string
wx_to_std (wxString s)
{
- return string (s.mb_str ());
+ return string (s.ToUTF8 ());
}
/** @param s STL string.
* @param initial Initial text for the wxStaticText while the computation is being run.
* @param fn Function which works out what the wxStaticText content should be and returns it.
*/
-ThreadedStaticText::ThreadedStaticText (wxWindow* parent, wxString initial, function<string ()> fn)
+ThreadedStaticText::ThreadedStaticText (wxWindow* parent, wxString initial, boost::function<string ()> fn)
: wxStaticText (parent, wxID_ANY, initial)
{
Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ThreadedStaticText::thread_finished, this, _1), _update_event_id);
/** Run our thread and post the result to the GUI thread via AddPendingEvent */
void
-ThreadedStaticText::run (function<string ()> fn)
+ThreadedStaticText::run (boost::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
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 ();
+ }
+}