Bug fix in GetLabelFromText

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index a12beef3b610a7809a1863db80e0f1973e87db20..ac536f9b9c9abbd910e83560dd95854bbd3b81c0 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -61,11 +61,6 @@
 
 #include "wx/progdlg.h"
 
 
 #include "wx/progdlg.h"
 

-// VZ: this is a temp. hack, will remove soon
-#ifndef wxUSE_SPINCTRL
-#define wxUSE_SPINCTRL 1
-#endif
-

 #if wxUSE_SPINCTRL
     #include "wx/spinctrl.h"
 #endif // wxUSE_SPINCTRL
 #if wxUSE_SPINCTRL
     #include "wx/spinctrl.h"
 #endif // wxUSE_SPINCTRL


@@ -110,7 +105,7 @@ public:
 #endif // wxUSE_SPINBTN
 
 #if wxUSE_SPINCTRL
 #endif // wxUSE_SPINBTN
 
 #if wxUSE_SPINCTRL

-    void OnSpinCtrl(wxSpinEvent& event);
+    void OnSpinCtrl(wxCommandEvent& event);

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


@@ -167,6 +162,8 @@ public:
     void OnSize( wxSizeEvent& event );
     void OnMove( wxMoveEvent& event );
 
     void OnSize( wxSizeEvent& event );
     void OnMove( wxMoveEvent& event );
 

+    MyPanel *GetPanel() const { return m_panel; }
+

 private:
     void UpdateStatusBar(const wxPoint& pos, const wxSize& size)
     {
 private:
     void UpdateStatusBar(const wxPoint& pos, const wxSize& size)
     {


@@ -176,7 +173,7 @@ private:
         SetStatusText(msg, 1);
     }
 
         SetStatusText(msg, 1);
     }
 

-    wxPanel *m_panel;
+    MyPanel *m_panel;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -222,7 +219,9 @@ bool MyApp::OnInit()
     // Create the main frame window
     MyFrame *frame = new MyFrame((wxFrame *) NULL,
             "Controls wxWindows App",
     // Create the main frame window
     MyFrame *frame = new MyFrame((wxFrame *) NULL,
             "Controls wxWindows App",

-            x, y, 530, 420);
+            x, y, 540, 430);
+    
+    frame->SetSizeHints( 500, 425 );

 
     // Give it an icon
     // The wxICON() macros loads an icon from a resource under Windows
 
     // Give it an icon
     // The wxICON() macros loads an icon from a resource under Windows


@@ -259,6 +258,8 @@ bool MyApp::OnInit()
     frame->Show(TRUE);
     frame->SetCursor(wxCursor(wxCURSOR_HAND));
 
     frame->Show(TRUE);
     frame->SetCursor(wxCursor(wxCURSOR_HAND));
 

+    frame->GetPanel()->m_notebook->SetSelection(6);
+

     SetTopWindow(frame);
 
     return TRUE;
     SetTopWindow(frame);
 
     return TRUE;


@@ -366,7 +367,7 @@ EVT_UPDATE_UI (ID_BTNPROGRESS,          MyPanel::OnUpdateShowProgress)
 EVT_BUTTON    (ID_BTNPROGRESS,          MyPanel::OnShowProgress)
 #endif // wxUSE_SPINBTN
 #if wxUSE_SPINCTRL
 EVT_BUTTON    (ID_BTNPROGRESS,          MyPanel::OnShowProgress)
 #endif // wxUSE_SPINBTN
 #if wxUSE_SPINCTRL

-EVT_SPIN      (ID_SPINCTRL,             MyPanel::OnSpinCtrl)
+EVT_SPINCTRL  (ID_SPINCTRL,             MyPanel::OnSpinCtrl)

 #endif // wxUSE_SPINCTRL
 EVT_BUTTON    (ID_BUTTON_LABEL,         MyPanel::OnUpdateLabel)
 EVT_CHECKBOX  (ID_CHANGE_COLOUR,        MyPanel::OnChangeColour)
 #endif // wxUSE_SPINCTRL
 EVT_BUTTON    (ID_BUTTON_LABEL,         MyPanel::OnUpdateLabel)
 EVT_CHECKBOX  (ID_CHANGE_COLOUR,        MyPanel::OnChangeColour)


