fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index c5318f1abd544b021dadd6b13b8fb9844cd85213..c7d56a3360fd01859841b16c0e91648f5be349db 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
-// Licence:    wxWindows license
+// Copyright:   (c) 1998 Julian Smart
+//                  2005 Vadim Zeitlin
+// 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,348 +25,711 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#if !USE_CONSTRAINTS
-#error You must set USE_CONSTRAINTS to 1 in wx_setup.h!
-#endif
+#include "wx/sizer.h"
+#include "wx/gbsizer.h"
+#include "wx/statline.h"
+#include "wx/notebook.h"
+#include "wx/spinctrl.h"
+#include "wx/wrapsizer.h"

 
 

-#include <ctype.h>

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

-// Declare two frames
-MyFrame   *frame = NULL;
-wxMenuBar *menu_bar = NULL;
+#ifndef __WXMSW__
+    #include "../sample.xpm"
+#endif

 
 

-IMPLEMENT_APP(MyApp)

 
 

-#ifdef __X__
-#include "aiai.xbm"
-#endif
+// ----------------------------------------------------------------------------
+// MyApp
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_APP(MyApp)

 
 

-MyApp::MyApp()
+bool MyApp::OnInit()

 {
 {

+  if ( !wxApp::OnInit() )
+      return false;
+
+  // Create the main frame window
+  MyFrame *frame = new MyFrame;
+
+  frame->Show(true);
+
+  return true;

 }
 
 }
 

-bool MyApp::OnInit(void)
+// ----------------------------------------------------------------------------
+// MyFrame
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+  EVT_MENU(LAYOUT_ABOUT, MyFrame::OnAbout)
+  EVT_MENU(LAYOUT_QUIT, MyFrame::OnQuit)
+
+  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)
+  EVT_MENU(LAYOUT_TEST_NESTED, MyFrame::TestNested)
+  EVT_MENU(LAYOUT_TEST_WRAP, MyFrame::TestWrap)
+END_EVENT_TABLE()
+
+// Define my frame constructor
+MyFrame::MyFrame()
+       : wxFrame(NULL, wxID_ANY, _T("wxWidgets Layout Demo"),
+                 wxPoint(30,30), wxDefaultSize,
+                 wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)

 {
 {

-  // Create the main frame window
-  frame = new MyFrame(NULL, "wxWindows Layout Demo", 0, 0, 550, 500);
+    SetIcon(wxICON(sample));
+
+    // Make a menubar
+    wxMenu *file_menu = new wxMenu;
+
+    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->Append(LAYOUT_TEST_NESTED, _T("Test nested sizer in a wxPanel...\tF6"));
+    file_menu->Append(LAYOUT_TEST_WRAP, _T("Test wrap sizers...\tF7"));
+
+    file_menu->AppendSeparator();
+    file_menu->Append(LAYOUT_QUIT, _T("E&xit"), _T("Quit program"));
+
+    wxMenu *help_menu = new wxMenu;
+    help_menu->Append(LAYOUT_ABOUT, _T("&About"), _T("About layout demo..."));
+
+    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
+    SetMenuBar(menu_bar);
+
+#if wxUSE_STATUSBAR
+    CreateStatusBar(2);
+    SetStatusText(_T("wxWidgets layout demo"));
+#endif // wxUSE_STATUSBAR
+
+    wxPanel* p = new wxPanel(this, wxID_ANY);
+
+    // 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 );
+
+    // 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));
+    topsizer->Add(
+        new wxStaticText( p, wxID_ANY, _T("An explanation (wxALIGN_LEFT).") ),
+        wxSizerFlags().Align(wxALIGN_LEFT).Border(wxALL & ~wxBOTTOM, 5));
+    topsizer->Add(
+        new wxStaticText( p, wxID_ANY, _T("An explanation (wxALIGN_CENTRE_HORIZONTAL).") ),
+        wxSizerFlags().Align(wxALIGN_CENTRE_HORIZONTAL).Border(wxALL & ~wxBOTTOM, 5));
+
+    // 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));
+
+    // 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().Border(wxALL, 30));
+    topsizer->Add(
+        statsizer,
+        wxSizerFlags(1).Expand().Border(wxALL, 10));
+
+    // 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
+
+
+    // 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));
+
+    topsizer->Add(button_box, wxSizerFlags().Center());
+
+    p->SetSizer( topsizer );
+
+    // 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 );
+}

 
 

-  frame->SetAutoLayout(TRUE);
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+{
+    Close(true);
+}

 
 

-  // Give it a status line
-  frame->CreateStatusBar(2);
+void MyFrame::TestProportions(wxCommandEvent& WXUNUSED(event))
+{
+    (new MyProportionsFrame(this))->Show();
+}

 
 

-  // Load icon and bitmap
-#ifdef __WXMSW__
-  frame->SetIcon(wxIcon("aiai_icn"));
-#endif
-#ifdef __X__
-  frame->SetIcon(wxIcon(aiai_bits, aiai_width, aiai_height));
-#endif
+void MyFrame::TestFlexSizers(wxCommandEvent& WXUNUSED(event) )
+{
+    MyFlexSizerFrame *newFrame = new MyFlexSizerFrame(_T("Flex Sizer Test Frame"), 50, 50);
+    newFrame->Show(true);
+}

 
 

-  // Make a menubar
-  wxMenu *file_menu = new wxMenu;
+void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) )
+{
+    MySizerDialog dialog( this, _T("Notebook Sizer Test Dialog") );

 
 

-  file_menu->Append(LAYOUT_LOAD_FILE, "&Load file",      "Load a text file");
-  file_menu->Append(LAYOUT_TEST, "&Test sizers",      "Test sizer code");
+    dialog.ShowModal();
+}

 
 

