added iosfwrap.h (wrapper for <iosfwd>)

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

diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index 32b27c43cc80e2586a8bdd67673d934be0abb6d4..c849af51ae252662ebf7ae1a1ec8d2084723d29c 100644 (file)
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

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


@@ -25,8 +25,10 @@
 #endif
 
 #include <ctype.h>
 #endif
 
 #include <ctype.h>

+

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

+#include "wx/notebook.h"

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


@@ -40,10 +42,10 @@ MyApp::MyApp()
 {
 }
 
 {
 }
 

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

 {
   // Create the main frame window
 {
   // Create the main frame window

-  frame = new MyFrame((MyFrame *) NULL, (char *) "wxWindows Layout Demo", 0, 0, 550, 500);
+  frame = new MyFrame(NULL, _T("wxWindows Layout Demo"), -1, -1, 400, 300);

 
   frame->SetAutoLayout(TRUE);
 
 
   frame->SetAutoLayout(TRUE);
 


@@ -53,71 +55,64 @@ bool MyApp::OnInit(void)
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 

-  file_menu->Append(LAYOUT_LOAD_FILE, "&Load file",      "Load a text file");
-  file_menu->Append(LAYOUT_TEST, "&Test sizers",      "Test sizer code");
-  file_menu->Append(LAYOUT_TEST_NEW, "&Test new sizers",      "Test new sizer code");
+  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->AppendSeparator();
 
   file_menu->AppendSeparator();

-  file_menu->Append(LAYOUT_QUIT, "E&xit",                "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, "&About",              "About layout demo");
+  help_menu->Append(LAYOUT_ABOUT, _T("&About"),              _T("About layout demo"));

 
   menu_bar = new wxMenuBar;
 
 
   menu_bar = new wxMenuBar;
 

-  menu_bar->Append(file_menu, "&File");
-  menu_bar->Append(help_menu, "&Help");
+  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);
 
   // Make a panel
 
   // Associate the menu bar with the frame
   frame->SetMenuBar(menu_bar);
 
   // Make a panel

-  frame->panel = new wxPanel(frame, 0, 0, 1000, 500, wxTAB_TRAVERSAL);
-  frame->panel->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-//  frame->panel->SetAutoLayout(TRUE);
+  wxPanel *panel = new wxPanel(frame);

 
   // Create some panel items
 
   // Create some panel items

-  wxButton *btn1 = new wxButton(frame->panel, -1, "A button (1)") ;
+  wxButton *btn1 = new wxButton(panel, -1, _T("A button (1)")) ;

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

   btn1->SetConstraints(b1);
 
   btn1->SetConstraints(b1);
 

-  wxListBox *list = new wxListBox(frame->panel, -1,
+  wxListBox *list = new wxListBox(panel, -1,

                                   wxPoint(-1, -1), wxSize(200, 100));
                                   wxPoint(-1, -1), wxSize(200, 100));

-  list->Append("Apple");
-  list->Append("Pear");
-  list->Append("Orange");
-  list->Append("Banana");
-  list->Append("Fruit");
+  list->Append(_T("Apple"));
+  list->Append(_T("Pear"));
+  list->Append(_T("Orange"));
+  list->Append(_T("Banana"));
+  list->Append(_T("Fruit"));

 
   wxLayoutConstraints *b2 = new wxLayoutConstraints;
   b2->top.Below         (btn1, 5);
 
   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);
+  b2->left.SameAs       (panel, wxLeft, 5);
+  b2->width.PercentOf   (panel, wxWidth, 40);
+  b2->bottom.SameAs     (panel, wxBottom, 5);

   list->SetConstraints(b2);
 
   list->SetConstraints(b2);
 

-  wxTextCtrl *mtext = new wxTextCtrl(frame->panel, -1, "Some text",
-                        wxPoint(-1, -1), wxSize(150, 100));
+  wxTextCtrl *mtext = new wxTextCtrl(panel, -1, _T("Some text"));

 
   wxLayoutConstraints *b3 = new wxLayoutConstraints;
   b3->top.Below         (btn1, 5);
   b3->left.RightOf      (list, 5);
 
   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);
+  b3->right.SameAs      (panel, wxRight, 5);
+  b3->bottom.SameAs     (panel, wxBottom, 5);

   mtext->SetConstraints(b3);
 
   mtext->SetConstraints(b3);
 

