compilation fixes for PCH-less build after r57074

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index f85667d24b7c3dc1b94d4dd7468cdabafbf87aec..ab41f78dc8583106335743b39360bdb5f584c186 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        controls.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        controls.cpp

-// Purpose:     Controls wxWindows sample
+// Purpose:     Controls wxWidgets sample

 // Author:      Robert Roebling
 // Modified by:
 // RCS-ID:      $Id$
 // Author:      Robert Roebling
 // Modified by:
 // RCS-ID:      $Id$


@@ -19,13 +19,12 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-#if !defined( __WXMSW__ ) || defined( __WIN95__ )

 #include "wx/spinbutt.h"
 #include "wx/spinbutt.h"

-#endif

 #include "wx/tglbtn.h"
 #include "wx/tglbtn.h"

-#include "wx/notebook.h"
+#include "wx/bookctrl.h"

 #include "wx/imaglist.h"
 #include "wx/artprov.h"
 #include "wx/imaglist.h"
 #include "wx/artprov.h"

+#include "wx/cshelp.h"

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


@@ -55,6 +54,11 @@
     #include "wx/spinctrl.h"
 #endif // wxUSE_SPINCTRL
 
     #include "wx/spinctrl.h"
 #endif // wxUSE_SPINCTRL
 

+#if !wxUSE_TOGGLEBTN
+    #define wxToggleButton wxCheckBox
+    #define EVT_TOGGLEBUTTON EVT_CHECKBOX
+#endif
+

 //----------------------------------------------------------------------
 // class definitions
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // class definitions
 //----------------------------------------------------------------------


@@ -71,7 +75,7 @@ public:
     MyPanel(wxFrame *frame, int x, int y, int w, int h);
     virtual ~MyPanel();
 
     MyPanel(wxFrame *frame, int x, int y, int w, int h);
     virtual ~MyPanel();
 

-    void OnSize( wxSizeEvent& event );
+    void OnIdle( wxIdleEvent &event );

     void OnListBox( wxCommandEvent &event );
     void OnListBoxDoubleClick( wxCommandEvent &event );
     void OnListBoxButtons( wxCommandEvent &event );
     void OnListBox( wxCommandEvent &event );
     void OnListBoxDoubleClick( wxCommandEvent &event );
     void OnListBoxButtons( wxCommandEvent &event );


@@ -88,18 +92,20 @@ public:
     void OnRadioButton1( wxCommandEvent &event );
     void OnRadioButton2( wxCommandEvent &event );
     void OnSetFont( wxCommandEvent &event );
     void OnRadioButton1( wxCommandEvent &event );
     void OnRadioButton2( wxCommandEvent &event );
     void OnSetFont( wxCommandEvent &event );

-    void OnPageChanged( wxNotebookEvent &event );
-    void OnPageChanging( wxNotebookEvent &event );
+    void OnPageChanged( wxBookCtrlEvent &event );
+    void OnPageChanging( wxBookCtrlEvent &event );

     void OnSliderUpdate( wxCommandEvent &event );
     void OnUpdateLabel( wxCommandEvent &event );
 #if wxUSE_SPINBTN
     void OnSpinUp( wxSpinEvent &event );
     void OnSpinDown( wxSpinEvent &event );
     void OnSpinUpdate( wxSpinEvent &event );
     void OnSliderUpdate( wxCommandEvent &event );
     void OnUpdateLabel( wxCommandEvent &event );
 #if wxUSE_SPINBTN
     void OnSpinUp( wxSpinEvent &event );
     void OnSpinDown( wxSpinEvent &event );
     void OnSpinUpdate( wxSpinEvent &event );

+#if wxUSE_PROGRESSDLG

     void OnUpdateShowProgress( wxUpdateUIEvent& event );
     void OnShowProgress( wxCommandEvent &event );
     void OnUpdateShowProgress( wxUpdateUIEvent& event );
     void OnShowProgress( wxCommandEvent &event );

+#endif // wxUSE_PROGRESSDLG

 #endif // wxUSE_SPINBTN
 #endif // wxUSE_SPINBTN

-
+    void OnNewText( wxCommandEvent &event );

 #if wxUSE_SPINCTRL
     void OnSpinCtrl(wxSpinEvent& event);
     void OnSpinCtrlUp(wxSpinEvent& event);
 #if wxUSE_SPINCTRL
     void OnSpinCtrl(wxSpinEvent& event);
     void OnSpinCtrlUp(wxSpinEvent& event);


@@ -111,6 +117,7 @@ public:
     void OnChangeColour(wxCommandEvent& event);
     void OnTestButton(wxCommandEvent& event);
     void OnBmpButton(wxCommandEvent& event);
     void OnChangeColour(wxCommandEvent& event);
     void OnTestButton(wxCommandEvent& event);
     void OnBmpButton(wxCommandEvent& event);

+    void OnBmpButtonToggle(wxCommandEvent& event);

 
     void OnSizerCheck (wxCommandEvent &event);
 
 
     void OnSizerCheck (wxCommandEvent &event);
 


@@ -123,16 +130,24 @@ public:
 
     wxComboBox    *m_combo;
     wxRadioBox    *m_radio;
 
     wxComboBox    *m_combo;
     wxRadioBox    *m_radio;

+#if wxUSE_GAUGE

     wxGauge       *m_gauge,
                   *m_gaugeVert;
     wxGauge       *m_gauge,
                   *m_gaugeVert;

+#endif // wxUSE_GAUGE
+#if wxUSE_SLIDER

     wxSlider      *m_slider;
     wxSlider      *m_slider;

+#endif // wxUSE_SLIDER

     wxButton      *m_fontButton;
     wxButton      *m_lbSelectNum;
     wxButton      *m_lbSelectThis;
 #if wxUSE_SPINBTN
     wxSpinButton  *m_spinbutton;
     wxButton      *m_fontButton;
     wxButton      *m_lbSelectNum;
     wxButton      *m_lbSelectThis;
 #if wxUSE_SPINBTN
     wxSpinButton  *m_spinbutton;

+#if wxUSE_PROGRESSDLG

     wxButton      *m_btnProgress;
     wxButton      *m_btnProgress;

+#endif // wxUSE_PROGRESSDLG

 #endif // wxUSE_SPINBTN
 #endif // wxUSE_SPINBTN

+    wxStaticText  *m_wrappingText;
+    wxStaticText  *m_nonWrappingText;

 
 #if wxUSE_SPINCTRL
     wxSpinCtrl    *m_spinctrl;
 
 #if wxUSE_SPINCTRL
     wxSpinCtrl    *m_spinctrl;


@@ -142,7 +157,7 @@ public:
     wxCheckBox    *m_checkbox;
 
     wxTextCtrl    *m_text;
     wxCheckBox    *m_checkbox;
 
     wxTextCtrl    *m_text;

-    wxNotebook    *m_notebook;
+    wxBookCtrl    *m_book;

 
     wxStaticText  *m_label;
 
 
     wxStaticText  *m_label;
 


@@ -175,14 +190,20 @@ public:
 #endif // wxUSE_TOOLTIPS
 
     void OnEnableAll(wxCommandEvent& event);
 #endif // wxUSE_TOOLTIPS
 
     void OnEnableAll(wxCommandEvent& event);

+    void OnHideAll(wxCommandEvent& event);
+    void OnHideList(wxCommandEvent& event);
+    void OnContextHelp(wxCommandEvent& event);

 
     void OnIdle( wxIdleEvent& event );
 
     void OnIdle( wxIdleEvent& event );

+    void OnIconized( wxIconizeEvent& event );
+    void OnMaximized( wxMaximizeEvent& event );

     void OnSize( wxSizeEvent& event );
     void OnMove( wxMoveEvent& event );
 
     MyPanel *GetPanel() const { return m_panel; }
 
 private:
     void OnSize( wxSizeEvent& event );
     void OnMove( wxMoveEvent& event );
 
     MyPanel *GetPanel() const { return m_panel; }
 
 private:

+#if wxUSE_STATUSBAR

     void UpdateStatusBar(const wxPoint& pos, const wxSize& size)
     {
         if ( m_frameStatusBar )
     void UpdateStatusBar(const wxPoint& pos, const wxSize& size)
     {
         if ( m_frameStatusBar )


@@ -198,6 +219,7 @@ private:
             SetStatusText(msg, 1);
         }
     }
             SetStatusText(msg, 1);
         }
     }

+#endif // wxUSE_STATUSBAR

 
     MyPanel *m_panel;
 
 
     MyPanel *m_panel;
 


@@ -273,7 +295,9 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
         : wxRadioBox(parent, id, title, pos, size, n, choices, majorDim,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
         : wxRadioBox(parent, id, title, pos, size, n, choices, majorDim,

-                     style, validator, name) { SetForegroundColour(*wxRED); }
+                     style, validator, name)
+    {
+    }

 
 protected:
     void OnFocusGot(wxFocusEvent& event)
 
 protected:
     void OnFocusGot(wxFocusEvent& event)


@@ -294,6 +318,42 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+// a choice which handles focus set/kill (for testing)
+class MyChoice : public wxChoice
+{
+public:
+    MyChoice(wxWindow *parent,
+               wxWindowID id,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int n = 0, const wxString choices[] = NULL,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxChoiceNameStr )
+        : wxChoice(parent, id, pos, size, n, choices,
+                     style, validator, name) { }
+
+protected:
+    void OnFocusGot(wxFocusEvent& event)
+    {
+        wxLogMessage(_T("MyChoice::OnFocusGot"));
+
+        event.Skip();
+    }
+
+    void OnFocusLost(wxFocusEvent& event)
+    {
+        wxLogMessage(_T("MyChoice::OnFocusLost"));
+
+        event.Skip();
+    }
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+
+

 //----------------------------------------------------------------------
 // other
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // other
 //----------------------------------------------------------------------


@@ -312,9 +372,9 @@ IMPLEMENT_APP(MyApp)
 
 enum
 {
 
 enum
 {

-    CONTROLS_QUIT   = 100,
-    CONTROLS_TEXT,
-    CONTROLS_ABOUT,
+    CONTROLS_QUIT   = wxID_EXIT,
+    CONTROLS_ABOUT = wxID_ABOUT,
+    CONTROLS_TEXT = 100,

     CONTROLS_CLEAR_LOG,
 
     // tooltip menu
     CONTROLS_CLEAR_LOG,
 
     // tooltip menu


@@ -322,7 +382,10 @@ enum
     CONTROLS_ENABLE_TOOLTIPS,
 
     // panel menu
     CONTROLS_ENABLE_TOOLTIPS,
 
     // panel menu

-    CONTROLS_ENABLE_ALL
+    CONTROLS_ENABLE_ALL,
+    CONTROLS_HIDE_ALL,
+    CONTROLS_HIDE_LIST,
+    CONTROLS_CONTEXT_HELP

 };
 
 bool MyApp::OnInit()
 };
 
 bool MyApp::OnInit()


@@ -340,8 +403,12 @@ bool MyApp::OnInit()
         wxSscanf(wxString(argv[2]), wxT("%d"), &y);
     }
 
         wxSscanf(wxString(argv[2]), wxT("%d"), &y);
     }
 