-  file_menu->AppendSeparator();
-  file_menu->Append(LAYOUT_QUIT, "E&xit",                "Quit program");
+void MyFrame::TestSetMinimal(wxCommandEvent& WXUNUSED(event) )
+{
+    MySimpleSizerFrame *newFrame = new MySimpleSizerFrame(_T("Simple Sizer Test Frame"), 50, 50);
+    newFrame->Show(true);
+}

 
 

-  wxMenu *help_menu = new wxMenu;
-  help_menu->Append(LAYOUT_ABOUT, "&About",              "About layout demo");
+void MyFrame::TestNested(wxCommandEvent& WXUNUSED(event) )
+{
+    MyNestedSizerFrame *newFrame = new MyNestedSizerFrame(_T("Nested Sizer Test Frame"), 50, 50);
+    newFrame->Show(true);
+}

 
 

-  menu_bar = new wxMenuBar;
+void MyFrame::TestWrap(wxCommandEvent& WXUNUSED(event) )
+{
+    MyWrapSizerFrame *newFrame = new MyWrapSizerFrame(_T("Wrap Sizer Test Frame"), 50, 50);
+    newFrame->Show(true);
+}

 
 

-  menu_bar->Append(file_menu, "&File");
-  menu_bar->Append(help_menu, "&Help");

 
 

-  // Associate the menu bar with the frame
-  frame->SetMenuBar(menu_bar);
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
+{
+    (void)wxMessageBox(_T("wxWidgets GUI library layout demo\n"),
+            _T("About Layout Demo"), wxOK|wxICON_INFORMATION);
+}

 
 

-  // Make a panel
-  frame->panel = new wxPanel(frame, 0, 0, 1000, 500, wxTAB_TRAVERSAL);
-  frame->panel->SetBackgroundColour(wxColour(192, 192, 192));
-//  frame->panel->SetAutoLayout(TRUE);
+void MyFrame::TestGridBagSizer(wxCommandEvent& WXUNUSED(event) )
+{
+    MyGridBagSizerFrame *newFrame = new
+        MyGridBagSizerFrame(_T("wxGridBagSizer Test Frame"), 50, 50);
+    newFrame->Show(true);
+}

 
 

-  // Create some panel items
-  wxButton *btn1 = new wxButton(frame->panel, -1, "A button (1)") ;
+// ----------------------------------------------------------------------------
+// MyProportionsFrame
+// ----------------------------------------------------------------------------

 
 

-  wxLayoutConstraints *b1 = new wxLayoutConstraints;
-  b1->centreX.SameAs    (frame->panel, wxCentreX);
-  b1->top.SameAs        (frame->panel, wxTop, 5);
-  b1->width.PercentOf   (frame->panel, wxWidth, 80);
-  b1->height.PercentOf  (frame->panel, wxHeight, 10);
-  btn1->SetConstraints(b1);
+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));
+}

 
 

