HasFlag is not set at this point

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index c5be4c74fa62c813d6786fe626206e4139c178d1..098505621e695fe6be235908e581d67a72e17003 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$


@@ -8,10 +8,6 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "controls.h"
-#endif
-

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


@@ -49,17 +45,9 @@
     #include "icons/gauge.xpm"
 #endif
 
     #include "icons/gauge.xpm"
 #endif
 

-#ifdef __WIN16__
-    // Win16 doesn't have them
-    #ifdef wxUSE_SPINBTN
-    #undef wxUSE_SPINBTN
-    #endif
-    #define wxUSE_SPINBTN 0
-#else
-    #ifndef wxUSE_SPINBTN
+#ifndef wxUSE_SPINBTN

     #define wxUSE_SPINBTN 1
     #define wxUSE_SPINBTN 1

-    #endif
-#endif // __WIN16__
+#endif

 
 #include "wx/progdlg.h"
 
 
 #include "wx/progdlg.h"
 


@@ -97,6 +85,8 @@ public:
     void OnComboButtons( wxCommandEvent &event );
     void OnRadio( wxCommandEvent &event );
     void OnRadioButtons( wxCommandEvent &event );
     void OnComboButtons( wxCommandEvent &event );
     void OnRadio( wxCommandEvent &event );
     void OnRadioButtons( wxCommandEvent &event );

+    void OnRadioButton1( wxCommandEvent &event );
+    void OnRadioButton2( wxCommandEvent &event );

     void OnSetFont( wxCommandEvent &event );
     void OnPageChanged( wxNotebookEvent &event );
     void OnPageChanging( wxNotebookEvent &event );
     void OnSetFont( wxCommandEvent &event );
     void OnPageChanged( wxNotebookEvent &event );
     void OnPageChanging( wxNotebookEvent &event );


@@ -112,6 +102,9 @@ public:
 
 #if wxUSE_SPINCTRL
     void OnSpinCtrl(wxSpinEvent& event);
 
 #if wxUSE_SPINCTRL
     void OnSpinCtrl(wxSpinEvent& event);

+    void OnSpinCtrlUp(wxSpinEvent& event);
+    void OnSpinCtrlDown(wxSpinEvent& event);
+    void OnSpinCtrlText(wxCommandEvent& event);

 #endif // wxUSE_SPINCTRL
 
     void OnEnableAll(wxCommandEvent& event);
 #endif // wxUSE_SPINCTRL
 
     void OnEnableAll(wxCommandEvent& event);


@@ -119,12 +112,15 @@ public:
     void OnTestButton(wxCommandEvent& event);
     void OnBmpButton(wxCommandEvent& event);
 
     void OnTestButton(wxCommandEvent& event);
     void OnBmpButton(wxCommandEvent& event);
 

+    void OnSizerCheck (wxCommandEvent &event);
+

     wxListBox     *m_listbox,
                   *m_listboxSorted;
 #if wxUSE_CHOICE
     wxChoice      *m_choice,
                   *m_choiceSorted;
     wxListBox     *m_listbox,
                   *m_listboxSorted;
 #if wxUSE_CHOICE
     wxChoice      *m_choice,
                   *m_choiceSorted;

-#endif
+#endif // wxUSE_CHOICE
+

     wxComboBox    *m_combo;
     wxRadioBox    *m_radio;
     wxGauge       *m_gauge,
     wxComboBox    *m_combo;
     wxRadioBox    *m_radio;
     wxGauge       *m_gauge,


@@ -150,6 +146,14 @@ public:
 
     wxStaticText  *m_label;
 
 
     wxStaticText  *m_label;
 

+    wxBoxSizer    *m_buttonSizer;
+    wxButton      *m_sizerBtn1;
+    wxButton      *m_sizerBtn2;
+    wxButton      *m_sizerBtn3;
+    wxButton      *m_sizerBtn4;
+    wxBoxSizer    *m_hsizer;
+    wxButton      *m_bigBtn;
+

 private:
     wxLog *m_logTargetOld;
 
 private:
     wxLog *m_logTargetOld;
 


@@ -159,7 +163,7 @@ private:
 class MyFrame: public wxFrame
 {
 public:
 class MyFrame: public wxFrame
 {
 public:

-    MyFrame(const char *title, int x, int y);
+    MyFrame(const wxChar *title, int x, int y);

 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);


@@ -179,6 +183,7 @@ public:
     MyPanel *GetPanel() const { return m_panel; }
 
 private:
     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 )


@@ -194,6 +199,7 @@ private:
             SetStatusText(msg, 1);
         }
     }
             SetStatusText(msg, 1);
         }
     }

+#endif // wxUSE_STATUSBAR

 
     MyPanel *m_panel;
 
 
     MyPanel *m_panel;
 


@@ -269,7 +275,7 @@ 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) { }
+                     style, validator, name) { SetForegroundColour(*wxRED); }

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


@@ -295,7 +301,10 @@ private:
 //----------------------------------------------------------------------
 
 static void SetListboxClientData(const wxChar *name, wxListBox *control);
 //----------------------------------------------------------------------
 
 static void SetListboxClientData(const wxChar *name, wxListBox *control);

+
+#if wxUSE_CHOICE

 static void SetChoiceClientData(const wxChar *name, wxChoice *control);
 static void SetChoiceClientData(const wxChar *name, wxChoice *control);

+#endif // wxUSE_CHOICE

 
 IMPLEMENT_APP(MyApp)
 
 
 IMPLEMENT_APP(MyApp)
 


@@ -322,7 +331,7 @@ bool MyApp::OnInit()
 {
     // use standard command line handling:
     if ( !wxApp::OnInit() )
 {
     // use standard command line handling:
     if ( !wxApp::OnInit() )

-        return FALSE;
+        return false;

 
     // parse the cmd line
     int x = 50,
 
     // parse the cmd line
     int x = 50,


@@ -334,10 +343,10 @@ bool MyApp::OnInit()
     }
 
     // Create the main frame window
     }
 
     // Create the main frame window

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

 
 

-    return TRUE;
+    return true;

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


@@ -400,6 +409,13 @@ const int  ID_BITMAP_BTN        = 192;
 
 const int  ID_CHANGE_COLOUR     = 200;
 
 
 const int  ID_CHANGE_COLOUR     = 200;
 

+const int  ID_SIZER_CHECK1      = 201;
+const int  ID_SIZER_CHECK2      = 202;
+const int  ID_SIZER_CHECK3      = 203;
+const int  ID_SIZER_CHECK4      = 204;
+const int  ID_SIZER_CHECK14     = 205;
+const int  ID_SIZER_CHECKBIG    = 206;
+

 BEGIN_EVENT_TABLE(MyPanel, wxPanel)
 EVT_SIZE      (                         MyPanel::OnSize)
 EVT_NOTEBOOK_PAGE_CHANGING(ID_NOTEBOOK, MyPanel::OnPageChanging)
 BEGIN_EVENT_TABLE(MyPanel, wxPanel)
 EVT_SIZE      (                         MyPanel::OnSize)
 EVT_NOTEBOOK_PAGE_CHANGING(ID_NOTEBOOK, MyPanel::OnPageChanging)


