no real changes, just correct a comment (closes #10563)

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 8435a9801c692801a5c3d8a83870258f8831d0e3..9b08f4cb6e4370936cf3d8465bab318784c6942e 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -28,7 +28,10 @@
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"

-#endif
+#ifdef __WXMSW__
+    #include "wx/numdlg.h"
+#endif // __WXMSW__
+#endif // wxUSE_TOOLTIPS

 
 #if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
     #define USE_XPM
 
 #if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
     #define USE_XPM


@@ -59,9 +62,6 @@
     #define EVT_TOGGLEBUTTON EVT_CHECKBOX
 #endif
 
     #define EVT_TOGGLEBUTTON EVT_CHECKBOX
 #endif
 

-#include "wx/hyperlink.h"
-#include "wx/utils.h"
-

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


@@ -78,6 +78,10 @@ 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();
 

+#if wxUSE_TOOLTIPS
+    void SetAllToolTips();
+#endif // wxUSE_TOOLTIPS
+

     void OnIdle( wxIdleEvent &event );
     void OnListBox( wxCommandEvent &event );
     void OnListBoxDoubleClick( wxCommandEvent &event );
     void OnIdle( wxIdleEvent &event );
     void OnListBox( wxCommandEvent &event );
     void OnListBoxDoubleClick( wxCommandEvent &event );


@@ -124,10 +128,6 @@ public:
 
     void OnSizerCheck (wxCommandEvent &event);
 
 
     void OnSizerCheck (wxCommandEvent &event);
 

-#if wxUSE_HYPERLINKCTRL
-    void OnHyperlink(wxHyperlinkEvent& event);
-#endif
-

     wxListBox     *m_listbox,
                   *m_listboxSorted;
 #if wxUSE_CHOICE
     wxListBox     *m_listbox,
                   *m_listboxSorted;
 #if wxUSE_CHOICE


@@ -176,10 +176,6 @@ public:
     wxBoxSizer    *m_hsizer;
     wxButton      *m_bigBtn;
 
     wxBoxSizer    *m_hsizer;
     wxButton      *m_bigBtn;
 

-#if wxUSE_HYPERLINKCTRL
-    wxHyperlinkCtrl *m_hyperlink;
-#endif
-

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


@@ -198,9 +194,14 @@ public:
 #if wxUSE_TOOLTIPS
     void OnSetTooltipDelay(wxCommandEvent& event);
     void OnToggleTooltips(wxCommandEvent& event);
 #if wxUSE_TOOLTIPS
     void OnSetTooltipDelay(wxCommandEvent& event);
     void OnToggleTooltips(wxCommandEvent& event);

+#ifdef __WXMSW__
+    void OnSetMaxTooltipWidth(wxCommandEvent& event);
+#endif // __WXMSW__

 #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 OnContextHelp(wxCommandEvent& event);
 
     void OnIdle( wxIdleEvent& event );


@@ -389,9 +390,12 @@ enum
     // tooltip menu
     CONTROLS_SET_TOOLTIP_DELAY = 200,
     CONTROLS_ENABLE_TOOLTIPS,
     // tooltip menu
     CONTROLS_SET_TOOLTIP_DELAY = 200,
     CONTROLS_ENABLE_TOOLTIPS,

+    CONTROLS_SET_TOOLTIPS_MAX_WIDTH,

 
     // panel menu
     CONTROLS_ENABLE_ALL,
 
     // panel menu
     CONTROLS_ENABLE_ALL,

+    CONTROLS_HIDE_ALL,
+    CONTROLS_HIDE_LIST,

     CONTROLS_CONTEXT_HELP
 };
 
     CONTROLS_CONTEXT_HELP
 };
 


@@ -462,7 +466,7 @@ const int  ID_RADIOBOX_SEL_NUM  = 161;
 const int  ID_RADIOBOX_SEL_STR  = 162;
 const int  ID_RADIOBOX_FONT     = 163;
 const int  ID_RADIOBOX_ENABLE   = 164;
 const int  ID_RADIOBOX_SEL_STR  = 162;
 const int  ID_RADIOBOX_FONT     = 163;
 const int  ID_RADIOBOX_ENABLE   = 164;