-  wxListBox *list = new wxListBox(frame->panel, -1,
-                                  wxPoint(-1, -1), wxSize(200, 100));
-  list->Append("Apple");
-  list->Append("Pear");
-  list->Append("Orange");
-  list->Append("Banana");
-  list->Append("Fruit");
+void MyProportionsFrame::UpdateProportions()
+{
+    for ( size_t n = 0; n < WXSIZEOF(m_spins); n++ )
+    {
+        m_sizer->GetItem(n)->SetProportion(m_spins[n]->GetValue());
+    }

 
 

-  wxLayoutConstraints *b2 = new wxLayoutConstraints;
-  b2->top.Below         (btn1, 5);
-  b2->left.SameAs       (frame->panel, wxLeft, 5);
-  b2->width.PercentOf   (frame->panel, wxWidth, 40);
-  b2->bottom.SameAs     (frame->panel, wxBottom, 5);
-  list->SetConstraints(b2);
+    m_sizer->Layout();
+}

 
 

-  wxTextCtrl *mtext = new wxTextCtrl(frame->panel, -1, "Some text",
-                        wxPoint(-1, -1), wxSize(150, 100));
+void MyProportionsFrame::OnProportionUpdated(wxCommandEvent& WXUNUSED(event))
+{
+    UpdateProportions();
+}

 
 

-  wxLayoutConstraints *b3 = new wxLayoutConstraints;
-  b3->top.Below         (btn1, 5);
-  b3->left.RightOf      (list, 5);
-  b3->right.SameAs      (frame->panel, wxRight, 5);
-  b3->bottom.SameAs     (frame->panel, wxBottom, 5);
-  mtext->SetConstraints(b3);
+void MyProportionsFrame::OnProportionChanged(wxSpinEvent& WXUNUSED(event))
+{
+    UpdateProportions();
+}

 
 

-  frame->canvas = new MyWindow(frame, 0, 0, 400, 400, wxRETAINED);
+// ----------------------------------------------------------------------------
+//  MyFlexSizerFrame
+// ----------------------------------------------------------------------------

 
 

-  // Give it scrollbars: the virtual canvas is 20 * 50 = 1000 pixels in each direction
-//  canvas->SetScrollbars(20, 20, 50, 50, 4, 4);
+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);
+        }
+    }
+}

 
 

-  // Make a text window
-  frame->text_window = new MyTextWindow(frame, 0, 250, 400, 250);
+MyFlexSizerFrame::MyFlexSizerFrame(const wxString &title, int x, int y )
+            : wxFrame(NULL, wxID_ANY, title, wxPoint(x, y) )
+{
+    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);
+}

 
 

-  // Set constraints for panel subwindow
-  wxLayoutConstraints *c1 = new wxLayoutConstraints;
+// ----------------------------------------------------------------------------
+// MySizerDialog
+// ----------------------------------------------------------------------------

 
 

-  c1->left.SameAs       (frame, wxLeft);
-  c1->top.SameAs        (frame, wxTop);
-  c1->right.PercentOf   (frame, wxWidth, 50);
-  c1->height.PercentOf  (frame, wxHeight, 50);
+MySizerDialog::MySizerDialog(wxWindow *parent, const wxString &title)
+             : wxDialog(parent, wxID_ANY, wxString(title))
+{
+    // Begin with first hierarchy: a notebook at the top and
+    // and OK button at the bottom.

 
 

-  frame->panel->SetConstraints(c1);
+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );

 
 

-  // Set constraints for canvas subwindow
-  wxLayoutConstraints *c2 = new wxLayoutConstraints;
+    wxNotebook *notebook = new wxNotebook( this, wxID_ANY );
+    topsizer->Add( notebook, 1, wxGROW );

 
 

-  c2->left.SameAs       (frame->panel, wxRight);
-  c2->top.SameAs        (frame, wxTop);
-  c2->right.SameAs      (frame, wxRight);
-  c2->height.PercentOf  (frame, wxHeight, 50);
+    wxButton *button = new wxButton( this, wxID_OK, _T("OK") );
+    topsizer->Add( button, 0, wxALIGN_RIGHT | wxALL, 10 );

 
 

