From c4e54c78fd0366a0d829295ac504f50fbc589458 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Thu, 21 Nov 2019 23:18:30 +0100 Subject: [PATCH] Select active mode in display sample Update sample to use SizerFlags. Set a minimum size to the dialog. --- samples/display/display.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/samples/display/display.cpp b/samples/display/display.cpp index 2c7b523e92..d0df96ee77 100644 --- a/samples/display/display.cpp +++ b/samples/display/display.cpp @@ -299,7 +299,7 @@ void MyFrame::PopuplateWithDisplayInfo() // add it to another sizer to have borders around it and button below wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); - sizerTop->Add(sizer, 1, wxALL | wxEXPAND, 10); + sizerTop->Add(sizer, wxSizerFlags(1).Expand().DoubleBorder()); #if wxUSE_DISPLAY wxChoice *choiceModes = new wxChoice(page, Display_ChangeMode); @@ -312,16 +312,18 @@ void MyFrame::PopuplateWithDisplayInfo() choiceModes->Append(VideoModeToText(mode), new MyVideoModeClientData(mode)); } + const wxString currentMode = VideoModeToText(display.GetCurrentMode()); + choiceModes->SetStringSelection(currentMode); - sizer->Add(new wxStaticText(page, wxID_ANY, "&Modes: ")); - sizer->Add(choiceModes, 0, wxEXPAND); + sizer->Add(new wxStaticText(page, wxID_ANY, "&Modes: "), + wxSizerFlags().CentreVertical()); + sizer->Add(choiceModes, wxSizerFlags().Expand()); sizer->Add(new wxStaticText(page, wxID_ANY, "Current: ")); - sizer->Add(new wxStaticText(page, Display_CurrentMode, - VideoModeToText(display.GetCurrentMode()))); + sizer->Add(new wxStaticText(page, Display_CurrentMode, currentMode)); sizerTop->Add(new wxButton(page, Display_ResetMode, "&Reset mode"), - 0, wxALL | wxCENTRE, 5); + wxSizerFlags().Centre().Border()); #endif // wxUSE_DISPLAY page->SetSizer(sizerTop); @@ -331,6 +333,7 @@ void MyFrame::PopuplateWithDisplayInfo() } SetClientSize(m_book->GetBestSize()); + SetMinSize(GetSize()); } #if wxUSE_DISPLAY