some clean up of the code

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 6bb423f803dafb6fa2be35d8484180b03ba7dc2e..04c892b4c34b2c293029ec8ec87c7f276e7a3a2d 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -57,11 +57,13 @@ class MyPanel: public wxPanel
     void OnComboButtons( wxCommandEvent &event );
     void OnRadio( wxCommandEvent &event );
     void OnRadioButtons( wxCommandEvent &event );
+    void OnSetFont( wxCommandEvent &event );
     
     wxListBox   *m_listbox;
     wxChoice    *m_choice;
     wxComboBox  *m_combo;
     wxRadioBox  *m_radio;
+    wxButton    *m_fontButton;
     
     wxTextCtrl  *m_text;
     wxNotebook  *m_notebook;    
@@ -101,7 +103,7 @@ const   int MINIMAL_ABOUT  = 102;
 bool MyApp::OnInit(void)
 {
   // Create the main frame window
-  MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "Controls wxWindows App", 50, 50, 500, 420 );
+  MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "Controls wxWindows App", 50, 50, 530, 420 );
   
   // Give it an icon
 #ifdef __WXMSW__
@@ -137,6 +139,8 @@ const  ID_LISTBOX_SEL_STR   = 132;
 const  ID_LISTBOX_CLEAR     = 133;
 const  ID_LISTBOX_APPEND    = 134;
 const  ID_LISTBOX_DELETE    = 135;
+const  ID_LISTBOX_FONT      = 136;
+const  ID_LISTBOX_ENABLE    = 137;
 
 const  ID_CHOICE            = 120;
 const  ID_CHOICE_SEL_NUM    = 121;
@@ -144,6 +148,8 @@ const  ID_CHOICE_SEL_STR    = 122;
 const  ID_CHOICE_CLEAR      = 123;
 const  ID_CHOICE_APPEND     = 124;
 const  ID_CHOICE_DELETE     = 125;
+const  ID_CHOICE_FONT       = 126;
+const  ID_CHOICE_ENABLE     = 127;
 
 const  ID_COMBO             = 140;
 const  ID_COMBO_SEL_NUM     = 141;
@@ -151,12 +157,18 @@ const  ID_COMBO_SEL_STR     = 142;
 const  ID_COMBO_CLEAR       = 143;
 const  ID_COMBO_APPEND      = 144;
 const  ID_COMBO_DELETE      = 145;
+const  ID_COMBO_FONT        = 146;
+const  ID_COMBO_ENABLE      = 147;
 
 const  ID_TEXT              = 150;
 
 const  ID_RADIOBOX          = 160;
 const  ID_RADIOBOX_SEL_NUM  = 161;
 const  ID_RADIOBOX_SEL_STR  = 162;
+const  ID_RADIOBOX_FONT     = 163;
+const  ID_RADIOBOX_ENABLE   = 164;
+
+const  ID_SET_FONT          = 170;
 
 BEGIN_EVENT_TABLE(MyPanel, wxPanel)
   EVT_SIZE      (                       MyPanel::OnSize)
@@ -166,21 +178,30 @@ BEGIN_EVENT_TABLE(MyPanel, wxPanel)
   EVT_BUTTON    (ID_LISTBOX_CLEAR,      MyPanel::OnListBoxButtons)
   EVT_BUTTON    (ID_LISTBOX_APPEND,     MyPanel::OnListBoxButtons)
   EVT_BUTTON    (ID_LISTBOX_DELETE,     MyPanel::OnListBoxButtons)
+  EVT_BUTTON    (ID_LISTBOX_FONT,       MyPanel::OnListBoxButtons)
+  EVT_CHECKBOX  (ID_LISTBOX_ENABLE,     MyPanel::OnListBoxButtons)
   EVT_CHOICE    (ID_CHOICE,             MyPanel::OnChoice)
   EVT_BUTTON    (ID_CHOICE_SEL_NUM,     MyPanel::OnChoiceButtons)
   EVT_BUTTON    (ID_CHOICE_SEL_STR,     MyPanel::OnChoiceButtons)
   EVT_BUTTON    (ID_CHOICE_CLEAR,       MyPanel::OnChoiceButtons)
   EVT_BUTTON    (ID_CHOICE_APPEND,      MyPanel::OnChoiceButtons)
   EVT_BUTTON    (ID_CHOICE_DELETE,      MyPanel::OnChoiceButtons)
