diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-09-11 21:23:37 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-13 19:54:31 +0200 |
| commit | ff623a7f045575169820b28a9e1d4ee10ec2fb69 (patch) | |
| tree | 7795c9f0b87e6acd6b4881a96fc5a285de8a1bea | |
| parent | 44532cd5f87df3ef10bbbd6b987492e36e4a0eb6 (diff) | |
More fixes for wxWidgets 3.1.x.
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 14 | ||||
| -rw-r--r-- | src/wx/wx_util.h | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index c7a724375..a73fa4d30 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -150,6 +150,7 @@ public: , _system_information_dialog (0) , _view_full_screen (0) , _view_dual_screen (0) + , _main_sizer (new wxBoxSizer (wxVERTICAL)) { dcpomatic_log.reset (new NullLog()); @@ -293,13 +294,15 @@ public: void setup_main_sizer (Config::PlayerMode mode) { - wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL); + _main_sizer->Detach (_viewer->panel()); + _main_sizer->Detach (_controls); + _main_sizer->Detach (_info); if (mode != Config::PLAYER_MODE_DUAL) { - main_sizer->Add (_viewer->panel(), 1, wxEXPAND | wxALIGN_CENTER_VERTICAL); + _main_sizer->Add (_viewer->panel(), 1, wxEXPAND); } - main_sizer->Add (_controls, mode == Config::PLAYER_MODE_DUAL ? 1 : 0, wxEXPAND | wxALL, 6); - main_sizer->Add (_info, 0, wxEXPAND | wxALL, 6); - _overall_panel->SetSizer (main_sizer); + _main_sizer->Add (_controls, mode == Config::PLAYER_MODE_DUAL ? 1 : 0, wxEXPAND | wxALL, 6); + _main_sizer->Add (_info, 0, wxEXPAND | wxALL, 6); + _overall_panel->SetSizer (_main_sizer); _overall_panel->Layout (); } @@ -1081,6 +1084,7 @@ private: wxMenuItem* _tools_verify; wxMenuItem* _view_full_screen; wxMenuItem* _view_dual_screen; + wxSizer* _main_sizer; PlayerStressTester _stress; }; diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index 294c661a8..f12671786 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -75,8 +75,8 @@ extern void error_dialog (wxWindow *, wxString, boost::optional<wxString> e = bo extern void message_dialog (wxWindow *, wxString); extern bool confirm_dialog (wxWindow *, wxString); extern wxStaticText* create_label (wxWindow* p, wxString t, bool left); -extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, bool left, int prop = 0, int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT); -extern wxStaticText* add_label_to_sizer (wxSizer *, wxStaticText *, bool left, int prop = 0, int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT); +extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, bool left, int prop = 0, int flags = wxLEFT | wxRIGHT); +extern wxStaticText* add_label_to_sizer (wxSizer *, wxStaticText *, bool left, int prop = 0, int flags = wxLEFT | wxRIGHT); extern wxStaticText* add_label_to_sizer (wxGridBagSizer *, wxWindow *, wxString, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan); extern wxStaticText* add_label_to_sizer (wxGridBagSizer *, wxStaticText *, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan); extern std::string wx_to_std (wxString); |