@@ -440,6 +456,8 @@ EVT_BUTTON    (ID_RADIOBOX_SEL_NUM,     MyPanel::OnRadioButtons)
 EVT_BUTTON    (ID_RADIOBOX_SEL_STR,     MyPanel::OnRadioButtons)
 EVT_BUTTON    (ID_RADIOBOX_FONT,        MyPanel::OnRadioButtons)
 EVT_CHECKBOX  (ID_RADIOBOX_ENABLE,      MyPanel::OnRadioButtons)
 EVT_BUTTON    (ID_RADIOBOX_SEL_STR,     MyPanel::OnRadioButtons)
 EVT_BUTTON    (ID_RADIOBOX_FONT,        MyPanel::OnRadioButtons)
 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_SLIDER    (ID_SLIDER,               MyPanel::OnSliderUpdate)
 #if wxUSE_SPINBTN
 EVT_BUTTON    (ID_SET_FONT,             MyPanel::OnSetFont)
 EVT_SLIDER    (ID_SLIDER,               MyPanel::OnSliderUpdate)
 #if wxUSE_SPINBTN


@@ -451,14 +469,27 @@ EVT_BUTTON    (ID_BTNPROGRESS,          MyPanel::OnShowProgress)
 #endif // wxUSE_SPINBTN
 #if wxUSE_SPINCTRL
 EVT_SPINCTRL  (ID_SPINCTRL,             MyPanel::OnSpinCtrl)
 #endif // wxUSE_SPINBTN
 #if wxUSE_SPINCTRL
 EVT_SPINCTRL  (ID_SPINCTRL,             MyPanel::OnSpinCtrl)

+EVT_SPIN_UP   (ID_SPINCTRL,             MyPanel::OnSpinCtrlUp)
+EVT_SPIN_DOWN (ID_SPINCTRL,             MyPanel::OnSpinCtrlDown)
+EVT_TEXT      (ID_SPINCTRL,             MyPanel::OnSpinCtrlText)

 #endif // wxUSE_SPINCTRL
 #if wxUSE_TOGGLEBTN
 EVT_TOGGLEBUTTON(ID_BUTTON_LABEL,       MyPanel::OnUpdateLabel)
 #endif // wxUSE_SPINCTRL
 #if wxUSE_TOGGLEBTN
 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)
 #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_SIZER_CHECK1,         MyPanel::OnSizerCheck)
+EVT_CHECKBOX  (ID_SIZER_CHECK2,         MyPanel::OnSizerCheck)
+EVT_CHECKBOX  (ID_SIZER_CHECK3,         MyPanel::OnSizerCheck)
+EVT_CHECKBOX  (ID_SIZER_CHECK4,         MyPanel::OnSizerCheck)
+EVT_CHECKBOX  (ID_SIZER_CHECK14,        MyPanel::OnSizerCheck)
+EVT_CHECKBOX  (ID_SIZER_CHECKBIG,       MyPanel::OnSizerCheck)
+

 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyButton, wxButton)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyButton, wxButton)


@@ -483,7 +514,7 @@ END_EVENT_TABLE()
 // ============================================================================
 
 MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 // ============================================================================
 
 MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )

-       : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) )
+       : wxPanel( frame, wxID_ANY, wxPoint(x, y), wxSize(w, h) )

 {
     m_listbox = NULL;
     m_listboxSorted = NULL;
 {
     m_listbox = NULL;
     m_listboxSorted = NULL;


@@ -512,23 +543,21 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_notebook = NULL;
     m_label = NULL;
 
     m_notebook = NULL;
     m_label = NULL;
 

-    m_text = new wxTextCtrl(this, -1, "This is the log window.\n",
+    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"));
 
                             wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE);
     m_text->SetBackgroundColour(wxT("wheat"));
 

-    if ( 0 )
-        wxLog::AddTraceMask(_T("focus"));

     m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text));
 
     m_notebook = new wxNotebook(this, ID_NOTEBOOK);
 
     wxString choices[] =
     {
     m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text));
 
     m_notebook = new wxNotebook(this, ID_NOTEBOOK);
 
     wxString choices[] =
     {

-        "This",
-        "is one of my",
-        "really",
-        "wonderful",
-        "examples."
+        _T("This"),
+        _T("is one of my"),
+        _T("really"),
+        _T("wonderful"),
+        _T("examples.")

     };
 
 #ifdef USE_XPM
     };
 
 #ifdef USE_XPM


@@ -539,9 +568,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     };
 
     // fill the image list
     };
 
     // fill the image list

-    wxImageList *imagelist = new wxImageList(32, 32);
+    wxBitmap bmp(list_xpm);
+
+    wxImageList *imagelist = new wxImageList(bmp.GetWidth(), bmp.GetHeight());

 
 

-    imagelist-> Add( wxBitmap( list_xpm ));
+    imagelist-> Add( bmp );

     imagelist-> Add( wxBitmap( choice_xpm ));
     imagelist-> Add( wxBitmap( combo_xpm ));
     imagelist-> Add( wxBitmap( text_xpm ));
     imagelist-> Add( wxBitmap( choice_xpm ));
     imagelist-> Add( wxBitmap( combo_xpm ));
     imagelist-> Add( wxBitmap( text_xpm ));


@@ -554,11 +585,12 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     {
         Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max
     };
     {
         Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max
     };

-    wxImageList *imagelist = new wxImageList(16, 16, FALSE, Image_Max);
+    wxImageList *imagelist = new wxImageList(16, 16, false, Image_Max);

 
 

-    static const char *s_iconNames[Image_Max] =
+    static const wxChar *s_iconNames[Image_Max] =

     {
     {

-        "list", "choice", "combo", "text", "radio", "gauge"
+        _T("list"), _T("choice"), _T("combo"), _T("text"), _T("radio"),
+        _T("gauge")

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


@@ -598,38 +630,38 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     m_listbox->SetCursor(*wxCROSS_CURSOR);
 #if wxUSE_TOOLTIPS
 
     m_listbox->SetCursor(*wxCROSS_CURSOR);
 #if wxUSE_TOOLTIPS

-    m_listbox->SetToolTip( "This is a list box" );
+    m_listbox->SetToolTip( _T("This is a list box") );

 #endif // wxUSE_TOOLTIPS
 
 #endif // wxUSE_TOOLTIPS
 

-    m_lbSelectNum = new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) );
-    m_lbSelectThis = new wxButton( panel, ID_LISTBOX_SEL_STR, "&Select 'This'", wxPoint(340,30), wxSize(140,30) );
-    (void)new wxButton( panel, ID_LISTBOX_CLEAR, "&Clear", wxPoint(180,80), wxSize(140,30) );
-    (void)new MyButton( panel, ID_LISTBOX_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
-    (void)new wxButton( panel, ID_LISTBOX_DELETE, "D&elete selected item", wxPoint(180,130), wxSize(140,30) );
-    wxButton *button = new MyButton( panel, ID_LISTBOX_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) );
+    m_lbSelectNum = new wxButton( panel, ID_LISTBOX_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
+    m_lbSelectThis = new wxButton( panel, ID_LISTBOX_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_LISTBOX_CLEAR, _T("&Clear"), wxPoint(180,80), wxSize(140,30) );
+    (void)new MyButton( panel, ID_LISTBOX_APPEND, _T("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
+    (void)new wxButton( panel, ID_LISTBOX_DELETE, _T("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
+    wxButton *button = new MyButton( panel, ID_LISTBOX_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );

 
     button->SetDefault();
 
     button->SetForegroundColour(*wxBLUE);
 
 #if wxUSE_TOOLTIPS
 
     button->SetDefault();
 
     button->SetForegroundColour(*wxBLUE);
 
 #if wxUSE_TOOLTIPS

-    button->SetToolTip( "Press here to set italic font" );
+    button->SetToolTip( _T("Press here to set italic font") );

 #endif // wxUSE_TOOLTIPS
 
 #endif // wxUSE_TOOLTIPS
 

-    m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "&Disable", wxPoint(20,170) );
-    m_checkbox->SetValue(FALSE);
+    m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, _T("&Disable"), wxPoint(20,170) );
+    m_checkbox->SetValue(false);

 #if wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS

-    m_checkbox->SetToolTip( "Click here to disable the listbox" );
+    m_checkbox->SetToolTip( _T("Click here to disable the listbox") );

 #endif // wxUSE_TOOLTIPS
 #endif // wxUSE_TOOLTIPS

-    (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, "&Toggle colour",
+    (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, _T("&Toggle colour"),

                           wxPoint(110,170) );
     panel->SetCursor(wxCursor(wxCURSOR_HAND));
                           wxPoint(110,170) );
     panel->SetCursor(wxCursor(wxCURSOR_HAND));

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

 
 #if wxUSE_CHOICE
     panel = new wxPanel(m_notebook);
 
 #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),
+    m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,wxDefaultCoord), 5, choices );
+    m_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,wxDefaultCoord),

                                    5, choices, wxCB_SORT );
 
     SetChoiceClientData(wxT("choice"), m_choice);
                                    5, choices, wxCB_SORT );
 
     SetChoiceClientData(wxT("choice"), m_choice);


