X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=96278b82bac0d1197a26ae68da601c9084a912a3;hb=54d5424caa2ccc2746d67b847898bb18dbcd692c;hp=c5887e17d80b5f3f8b5faade084fac29c73978ec;hpb=89115db77729a2c99f1a09ff6a461720e16f889e;p=dcpomatic.git

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index c5887e17d..96278b82b 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -24,9 +24,9 @@
 #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;
@@ -40,7 +40,11 @@ using namespace boost;
  *  @param prop Proportion to pass when calling Add() on the wxSizer.
  */
 wxStaticText *
+#ifdef __WXOSX__
 add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool left, int prop)
+#else
+add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool, int prop)
+#endif
 {
 	int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
 #ifdef __WXOSX__
@@ -55,7 +59,11 @@ add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool left, int prop)
 }
 
 wxStaticText *
+#ifdef __WXOSX__
 add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span)
+#else
+add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, wxGBPosition pos, wxGBSpan span)
+#endif
 {
 	int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
 #ifdef __WXOSX__
@@ -97,7 +105,7 @@ confirm_dialog (wxWindow* parent, wxString m)
 string
 wx_to_std (wxString s)
 {
-	return string (s.mb_str ());
+	return string (s.ToUTF8 ());
 }
 
 /** @param s STL string.
@@ -118,7 +126,7 @@ int const ThreadedStaticText::_update_event_id = 10000;
 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));
 }
 
@@ -132,17 +140,25 @@ ThreadedStaticText::~ThreadedStaticText ()
 /** Run our thread and post the result to the GUI thread via AddPendingEvent */
 void
 ThreadedStaticText::run (function<string ()> fn)
+try
 {
 	wxCommandEvent ev (wxEVT_COMMAND_TEXT_UPDATED, _update_event_id);
 	ev.SetString (std_to_wx (fn ()));
 	GetEventHandler()->AddPendingEvent (ev);
 }
+catch (...)
+{
+	/* Ignore exceptions; marginally better than the program quitting, but
+	   only marginally.
+	*/
+}
 
 /** Called in the GUI thread when our worker thread has finished */
 void
 ThreadedStaticText::thread_finished (wxCommandEvent& ev)
 {
 	SetLabel (ev.GetString ());
+	Finished ();
 }
 
 string
@@ -251,13 +267,16 @@ dcpomatic_setup_i18n ()
 		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"));
 		
 		if (!locale->IsOk()) {
 			delete locale;
 			locale = new wxLocale (wxLANGUAGE_ENGLISH);
-			language = wxLANGUAGE_ENGLISH;
 		}
 	}
 
@@ -265,3 +284,23 @@ dcpomatic_setup_i18n ()
 		dcpomatic_setup_gettext_i18n (wx_to_std (locale->GetCanonicalName ()));
 	}
 }
+
+int
+wx_get (wxSpinCtrl* w)
+{
+	return w->GetValue ();
+}
+
+int
+wx_get (wxChoice* w)
+{
+	return w->GetSelection ();
+}
+
+void
+run_gui_loop ()
+{
+	while (wxTheApp->Pending ()) {
+		wxTheApp->Dispatch ();
+	}
+}