@@ -376,10 +377,12 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
        : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) ),
          m_text(NULL), m_notebook(NULL)
 {
        : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) ),
          m_text(NULL), m_notebook(NULL)
 {

+    wxLayoutConstraints *c;
+

     m_text = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,50), wxSize(100,50), wxTE_MULTILINE );
     //  m_text->SetBackgroundColour("wheat");
 
     m_text = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,50), wxSize(100,50), wxTE_MULTILINE );
     //  m_text->SetBackgroundColour("wheat");
 

-    delete wxLog::SetActiveTarget(new wxLogStderr);
+    //delete wxLog::SetActiveTarget(new wxLogStderr);

 
     m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) );
 
 
     m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) );
 


@@ -468,6 +471,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     (void)new wxButton( panel, ID_LISTBOX_APPEND, "Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
     (void)new wxButton( panel, ID_LISTBOX_DELETE, "Delete selected item", wxPoint(180,130), wxSize(140,30) );
     wxButton *button = new wxButton( panel, ID_LISTBOX_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) );
     (void)new wxButton( panel, ID_LISTBOX_APPEND, "Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
     (void)new wxButton( panel, ID_LISTBOX_DELETE, "Delete selected item", wxPoint(180,130), wxSize(140,30) );
     wxButton *button = new wxButton( panel, ID_LISTBOX_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) );

+
+    button->SetDefault();
+
+    button->SetForegroundColour(*wxBLUE);
+

 #if wxUSE_TOOLTIPS
     button->SetToolTip( "Press here to set italic font" );
 #endif // wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS
     button->SetToolTip( "Press here to set italic font" );
 #endif // wxUSE_TOOLTIPS


@@ -504,7 +512,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
 
     panel = new wxPanel(m_notebook);
     m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
 
     panel = new wxPanel(m_notebook);

-    m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(10,10), wxSize(120,-1), 5, choices, wxCB_READONLY );
+    (void)new wxStaticBox( panel, -1, "Box around combobox",
+                           wxPoint(5, 5), wxSize(150, 100));
+    m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(20,25), wxSize(120,-1), 5, choices, wxCB_READONLY );

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


@@ -525,14 +535,19 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     panel = new wxPanel(m_notebook);
     (void)new wxRadioBox( panel, ID_RADIOBOX, "That", wxPoint(10,160), wxSize(-1,-1), WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS );
     m_radio = new wxRadioBox( panel, ID_RADIOBOX, "This", wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS );
     panel = new wxPanel(m_notebook);
     (void)new wxRadioBox( panel, ID_RADIOBOX, "That", wxPoint(10,160), wxSize(-1,-1), WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS );
     m_radio = new wxRadioBox( panel, ID_RADIOBOX, "This", wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS );

+
+#if wxUSE_TOOLTIPS
+    m_radio->SetToolTip("Ever seen a radiobox?");
+#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 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), wxSize(140,30) );
-    wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxSize(110,30), wxRB_GROUP );
+    (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 );
     rb->SetValue( FALSE );

-    (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "Radiobutton2", wxPoint(340,170), wxSize(110,30) );
+    (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "Radiobutton2", wxPoint(340,170), wxDefaultSize );

     m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio);
 
     panel = new wxPanel(m_notebook);
     m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio);
 
     panel = new wxPanel(m_notebook);


@@ -584,7 +599,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
 #ifndef __WXMOTIF__  // wxStaticBitmap not working under Motif yet. MB
     wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
 
 #ifndef __WXMOTIF__  // wxStaticBitmap not working under Motif yet. MB
     wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);

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

 
     bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10));
     bmpStatic->SetIcon(wxTheApp->GetStdIcon(wxICON_QUESTION));
 
     bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10));
     bmpStatic->SetIcon(wxTheApp->GetStdIcon(wxICON_QUESTION));


@@ -594,11 +610,32 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     wxMemoryDC dc;
     dc.SelectObject( bitmap );
     dc.SetPen(*wxGREEN_PEN);
     wxMemoryDC dc;
     dc.SelectObject( bitmap );
     dc.SetPen(*wxGREEN_PEN);

