X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.h;h=bff11647edb653c92eade0b72ac6d3a939f04538;hb=bdbddbe89d4996a39dc6e695f23a6457c03774ae;hp=d0b838c365e61825db0623d8dbafbcaf7aa35670;hpb=121313dc6660f39328cf757dd9fd485bf1810a63;p=dcpomatic.git

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index d0b838c36..bff11647e 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -18,12 +18,54 @@
 */
 
 #include <wx/wx.h>
+#include <wx/gbsizer.h>
+#include <boost/function.hpp>
+#include <boost/thread.hpp>
+
+class wxFilePickerCtrl;
+class wxSpinCtrl;
+class wxGridBagSizer;
 
 /** @file src/wx/wx_util.h
- *  @brief Some utility functions.
+ *  @brief Some utility functions and classes.
  */
 
-extern void error_dialog (wxWindow *, std::string);
-extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, std::string, int prop = 0);
+extern void error_dialog (wxWindow *, wxString);
+extern bool confirm_dialog (wxWindow *, wxString);
+extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, int prop = 0);
+extern wxStaticText* add_label_to_grid_bag_sizer (wxGridBagSizer *, wxWindow *, wxString, wxGBPosition, wxGBSpan span = wxDefaultSpan);
 extern std::string wx_to_std (wxString);
 extern wxString std_to_wx (std::string);
+extern void dcpomatic_setup_i18n ();
+
+/** @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);