From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 12 Mar 2006 17:04:23 +0000 (+0000)
Subject: use the sizer to layout the main window/panel (this allows to give more size to the... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9ae195997283b464996917cd63ca3cc12cd4567e?ds=sidebyside;hp=985f824c2b4cb1162048f607b15fb383cdef1d59

use the sizer to layout the main window/panel (this allows to give more size to the log window by resizing the main frame while before it was pretty difficult to see anything in it)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 0f95b16646..44e3605b06 100644
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -74,7 +74,6 @@ public:
     MyPanel(wxFrame *frame, int x, int y, int w, int h);
     virtual ~MyPanel();
 
-    void OnSize( wxSizeEvent& event );
     void OnIdle( wxIdleEvent &event );
     void OnListBox( wxCommandEvent &event );
     void OnListBoxDoubleClick( wxCommandEvent &event );
@@ -480,7 +479,6 @@ const int  ID_SIZER_CHECK14     = 205;
 const int  ID_SIZER_CHECKBIG    = 206;
 
 BEGIN_EVENT_TABLE(MyPanel, wxPanel)
-EVT_SIZE      (                         MyPanel::OnSize)
 EVT_IDLE      (                         MyPanel::OnIdle)
 EVT_BOOKCTRL_PAGE_CHANGING(ID_BOOK,     MyPanel::OnPageChanging)
 EVT_BOOKCTRL_PAGE_CHANGED(ID_BOOK,      MyPanel::OnPageChanged)
@@ -1040,16 +1038,12 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     panel->SetSizer( sizer );
 
     m_book->AddPage(panel, _T("wxSizer"));
-}
-
-void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )
-{
-    int x = 0;
-    int y = 0;
-    GetClientSize( &x, &y );
 
-    if (m_book) m_book->SetSize( 2, 2, x-4, y*2/3-4 );
-    if (m_text) m_text->SetSize( 2, y*2/3+2, x-4, y/3-4 );
+    // set the sizer for the panel itself
+    sizer = new wxBoxSizer(wxVERTICAL);
+    sizer->Add(m_book, wxSizerFlags().Border().Expand());
+    sizer->Add(m_text, wxSizerFlags(1).Border().Expand());
+    SetSizer(sizer);
 }
 
 void MyPanel::OnIdle(wxIdleEvent& event)