+#if wxUSE_HELP
+    wxHelpProvider::Set( new wxSimpleHelpProvider );
+#endif // wxUSE_HELP
+

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

-    MyFrame *frame = new MyFrame(_T("Controls wxWindows App"), x, y);
+    MyFrame *frame = new MyFrame(_T("Controls wxWidgets App"), x, y);

     frame->Show(true);
 
     return true;
     frame->Show(true);
 
     return true;


@@ -351,7 +418,7 @@ bool MyApp::OnInit()
 // MyPanel
 //----------------------------------------------------------------------
 
 // MyPanel
 //----------------------------------------------------------------------
 

-const int  ID_NOTEBOOK          = 1000;
+const int  ID_BOOK              = 1000;

 
 const int  ID_LISTBOX           = 130;
 const int  ID_LISTBOX_SEL_NUM   = 131;
 
 const int  ID_LISTBOX           = 130;
 const int  ID_LISTBOX_SEL_NUM   = 131;


@@ -381,6 +448,7 @@ const int  ID_COMBO_APPEND      = 144;
 const int  ID_COMBO_DELETE      = 145;
 const int  ID_COMBO_FONT        = 146;
 const int  ID_COMBO_ENABLE      = 147;
 const int  ID_COMBO_DELETE      = 145;
 const int  ID_COMBO_FONT        = 146;
 const int  ID_COMBO_ENABLE      = 147;

+const int  ID_COMBO_SET_TEXT    = 148;

 
 const int  ID_RADIOBOX          = 160;
 const int  ID_RADIOBOX_SEL_NUM  = 161;
 
 const int  ID_RADIOBOX          = 160;
 const int  ID_RADIOBOX_SEL_NUM  = 161;


@@ -393,17 +461,26 @@ const int  ID_RADIOBUTTON_2     = 167;
 
 const int  ID_SET_FONT          = 170;
 
 
 const int  ID_SET_FONT          = 170;
 

+#if wxUSE_GAUGE

 const int  ID_GAUGE             = 180;
 const int  ID_GAUGE             = 180;

+#endif // wxUSE_GAUGE
+
+#if wxUSE_SLIDER

 const int  ID_SLIDER            = 181;
 const int  ID_SLIDER            = 181;

+#endif // wxUSE_SLIDER

 
 const int  ID_SPIN              = 182;
 
 const int  ID_SPIN              = 182;

+#if wxUSE_PROGRESSDLG

 const int  ID_BTNPROGRESS       = 183;
 const int  ID_BTNPROGRESS       = 183;

+#endif // wxUSE_PROGRESSDLG

 const int  ID_BUTTON_LABEL      = 184;
 const int  ID_SPINCTRL          = 185;
 const int  ID_BUTTON_LABEL      = 184;
 const int  ID_SPINCTRL          = 185;

+const int  ID_BTNNEWTEXT        = 186;

 
 const int  ID_BUTTON_TEST1      = 190;
 const int  ID_BUTTON_TEST2      = 191;
 const int  ID_BITMAP_BTN        = 192;
 
 const int  ID_BUTTON_TEST1      = 190;
 const int  ID_BUTTON_TEST2      = 191;
 const int  ID_BITMAP_BTN        = 192;

+const int  ID_BITMAP_BTN_ENABLE = 193;

 
 const int  ID_CHANGE_COLOUR     = 200;
 
 
 const int  ID_CHANGE_COLOUR     = 200;
 


@@ -414,10 +491,12 @@ const int  ID_SIZER_CHECK4      = 204;
 const int  ID_SIZER_CHECK14     = 205;
 const int  ID_SIZER_CHECKBIG    = 206;
 
 const int  ID_SIZER_CHECK14     = 205;
 const int  ID_SIZER_CHECKBIG    = 206;
 

+const int  ID_HYPERLINK         = 300;
+

 BEGIN_EVENT_TABLE(MyPanel, wxPanel)
 BEGIN_EVENT_TABLE(MyPanel, wxPanel)

-EVT_SIZE      (                         MyPanel::OnSize)
-EVT_NOTEBOOK_PAGE_CHANGING(ID_NOTEBOOK, MyPanel::OnPageChanging)
-EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK,  MyPanel::OnPageChanged)
+EVT_IDLE      (                         MyPanel::OnIdle)
+EVT_BOOKCTRL_PAGE_CHANGING(ID_BOOK,     MyPanel::OnPageChanging)
+EVT_BOOKCTRL_PAGE_CHANGED(ID_BOOK,      MyPanel::OnPageChanged)

 EVT_LISTBOX   (ID_LISTBOX,              MyPanel::OnListBox)
 EVT_LISTBOX   (ID_LISTBOX_SORTED,       MyPanel::OnListBox)
 EVT_LISTBOX_DCLICK(ID_LISTBOX,          MyPanel::OnListBoxDoubleClick)
 EVT_LISTBOX   (ID_LISTBOX,              MyPanel::OnListBox)
 EVT_LISTBOX   (ID_LISTBOX_SORTED,       MyPanel::OnListBox)
 EVT_LISTBOX_DCLICK(ID_LISTBOX,          MyPanel::OnListBoxDoubleClick)


@@ -448,6 +527,7 @@ EVT_BUTTON    (ID_COMBO_CLEAR,          MyPanel::OnComboButtons)
 EVT_BUTTON    (ID_COMBO_APPEND,         MyPanel::OnComboButtons)
 EVT_BUTTON    (ID_COMBO_DELETE,         MyPanel::OnComboButtons)
 EVT_BUTTON    (ID_COMBO_FONT,           MyPanel::OnComboButtons)
 EVT_BUTTON    (ID_COMBO_APPEND,         MyPanel::OnComboButtons)
 EVT_BUTTON    (ID_COMBO_DELETE,         MyPanel::OnComboButtons)
 EVT_BUTTON    (ID_COMBO_FONT,           MyPanel::OnComboButtons)

+EVT_BUTTON    (ID_COMBO_SET_TEXT,       MyPanel::OnComboButtons)

 EVT_CHECKBOX  (ID_COMBO_ENABLE,         MyPanel::OnComboButtons)
 EVT_RADIOBOX  (ID_RADIOBOX,             MyPanel::OnRadio)
 EVT_BUTTON    (ID_RADIOBOX_SEL_NUM,     MyPanel::OnRadioButtons)
 EVT_CHECKBOX  (ID_COMBO_ENABLE,         MyPanel::OnComboButtons)
 EVT_RADIOBOX  (ID_RADIOBOX,             MyPanel::OnRadio)
 EVT_BUTTON    (ID_RADIOBOX_SEL_NUM,     MyPanel::OnRadioButtons)


@@ -457,13 +537,17 @@ EVT_CHECKBOX  (ID_RADIOBOX_ENABLE,      MyPanel::OnRadioButtons)
 EVT_RADIOBUTTON(ID_RADIOBUTTON_1,       MyPanel::OnRadioButton1)
 EVT_RADIOBUTTON(ID_RADIOBUTTON_2,       MyPanel::OnRadioButton2)
 EVT_BUTTON    (ID_SET_FONT,             MyPanel::OnSetFont)
 EVT_RADIOBUTTON(ID_RADIOBUTTON_1,       MyPanel::OnRadioButton1)
 EVT_RADIOBUTTON(ID_RADIOBUTTON_2,       MyPanel::OnRadioButton2)
 EVT_BUTTON    (ID_SET_FONT,             MyPanel::OnSetFont)

+#if wxUSE_SLIDER

 EVT_SLIDER    (ID_SLIDER,               MyPanel::OnSliderUpdate)
 EVT_SLIDER    (ID_SLIDER,               MyPanel::OnSliderUpdate)

+#endif // wxUSE_SLIDER

 #if wxUSE_SPINBTN
 EVT_SPIN      (ID_SPIN,                 MyPanel::OnSpinUpdate)
 EVT_SPIN_UP   (ID_SPIN,                 MyPanel::OnSpinUp)
 EVT_SPIN_DOWN (ID_SPIN,                 MyPanel::OnSpinDown)
 #if wxUSE_SPINBTN
 EVT_SPIN      (ID_SPIN,                 MyPanel::OnSpinUpdate)
 EVT_SPIN_UP   (ID_SPIN,                 MyPanel::OnSpinUp)
 EVT_SPIN_DOWN (ID_SPIN,                 MyPanel::OnSpinDown)

+#if wxUSE_PROGRESSDLG

 EVT_UPDATE_UI (ID_BTNPROGRESS,          MyPanel::OnUpdateShowProgress)
 EVT_BUTTON    (ID_BTNPROGRESS,          MyPanel::OnShowProgress)
 EVT_UPDATE_UI (ID_BTNPROGRESS,          MyPanel::OnUpdateShowProgress)
 EVT_BUTTON    (ID_BTNPROGRESS,          MyPanel::OnShowProgress)

+#endif // wxUSE_PROGRESSDLG

 #endif // wxUSE_SPINBTN
 #if wxUSE_SPINCTRL
 EVT_SPINCTRL  (ID_SPINCTRL,             MyPanel::OnSpinCtrl)
 #endif // wxUSE_SPINBTN
 #if wxUSE_SPINCTRL
 EVT_SPINCTRL  (ID_SPINCTRL,             MyPanel::OnSpinCtrl)