-  frame->canvas = new MyWindow(frame, 0, 0, 400, 400, wxRETAINED);
-
-  // Give it scrollbars: the virtual canvas is 20 * 50 = 1000 pixels in each direction
-//  canvas->SetScrollbars(20, 20, 50, 50, 4, 4);
+  MyWindow *canvas = new MyWindow(frame, 0, 0, 400, 400, wxRETAINED);

 
   // Make a text window
 
   // Make a text window

-  frame->text_window = new MyTextWindow(frame, 0, 250, 400, 250);
+  MyTextWindow *text_window = new MyTextWindow(frame, 0, 250, 400, 150);

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


@@ -127,32 +122,33 @@ bool MyApp::OnInit(void)
   c1->right.PercentOf   (frame, wxWidth, 50);
   c1->height.PercentOf  (frame, wxHeight, 50);
 
   c1->right.PercentOf   (frame, wxWidth, 50);
   c1->height.PercentOf  (frame, wxHeight, 50);
 

-  frame->panel->SetConstraints(c1);
+  panel->SetConstraints(c1);

 
   // Set constraints for canvas subwindow
   wxLayoutConstraints *c2 = new wxLayoutConstraints;
 
 
   // Set constraints for canvas subwindow
   wxLayoutConstraints *c2 = new wxLayoutConstraints;
 

-  c2->left.SameAs       (frame->panel, wxRight);
+  c2->left.SameAs       (panel, wxRight);

   c2->top.SameAs        (frame, wxTop);
   c2->right.SameAs      (frame, wxRight);
   c2->height.PercentOf  (frame, wxHeight, 50);
 
   c2->top.SameAs        (frame, wxTop);
   c2->right.SameAs      (frame, wxRight);
   c2->height.PercentOf  (frame, wxHeight, 50);
 

-  frame->canvas->SetConstraints(c2);
+  canvas->SetConstraints(c2);

 
   // Set constraints for text subwindow
   wxLayoutConstraints *c3 = new wxLayoutConstraints;
   c3->left.SameAs       (frame, wxLeft);
 
   // Set constraints for text subwindow
   wxLayoutConstraints *c3 = new wxLayoutConstraints;
   c3->left.SameAs       (frame, wxLeft);

-  c3->top.Below         (frame->panel);
+  c3->top.Below         (panel);

   c3->right.SameAs      (frame, wxRight);
   c3->bottom.SameAs     (frame, wxBottom);
 
   c3->right.SameAs      (frame, wxRight);
   c3->bottom.SameAs     (frame, wxBottom);
 

-  frame->text_window->SetConstraints(c3);
+  text_window->SetConstraints(c3);

 
   frame->Show(TRUE);
 
 
   frame->Show(TRUE);
 

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

 
   SetTopWindow(frame);
 
   SetTopWindow(frame);

+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -161,82 +157,80 @@ bool MyApp::OnInit(void)
 //-----------------------------------------------------------------
 
 // Define my frame constructor
 //-----------------------------------------------------------------
 
 // 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))
+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))

 {
 {

-  panel = (wxPanel *) NULL;
-  text_window = (MyTextWindow *) NULL;
-  canvas = (MyWindow *) NULL;

 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 }
 
 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_TEST_NEW, MyFrame::TestNewSizers)
+  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)
   EVT_MENU(LAYOUT_ABOUT, MyFrame::About)

-  EVT_SIZE(MyFrame::OnSize)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) )
-{
-      wxString s = wxFileSelector( _T("Load text file"), (const wxChar *) NULL, 
-                                   (const wxChar *) NULL, (const wxChar *) NULL, _T("*.txt") );
-      if (s != "")
-      {
-#ifdef __WXMSW__
-        frame->text_window->LoadFile(s);
-#endif
-      }
-}
-
-void MyFrame::Quit(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )

 {
 {

-      this->Close(TRUE);
+    Close(TRUE);

 }
 
 void MyFrame::TestSizers(wxCommandEvent& WXUNUSED(event) )
 {
 }
 
 void MyFrame::TestSizers(wxCommandEvent& WXUNUSED(event) )
 {

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

 }
 
 }
 

-void MyFrame::TestNewSizers(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) )

 {
 {

-  NewSizerFrame *newFrame = new NewSizerFrame((MyFrame *) NULL, "Sizer Test Frame", 50, 50 );
-  newFrame->Show(TRUE);
-}
+    wxDialog dialog( this, -1, wxString(_T("Notebook Sizer Test Dialog"))  );

 
 

-void MyFrame::About(wxCommandEvent& WXUNUSED(event) )
-{
-      (void)wxMessageBox("wxWindows GUI library layout demo\n",
-            "About Layout Demo", wxOK|wxCENTRE);
-}
+    // Begin with first hierarchy: a notebook at the top and
+    // and OK button at the bottom.

 
 

-// Size the subwindows when the frame is resized
-void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event) )
-{
-    Layout();
-}
+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );

 
 