@@ -637,91 +669,97 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     m_choice->SetSelection(2);
     m_choice->SetBackgroundColour( wxT("red") );
 
     m_choice->SetSelection(2);
     m_choice->SetBackgroundColour( wxT("red") );

-    (void)new wxButton( panel, ID_CHOICE_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) );
-    (void)new wxButton( panel, ID_CHOICE_SEL_STR, "&Select 'This'", wxPoint(340,30), wxSize(140,30) );
-    (void)new wxButton( panel, ID_CHOICE_CLEAR, "&Clear", wxPoint(180,80), wxSize(140,30) );
-    (void)new wxButton( panel, ID_CHOICE_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
-    (void)new wxButton( panel, ID_CHOICE_DELETE, "D&elete selected item", wxPoint(180,130), wxSize(140,30) );
-    (void)new wxButton( panel, ID_CHOICE_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) );
-    (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, "&Disable", wxPoint(20,130), wxSize(140,30) );
-
-    m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
+    (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_APPEND, _T("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
+    (void)new wxButton( panel, ID_CHOICE_DELETE, _T("D&elete selected item"), wxPoint(180,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);

 #endif // wxUSE_CHOICE
 
     panel = new wxPanel(m_notebook);
 #endif // wxUSE_CHOICE
 
     panel = new wxPanel(m_notebook);

-    (void)new wxStaticBox( panel, -1, "&Box around combobox",
+    (void)new wxStaticBox( panel, wxID_ANY, _T("&Box around combobox"),

                            wxPoint(5, 5), wxSize(150, 100));
                            wxPoint(5, 5), wxSize(150, 100));

-    m_combo = new MyComboBox( panel, ID_COMBO, "This",
-                              wxPoint(20,25), wxSize(120, -1),
+    m_combo = new MyComboBox( panel, ID_COMBO, _T("This"),
+                              wxPoint(20,25), wxSize(120, wxDefaultCoord),

                               5, choices,
                               5, choices,

-                              /* wxCB_READONLY | */ wxPROCESS_ENTER);
-
-    (void)new wxButton( panel, ID_COMBO_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) );
-    (void)new wxButton( panel, ID_COMBO_SEL_STR, "&Select 'This'", wxPoint(340,30), wxSize(140,30) );
-    (void)new wxButton( panel, ID_COMBO_CLEAR, "&Clear", wxPoint(180,80), wxSize(140,30) );
-    (void)new wxButton( panel, ID_COMBO_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
-    (void)new wxButton( panel, ID_COMBO_DELETE, "D&elete selected item", wxPoint(180,130), wxSize(140,30) );
-    (void)new wxButton( panel, ID_COMBO_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) );
-    (void)new wxCheckBox( panel, ID_COMBO_ENABLE, "&Disable", wxPoint(20,130), wxSize(140,30) );
-    m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo);
+                              wxCB_READONLY | wxPROCESS_ENTER);
+    m_combo->SetBackgroundColour(*wxBLUE);
+
+    (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_CLEAR, _T("&Clear"), wxPoint(180,80), 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 wxCheckBox( panel, ID_COMBO_ENABLE, _T("&Disable"), wxPoint(20,130), wxSize(140,30) );
+    m_notebook->AddPage(panel, _T("wxComboBox"), false, Image_Combo);

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

-        "First", "Second",
+        _T("First"), _T("Second"),

         /* "Third",
         "Fourth", "Fifth", "Sixth",
         "Seventh", "Eighth", "Nineth", "Tenth" */
     };
 
     panel = new wxPanel(m_notebook);
         /* "Third",
         "Fourth", "Fifth", "Sixth",
         "Seventh", "Eighth", "Nineth", "Tenth" */
     };
 
     panel = new wxPanel(m_notebook);

-    (void)new MyRadioBox( panel, ID_RADIOBOX, "&That", wxPoint(10,160), wxSize(-1,-1), WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS );
-    m_radio = new wxRadioBox( panel, ID_RADIOBOX, "T&his", wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS );
+    (void)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->SetForegroundColour(*wxRED);

 
 #if wxUSE_TOOLTIPS
 
 #if wxUSE_TOOLTIPS

-    m_combo->SetToolTip("This is a natural\ncombobox - can you believe me?");
-    m_radio->SetToolTip("Ever seen a radiobox?");
+    m_combo->SetToolTip(_T("This is a natural\ncombobox - can you believe me?"));
+    m_radio->SetToolTip(_T("Ever seen a radiobox?"));

 #endif // wxUSE_TOOLTIPS
 
 #endif // wxUSE_TOOLTIPS
 

-    (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) );
-    (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "&Select 'This'", wxPoint(180,80), wxSize(140,30) );
-    m_fontButton = new wxButton( panel, ID_SET_FONT, "Set &more Italic font", wxPoint(340,30), wxSize(140,30) );
-    (void)new wxButton( panel, ID_RADIOBOX_FONT, "Set &Italic font", wxPoint(340,80), wxSize(140,30) );
-    (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "&Disable", wxPoint(340,130), wxDefaultSize );
-    wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxDefaultSize, wxRB_GROUP );
-    rb->SetValue( FALSE );
-    (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "&Radiobutton2", wxPoint(340,170), wxDefaultSize );
-    m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio);
+    (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 );
+    m_notebook->AddPage(panel, _T("wxRadioBox"), false, Image_Radio);

 
     panel = new wxPanel(m_notebook);
 
     panel = new wxPanel(m_notebook);

-    (void)new wxStaticBox( panel, -1, "&wxGauge and wxSlider", wxPoint(10,10), wxSize(222,130) );
-    m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER );
+    (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_gauge->SetBackgroundColour(*wxGREEN);
     m_gauge->SetForegroundColour(*wxRED);

-    m_gaugeVert = new wxGauge( panel, -1, 100,
+    m_gaugeVert = new wxGauge( panel, wxID_ANY, 100,

                                wxPoint(195,35), wxSize(30, 90),
                                wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER );
                                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),
+    m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,wxDefaultCoord),

                              wxSL_AUTOTICKS | wxSL_LABELS );
     m_slider->SetTickFreq(40, 0);
                              wxSL_AUTOTICKS | wxSL_LABELS );
     m_slider->SetTickFreq(40, 0);

-    (void)new wxStaticBox( panel, -1, "&Explanation",
+#if wxUSE_TOOLTIPS
+    m_slider->SetToolTip(_T("This is a sliding slider"));
+#endif // wxUSE_TOOLTIPS
+
+    (void)new wxStaticBox( panel, wxID_ANY, _T("&Explanation"),

                            wxPoint(230,10), wxSize(270,130),
                            wxALIGN_CENTER );
 
 #ifdef __WXMOTIF__
     // No wrapping text in wxStaticText yet :-(
                            wxPoint(230,10), wxSize(270,130),
                            wxALIGN_CENTER );
 
 #ifdef __WXMOTIF__
     // No wrapping text in wxStaticText yet :-(