@@ -471,15 +555,13 @@ EVT_SPIN_UP   (ID_SPINCTRL,             MyPanel::OnSpinCtrlUp)
 EVT_SPIN_DOWN (ID_SPINCTRL,             MyPanel::OnSpinCtrlDown)
 EVT_TEXT      (ID_SPINCTRL,             MyPanel::OnSpinCtrlText)
 #endif // wxUSE_SPINCTRL
 EVT_SPIN_DOWN (ID_SPINCTRL,             MyPanel::OnSpinCtrlDown)
 EVT_TEXT      (ID_SPINCTRL,             MyPanel::OnSpinCtrlText)
 #endif // wxUSE_SPINCTRL

-#if wxUSE_TOGGLEBTN
+EVT_BUTTON    (ID_BTNNEWTEXT,           MyPanel::OnNewText)

 EVT_TOGGLEBUTTON(ID_BUTTON_LABEL,       MyPanel::OnUpdateLabel)
 EVT_TOGGLEBUTTON(ID_BUTTON_LABEL,       MyPanel::OnUpdateLabel)

-#else
-EVT_CHECKBOX(ID_BUTTON_LABEL,       MyPanel::OnUpdateLabel)
-#endif // wxUSE_TOGGLEBTN

 EVT_CHECKBOX  (ID_CHANGE_COLOUR,        MyPanel::OnChangeColour)
 EVT_BUTTON    (ID_BUTTON_TEST1,         MyPanel::OnTestButton)
 EVT_BUTTON    (ID_BUTTON_TEST2,         MyPanel::OnTestButton)
 EVT_BUTTON    (ID_BITMAP_BTN,           MyPanel::OnBmpButton)
 EVT_CHECKBOX  (ID_CHANGE_COLOUR,        MyPanel::OnChangeColour)
 EVT_BUTTON    (ID_BUTTON_TEST1,         MyPanel::OnTestButton)
 EVT_BUTTON    (ID_BUTTON_TEST2,         MyPanel::OnTestButton)
 EVT_BUTTON    (ID_BITMAP_BTN,           MyPanel::OnBmpButton)

+EVT_TOGGLEBUTTON(ID_BITMAP_BTN_ENABLE,  MyPanel::OnBmpButtonToggle)

 
 EVT_CHECKBOX  (ID_SIZER_CHECK1,         MyPanel::OnSizerCheck)
 EVT_CHECKBOX  (ID_SIZER_CHECK2,         MyPanel::OnSizerCheck)
 
 EVT_CHECKBOX  (ID_SIZER_CHECK1,         MyPanel::OnSizerCheck)
 EVT_CHECKBOX  (ID_SIZER_CHECK2,         MyPanel::OnSizerCheck)


@@ -507,6 +589,11 @@ BEGIN_EVENT_TABLE(MyRadioBox, wxRadioBox)
     EVT_KILL_FOCUS(MyRadioBox::OnFocusLost)
 END_EVENT_TABLE()
 
     EVT_KILL_FOCUS(MyRadioBox::OnFocusLost)
 END_EVENT_TABLE()
 

+BEGIN_EVENT_TABLE(MyChoice, wxChoice)
+    EVT_SET_FOCUS(MyChoice::OnFocusGot)
+    EVT_KILL_FOCUS(MyChoice::OnFocusLost)
+END_EVENT_TABLE()
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -519,18 +606,24 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 #if wxUSE_CHOICE
     m_choice = NULL;
     m_choiceSorted = NULL;
 #if wxUSE_CHOICE
     m_choice = NULL;
     m_choiceSorted = NULL;

-#endif
+#endif // wxUSE_CHOICE

     m_combo = NULL;
     m_radio = NULL;
     m_combo = NULL;
     m_radio = NULL;

+#if wxUSE_GAUGE

     m_gauge = NULL;
     m_gaugeVert = NULL;
     m_gauge = NULL;
     m_gaugeVert = NULL;

+#endif // wxUSE_GAUGE
+#if wxUSE_SLIDER

     m_slider = NULL;
     m_slider = NULL;

+#endif // wxUSE_SLIDER

     m_fontButton = NULL;
     m_lbSelectNum = NULL;
     m_lbSelectThis = NULL;
 #if wxUSE_SPINBTN
     m_spinbutton = NULL;
     m_fontButton = NULL;
     m_lbSelectNum = NULL;
     m_lbSelectThis = NULL;
 #if wxUSE_SPINBTN
     m_spinbutton = NULL;

+#if wxUSE_PROGRESSDLG

     m_btnProgress = NULL;
     m_btnProgress = NULL;

+#endif // wxUSE_PROGRESSDLG

 #endif // wxUSE_SPINBTN
 #if wxUSE_SPINCTRL
     m_spinctrl = NULL;
 #endif // wxUSE_SPINBTN
 #if wxUSE_SPINCTRL
     m_spinctrl = NULL;


@@ -538,22 +631,21 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_spintext = NULL;
     m_checkbox = NULL;
     m_text = NULL;
     m_spintext = NULL;
     m_checkbox = NULL;
     m_text = NULL;

-    m_notebook = NULL;
+    m_book = NULL;

     m_label = NULL;
 
     m_text = new wxTextCtrl(this, wxID_ANY, _T("This is the log window.\n"),
                             wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE);
     m_label = NULL;
 
     m_text = new wxTextCtrl(this, wxID_ANY, _T("This is the log window.\n"),
                             wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE);

-    m_text->SetBackgroundColour(wxT("wheat"));

 
     m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text));
 
 
     m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text));
 

-    m_notebook = new wxNotebook(this, ID_NOTEBOOK);
+    m_book = new wxBookCtrl(this, ID_BOOK);

 
     wxString choices[] =
     {
         _T("This"),
 
     wxString choices[] =
     {
         _T("This"),

-        _T("is one of my"),
-        _T("really"),
+        _T("is"),
+        _T("one of my long and"),

         _T("wonderful"),
         _T("examples.")
     };
         _T("wonderful"),
         _T("examples.")
     };


@@ -562,7 +654,15 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     // image ids
     enum
     {
     // image ids
     enum
     {

-        Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max
+        Image_List,
+        Image_Choice,
+        Image_Combo,
+        Image_Text,
+        Image_Radio,
+#if wxUSE_GAUGE
+        Image_Gauge,
+#endif // wxUSE_GAUGE
+        Image_Max

     };
 
     // fill the image list
     };
 
     // fill the image list


@@ -575,20 +675,36 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     imagelist-> Add( wxBitmap( combo_xpm ));
     imagelist-> Add( wxBitmap( text_xpm ));
     imagelist-> Add( wxBitmap( radio_xpm ));
     imagelist-> Add( wxBitmap( combo_xpm ));
     imagelist-> Add( wxBitmap( text_xpm ));
     imagelist-> Add( wxBitmap( radio_xpm ));

+#if wxUSE_GAUGE

     imagelist-> Add( wxBitmap( gauge_xpm ));
     imagelist-> Add( wxBitmap( gauge_xpm ));

-    m_notebook->SetImageList(imagelist);
+#endif // wxUSE_GAUGE
+    m_book->SetImageList(imagelist);

 #elif defined(__WXMSW__)
     // load images from resources
     enum
     {
 #elif defined(__WXMSW__)
     // load images from resources
     enum
     {

-        Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max
+        Image_List,
+        Image_Choice,
+        Image_Combo,
+        Image_Text,
+        Image_Radio,
+#if wxUSE_GAUGE
+        Image_Gauge,
+#endif // wxUSE_GAUGE
+        Image_Max

     };
     wxImageList *imagelist = new wxImageList(16, 16, false, Image_Max);
 
     static const wxChar *s_iconNames[Image_Max] =
     {
     };
     wxImageList *imagelist = new wxImageList(16, 16, false, Image_Max);
 
     static const wxChar *s_iconNames[Image_Max] =
     {

-        _T("list"), _T("choice"), _T("combo"), _T("text"), _T("radio"),
-        _T("gauge")
+        _T("list")
+        , _T("choice")
+        , _T("combo")
+        , _T("text")
+        , _T("radio")
+#if wxUSE_GAUGE
+        , _T("gauge")
+#endif // wxUSE_GAUGE

     };
 
     for ( size_t n = 0; n < Image_Max; n++ )
     };
 
     for ( size_t n = 0; n < Image_Max; n++ )


@@ -596,12 +712,12 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
         wxBitmap bmp(s_iconNames[n]);
         if ( !bmp.Ok() || (imagelist->Add(bmp) == -1) )
         {
         wxBitmap bmp(s_iconNames[n]);
         if ( !bmp.Ok() || (imagelist->Add(bmp) == -1) )
         {

-            wxLogWarning(wxT("Couldn't load the image '%s' for the notebook page %d."),
+            wxLogWarning(wxT("Couldn't load the image '%s' for the book control page %d."),

                     s_iconNames[n], n);
         }
     }
 
                     s_iconNames[n], n);
         }
     }
 

-    m_notebook->SetImageList(imagelist);
+    m_book->SetImageList(imagelist);

 #else
 
     // No images for now
 #else
 
     // No images for now


@@ -610,18 +726,20 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 #define    Image_Combo -1
 #define    Image_Text -1
 #define    Image_Radio -1
 #define    Image_Combo -1
 #define    Image_Text -1
 #define    Image_Radio -1

+#if wxUSE_GAUGE

 #define    Image_Gauge -1
 #define    Image_Gauge -1

+#endif // wxUSE_GAUGE

 #define    Image_Max -1
 
 #endif
 
 #define    Image_Max -1
 
 #endif
 

