Change wxFSFile::DetachStream to NULL the m_Stream member. Add SetStream().

[wxWidgets.git] / samples / layout / layout.cpp

diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index c849af51ae252662ebf7ae1a1ec8d2084723d29c..dd3b080d7f0a73dc875d00f55bd7257278ddd1cf 100644 (file)
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -2,13 +2,18 @@
 // Name:        layout.cpp
 // Purpose:     Layout sample
 // Author:      Julian Smart
 // Name:        layout.cpp
 // Purpose:     Layout sample
 // Author:      Julian Smart

-// Modified by:
+// Modified by: Robin Dunn, Vadim Zeitlin

 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Julian Smart
+//                  2005 Vadim Zeitlin

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -20,352 +25,583 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#if !wxUSE_CONSTRAINTS
-#error You must set wxUSE_CONSTRAINTS to 1 in setup.h!
-#endif
-
-#include <ctype.h>
-

 #include "wx/sizer.h"
 #include "wx/sizer.h"

+#include "wx/gbsizer.h"

 #include "wx/statline.h"
 #include "wx/notebook.h"
 #include "wx/statline.h"
 #include "wx/notebook.h"

+#include "wx/spinctrl.h"

 
 #include "layout.h"
 
 
 #include "layout.h"
 

-// Declare two frames
-MyFrame   *frame = (MyFrame *) NULL;
-wxMenuBar *menu_bar = (wxMenuBar *) NULL;
+// ----------------------------------------------------------------------------
+// MyApp
+// ----------------------------------------------------------------------------

 
 IMPLEMENT_APP(MyApp)
 
 
 IMPLEMENT_APP(MyApp)
 

