X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.h;h=fb1a3a001ecd6064467ea3bd97347ac435beb52b;hb=f5bd787fb71466a6187050086b2890b9b0ac9294;hp=294c661a87dbed0fe88d59519f16cd872c0e0e7c;hpb=94ace8e9fb2cbcf6f849edefd6b5e4c4a2d3ed7f;p=dcpomatic.git

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 294c661a8..fb1a3a001 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,22 +18,26 @@
 
 */
 
+
 /** @file src/wx/wx_util.h
  *  @brief Some utility functions and classes.
  */
 
+
 #ifndef DCPOMATIC_WX_UTIL_H
 #define DCPOMATIC_WX_UTIL_H
 
+
+#include "lib/config.h"
 #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/function.hpp>
-#include <boost/thread.hpp>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+#include <boost/thread.hpp>
+
 
 class FilePickerCtrl;
 class wxDirPickerCtrl;
@@ -43,13 +47,35 @@ class wxGridBagSizer;
 class wxSplashScreen;
 class PasswordEntry;
 
+
 #define DCPOMATIC_SIZER_X_GAP 8
 #define DCPOMATIC_SIZER_Y_GAP 8
 #define DCPOMATIC_SIZER_GAP 8
 #define DCPOMATIC_DIALOG_BORDER 12
+#ifdef __WXGTK3__
+#define DCPOMATIC_SPIN_CTRL_WIDTH 118
+#else
+#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 line */
-#if defined(DCPOMATIC_OSX) | defined(__WXGTK3__)
+/** Spacing to use between buttons in a vertical/horizontal line */
+#if defined(DCPOMATIC_OSX) || defined(__WXGTK3__)
 #define DCPOMATIC_BUTTON_STACK_GAP 2
 #else
 #define DCPOMATIC_BUTTON_STACK_GAP 0
@@ -65,18 +91,20 @@ class PasswordEntry;
 #define DCPOMATIC_RTAUDIO_API RtAudio::MACOSX_CORE
 #endif
 
+
 /** i18n macro to support strings like Context|String
  *  so that `String' can be translated to different things
  *  in different contexts.
  */
 #define S_(x) context_translation(x)
 
+
 extern void error_dialog (wxWindow *, wxString, boost::optional<wxString> e = boost::optional<wxString>());
 extern void message_dialog (wxWindow *, wxString);
 extern bool confirm_dialog (wxWindow *, wxString);
 extern wxStaticText* create_label (wxWindow* p, wxString t, bool left);
-extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, bool left, int prop = 0, int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT);
-extern wxStaticText* add_label_to_sizer (wxSizer *, wxStaticText *, bool left, int prop = 0, int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT);
+extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, bool left, int prop = 0, int flags = wxLEFT | wxRIGHT);
+extern wxStaticText* add_label_to_sizer (wxSizer *, wxStaticText *, bool left, int prop = 0, int flags = wxLEFT | wxRIGHT);
 extern wxStaticText* add_label_to_sizer (wxGridBagSizer *, wxWindow *, wxString, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan);
 extern wxStaticText* add_label_to_sizer (wxGridBagSizer *, wxStaticText *, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan);
 extern std::string wx_to_std (wxString);
@@ -91,6 +119,11 @@ extern double calculate_mark_interval (double start);
 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 ();
+extern void report_config_load_failure(wxWindow* parent, Config::LoadFailure what);
 
 struct Offset
 {
@@ -127,8 +160,9 @@ 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
 
+
 #endif