-    wxPanel *panel = new wxPanel(m_notebook);
+    wxPanel *panel = new wxPanel(m_book);

     m_listbox = new wxListBox( panel, ID_LISTBOX,
                                wxPoint(10,10), wxSize(120,70),
     m_listbox = new wxListBox( panel, ID_LISTBOX,
                                wxPoint(10,10), wxSize(120,70),

-                               5, choices, wxLB_ALWAYS_SB );
+                               5, choices, wxLB_MULTIPLE | wxLB_ALWAYS_SB | wxHSCROLL );

     m_listboxSorted = new wxListBox( panel, ID_LISTBOX_SORTED,
                                      wxPoint(10,90), wxSize(120,70),
     m_listboxSorted = new wxListBox( panel, ID_LISTBOX_SORTED,
                                      wxPoint(10,90), wxSize(120,70),

-                                     5, choices, wxLB_SORT );
+                                     3, choices, wxLB_SORT );

 
     SetListboxClientData(wxT("listbox"), m_listbox);
     SetListboxClientData(wxT("listbox"), m_listboxSorted);
 
     SetListboxClientData(wxT("listbox"), m_listbox);
     SetListboxClientData(wxT("listbox"), m_listboxSorted);


@@ -640,33 +758,31 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     button->SetDefault();
 
 
     button->SetDefault();
 

-    button->SetForegroundColour(*wxBLUE);
-

 #if wxUSE_TOOLTIPS
     button->SetToolTip( _T("Press here to set italic font") );
 #endif // wxUSE_TOOLTIPS
 
     m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, _T("&Disable"), wxPoint(20,170) );
     m_checkbox->SetValue(false);
 #if wxUSE_TOOLTIPS
     button->SetToolTip( _T("Press here to set italic font") );
 #endif // wxUSE_TOOLTIPS
 
     m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, _T("&Disable"), wxPoint(20,170) );
     m_checkbox->SetValue(false);

+    button->MoveAfterInTabOrder(m_checkbox);

 #if wxUSE_TOOLTIPS
     m_checkbox->SetToolTip( _T("Click here to disable the listbox") );
 #endif // wxUSE_TOOLTIPS
     (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, _T("&Toggle colour"),
                           wxPoint(110,170) );
     panel->SetCursor(wxCursor(wxCURSOR_HAND));
 #if wxUSE_TOOLTIPS
     m_checkbox->SetToolTip( _T("Click here to disable the listbox") );
 #endif // wxUSE_TOOLTIPS
     (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, _T("&Toggle colour"),
                           wxPoint(110,170) );
     panel->SetCursor(wxCursor(wxCURSOR_HAND));

-    m_notebook->AddPage(panel, _T("wxListBox"), true, Image_List);
+    m_book->AddPage(panel, _T("wxListBox"), true, Image_List);

 
 #if wxUSE_CHOICE
 
 #if wxUSE_CHOICE

-    panel = new wxPanel(m_notebook);
-    m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,-1), 5, choices );
-    m_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,-1),
+    panel = new wxPanel(m_book);
+    m_choice = new MyChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,wxDefaultCoord), 5, choices );
+    m_choiceSorted = new MyChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,wxDefaultCoord),

                                    5, choices, wxCB_SORT );
 
     SetChoiceClientData(wxT("choice"), m_choice);
     SetChoiceClientData(wxT("choice"), m_choiceSorted);
 
     m_choice->SetSelection(2);
                                    5, choices, wxCB_SORT );
 
     SetChoiceClientData(wxT("choice"), m_choice);
     SetChoiceClientData(wxT("choice"), m_choiceSorted);
 
     m_choice->SetSelection(2);