-MyApp::MyApp()
-{
-}
-

 bool MyApp::OnInit()
 {
   // Create the main frame window
 bool MyApp::OnInit()
 {
   // Create the main frame window

-  frame = new MyFrame(NULL, _T("wxWindows Layout Demo"), -1, -1, 400, 300);
+  MyFrame *frame = new MyFrame;
+
+  frame->Show(true);

 
 

-  frame->SetAutoLayout(TRUE);
+  return true;
+}
+
+// ----------------------------------------------------------------------------
+// MyFrame
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+  EVT_MENU(LAYOUT_ABOUT, MyFrame::OnAbout)
+  EVT_MENU(LAYOUT_QUIT, MyFrame::OnQuit)

 
 

-  // Give it a status line
-  frame->CreateStatusBar(2);
+  EVT_MENU(LAYOUT_TEST_PROPORTIONS, MyFrame::TestProportions)
+  EVT_MENU(LAYOUT_TEST_SIZER, MyFrame::TestFlexSizers)
+  EVT_MENU(LAYOUT_TEST_NB_SIZER, MyFrame::TestNotebookSizers)
+  EVT_MENU(LAYOUT_TEST_GB_SIZER, MyFrame::TestGridBagSizer)
+  EVT_MENU(LAYOUT_TEST_SET_MINIMAL, MyFrame::TestSetMinimal)
+END_EVENT_TABLE()

 
 

+// Define my frame constructor
+MyFrame::MyFrame()
+       : wxFrame(NULL, wxID_ANY, _T("wxWidgets Layout Demo"),
+                 wxDefaultPosition, wxDefaultSize,
+                 wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
+{

   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 

-  file_menu->Append(LAYOUT_TEST_SIZER, _T("&Test sizers"),      _T("Test sizer"));
-  file_menu->Append(LAYOUT_TEST_NB, _T("&Test notebook sizers"),      _T("Test notebook sizer"));
+  file_menu->Append(LAYOUT_TEST_PROPORTIONS, _T("&Proportions demo...\tF1"));
+  file_menu->Append(LAYOUT_TEST_SIZER, _T("Test wx&FlexSizer...\tF2"));
+  file_menu->Append(LAYOUT_TEST_NB_SIZER, _T("Test &notebook sizers...\tF3"));
+  file_menu->Append(LAYOUT_TEST_GB_SIZER, _T("Test &gridbag sizer...\tF4"));
+  file_menu->Append(LAYOUT_TEST_SET_MINIMAL, _T("Test Set&ItemMinSize...\tF5"));

 
   file_menu->AppendSeparator();
 
   file_menu->AppendSeparator();

-  file_menu->Append(LAYOUT_QUIT, _T("E&xit"),                _T("Quit program"));
+  file_menu->Append(LAYOUT_QUIT, _T("E&xit"), _T("Quit program"));

 
   wxMenu *help_menu = new wxMenu;
 
   wxMenu *help_menu = new wxMenu;

-  help_menu->Append(LAYOUT_ABOUT, _T("&About"),              _T("About layout demo"));
+  help_menu->Append(LAYOUT_ABOUT, _T("&About"), _T("About layout demo..."));

 
 

-  menu_bar = new wxMenuBar;
+  wxMenuBar *menu_bar = new wxMenuBar;

 
   menu_bar->Append(file_menu, _T("&File"));
   menu_bar->Append(help_menu, _T("&Help"));
 
   // Associate the menu bar with the frame
 
   menu_bar->Append(file_menu, _T("&File"));
   menu_bar->Append(help_menu, _T("&Help"));
 
   // Associate the menu bar with the frame

-  frame->SetMenuBar(menu_bar);
+  SetMenuBar(menu_bar);

 
 

-  // Make a panel
-  wxPanel *panel = new wxPanel(frame);
+#if wxUSE_STATUSBAR
+  CreateStatusBar(2);
+  SetStatusText(_T("wxWidgets layout demo"));
+#endif // wxUSE_STATUSBAR

 
 

-  // Create some panel items
-  wxButton *btn1 = new wxButton(panel, -1, _T("A button (1)")) ;
+  wxPanel* p = new wxPanel(this, wxID_ANY);

 
 

-  wxLayoutConstraints *b1 = new wxLayoutConstraints;
-  b1->centreX.SameAs    (panel, wxCentreX);
-  b1->top.SameAs        (panel, wxTop, 5);
-  b1->width.PercentOf   (panel, wxWidth, 80);
-  b1->height.AsIs       ();
-  btn1->SetConstraints(b1);
+  // we want to get a dialog that is stretchable because it
+  // has a text ctrl in the middle. at the bottom, we have
+  // two buttons which.
+
+  wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );

 
 

-  wxListBox *list = new wxListBox(panel, -1,
-                                  wxPoint(-1, -1), wxSize(200, 100));
-  list->Append(_T("Apple"));
-  list->Append(_T("Pear"));
-  list->Append(_T("Orange"));
-  list->Append(_T("Banana"));
-  list->Append(_T("Fruit"));
+  // 1) top: create wxStaticText with minimum size equal to its default size
+  topsizer->Add(
+    new wxStaticText( p, wxID_ANY, _T("An explanation (wxALIGN_RIGHT).") ),
+    wxSizerFlags().Align(wxALIGN_RIGHT).Border(wxALL & ~wxBOTTOM, 5));

 
 

-  wxLayoutConstraints *b2 = new wxLayoutConstraints;
-  b2->top.Below         (btn1, 5);
-  b2->left.SameAs       (panel, wxLeft, 5);
-  b2->width.PercentOf   (panel, wxWidth, 40);
-  b2->bottom.SameAs     (panel, wxBottom, 5);
-  list->SetConstraints(b2);
+  // 2) top: create wxTextCtrl with minimum size (100x60)
+  topsizer->Add(
+    new wxTextCtrl( p, wxID_ANY, _T("My text (wxEXPAND)."), wxDefaultPosition, wxSize(100,60), wxTE_MULTILINE),
+    wxSizerFlags(1).Expand().Border(wxALL, 5));

 
 

-  wxTextCtrl *mtext = new wxTextCtrl(panel, -1, _T("Some text"));
+  // 2.5) Gratuitous test of wxStaticBoxSizers
+  wxBoxSizer *statsizer = new wxStaticBoxSizer(
+    new wxStaticBox(p, wxID_ANY, _T("A wxStaticBoxSizer")), wxVERTICAL );
+  statsizer->Add(
+    new wxStaticText(p, wxID_ANY, _T("And some TEXT inside it")),
+    wxSizerFlags().Center().Border(wxALL, 30));
+  topsizer->Add(
+    statsizer,
+    wxSizerFlags(1).Expand().Border(wxALL, 10));

 
 

-  wxLayoutConstraints *b3 = new wxLayoutConstraints;
-  b3->top.Below         (btn1, 5);
-  b3->left.RightOf      (list, 5);
-  b3->right.SameAs      (panel, wxRight, 5);
-  b3->bottom.SameAs     (panel, wxBottom, 5);
-  mtext->SetConstraints(b3);
+    // 2.7) And a test of wxGridSizer
+    wxGridSizer *gridsizer = new wxGridSizer(2, 5, 5);
+    gridsizer->Add(new wxStaticText(p, wxID_ANY, _T("Label")),
+                   wxSizerFlags().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL));
+    gridsizer->Add(new wxTextCtrl(p, wxID_ANY, _T("Grid sizer demo")),
+                   wxSizerFlags(1).Align(wxGROW | wxALIGN_CENTER_VERTICAL));
+    gridsizer->Add(new wxStaticText(p, wxID_ANY, _T("Another label")),
+                   wxSizerFlags().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL));
+    gridsizer->Add(new wxTextCtrl(p, wxID_ANY, _T("More text")),
+                   wxSizerFlags(1).Align(wxGROW | wxALIGN_CENTER_VERTICAL));
+    gridsizer->Add(new wxStaticText(p, wxID_ANY, _T("Final label")),
+                   wxSizerFlags().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL));
+    gridsizer->Add(new wxTextCtrl(p, wxID_ANY, _T("And yet more text")),
+                   wxSizerFlags().Align(wxGROW | wxALIGN_CENTER_VERTICAL));
+    topsizer->Add(
+        gridsizer,
+        wxSizerFlags().Proportion(1).Expand().Border(wxALL, 10));
+
+
+#if wxUSE_STATLINE
+  // 3) middle: create wxStaticLine with minimum size (3x3)
+  topsizer->Add(
+     new wxStaticLine( p, wxID_ANY, wxDefaultPosition, wxSize(3,3), wxHORIZONTAL),
+     wxSizerFlags().Expand());
+#endif // wxUSE_STATLINE

 
 

-  MyWindow *canvas = new MyWindow(frame, 0, 0, 400, 400, wxRETAINED);

 
 

