A few tweaks and cleanups

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

diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index 14532691e366511cca5a061a9225a8297faedfd0..c3bfb5e58dd193b9733bba21df4e643cbc718d60 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,7 +42,7 @@ MyApp::MyApp()
 {
 }
 
 {
 }
 

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

 {
   // Create the main frame window
   frame = new MyFrame((MyFrame *) NULL, (char *) "wxWindows Layout Demo", 0, 0, 550, 500);
 {
   // Create the main frame window
   frame = new MyFrame((MyFrame *) NULL, (char *) "wxWindows Layout Demo", 0, 0, 550, 500);


@@ -54,7 +56,8 @@ bool MyApp::OnInit(void)
   wxMenu *file_menu = new wxMenu;
 
   file_menu->Append(LAYOUT_LOAD_FILE, "&Load file",      "Load a text file");
   wxMenu *file_menu = new wxMenu;
 
   file_menu->Append(LAYOUT_LOAD_FILE, "&Load file",      "Load a text file");

-  file_menu->Append(LAYOUT_TEST_NEW, "&Test new sizers",      "Test new sizer code");
+  file_menu->Append(LAYOUT_TEST_SIZER, "&Test sizers",      "Test sizer");
+  file_menu->Append(LAYOUT_TEST_NB, "&Test notebook sizers",      "Test notebook sizer");

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


@@ -72,7 +75,7 @@ bool MyApp::OnInit(void)
 
   // Make a panel
   frame->panel = new wxPanel(frame, 0, 0, 1000, 500, wxTAB_TRAVERSAL);
 
   // Make a panel
   frame->panel = new wxPanel(frame, 0, 0, 1000, 500, wxTAB_TRAVERSAL);

-  frame->panel->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+  frame->panel->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));

 //  frame->panel->SetAutoLayout(TRUE);
 
   // Create some panel items
 //  frame->panel->SetAutoLayout(TRUE);
 
   // Create some panel items


@@ -171,14 +174,15 @@ MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
   EVT_MENU(LAYOUT_LOAD_FILE, MyFrame::LoadFile)
   EVT_MENU(LAYOUT_QUIT, MyFrame::Quit)
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
   EVT_MENU(LAYOUT_LOAD_FILE, MyFrame::LoadFile)
   EVT_MENU(LAYOUT_QUIT, MyFrame::Quit)