-    m_choice->SetBackgroundColour( wxT("red") );

     (void)new wxButton( panel, ID_CHOICE_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
     (void)new wxButton( panel, ID_CHOICE_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
     (void)new wxButton( panel, ID_CHOICE_CLEAR, _T("&Clear"), wxPoint(180,80), wxSize(140,30) );
     (void)new wxButton( panel, ID_CHOICE_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
     (void)new wxButton( panel, ID_CHOICE_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
     (void)new wxButton( panel, ID_CHOICE_CLEAR, _T("&Clear"), wxPoint(180,80), wxSize(140,30) );


@@ -675,17 +791,16 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     (void)new wxButton( panel, ID_CHOICE_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
     (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, _T("&Disable"), wxPoint(20,130), wxSize(140,30) );
 
     (void)new wxButton( panel, ID_CHOICE_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
     (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, _T("&Disable"), wxPoint(20,130), wxSize(140,30) );
 

-    m_notebook->AddPage(panel, _T("wxChoice"), false, Image_Choice);
+    m_book->AddPage(panel, _T("wxChoice"), false, Image_Choice);

 #endif // wxUSE_CHOICE
 
 #endif // wxUSE_CHOICE
 

-    panel = new wxPanel(m_notebook);
+    panel = new wxPanel(m_book);

     (void)new wxStaticBox( panel, wxID_ANY, _T("&Box around combobox"),
                            wxPoint(5, 5), wxSize(150, 100));
     m_combo = new MyComboBox( panel, ID_COMBO, _T("This"),
     (void)new wxStaticBox( panel, wxID_ANY, _T("&Box around combobox"),
                            wxPoint(5, 5), wxSize(150, 100));
     m_combo = new MyComboBox( panel, ID_COMBO, _T("This"),

-                              wxPoint(20,25), wxSize(120, -1),
+                              wxPoint(20,25), wxSize(120, wxDefaultCoord),

                               5, choices,
                               5, choices,

-                              wxCB_READONLY | wxPROCESS_ENTER);
-    m_combo->SetBackgroundColour(*wxBLUE);
+                              wxTE_PROCESS_ENTER);

 
     (void)new wxButton( panel, ID_COMBO_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
     (void)new wxButton( panel, ID_COMBO_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
 
     (void)new wxButton( panel, ID_COMBO_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
     (void)new wxButton( panel, ID_COMBO_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );


@@ -693,8 +808,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     (void)new wxButton( panel, ID_COMBO_APPEND, _T("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
     (void)new wxButton( panel, ID_COMBO_DELETE, _T("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
     (void)new wxButton( panel, ID_COMBO_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
     (void)new wxButton( panel, ID_COMBO_APPEND, _T("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
     (void)new wxButton( panel, ID_COMBO_DELETE, _T("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
     (void)new wxButton( panel, ID_COMBO_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );

+    (void)new wxButton( panel, ID_COMBO_SET_TEXT, _T("Set 'Hi!' at #2"), wxPoint(340,180), wxSize(140,30) );

     (void)new wxCheckBox( panel, ID_COMBO_ENABLE, _T("&Disable"), wxPoint(20,130), wxSize(140,30) );
     (void)new wxCheckBox( panel, ID_COMBO_ENABLE, _T("&Disable"), wxPoint(20,130), wxSize(140,30) );

-    m_notebook->AddPage(panel, _T("wxComboBox"), false, Image_Combo);
+    m_book->AddPage(panel, _T("wxComboBox"), false, Image_Combo);

 
     wxString choices2[] =
     {
 
     wxString choices2[] =
     {


@@ -704,86 +820,141 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
         "Seventh", "Eighth", "Nineth", "Tenth" */
     };
 
         "Seventh", "Eighth", "Nineth", "Tenth" */
     };
 

-    panel = new wxPanel(m_notebook);
-    (void)new MyRadioBox( panel, ID_RADIOBOX, _T("&That"), wxPoint(10,160), wxDefaultSize, WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS );
+    panel = new wxPanel(m_book);
+#if wxUSE_TOOLTIPS
+    wxRadioBox *radio2 =
+#endif // wxUSE_TOOLTIPS
+        new MyRadioBox( panel, ID_RADIOBOX, _T("&That"), wxPoint(10,160), wxDefaultSize, WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS );

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

-    m_radio->SetForegroundColour(*wxRED);

 
 #if wxUSE_TOOLTIPS
     m_combo->SetToolTip(_T("This is a natural\ncombobox - can you believe me?"));
 
 #if wxUSE_TOOLTIPS
     m_combo->SetToolTip(_T("This is a natural\ncombobox - can you believe me?"));

-    m_radio->SetToolTip(_T("Ever seen a radiobox?"));
+    radio2->SetToolTip(_T("Ever seen a radiobox?"));
+
+    //m_radio->SetToolTip(_T("Tooltip for the entire radiobox"));
+    for ( unsigned int nb = 0; nb < WXSIZEOF(choices); nb++ )
+    {
+        m_radio->SetItemToolTip(nb, _T("tooltip for\n") + choices[nb]);
+    }
+
+    // remove the tooltip for one of the items
+    m_radio->SetItemToolTip(2, _T(""));

 #endif // wxUSE_TOOLTIPS
 
 #endif // wxUSE_TOOLTIPS
 

+#if wxUSE_HELP
+    for( unsigned int item = 0; item < WXSIZEOF(choices); ++item )
+        m_radio->SetItemHelpText( item, wxString::Format( _T("Help text for \"%s\""), choices[item].c_str() ) );
+
+    // erase help text for the second item
+    m_radio->SetItemHelpText( 1, _T("") );
+    // set default help text for control
+    m_radio->SetHelpText( _T("Default helptext for wxRadioBox") );
+#endif // wxUSE_HELP
+

     (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
     (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, _T("&Select 'This'"), wxPoint(180,80), wxSize(140,30) );
     m_fontButton = new wxButton( panel, ID_SET_FONT, _T("Set &more Italic font"), wxPoint(340,30), wxSize(140,30) );
     (void)new wxButton( panel, ID_RADIOBOX_FONT, _T("Set &Italic font"), wxPoint(340,80), wxSize(140,30) );
     (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, _T("&Disable"), wxPoint(340,130), wxDefaultSize );
     (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
     (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, _T("&Select 'This'"), wxPoint(180,80), wxSize(140,30) );
     m_fontButton = new wxButton( panel, ID_SET_FONT, _T("Set &more Italic font"), wxPoint(340,30), wxSize(140,30) );
     (void)new wxButton( panel, ID_RADIOBOX_FONT, _T("Set &Italic font"), wxPoint(340,80), wxSize(140,30) );
     (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, _T("&Disable"), wxPoint(340,130), wxDefaultSize );

+

     wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, _T("Radiobutton1"), wxPoint(210,170), wxDefaultSize, wxRB_GROUP );
     rb->SetValue( false );
     (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, _T("&Radiobutton2"), wxPoint(340,170), wxDefaultSize );
     wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, _T("Radiobutton1"), wxPoint(210,170), wxDefaultSize, wxRB_GROUP );
     rb->SetValue( false );
     (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, _T("&Radiobutton2"), wxPoint(340,170), wxDefaultSize );

-    m_notebook->AddPage(panel, _T("wxRadioBox"), false, Image_Radio);
+    m_book->AddPage(panel, _T("wxRadioBox"), false, Image_Radio);

 
 

-    panel = new wxPanel(m_notebook);
-    (void)new wxStaticBox( panel, wxID_ANY, _T("&wxGauge and wxSlider"), wxPoint(10,10), wxSize(222,130) );
-    m_gauge = new wxGauge( panel, wxID_ANY, 200, wxPoint(18,50), wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER );
-    m_gauge->SetBackgroundColour(*wxGREEN);
-    m_gauge->SetForegroundColour(*wxRED);
-    m_gaugeVert = new wxGauge( panel, wxID_ANY, 100,
-                               wxPoint(195,35), wxSize(30, 90),
-                               wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER );
-    m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,-1),
-                             wxSL_AUTOTICKS | wxSL_LABELS );
+
+#if wxUSE_SLIDER && wxUSE_GAUGE
+    panel = new wxPanel(m_book);
+
+    wxBoxSizer *main_sizer = new wxBoxSizer( wxHORIZONTAL );
+    panel->SetSizer( main_sizer );
+
+    wxStaticBoxSizer *gauge_sizer = new wxStaticBoxSizer( wxHORIZONTAL, panel, _T("&wxGauge and wxSlider") );
+    main_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 );
+    sz->Add( m_gauge, 0, wxALL, 10 );
+    m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200,
+                             wxDefaultPosition, wxSize(155,wxDefaultCoord),
+                             wxSL_AUTOTICKS | wxSL_LABELS);

     m_slider->SetTickFreq(40, 0);
 #if wxUSE_TOOLTIPS
     m_slider->SetToolTip(_T("This is a sliding slider"));
 #endif // wxUSE_TOOLTIPS
     m_slider->SetTickFreq(40, 0);
 #if wxUSE_TOOLTIPS
     m_slider->SetToolTip(_T("This is a sliding slider"));
 #endif // wxUSE_TOOLTIPS

+    sz->Add( m_slider, 0, wxALL, 10 );
+
+    m_gaugeVert = new wxGauge( panel, wxID_ANY, 100,
+                               wxDefaultPosition, wxSize(wxDefaultCoord, 90),
+                               wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER );
+    gauge_sizer->Add( m_gaugeVert, 0, wxALL, 10 );
+
+

 
 

-    (void)new wxStaticBox( panel, wxID_ANY, _T("&Explanation"),
-                           wxPoint(230,10), wxSize(270,130),
-                           wxALIGN_CENTER );
+    wxStaticBox *sb = new wxStaticBox( panel, wxID_ANY, _T("&Explanation"),
+                           wxDefaultPosition, wxDefaultSize ); //, wxALIGN_CENTER );
+    wxStaticBoxSizer *wrapping_sizer = new wxStaticBoxSizer( sb, wxVERTICAL );
+    main_sizer->Add( wrapping_sizer, 0, wxALL, 5 );

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

-    (void)new wxStaticText( panel, wxID_ANY,
+    m_wrappingText = new wxStaticText( panel, wxID_ANY,

                             _T("Drag the slider!"),
                             wxPoint(250,30),
                             _T("Drag the slider!"),
                             wxPoint(250,30),

-                            wxSize(240, -1)
+                            wxSize(240, wxDefaultCoord)

                           );
 #else
                           );
 #else

-    (void)new wxStaticText( panel, wxID_ANY,
-                            _T("In order see the gauge (aka progress bar)\n")
-                            _T("control do something you have to drag the\n")
-                            _T("handle of the slider to the right.\n")
-                            _T("\n")
-                            _T("This is also supposed to demonstrate how\n")
-                            _T("to use static controls.\n"),
-                            wxPoint(250,25),
-                            wxSize(240, 110)
+    m_wrappingText = new wxStaticText( panel, wxID_ANY,
+                            _T("In order see the gauge (aka progress bar) ")
+                            _T("control do something you have to drag the ")
+                            _T("handle of the slider to the right.")
+                            _T("\n\n")
+                            _T("This is also supposed to demonstrate how ")
+                            _T("to use static controls with line wrapping."),
+                            wxDefaultPosition,
+                            wxSize(240, wxDefaultCoord)

                           );
 #endif
                           );
 #endif

+    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 );
+
+    m_nonWrappingText = new wxStaticText( panel, wxID_ANY,
+                            _T("This static text has two lines.\nThey do not wrap."),
+                            wxDefaultPosition,
+                            wxDefaultSize
+                          );
+    non_wrapping_sizer->Add( m_nonWrappingText );
+
+    (void)new wxButton( panel, ID_BTNNEWTEXT, wxT("New text"), wxPoint(450, 160) );
+

     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,-1) );
+    m_spintext = new wxTextCtrl( panel, wxID_ANY, s, wxPoint(20,160), wxSize(80,wxDefaultCoord) );

 #if wxUSE_SPINBTN
 #if wxUSE_SPINBTN

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

     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, _T("&Show progress dialog"),
                                   wxPoint(300, 160) );
     m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, _T("&Show progress dialog"),
                                   wxPoint(300, 160) );

+#endif // wxUSE_PROGRESSDLG

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

-    m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, _T(""), wxPoint(200, 160), wxSize(80, -1) );
-    m_spinctrl->SetRange(10,30);
+    m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, wxEmptyString, wxPoint(200, 160), wxSize(80, wxDefaultCoord) );
+    m_spinctrl->SetRange(-10,30);

     m_spinctrl->SetValue(15);
 #endif // wxUSE_SPINCTRL
 
     m_spinctrl->SetValue(15);
 #endif // wxUSE_SPINCTRL
 

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

 
 

-    panel = new wxPanel(m_notebook);
+    panel = new wxPanel(m_book);

 
 #if !defined(__WXMOTIF__) // wxStaticBitmap not working under Motif yet.
     wxIcon icon = wxArtProvider::GetIcon(wxART_INFORMATION);
 
 #if !defined(__WXMOTIF__) // wxStaticBitmap not working under Motif yet.
     wxIcon icon = wxArtProvider::GetIcon(wxART_INFORMATION);


@@ -797,13 +968,16 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     wxBitmap bitmap( 100, 100 );
     wxMemoryDC dc;
     dc.SelectObject( bitmap );
     wxBitmap bitmap( 100, 100 );
     wxMemoryDC dc;
     dc.SelectObject( bitmap );

-    dc.SetPen(*wxGREEN_PEN);
+    dc.SetBackground(*wxGREEN);
+    dc.SetPen(*wxRED_PEN);

     dc.Clear();
     dc.DrawEllipse(5, 5, 90, 90);
     dc.DrawText(_T("Bitmap"), 30, 40);
     dc.SelectObject( wxNullBitmap );
 
     (void)new wxBitmapButton(panel, ID_BITMAP_BTN, bitmap, wxPoint(100, 20));
     dc.Clear();
     dc.DrawEllipse(5, 5, 90, 90);
     dc.DrawText(_T("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,
+                             _T("Enable/disable &bitmap"), wxPoint(100, 140));

 
 #if defined(__WXMSW__) || defined(__WXMOTIF__)
     // test for masked bitmap display
 
 #if defined(__WXMSW__) || defined(__WXMOTIF__)
     // test for masked bitmap display


@@ -812,7 +986,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     {
        bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
 
     {
        bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
 

-       (void)new wxStaticBitmap /* wxBitmapButton */ (panel, wxID_ANY, bitmap, wxPoint(300, 120));
+       (void)new wxStaticBitmap(panel, wxID_ANY, bitmap, wxPoint(300, 120));

     }
 #endif
 
     }
 #endif
 


@@ -829,32 +1003,24 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     bmpBtn->SetBitmapSelected(bmp2);
     bmpBtn->SetBitmapFocus(bmp3);
 
     bmpBtn->SetBitmapSelected(bmp2);
     bmpBtn->SetBitmapFocus(bmp3);
 

-#if wxUSE_TOGGLEBTN

     (void)new wxToggleButton(panel, ID_BUTTON_LABEL,
                              _T("&Toggle label"), wxPoint(250, 20));
     (void)new wxToggleButton(panel, ID_BUTTON_LABEL,
                              _T("&Toggle label"), wxPoint(250, 20));

-#else
-    (void)new wxCheckBox(panel, ID_BUTTON_LABEL,
-                         _T("&Toggle label"), wxPoint(250, 20));
-#endif // wxUSE_TOGGLEBTN

 
     m_label = new wxStaticText(panel, wxID_ANY, _T("Label with some long text"),
                                wxPoint(250, 60), wxDefaultSize,
                                wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/);
     m_label->SetForegroundColour( *wxBLUE );
 
 
     m_label = new wxStaticText(panel, wxID_ANY, _T("Label with some long text"),
                                wxPoint(250, 60), wxDefaultSize,
                                wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/);
     m_label->SetForegroundColour( *wxBLUE );
 

-    m_notebook->AddPage(panel, _T("wxBitmapXXX"));
+    m_book->AddPage(panel, _T("wxBitmapXXX"));

 
     // sizer
 
     // sizer

-
-    panel = new wxPanel(m_notebook);
-    panel->SetAutoLayout( true );
+    panel = new wxPanel(m_book);

 
     wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
 
     wxStaticBoxSizer *csizer =
 
     wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
 
     wxStaticBoxSizer *csizer =

-      new wxStaticBoxSizer (new wxStaticBox (panel, wxID_ANY, _T("Show Buttons")),
-                           wxHORIZONTAL );
-    
+      new wxStaticBoxSizer (new wxStaticBox (panel, wxID_ANY, _T("Show Buttons")), wxHORIZONTAL );
+

     wxCheckBox *check1, *check2, *check3, *check4, *check14, *checkBig;
     check1 = new wxCheckBox (panel, ID_SIZER_CHECK1, _T("1"));
     check1->SetValue (true);
     wxCheckBox *check1, *check2, *check3, *check4, *check14, *checkBig;
     check1 = new wxCheckBox (panel, ID_SIZER_CHECK1, _T("1"));
     check1->SetValue (true);


@@ -874,22 +1040,24 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     checkBig = new wxCheckBox (panel, ID_SIZER_CHECKBIG, _T("Big"));
     checkBig->SetValue (true);
     csizer->Add (checkBig);
     checkBig = new wxCheckBox (panel, ID_SIZER_CHECKBIG, _T("Big"));
     checkBig->SetValue (true);
     csizer->Add (checkBig);

-    
+

     sizer->Add (csizer);
 
     m_hsizer = new wxBoxSizer( wxHORIZONTAL );
 
     m_buttonSizer = new wxBoxSizer (wxVERTICAL);
     sizer->Add (csizer);
 
     m_hsizer = new wxBoxSizer( wxHORIZONTAL );
 
     m_buttonSizer = new wxBoxSizer (wxVERTICAL);

-    
-    m_sizerBtn1 = new wxButton(panel, wxID_ANY, _T("Test Button &1") );
+
+    m_sizerBtn1 = new wxButton(panel, wxID_ANY, _T("Test Button &1 (tab order 1)") );

     m_buttonSizer->Add( m_sizerBtn1, 0, wxALL, 10 );
     m_buttonSizer->Add( m_sizerBtn1, 0, wxALL, 10 );

-    m_sizerBtn2 = new wxButton(panel, wxID_ANY, _T("Test Button &2") );
+    m_sizerBtn2 = new wxButton(panel, wxID_ANY, _T("Test Button &2 (tab order 3)") );

     m_buttonSizer->Add( m_sizerBtn2, 0, wxALL, 10 );
     m_buttonSizer->Add( m_sizerBtn2, 0, wxALL, 10 );

-    m_sizerBtn3 = new wxButton(panel, wxID_ANY, _T("Test Button &3") );
+    m_sizerBtn3 = new wxButton(panel, wxID_ANY, _T("Test Button &3 (tab order 2)") );

     m_buttonSizer->Add( m_sizerBtn3, 0, wxALL, 10 );
     m_buttonSizer->Add( m_sizerBtn3, 0, wxALL, 10 );

-    m_sizerBtn4 = new wxButton(panel, wxID_ANY, _T("Test Button &4") );
+    m_sizerBtn4 = new wxButton(panel, wxID_ANY, _T("Test Button &4 (tab order 4)") );

     m_buttonSizer->Add( m_sizerBtn4, 0, wxALL, 10 );
 
     m_buttonSizer->Add( m_sizerBtn4, 0, wxALL, 10 );
 

+    m_sizerBtn3->MoveBeforeInTabOrder(m_sizerBtn2);
+

     m_hsizer->Add (m_buttonSizer);
     m_hsizer->Add( 20,20, 1 );
     m_bigBtn = new wxButton(panel, wxID_ANY, _T("Multiline\nbutton") );
     m_hsizer->Add (m_buttonSizer);
     m_hsizer->Add( 20,20, 1 );
     m_bigBtn = new wxButton(panel, wxID_ANY, _T("Multiline\nbutton") );


@@ -899,20 +1067,56 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     panel->SetSizer( sizer );
 
 
     panel->SetSizer( sizer );
 

-    m_notebook->AddPage(panel, _T("wxSizer"));
+    m_book->AddPage(panel, _T("wxSizer"));
+
+    // set the sizer for the panel itself
+    sizer = new wxBoxSizer(wxVERTICAL);
+    sizer->Add(m_book, wxSizerFlags().Border().Expand());
+    sizer->Add(m_text, wxSizerFlags(1).Border().Expand());
+    SetSizer(sizer);

 }
 
 }
 

-void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )
+void MyPanel::OnIdle(wxIdleEvent& event)

 {
 {

-    int x = 0;
-    int y = 0;
-    GetClientSize( &x, &y );
+    static const int INVALID_SELECTION = -2;
+
+    static int s_selCombo = INVALID_SELECTION;
+
+    if (!m_combo || !m_choice)
+    {
+        event.Skip();
+        return;
+    }
+
+    int sel = m_combo->GetSelection();
+    if ( sel != s_selCombo )
+    {
+        if ( s_selCombo != INVALID_SELECTION )
+        {
+            wxLogMessage(_T("EVT_IDLE: combobox selection changed from %d to %d"),
+                         s_selCombo, sel);
+        }
+
+        s_selCombo = sel;
+    }
+
+    static int s_selChoice = INVALID_SELECTION;
+    sel = m_choice->GetSelection();
+    if ( sel != s_selChoice )
+    {
+        if ( s_selChoice != INVALID_SELECTION )
+        {
+            wxLogMessage(_T("EVT_IDLE: choice selection changed from %d to %d"),
+                         s_selChoice, sel);
+        }

 
 

-    if (m_notebook) m_notebook->SetSize( 2, 2, x-4, y*2/3-4 );
-    if (m_text) m_text->SetSize( 2, y*2/3+2, x-4, y/3-4 );
+        s_selChoice = sel;
+    }
+
+    event.Skip();

 }
 
 }
 

-void MyPanel::OnPageChanging( wxNotebookEvent &event )
+void MyPanel::OnPageChanging( wxBookCtrlEvent &event )

 {
     int selOld = event.GetOldSelection();
     if ( selOld == 2 )
 {
     int selOld = event.GetOldSelection();
     if ( selOld == 2 )


@@ -929,16 +1133,16 @@ void MyPanel::OnPageChanging( wxNotebookEvent &event )
         }
     }
 
         }
     }
 

-    *m_text << _T("Notebook selection is being changed from ") << selOld
+    *m_text << _T("Book selection is being changed from ") << selOld

             << _T(" to ") << event.GetSelection()
             << _T(" to ") << event.GetSelection()

-            << _T(" (current page from notebook is ")
-            << m_notebook->GetSelection() << _T(")\n");
+            << _T(" (current page from book is ")
+            << m_book->GetSelection() << _T(")\n");

 }
 
 }
 

-void MyPanel::OnPageChanged( wxNotebookEvent &event )
+void MyPanel::OnPageChanged( wxBookCtrlEvent &event )

 {
 {

-    *m_text << _T("Notebook selection is now ") << event.GetSelection()
-            << _T(" (from notebook: ") << m_notebook->GetSelection()
+    *m_text << _T("Book selection is now ") << event.GetSelection()
+            << _T(" (from book: ") << m_book->GetSelection()

             << _T(")\n");
 }
 
             << _T(")\n");
 }
 


@@ -953,18 +1157,24 @@ void MyPanel::OnBmpButton(wxCommandEvent& WXUNUSED(event))
     wxLogMessage(_T("Bitmap button clicked."));
 }
 
     wxLogMessage(_T("Bitmap button clicked."));
 }
 