-  // Make a text window
-  MyTextWindow *text_window = new MyTextWindow(frame, 0, 250, 400, 150);
+  // 4) bottom: create two centred wxButtons
+  wxBoxSizer *button_box = new wxBoxSizer( wxHORIZONTAL );
+  button_box->Add(
+     new wxButton( p, wxID_ANY, _T("Two buttons in a box") ),
+     wxSizerFlags().Border(wxALL, 7));
+  button_box->Add(
+     new wxButton( p, wxID_ANY, _T("(wxCENTER)") ),
+     wxSizerFlags().Border(wxALL, 7));

 
 

-  // Set constraints for panel subwindow
-  wxLayoutConstraints *c1 = new wxLayoutConstraints;
+  topsizer->Add(button_box, wxSizerFlags().Center());

 
 

-  c1->left.SameAs       (frame, wxLeft);
-  c1->top.SameAs        (frame, wxTop);
-  c1->right.PercentOf   (frame, wxWidth, 50);
-  c1->height.PercentOf  (frame, wxHeight, 50);
+  p->SetSizer( topsizer );

 
 

-  panel->SetConstraints(c1);
+  // don't allow frame to get smaller than what the sizers tell it and also set
+  // the initial size as calculated by the sizers
+  topsizer->SetSizeHints( this );
+}

 
 

-  // Set constraints for canvas subwindow
-  wxLayoutConstraints *c2 = new wxLayoutConstraints;
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+{
+    Close(true);
+}

 
 

-  c2->left.SameAs       (panel, wxRight);
-  c2->top.SameAs        (frame, wxTop);
-  c2->right.SameAs      (frame, wxRight);
-  c2->height.PercentOf  (frame, wxHeight, 50);
+void MyFrame::TestProportions(wxCommandEvent& WXUNUSED(event))
+{
+    (new MyProportionsFrame(this))->Show();
+}

 
 

-  canvas->SetConstraints(c2);
+void MyFrame::TestFlexSizers(wxCommandEvent& WXUNUSED(event) )
+{
+    MyFlexSizerFrame *newFrame = new MyFlexSizerFrame(_T("Flex Sizer Test Frame"), 50, 50);
+    newFrame->Show(true);
+}

 
 

-  // Set constraints for text subwindow
-  wxLayoutConstraints *c3 = new wxLayoutConstraints;
-  c3->left.SameAs       (frame, wxLeft);
-  c3->top.Below         (panel);
-  c3->right.SameAs      (frame, wxRight);
-  c3->bottom.SameAs     (frame, wxBottom);
+void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) )
+{
+    MySizerDialog dialog( this, _T("Notebook Sizer Test Dialog") );

 
 

-  text_window->SetConstraints(c3);
+    dialog.ShowModal();
+}

 
 

-  frame->Show(TRUE);
+void MyFrame::TestSetMinimal(wxCommandEvent& WXUNUSED(event) )
+{
+    MySimpleSizerFrame *newFrame = new MySimpleSizerFrame(_T("Simple Sizer Test Frame"), 50, 50);
+    newFrame->Show(true);
+}

 
 

-  frame->SetStatusText(_T("wxWindows layout demo"));

 
 

-  SetTopWindow(frame);
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
+{
+    (void)wxMessageBox(_T("wxWidgets GUI library layout demo\n"),
+            _T("About Layout Demo"), wxOK|wxICON_INFORMATION);
+}

 
 

-  return TRUE;
+void MyFrame::TestGridBagSizer(wxCommandEvent& WXUNUSED(event) )
+{
+    MyGridBagSizerFrame *newFrame = new
+        MyGridBagSizerFrame(_T("wxGridBagSizer Test Frame"), 50, 50);
+    newFrame->Show(true);

 }
 
 }
 

-//-----------------------------------------------------------------
-//  MyFrame
-//-----------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// MyProportionsFrame
+// ----------------------------------------------------------------------------

 
 

-// Define my frame constructor
-MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h)
-       : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
+MyProportionsFrame::MyProportionsFrame(wxFrame *parent)
+                  : wxFrame(parent, wxID_ANY, _T("Box Sizer Proportions Demo"))

 {
 {

+    size_t n;
+
+    // create the controls
+    wxPanel *panel = new wxPanel(this, wxID_ANY);
+    for ( n = 0; n < WXSIZEOF(m_spins); n++ )
+    {
+        m_spins[n] = new wxSpinCtrl(panel);
+        m_spins[n]->SetValue(n);
+    }
+
+    // lay them out
+    m_sizer = new wxStaticBoxSizer(wxHORIZONTAL, panel,
+                _T("Try changing elements proportions and resizing the window"));
+    for ( n = 0; n < WXSIZEOF(m_spins); n++ )
+        m_sizer->Add(m_spins[n], wxSizerFlags().Border());
+
+    // put everything together
+    panel->SetSizer(m_sizer);
+    wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
+    sizerTop->Add(panel, wxSizerFlags(1).Expand().Border());
+    UpdateProportions();
+    SetSizerAndFit(sizerTop);
+
+    // and connect the events
+    Connect(wxEVT_COMMAND_TEXT_UPDATED,
+                wxCommandEventHandler(MyProportionsFrame::OnProportionUpdated));
+    Connect(wxEVT_COMMAND_SPINCTRL_UPDATED,
+            wxSpinEventHandler(MyProportionsFrame::OnProportionChanged));

 }
 
 }
 