-    (void)new wxStaticText( panel, -1,
-                            "Drag the slider!",
+    (void)new wxStaticText( panel, wxID_ANY,
+                            _T("Drag the slider!"),

                             wxPoint(250,30),
                             wxPoint(250,30),

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

                           );
 #else
                           );
 #else

-    (void)new wxStaticText( panel, -1,
-                            "In order see the gauge (aka progress bar)\n"
-                            "control do something you have to drag the\n"
-                            "handle of the slider to the right.\n"
-                            "\n"
-                            "This is also supposed to demonstrate how\n"
-                            "to use static controls.\n",
+    (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)
                           );
                             wxPoint(250,25),
                             wxSize(240, 110)
                           );


@@ -729,33 +767,33 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     int initialSpinValue = -5;
     wxString s;
     s << initialSpinValue;
     int initialSpinValue = -5;
     wxString s;
     s << initialSpinValue;

-    m_spintext = new wxTextCtrl( panel, -1, 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(80, wxDefaultCoord) );

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

-    m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "&Show progress dialog",
+    m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, _T("&Show progress dialog"),

                                   wxPoint(300, 160) );
 #endif // wxUSE_SPINBTN
 
 #if wxUSE_SPINCTRL
                                   wxPoint(300, 160) );
 #endif // wxUSE_SPINBTN
 
 #if wxUSE_SPINCTRL

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

     m_spinctrl->SetRange(10,30);
     m_spinctrl->SetValue(15);
 #endif // wxUSE_SPINCTRL
 
     m_spinctrl->SetRange(10,30);
     m_spinctrl->SetValue(15);
 #endif // wxUSE_SPINCTRL
 

-    m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge);
+    m_notebook->AddPage(panel, _T("wxGauge"), false, Image_Gauge);

 
     panel = new wxPanel(m_notebook);
 
 
     panel = new wxPanel(m_notebook);
 

-#if !defined(__WXMOTIF__) && !defined(__WIN16__)  // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16.
+#if !defined(__WXMOTIF__) // wxStaticBitmap not working under Motif yet.

     wxIcon icon = wxArtProvider::GetIcon(wxART_INFORMATION);
     wxIcon icon = wxArtProvider::GetIcon(wxART_INFORMATION);

-    wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon,
-                                                   wxPoint(10, 10));
+    (void) new wxStaticBitmap( panel, wxID_ANY, icon, wxPoint(10, 10) );

 
 

-    bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10));
-    bmpStatic->SetIcon(wxArtProvider::GetIcon(wxART_QUESTION));
+    // VZ: don't leak memory
+    // bmpStatic = new wxStaticBitmap(panel, wxID_ANY, wxNullIcon, wxPoint(50, 10));
+    // bmpStatic->SetIcon(wxArtProvider::GetIcon(wxART_QUESTION));

 #endif // !Motif
 
     wxBitmap bitmap( 100, 100 );
 #endif // !Motif
 
     wxBitmap bitmap( 100, 100 );


@@ -764,19 +802,19 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     dc.SetPen(*wxGREEN_PEN);
     dc.Clear();
     dc.DrawEllipse(5, 5, 90, 90);
     dc.SetPen(*wxGREEN_PEN);
     dc.Clear();
     dc.DrawEllipse(5, 5, 90, 90);

-    dc.DrawText("Bitmap", 30, 40);
+    dc.DrawText(_T("Bitmap"), 30, 40);

     dc.SelectObject( wxNullBitmap );
 
     (void)new wxBitmapButton(panel, ID_BITMAP_BTN, bitmap, wxPoint(100, 20));
 
     dc.SelectObject( wxNullBitmap );
 
     (void)new wxBitmapButton(panel, ID_BITMAP_BTN, bitmap, wxPoint(100, 20));
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMOTIF__)

     // test for masked bitmap display
     // test for masked bitmap display

-    bitmap = wxBitmap("test2.bmp", wxBITMAP_TYPE_BMP);
+    bitmap = wxBitmap(_T("test2.bmp"), wxBITMAP_TYPE_BMP);

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

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

     }
 #endif
 
     }
 #endif
 


@@ -785,7 +823,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
              bmp3(wxArtProvider::GetBitmap(wxART_QUESTION));
     wxBitmapButton *bmpBtn = new wxBitmapButton
                                  (
              bmp3(wxArtProvider::GetBitmap(wxART_QUESTION));
     wxBitmapButton *bmpBtn = new wxBitmapButton
                                  (

-                                  panel, -1,
+                                  panel, wxID_ANY,

                                   bmp1,
                                   wxPoint(30, 70)
                                  );
                                   bmp1,
                                   wxPoint(30, 70)
                                  );


@@ -795,58 +833,76 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
 #if wxUSE_TOGGLEBTN
     (void)new wxToggleButton(panel, ID_BUTTON_LABEL,
 
 #if wxUSE_TOGGLEBTN
     (void)new wxToggleButton(panel, ID_BUTTON_LABEL,

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

 #endif // wxUSE_TOGGLEBTN
 
 #endif // wxUSE_TOGGLEBTN
 

-    m_label = new wxStaticText(panel, -1, "Label with some long text",
+    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 );
 
                                wxPoint(250, 60), wxDefaultSize,
                                wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/);
     m_label->SetForegroundColour( *wxBLUE );
 

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

 
 

-    // layout constraints
-#if wxUSE_CONSTRAINTS
-    wxLayoutConstraints *c;
+    // sizer

 
     panel = new wxPanel(m_notebook);
 
     panel = new wxPanel(m_notebook);

-    panel->SetAutoLayout( TRUE );
+    panel->SetAutoLayout( true );

 
 

-    c = new wxLayoutConstraints;
-    c->top.SameAs( panel, wxTop, 10 );
-    c->height.AsIs( );
-    c->left.SameAs( panel, wxLeft, 10 );
-    c->width.PercentOf( panel, wxWidth, 40 );
+    wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );

 
 

-    wxButton *pMyButton = new wxButton(panel, ID_BUTTON_TEST1, "Test Button &1" );
-    pMyButton->SetConstraints( c );
-
-    c = new wxLayoutConstraints;
-    c->top.SameAs( panel, wxTop, 10 );
-    c->bottom.SameAs( panel, wxBottom, 10 );
-    c->right.SameAs( panel, wxRight, 10 );
-    c->width.PercentOf( panel, wxWidth, 40 );
+    wxStaticBoxSizer *csizer =
+      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);
+    csizer->Add (check1);
+    check2 = new wxCheckBox (panel, ID_SIZER_CHECK2, _T("2"));
+    check2->SetValue (true);
+    csizer->Add (check2);
+    check3 = new wxCheckBox (panel, ID_SIZER_CHECK3, _T("3"));
+    check3->SetValue (true);
+    csizer->Add (check3);
+    check4 = new wxCheckBox (panel, ID_SIZER_CHECK4, _T("4"));
+    check4->SetValue (true);
+    csizer->Add (check4);
+    check14 = new wxCheckBox (panel, ID_SIZER_CHECK14, _T("1-4"));
+    check14->SetValue (true);
+    csizer->Add (check14);
+    checkBig = new wxCheckBox (panel, ID_SIZER_CHECKBIG, _T("Big"));
+    checkBig->SetValue (true);
+    csizer->Add (checkBig);
+    
+    sizer->Add (csizer);

 
 

-    wxButton *pMyButton2 = new wxButton(panel, ID_BUTTON_TEST2, "Test Button &2" );
-    pMyButton2->SetConstraints( c );
+    m_hsizer = new wxBoxSizer( wxHORIZONTAL );

 
 