+void MyPanel::OnBmpButtonToggle(wxCommandEvent& event)
+{
+    FindWindow(ID_BITMAP_BTN)->Enable(!event.IsChecked());
+}
+

 void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
 {
     static wxColour s_colOld;
 
 void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
 {
     static wxColour s_colOld;
 

+    SetThemeEnabled(false);

     // test panel colour changing and propagation to the subcontrols
     if ( s_colOld.Ok() )
     {
         SetBackgroundColour(s_colOld);
         s_colOld = wxNullColour;
 
     // test panel colour changing and propagation to the subcontrols
     if ( s_colOld.Ok() )
     {
         SetBackgroundColour(s_colOld);
         s_colOld = wxNullColour;
 

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

     }
     else
     {
     }
     else
     {


@@ -981,23 +1191,29 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
 
 void MyPanel::OnListBox( wxCommandEvent &event )
 {
 
 void MyPanel::OnListBox( wxCommandEvent &event )
 {

-//    GetParent()->Move(100, 100);
+    wxListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox
+                                                     : m_listboxSorted;

 
 

-    if (event.GetInt() == -1)
+    bool deselect = false;
+    if (listbox->HasFlag(wxLB_MULTIPLE) || listbox->HasFlag(wxLB_EXTENDED))

     {
     {

-        m_text->AppendText( _T("ListBox has no selections anymore\n") );
-        return;
+        deselect = !event.IsSelection();
+        if (deselect)
+            m_text->AppendText( _T("ListBox deselection event\n") );

     }
 
     }
 

-    wxListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox
-                                                     : m_listboxSorted;
-

     m_text->AppendText( _T("ListBox event selection string is: '") );
     m_text->AppendText( event.GetString() );
     m_text->AppendText( _T("'\n") );
     m_text->AppendText( _T("ListBox event selection string is: '") );
     m_text->AppendText( event.GetString() );
     m_text->AppendText( _T("'\n") );

-    m_text->AppendText( _T("ListBox control selection string is: '") );
-    m_text->AppendText( listbox->GetStringSelection() );
-    m_text->AppendText( _T("'\n") );
+
+    // can't use GetStringSelection() with multiple selections, there could be
+    // more than one of them
+    if ( !listbox->HasFlag(wxLB_MULTIPLE) && !listbox->HasFlag(wxLB_EXTENDED) )
+    {
+        m_text->AppendText( _T("ListBox control selection string is: '") );
+        m_text->AppendText( listbox->GetStringSelection() );
+        m_text->AppendText( _T("'\n") );
+    }

 
     wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
     m_text->AppendText( _T("ListBox event client data string is: '") );
 
     wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
     m_text->AppendText( _T("ListBox event client data string is: '") );


@@ -1008,7 +1224,7 @@ void MyPanel::OnListBox( wxCommandEvent &event )
 
     m_text->AppendText( _T("'\n") );
     m_text->AppendText( _T("ListBox control client data string is: '") );
 
     m_text->AppendText( _T("'\n") );
     m_text->AppendText( _T("ListBox control client data string is: '") );

-    obj = (wxStringClientData *)listbox->GetClientObject(listbox->GetSelection());
+    obj = (wxStringClientData *)listbox->GetClientObject(event.GetInt());

     if (obj)
         m_text->AppendText( obj->GetData() );
     else
     if (obj)
         m_text->AppendText( obj->GetData() );
     else


@@ -1055,9 +1271,9 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
             }
         case ID_LISTBOX_SEL_STR:
             {
             }
         case ID_LISTBOX_SEL_STR:
             {

-                if (m_listbox->FindString(_T("This")) > -1)
+                if (m_listbox->FindString(_T("This")) != wxNOT_FOUND)

                     m_listbox->SetStringSelection( _T("This") );
                     m_listbox->SetStringSelection( _T("This") );

-                if (m_listboxSorted->FindString(_T("This")) > -1)
+                if (m_listboxSorted->FindString(_T("This")) != wxNOT_FOUND)

                     m_listboxSorted->SetStringSelection( _T("This") );
                 m_lbSelectNum->WarpPointer( 40, 14 );
                 break;
                     m_listboxSorted->SetStringSelection( _T("This") );
                 m_lbSelectNum->WarpPointer( 40, 14 );
                 break;


@@ -1070,8 +1286,8 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
             }
         case ID_LISTBOX_APPEND:
             {
             }
         case ID_LISTBOX_APPEND:
             {

-                m_listbox->Append( _T("Hi!") );
-                m_listboxSorted->Append( _T("Hi!") );
+                m_listbox->Append( _T("Hi kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk!") );
+                m_listboxSorted->Append( _T("Hi hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh!") );

                 break;
             }
         case ID_LISTBOX_DELETE:
                 break;
             }
         case ID_LISTBOX_DELETE:


@@ -1096,35 +1312,32 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
 }
 
 #if wxUSE_CHOICE
 }
 
 #if wxUSE_CHOICE

+
+static wxString GetDataString(wxClientData *data)
+{
+    return data ? static_cast<wxStringClientData *>(data)->GetData()
+                : wxString("none");
+}
+

 void MyPanel::OnChoice( wxCommandEvent &event )
 {
     wxChoice *choice = event.GetId() == ID_CHOICE ? m_choice
                                                   : m_choiceSorted;
 
 void MyPanel::OnChoice( wxCommandEvent &event )
 {
     wxChoice *choice = event.GetId() == ID_CHOICE ? m_choice
                                                   : m_choiceSorted;
 

-    m_text->AppendText( _T("Choice event selection string is: '") );
-    m_text->AppendText( event.GetString() );
-    m_text->AppendText( _T("'\n") );
-    m_text->AppendText( _T("Choice control selection string is: '") );
-    m_text->AppendText( choice->GetStringSelection() );
-    m_text->AppendText( _T("'\n") );
-
-    wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
-    m_text->AppendText( _T("Choice event client data string is: '") );
-
-    if (obj)
-       m_text->AppendText( obj->GetData() );
-    else
-       m_text->AppendText( wxString(_T("none")) );
+    const int sel = choice->GetSelection();

 
 

-    m_text->AppendText( _T("'\n") );
-    m_text->AppendText( _T("Choice control client data string is: '") );
-    obj = (wxStringClientData *)choice->GetClientObject(choice->GetSelection());
+    wxClientData *dataEvt = event.GetClientObject(),
+                 *dataCtrl = choice->GetClientObject(sel);

 
 

-    if (obj)
-       m_text->AppendText( obj->GetData() );
-    else
-       m_text->AppendText( wxString(_T("none")) );
-    m_text->AppendText( _T("'\n") );
+    wxLogMessage(_T("EVT_CHOICE: item %d/%d (event/control), ")
+                 _T("string \"%s\"/\"%s\", ")
+                 _T("data \"%s\"/\"%s\""),
+                 (int)event.GetInt(),
+                 sel,
+                 event.GetString(),
+                 choice->GetStringSelection(),
+                 GetDataString(dataEvt),
+                 GetDataString(dataCtrl));

 }
 
 void MyPanel::OnChoiceButtons( wxCommandEvent &event )
 }
 
 void MyPanel::OnChoiceButtons( wxCommandEvent &event )


@@ -1183,26 +1396,29 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
 
 void MyPanel::OnCombo( wxCommandEvent &event )
 {
 
 void MyPanel::OnCombo( wxCommandEvent &event )
 {

-    m_text->AppendText( _T("ComboBox event selection string is: ") );
-    m_text->AppendText( event.GetString() );
-    m_text->AppendText( _T("\n") );
-    m_text->AppendText( _T("ComboBox control selection string is: ") );
-    m_text->AppendText( m_combo->GetStringSelection() );
-    m_text->AppendText( _T("\n") );
+    if (!m_combo)
+        return;
+    
+    wxLogMessage(_T("EVT_COMBOBOX: item %d/%d (event/control), string \"%s\"/\"%s\""),
+                 (int)event.GetInt(),
+                 m_combo->GetSelection(),
+                 event.GetString().c_str(),
+                 m_combo->GetStringSelection().c_str());

 }
 
 void MyPanel::OnComboTextChanged(wxCommandEvent& event)
 {
 }
 
 void MyPanel::OnComboTextChanged(wxCommandEvent& event)
 {

-    wxString str;
-    str.Printf( wxT("Text in the combobox changed: now is '%s'."),
-                event.GetString().c_str() );
-    wxLogMessage( str.c_str() );
+    if (m_combo)
+        wxLogMessage(wxT("EVT_TEXT for the combobox: \"%s\" (event) or \"%s\" (control)."),
+                     event.GetString().c_str(),
+                     m_combo->GetValue().c_str());

 }
 
 void MyPanel::OnComboTextEnter(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyPanel::OnComboTextEnter(wxCommandEvent& WXUNUSED(event))
 {

-    wxLogMessage(_T("Enter pressed in the combobox: value is '%s'."),
-                 m_combo->GetValue().c_str());
+    if (m_combo)
+        wxLogMessage(_T("Enter pressed in the combobox: value is '%s'."),
+                     m_combo->GetValue().c_str());

 }
 
 void MyPanel::OnComboButtons( wxCommandEvent &event )
 }
 
 void MyPanel::OnComboButtons( wxCommandEvent &event )


@@ -1245,6 +1461,11 @@ void MyPanel::OnComboButtons( wxCommandEvent &event )
                 m_combo->SetFont( *wxITALIC_FONT );
                 break;
             }
                 m_combo->SetFont( *wxITALIC_FONT );
                 break;
             }

+        case ID_COMBO_SET_TEXT:
+            {
+                m_combo->SetString( 2, wxT("Hi!") );
+                break;
+            }

     }
 }
 
     }
 }
 