-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-  EVT_MENU(LAYOUT_QUIT, MyFrame::OnQuit)
-  EVT_MENU(LAYOUT_TEST_SIZER, MyFrame::TestSizers)
-  EVT_MENU(LAYOUT_TEST_NB, MyFrame::TestNotebookSizers)
-  EVT_MENU(LAYOUT_ABOUT, MyFrame::About)
-END_EVENT_TABLE()
+void MyProportionsFrame::UpdateProportions()
+{
+    for ( size_t n = 0; n < WXSIZEOF(m_spins); n++ )
+    {
+        m_sizer->GetItem(n)->SetProportion(m_spins[n]->GetValue());
+    }
+
+    m_sizer->Layout();
+}

 
 

-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
+void MyProportionsFrame::OnProportionUpdated(wxCommandEvent& WXUNUSED(event))

 {
 {

-    Close(TRUE);
+    UpdateProportions();

 }
 
 }
 

-void MyFrame::TestSizers(wxCommandEvent& WXUNUSED(event) )
+void MyProportionsFrame::OnProportionChanged(wxSpinEvent& WXUNUSED(event))

 {
 {

-    MySizerFrame *newFrame = new MySizerFrame(NULL, _T("Sizer Test Frame"), 50, 50);
-    newFrame->Show(TRUE);
+    UpdateProportions();

 }
 
 }
 

-void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) )
+// ----------------------------------------------------------------------------
+//  MyFlexSizerFrame
+// ----------------------------------------------------------------------------
+
+void MyFlexSizerFrame::InitFlexSizer(wxFlexGridSizer *sizer, wxWindow* parent)
+{
+    for ( int i = 0; i < 3; i++ )
+    {
+        for ( int j = 0; j < 3; j++ )
+        {
+            sizer->Add(new wxStaticText
+                           (
+                            parent,
+                            wxID_ANY,
+                            wxString::Format(_T("(%d, %d)"), i + 1, j + 1),
+                            wxDefaultPosition,
+                            wxDefaultSize,
+                            wxALIGN_CENTER
+                           ),
+                       0, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 3);
+        }
+    }
+}
+
+MyFlexSizerFrame::MyFlexSizerFrame(const wxChar *title, int x, int y )
+            : wxFrame(NULL, wxID_ANY, title, wxPoint(x, y) )

 {
 {

-    wxDialog dialog( this, -1, wxString(_T("Notebook Sizer Test Dialog"))  );
+    wxFlexGridSizer *sizerFlex;
+    wxPanel* p = new wxPanel(this, wxID_ANY);
+
+    // consttuct the first column
+    wxSizer *sizerCol1 = new wxBoxSizer(wxVERTICAL);
+    sizerCol1->Add(new wxStaticText(p, wxID_ANY, _T("Ungrowable:")), 0, wxCENTER | wxTOP, 20);
+    sizerFlex = new wxFlexGridSizer(3, 3);
+    InitFlexSizer(sizerFlex, p);
+    sizerCol1->Add(sizerFlex, 1, wxALL | wxEXPAND, 10);
+
+    sizerCol1->Add(new wxStaticText(p, wxID_ANY, _T("Growable middle column:")), 0, wxCENTER | wxTOP, 20);
+    sizerFlex = new wxFlexGridSizer(3, 3);
+    InitFlexSizer(sizerFlex, p);
+    sizerFlex->AddGrowableCol(1);
+    sizerCol1->Add(sizerFlex, 1, wxALL | wxEXPAND, 10);
+
+    sizerCol1->Add(new wxStaticText(p, wxID_ANY, _T("Growable middle row:")), 0, wxCENTER | wxTOP, 20);
+    sizerFlex = new wxFlexGridSizer(3, 3);
+    InitFlexSizer(sizerFlex, p);
+    sizerFlex->AddGrowableRow(1);
+    sizerCol1->Add(sizerFlex, 1, wxALL | wxEXPAND, 10);
+
+    sizerCol1->Add(new wxStaticText(p, wxID_ANY, _T("All growable columns:")), 0, wxCENTER | wxTOP, 20);
+    sizerFlex = new wxFlexGridSizer(3, 3);
+    InitFlexSizer(sizerFlex, p);
+    sizerFlex->AddGrowableCol(0, 1);
+    sizerFlex->AddGrowableCol(1, 2);
+    sizerFlex->AddGrowableCol(2, 3);
+    sizerCol1->Add(sizerFlex, 1, wxALL | wxEXPAND, 10);
+
+    // the second one
+    wxSizer *sizerCol2 = new wxBoxSizer(wxVERTICAL);
+    sizerCol2->Add(new wxStaticText(p, wxID_ANY, _T("Growable middle row and column:")), 0, wxCENTER | wxTOP, 20);
+    sizerFlex = new wxFlexGridSizer(3, 3);
+    InitFlexSizer(sizerFlex, p);
+    sizerFlex->AddGrowableCol(1);
+    sizerFlex->AddGrowableRow(1);
+    sizerCol2->Add(sizerFlex, 1, wxALL | wxEXPAND, 10);
+
+    sizerCol2->Add(new wxStaticText(p, wxID_ANY, _T("Same with horz flex direction")), 0, wxCENTER | wxTOP, 20);
+    sizerFlex = new wxFlexGridSizer(3, 3);
+    InitFlexSizer(sizerFlex, p);
+    sizerFlex->AddGrowableCol(1);
+    sizerFlex->AddGrowableRow(1);
+    sizerFlex->SetFlexibleDirection(wxHORIZONTAL);
+    sizerCol2->Add(sizerFlex, 1, wxALL | wxEXPAND, 10);
+
+    sizerCol2->Add(new wxStaticText(p, wxID_ANY, _T("Same with grow mode == \"none\"")), 0, wxCENTER | wxTOP, 20);
+    sizerFlex = new wxFlexGridSizer(3, 3);
+    InitFlexSizer(sizerFlex, p);
+    sizerFlex->AddGrowableCol(1);
+    sizerFlex->AddGrowableRow(1);
+    sizerFlex->SetFlexibleDirection(wxHORIZONTAL);
+    sizerFlex->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_NONE);
+    sizerCol2->Add(sizerFlex, 1, wxALL | wxEXPAND, 10);
+
+    sizerCol2->Add(new wxStaticText(p, wxID_ANY, _T("Same with grow mode == \"all\"")), 0, wxCENTER | wxTOP, 20);
+    sizerFlex = new wxFlexGridSizer(3, 3);
+    InitFlexSizer(sizerFlex, p);
+    sizerFlex->AddGrowableCol(1);
+    sizerFlex->AddGrowableRow(1);
+    sizerFlex->SetFlexibleDirection(wxHORIZONTAL);
+    sizerFlex->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_ALL);
+    sizerCol2->Add(sizerFlex, 1, wxALL | wxEXPAND, 10);
+
+    // add both columns to grid sizer
+    wxGridSizer *sizerTop = new wxGridSizer(2, 0, 20);
+    sizerTop->Add(sizerCol1, 1, wxEXPAND);
+    sizerTop->Add(sizerCol2, 1, wxEXPAND);
+
+    p->SetSizer(sizerTop);
+    sizerTop->SetSizeHints(this);
+}
+
+// ----------------------------------------------------------------------------
+// MySizerDialog
+// ----------------------------------------------------------------------------

 
 