-
+const int  ID_RADIOBOX2         = 165;

 const int  ID_RADIOBUTTON_1     = 166;
 const int  ID_RADIOBUTTON_2     = 167;
 
 const int  ID_RADIOBUTTON_1     = 166;
 const int  ID_RADIOBUTTON_2     = 167;
 


@@ -537,6 +541,7 @@ 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_COMBO_SET_TEXT,       MyPanel::OnComboButtons)
 EVT_CHECKBOX  (ID_COMBO_ENABLE,         MyPanel::OnComboButtons)
 EVT_RADIOBOX  (ID_RADIOBOX,             MyPanel::OnRadio)

+EVT_RADIOBOX  (ID_RADIOBOX2,            MyPanel::OnRadio)

 EVT_BUTTON    (ID_RADIOBOX_SEL_NUM,     MyPanel::OnRadioButtons)
 EVT_BUTTON    (ID_RADIOBOX_SEL_STR,     MyPanel::OnRadioButtons)
 EVT_BUTTON    (ID_RADIOBOX_FONT,        MyPanel::OnRadioButtons)
 EVT_BUTTON    (ID_RADIOBOX_SEL_NUM,     MyPanel::OnRadioButtons)
 EVT_BUTTON    (ID_RADIOBOX_SEL_STR,     MyPanel::OnRadioButtons)
 EVT_BUTTON    (ID_RADIOBOX_FONT,        MyPanel::OnRadioButtons)


@@ -569,9 +574,6 @@ 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_BUTTON    (ID_BUTTON_TEST2,         MyPanel::OnTestButton)
 EVT_BUTTON    (ID_BITMAP_BTN,           MyPanel::OnBmpButton)
 EVT_TOGGLEBUTTON(ID_BITMAP_BTN_ENABLE,  MyPanel::OnBmpButtonToggle)

-#if wxUSE_HYPERLINKCTRL
-EVT_HYPERLINK (ID_HYPERLINK,            MyPanel::OnHyperlink)
-#endif

 
 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)


@@ -654,8 +656,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     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.")
     };


@@ -746,18 +748,15 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     wxPanel *panel = new wxPanel(m_book);
     m_listbox = new wxListBox( panel, ID_LISTBOX,
                                wxPoint(10,10), wxSize(120,70),
     wxPanel *panel = new wxPanel(m_book);
     m_listbox = new wxListBox( panel, ID_LISTBOX,
                                wxPoint(10,10), wxSize(120,70),

-                               5, choices, wxLB_MULTIPLE |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);
 
     m_listbox->SetCursor(*wxCROSS_CURSOR);
 
     SetListboxClientData(wxT("listbox"), m_listbox);
     SetListboxClientData(wxT("listbox"), m_listboxSorted);
 
     m_listbox->SetCursor(*wxCROSS_CURSOR);

-#if wxUSE_TOOLTIPS
-    m_listbox->SetToolTip( _T("This is a list box") );
-#endif // wxUSE_TOOLTIPS

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


@@ -768,16 +767,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     button->SetDefault();
 
 
     button->SetDefault();
 

-#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);
     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));
     (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, _T("&Toggle colour"),
                           wxPoint(110,170) );
     panel->SetCursor(wxCursor(wxCURSOR_HAND));


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

-    wxRadioBox *radio2 = 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 );
-
-#if wxUSE_TOOLTIPS
-    m_combo->SetToolTip(_T("This is a natural\ncombobox - can you believe me?"));
-    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
+    new MyRadioBox(panel, ID_RADIOBOX2, _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 );

 
 #if wxUSE_HELP
     for( unsigned int item = 0; item < WXSIZEOF(choices); ++item )
 
 #if wxUSE_HELP
     for( unsigned int item = 0; item < WXSIZEOF(choices); ++item )


@@ -886,9 +870,6 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
                              wxDefaultPosition, wxSize(155,wxDefaultCoord),
                              wxSL_AUTOTICKS | wxSL_LABELS);
     m_slider->SetTickFreq(40, 0);
                              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

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


@@ -941,7 +922,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     s << initialSpinValue;
     m_spintext = new wxTextCtrl( panel, wxID_ANY, s, wxPoint(20,160), wxSize(80,wxDefaultCoord) );
 #if wxUSE_SPINBTN
     s << initialSpinValue;
     m_spintext = new wxTextCtrl( panel, wxID_ANY, s, wxPoint(20,160), wxSize(80,wxDefaultCoord) );
 #if wxUSE_SPINBTN