+  EVT_BUTTON    (ID_CHOICE_FONT,        MyPanel::OnChoiceButtons)
+  EVT_CHECKBOX  (ID_CHOICE_ENABLE,      MyPanel::OnChoiceButtons)
   EVT_CHOICE    (ID_COMBO,              MyPanel::OnCombo)
   EVT_BUTTON    (ID_COMBO_SEL_NUM,      MyPanel::OnComboButtons)
   EVT_BUTTON    (ID_COMBO_SEL_STR,      MyPanel::OnComboButtons)
   EVT_BUTTON    (ID_COMBO_CLEAR,        MyPanel::OnComboButtons)
   EVT_BUTTON    (ID_COMBO_APPEND,       MyPanel::OnComboButtons)
   EVT_BUTTON    (ID_COMBO_DELETE,       MyPanel::OnComboButtons)
+  EVT_BUTTON    (ID_COMBO_FONT,         MyPanel::OnComboButtons)
+  EVT_CHECKBOX  (ID_COMBO_ENABLE,       MyPanel::OnComboButtons)
   EVT_RADIOBOX  (ID_RADIOBOX,           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_CHECKBOX  (ID_RADIOBOX_ENABLE,    MyPanel::OnRadioButtons)
+  EVT_BUTTON    (ID_SET_FONT,           MyPanel::OnSetFont)
 END_EVENT_TABLE()
 
 MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
@@ -212,9 +233,15 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   wxASSERT( WXSIZEOF(aIconNames) == Image_Max ); // keep in sync
 
   // fill the image list
+#ifdef __WXMSW__
   wxString strIconDir = "icons/";
+#else
+  wxString strIconDir = "../icons/";
+#endif
+
   wxImageList *imagelist = new wxImageList(32, 32);
-  for ( size_t n = 0; n < Image_Max; n++ ) {
+  for ( size_t n = 0; n < Image_Max; n++ ) 
+  {
     imagelist->Add(wxBitmap(strIconDir + aIconNames[n]));
   }
 
@@ -222,29 +249,35 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
 
   wxPanel *panel = new wxPanel(m_notebook);
   m_listbox = new wxListBox( panel, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), 4, choices );
-  (void)new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(100,30) );
-  (void)new wxButton( panel, ID_LISTBOX_SEL_STR, "Select 'This'", wxPoint(300,30), wxSize(100,30) );
-  (void)new wxButton( panel, ID_LISTBOX_CLEAR, "Clear", wxPoint(180,80), wxSize(100,30) );
-  (void)new wxButton( panel, ID_LISTBOX_APPEND, "Append 'Hi!'", wxPoint(300,80), wxSize(100,30) );
+  (void)new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
+  (void)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 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) );
+  (void)new wxButton( panel, ID_LISTBOX_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) );
+  (void)new wxCheckBox( panel, ID_LISTBOX_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) );
   m_notebook->AddPage(panel, "wxList", FALSE, Image_List);
   
   panel = new wxPanel(m_notebook);
   m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,-1), 4, choices );
-  (void)new wxButton( panel, ID_CHOICE_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(100,30) );
-  (void)new wxButton( panel, ID_CHOICE_SEL_STR, "Select 'This'", wxPoint(300,30), wxSize(100,30) );
-  (void)new wxButton( panel, ID_CHOICE_CLEAR, "Clear", wxPoint(180,80), wxSize(100,30) );
-  (void)new wxButton( panel, ID_CHOICE_APPEND, "Append 'Hi!'", wxPoint(300,80), wxSize(100,30) );
+  (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, "Delete 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);
   
   panel = new wxPanel(m_notebook);
   m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(10,10), wxSize(170,-1), 4, choices );
