C++11 and whitespace cleanups.

[dcpomatic.git] / src / wx / wx_util.cc

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 47a6bd5b05141a704ed08a86b3df64c39b9d3d57..493743d4afebb92eb7d64e8b562fa60f0ed4795d 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -86,7 +86,7 @@ setup_osx_flags (wxSizer* s, bool left, int& flags)
 #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.
@@ -297,7 +297,7 @@ checked_set (wxChoice* widget, string value)
 
 
 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) {
@@ -657,7 +657,7 @@ small_button_size (wxWindow* parent, wxString text)
        wxClientDC dc (parent);
        auto size = dc.GetTextExtent (text);
        size.SetHeight (-1);
-       size.IncBy (24, 0);
+       size.IncBy (32, 0);
        return size;
 }
 
@@ -688,3 +688,15 @@ dpi_scale_factor (wxWindow*)
 }
 #endif
 
+
+
+int
+search_ctrl_height ()
+{
+#ifdef __WXGTK3__
+       return 30;
+#else
+       return -1;
+#endif
+}
+