-    m_notebook->AddPage(panel, "wxLayoutConstraint");
-#endif
+    m_buttonSizer = new wxBoxSizer (wxVERTICAL);

     
     

-    // sizer
+    m_sizerBtn1 = new wxButton(panel, wxID_ANY, _T("Test Button &1 (tab order 1)") );
+    m_buttonSizer->Add( m_sizerBtn1, 0, wxALL, 10 );
+    m_sizerBtn2 = new wxButton(panel, wxID_ANY, _T("Test Button &2 (tab order 3)") );
+    m_buttonSizer->Add( m_sizerBtn2, 0, wxALL, 10 );
+    m_sizerBtn3 = new wxButton(panel, wxID_ANY, _T("Test Button &3 (tab order 2)") );
+    m_buttonSizer->Add( m_sizerBtn3, 0, wxALL, 10 );
+    m_sizerBtn4 = new wxButton(panel, wxID_ANY, _T("Test Button &4 (tab order 4)") );
+    m_buttonSizer->Add( m_sizerBtn4, 0, wxALL, 10 );

 
 

-    panel = new wxPanel(m_notebook);
-    panel->SetAutoLayout( TRUE );
+    m_sizerBtn3->MoveBeforeInTabOrder(m_sizerBtn2);

 
 

-    wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
+    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_bigBtn , 3, wxGROW|wxALL, 10 );

 
 

-    sizer->Add( new wxButton(panel, -1, "Test Button &1" ), 3, wxALL, 10 );
-    sizer->Add( 20,20, 1 );
-    sizer->Add( new wxButton(panel, -1, "Multiline\nbutton" ), 3, wxGROW|wxALL, 10 );
+    sizer->Add (m_hsizer, 1, wxGROW);

 
     panel->SetSizer( sizer );
 
 
     panel->SetSizer( sizer );
 

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

 }
 
 void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )
 }
 
 void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )


@@ -864,10 +920,10 @@ void MyPanel::OnPageChanging( wxNotebookEvent &event )
     int selOld = event.GetOldSelection();
     if ( selOld == 2 )
     {
     int selOld = event.GetOldSelection();
     if ( selOld == 2 )
     {

-        if ( wxMessageBox("This demonstrates how a program may prevent the\n"
-                          "page change from taking place - if you select\n"
-                          "[No] the current page will stay the third one\n",
-                          "Control sample",
+        if ( wxMessageBox(_T("This demonstrates how a program may prevent the\n")
+                          _T("page change from taking place - if you select\n")
+                          _T("[No] the current page will stay the third one\n"),
+                          _T("Control sample"),

                           wxICON_QUESTION | wxYES_NO, this) != wxYES )
         {
             event.Veto();
                           wxICON_QUESTION | wxYES_NO, this) != wxYES )
         {
             event.Veto();


@@ -876,16 +932,17 @@ void MyPanel::OnPageChanging( wxNotebookEvent &event )
         }
     }
 
         }
     }
 

-    *m_text << "Notebook selection is being changed from " << selOld
-            << " to " << event.GetSelection()
-            << " (current page from notebook is "
-            << m_notebook->GetSelection() << ")\n";
+    *m_text << _T("Notebook selection is being changed from ") << selOld
+            << _T(" to ") << event.GetSelection()
+            << _T(" (current page from notebook is ")
+            << m_notebook->GetSelection() << _T(")\n");

 }
 
 void MyPanel::OnPageChanged( wxNotebookEvent &event )
 {
 }
 
 void MyPanel::OnPageChanged( wxNotebookEvent &event )
 {

-    *m_text << "Notebook selection is now " << event.GetSelection()
-            << " (from notebook: " << m_notebook->GetSelection() << ")\n";
+    *m_text << _T("Notebook selection is now ") << event.GetSelection()
+            << _T(" (from notebook: ") << m_notebook->GetSelection()
+            << _T(")\n");

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


@@ -894,7 +951,7 @@ void MyPanel::OnTestButton(wxCommandEvent& event)
                  event.GetId() == ID_BUTTON_TEST1 ? _T('1') : _T('2'));
 }
 
                  event.GetId() == ID_BUTTON_TEST1 ? _T('1') : _T('2'));
 }
 

-void MyPanel::OnBmpButton(wxCommandEvent& event)
+void MyPanel::OnBmpButton(wxCommandEvent& WXUNUSED(event))

 {
     wxLogMessage(_T("Bitmap button clicked."));
 }
 {
     wxLogMessage(_T("Bitmap button clicked."));
 }


