X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.h;h=8ac824c508d81d1edc5640de2df33f7a792cfdc2;hb=c758226b90f22b553725df2c7be4a3a42772ae54;hp=0c77735eb2abf985317fedcaf110c145311a5f8c;hpb=a7130995cf5f13396746932511ba133e8ad4ca9d;p=dcpomatic.git

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 0c77735eb..8ac824c50 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -17,21 +17,37 @@
 
 */
 
+#ifndef DCPOMATIC_WX_UTIL_H
+#define DCPOMATIC_WX_UTIL_H
+
 #include <wx/wx.h>
+#include <wx/gbsizer.h>
 #include <boost/function.hpp>
 #include <boost/thread.hpp>
+#include <boost/signals2.hpp>
+#ifdef __WXGTK__
+#include <gtk/gtk.h>
+#endif
 
 class wxFilePickerCtrl;
 class wxSpinCtrl;
+class wxGridBagSizer;
+
+#define DCPOMATIC_SIZER_X_GAP 8
+#define DCPOMATIC_SIZER_Y_GAP 8
+#define DCPOMATIC_DIALOG_BORDER 12
 
 /** @file src/wx/wx_util.h
  *  @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, bool left, int prop = 0);
+extern wxStaticText* add_label_to_grid_bag_sizer (wxGridBagSizer *, wxWindow *, wxString, bool, 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
  *
@@ -41,9 +57,12 @@ extern wxString std_to_wx (std::string);
 class ThreadedStaticText : public wxStaticText
 {
 public:
-	ThreadedStaticText (wxWindow* parent, std::string initial, boost::function<std::string ()> fn);
+	ThreadedStaticText (wxWindow* parent, wxString initial, boost::function<std::string ()> fn);
 	~ThreadedStaticText ();
 
+	/** Emitted in the UI thread when the text has been set up */
+	boost::signals2::signal<void()> Finished;
+
 private:
 	void run (boost::function<std::string ()> fn);
 	void thread_finished (wxCommandEvent& ev);
@@ -63,3 +82,17 @@ 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);
+
+extern int wx_get (wxChoice* widget);
+extern int wx_get (wxSpinCtrl* widget);
+
+/* GTK 2.24.17 has a buggy GtkFileChooserButton and it was put in Ubuntu 13.04.
+   This also seems to apply to 2.24.20 in Ubuntu 13.10
+   Use our own dir picker as this is the least bad option I can think of.
+*/
+#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && (GTK_MICRO_VERSION == 17 || GTK_MICRO_VERSION == 20))
+#define DCPOMATIC_USE_OWN_DIR_PICKER
+#endif
+
+#endif