-  frame->canvas->SetConstraints(c2);
+    // First page: one big text ctrl
+    wxTextCtrl *multi = new wxTextCtrl( notebook, wxID_ANY, _T("TextCtrl."), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
+    notebook->AddPage( multi, _T("Page One") );

 
 

-  // Set constraints for text subwindow
-  wxLayoutConstraints *c3 = new wxLayoutConstraints;
-  c3->left.SameAs       (frame, wxLeft);
-  c3->top.Below         (frame->panel);
-  c3->right.SameAs      (frame, wxRight);
-  c3->bottom.SameAs     (frame, wxBottom);
+    // Second page: a text ctrl and a button
+    wxPanel *panel = new wxPanel( notebook, wxID_ANY );
+    notebook->AddPage( panel, _T("Page Two") );

 
 

-  frame->text_window->SetConstraints(c3);
+    wxSizer *panelsizer = new wxBoxSizer( wxVERTICAL );

 
 

-  frame->Show(TRUE);
+    wxTextCtrl *text = new wxTextCtrl( panel, wxID_ANY, _T("TextLine 1."), wxDefaultPosition, wxSize(250,wxDefaultCoord) );
+    panelsizer->Add( text, 0, wxGROW|wxALL, 30 );
+    text = new wxTextCtrl( panel, wxID_ANY, _T("TextLine 2."), wxDefaultPosition, wxSize(250,wxDefaultCoord) );
+    panelsizer->Add( text, 0, wxGROW|wxALL, 30 );
+    wxButton *button2 = new wxButton( panel, wxID_ANY, _T("Hallo") );
+    panelsizer->Add( button2, 0, wxALIGN_RIGHT | wxLEFT|wxRIGHT|wxBOTTOM, 30 );

 
 

-  frame->SetStatusText("wxWindows layout demo");
+    panel->SetSizer( panelsizer );

 
 

-  SetTopWindow(frame);
-  return TRUE;
+    // Tell dialog to use sizer
+    SetSizerAndFit( topsizer );

 }
 
 }
 

-// Define my frame constructor
-MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
-  wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
-{
-  panel = NULL;
-  text_window = NULL;
-  canvas = NULL;
-}
+// ----------------------------------------------------------------------------
+// MyGridBagSizerFrame
+// ----------------------------------------------------------------------------

 
 

-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-  EVT_MENU(LAYOUT_LOAD_FILE, MyFrame::LoadFile)
-  EVT_MENU(LAYOUT_QUIT, MyFrame::Quit)
-  EVT_MENU(LAYOUT_TEST, MyFrame::TestSizers)
-  EVT_MENU(LAYOUT_ABOUT, MyFrame::About)
-  EVT_SIZE(MyFrame::OnSize)
+// 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.");
+
+
+// Some IDs
+enum {
+    GBS_HIDE_BTN = 1212,
+    GBS_SHOW_BTN,
+    GBS_MOVE_BTN1,
+    GBS_MOVE_BTN2,
+
+    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()
 

-void MyFrame::LoadFile(wxCommandEvent& event)
-{
-      char *s = wxFileSelector("Load text file", NULL, NULL, NULL, "*.txt");
-      if (s)
-      {
-#ifdef __WXMSW__
-        frame->text_window->LoadFile(s);
-#endif
-      }
-}

 
 

-void MyFrame::Quit(wxCommandEvent& event)
+MyGridBagSizerFrame::MyGridBagSizerFrame(const wxString &title, int x, int y )
+    : wxFrame( NULL, wxID_ANY, title, wxPoint(x, y) )

 {
 {

-      this->Close(TRUE);
+    wxPanel* p = new wxPanel(this, wxID_ANY);
+    m_panel = p;
+    m_gbs = new wxGridBagSizer();
+
+
+    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) );
+
+    m_showBtn = new wxButton(p, GBS_SHOW_BTN, _T("<-- Show it again"));
+    m_gbs->Add(m_showBtn, POS(12, 5));
+    m_showBtn->Disable();
+
+    m_gbs->Add(10,10, POS(14,0));
+
+    m_gbs->AddGrowableRow(3);
+    m_gbs->AddGrowableCol(2);
+
+    p->SetSizerAndFit(m_gbs);
+    SetClientSize(p->GetSize());

 }
 
 }
 

-void MyFrame::TestSizers(wxCommandEvent& event)
+
+void MyGridBagSizerFrame::OnHideBtn(wxCommandEvent&)

 {
 {

-  SizerFrame *newFrame = new SizerFrame(NULL, "Sizer Test Frame", 50, 50, 500, 500);
-  newFrame->Show(TRUE);
+    m_gbs->Hide(m_hideTxt);
+    m_hideBtn->Disable();
+    m_showBtn->Enable();
+    m_gbs->Layout();

 }
 
 }
 

