X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.h;h=06e3eda0f1b447d090c7d6350c55463a3b928f2a;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=30e2b739acacd038e8431ca6fcde871ca56aeca3;hpb=2d2af972a53a2c11b95469058803b4eaed2d3c01;p=dcpomatic.git diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index 30e2b739a..06e3eda0f 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -31,11 +31,11 @@ #include "lib/dcpomatic_time.h" #include "lib/warnings.h" DCPOMATIC_DISABLE_WARNINGS +#include #include DCPOMATIC_ENABLE_WARNINGS -#include -#include #include +#include class FilePickerCtrl; @@ -121,6 +121,7 @@ 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 @@ -158,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