-void MyFrame::Draw(wxDC& dc, bool WXUNUSED(draw_bitmaps) )
-{
-  dc.SetPen(* wxGREEN_PEN);
-  dc.DrawLine(0, 0, 200, 200);
-  dc.DrawLine(200, 0, 0, 200);
+    wxNotebook *notebook = new wxNotebook( &dialog, -1 );
+    wxNotebookSizer *nbs = new wxNotebookSizer( notebook );
+    topsizer->Add( nbs, 1, wxGROW );

 
 

-  dc.SetBrush(* wxCYAN_BRUSH);
-  dc.SetPen(* wxRED_PEN);
+    wxButton *button = new wxButton( &dialog, wxID_OK, _T("OK") );
+    topsizer->Add( button, 0, wxALIGN_RIGHT | wxALL, 10 );

 
 

-  dc.DrawRectangle(100, 100, 100, 50);
-  dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
+    // First page: one big text ctrl
+    wxTextCtrl *multi = new wxTextCtrl( notebook, -1, _T("TextCtrl."), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
+    notebook->AddPage( multi, _T("Page One") );

 
 

-  dc.DrawEllipse(250, 250, 100, 50);
-  dc.DrawSpline(50, 200, 50, 100, 200, 10);
-  dc.DrawLine(50, 230, 200, 230);
+    // Second page: a text ctrl and a button
+    wxPanel *panel = new wxPanel( notebook, -1 );
+    notebook->AddPage( panel, _T("Page Two") );

 
 

-  dc.SetPen(* wxBLACK_PEN);
-  dc.DrawArc(50, 300, 100, 250, 100, 300 );
+    wxSizer *panelsizer = new wxBoxSizer( wxVERTICAL );
+
+    wxTextCtrl *text = new wxTextCtrl( panel, -1, _T("TextLine 1."), wxDefaultPosition, wxSize(250,-1) );
+    panelsizer->Add( text, 0, wxGROW|wxALL, 30 );
+    text = new wxTextCtrl( panel, -1, _T("TextLine 2."), wxDefaultPosition, wxSize(250,-1) );
+    panelsizer->Add( text, 0, wxGROW|wxALL, 30 );
+    wxButton *button2 = new wxButton( panel, -1, _T("Hallo") );
+    panelsizer->Add( button2, 0, wxALIGN_RIGHT | wxLEFT|wxRIGHT|wxBOTTOM, 30 );
+
+    panel->SetAutoLayout( TRUE );
+    panel->SetSizer( panelsizer );
+
+    // Tell dialog to use sizer
+
+    dialog.SetAutoLayout( TRUE );
+    dialog.SetSizer( topsizer );
+    topsizer->Fit( &dialog );
+    topsizer->SetSizeHints( &dialog );
+
+    dialog.ShowModal();
+}
+
+
+void MyFrame::About(wxCommandEvent& WXUNUSED(event) )
+{
+    (void)wxMessageBox(_T("wxWindows GUI library layout demo\n"),
+            _T("About Layout Demo"), wxOK|wxCENTRE);

 }
 
 //-----------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------


@@ -248,12 +242,12 @@ BEGIN_EVENT_TABLE(MyWindow, wxWindow)
 END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 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(wxFrame *frame, int x, int y, int w, int h, long style)
+        : wxWindow(frame, -1, wxPoint(x, y), wxSize(w, h), style)

 {
 }
 
 {
 }
 

-MyWindow::~MyWindow(void)
+MyWindow::~MyWindow()

 {
 }
 
 {
 }
 


@@ -261,191 +255,117 @@ MyWindow::~MyWindow(void)
 void MyWindow::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
   wxPaintDC dc(this);
 void MyWindow::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
   wxPaintDC dc(this);

-  frame->Draw(dc,TRUE);
-}
-
-//-----------------------------------------------------------------
-//  SizerFrame
-//-----------------------------------------------------------------
+  dc.SetPen(* wxGREEN_PEN);
+  dc.DrawLine(0, 0, 200, 200);
+  dc.DrawLine(200, 0, 0, 200);

 
 

-SizerFrame::SizerFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
-  wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
-{
-  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);
-}
+  dc.SetBrush(* wxCYAN_BRUSH);
+  dc.SetPen(* wxRED_PEN);

 
 

