projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 / sorting cleanups.
[dcpomatic.git]
/
src
/
wx
/
wx_util.cc
diff --git
a/src/wx/wx_util.cc
b/src/wx/wx_util.cc
index 47a6bd5b05141a704ed08a86b3df64c39b9d3d57..9974f61c983900e997e673da953afbe2bc1f60fe 100644
(file)
--- a/
src/wx/wx_util.cc
+++ b/
src/wx/wx_util.cc
@@
-34,15
+34,15
@@
#include "lib/job_manager.h"
#include "lib/util.h"
#include "lib/version.h"
#include "lib/job_manager.h"
#include "lib/util.h"
#include "lib/version.h"
-#include "lib/warnings.h"
#include <dcp/locale_convert.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>
#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>
#include <boost/thread.hpp>
@@
-86,7
+86,7
@@
setup_osx_flags (wxSizer* s, bool left, int& flags)
#endif
#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.
* @param s Sizer to add to.
* @param p Parent window for the wxStaticText.
* @param t Text for the wxStaticText.
@@
-297,7
+297,7
@@
checked_set (wxChoice* widget, string value)
void
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) {
{
vector<pair<string, string>> current;
for (unsigned int i = 0; i < widget->GetCount(); ++i) {
@@
-657,7
+657,7
@@
small_button_size (wxWindow* parent, wxString text)
wxClientDC dc (parent);
auto size = dc.GetTextExtent (text);
size.SetHeight (-1);
wxClientDC dc (parent);
auto size = dc.GetTextExtent (text);
size.SetHeight (-1);
- size.IncBy (
24
, 0);
+ size.IncBy (
32
, 0);
return size;
}
return size;
}
@@
-688,3
+688,15
@@
dpi_scale_factor (wxWindow*)
}
#endif
}
#endif
+
+
+int
+search_ctrl_height ()
+{
+#ifdef __WXGTK3__
+ return 30;
+#else
+ return -1;
+#endif
+}
+