From 0e335b9dc141fbcb40e45f038306451d44f4ef42 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sun, 3 Nov 2019 17:20:37 +0100 Subject: [PATCH] Make button and searchctrl pages in widgets sample more DPI aware --- samples/widgets/button.cpp | 10 +++++----- samples/widgets/searchctrl.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp index df2f1d48d5..18a3b477e0 100644 --- a/samples/widgets/button.cpp +++ b/samples/widgets/button.cpp @@ -312,7 +312,7 @@ void ButtonWidgetsPage::CreateContent() sizerLeft->AddSpacer(5); wxButton *btn = new wxButton(this, ButtonPage_Reset, "&Reset"); - sizerLeft->Add(btn, wxSizerFlags().CentreHorizontal().Border(wxALL, 15)); + sizerLeft->Add(btn, wxSizerFlags().CentreHorizontal().TripleBorder(wxALL)); // middle pane wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, "&Operations"); @@ -337,15 +337,15 @@ void ButtonWidgetsPage::CreateContent() // right pane m_sizerButton = new wxBoxSizer(wxHORIZONTAL); - m_sizerButton->SetMinSize(150, 0); + m_sizerButton->SetMinSize(FromDIP(150), 0); // the 3 panes panes compose the window sizerTop->Add(sizerLeft, - wxSizerFlags(0).Expand().Border((wxALL & ~wxLEFT), 10)); + wxSizerFlags(0).Expand().DoubleBorder(wxALL & ~wxLEFT)); sizerTop->Add(sizerMiddle, - wxSizerFlags(1).Expand().Border(wxALL, 10)); + wxSizerFlags(1).Expand().DoubleBorder(wxALL)); sizerTop->Add(m_sizerButton, - wxSizerFlags(1).Expand().Border((wxALL & ~wxRIGHT), 10)); + wxSizerFlags(1).Expand().DoubleBorder((wxALL & ~wxRIGHT))); // do create the main control Reset(); diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp index 91e45c64f0..2f6d206605 100644 --- a/samples/widgets/searchctrl.cpp +++ b/samples/widgets/searchctrl.cpp @@ -156,13 +156,13 @@ void SearchCtrlWidgetsPage::CreateContent() m_searchBtnCheck->SetValue(true); - box->Add(m_searchBtnCheck, 0, wxALL, 5); - box->Add(m_cancelBtnCheck, 0, wxALL, 5); - box->Add(m_menuBtnCheck, 0, wxALL, 5); + box->Add(m_searchBtnCheck, wxSizerFlags().Border()); + box->Add(m_cancelBtnCheck, wxSizerFlags().Border()); + box->Add(m_menuBtnCheck, wxSizerFlags().Border()); wxSizer* sizer = new wxBoxSizer(wxHORIZONTAL); - sizer->Add(box, 0, wxALL|wxEXPAND, 15); - sizer->Add(m_srchCtrl, 0, wxALL|wxALIGN_CENTER, 15); + sizer->Add(box, wxSizerFlags().Expand().TripleBorder()); + sizer->Add(m_srchCtrl, wxSizerFlags().Centre().TripleBorder()); SetSizer(sizer); }