Added support for sub-object virtual attributes (temporary attributes for characters...

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index ef951a18bb80662b47b7968d4d3b9082b34fc0ea..ea60421a1e4e5fcb039e0b6bfd93f6b5f999c818 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling, Julian Smart
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling, Julian Smart

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

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


@@ -25,6 +25,7 @@
 #include "wx/imaglist.h"
 #include "wx/artprov.h"
 #include "wx/cshelp.h"
 #include "wx/imaglist.h"
 #include "wx/artprov.h"
 #include "wx/cshelp.h"

+#include "wx/gbsizer.h"

 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"


@@ -57,7 +58,7 @@
     #define EVT_TOGGLEBUTTON EVT_CHECKBOX
 #endif
 
     #define EVT_TOGGLEBUTTON EVT_CHECKBOX
 #endif
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 


@@ -721,7 +722,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     for ( size_t n = 0; n < Image_Max; n++ )
     {
         wxBitmap bmp(s_iconNames[n]);
     for ( size_t n = 0; n < Image_Max; n++ )
     {
         wxBitmap bmp(s_iconNames[n]);

-        if ( !bmp.Ok() || (imagelist->Add(bmp) == -1) )
+        if ( !bmp.IsOk() || (imagelist->Add(bmp) == -1) )

         {
             wxLogWarning(wxT("Couldn't load the image '%s' for the book control page %d."),
                     s_iconNames[n], n);
         {
             wxLogWarning(wxT("Couldn't load the image '%s' for the book control page %d."),
                     s_iconNames[n], n);


@@ -731,6 +732,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_book->SetImageList(imagelist);
 #endif
 
     m_book->SetImageList(imagelist);
 #endif
 

+    // ------------------------------------------------------------------------
+    // listbox page
+    // ------------------------------------------------------------------------

     wxPanel *panel = new wxPanel(m_book);
     m_listbox = new wxListBox( panel, ID_LISTBOX,
                                wxPoint(10,10), wxSize(120,70),
     wxPanel *panel = new wxPanel(m_book);
     m_listbox = new wxListBox( panel, ID_LISTBOX,
                                wxPoint(10,10), wxSize(120,70),


@@ -761,9 +765,12 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     panel->SetCursor(wxCursor(wxCURSOR_HAND));
     m_book->AddPage(panel, wxT("wxListBox"), true, Image_List);
 
     panel->SetCursor(wxCursor(wxCURSOR_HAND));
     m_book->AddPage(panel, wxT("wxListBox"), true, Image_List);
 

+    // ------------------------------------------------------------------------
+    // choice page
+    // ------------------------------------------------------------------------

 #if wxUSE_CHOICE
     panel = new wxPanel(m_book);
 #if wxUSE_CHOICE
     panel = new wxPanel(m_book);

-    m_choice = new MyChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,wxDefaultCoord), 5, choices );
+    m_choice = new MyChoice( panel, ID_CHOICE, wxPoint(10,10), wxDefaultSize, 5, choices );

     m_choiceSorted = new MyChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,wxDefaultCoord),
                                    5, choices, wxCB_SORT );
 
     m_choiceSorted = new MyChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,wxDefaultCoord),
                                    5, choices, wxCB_SORT );
 


@@ -771,35 +778,42 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     SetChoiceClientData(wxT("choice"), m_choiceSorted);
 
     m_choice->SetSelection(2);
     SetChoiceClientData(wxT("choice"), m_choiceSorted);
 
     m_choice->SetSelection(2);

-    (void)new wxButton( panel, ID_CHOICE_SEL_NUM, wxT("Select #&2"), wxPoint(180,30), wxSize(140,30) );
-    (void)new wxButton( panel, ID_CHOICE_SEL_STR, wxT("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
-    (void)new wxButton( panel, ID_CHOICE_CLEAR, wxT("&Clear"), wxPoint(180,80), wxSize(140,30) );
-    (void)new wxButton( panel, ID_CHOICE_APPEND, wxT("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
-    (void)new wxButton( panel, ID_CHOICE_DELETE, wxT("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
-    (void)new wxButton( panel, ID_CHOICE_FONT, wxT("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
+    (void)new wxButton( panel, ID_CHOICE_SEL_NUM, wxT("Select #&2"), wxPoint(220,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_CHOICE_SEL_STR, wxT("&Select 'This'"), wxPoint(380,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_CHOICE_CLEAR, wxT("&Clear"), wxPoint(220,80), wxSize(140,30) );
+    (void)new wxButton( panel, ID_CHOICE_APPEND, wxT("&Append 'Hi!'"), wxPoint(380,80), wxSize(140,30) );
+    (void)new wxButton( panel, ID_CHOICE_DELETE, wxT("D&elete selected item"), wxPoint(220,130), wxSize(140,30) );
+    (void)new wxButton( panel, ID_CHOICE_FONT, wxT("Set &Italic font"), wxPoint(380,130), wxSize(140,30) );

     (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, wxT("&Disable"), wxPoint(20,130), wxSize(140,30) );
 
     m_book->AddPage(panel, wxT("wxChoice"), false, Image_Choice);
 #endif // wxUSE_CHOICE
 
     (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, wxT("&Disable"), wxPoint(20,130), wxSize(140,30) );
 
     m_book->AddPage(panel, wxT("wxChoice"), false, Image_Choice);
 #endif // wxUSE_CHOICE
 

+    // ------------------------------------------------------------------------
+    // combo page
+    // ------------------------------------------------------------------------

     panel = new wxPanel(m_book);
     panel = new wxPanel(m_book);

-    (void)new wxStaticBox( panel, wxID_ANY, wxT("&Box around combobox"),
-                           wxPoint(5, 5), wxSize(150, 100));

     m_combo = new MyComboBox( panel, ID_COMBO, wxT("This"),
     m_combo = new MyComboBox( panel, ID_COMBO, wxT("This"),

-                              wxPoint(20,25), wxSize(120, wxDefaultCoord),
+                              wxPoint(15,25), wxDefaultSize,

                               5, choices,
                               wxTE_PROCESS_ENTER);
                               5, choices,
                               wxTE_PROCESS_ENTER);

-
-    (void)new wxButton( panel, ID_COMBO_SEL_NUM, wxT("Select #&2"), wxPoint(180,30), wxSize(140,30) );
-    (void)new wxButton( panel, ID_COMBO_SEL_STR, wxT("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
-    (void)new wxButton( panel, ID_COMBO_CLEAR, wxT("&Clear"), wxPoint(180,80), wxSize(140,30) );
-    (void)new wxButton( panel, ID_COMBO_APPEND, wxT("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
-    (void)new wxButton( panel, ID_COMBO_DELETE, wxT("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
-    (void)new wxButton( panel, ID_COMBO_FONT, wxT("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
-    (void)new wxButton( panel, ID_COMBO_SET_TEXT, wxT("Set 'Hi!' at #2"), wxPoint(340,180), wxSize(140,30) );
+    wxSize combosize(m_combo->GetBestSize().x + 20, 100);
+    (void)new wxStaticBox( panel, wxID_ANY, wxT("&Box around combobox"),
+                           wxPoint(5, 5), combosize);
+
+    (void)new wxButton( panel, ID_COMBO_SEL_NUM, wxT("Select #&2"), wxPoint(220,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_SEL_STR, wxT("&Select 'This'"), wxPoint(380,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_CLEAR, wxT("&Clear"), wxPoint(220,80), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_APPEND, wxT("&Append 'Hi!'"), wxPoint(380,80), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_DELETE, wxT("D&elete selected item"), wxPoint(220,130), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_FONT, wxT("Set &Italic font"), wxPoint(380,130), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_SET_TEXT, wxT("Set 'Hi!' at #2"), wxPoint(380,180), wxSize(140,30) );

     (void)new wxCheckBox( panel, ID_COMBO_ENABLE, wxT("&Disable"), wxPoint(20,130), wxSize(140,30) );
     m_book->AddPage(panel, wxT("wxComboBox"), false, Image_Combo);
 
     (void)new wxCheckBox( panel, ID_COMBO_ENABLE, wxT("&Disable"), wxPoint(20,130), wxSize(140,30) );
     m_book->AddPage(panel, wxT("wxComboBox"), false, Image_Combo);
 

+    // ------------------------------------------------------------------------
+    // radio box
+    // ------------------------------------------------------------------------

     wxString choices2[] =
     {
         wxT("First"), wxT("Second"),
     wxString choices2[] =
     {
         wxT("First"), wxT("Second"),


@@ -809,18 +823,24 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     };
 
     panel = new wxPanel(m_book);
     };
 
     panel = new wxPanel(m_book);

-    new MyRadioBox(panel, ID_RADIOBOX2, wxT("&That"),
-                   wxPoint(10,160), wxDefaultSize,
-                   WXSIZEOF(choices2), choices2,
-                   1, wxRA_SPECIFY_ROWS );
+    wxGridBagSizer* radio_page_sizer = new wxGridBagSizer(5, 5);
+

     m_radio = new wxRadioBox(panel, ID_RADIOBOX, wxT("T&his"),
                              wxPoint(10,10), wxDefaultSize,
                              WXSIZEOF(choices), choices,
                              1, wxRA_SPECIFY_COLS );
     m_radio = new wxRadioBox(panel, ID_RADIOBOX, wxT("T&his"),
                              wxPoint(10,10), wxDefaultSize,
                              WXSIZEOF(choices), choices,
                              1, wxRA_SPECIFY_COLS );

+    MyRadioBox* mybox = new MyRadioBox(panel, ID_RADIOBOX2, wxT("&That"),
+                                       wxPoint(10,160), wxDefaultSize,
+                                       WXSIZEOF(choices2), choices2,
+                                       1, wxRA_SPECIFY_ROWS );
+
+    radio_page_sizer->Add( m_radio, wxGBPosition(0,0), wxGBSpan(2,1) );
+    radio_page_sizer->Add( mybox,   wxGBPosition(2,0), wxGBSpan(2,1) );

 
 #if wxUSE_HELP
 
 #if wxUSE_HELP

-    for( unsigned int item = 0; item < WXSIZEOF(choices); ++item )
-        m_radio->SetItemHelpText( item, wxString::Format( wxT("Help text for \"%s\""), choices[item].c_str() ) );
+    for (unsigned int item = 0; item < WXSIZEOF(choices); ++item)
+        m_radio->SetItemHelpText( item, wxString::Format( wxT("Help text for \"%s\""),
+                                  choices[item].c_str() ) );

 
     // erase help text for the second item
     m_radio->SetItemHelpText( 1, wxT("") );
 
     // erase help text for the second item
     m_radio->SetItemHelpText( 1, wxT("") );


@@ -828,26 +848,42 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_radio->SetHelpText( wxT("Default helptext for wxRadioBox") );
 #endif // wxUSE_HELP
 
     m_radio->SetHelpText( wxT("Default helptext for wxRadioBox") );
 #endif // wxUSE_HELP
 

-    (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, wxT("Select #&2"), wxPoint(180,30), wxSize(140,30) );
-    (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, wxT("&Select 'This'"), wxPoint(180,80), wxSize(140,30) );
-    m_fontButton = new wxButton( panel, ID_SET_FONT, wxT("Set &more Italic font"), wxPoint(340,30), wxSize(140,30) );
-    (void)new wxButton( panel, ID_RADIOBOX_FONT, wxT("Set &Italic font"), wxPoint(340,80), wxSize(140,30) );
-    (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, wxT("&Disable"), wxPoint(340,130), wxDefaultSize );
-
-    wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, wxT("Radiobutton1"), wxPoint(210,170), wxDefaultSize, wxRB_GROUP );
+    wxButton* select_two   = new wxButton  ( panel, ID_RADIOBOX_SEL_NUM, wxT("Select #&2") );
+    wxButton* select_this  = new wxButton  ( panel, ID_RADIOBOX_SEL_STR, wxT("&Select 'This'") );
+    m_fontButton           = new wxButton  ( panel, ID_SET_FONT,         wxT("Set &more Italic font") );
+    wxButton* set_italic   = new wxButton  ( panel, ID_RADIOBOX_FONT,    wxT("Set &Italic font") );
+    wxCheckBox* disable_cb = new wxCheckBox( panel, ID_RADIOBOX_ENABLE,  wxT("&Disable") );
+    wxRadioButton *rb      = new wxRadioButton( panel, ID_RADIOBUTTON_1, wxT("Radiobutton1"),
+                                                wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+    wxRadioButton *rb2     = new wxRadioButton( panel, ID_RADIOBUTTON_2, wxT("&Radiobutton2"),
+                                                wxDefaultPosition, wxDefaultSize );

     rb->SetValue( false );
     rb->SetValue( false );

-    (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, wxT("&Radiobutton2"), wxPoint(340,170), wxDefaultSize );
+
+    radio_page_sizer->Add( select_two,   wxGBPosition(0, 1), wxDefaultSpan, wxALL           , 10 );
+    radio_page_sizer->Add( select_this,  wxGBPosition(1, 1), wxDefaultSpan, wxALL           , 10 );
+    radio_page_sizer->Add( m_fontButton, wxGBPosition(0, 2), wxDefaultSpan, wxALL           , 10 );
+    radio_page_sizer->Add( set_italic,   wxGBPosition(1, 2), wxDefaultSpan, wxALL           , 10 );
+    radio_page_sizer->Add( disable_cb,   wxGBPosition(2, 2), wxDefaultSpan, wxLEFT | wxRIGHT, 10 );
+    radio_page_sizer->Add( rb,           wxGBPosition(3, 1), wxDefaultSpan, wxLEFT | wxRIGHT, 10 );
+    radio_page_sizer->Add( rb2,          wxGBPosition(3, 2), wxDefaultSpan, wxLEFT | wxRIGHT, 10 );
+
+    panel->SetSizer( radio_page_sizer );
+

     m_book->AddPage(panel, wxT("wxRadioBox"), false, Image_Radio);
 
     m_book->AddPage(panel, wxT("wxRadioBox"), false, Image_Radio);
 

+    // ------------------------------------------------------------------------
+    // gauge and slider
+    // ------------------------------------------------------------------------

 
 #if wxUSE_SLIDER && wxUSE_GAUGE
     panel = new wxPanel(m_book);
 
 
 #if wxUSE_SLIDER && wxUSE_GAUGE
     panel = new wxPanel(m_book);
 

-    wxBoxSizer *main_sizer = new wxBoxSizer( wxHORIZONTAL );
-    panel->SetSizer( main_sizer );
+    wxBoxSizer *gauge_page_vsizer = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer *gauge_page_first_row_sizer = new wxBoxSizer( wxHORIZONTAL );

 
     wxStaticBoxSizer *gauge_sizer = new wxStaticBoxSizer( wxHORIZONTAL, panel, wxT("&wxGauge and wxSlider") );
 
     wxStaticBoxSizer *gauge_sizer = new wxStaticBoxSizer( wxHORIZONTAL, panel, wxT("&wxGauge and wxSlider") );

-    main_sizer->Add( gauge_sizer, 0, wxALL, 5 );
+    gauge_page_first_row_sizer->Add( gauge_sizer, 0, wxALL, 5 );

     wxBoxSizer *sz = new wxBoxSizer( wxVERTICAL );
     gauge_sizer->Add( sz );
     m_gauge = new wxGauge( panel, wxID_ANY, 200, wxDefaultPosition, wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER );
     wxBoxSizer *sz = new wxBoxSizer( wxVERTICAL );
     gauge_sizer->Add( sz );
     m_gauge = new wxGauge( panel, wxID_ANY, 200, wxDefaultPosition, wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER );


@@ -855,7 +891,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200,
                              wxDefaultPosition, wxSize(155,wxDefaultCoord),
                              wxSL_AUTOTICKS | wxSL_LABELS);
     m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200,
                              wxDefaultPosition, wxSize(155,wxDefaultCoord),
                              wxSL_AUTOTICKS | wxSL_LABELS);

-    m_slider->SetTickFreq(40, 0);
+    m_slider->SetTickFreq(40);

     sz->Add( m_slider, 0, wxALL, 10 );
 
     m_gaugeVert = new wxGauge( panel, wxID_ANY, 100,
     sz->Add( m_slider, 0, wxALL, 10 );
 
     m_gaugeVert = new wxGauge( panel, wxID_ANY, 100,


@@ -868,7 +904,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     wxStaticBox *sb = new wxStaticBox( panel, wxID_ANY, wxT("&Explanation"),
                            wxDefaultPosition, wxDefaultSize ); //, wxALIGN_CENTER );
     wxStaticBoxSizer *wrapping_sizer = new wxStaticBoxSizer( sb, wxVERTICAL );
     wxStaticBox *sb = new wxStaticBox( panel, wxID_ANY, wxT("&Explanation"),
                            wxDefaultPosition, wxDefaultSize ); //, wxALIGN_CENTER );
     wxStaticBoxSizer *wrapping_sizer = new wxStaticBoxSizer( sb, wxVERTICAL );

-    main_sizer->Add( wrapping_sizer, 0, wxALL, 5 );
+    gauge_page_first_row_sizer->Add( wrapping_sizer, 0, wxALL, 5 );

 
 #ifdef __WXMOTIF__
     // No wrapping text in wxStaticText yet :-(
 
 #ifdef __WXMOTIF__
     // No wrapping text in wxStaticText yet :-(


@@ -892,7 +928,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     wrapping_sizer->Add( m_wrappingText );
 
     wxStaticBoxSizer *non_wrapping_sizer = new wxStaticBoxSizer( wxVERTICAL, panel, wxT("Non-wrapping") );
     wrapping_sizer->Add( m_wrappingText );
 
     wxStaticBoxSizer *non_wrapping_sizer = new wxStaticBoxSizer( wxVERTICAL, panel, wxT("Non-wrapping") );

-    main_sizer->Add( non_wrapping_sizer, 0, wxALL, 5 );
+    gauge_page_first_row_sizer->Add( non_wrapping_sizer, 0, wxALL, 5 );

 
     m_nonWrappingText = new wxStaticText( panel, wxID_ANY,
                             wxT("This static text has two lines.\nThey do not wrap."),
 
     m_nonWrappingText = new wxStaticText( panel, wxID_ANY,
                             wxT("This static text has two lines.\nThey do not wrap."),


@@ -901,33 +937,51 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
                           );
     non_wrapping_sizer->Add( m_nonWrappingText );
 
                           );
     non_wrapping_sizer->Add( m_nonWrappingText );
 

-    (void)new wxButton( panel, ID_BTNNEWTEXT, wxT("New text"), wxPoint(450, 160) );
+    gauge_page_vsizer->Add( gauge_page_first_row_sizer, 1 );
+    wxBoxSizer *gauge_page_second_row_sizer = new wxBoxSizer( wxHORIZONTAL );
+

 
     int initialSpinValue = -5;
     wxString s;
     s << initialSpinValue;
 
     int initialSpinValue = -5;
     wxString s;
     s << initialSpinValue;

-    m_spintext = new wxTextCtrl( panel, wxID_ANY, s, wxPoint(20,160), wxSize(80,wxDefaultCoord) );
+    m_spintext = new wxTextCtrl( panel, wxID_ANY, s );
+    gauge_page_second_row_sizer->Add( m_spintext, 0, wxALL, 5 );
+

 #if wxUSE_SPINBTN
 #if wxUSE_SPINBTN

-    m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(-1, m_spintext->GetSize().y) );
+    m_spinbutton = new wxSpinButton( panel, ID_SPIN );

     m_spinbutton->SetRange(-40,30);
     m_spinbutton->SetValue(initialSpinValue);
     m_spinbutton->SetRange(-40,30);
     m_spinbutton->SetValue(initialSpinValue);

-
-#if wxUSE_PROGRESSDLG
-    m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, wxT("&Show progress dialog"),
-                                  wxPoint(300, 160) );
-#endif // wxUSE_PROGRESSDLG
+    gauge_page_second_row_sizer->Add( m_spinbutton, 0, wxALL, 5 );

 #endif // wxUSE_SPINBTN
 
 #if wxUSE_SPINCTRL
 #endif // wxUSE_SPINBTN
 
 #if wxUSE_SPINCTRL

-    m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, wxEmptyString, wxPoint(200, 160), wxSize(80, wxDefaultCoord) );
+    m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, wxEmptyString );

     m_spinctrl->SetRange(-10,30);
     m_spinctrl->SetValue(15);
     m_spinctrl->SetRange(-10,30);
     m_spinctrl->SetValue(15);

+    gauge_page_second_row_sizer->Add( m_spinctrl, 0, wxALL, 5 );

 #endif // wxUSE_SPINCTRL
 
 #endif // wxUSE_SPINCTRL
 

+#if wxUSE_SPINBTN
+#if wxUSE_PROGRESSDLG
+    m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, wxT("&Show progress dialog") );
+    gauge_page_second_row_sizer->Add( m_btnProgress, 0, wxALL, 5 );
+#endif // wxUSE_PROGRESSDLG
+#endif // wxUSE_SPINBTN
+
+    wxButton* newTextButton = new wxButton( panel, ID_BTNNEWTEXT, wxT("New text"));
+    gauge_page_second_row_sizer->Add( newTextButton, 0, wxALL, 5 );
+
+    gauge_page_vsizer->Add(gauge_page_second_row_sizer, 1);
+    panel->SetSizer( gauge_page_vsizer );
+

     m_book->AddPage(panel, wxT("wxGauge"), false, Image_Gauge);
 #endif // wxUSE_SLIDER && wxUSE_GAUGE
 
 
     m_book->AddPage(panel, wxT("wxGauge"), false, Image_Gauge);
 #endif // wxUSE_SLIDER && wxUSE_GAUGE
 
 

+    // ------------------------------------------------------------------------
+    // wxBitmapXXX
+    // ------------------------------------------------------------------------
+

     panel = new wxPanel(m_book);
 
 #if !defined(__WXMOTIF__) // wxStaticBitmap not working under Motif yet.
     panel = new wxPanel(m_book);
 
 #if !defined(__WXMOTIF__) // wxStaticBitmap not working under Motif yet.


@@ -949,14 +1003,15 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     dc.DrawText(wxT("Bitmap"), 30, 40);
     dc.SelectObject( wxNullBitmap );
 
     dc.DrawText(wxT("Bitmap"), 30, 40);
     dc.SelectObject( wxNullBitmap );
 

-    (void)new wxBitmapButton(panel, ID_BITMAP_BTN, bitmap, wxPoint(100, 20));
-    (void)new wxToggleButton(panel, ID_BITMAP_BTN_ENABLE,
-                             wxT("Enable/disable &bitmap"), wxPoint(100, 140));
+    wxPanel *panel2 = new wxPanel(panel, -1, wxPoint(100, 0), wxSize(100, 200));
+    (void)new wxBitmapButton(panel2, ID_BITMAP_BTN, bitmap, wxPoint(0, 20));
+    (void)new wxToggleButton(panel2, ID_BITMAP_BTN_ENABLE,
+                             wxT("Enable/disable &bitmap"), wxPoint(0, 140));

 
 #if defined(__WXMSW__) || defined(__WXMOTIF__)
     // test for masked bitmap display
     bitmap = wxBitmap(wxT("test2.bmp"), wxBITMAP_TYPE_BMP);
 
 #if defined(__WXMSW__) || defined(__WXMOTIF__)
     // test for masked bitmap display
     bitmap = wxBitmap(wxT("test2.bmp"), wxBITMAP_TYPE_BMP);

-    if (bitmap.Ok())
+    if (bitmap.IsOk())

     {
        bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
 
     {
        bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
 


@@ -987,7 +1042,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     m_book->AddPage(panel, wxT("wxBitmapXXX"));
 
 
     m_book->AddPage(panel, wxT("wxBitmapXXX"));
 

-    // sizer
+    // ------------------------------------------------------------------------
+    // sizer page
+    // ------------------------------------------------------------------------
+

     panel = new wxPanel(m_book);
 
     wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
     panel = new wxPanel(m_book);
 
     wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );


@@ -1182,7 +1240,7 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
 
     SetThemeEnabled(false);
     // test panel colour changing and propagation to the subcontrols
 
     SetThemeEnabled(false);
     // test panel colour changing and propagation to the subcontrols

-    if ( s_colOld.Ok() )
+    if ( s_colOld.IsOk() )

     {
         SetBackgroundColour(s_colOld);
         s_colOld = wxNullColour;
     {
         SetBackgroundColour(s_colOld);
         s_colOld = wxNullColour;


@@ -1192,8 +1250,8 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
     }
     else
     {
     }
     else
     {

-        s_colOld = wxColour(wxT("red"));
-        SetBackgroundColour(wxT("white"));
+        s_colOld = *wxRED;
+        SetBackgroundColour(*wxWHITE);

 
         m_lbSelectThis->SetForegroundColour(wxT("white"));
         m_lbSelectThis->SetBackgroundColour(wxT("red"));
 
         m_lbSelectThis->SetForegroundColour(wxT("white"));
         m_lbSelectThis->SetBackgroundColour(wxT("red"));