+    dc.Clear();

     dc.DrawEllipse(5, 5, 90, 90);
     dc.DrawEllipse(5, 5, 90, 90);

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

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

+
+#if 0
+    bitmap = wxBitmap("../../utils/wxPython/tests/bitmaps/test2.bmp",
+                      wxBITMAP_TYPE_BMP);
+    bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
+    (void)new wxBitmapButton(panel, -1, bitmap, wxPoint(300, 120));
+#endif
+
+    wxBitmap bmp1(wxTheApp->GetStdIcon(wxICON_INFORMATION)),
+             bmp2(wxTheApp->GetStdIcon(wxICON_WARNING)),
+             bmp3(wxTheApp->GetStdIcon(wxICON_QUESTION));
+    wxBitmapButton *bmpBtn = new wxBitmapButton
+                                 (
+                                  panel, -1,
+                                  bmp1,
+                                  wxPoint(30, 50)
+                                 );
+    bmpBtn->SetBitmapSelected(bmp2);
+    bmpBtn->SetBitmapFocus(bmp3);
+

     (void)new wxButton(panel, ID_BUTTON_LABEL, "Toggle label", wxPoint(250, 20));
     m_label = new wxStaticText(panel, -1, "Label with some long text",
                                wxPoint(250, 60), wxDefaultSize,
     (void)new wxButton(panel, ID_BUTTON_LABEL, "Toggle label", wxPoint(250, 20));
     m_label = new wxStaticText(panel, -1, "Label with some long text",
                                wxPoint(250, 60), wxDefaultSize,


@@ -606,51 +643,45 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     m_notebook->AddPage(panel, "wxBitmapXXX");
 
 
     m_notebook->AddPage(panel, "wxBitmapXXX");
 

-// --------------- TEST CODE ----------------------
+    // layout constraints

 
 

-  // layout constraints
-
-  panel = new wxPanel(m_notebook);
-  panel->SetAutoLayout( TRUE );
-
-  wxLayoutConstraints *c;
-  c = new wxLayoutConstraints;
-  c->top.SameAs( panel, wxTop, 10 );
-  c->height.AsIs( );
-  c->left.SameAs( panel, wxLeft, 10 );
-  c->width.PercentOf( panel, wxWidth, 40 );
-
-  wxButton *pMyButton = new wxButton(panel, -1, "Test Button" );
-  pMyButton->SetConstraints( c );
+    panel = new wxPanel(m_notebook);
+    panel->SetAutoLayout( TRUE );

 
 

-  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 );
+    c = new wxLayoutConstraints;
+    c->top.SameAs( panel, wxTop, 10 );
+    c->height.AsIs( );
+    c->left.SameAs( panel, wxLeft, 10 );
+    c->width.PercentOf( panel, wxWidth, 40 );

 
 

-  wxButton *pMyButton2 = new wxButton(panel, -1, "Test Button 2" );
-  pMyButton2->SetConstraints( c );
+    wxButton *pMyButton = new wxButton(panel, -1, "Test Button" );
+    pMyButton->SetConstraints( c );

 
 

-  m_notebook->AddPage(panel, "wxLayoutConstraint");
+    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 );

 
 

-  // sizer
+    wxButton *pMyButton2 = new wxButton(panel, -1, "Test Button 2" );
+    pMyButton2->SetConstraints( c );

 
 

-  panel = new wxPanel(m_notebook);
-  panel->SetAutoLayout( TRUE );
+    m_notebook->AddPage(panel, "wxLayoutConstraint");

 
 

-  wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
+    // sizer

 
 

-  sizer->Add( new wxButton(panel, -1, "Test Button" ), 3, wxALL, 10 );
-  sizer->Add( 20,20, 1 );
-  sizer->Add( new wxButton(panel, -1, "Test Button 2" ), 3, wxGROW|wxALL, 10 );
+    panel = new wxPanel(m_notebook);
+    panel->SetAutoLayout( TRUE );

 
 

-  panel->SetSizer( sizer );
+    wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );

 
 