+MySizerDialog::MySizerDialog(wxWindow *parent, const wxChar *title)
+             : wxDialog(parent, wxID_ANY, wxString(title))
+{

     // Begin with first hierarchy: a notebook at the top and
     // and OK button at the bottom.
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     // Begin with first hierarchy: a notebook at the top and
     // and OK button at the bottom.
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 

-    wxNotebook *notebook = new wxNotebook( &dialog, -1 );
-    wxNotebookSizer *nbs = new wxNotebookSizer( notebook );
-    topsizer->Add( nbs, 1, wxGROW );
+    wxNotebook *notebook = new wxNotebook( this, wxID_ANY );
+    topsizer->Add( notebook, 1, wxGROW );

 
 

-    wxButton *button = new wxButton( &dialog, wxID_OK, _T("OK") );
+    wxButton *button = new wxButton( this, wxID_OK, _T("OK") );

     topsizer->Add( button, 0, wxALIGN_RIGHT | wxALL, 10 );
 
     // First page: one big text ctrl
     topsizer->Add( button, 0, wxALIGN_RIGHT | wxALL, 10 );
 
     // First page: one big text ctrl

-    wxTextCtrl *multi = new wxTextCtrl( notebook, -1, _T("TextCtrl."), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
+    wxTextCtrl *multi = new wxTextCtrl( notebook, wxID_ANY, _T("TextCtrl."), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );

     notebook->AddPage( multi, _T("Page One") );
 
     // Second page: a text ctrl and a button
     notebook->AddPage( multi, _T("Page One") );
 
     // Second page: a text ctrl and a button

-    wxPanel *panel = new wxPanel( notebook, -1 );
+    wxPanel *panel = new wxPanel( notebook, wxID_ANY );

     notebook->AddPage( panel, _T("Page Two") );
 
     wxSizer *panelsizer = new wxBoxSizer( wxVERTICAL );
 
     notebook->AddPage( panel, _T("Page Two") );
 
     wxSizer *panelsizer = new wxBoxSizer( wxVERTICAL );
 

-    wxTextCtrl *text = new wxTextCtrl( panel, -1, _T("TextLine 1."), wxDefaultPosition, wxSize(250,-1) );
+    wxTextCtrl *text = new wxTextCtrl( panel, wxID_ANY, _T("TextLine 1."), wxDefaultPosition, wxSize(250,wxDefaultCoord) );

     panelsizer->Add( text, 0, wxGROW|wxALL, 30 );
     panelsizer->Add( text, 0, wxGROW|wxALL, 30 );

-    text = new wxTextCtrl( panel, -1, _T("TextLine 2."), wxDefaultPosition, wxSize(250,-1) );
+    text = new wxTextCtrl( panel, wxID_ANY, _T("TextLine 2."), wxDefaultPosition, wxSize(250,wxDefaultCoord) );

     panelsizer->Add( text, 0, wxGROW|wxALL, 30 );
     panelsizer->Add( text, 0, wxGROW|wxALL, 30 );

-    wxButton *button2 = new wxButton( panel, -1, _T("Hallo") );
+    wxButton *button2 = new wxButton( panel, wxID_ANY, _T("Hallo") );

     panelsizer->Add( button2, 0, wxALIGN_RIGHT | wxLEFT|wxRIGHT|wxBOTTOM, 30 );
 
     panelsizer->Add( button2, 0, wxALIGN_RIGHT | wxLEFT|wxRIGHT|wxBOTTOM, 30 );
 

-    panel->SetAutoLayout( TRUE );
+    panel->SetAutoLayout( true );

     panel->SetSizer( panelsizer );
 
     // Tell dialog to use sizer
     panel->SetSizer( panelsizer );
 
     // Tell dialog to use sizer

+    SetSizer( topsizer );
+    topsizer->SetSizeHints( this );
+}

 
 

-    dialog.SetAutoLayout( TRUE );
-    dialog.SetSizer( topsizer );
-    topsizer->Fit( &dialog );
-    topsizer->SetSizeHints( &dialog );
+// ----------------------------------------------------------------------------
+// MyGridBagSizerFrame
+// ----------------------------------------------------------------------------

 
 

-    dialog.ShowModal();
-}
+// some simple macros to help make the sample code below more clear
+#define TEXTCTRL(text)   new wxTextCtrl(p, wxID_ANY, _T(text))
+#define MLTEXTCTRL(text) new wxTextCtrl(p, wxID_ANY, _T(text), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE)
+#define POS(r, c)        wxGBPosition(r,c)
+#define SPAN(r, c)       wxGBSpan(r,c)

 
 