@@ -1270,27 +1491,20 @@ void MyPanel::OnRadioButtons( wxCommandEvent &event )
     switch (event.GetId())
     {
         case ID_RADIOBOX_ENABLE:
     switch (event.GetId())
     {
         case ID_RADIOBOX_ENABLE:

-            {
-                m_radio->Enable( event.GetInt() == 0 );
-                break;
-            }
+            m_radio->Enable( event.GetInt() == 0 );
+            break;
+

         case ID_RADIOBOX_SEL_NUM:
         case ID_RADIOBOX_SEL_NUM:

-            {
-                m_radio->SetSelection( 2 );
-                break;
-            }
+            m_radio->SetSelection( 2 );
+            break;
+

         case ID_RADIOBOX_SEL_STR:
         case ID_RADIOBOX_SEL_STR:

-            {
-                m_radio->SetStringSelection( _T("This") );
-                break;
-            }
-        case ID_RADIOBOX_FONT:
-            {
-                    m_radio->SetForegroundColour(*wxGREEN);
+            m_radio->SetStringSelection( _T("This") );
+            break;

 
 

-                m_radio->SetFont( *wxITALIC_FONT );
-                break;
-            }
+        case ID_RADIOBOX_FONT:
+            m_radio->SetFont( *wxITALIC_FONT );
+            break;

     }
 }
 
     }
 }
 


@@ -1306,12 +1520,18 @@ void MyPanel::OnUpdateLabel( wxCommandEvent &event )
                                      : _T("Shorter text."));
 }
 
                                      : _T("Shorter text."));
 }
 

+#if wxUSE_SLIDER
+

 void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
 {
 void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
 {

+#if wxUSE_GAUGE

     m_gauge->SetValue( m_slider->GetValue() );
     m_gaugeVert->SetValue( m_slider->GetValue() / 2 );
     m_gauge->SetValue( m_slider->GetValue() );
     m_gaugeVert->SetValue( m_slider->GetValue() / 2 );

+#endif // wxUSE_GAUGE

 }
 
 }
 

+#endif // wxUSE_SLIDER
+

 #if wxUSE_SPINCTRL
 
 void MyPanel::OnSpinCtrlText(wxCommandEvent& event)
 #if wxUSE_SPINCTRL
 
 void MyPanel::OnSpinCtrlText(wxCommandEvent& event)


@@ -1330,7 +1550,7 @@ void MyPanel::OnSpinCtrl(wxSpinEvent& event)
     if ( m_spinctrl )
     {
         wxString s;
     if ( m_spinctrl )
     {
         wxString s;

-        s.Printf( _T("Spin ctrl changed: now %d (from event: %ld)\n"),
+        s.Printf( _T("Spin ctrl changed: now %d (from event: %d)\n"),

                  m_spinctrl->GetValue(), event.GetInt() );
         m_text->AppendText(s);
     }
                  m_spinctrl->GetValue(), event.GetInt() );
         m_text->AppendText(s);
     }


@@ -1341,7 +1561,7 @@ void MyPanel::OnSpinCtrlUp(wxSpinEvent& event)
     if ( m_spinctrl )
     {
         m_text->AppendText( wxString::Format(
     if ( m_spinctrl )
     {
         m_text->AppendText( wxString::Format(

-            _T("Spin up: %d (from event: %ld)\n"),
+            _T("Spin up: %d (from event: %d)\n"),

             m_spinctrl->GetValue(), event.GetInt() ) );
     }
 }
             m_spinctrl->GetValue(), event.GetInt() ) );
     }
 }