-    m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160) );
+    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);
 


@@ -953,7 +934,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
 #if wxUSE_SPINCTRL
     m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, wxEmptyString, wxPoint(200, 160), wxSize(80, wxDefaultCoord) );
 
 #if wxUSE_SPINCTRL
     m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, wxEmptyString, wxPoint(200, 160), wxSize(80, wxDefaultCoord) );

-    //m_spinctrl->SetRange(10,30);
+    m_spinctrl->SetRange(-10,30);

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


@@ -974,9 +955,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     wxBitmap bitmap( 100, 100 );
     wxMemoryDC dc;
 
     wxBitmap bitmap( 100, 100 );
     wxMemoryDC dc;

-    dc.SetBackground(*wxGREEN);

     dc.SelectObject( bitmap );
     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.Clear();
     dc.DrawEllipse(5, 5, 90, 90);
     dc.DrawText(_T("Bitmap"), 30, 40);


@@ -1020,28 +1001,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     m_book->AddPage(panel, _T("wxBitmapXXX"));
 
 
     m_book->AddPage(panel, _T("wxBitmapXXX"));
 

-    // hyperlink
-#if wxUSE_HYPERLINKCTRL
-    panel = new wxPanel(m_book);
-    m_hyperlink = new wxHyperlinkCtrl(panel, ID_HYPERLINK,
-                                      _T("Click here to go to Google!"),
-                                      _T("http://www.google.com"),
-                                      wxPoint(20, 20));
-    m_hyperlink->SetVisitedColour(m_hyperlink->GetNormalColour());
-    m_hyperlink->SetFont(*wxITALIC_FONT);
-    m_hyperlink->SetBackgroundColour(*wxWHITE);
-
-    // this hyperlink will automatically call wxLaunchDefaultBrowser on user's clicks
-    new wxHyperlinkCtrl(panel, wxID_ANY, wxT("http://www.test.com"),
-                        wxEmptyString, wxPoint(20, 50));
-
-    m_book->AddPage(panel, _T("wxHyperlinkCtrl"));
-#endif
-

     // sizer
     // sizer

-

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

-    panel->SetAutoLayout( true );

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


@@ -1101,8 +1062,48 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     sizer->Add(m_book, wxSizerFlags().Border().Expand());
     sizer->Add(m_text, wxSizerFlags(1).Border().Expand());
     SetSizer(sizer);
     sizer->Add(m_book, wxSizerFlags().Border().Expand());
     sizer->Add(m_text, wxSizerFlags(1).Border().Expand());
     SetSizer(sizer);

+
+#if wxUSE_TOOLTIPS
+    SetAllToolTips();
+#endif // wxUSE_TOOLTIPS
+}
+
+#if wxUSE_TOOLTIPS
+
+namespace
+{
+
+void ResetToolTip(wxWindow *win, const char *tip)
+{
+    wxCHECK_RET( win, "NULL window?" );
+
+    win->UnsetToolTip();
+    win->SetToolTip(tip);
+}
+

 }
 
 }
 