+const wxChar gbsDescription[] =_T("\
+The wxGridBagSizer is similar to the wxFlexGridSizer except the items are explicitly positioned\n\
+in a virtual cell of the layout grid, and column or row spanning is allowed.  For example, this\n\
+static text is positioned at (0,0) and it spans 7 columns.");

 
 

-void MyFrame::About(wxCommandEvent& WXUNUSED(event) )
-{
-    (void)wxMessageBox(_T("wxWindows GUI library layout demo\n"),
-            _T("About Layout Demo"), wxOK|wxCENTRE);
-}

 
 

-//-----------------------------------------------------------------
-//  MyWindow
-//-----------------------------------------------------------------
+// Some IDs
+enum {
+    GBS_HIDE_BTN = 1212,
+    GBS_SHOW_BTN,
+    GBS_MOVE_BTN1,
+    GBS_MOVE_BTN2,

 
 

-BEGIN_EVENT_TABLE(MyWindow, wxWindow)
-    EVT_PAINT(MyWindow::OnPaint)
+    GBS_MAX
+};
+
+
+BEGIN_EVENT_TABLE(MyGridBagSizerFrame, wxFrame)
+    EVT_BUTTON( GBS_HIDE_BTN,  MyGridBagSizerFrame::OnHideBtn)
+    EVT_BUTTON( GBS_SHOW_BTN,  MyGridBagSizerFrame::OnShowBtn)
+    EVT_BUTTON( GBS_MOVE_BTN1, MyGridBagSizerFrame::OnMoveBtn)
+    EVT_BUTTON( GBS_MOVE_BTN2, MyGridBagSizerFrame::OnMoveBtn)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-// Define a constructor for my canvas
-MyWindow::MyWindow(wxFrame *frame, int x, int y, int w, int h, long style)
-        : wxWindow(frame, -1, wxPoint(x, y), wxSize(w, h), style)
-{
-}

 
 