@@ -903,14 +960,15 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
 {
     static wxColour s_colOld;
 
 {
     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
     {


@@ -931,42 +989,42 @@ void MyPanel::OnListBox( wxCommandEvent &event )
 
     if (event.GetInt() == -1)
     {
 
     if (event.GetInt() == -1)
     {

-        m_text->AppendText( "ListBox has no selections anymore\n" );
+        m_text->AppendText( _T("ListBox has no selections anymore\n") );

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

-    m_text->AppendText( "ListBox event selection string is: '" );
+    m_text->AppendText( _T("ListBox event selection string is: '") );

     m_text->AppendText( event.GetString() );
     m_text->AppendText( event.GetString() );

-    m_text->AppendText( "'\n" );
-    m_text->AppendText( "ListBox control selection string is: '" );
+    m_text->AppendText( _T("'\n") );
+    m_text->AppendText( _T("ListBox control selection string is: '") );

     m_text->AppendText( listbox->GetStringSelection() );
     m_text->AppendText( listbox->GetStringSelection() );

-    m_text->AppendText( "'\n" );
+    m_text->AppendText( _T("'\n") );

 
     wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
 
     wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());

-    m_text->AppendText( "ListBox event client data string is: '" );
+    m_text->AppendText( _T("ListBox event client data string is: '") );

     if (obj) // BC++ doesn't like use of '? .. : .. ' in this context
         m_text->AppendText( obj->GetData() );
     else
     if (obj) // BC++ doesn't like use of '? .. : .. ' in this context
         m_text->AppendText( obj->GetData() );
     else

-        m_text->AppendText( wxString("none") );
+        m_text->AppendText( wxString(_T("none")) );

 
 

-    m_text->AppendText( "'\n" );
-    m_text->AppendText( "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());
     if (obj)
         m_text->AppendText( obj->GetData() );
     else
     obj = (wxStringClientData *)listbox->GetClientObject(listbox->GetSelection());
     if (obj)
         m_text->AppendText( obj->GetData() );
     else

-        m_text->AppendText( wxString("none") );
-    m_text->AppendText( "'\n" );
+        m_text->AppendText( wxString(_T("none")) );
+    m_text->AppendText( _T("'\n") );

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

-    m_text->AppendText( "ListBox double click string is: " );
+    m_text->AppendText( _T("ListBox double click string is: ") );

     m_text->AppendText( event.GetString() );
     m_text->AppendText( event.GetString() );

-    m_text->AppendText( "\n" );
+    m_text->AppendText( _T("\n") );

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


@@ -975,13 +1033,13 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
     {
         case ID_LISTBOX_ENABLE:
             {
     {
         case ID_LISTBOX_ENABLE:
             {

-                m_text->AppendText("Checkbox clicked.\n");
+                m_text->AppendText(_T("Checkbox clicked.\n"));

 #if wxUSE_TOOLTIPS
                 wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
                 if (event.GetInt())
 #if wxUSE_TOOLTIPS
                 wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
                 if (event.GetInt())

-                    cb->SetToolTip( "Click to enable listbox" );
+                    cb->SetToolTip( _T("Click to enable listbox") );

                 else
                 else

-                    cb->SetToolTip( "Click to disable listbox" );
+                    cb->SetToolTip( _T("Click to disable listbox") );

 #endif // wxUSE_TOOLTIPS
                 m_listbox->Enable( event.GetInt() == 0 );
                 m_lbSelectThis->Enable( event.GetInt() == 0 );
 #endif // wxUSE_TOOLTIPS
                 m_listbox->Enable( event.GetInt() == 0 );
                 m_lbSelectThis->Enable( event.GetInt() == 0 );


@@ -992,15 +1050,19 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
             }
         case ID_LISTBOX_SEL_NUM:
             {
             }
         case ID_LISTBOX_SEL_NUM:
             {

-                m_listbox->SetSelection( 2 );
-                m_listboxSorted->SetSelection( 2 );
+                if (m_listbox->GetCount() > 2)
+                    m_listbox->SetSelection( 2 );
+                if (m_listboxSorted->GetCount() > 2)
+                    m_listboxSorted->SetSelection( 2 );

                 m_lbSelectThis->WarpPointer( 40, 14 );
                 break;
             }
         case ID_LISTBOX_SEL_STR:
             {
                 m_lbSelectThis->WarpPointer( 40, 14 );
                 break;
             }
         case ID_LISTBOX_SEL_STR:
             {

-                m_listbox->SetStringSelection( "This" );
-                m_listboxSorted->SetStringSelection( "This" );
+                if (m_listbox->FindString(_T("This")) != wxNOT_FOUND)
+                    m_listbox->SetStringSelection( _T("This") );
+                if (m_listboxSorted->FindString(_T("This")) != wxNOT_FOUND)
+                    m_listboxSorted->SetStringSelection( _T("This") );

                 m_lbSelectNum->WarpPointer( 40, 14 );
                 break;
             }
                 m_lbSelectNum->WarpPointer( 40, 14 );
                 break;
             }


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

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

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


@@ -1043,30 +1105,30 @@ void MyPanel::OnChoice( wxCommandEvent &event )
     wxChoice *choice = event.GetId() == ID_CHOICE ? m_choice
                                                   : m_choiceSorted;
 
     wxChoice *choice = event.GetId() == ID_CHOICE ? m_choice
                                                   : m_choiceSorted;
 

-    m_text->AppendText( "Choice event selection string is: '" );
+    m_text->AppendText( _T("Choice event selection string is: '") );

     m_text->AppendText( event.GetString() );
     m_text->AppendText( event.GetString() );

-    m_text->AppendText( "'\n" );
-    m_text->AppendText( "Choice control selection string is: '" );
+    m_text->AppendText( _T("'\n") );
+    m_text->AppendText( _T("Choice control selection string is: '") );

     m_text->AppendText( choice->GetStringSelection() );
     m_text->AppendText( choice->GetStringSelection() );

-    m_text->AppendText( "'\n" );
+    m_text->AppendText( _T("'\n") );

 
     wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
 
     wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());

-    m_text->AppendText( "Choice event client data string is: '" );
+    m_text->AppendText( _T("Choice event client data string is: '") );

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

-       m_text->AppendText( wxString("none") );
+       m_text->AppendText( wxString(_T("none")) );

 
 

-    m_text->AppendText( "'\n" );
-    m_text->AppendText( "Choice control client data string is: '" );
+    m_text->AppendText( _T("'\n") );
+    m_text->AppendText( _T("Choice control client data string is: '") );

     obj = (wxStringClientData *)choice->GetClientObject(choice->GetSelection());
 
     if (obj)
        m_text->AppendText( obj->GetData() );
     else
     obj = (wxStringClientData *)choice->GetClientObject(choice->GetSelection());
 
     if (obj)
        m_text->AppendText( obj->GetData() );
     else

-       m_text->AppendText( wxString("none") );
-    m_text->AppendText( "'\n" );
+       m_text->AppendText( wxString(_T("none")) );
+    m_text->AppendText( _T("'\n") );

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


@@ -1087,8 +1149,8 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
             }
         case ID_CHOICE_SEL_STR:
             {
             }
         case ID_CHOICE_SEL_STR:
             {

-                m_choice->SetStringSelection( "This" );
-                m_choiceSorted->SetStringSelection( "This" );
+                m_choice->SetStringSelection( _T("This") );
+                m_choiceSorted->SetStringSelection( _T("This") );

                 break;
             }
         case ID_CHOICE_CLEAR:
                 break;
             }
         case ID_CHOICE_CLEAR:


@@ -1099,8 +1161,8 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
             }
         case ID_CHOICE_APPEND:
             {
             }
         case ID_CHOICE_APPEND:
             {

-                m_choice->Append( "Hi!" );
-                m_choiceSorted->Append( "Hi!" );
+                m_choice->Append( _T("Hi!") );
+                m_choiceSorted->Append( _T("Hi!") );

                 break;
             }
         case ID_CHOICE_DELETE:
                 break;
             }
         case ID_CHOICE_DELETE:


@@ -1125,18 +1187,20 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
 
 void MyPanel::OnCombo( wxCommandEvent &event )
 {
 
 void MyPanel::OnCombo( wxCommandEvent &event )
 {

-    m_text->AppendText( "ComboBox event selection string is: " );
+    m_text->AppendText( _T("ComboBox event selection string is: ") );

     m_text->AppendText( event.GetString() );
     m_text->AppendText( event.GetString() );

-    m_text->AppendText( "\n" );
-    m_text->AppendText( "ComboBox control selection string is: " );
+    m_text->AppendText( _T("\n") );
+    m_text->AppendText( _T("ComboBox control selection string is: ") );

     m_text->AppendText( m_combo->GetStringSelection() );
     m_text->AppendText( m_combo->GetStringSelection() );

-    m_text->AppendText( "\n" );
+    m_text->AppendText( _T("\n") );

 }
 
 }
 

-void MyPanel::OnComboTextChanged(wxCommandEvent& WXUNUSED(event))
+void MyPanel::OnComboTextChanged(wxCommandEvent& event)

 {
 {

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

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


@@ -1161,7 +1225,7 @@ void MyPanel::OnComboButtons( wxCommandEvent &event )
             }
         case ID_COMBO_SEL_STR:
             {
             }
         case ID_COMBO_SEL_STR:
             {

-                m_combo->SetStringSelection( "This" );
+                m_combo->SetStringSelection( _T("This") );

                 break;
             }
         case ID_COMBO_CLEAR:
                 break;
             }
         case ID_COMBO_CLEAR:


@@ -1171,7 +1235,7 @@ void MyPanel::OnComboButtons( wxCommandEvent &event )
             }
         case ID_COMBO_APPEND:
             {
             }
         case ID_COMBO_APPEND:
             {

-                m_combo->Append( "Hi!" );
+                m_combo->Append( _T("Hi!") );

                 break;
             }
         case ID_COMBO_DELETE:
                 break;
             }
         case ID_COMBO_DELETE:


@@ -1190,9 +1254,19 @@ void MyPanel::OnComboButtons( wxCommandEvent &event )
 
 void MyPanel::OnRadio( wxCommandEvent &event )
 {
 
 void MyPanel::OnRadio( wxCommandEvent &event )
 {

-    m_text->AppendText( "RadioBox selection string is: " );
+    m_text->AppendText( _T("RadioBox selection string is: ") );

     m_text->AppendText( event.GetString() );
     m_text->AppendText( event.GetString() );

-    m_text->AppendText( "\n" );
+    m_text->AppendText( _T("\n") );
+}
+
+void MyPanel::OnRadioButton1( wxCommandEvent & WXUNUSED(event) )
+{
+    wxMessageBox(_T("First wxRadioButton selected."), _T("wxControl sample"));
+}
+
+void MyPanel::OnRadioButton2( wxCommandEvent & WXUNUSED(event) )
+{
+    m_text->AppendText(_T("Second wxRadioButton selected.\n"));

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


@@ -1211,11 +1285,13 @@ void MyPanel::OnRadioButtons( wxCommandEvent &event )
             }
         case ID_RADIOBOX_SEL_STR:
             {
             }
         case ID_RADIOBOX_SEL_STR:
             {

-                m_radio->SetStringSelection( "This" );
+                m_radio->SetStringSelection( _T("This") );

                 break;
             }
         case ID_RADIOBOX_FONT:
             {
                 break;
             }
         case ID_RADIOBOX_FONT:
             {

+                    m_radio->SetForegroundColour(*wxGREEN);
+

                 m_radio->SetFont( *wxITALIC_FONT );
                 break;
             }
                 m_radio->SetFont( *wxITALIC_FONT );
                 break;
             }


