Disable warnings around all wx includes.

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

diff --git a/src/wx/time_picker.cc b/src/wx/time_picker.cc
index 63d6d4f847e88d273de2c5cfa2cc79cd40527f53..614ea94240f9a0b56d58d6082dac8fe847dcb240 100644 (file)
--- a/src/wx/time_picker.cc
+++ b/src/wx/time_picker.cc
@@ -18,20 +18,25 @@
 
 */
 
+
+#include "static_text.h"
 #include "time_picker.h"
 #include "wx_util.h"
-#include "static_text.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
-#include <boost/bind.hpp>
+DCPOMATIC_ENABLE_WARNINGS
+#include <boost/bind/bind.hpp>
 #include <iomanip>
 
+
+using std::cout;
+using std::max;
+using std::min;
 using std::setfill;
 using std::setw;
-using std::min;
-using std::max;
 using std::string;
-using std::cout;
 using boost::bind;
 using dcp::locale_convert;
 
@@ -52,10 +57,10 @@ TimePickerSpin::TimePickerSpin (wxWindow* parent, wxDateTime time)
 
        wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
        _hours = new wxSpinCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size);
-       sizer->Add (_hours, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
-       sizer->Add (new StaticText (this, wxT (":")), 0, wxALIGN_CENTER_VERTICAL);
+       sizer->Add (_hours, 1, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
+       sizer->Add (new StaticText(this, wxT(":")), 0, wxALIGN_CENTER_VERTICAL);
        _minutes = new wxSpinCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size);
-       sizer->Add (_minutes, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
+       sizer->Add (_minutes, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
 
        SetSizerAndFit (sizer);