-void MyFrame::About(wxCommandEvent& event)
+void MyGridBagSizerFrame::OnShowBtn(wxCommandEvent&)

 {
 {

-      (void)wxMessageBox("wxWindows GUI library layout demo\n",
-            "About Layout Demo", wxOK|wxCENTRE);
+    m_gbs->Show(m_hideTxt);
+    m_hideBtn->Enable();
+    m_showBtn->Disable();
+    m_gbs->Layout();

 }
 
 }
 

-// Size the subwindows when the frame is resized
-void MyFrame::OnSize(wxSizeEvent& event)
+
+void MyGridBagSizerFrame::OnMoveBtn(wxCommandEvent& event)

 {
 {

-    Layout();
+    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();

 }
 
 }
 

-void MyFrame::Draw(wxDC& dc, bool draw_bitmaps)
+// ----------------------------------------------------------------------------
+// MySimpleSizerFrame
+// ----------------------------------------------------------------------------
+
+// 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()
+
+MySimpleSizerFrame::MySimpleSizerFrame(const wxString &title, int x, int y )
+    : wxFrame( NULL, wxID_ANY, title, wxPoint(x, y) )

 {
 {

-  dc.SetPen(wxGREEN_PEN);
-  dc.DrawLine(0.0, 0.0, 200.0, 200.0);
-  dc.DrawLine(200.0, 0.0, 0.0, 200.0);
+    wxMenu *menu = new wxMenu;

 
 

-  dc.SetBrush(wxCYAN_BRUSH);
-  dc.SetPen(wxRED_PEN);
+    menu->Append(ID_SET_SMALL, _T("Make text control small\tF4"));
+    menu->Append(ID_SET_BIG, _T("Make text control big\tF5"));

 
 

-  dc.DrawRectangle(100.0, 100.0, 100.0, 50.0);
-  dc.DrawRoundedRectangle(150.0, 150.0, 100.0, 50.0,20.0);
+    wxMenuBar *menu_bar = new wxMenuBar;
+    menu_bar->Append(menu, _T("&File"));

 
 

-  dc.DrawEllipse(250.0, 250.0, 100.0, 50.0);
-  dc.DrawSpline(50.0, 200.0, 50.0, 100.0, 200.0, 10.0);
-  dc.DrawLine(50.0, 230.0, 200.0, 230.0);
+    SetMenuBar( menu_bar );

 
 

-  dc.SetPen(wxBLACK_PEN);
-  dc.DrawArc(50.0, 300.0, 100.0, 250.0, 100.0, 300.0);
-}
+    wxBoxSizer *main_sizer = new wxBoxSizer( wxHORIZONTAL );

 
 

-BEGIN_EVENT_TABLE(MyWindow, wxWindow)
-    EVT_PAINT(MyWindow::OnPaint)
-END_EVENT_TABLE()
+    m_target = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80, wxDefaultCoord ) );
+    main_sizer->Add( m_target, 1, wxALL, 5 );

 
 

-// 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)
-{
+    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 );

 }
 
 }
 

-MyWindow::~MyWindow(void)
+void MySimpleSizerFrame::OnSetSmallSize( wxCommandEvent& WXUNUSED(event))

 {
 {

+    GetSizer()->SetItemMinSize( m_target, 40, -1 );
+    Layout();
+    GetSizer()->Fit( this );

 }
 
 }
 

-// Define the repainting behaviour
-void MyWindow::OnPaint(wxPaintEvent& event)
+void MySimpleSizerFrame::OnSetBigSize( wxCommandEvent& WXUNUSED(event))

 {
 {

-  wxPaintDC dc(this);
-  frame->Draw(dc,TRUE);
+    GetSizer()->SetItemMinSize( m_target, 140, -1 );
+    Layout();
+    GetSizer()->Fit( this );

 }
 
 }
 

-// Define the behaviour for the frame closing
-// - must delete all frames except for the main one.
-bool MyFrame::OnClose(void)
-{
-  Show(FALSE);

 
 

-  return TRUE;
-}
+// ----------------------------------------------------------------------------
+// MyNestedSizerFrame
+// ----------------------------------------------------------------------------
+

 
 