@@ -1230,8 +1306,8 @@ void MyPanel::OnSetFont( wxCommandEvent &WXUNUSED(event) )
 
 void MyPanel::OnUpdateLabel( wxCommandEvent &event )
 {
 
 void MyPanel::OnUpdateLabel( wxCommandEvent &event )
 {

-    m_label->SetLabel(event.GetInt() ? "Very very very very very long text."
-                                     : "Shorter text.");
+    m_label->SetLabel(event.GetInt() ? _T("Very very very very very long text.")
+                                     : _T("Shorter text."));

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


@@ -1242,14 +1318,46 @@ void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
 
 #if wxUSE_SPINCTRL
 
 
 #if wxUSE_SPINCTRL
 

+void MyPanel::OnSpinCtrlText(wxCommandEvent& event)
+{
+    if ( m_spinctrl )
+    {
+        wxString s;
+        s.Printf( _T("Spin ctrl text changed: now %d (from event: %s)\n"),
+                 m_spinctrl->GetValue(), event.GetString().c_str() );
+        m_text->AppendText(s);
+    }
+}
+

 void MyPanel::OnSpinCtrl(wxSpinEvent& event)
 {
 void MyPanel::OnSpinCtrl(wxSpinEvent& event)
 {

-    if (!m_spinctrl)
-        return ;
-    wxString s;
-    s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"),
-             m_spinctrl->GetValue(), event.GetInt());
-    m_text->AppendText(s);
+    if ( m_spinctrl )
+    {
+        wxString s;
+        s.Printf( _T("Spin ctrl changed: now %d (from event: %ld)\n"),
+                 m_spinctrl->GetValue(), event.GetInt() );
+        m_text->AppendText(s);
+    }
+}
+
+void MyPanel::OnSpinCtrlUp(wxSpinEvent& event)
+{
+    if ( m_spinctrl )
+    {
+        m_text->AppendText( wxString::Format(
+            _T("Spin up: %d (from event: %ld)\n"),
+            m_spinctrl->GetValue(), event.GetInt() ) );
+    }
+}
+
+void MyPanel::OnSpinCtrlDown(wxSpinEvent& event)
+{
+    if ( m_spinctrl )
+    {
+        m_text->AppendText( wxString::Format(
+            _T("Spin down: %d (from event: %ld)\n"),
+            m_spinctrl->GetValue(), event.GetInt() ) );
+    }

 }
 
 #endif // wxUSE_SPINCTRL
 }
 
 #endif // wxUSE_SPINCTRL


@@ -1315,8 +1423,8 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
         return;
     }
     
         return;
     }
     

-    wxProgressDialog dialog("Progress dialog example",
-                            "An informative message",
+    wxProgressDialog dialog(_T("Progress dialog example"),
+                            _T("An informative message"),

                             max,    // range
                             this,   // parent
                             wxPD_CAN_ABORT |
                             max,    // range
                             this,   // parent
                             wxPD_CAN_ABORT |


@@ -1327,17 +1435,17 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
                             wxPD_REMAINING_TIME);
 
 
                             wxPD_REMAINING_TIME);
 
 

-    bool cont = TRUE;
+    bool cont = true;

     for ( int i = 0; i <= max && cont; i++ )
     {
         wxSleep(1);
         if ( i == max )
         {
     for ( int i = 0; i <= max && cont; i++ )
     {
         wxSleep(1);
         if ( i == max )
         {

-            cont = dialog.Update(i, "That's all, folks!");
+            cont = dialog.Update(i, _T("That's all, folks!"));

         }
         else if ( i == max / 2 )
         {
         }
         else if ( i == max / 2 )
         {

-            cont = dialog.Update(i, "Only a half left (very long message)!");
+            cont = dialog.Update(i, _T("Only a half left (very long message)!"));

         }
         else
         {
         }
         else
         {


@@ -1347,16 +1455,47 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
 
     if ( !cont )
     {
 
     if ( !cont )
     {

-        *m_text << "Progress dialog aborted!\n";
+        *m_text << _T("Progress dialog aborted!\n");

     }
     else
     {
     }
     else
     {

-        *m_text << "Countdown from " << max << " finished.\n";
+        *m_text << _T("Countdown from ") << max << _T(" finished.\n");

     }
 }
 
 #endif // wxUSE_SPINBTN
 
     }
 }
 
 #endif // wxUSE_SPINBTN
 

+void MyPanel::OnSizerCheck( wxCommandEvent &event)
+{
+  switch (event.GetId ()) {
+  case ID_SIZER_CHECK1:
+    m_buttonSizer->Show (m_sizerBtn1, event.IsChecked ());
+    m_buttonSizer->Layout ();
+    break;
+  case ID_SIZER_CHECK2:
+    m_buttonSizer->Show (m_sizerBtn2, event.IsChecked ());
+    m_buttonSizer->Layout ();
+    break;
+  case ID_SIZER_CHECK3:
+    m_buttonSizer->Show (m_sizerBtn3, event.IsChecked ());
+    m_buttonSizer->Layout ();
+    break;
+  case ID_SIZER_CHECK4:
+    m_buttonSizer->Show (m_sizerBtn4, event.IsChecked ());
+    m_buttonSizer->Layout ();
+    break;
+  case ID_SIZER_CHECK14:
+    m_hsizer->Show (m_buttonSizer, event.IsChecked ());
+    m_hsizer->Layout ();
+    break;
+  case ID_SIZER_CHECKBIG:
+    m_hsizer->Show (m_bigBtn, event.IsChecked ());
+    m_hsizer->Layout ();
+    break;
+  }
+
+}
+

 MyPanel::~MyPanel()
 {
     //wxLog::RemoveTraceMask(_T("focus"));
 MyPanel::~MyPanel()
 {
     //wxLog::RemoveTraceMask(_T("focus"));


@@ -1386,44 +1525,48 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 
     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 

-MyFrame::MyFrame(const char *title, int x, int y)
-       : wxFrame(NULL, -1, title, wxPoint(x, y), wxSize(500, 430))
+MyFrame::MyFrame(const wxChar *title, int x, int y)
+       : wxFrame(NULL, wxID_ANY, title, wxPoint(x, y), wxSize(500, 430))

 {
     // 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
 

+#ifdef USE_XPM

     SetIcon( wxICON(mondrian) );
     SetIcon( wxICON(mondrian) );

+#endif

 
     wxMenu *file_menu = new wxMenu;
 
 
     wxMenu *file_menu = new wxMenu;
 

-    file_menu->Append(CONTROLS_CLEAR_LOG, "&Clear log\tCtrl-L");
+    file_menu->Append(CONTROLS_CLEAR_LOG, _T("&Clear log\tCtrl-L"));

     file_menu->AppendSeparator();
     file_menu->AppendSeparator();

-    file_menu->Append(CONTROLS_ABOUT, "&About\tF1");
+    file_menu->Append(CONTROLS_ABOUT, _T("&About\tF1"));

     file_menu->AppendSeparator();
     file_menu->AppendSeparator();

-    file_menu->Append(CONTROLS_QUIT, "E&xit\tAlt-X", "Quit controls sample");
+    file_menu->Append(CONTROLS_QUIT, _T("E&xit\tAlt-X"), _T("Quit controls sample"));

 
     wxMenuBar *menu_bar = new wxMenuBar;
 
     wxMenuBar *menu_bar = new wxMenuBar;

-    menu_bar->Append(file_menu, "&File");
+    menu_bar->Append(file_menu, _T("&File"));

 
 #if wxUSE_TOOLTIPS
     wxMenu *tooltip_menu = new wxMenu;
 
 #if wxUSE_TOOLTIPS
     wxMenu *tooltip_menu = new wxMenu;

-    tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D");
+    tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, _T("Set &delay\tCtrl-D"));

     tooltip_menu->AppendSeparator();
     tooltip_menu->AppendSeparator();

-    tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, "&Toggle tooltips\tCtrl-T",
-            "enable/disable tooltips", TRUE);
-    tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, TRUE);
-    menu_bar->Append(tooltip_menu, "&Tooltips");
+    tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, _T("&Toggle tooltips\tCtrl-T"),
+            _T("enable/disable tooltips"), true);
+    tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, true);
+    menu_bar->Append(tooltip_menu, _T("&Tooltips"));

 #endif // wxUSE_TOOLTIPS
 
     wxMenu *panel_menu = new wxMenu;
 #endif // wxUSE_TOOLTIPS
 
     wxMenu *panel_menu = new wxMenu;