+void MyPanel::SetAllToolTips()
+{
+    ResetToolTip(FindWindow(ID_LISTBOX_FONT), "Press here to set italic font");
+    ResetToolTip(m_checkbox, "Click here to disable the listbox");
+    ResetToolTip(m_listbox, "This is a list box");
+    ResetToolTip(m_combo, "This is a natural\ncombobox - can you believe me?");
+    ResetToolTip(m_slider, "This is a sliding slider");
+    ResetToolTip(FindWindow(ID_RADIOBOX2), "Ever seen a radiobox?");
+
+    //ResetToolTip(m_radio, "Tooltip for the entire radiobox");
+    for ( unsigned int nb = 0; nb < m_radio->GetCount(); nb++ )
+    {
+        m_radio->SetItemToolTip(nb, "");
+        m_radio->SetItemToolTip(nb, "tooltip for\n" + m_radio->GetString(nb));
+    }
+
+    // remove the tooltip for one of the items
+    m_radio->SetItemToolTip(2, "");
+}
+#endif // wxUSE_TOOLTIPS
+

 void MyPanel::OnIdle(wxIdleEvent& event)
 {
     static const int INVALID_SELECTION = -2;
 void MyPanel::OnIdle(wxIdleEvent& event)
 {
     static const int INVALID_SELECTION = -2;


@@ -1218,22 +1219,24 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
 
 void MyPanel::OnListBox( wxCommandEvent &event )
 {
 
 void MyPanel::OnListBox( wxCommandEvent &event )
 {

-    if (event.GetInt() == -1)
-    {
-        m_text->AppendText( _T("ListBox has no selections anymore\n") );
-        return;
-    }
-

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

+    bool deselect = false;
+    if (listbox->HasFlag(wxLB_MULTIPLE) || listbox->HasFlag(wxLB_EXTENDED))
+    {
+        deselect = !event.IsSelection();
+        if (deselect)
+            m_text->AppendText( _T("ListBox deselection event\n") );
+    }
+

     m_text->AppendText( _T("ListBox event selection string is: '") );
     m_text->AppendText( event.GetString() );
     m_text->AppendText( _T("'\n") );
 
     // can't use GetStringSelection() with multiple selections, there could be
     // more than one of them
     m_text->AppendText( _T("ListBox event selection string is: '") );
     m_text->AppendText( event.GetString() );
     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) )
+    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("ListBox control selection string is: '") );
         m_text->AppendText( listbox->GetStringSelection() );


@@ -1311,8 +1314,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:


@@ -1338,10 +1341,10 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
 
 #if wxUSE_CHOICE
 
 
 #if wxUSE_CHOICE
 

-static const wxChar *GetDataString(wxClientData *data)
+static wxString GetDataString(wxClientData *data)

 {
 {

-    return data ? wx_static_cast(wxStringClientData *, data)->GetData().c_str()
-                : _T("none");
+    return data ? static_cast<wxStringClientData *>(data)->GetData()
+                : wxString("none");

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


@@ -1359,8 +1362,8 @@ void MyPanel::OnChoice( wxCommandEvent &event )
                  _T("data \"%s\"/\"%s\""),
                  (int)event.GetInt(),
                  sel,
                  _T("data \"%s\"/\"%s\""),
                  (int)event.GetInt(),
                  sel,

-                 event.GetString().c_str(),
-                 choice->GetStringSelection().c_str(),
+                 event.GetString(),
+                 choice->GetStringSelection(),

                  GetDataString(dataEvt),
                  GetDataString(dataCtrl));
 }
                  GetDataString(dataEvt),
                  GetDataString(dataCtrl));
 }


@@ -1716,15 +1719,6 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
 #endif // wxUSE_PROGRESSDLG
 #endif // wxUSE_SPINBTN
 
 #endif // wxUSE_PROGRESSDLG
 #endif // wxUSE_SPINBTN
 