-MyWindow::~MyWindow()
+MyGridBagSizerFrame::MyGridBagSizerFrame(const wxChar *title, int x, int y )
+    : wxFrame( NULL, wxID_ANY, title, wxPoint(x, y) )

 {
 {

-}
+    wxPanel* p = new wxPanel(this, wxID_ANY);
+    m_panel = p;
+    m_gbs = new wxGridBagSizer();

 
 

-// Define the repainting behaviour
-void MyWindow::OnPaint(wxPaintEvent& WXUNUSED(event) )
-{
-  wxPaintDC dc(this);
-  dc.SetPen(* wxGREEN_PEN);
-  dc.DrawLine(0, 0, 200, 200);
-  dc.DrawLine(200, 0, 0, 200);

 
 

-  dc.SetBrush(* wxCYAN_BRUSH);
-  dc.SetPen(* wxRED_PEN);
+    m_gbs->Add( new wxStaticText(p, wxID_ANY, gbsDescription),
+                POS(0,0), SPAN(1, 7),
+                wxALIGN_CENTER | wxALL, 5);
+
+    m_gbs->Add( TEXTCTRL("pos(1,0)"),   POS(1,0) );
+    m_gbs->Add( TEXTCTRL("pos(1,1)"),   POS(1,1) );
+    m_gbs->Add( TEXTCTRL("pos(2,0)"),   POS(2,0) );
+    m_gbs->Add( TEXTCTRL("pos(2,1)"),   POS(2,1) );
+    m_gbs->Add( MLTEXTCTRL("pos(3,2), span(1,2)\nthis row and col are growable"),
+              POS(3,2), SPAN(1,2), wxEXPAND );
+    m_gbs->Add( MLTEXTCTRL("pos(4,3)\nspan(3,1)"),
+              POS(4,3), SPAN(3,1), wxEXPAND );
+    m_gbs->Add( TEXTCTRL("pos(5,4)"),   POS(5,4), wxDefaultSpan, wxEXPAND );
+    m_gbs->Add( TEXTCTRL("pos(6,5)"),   POS(6,5), wxDefaultSpan, wxEXPAND );
+    m_gbs->Add( TEXTCTRL("pos(7,6)"),   POS(7,6) );
+
+    //m_gbs->Add( TEXTCTRL("bad position"), POS(4,3) );  // Test for assert
+    //m_gbs->Add( TEXTCTRL("bad position"), POS(5,3) );  // Test for assert
+
+
+    m_moveBtn1 = new wxButton(p, GBS_MOVE_BTN1, _T("Move this to (3,6)"));
+    m_moveBtn2 = new wxButton(p, GBS_MOVE_BTN2, _T("Move this to (3,6)"));
+    m_gbs->Add( m_moveBtn1, POS(10,2) );
+    m_gbs->Add( m_moveBtn2, POS(10,3) );
+
+    m_hideBtn = new wxButton(p, GBS_HIDE_BTN, _T("Hide this item -->"));
+    m_gbs->Add(m_hideBtn, POS(12, 3));
+
+    m_hideTxt = new wxTextCtrl(p, wxID_ANY, _T("pos(12,4), size(150, wxDefaultCoord)"),
+                                wxDefaultPosition, wxSize(150,wxDefaultCoord));
+    m_gbs->Add( m_hideTxt, POS(12,4) );

 
 

-  dc.DrawRectangle(100, 100, 100, 50);
-  dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
+    m_showBtn = new wxButton(p, GBS_SHOW_BTN, _T("<-- Show it again"));
+    m_gbs->Add(m_showBtn, POS(12, 5));
+    m_showBtn->Disable();

 
 

-  dc.DrawEllipse(250, 250, 100, 50);
-#if wxUSE_SPLINES
-  dc.DrawSpline(50, 200, 50, 100, 200, 10);
-#endif // wxUSE_SPLINES
-  dc.DrawLine(50, 230, 200, 230);
+    m_gbs->Add(10,10, POS(14,0));

 
 

-  dc.SetPen(* wxBLACK_PEN);
-  dc.DrawArc(50, 300, 100, 250, 100, 300 );
+    m_gbs->AddGrowableRow(3);
+    m_gbs->AddGrowableCol(2);
+
+    p->SetSizerAndFit(m_gbs);
+    SetClientSize(p->GetSize());

 }
 
 }
 

-//-----------------------------------------------------------------
-//  MySizerFrame
-//-----------------------------------------------------------------

 
 