-    panel_menu->Append(CONTROLS_ENABLE_ALL, "&Disable all\tCtrl-E",
-                       "Enable/disable all panel controls", TRUE);
-    menu_bar->Append(panel_menu, "&Panel");
+    panel_menu->Append(CONTROLS_ENABLE_ALL, _T("&Disable all\tCtrl-E"),
+                       _T("Enable/disable all panel controls"), true);
+    menu_bar->Append(panel_menu, _T("&Panel"));

 
     SetMenuBar(menu_bar);
 
 
     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 );
 


@@ -1432,14 +1575,14 @@ MyFrame::MyFrame(const char *title, int x, int y)
 
 void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) )
 {

-    Close(TRUE);
+    Close(true);

 }
 
 void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {
     wxBusyCursor bc;
 
 }
 
 void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {
     wxBusyCursor bc;
 

-    wxMessageDialog dialog(this, "This is a control sample", "About Controls", wxOK );
+    wxMessageDialog dialog(this, _T("This is a control sample"), _T("About Controls"), wxOK );

     dialog.ShowModal();
 }
 
     dialog.ShowModal();
 }
 


@@ -1449,15 +1592,15 @@ void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
 }
 
 #if wxUSE_TOOLTIPS
 }
 
 #if wxUSE_TOOLTIPS

-void MyFrame::OnSetTooltipDelay(wxCommandEvent& event)
+void MyFrame::OnSetTooltipDelay(wxCommandEvent& WXUNUSED(event))

 {
     static long s_delay = 5000;
 
     wxString delay;
     delay.Printf( _T("%ld"), s_delay);
 
 {
     static long s_delay = 5000;
 
     wxString delay;
     delay.Printf( _T("%ld"), s_delay);
 

-    delay = wxGetTextFromUser("Enter delay (in milliseconds)",
-            "Set tooltip delay",
+    delay = wxGetTextFromUser(_T("Enter delay (in milliseconds)"),
+            _T("Set tooltip delay"),

             delay,
             this);
     if ( !delay )
             delay,
             this);
     if ( !delay )


@@ -1470,9 +1613,9 @@ void MyFrame::OnSetTooltipDelay(wxCommandEvent& event)
     wxLogStatus(this, _T("Tooltip delay set to %ld milliseconds"), s_delay);
 }
 
     wxLogStatus(this, _T("Tooltip delay set to %ld milliseconds"), s_delay);
 }
 

-void MyFrame::OnToggleTooltips(wxCommandEvent& event)
+void MyFrame::OnToggleTooltips(wxCommandEvent& WXUNUSED(event))

 {
 {

-    static bool s_enabled = TRUE;
+    static bool s_enabled = true;

 
     s_enabled = !s_enabled;
 
 
     s_enabled = !s_enabled;
 


@@ -1484,7 +1627,7 @@ void MyFrame::OnToggleTooltips(wxCommandEvent& event)
 
 void MyFrame::OnEnableAll(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnEnableAll(wxCommandEvent& WXUNUSED(event))
 {

-    static bool s_enable = TRUE;
+    static bool s_enable = true;

 
     s_enable = !s_enable;
     m_panel->Enable(s_enable);
 
     s_enable = !s_enable;
     m_panel->Enable(s_enable);


@@ -1492,14 +1635,18 @@ void MyFrame::OnEnableAll(wxCommandEvent& WXUNUSED(event))
 
 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();
 }
 
 void MyFrame::OnSize( wxSizeEvent& event )
 {
 
     event.Skip();
 }
 
 void MyFrame::OnSize( wxSizeEvent& event )
 {

+#if wxUSE_STATUSBAR

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

+#endif // wxUSE_STATUSBAR

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


@@ -1522,11 +1669,13 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 #endif
                 s_windowFocus->GetClassInfo()->GetClassName()
 #ifdef __WXMSW__
 #endif
                 s_windowFocus->GetClassInfo()->GetClassName()
 #ifdef __WXMSW__

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

 #endif
                   );
 
 #endif
                   );
 

+#if wxUSE_STATUSBAR

         SetStatusText(msg);
         SetStatusText(msg);

+#endif // wxUSE_STATUSBAR

     }
 }
 
     }
 }
 


@@ -1534,7 +1683,7 @@ void MyComboBox::OnChar(wxKeyEvent& event)
 {
     wxLogMessage(_T("MyComboBox::OnChar"));
 
 {
     wxLogMessage(_T("MyComboBox::OnChar"));
 

-    if ( event.KeyCode() == 'w' )
+    if ( event.GetKeyCode() == 'w' )

         wxLogMessage(_T("MyComboBox: 'w' will be ignored."));
     else
         event.Skip();
         wxLogMessage(_T("MyComboBox: 'w' will be ignored."));
     else
         event.Skip();


@@ -1544,7 +1693,7 @@ void MyComboBox::OnKeyDown(wxKeyEvent& event)
 {
     wxLogMessage(_T("MyComboBox::OnKeyDown"));
 
 {
     wxLogMessage(_T("MyComboBox::OnKeyDown"));
 

-    if ( event.KeyCode() == 'w' )
+    if ( event.GetKeyCode() == 'w' )

         wxLogMessage(_T("MyComboBox: 'w' will be ignored."));
     else
         event.Skip();
         wxLogMessage(_T("MyComboBox: 'w' will be ignored."));
     else
         event.Skip();


@@ -1570,6 +1719,8 @@ static void SetListboxClientData(const wxChar *name, wxListBox *control)
     }
 }
 
     }
 }
 

+#if wxUSE_CHOICE
+

 static void SetChoiceClientData(const wxChar *name, wxChoice *control)
 {
     size_t count = control->GetCount();
 static void SetChoiceClientData(const wxChar *name, wxChoice *control)
 {
     size_t count = control->GetCount();


@@ -1582,3 +1733,5 @@ static void SetChoiceClientData(const wxChar *name, wxChoice *control)
         control->SetClientObject(n, new wxStringClientData(s));
     }
 }
         control->SetClientObject(n, new wxStringClientData(s));
     }
 }

+
+#endif // wxUSE_CHOICE