-  (void)new wxButton( panel, ID_COMBO_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(100,30) );
-  (void)new wxButton( panel, ID_COMBO_SEL_STR, "Select 'This'", wxPoint(300,30), wxSize(100,30) );
-  (void)new wxButton( panel, ID_COMBO_CLEAR, "Clear", wxPoint(180,80), wxSize(100,30) );
-  (void)new wxButton( panel, ID_COMBO_APPEND, "Append 'Hi!'", wxPoint(300,80), wxSize(100,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) );
+  (void)new wxButton( panel, ID_COMBO_APPEND, "Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
   (void)new wxButton( panel, ID_COMBO_DELETE, "Delete 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);
   
   wxTextCtrl *text = new wxTextCtrl( m_notebook, ID_TEXT, "Write text here.", wxPoint(10,10), wxSize(120,100), wxTE_MULTILINE );
@@ -252,8 +285,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   
   panel = new wxPanel(m_notebook);
   m_radio = new wxRadioBox( panel, ID_RADIOBOX, "This", wxPoint(10,10), wxSize(-1,-1), 4, choices );
-  (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, "Select #2", wxPoint(200,30), wxSize(100,30) );
-  (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "Select 'This'", wxPoint(200,80), wxSize(100,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) );
+  (void)new wxButton( panel, ID_RADIOBOX_FONT, "Set Italic font", wxPoint(180,130), wxSize(140,30) );
+  (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) );
+  m_fontButton = new wxButton( panel, ID_SET_FONT, "Set more Italic font", wxPoint(340,30), wxSize(160,30) );
   m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio);
 }
 
@@ -278,6 +314,11 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
 {
   switch (event.GetId())
   {
+    case ID_LISTBOX_ENABLE:
+    {
+      m_listbox->Enable( !((bool)event.GetInt()) );
+      break;
+    }
     case ID_LISTBOX_SEL_NUM:
     {
       m_listbox->SetSelection( 2 );
@@ -304,6 +345,11 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
       m_listbox->Delete( idx );
       break;
     }
+    case ID_LISTBOX_FONT:
+    {
+      m_listbox->SetFont( *wxITALIC_FONT );
+      break;
+    }
   }
 }
 
@@ -318,6 +364,11 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
 {
   switch (event.GetId())
   {
+    case ID_CHOICE_ENABLE:
+    {
+      m_choice->Enable( !((bool)event.GetInt()) );
+      break;
+    }
     case ID_CHOICE_SEL_NUM:
     {
       m_choice->SetSelection( 2 );
@@ -344,6 +395,11 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
       m_choice->Delete( idx );
       break;
     }
+    case ID_CHOICE_FONT:
+    {
+      m_choice->SetFont( *wxITALIC_FONT );
+      break;
+    }
   }
 }
 
@@ -358,6 +414,11 @@ void MyPanel::OnComboButtons( wxCommandEvent &event )
 {
   switch (event.GetId())
   {
+    case ID_COMBO_ENABLE:
+    {
+      m_combo->Enable( !((bool)event.GetInt()) );
+      break;
+    }
     case ID_COMBO_SEL_NUM:
     {
       m_combo->SetSelection( 2 );
@@ -384,6 +445,11 @@ void MyPanel::OnComboButtons( wxCommandEvent &event )
       m_combo->Delete( idx );
       break;
     }
+    case ID_COMBO_FONT:
+    {
+      m_combo->SetFont( *wxITALIC_FONT );
+      break;
+    }
   }
 }
 
@@ -398,6 +464,11 @@ void MyPanel::OnRadioButtons( wxCommandEvent &event )
 {
   switch (event.GetId())
   {
+    case ID_RADIOBOX_ENABLE:
+    {
+      m_radio->Enable( !((bool)event.GetInt()) );
+      break;
+    }
     case ID_RADIOBOX_SEL_NUM:
     {
       m_radio->SetSelection( 2 );
@@ -408,9 +479,20 @@ void MyPanel::OnRadioButtons( wxCommandEvent &event )
       m_radio->SetStringSelection( "This" );
       break;
     }
+    case ID_RADIOBOX_FONT:
+    {
+      m_radio->SetFont( *wxITALIC_FONT );
+      break;
+    }
   }
 }
 
+void MyPanel::OnSetFont( wxCommandEvent &WXUNUSED(event) )
+{
+  m_fontButton->SetFont( *wxITALIC_FONT );
+  m_text->SetFont( *wxITALIC_FONT );
+}
+
 MyPanel::~MyPanel()
 {
   delete m_notebook->GetImageList();