-SizerFrame::SizerFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
-  wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
+MyNestedSizerFrame::MyNestedSizerFrame(const wxString &title, int x, int y )
+    : wxFrame( NULL, wxID_ANY, title, wxPoint(x, y) )

 {
 {

-  panel = new wxPanel(this, -1, wxPoint(0, 0), wxSize(-1, -1), wxTAB_TRAVERSAL);
-  panel->SetBackgroundColour(wxColour(192, 192, 192));
-
-  // A sizer to fit the whole panel, plus two sizers, one
-  // above the other. A button is centred on the lower
-  // sizer; a rowcol containing 3 buttons is centred on the upper
-  // sizer.
-  wxSizer *expandSizer = new wxSizer(panel, wxSizerExpand);
-  expandSizer->SetName("expandSizer");
-
-  wxLayoutConstraints *c;
-
-  /////// TOP OF PANEL
-  ///////
-  wxSizer *topSizer = new wxSizer(expandSizer);
-  topSizer->SetName("topSizer");
-
-  // Specify constraints for the top sizer
-  c = new wxLayoutConstraints;
-  c->left.SameAs       (expandSizer, wxLeft);
-  c->top.SameAs        (expandSizer, wxTop);
-  c->right.SameAs      (expandSizer, wxRight);
-  c->height.PercentOf  (expandSizer, wxHeight, 50);
-
-  topSizer->SetConstraints(c);
-
- /*
-  * Add a row-col sizer and some buttons
-  */
-
-  // Default is layout by rows, 20 columns per row, shrink to fit.
-  wxRowColSizer *rowCol = new wxRowColSizer(topSizer);
-  rowCol->SetName("rowCol");
-  
-  wxButton *button = new wxButton(panel, -1, "Button 1");
-  rowCol->AddSizerChild(button);
-
-  button = new wxButton(panel, -1, "Button 2");
-  rowCol->AddSizerChild(button);
-
-  button = new wxButton(panel, -1, "Button 3");
-  rowCol->AddSizerChild(button);
-
-  // Centre the rowcol in the middle of the upper sizer
-  c = new wxLayoutConstraints;
-  c->centreX.SameAs    (topSizer, wxCentreX);
-  c->centreY.SameAs    (topSizer, wxCentreY);
-  c->width.AsIs();
-  c->height.AsIs();
-  rowCol->SetConstraints(c);
-
-  /////// BOTTOM OF PANEL
-  ///////
-  wxSizer *bottomSizer = new wxSizer(expandSizer);
-
-  // Specify constraints for the bottom sizer
-  c = new wxLayoutConstraints;
-  c->left.SameAs       (expandSizer, wxLeft);
-  c->top.PercentOf     (expandSizer, wxHeight, 50);
-  c->right.SameAs      (expandSizer, wxRight);
-  c->height.PercentOf  (expandSizer, wxHeight, 50);
-
-  bottomSizer->SetConstraints(c);
-
-  wxButton *button2 = new wxButton(panel, -1, "Test button");
-
-  // The button should be a child of the bottom sizer
-  bottomSizer->AddSizerChild(button2);
-
-  // Centre the button on the sizer
-  c = new wxLayoutConstraints;
-  c->centreX.SameAs    (bottomSizer, wxCentreX);
-  c->centreY.SameAs    (bottomSizer, wxCentreY);
-  c->width.PercentOf   (bottomSizer, wxWidth, 20);
-  c->height.PercentOf  (bottomSizer, wxHeight, 20);
-  button2->SetConstraints(c);
-}
+    wxMenu *menu = new wxMenu;

 
 

-BEGIN_EVENT_TABLE(SizerFrame, wxFrame)
-  EVT_SIZE(SizerFrame::OnSize)
-END_EVENT_TABLE()
+    menu->Append(wxID_ABOUT, _T("Do nothing"));

 
 

+    wxMenuBar *menu_bar = new wxMenuBar;
+    menu_bar->Append(menu, _T("&File"));

 
 

-// Size the subwindows when the frame is resized
-void SizerFrame::OnSize(wxSizeEvent& event)
-{
-  wxFrame::OnSize(event);
-  panel->Layout();
+    SetMenuBar( menu_bar );
+
+    wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
+
+    main_sizer->Add( new wxStaticText( this, -1, wxT("Hello outside") ), 0, wxALIGN_CENTER );
+    main_sizer->Add( new wxStaticText( this, -1, wxT("Hello outside") ), 0, wxALIGN_CENTER );
+    main_sizer->Add( new wxStaticText( this, -1, wxT("Hello outside") ), 0, wxALIGN_CENTER );
+    main_sizer->Add( new wxStaticText( this, -1, wxT("Hello outside") ), 0, wxALIGN_CENTER );
+
+    wxPanel *panel = new wxPanel( this, -1, wxDefaultPosition, wxDefaultSize,
+                                  wxTAB_TRAVERSAL | wxSUNKEN_BORDER );
+    main_sizer->Add( panel, 0, wxALIGN_CENTER );
+    wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
+    panel->SetSizer( panel_sizer );
+    panel_sizer->Add( new wxStaticText( panel, -1, wxT("Hello inside") ) );
+    panel_sizer->Add( new wxStaticText( panel, -1, wxT("Hello inside") ) );
+    panel_sizer->Add( new wxStaticText( panel, -1, wxT("Hello inside") ) );
+
+    main_sizer->Add( new wxStaticText( this, -1, wxT("Hello outside") ), 0, wxALIGN_CENTER );
+
+    m_target = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80, wxDefaultCoord ) );
+    main_sizer->Add( m_target, 1, wxALL|wxGROW, 5 );
+
+    SetSizerAndFit( main_sizer);

 }
 
 }
 