-  EVT_MENU(LAYOUT_TEST_NEW, MyFrame::TestNewSizers)
+  EVT_MENU(LAYOUT_TEST_SIZER, MyFrame::TestSizers)
+  EVT_MENU(LAYOUT_TEST_NB, MyFrame::TestNotebookSizers)

   EVT_MENU(LAYOUT_ABOUT, MyFrame::About)
   EVT_SIZE(MyFrame::OnSize)
 END_EVENT_TABLE()
 
 void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) )
 {
   EVT_MENU(LAYOUT_ABOUT, MyFrame::About)
   EVT_SIZE(MyFrame::OnSize)
 END_EVENT_TABLE()
 
 void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) )
 {

-      wxString s = wxFileSelector( _T("Load text file"), (const wxChar *) NULL, 
+      wxString s = wxFileSelector( _T("Load text file"), (const wxChar *) NULL,

                                    (const wxChar *) NULL, (const wxChar *) NULL, _T("*.txt") );
       if (s != "")
       {
                                    (const wxChar *) NULL, (const wxChar *) NULL, _T("*.txt") );
       if (s != "")
       {


@@ -190,18 +194,65 @@ void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::Quit(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::Quit(wxCommandEvent& WXUNUSED(event) )
 {

-      this->Close(TRUE);
+    this->Close(TRUE);
+}
+
+void MyFrame::TestSizers(wxCommandEvent& WXUNUSED(event) )
+{
+    MySizerFrame *newFrame = new MySizerFrame((MyFrame *) NULL, "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("Notebook Sizer Test Dialog")  );
+
+    // 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 );
+
+    wxButton *button = new wxButton( &dialog, wxID_OK, "OK" );
+    topsizer->Add( button, 0, wxALIGN_RIGHT | wxALL, 10 );
+
+    // First page: one big text ctrl
+    wxTextCtrl *multi = new wxTextCtrl( notebook, -1, "TextCtrl.", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
+    notebook->AddPage( multi, "Page One" );
+
+    // Second page: a text ctrl and a button
+    wxPanel *panel = new wxPanel( notebook, -1 );
+    notebook->AddPage( panel, "Page Two" );
+
+    wxSizer *panelsizer = new wxBoxSizer( wxVERTICAL );
+
+    wxTextCtrl *text = new wxTextCtrl( panel, -1, "TextLine 1.", wxDefaultPosition, wxSize(250,-1) );
+    panelsizer->Add( text, 0, wxGROW|wxALL, 30 );
+    text = new wxTextCtrl( panel, -1, "TextLine 2.", wxDefaultPosition, wxSize(250,-1) );
+    panelsizer->Add( text, 0, wxGROW|wxALL, 30 );
+    wxButton *button2 = new wxButton( panel, -1, "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 MyFrame::About(wxCommandEvent& WXUNUSED(event) )
 {

-      (void)wxMessageBox("wxWindows GUI library layout demo\n",
+    (void)wxMessageBox("wxWindows GUI library layout demo\n",

             "About Layout Demo", wxOK|wxCENTRE);
 }
 
             "About Layout Demo", wxOK|wxCENTRE);
 }
 


@@ -224,7 +275,9 @@ void MyFrame::Draw(wxDC& dc, bool WXUNUSED(draw_bitmaps) )
   dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
 
   dc.DrawEllipse(250, 250, 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);
   dc.DrawSpline(50, 200, 50, 100, 200, 10);

+#endif // wxUSE_SPLINES

   dc.DrawLine(50, 230, 200, 230);
 
   dc.SetPen(* wxBLACK_PEN);
   dc.DrawLine(50, 230, 200, 230);
 
   dc.SetPen(* wxBLACK_PEN);


@@ -245,7 +298,7 @@ MyWindow::MyWindow(wxFrame *frame, int x, int y, int w, int h, long style):
 {
 }
 
 {
 }
 

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

 {
 }
 
 {
 }
 


@@ -257,10 +310,10 @@ void MyWindow::OnPaint(wxPaintEvent& WXUNUSED(event) )
 }
 
 //-----------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------

-//  NewSizerFrame
+//  MySizerFrame

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

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

   wxFrame(frame, -1, title, wxPoint(x, y) )
 {
   // we want to get a dialog that is stretchable because it
   wxFrame(frame, -1, title, wxPoint(x, y) )
 {
   // we want to get a dialog that is stretchable because it


@@ -268,9 +321,9 @@ NewSizerFrame::NewSizerFrame(wxFrame *frame, char *title, int x, int y ):
   // two buttons which.
 
   wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
   // two buttons which.
 
   wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );

-  
+

   // 1) top: create wxStaticText with minimum size equal to its default size
   // 1) top: create wxStaticText with minimum size equal to its default size

-  topsizer->Add( 
+  topsizer->Add(

     new wxStaticText( this, -1, "An explanation (wxALIGN_RIGHT)." ),
     0,                         // make vertically unstretchable
     wxALIGN_RIGHT |            // right align text
     new wxStaticText( this, -1, "An explanation (wxALIGN_RIGHT)." ),
     0,                         // make vertically unstretchable
     wxALIGN_RIGHT |            // right align text


@@ -278,51 +331,78 @@ NewSizerFrame::NewSizerFrame(wxFrame *frame, char *title, int x, int y ):
     5 );                      // set border width to 5
 
   // 2) top: create wxTextCtrl with minimum size (100x60)
     5 );                      // set border width to 5
 
   // 2) top: create wxTextCtrl with minimum size (100x60)

-  topsizer->Add( 
+  topsizer->Add(

     new wxTextCtrl( this, -1, "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
 
     new wxTextCtrl( this, -1, "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, "A wxStaticBoxSizer"),
+    wxVERTICAL );
+  statsizer->Add(
+    new wxStaticText(this, -1, "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, "Label"), 0,
+                  wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+    gridsizer->Add(new wxTextCtrl(this, -1, "Grid sizer demo"), 1,
+                   wxGROW | wxALIGN_CENTER_VERTICAL);
+    gridsizer->Add(new wxStaticText(this, -1, "Another label"), 0,
+                   wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+    gridsizer->Add(new wxTextCtrl(this, -1, "More text"), 1,
+                   wxGROW | wxALIGN_CENTER_VERTICAL);
+    gridsizer->Add(new wxStaticText(this, -1, "Final label"), 0,
+                   wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+    gridsizer->Add(new wxTextCtrl(this, -1, "And yet more text"), 1,
+                   wxGROW | wxALIGN_CENTER_VERTICAL);
+    topsizer->Add(gridsizer, 1, wxGROW | wxALL, 10);
+

 
   // 3) middle: create wxStaticLine with minimum size (3x3)
 
   // 3) middle: create wxStaticLine with minimum size (3x3)

-  topsizer->Add( 
-     new wxStaticLine( this, -1, wxDefaultPosition, wxSize(3,3), wxHORIZONTAL), 
+  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
      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  
+
+  // 4) bottom: create two centred wxButtons

   wxBoxSizer *button_box = new wxBoxSizer( wxHORIZONTAL );
   button_box->Add(
   wxBoxSizer *button_box = new wxBoxSizer( wxHORIZONTAL );
   button_box->Add(

-     new wxButton( this, -1, "Two buttons in a box" ), 
+     new wxButton( this, -1, "Two buttons in a box" ),

      0,           // make horizontally unstretchable
      wxALL,       // make border all around
      7 );         // set border width to 7
   button_box->Add(
      0,           // make horizontally unstretchable
      wxALL,       // make border all around
      7 );         // set border width to 7
   button_box->Add(

-     new wxButton( this, -1, "(wxCENTER)" ), 
+     new wxButton( this, -1, "(wxCENTER)" ),

      0,           // make horizontally unstretchable
      wxALL,       // make border all around
      7 );         // set border width to 7
      0,           // make horizontally unstretchable
      wxALL,       // make border all around
      7 );         // set border width to 7

-  
-  topsizer->Add( 
+
+  topsizer->Add(

      button_box,
      0,          // make vertically unstretchable
      wxCENTER ); // no border and centre horizontally
 
      button_box,
      0,          // make vertically unstretchable
      wxCENTER ); // no border and centre horizontally
 

-  
+  SetAutoLayout( TRUE );
+

   // set frame to minimum size
   // set frame to minimum size

-  topsizer->Fit( this );  
-  
+  topsizer->Fit( this );
+

   // don't allow frame to get smaller than what the sizers tell ye
   // don't allow frame to get smaller than what the sizers tell ye

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

   SetSizer( topsizer );
   SetSizer( topsizer );

-  
-  SetAutoLayout( TRUE );

 }
 
 
 }