X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.h;h=6cde08a90924dd93977d628d4b94ac1f48c730a5;hb=324278cc8459e4d7d907b03e0748cf1b33f294f4;hp=6f83e3df0e04a25c70a27a77b53818f2a8633d17;hpb=b0f5d569ccf740d5524e06ff59a17638221dc9d7;p=dcpomatic.git

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 6f83e3df0..6cde08a90 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -17,14 +17,50 @@
 
 */
 
-#include <list>
 #include <wx/wx.h>
+#include <boost/function.hpp>
+#include <boost/thread.hpp>
+
+class wxFilePickerCtrl;
+class wxSpinCtrl;
 
 /** @file src/wx/wx_util.h
- *  @brief Some utility functions.
+ *  @brief Some utility functions and classes.
  */
 
-extern void error_dialog (std::string);
-extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, std::list<wxControl*>&, std::string);
+extern void error_dialog (wxWindow *, wxString);
+extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, int prop = 0);
 extern std::string wx_to_std (wxString);
 extern wxString std_to_wx (std::string);
+
+/** @class ThreadedStaticText
+ *
+ *  @brief A wxStaticText whose content is computed in a separate thread, to avoid holding
+ *  up the GUI while work is done.
+ */
+class ThreadedStaticText : public wxStaticText
+{
+public:
+	ThreadedStaticText (wxWindow* parent, wxString initial, boost::function<std::string ()> fn);
+	~ThreadedStaticText ();
+
+private:
+	void run (boost::function<std::string ()> fn);
+	void thread_finished (wxCommandEvent& ev);
+
+	/** Thread to do our work in */
+	boost::thread* _thread;
+	
+	static const int _update_event_id;
+};
+
+extern std::string string_client_data (wxClientData* o);
+
+extern void checked_set (wxFilePickerCtrl* widget, std::string value);
+extern void checked_set (wxSpinCtrl* widget, int value);
+extern void checked_set (wxChoice* widget, int value);
+extern void checked_set (wxChoice* widget, std::string value);
+extern void checked_set (wxTextCtrl* widget, std::string value);
+extern void checked_set (wxCheckBox* widget, bool value);
+extern void checked_set (wxRadioButton* widget, bool value);
+extern void checked_set (wxStaticText* widget, std::string value);