-BEGIN_EVENT_TABLE(SizerFrame, wxFrame)
-  EVT_SIZE(SizerFrame::OnSize)
-END_EVENT_TABLE()
+  dc.DrawRectangle(100, 100, 100, 50);
+  dc.DrawRoundedRectangle(150, 150, 100, 50, 20);

 
 

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

 
 

-// Size the subwindows when the frame is resized
-void SizerFrame::OnSize(wxSizeEvent& event)
-{
-  wxFrame::OnSize(event);
-  panel->Layout();
+  dc.SetPen(* wxBLACK_PEN);
+  dc.DrawArc(50, 300, 100, 250, 100, 300 );

 }
 
 //-----------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------

-//  NewSizerFrame
+//  MySizerFrame

 //-----------------------------------------------------------------
 
 //-----------------------------------------------------------------
 

-NewSizerFrame::NewSizerFrame(wxFrame *frame, char *title, int x, int y ):
-  wxFrame(frame, -1, title, wxPoint(x, y) )
+MySizerFrame::MySizerFrame(wxFrame *frame, wxChar *title, int x, int y )
+            : wxFrame(frame, -1, title, wxPoint(x, y) )

 {
   // we want to get a dialog that is stretchable because it
   // has a text ctrl in the middle. at the bottom, we have
 {
   // 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 are not supposed to get stretched
-  // and therefore we insert two spacers next to them
-
-  topsizer = new wxBoxNewSizer( wxVERTICAL );
-
-  
-  // 1) upper part: text ctrl
-  
-  // make border around textctrl in all directions
-  wxBorderNewSizer *text_border = new wxBorderNewSizer();
-  
-  // make border around text ctrl 20 pixels wide
-  // minimum size for the text ctrl is 60x30
-  text_border->Add( new wxTextCtrl( this, -1, "My text.", wxDefaultPosition, wxSize(170,30), wxTE_MULTILINE), 5 );
-  
-  // add text ctrl with border to top sizer
-  // a value of more than zero indicates that it's stretchable
-  topsizer->Add( text_border, 1 );
-
-  
-  // 2) middle part: static line
-  
-  // make border for beauty static line
-  wxBorderNewSizer *line_border = new wxBorderNewSizer();
-
-  // make border around static line 2 pixels wide
-  // minimum size for the static line is 3x3
-  line_border->Add( new wxStaticLine( this, -1, wxDefaultPosition, wxSize(170,3), wxHORIZONTAL), 5 );
-  
-  // add text ctrl with border to top sizer
-  topsizer->Add( line_border );
-  
-
-  // 3) bottom: buttons  
-  
-  // make border around button in all directions
-  wxBoxNewSizer *button_sizer = new wxBoxNewSizer( wxHORIZONTAL );
-  
-  // make border around buttons 5 pixels wide
-  // minimum size for the button is its default size
-  wxBorderNewSizer *button1_border = new wxBorderNewSizer();
-  button1_border->Add( new wxButton( this, -1, "Hello 1", wxDefaultPosition, wxSize(80,30) ), 5 );
-  button_sizer->Add( button1_border );
-  
-  wxBorderNewSizer *button2_border = new wxBorderNewSizer();
-  button2_border->Add( new wxButton( this, -1, "Hello 2", wxDefaultPosition, wxSize(80,30) ), 5 );
-  button_sizer->Add( button2_border );
-
-  // add buttons with border to top sizer
-  topsizer->Add( button_sizer );
-
-  
-  // set frame to minimum size
-  topsizer->Fit( this );  
-  
-  // don't allow frame to get smaller than what the sizers tell ye
-  topsizer->SetSizeHints( this );  
-  
-  // layout widgets
-  topsizer->Layout();
+  // two buttons which.
+
+  wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+
+  // 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
+
+  // 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);
+
+    // 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);
+
+
+  // 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
+
+
+  // 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
+
+  topsizer->Add(
+     button_box,
+     0,          // make vertically unstretchable
+     wxCENTER ); // no border and centre horizontally
+
+  // 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 );
+
+  SetSizer( topsizer );

 }
 
 }
 

-// This can later be removed if we integrate wxNewSizers
-// into wxWindows
-
-BEGIN_EVENT_TABLE(NewSizerFrame, wxFrame)
-  EVT_SIZE(NewSizerFrame::OnSize)
-END_EVENT_TABLE()
-
-void NewSizerFrame::OnSize(wxSizeEvent& event)
-{
-  wxFrame::OnSize(event);
-
-  wxSize client_size( GetClientSize() );
-   
-  topsizer->SetDimension( 0, 0, client_size.x, client_size.y );
-}