-  m_notebook->AddPage(panel, "wxSizer");
+    sizer->Add( new wxButton(panel, -1, "Test Button" ), 3, wxALL, 10 );
+    sizer->Add( 20,20, 1 );
+    sizer->Add( new wxButton(panel, -1, "Test Button 2" ), 3, wxGROW|wxALL, 10 );

 
 

-// --------------- TEST CODE ----------------------
+    panel->SetSizer( sizer );

 
 

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

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


@@ -698,6 +729,7 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
         SetBackgroundColour(s_colOld);
         s_colOld = wxNullColour;
 
         SetBackgroundColour(s_colOld);
         s_colOld = wxNullColour;
 

+        m_lbSelectThis->SetForegroundColour("yellow");

         m_lbSelectThis->SetBackgroundColour("blue");
     }
     else
         m_lbSelectThis->SetBackgroundColour("blue");
     }
     else


@@ -705,6 +737,7 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
         s_colOld = GetBackgroundColour();
         SetBackgroundColour("green");
 
         s_colOld = GetBackgroundColour();
         SetBackgroundColour("green");
 

+        m_lbSelectThis->SetForegroundColour("white");

         m_lbSelectThis->SetBackgroundColour("red");
     }
 
         m_lbSelectThis->SetBackgroundColour("red");
     }
 


@@ -714,7 +747,7 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
 
 void MyPanel::OnListBox( wxCommandEvent &event )
 {
 
 void MyPanel::OnListBox( wxCommandEvent &event )
 {

-    GetParent()->Move(100, 100);
+//    GetParent()->Move(100, 100);

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


@@ -729,17 +762,17 @@ void MyPanel::OnListBox( wxCommandEvent &event )
     wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
     m_text->AppendText( "ListBox event client data string is: '" );
     if (obj) // BC++ doesn't like use of '? .. : .. ' in this context
     wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
     m_text->AppendText( "ListBox event client data string is: '" );
     if (obj) // BC++ doesn't like use of '? .. : .. ' in this context

-       m_text->AppendText( obj->GetData() );
+        m_text->AppendText( obj->GetData() );

     else
     else

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

 
     m_text->AppendText( "'\n" );
     m_text->AppendText( "ListBox control client data string is: '" );
     obj = (wxStringClientData *)listbox->GetClientObject(listbox->GetSelection());
     if (obj)
 
     m_text->AppendText( "'\n" );
     m_text->AppendText( "ListBox control client data string is: '" );
     obj = (wxStringClientData *)listbox->GetClientObject(listbox->GetSelection());
     if (obj)

-       m_text->AppendText( obj->GetData() );
+        m_text->AppendText( obj->GetData() );

     else
     else

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

     m_text->AppendText( "'\n" );
 }
 
     m_text->AppendText( "'\n" );
 }
 


@@ -765,6 +798,8 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
                     cb->SetToolTip( "Click to disable listbox" );
 #endif // wxUSE_TOOLTIPS
                 m_listbox->Enable( event.GetInt() == 0 );
                     cb->SetToolTip( "Click to disable listbox" );
 #endif // wxUSE_TOOLTIPS
                 m_listbox->Enable( event.GetInt() == 0 );

+                m_lbSelectThis->Enable( event.GetInt() == 0 );
+                m_lbSelectNum->Enable( event.GetInt() == 0 );

                 m_listboxSorted->Enable( event.GetInt() == 0 );
                 break;
             }
                 m_listboxSorted->Enable( event.GetInt() == 0 );
                 break;
             }


@@ -1003,10 +1038,11 @@ void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
 
 #if wxUSE_SPINCTRL
 
 
 #if wxUSE_SPINCTRL
 

-void MyPanel::OnSpinCtrl(wxSpinEvent& event)
+void MyPanel::OnSpinCtrl(wxCommandEvent& event)

 {
     wxString s;
 {
     wxString s;

-    s.Printf(_T("Current value of spin ctrl is %d\n"), m_spinctrl->GetValue());
+    s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"),
+             m_spinctrl->GetValue(), event.GetInt());

     m_text->AppendText(s);
 }
 
     m_text->AppendText(s);
 }