@@ -1351,7 +1571,7 @@ void MyPanel::OnSpinCtrlDown(wxSpinEvent& event)
     if ( m_spinctrl )
     {
         m_text->AppendText( wxString::Format(
     if ( m_spinctrl )
     {
         m_text->AppendText( wxString::Format(

-            _T("Spin down: %d (from event: %ld)\n"),
+            _T("Spin down: %d (from event: %d)\n"),

             m_spinctrl->GetValue(), event.GetInt() ) );
     }
 }
             m_spinctrl->GetValue(), event.GetInt() ) );
     }
 }


@@ -1404,6 +1624,15 @@ void MyPanel::OnSpinUpdate( wxSpinEvent &event )
     m_text->AppendText(value);
 }
 
     m_text->AppendText(value);
 }
 

+void MyPanel::OnNewText( wxCommandEvent& /* event */)
+{
+    m_nonWrappingText->SetLabel( wxT("This text is short\nbut still spans\nover three lines.") );
+    m_wrappingText->SetLabel( wxT("This text is short but will still be wrapped if it is too long.") );
+    m_wrappingText->GetParent()->Layout();
+}
+
+#if wxUSE_PROGRESSDLG
+

 void MyPanel::OnUpdateShowProgress( wxUpdateUIEvent& event )
 {
     event.Enable( m_spinbutton->GetValue() > 0 );
 void MyPanel::OnUpdateShowProgress( wxUpdateUIEvent& event )
 {
     event.Enable( m_spinbutton->GetValue() > 0 );


@@ -1412,13 +1641,13 @@ void MyPanel::OnUpdateShowProgress( wxUpdateUIEvent& event )
 void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
 {
     int max = m_spinbutton->GetValue();
 void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
 {
     int max = m_spinbutton->GetValue();

-    
+

     if ( max <= 0 )
     {
         wxLogError(_T("You must set positive range!"));
         return;
     }
     if ( max <= 0 )
     {
         wxLogError(_T("You must set positive range!"));
         return;
     }

-    
+

     wxProgressDialog dialog(_T("Progress dialog example"),
                             _T("An informative message"),
                             max,    // range
     wxProgressDialog dialog(_T("Progress dialog example"),
                             _T("An informative message"),
                             max,    // range


@@ -1459,6 +1688,7 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
     }
 }
 
     }
 }
 

+#endif // wxUSE_PROGRESSDLG

 #endif // wxUSE_SPINBTN
 
 void MyPanel::OnSizerCheck( wxCommandEvent &event)
 #endif // wxUSE_SPINBTN
 
 void MyPanel::OnSizerCheck( wxCommandEvent &event)


@@ -1497,7 +1727,7 @@ MyPanel::~MyPanel()
     //wxLog::RemoveTraceMask(_T("focus"));
     delete wxLog::SetActiveTarget(m_logTargetOld);
 
     //wxLog::RemoveTraceMask(_T("focus"));
     delete wxLog::SetActiveTarget(m_logTargetOld);
 

-    delete m_notebook->GetImageList();
+    delete m_book->GetImageList();

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


@@ -1514,7 +1744,12 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 #endif // wxUSE_TOOLTIPS
 
     EVT_MENU(CONTROLS_ENABLE_ALL, MyFrame::OnEnableAll)
 #endif // wxUSE_TOOLTIPS
 
     EVT_MENU(CONTROLS_ENABLE_ALL, MyFrame::OnEnableAll)

+    EVT_MENU(CONTROLS_HIDE_ALL,   MyFrame::OnHideAll)
+    EVT_MENU(CONTROLS_HIDE_LIST,   MyFrame::OnHideList)
+    EVT_MENU(CONTROLS_CONTEXT_HELP, MyFrame::OnContextHelp)

 
 

+    EVT_ICONIZE(MyFrame::OnIconized)
+    EVT_MAXIMIZE(MyFrame::OnMaximized)

     EVT_SIZE(MyFrame::OnSize)
     EVT_MOVE(MyFrame::OnMove)
 
     EVT_SIZE(MyFrame::OnSize)
     EVT_MOVE(MyFrame::OnMove)
 


@@ -1522,8 +1757,10 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame(const wxChar *title, int x, int y)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame(const wxChar *title, int x, int y)

-       : wxFrame(NULL, wxID_ANY, title, wxPoint(x, y), wxSize(500, 430))
+       : wxFrame(NULL, wxID_ANY, title, wxPoint(x, y), wxSize(700, 450))

 {
 {

+    SetHelpText( _T("Controls sample demonstrating various widgets") );
+

     // Give it an icon
     // The wxICON() macros loads an icon from a resource under Windows
     // and uses an #included XPM image under GTK+ and Motif
     // Give it an icon
     // The wxICON() macros loads an icon from a resource under Windows
     // and uses an #included XPM image under GTK+ and Motif


@@ -1556,15 +1793,21 @@ MyFrame::MyFrame(const wxChar *title, int x, int y)
     wxMenu *panel_menu = new wxMenu;
     panel_menu->Append(CONTROLS_ENABLE_ALL, _T("&Disable all\tCtrl-E"),
                        _T("Enable/disable all panel controls"), true);
     wxMenu *panel_menu = new wxMenu;
     panel_menu->Append(CONTROLS_ENABLE_ALL, _T("&Disable all\tCtrl-E"),
                        _T("Enable/disable all panel controls"), true);

+    panel_menu->Append(CONTROLS_HIDE_ALL, _T("&Hide all\tCtrl-I"),
+                       _T("Show/hide thoe whole panel controls"), true);
+    panel_menu->Append(CONTROLS_HIDE_LIST, _T("Hide &list ctrl\tCtrl-S"),
+                       _T("Enable/disable all panel controls"), true);
+    panel_menu->Append(CONTROLS_CONTEXT_HELP, _T("&Context help...\tCtrl-H"),
+                       _T("Get context help for a control"));

     menu_bar->Append(panel_menu, _T("&Panel"));
 
     SetMenuBar(menu_bar);
 
     menu_bar->Append(panel_menu, _T("&Panel"));
 
     SetMenuBar(menu_bar);
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(2);
     CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
     m_panel = new MyPanel( this, 10, 10, 300, 100 );
 
     m_panel = new MyPanel( this, 10, 10, 300, 100 );

-
-    SetSizeHints( 500, 425 );

 }
 
 void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) )
 }
 
 void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) )


@@ -1625,18 +1868,65 @@ void MyFrame::OnEnableAll(wxCommandEvent& WXUNUSED(event))
 
     s_enable = !s_enable;
     m_panel->Enable(s_enable);
 
     s_enable = !s_enable;
     m_panel->Enable(s_enable);

+    static bool s_enableCheckbox = true;
+    if ( !s_enable )
+    {
+        // this is a test for correct behaviour of either enabling or disabling
+        // a child when its parent is disabled: the checkbox should have the
+        // correct state when the parent is enabled back
+        m_panel->m_checkbox->Enable(s_enableCheckbox);
+        s_enableCheckbox = !s_enableCheckbox;
+    }
+}
+
+void MyFrame::OnHideAll(wxCommandEvent& WXUNUSED(event))
+{
+    static bool s_show = true;
+
+    s_show = !s_show;
+    m_panel->Show(s_show);
+}
+
+void MyFrame::OnHideList(wxCommandEvent& WXUNUSED(event))
+{
+    static bool s_show = true;
+
+    s_show = !s_show;
+    m_panel->m_listbox->Show(s_show);
+}
+
+void MyFrame::OnContextHelp(wxCommandEvent& WXUNUSED(event))
+{
+    // starts a local event loop
+    wxContextHelp chelp(this);

 }
 
 void MyFrame::OnMove( wxMoveEvent& event )
 {
 }
 
 void MyFrame::OnMove( wxMoveEvent& event )
 {

+#if wxUSE_STATUSBAR

     UpdateStatusBar(event.GetPosition(), GetSize());
     UpdateStatusBar(event.GetPosition(), GetSize());

+#endif // wxUSE_STATUSBAR

 
     event.Skip();
 }
 
 
     event.Skip();
 }
 

+void MyFrame::OnIconized( wxIconizeEvent& event )
+{
+    wxLogMessage(_T("Frame %s"), event.IsIconized() ? _T("iconized")
+                                                    : _T("restored"));
+    event.Skip();
+}
+
+void MyFrame::OnMaximized( wxMaximizeEvent& WXUNUSED(event) )
+{
+    wxLogMessage(_T("Frame maximized"));
+}
+

 void MyFrame::OnSize( wxSizeEvent& event )
 {
 void MyFrame::OnSize( wxSizeEvent& event )
 {

+#if wxUSE_STATUSBAR

     UpdateStatusBar(GetPosition(), event.GetSize());
     UpdateStatusBar(GetPosition(), event.GetSize());

+#endif // wxUSE_STATUSBAR

 
     event.Skip();
 }
 
     event.Skip();
 }


@@ -1644,26 +1934,34 @@ void MyFrame::OnSize( wxSizeEvent& event )
 void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 {
     // track the window which has the focus in the status bar
 void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 {
     // track the window which has the focus in the status bar

-    static wxWindow *s_windowFocus = (wxWindow *)NULL;
+    static wxWindow *s_windowFocus = NULL;

     wxWindow *focus = wxWindow::FindFocus();
     wxWindow *focus = wxWindow::FindFocus();

-    if ( focus && (focus != s_windowFocus) )
+    if ( focus != s_windowFocus )

     {
         s_windowFocus = focus;
 
         wxString msg;
     {
         s_windowFocus = focus;
 
         wxString msg;

-        msg.Printf(
+        if ( focus )
+        {
+            msg.Printf(
+                    _T("Focus: %s")

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-                _T("Focus: %s, HWND = %08x"),
-#else
-                _T("Focus: %s"),
+                    , _T(", HWND = %08x")

 #endif
 #endif

-                s_windowFocus->GetClassInfo()->GetClassName()
+                    , s_windowFocus->GetName().c_str()

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-                , (unsigned int) s_windowFocus->GetHWND()
+                    , (unsigned int) s_windowFocus->GetHWND()

 #endif
 #endif

-                  );
+                      );
+        }
+        else
+        {
+            msg = _T("No focus");
+        }

 
 

+#if wxUSE_STATUSBAR

         SetStatusText(msg);
         SetStatusText(msg);

+#endif // wxUSE_STATUSBAR

     }
 }
 
     }
 }