-MySizerFrame::MySizerFrame(wxFrame *frame, wxChar *title, int x, int y )
-            : wxFrame(frame, -1, title, wxPoint(x, y) )
+void MyGridBagSizerFrame::OnHideBtn(wxCommandEvent&)

 {
 {

-  // we want to get a dialog that is stretchable because it
-  // has a text ctrl in the middle. at the bottom, we have
-  // two buttons which.
+    m_gbs->Hide(m_hideTxt);
+    m_hideBtn->Disable();
+    m_showBtn->Enable();
+    m_gbs->Layout();
+}

 
 

-  wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+void MyGridBagSizerFrame::OnShowBtn(wxCommandEvent&)
+{
+    m_gbs->Show(m_hideTxt);
+    m_hideBtn->Enable();
+    m_showBtn->Disable();
+    m_gbs->Layout();
+}

 
 

-  // 1) top: create wxStaticText with minimum size equal to its default size
-  topsizer->Add(
-    new wxStaticText( this, -1, _T("An explanation (wxALIGN_RIGHT).") ),
-    0,                         // make vertically unstretchable
-    wxALIGN_RIGHT |            // right align text
-    wxTOP | wxLEFT | wxRIGHT,  // make border all around except wxBOTTOM
-    5 );                      // set border width to 5

 
 

-  // 2) top: create wxTextCtrl with minimum size (100x60)
-  topsizer->Add(
-    new wxTextCtrl( this, -1, _T("My text (wxEXPAND)."), wxDefaultPosition, wxSize(100,60), wxTE_MULTILINE),
-    1,            // make vertically stretchable
-    wxEXPAND |    // make horizontally stretchable
-    wxALL,        //   and make border all around
-    5 );         // set border width to 5
+void MyGridBagSizerFrame::OnMoveBtn(wxCommandEvent& event)
+{
+    wxButton* btn = (wxButton*)event.GetEventObject();
+    wxGBPosition curPos = m_gbs->GetItemPosition(btn);
+
+    // if it's already at the "other" spot then move it back
+    if (curPos == wxGBPosition(3,6))
+    {
+        m_gbs->SetItemPosition(btn, m_lastPos);
+        btn->SetLabel(_T("Move this to (3,6)"));
+    }
+    else
+    {
+        if ( m_gbs->CheckForIntersection(wxGBPosition(3,6), wxGBSpan(1,1)) )
+            wxMessageBox(
+_T("wxGridBagSizer will not allow items to be in the same cell as\n\
+another item, so this operation will fail.  You will also get an assert\n\
+when compiled in debug mode."), _T("Warning"), wxOK | wxICON_INFORMATION);
+
+        if ( m_gbs->SetItemPosition(btn, wxGBPosition(3,6)) )
+        {
+            m_lastPos = curPos;
+            btn->SetLabel(_T("Move it back"));
+        }
+    }
+    m_gbs->Layout();
+}

 
 

-  // 2.5) Gratuitous test of wxStaticBoxSizers
-  wxBoxSizer *statsizer = new wxStaticBoxSizer(
-    new wxStaticBox(this, -1, _T("A wxStaticBoxSizer")),
-    wxVERTICAL );
-  statsizer->Add(
-    new wxStaticText(this, -1, _T("And some TEXT inside it")),
-    0,
-    wxCENTER |
-    wxALL,
-    30);
-  topsizer->Add(statsizer, 1, wxEXPAND | wxALL, 10);
+// ----------------------------------------------------------------------------
+// MySimpleSizerFrame
+// ----------------------------------------------------------------------------

 
 

-    // 2.7) And a test of wxGridSizer
-    wxGridSizer *gridsizer = new wxGridSizer(2, 5, 5);
-    gridsizer->Add(new wxStaticText(this, -1, _T("Label")), 0,
-                  wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
-    gridsizer->Add(new wxTextCtrl(this, -1, _T("Grid sizer demo")), 1,
-                   wxGROW | wxALIGN_CENTER_VERTICAL);
-    gridsizer->Add(new wxStaticText(this, -1, _T("Another label")), 0,
-                   wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
-    gridsizer->Add(new wxTextCtrl(this, -1, _T("More text")), 1,
-                   wxGROW | wxALIGN_CENTER_VERTICAL);
-    gridsizer->Add(new wxStaticText(this, -1, _T("Final label")), 0,
-                   wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
-    gridsizer->Add(new wxTextCtrl(this, -1, _T("And yet more text")), 1,
-                   wxGROW | wxALIGN_CENTER_VERTICAL);
-    topsizer->Add(gridsizer, 1, wxGROW | wxALL, 10);
+// Some IDs
+enum {
+    ID_SET_SMALL = 1300,
+    ID_SET_BIG
+};

 
 

+BEGIN_EVENT_TABLE(MySimpleSizerFrame, wxFrame)
+    EVT_MENU( ID_SET_SMALL, MySimpleSizerFrame::OnSetSmallSize)
+    EVT_MENU( ID_SET_BIG, MySimpleSizerFrame::OnSetBigSize)
+END_EVENT_TABLE()

 
 

-  // 3) middle: create wxStaticLine with minimum size (3x3)
-  topsizer->Add(
-     new wxStaticLine( this, -1, wxDefaultPosition, wxSize(3,3), wxHORIZONTAL),
-     0,           // make vertically unstretchable
-     wxEXPAND |   // make horizontally stretchable
-     wxALL,       //   and make border all around
-     5 );         // set border width to 5
+MySimpleSizerFrame::MySimpleSizerFrame(const wxChar *title, int x, int y )
+    : wxFrame( NULL, wxID_ANY, title, wxPoint(x, y) )
+{
+    wxMenu *menu = new wxMenu;

 
 

+    menu->Append(ID_SET_SMALL, _T("Make text control small\tF4"));
+    menu->Append(ID_SET_BIG, _T("Make text control big\tF5"));

 
 

-  // 4) bottom: create two centred wxButtons
-  wxBoxSizer *button_box = new wxBoxSizer( wxHORIZONTAL );
-  button_box->Add(
-     new wxButton( this, -1, _T("Two buttons in a box") ),
-     0,           // make horizontally unstretchable
-     wxALL,       // make border all around
-     7 );         // set border width to 7
-  button_box->Add(
-     new wxButton( this, -1, _T("(wxCENTER)") ),
-     0,           // make horizontally unstretchable
-     wxALL,       // make border all around
-     7 );         // set border width to 7
+    wxMenuBar *menu_bar = new wxMenuBar;
+    menu_bar->Append(menu, _T("&File"));

 
 

-  topsizer->Add(
-     button_box,
-     0,          // make vertically unstretchable
-     wxCENTER ); // no border and centre horizontally
+    SetMenuBar( menu_bar );

 
 

-  // don't allow frame to get smaller than what the sizers tell it and also set
-  // the initial size as calculated by the sizers
-  topsizer->SetSizeHints( this );
+    wxBoxSizer *main_sizer = new wxBoxSizer( wxHORIZONTAL );
+
+    m_target = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80, wxDefaultCoord ) );
+    main_sizer->Add( m_target, 1, wxALL, 5 );

 
 

-  SetSizer( topsizer );
+    main_sizer->Add( new wxStaticText( this, wxID_ANY, wxT("Set alternating sizes using F4 and F5") ), 0, wxALL, 5 );
+
+    SetSizer( main_sizer);
+
+    Layout();
+    GetSizer()->Fit( this );

 }
 
 }
 

+void MySimpleSizerFrame::OnSetSmallSize( wxCommandEvent& WXUNUSED(event))
+{
+    GetSizer()->SetItemMinSize( m_target, 40, -1 );
+    Layout();
+    GetSizer()->Fit( this );
+}
+
+void MySimpleSizerFrame::OnSetBigSize( wxCommandEvent& WXUNUSED(event))
+{
+    GetSizer()->SetItemMinSize( m_target, 140, -1 );
+    Layout();
+    GetSizer()->Fit( this );
+}