#include "lib/job_manager.h"
#include "lib/util.h"
#include "lib/version.h"
-#include "lib/warnings.h"
#include <dcp/locale_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/spinctrl.h>
#include <wx/splash.h>
#include <wx/progdlg.h>
#include <wx/filepicker.h>
#include <wx/sizer.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
#include <boost/thread.hpp>
#endif
-/** Add a wxStaticText to a wxSizer, aligning it at vertical centre.
+/** Add a wxStaticText to a wxSizer.
* @param s Sizer to add to.
* @param p Parent window for the wxStaticText.
* @param t Text for the wxStaticText.
setup_osx_flags (s, left, flags);
#endif
auto m = create_label (p, t, left);
- s->Add (m, prop, flags, 6);
+ s->Add (m, prop, flags, DCPOMATIC_SIZER_GAP);
return m;
}
#ifdef __WXOSX__
setup_osx_flags (s, left, flags);
#endif
- s->Add (t, prop, flags, 6);
+ s->Add (t, prop, flags, DCPOMATIC_SIZER_GAP);
return t;
}
void
-checked_set (wxChoice* widget, vector<pair<string, string> > items)
+checked_set (wxChoice* widget, vector<pair<string, string>> items)
{
vector<pair<string, string>> current;
for (unsigned int i = 0; i < widget->GetCount(); ++i) {
wxClientDC dc (parent);
auto size = dc.GetTextExtent (text);
size.SetHeight (-1);
- size.IncBy (24, 0);
+ size.IncBy (32, 0);
return size;
}
}
#endif
+
+
+int
+search_ctrl_height ()
+{
+#ifdef __WXGTK3__
+ return 30;
+#else
+ return -1;
+#endif
+}
+