#include <boost/thread.hpp>
#include <wx/filepicker.h>
#include <wx/spinctrl.h>
+#include "lib/config.h"
+#include "lib/util.h"
#include "wx_util.h"
-#include "config.h"
-#include "util.h"
using namespace std;
using namespace boost;
ThreadedStaticText::ThreadedStaticText (wxWindow* parent, wxString initial, function<string ()> fn)
: wxStaticText (parent, wxID_ANY, initial)
{
- Connect (_update_event_id, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ThreadedStaticText::thread_finished), 0, this);
+ Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ThreadedStaticText::thread_finished, this, _1), _update_event_id);
_thread = new thread (bind (&ThreadedStaticText::run, this, fn));
}
ThreadedStaticText::thread_finished (wxCommandEvent& ev)
{
SetLabel (ev.GetString ());
+ Finished ();
}
string
locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string()));
#endif
+#ifdef DCPOMATIC_POSIX
+ locale->AddCatalogLookupPathPrefix (POSIX_LOCALE_PREFIX);
+#endif
+
locale->AddCatalog (wxT ("libdcpomatic-wx"));
locale->AddCatalog (wxT ("dcpomatic"));