X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fwx_util.h;h=14f203688668a7aa2a424bf909f279e12884a5d9;hb=59209af1e2d73334ff7dfe6c7da465293dc24c0b;hp=0c2eabce0faf4db9ea347d7951c8089df5984b2a;hpb=65bd479a3008fb269925e1ce92e547c863ede73d;p=dcpomatic.git

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 0c2eabce0..14f203688 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -29,13 +29,13 @@
 
 
 #include "lib/dcpomatic_time.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
-#include <boost/thread.hpp>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+#include <boost/thread.hpp>
 
 
 class FilePickerCtrl;
@@ -57,6 +57,22 @@ class PasswordEntry;
 #define DCPOMATIC_SPIN_CTRL_WIDTH 56
 #endif
 
+/** Amount by which you need to bottom-pad text next to a checkbox in order
+ *  for the text baselines to be aligned.
+ */
+#ifdef DCPOMATIC_OSX
+#define DCPOMATIC_CHECKBOX_BOTTOM_PAD 2
+#else
+#define DCPOMATIC_CHECKBOX_BOTTOM_PAD 0
+#endif
+
+/** Amount by which you need to top-pad a choice to make it line up, in some cases */
+#ifdef DCPOMATIC_OSX
+#define DCPOMATIC_CHOICE_TOP_PAD 1
+#else
+#define DCPOMATIC_CHOICE_TOP_PAD 0
+#endif
+
 /** Spacing to use between buttons in a vertical/horizontal line */
 #if defined(DCPOMATIC_OSX) || defined(__WXGTK3__)
 #define DCPOMATIC_BUTTON_STACK_GAP 2
@@ -103,6 +119,9 @@ extern bool display_progress (wxString title, wxString task);
 extern bool report_errors_from_last_job (wxWindow* parent);
 extern wxString bitmap_path (std::string name);
 extern wxSize small_button_size (wxWindow* parent, wxString text);
+extern bool gui_is_dark ();
+extern double dpi_scale_factor (wxWindow* window);
+extern int search_ctrl_height ();
 
 
 struct Offset
@@ -140,7 +159,7 @@ extern int wx_get (wxChoice* widget);
 extern int wx_get (wxSpinCtrl* widget);
 extern double wx_get (wxSpinCtrlDouble* widget);
 
-#if defined(__WXMSW__)
+#ifdef DCPOMATIC_WINDOWS
 #define DCPOMATIC_USE_OWN_PICKER
 #endif