From 9eb62000f9695841da4b20af8e3b755fc12f961e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 31 Mar 2017 17:12:39 +0200 Subject: [PATCH] Simplify layout of the svg sample Get rid of the panel and the sizer, neither of them are necessary when we have a single control (wxNotebook in this case) taking up the entire frame client area. --- samples/svg/svgtest.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp index e0bdbfb64d..4563474ab1 100644 --- a/samples/svg/svgtest.cpp +++ b/samples/svg/svgtest.cpp @@ -140,27 +140,17 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, // Associate the menu bar with the frame SetMenuBar(menu_bar); - // Panel containing a notebook - m_panel = new wxPanel(this); - m_sizerFrame = new wxBoxSizer(wxVERTICAL); - m_panel->SetSizer(m_sizerFrame); - // Create a notebook - m_notebook = new wxNotebook(m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBK_TOP); + m_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBK_TOP); //Add SVG Windows to a notebook for (int i = 0; i <= 8; ++i) { wxString svgTitle; svgTitle.Printf(wxT("SVG Test %d"), i); - m_notebook->AddPage(CreateNewPage(i), svgTitle, true); + m_notebook->AddPage(CreateNewPage(i), svgTitle); } - - // Add a notebook - m_sizerFrame->Insert(0, m_notebook, wxSizerFlags(5).Expand().Border()); - m_notebook->ChangeSelection(0); - m_sizerFrame->Layout(); } MyPage *MyFrame::CreateNewPage(int index)