X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.h;h=8ac824c508d81d1edc5640de2df33f7a792cfdc2;hb=8dbaf398617620b44ca7e01966b879e1b5c98d35;hp=de6a09c35298fcc0b53460e4e8be8ef299695bed;hpb=89115db77729a2c99f1a09ff6a461720e16f889e;p=dcpomatic.git

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index de6a09c35..8ac824c50 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -24,6 +24,7 @@
 #include <wx/gbsizer.h>
 #include <boost/function.hpp>
 #include <boost/thread.hpp>
+#include <boost/signals2.hpp>
 #ifdef __WXGTK__
 #include <gtk/gtk.h>
 #endif
@@ -34,6 +35,7 @@ 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.
@@ -58,6 +60,9 @@ public:
 	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);
@@ -79,10 +84,14 @@ 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)
+#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