-bool SizerFrame::OnClose(void)
+
+// ----------------------------------------------------------------------------
+// MyWrapSizerFrame
+// ----------------------------------------------------------------------------
+
+
+MyWrapSizerFrame::MyWrapSizerFrame(const wxString &title, int x, int y )
+    : wxFrame( NULL, wxID_ANY, title, wxPoint(x, y), wxSize(200,-1) )

 {
 {

-  Show(FALSE);
+    wxMenu *menu = new wxMenu;
+
+    menu->Append(wxID_ABOUT, "Do nothing");
+
+    wxMenuBar *menu_bar = new wxMenuBar;
+    menu_bar->Append(menu, "&File");
+
+    SetMenuBar( menu_bar );
+
+    wxBoxSizer *root = new wxBoxSizer( wxVERTICAL );
+
+#if 0
+    wxSizer *row = new wxWrapSizer;
+    int i;
+    for (i = 0; i < 4; i++)
+       row->Add( new wxButton( this, -1, "Hello" ), 0, wxALL, 10 );
+    root->Add( row, 0, wxGROW );
+
+    row = new wxWrapSizer;
+    for (i = 0; i < 4; i++)
+       row->Add( new wxButton( this, -1, "Hello" ) );
+    root->Add( row, 0, wxGROW );
+
+#else
+    // A number of checkboxes inside a wrap sizer
+    wxSizer *ps_mid = new wxStaticBoxSizer( wxVERTICAL, this, "Wrapping check-boxes" );
+    wxSizer *ps_mid_wrap = new wxWrapSizer(wxHORIZONTAL);
+    ps_mid->Add( ps_mid_wrap, 100, wxEXPAND );
+    for( int ix=0; ix<6; ix++ )
+            ps_mid_wrap->Add( new wxCheckBox(this,wxID_ANY,wxString::Format("Option %d",ix+1)), 0, wxALIGN_CENTRE|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    root->Add( ps_mid, 0, wxEXPAND | wxALL, 5 );
+
+    // A shaped item inside a box sizer
+    wxSizer *ps_bottom = new wxStaticBoxSizer( wxVERTICAL, this, "With wxSHAPED item" );
+    wxSizer *ps_bottom_box = new wxBoxSizer(wxHORIZONTAL);
+    ps_bottom->Add( ps_bottom_box, 100, wxEXPAND );
+    ps_bottom_box->Add( new wxListBox(this,wxID_ANY,wxPoint(0,0),wxSize(70,70)), 0, wxEXPAND|wxSHAPED );
+    ps_bottom_box->Add( 10,10 );
+    ps_bottom_box->Add( new wxCheckBox(this,wxID_ANY,"A much longer option..."), 100, 0, 5 );
+
+    root->Add( ps_bottom, 1, wxEXPAND | wxALL, 5 );
+#endif

 
 

-  return TRUE;
+    // Set sizer for window
+    SetSizerAndFit( root );

 }
 
 }