-#if wxUSE_HYPERLINKCTRL
-void MyPanel::OnHyperlink(wxHyperlinkEvent& event)
-{
-    wxLogMessage(wxT("Clicked on hyperlink with url '%s'"), event.GetURL().c_str());
-    if (!wxLaunchDefaultBrowser(event.GetURL()))
-        wxMessageBox(_T("Could not launch the default browser!"));
-}
-#endif //wxUSE_HYPERLINK
-

 void MyPanel::OnSizerCheck( wxCommandEvent &event)
 {
   switch (event.GetId ()) {
 void MyPanel::OnSizerCheck( wxCommandEvent &event)
 {
   switch (event.GetId ()) {


@@ -1775,9 +1769,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 #if wxUSE_TOOLTIPS
     EVT_MENU(CONTROLS_SET_TOOLTIP_DELAY,  MyFrame::OnSetTooltipDelay)
     EVT_MENU(CONTROLS_ENABLE_TOOLTIPS,  MyFrame::OnToggleTooltips)
 #if wxUSE_TOOLTIPS
     EVT_MENU(CONTROLS_SET_TOOLTIP_DELAY,  MyFrame::OnSetTooltipDelay)
     EVT_MENU(CONTROLS_ENABLE_TOOLTIPS,  MyFrame::OnToggleTooltips)

+#ifdef __WXMSW__
+    EVT_MENU(CONTROLS_SET_TOOLTIPS_MAX_WIDTH, MyFrame::OnSetMaxTooltipWidth)
+#endif // __WXMSW__

 #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_MENU(CONTROLS_CONTEXT_HELP, MyFrame::OnContextHelp)
 
     EVT_ICONIZE(MyFrame::OnIconized)


@@ -1789,11 +1788,8 @@ 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(700, 450))

 {
 {

-    // give it a context help button
-    SetExtraStyle(wxFRAME_EX_CONTEXTHELP);
-    wxFrame::Create(NULL, wxID_ANY, title, wxPoint(x, y), wxSize(500, 430),
-                    wxDEFAULT_FRAME_STYLE & ~ (wxMINIMIZE_BOX | wxMAXIMIZE_BOX));

     SetHelpText( _T("Controls sample demonstrating various widgets") );
 
     // Give it an icon
     SetHelpText( _T("Controls sample demonstrating various widgets") );
 
     // Give it an icon


@@ -1822,12 +1818,19 @@ MyFrame::MyFrame(const wxChar *title, int x, int y)
     tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, _T("&Toggle tooltips\tCtrl-T"),
             _T("enable/disable tooltips"), true);
     tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, true);
     tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, _T("&Toggle tooltips\tCtrl-T"),
             _T("enable/disable tooltips"), true);
     tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, true);

+#ifdef __WXMSW__
+    tooltip_menu->Append(CONTROLS_SET_TOOLTIPS_MAX_WIDTH, "Set maximal &width");
+#endif // __WXMSW__

     menu_bar->Append(tooltip_menu, _T("&Tooltips"));
 #endif // wxUSE_TOOLTIPS
 
     wxMenu *panel_menu = new wxMenu;
     panel_menu->Append(CONTROLS_ENABLE_ALL, _T("&Disable all\tCtrl-E"),
                        _T("Enable/disable all panel controls"), true);
     menu_bar->Append(tooltip_menu, _T("&Tooltips"));
 #endif // wxUSE_TOOLTIPS
 
     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"));
     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"));


@@ -1839,8 +1842,6 @@ MyFrame::MyFrame(const wxChar *title, int x, int y)
 #endif // wxUSE_STATUSBAR
 
     m_panel = new MyPanel( this, 10, 10, 300, 100 );
 #endif // wxUSE_STATUSBAR
 
     m_panel = new MyPanel( this, 10, 10, 300, 100 );

-
-    SetSizeHints( 500, 425 );

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


@@ -1893,7 +1894,36 @@ void MyFrame::OnToggleTooltips(wxCommandEvent& WXUNUSED(event))
 
     wxLogStatus(this, _T("Tooltips %sabled"), s_enabled ? _T("en") : _T("dis") );
 }
 
     wxLogStatus(this, _T("Tooltips %sabled"), s_enabled ? _T("en") : _T("dis") );
 }

-#endif // tooltips
+
+#ifdef __WXMSW__
+
+void MyFrame::OnSetMaxTooltipWidth(wxCommandEvent& WXUNUSED(event))
+{
+    static int s_maxWidth = 0;
+
+    wxNumberEntryDialog dlg
+                        (
+                         this,
+                         "Change maximal tooltip width",
+                         "&Width in pixels:",
+                         GetTitle(),
+                         s_maxWidth,
+                         -1,
+                         600
+                        );
+    if ( dlg.ShowModal() == wxID_CANCEL )
+        return;
+
+    s_maxWidth = dlg.GetValue();
+    wxToolTip::SetMaxWidth(s_maxWidth);
+
+    // we need to set the tooltip again to test the new width
+    m_panel->SetAllToolTips();
+}
+
+#endif // __WXMSW__
+
+#endif // wxUSE_TOOLTIPS

 
 void MyFrame::OnEnableAll(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnEnableAll(wxCommandEvent& WXUNUSED(event))
 {


@@ -1901,6 +1931,31 @@ 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))
 }
 
 void MyFrame::OnContextHelp(wxCommandEvent& WXUNUSED(event))


@@ -1920,8 +1975,8 @@ void MyFrame::OnMove( wxMoveEvent& event )
 
 void MyFrame::OnIconized( wxIconizeEvent& event )
 {
 
 void MyFrame::OnIconized( wxIconizeEvent& event )
 {

-    wxLogMessage(_T("Frame %s"), event.Iconized() ? _T("iconized")
-                                                  : _T("restored"));
+    wxLogMessage(_T("Frame %s"), event.IsIconized() ? _T("iconized")
+                                                    : _T("restored"));

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


@@ -1942,24 +1997,30 @@ 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);
 
 #if wxUSE_STATUSBAR
         SetStatusText(msg);