From 655822f3a720ec6f876d52cdd021f9056740a2e0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 15 Dec 1998 22:59:11 +0000 Subject: [PATCH] 1. is there any reason to comment out SetColor() in controls? I restored it... 2. Removed unused files from checklst sample git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/checklst/bell.bmp | Bin 370 -> 0 bytes samples/checklst/checklst.cpp | 29 +++--- samples/checklst/checklst.rc | 5 - samples/checklst/mondrian.ico | Bin 766 -> 0 bytes samples/checklst/nosound.bmp | Bin 370 -> 0 bytes samples/checklst/sound.bmp | Bin 370 -> 0 bytes samples/controls/controls.cpp | 170 +++++++++++++++++----------------- samples/controls/controls.rc | 10 +- 8 files changed, 110 insertions(+), 104 deletions(-) delete mode 100644 samples/checklst/bell.bmp delete mode 100644 samples/checklst/mondrian.ico delete mode 100644 samples/checklst/nosound.bmp delete mode 100644 samples/checklst/sound.bmp diff --git a/samples/checklst/bell.bmp b/samples/checklst/bell.bmp deleted file mode 100644 index 279b827162f2b745c005fc802938a84f0ce5890a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370 zcmb7*HZ}&$B zw=fcw0f;p=!k7u@ps`;V%cT)}F?J!_0&p#!2&% vld<$VEqU&p<3Ns5`Nf_+KG?%$w#sLQx8`|ei8_4vBY&s8ZsYZro@o37zjK0f diff --git a/samples/checklst/checklst.cpp b/samples/checklst/checklst.cpp index 26f90fa53d..5cd439384c 100644 --- a/samples/checklst/checklst.cpp +++ b/samples/checklst/checklst.cpp @@ -2,7 +2,7 @@ // Name: checklst.cpp // Purpose: wxCheckListBox sample // Author: Vadim Zeitlin -// Modified by: +// Modified by: // Created: 13.11.97 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin @@ -57,8 +57,8 @@ private: wxCheckListBox *m_pListBox; }; -enum -{ +enum +{ Menu_Quit = 1, Control_First = 1000, Control_Listbox, Control_Listbox2, @@ -102,11 +102,11 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame, char *title, int x, int y, SetMenuBar(menu_bar); // make a panel with some controls - wxPanel *pPanel = new wxPanel(this, -1, wxPoint(0, 0), + wxPanel *pPanel = new wxPanel(this, -1, wxPoint(0, 0), wxSize(400, 200), wxTAB_TRAVERSAL); // check list box - static const char* aszChoices[] = { "Hello", "world", "and", + static const char* aszChoices[] = { "Hello", "world", "and", "goodbye", "cruel", "world", "-------", "owner-drawn", "listbox" }; @@ -116,15 +116,15 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame, char *title, int x, int y, astrChoices[ui] = aszChoices[ui]; m_pListBox = new wxCheckListBox - ( - pPanel, // parent - Control_Listbox, // control id - wxPoint(10, 10), // listbox poistion + ( + pPanel, // parent + Control_Listbox, // control id + wxPoint(10, 10), // listbox poistion wxSize(400, 200), // listbox size - WXSIZEOF(aszChoices), // number of strings + WXSIZEOF(aszChoices), // number of strings astrChoices // array of strings - ); - + ); + delete [] astrChoices; for ( ui = 0; ui < WXSIZEOF(aszChoices); ui += 2 ) { @@ -179,9 +179,8 @@ void CheckListBoxFrame::OnCheckboxToggle(wxCommandEvent& event) { wxString strSelection; unsigned int nItem = event.GetInt(); - if(event.GetInt()==-1) - return; + strSelection.sprintf("item %d was %schecked", nItem, m_pListBox->IsChecked(nItem) ? "" : "un"); SetStatusText(strSelection); -} \ No newline at end of file +} diff --git a/samples/checklst/checklst.rc b/samples/checklst/checklst.rc index bbc00bdf4b..b86c4e2265 100644 --- a/samples/checklst/checklst.rc +++ b/samples/checklst/checklst.rc @@ -1,6 +1 @@ -mondrian ICON "mondrian.ico" -bell BITMAP "bell.bmp" -sound BITMAP "sound.bmp" -nosound BITMAP "nosound.bmp" #include "wx/msw/wx.rc" - diff --git a/samples/checklst/mondrian.ico b/samples/checklst/mondrian.ico deleted file mode 100644 index 2310c5d275a87af295d5ea8dc79ea417a5e74c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Zq|%K6?!Y&x{v!R^j? zrXT4i`h*=L@bnnrz$6c=0558d#7IQ%ommgVFUAnjdDLRaAHxrqt#9mG6eW|(>VqcE z4cKRniWe$tQoJ@KDTw)=jLA70tBp(h&tEh8c7D%WPRk>h+6feuCR3VY2mO-jras$Z M?X0$&#ST#bFP=DbWdHyG diff --git a/samples/checklst/sound.bmp b/samples/checklst/sound.bmp deleted file mode 100644 index 26f5f1883e29c465f0243ccff4ba2766b980229e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370 zcma)#K@I{T5CogVWPO1C!FTN4zYq`Vk(=M*VVkfu;|Q8;vI5gn44r1a-jaOX(F=8= z&Q#I?l@`}6DH2Deyc-It)=IaB=0~j=QEVF_kG}LLKf`E^u%iV8dx9~Z{F&2#nOj6; Xd)eh_c=Y<>_}B8WjGS#|+C9N5tAudn diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index a824a9a84a..18b22ffe50 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -5,7 +5,7 @@ // Modified by: // RCS-ID: $Id$ // Copyright: (c) Robert Roebling, Julian Smart -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -26,13 +26,14 @@ #include "wx/spinbutt.h" #include "wx/notebook.h" #include "wx/imaglist.h" +#include "wx/spinbutt.h" #include "wx/clipbrd.h" #include "wx/checklst.h" // XPM doesn't seem to work under Windows at present. Or, wxNotebook images // aren't working. // Uncomment this line and comment out the next to try it. -// #if defined(__WXGTK__) || defined(__WXMOTIF__) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW) +//#if defined(__WXGTK__) || defined(__WXMOTIF__) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW) #if defined(__WXGTK__) || defined(__WXMOTIF__) #define USE_XPM #endif @@ -52,7 +53,7 @@ //---------------------------------------------------------------------- class MyApp: public wxApp -{ +{ public: bool OnInit(void); }; @@ -60,10 +61,10 @@ class MyApp: public wxApp class MyPanel: public wxPanel { public: - + MyPanel(wxFrame *frame, int x, int y, int w, int h); virtual ~MyPanel(); - + void OnSize( wxSizeEvent& event ); void OnListBox( wxCommandEvent &event ); void OnListBoxButtons( wxCommandEvent &event ); @@ -79,7 +80,7 @@ class MyPanel: public wxPanel void OnSpinUpdate( wxSpinEvent &event ); void OnPasteFromClipboard( wxCommandEvent &event ); void OnCopyToClipboard( wxCommandEvent &event ); - + wxListBox *m_listbox; wxChoice *m_choice; wxComboBox *m_combo; @@ -91,26 +92,26 @@ class MyPanel: public wxPanel wxTextCtrl *m_spintext; wxTextCtrl *m_multitext; wxCheckBox *m_checkbox; - + wxTextCtrl *m_text; - wxNotebook *m_notebook; - - DECLARE_EVENT_TABLE() + wxNotebook *m_notebook; + + DECLARE_EVENT_TABLE() }; class MyFrame: public wxFrame { public: - + MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h); - + public: - + void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); bool OnClose(void) { return TRUE; } - - DECLARE_EVENT_TABLE() + + DECLARE_EVENT_TABLE() }; //---------------------------------------------------------------------- @@ -130,12 +131,14 @@ 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, 530, 420 ); - + MyFrame *frame = new MyFrame((wxFrame *) NULL, + "Controls wxWindows App", + 50, 50, 530, 420); + // 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 - + frame->SetIcon( wxICON(mondrian) ); wxMenu *file_menu = new wxMenu; @@ -147,7 +150,7 @@ bool MyApp::OnInit(void) frame->SetMenuBar(menu_bar); frame->Show(TRUE); - + SetTopWindow(frame); return TRUE; @@ -211,7 +214,7 @@ const int ID_CHECKLIST = 190; BEGIN_EVENT_TABLE(MyPanel, wxPanel) EVT_SIZE ( MyPanel::OnSize) - EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK, MyPanel::OnPageChanged) + EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK, MyPanel::OnPageChanged) EVT_LISTBOX (ID_LISTBOX, MyPanel::OnListBox) EVT_BUTTON (ID_LISTBOX_SEL_NUM, MyPanel::OnListBoxButtons) EVT_BUTTON (ID_LISTBOX_SEL_STR, MyPanel::OnListBoxButtons) @@ -251,13 +254,13 @@ END_EVENT_TABLE() MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) ) { -// SetBackgroundColour("cadet blue"); + SetBackgroundColour("cadet blue"); 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->SetBackgroundColour("wheat"); + m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) ); - + wxString choices[] = { "This", @@ -266,14 +269,14 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) : "wonderful", "examples.", }; - + #ifdef USE_XPM // image ids and names enum { Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max }; - + // fill the image list wxImageList *imagelist = new wxImageList(32, 32); @@ -299,29 +302,29 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) : wxButton *button = (wxButton*)NULL; -// m_notebook->SetBackgroundColour("cadet blue"); + m_notebook->SetBackgroundColour("cadet blue"); wxPanel *panel = (wxPanel*) NULL; panel = new wxPanel(m_notebook); -// panel->SetBackgroundColour("cadet blue"); -// panel->SetForegroundColour("blue"); + panel->SetBackgroundColour("cadet blue"); + panel->SetForegroundColour("blue"); m_listbox = new wxListBox( panel, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), 5, choices ); -// m_listbox->SetBackgroundColour("wheat"); + m_listbox->SetBackgroundColour("wheat"); (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) ); button = new wxButton( panel, ID_LISTBOX_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) ); -// button->SetForegroundColour( "red" ); + button->SetForegroundColour( "red" ); m_checkbox = 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); -// panel->SetBackgroundColour("cadet blue"); -// panel->SetForegroundColour("blue"); + panel->SetBackgroundColour("cadet blue"); + panel->SetForegroundColour("blue"); m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,-1), 5, choices ); -// m_choice->SetBackgroundColour("wheat"); + m_choice->SetBackgroundColour("wheat"); (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) ); @@ -330,12 +333,12 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) : (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); -// panel->SetBackgroundColour("cadet blue"); -// panel->SetForegroundColour("blue"); + panel->SetBackgroundColour("cadet blue"); + panel->SetForegroundColour("blue"); m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(10,10), wxSize(120,-1), 5, choices ); -// m_combo->SetBackgroundColour("wheat"); + m_combo->SetBackgroundColour("wheat"); (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) ); @@ -344,34 +347,34 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) : (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); - + panel = new wxPanel(m_notebook); -// panel->SetBackgroundColour("cadet blue"); -// panel->SetForegroundColour("blue"); + panel->SetBackgroundColour("cadet blue"); + panel->SetForegroundColour("blue"); wxTextCtrl *tc = new wxTextCtrl( panel, ID_TEXT, "Write text here.", wxPoint(10,10), wxSize(320,28)); (*tc) << " More text."; -// tc->SetBackgroundColour("wheat"); + tc->SetBackgroundColour("wheat"); m_multitext = new wxTextCtrl( panel, ID_TEXT, "And here.", wxPoint(10,50), wxSize(320,160), wxTE_MULTILINE ); (*m_multitext) << " More text."; -// m_multitext->SetBackgroundColour("wheat"); + m_multitext->SetBackgroundColour("wheat"); (void)new wxStaticBox( panel, -1, "wxClipboard", wxPoint(345,50), wxSize(160,145) ); (void)new wxButton( panel, ID_COPY_TEXT, "Copy line 1", wxPoint(370,80), wxSize(110,30) ); (void)new wxButton( panel, ID_PASTE_TEXT, "Paste text", wxPoint(370,140), wxSize(110,30) ); m_notebook->AddPage(panel, "wxTextCtrl" , FALSE, Image_Text); - + wxString choices2[] = { "Wonderful", "examples.", }; - + panel = new wxPanel(m_notebook); -// panel->SetBackgroundColour("cadet blue"); -// panel->SetForegroundColour("blue"); + panel->SetBackgroundColour("cadet blue"); + panel->SetForegroundColour("blue"); m_radio = new wxRadioBox( panel, ID_RADIOBOX, "That", wxPoint(10,160), wxSize(-1,-1), 2, choices2, 1, wxRA_VERTICAL ); -// m_radio->SetBackgroundColour("wheat"); + m_radio->SetBackgroundColour("wheat"); m_radio = new wxRadioBox( panel, ID_RADIOBOX, "This", wxPoint(10,10), wxSize(-1,-1), 5, choices, 1, wxRA_HORIZONTAL ); -// m_radio->SetBackgroundColour("wheat"); + m_radio->SetBackgroundColour("wheat"); (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) ); @@ -382,36 +385,37 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) : rb->SetValue( FALSE ); (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "Radiobutton2", wxPoint(340,170), wxSize(110,30) ); m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio); - + panel = new wxPanel(m_notebook); -// panel->SetBackgroundColour("cadet blue"); -// panel->SetForegroundColour("blue"); + panel->SetBackgroundColour("cadet blue"); + panel->SetForegroundColour("blue"); (void)new wxStaticBox( panel, -1, "wxGauge and wxSlider", wxPoint(10,10), wxSize(180,130) ); m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155,-1) ); -// m_gauge->SetBackgroundColour("wheat"); + m_gauge->SetBackgroundColour("wheat"); m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,-1) ); -// m_slider->SetBackgroundColour("wheat"); + m_slider->SetBackgroundColour("wheat"); (void)new wxStaticBox( panel, -1, "Explanation", wxPoint(200,10), wxSize(290,130) ); - (void)new wxStaticText( panel, -1, - "In order see the gauge (aka progress bar)\n" - "control do something you have to drag the\n" + (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", - wxPoint(208,25) ); + wxPoint(208,25), wxSize(200, 100) ); m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) ); -// m_spintext->SetBackgroundColour("wheat"); + m_spintext->SetBackgroundColour("wheat"); m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) ); -// m_spinbutton->SetBackgroundColour("wheat"); - m_spinbutton->SetRange(0,100); + m_spinbutton->SetBackgroundColour("wheat"); + m_spinbutton->SetRange(0,100); + m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge); - + panel = new wxPanel(m_notebook); -// panel->SetBackgroundColour("cadet blue"); -// panel->SetForegroundColour("blue"); + panel->SetBackgroundColour("cadet blue"); + panel->SetForegroundColour("blue"); m_listbox = new wxCheckListBox( panel, ID_CHECKLIST, wxPoint(10,10), wxSize(160,70), 5, choices ); -// m_listbox->SetBackgroundColour("wheat"); + m_listbox->SetBackgroundColour("wheat"); button = new wxButton( panel, ID_LISTBOX_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) ); m_notebook->AddPage(panel, "wxCheckListBox", FALSE, Image_List); } @@ -423,14 +427,14 @@ void MyPanel::OnPasteFromClipboard( wxCommandEvent &WXUNUSED(event) ) if (!wxTheClipboard->IsSupportedFormat( wxDF_TEXT )) { *m_text << "The clipboard doesn't contain any data in the requested format." << "\n"; - + return; } if (!wxTheClipboard->Open()) { *m_text << "Error opening the clipboard." << "\n"; - + return; } else @@ -439,7 +443,7 @@ void MyPanel::OnPasteFromClipboard( wxCommandEvent &WXUNUSED(event) ) } wxTextDataObject *data = new wxTextDataObject(); - + if (wxTheClipboard->GetData( data )) { *m_text << "Successfully retrieved data from the clipboard." << "\n"; @@ -449,11 +453,11 @@ void MyPanel::OnPasteFromClipboard( wxCommandEvent &WXUNUSED(event) ) { *m_text << "Error getting data from the clipboard." << "\n"; } - + wxTheClipboard->Close(); - + *m_text << "Closed the clipboard." << "\n"; - + delete data; #endif @@ -462,17 +466,17 @@ void MyPanel::OnPasteFromClipboard( wxCommandEvent &WXUNUSED(event) ) void MyPanel::OnCopyToClipboard( wxCommandEvent &WXUNUSED(event) ) { #ifdef __WXGTK__ - + wxString text( m_multitext->GetLineText(0) ); if (text.IsEmpty()) return; - + wxTextDataObject *data = new wxTextDataObject( text ); - + if (!wxTheClipboard->Open()) { *m_text << "Error opening the clipboard." << "\n"; - + return; } else @@ -490,9 +494,9 @@ void MyPanel::OnCopyToClipboard( wxCommandEvent &WXUNUSED(event) ) } wxTheClipboard->Close(); - + *m_text << "Closed the clipboard." << "\n"; - + #endif } @@ -501,7 +505,7 @@ void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) ) int x = 0; int y = 0; GetClientSize( &x, &y ); - + if (m_notebook) m_notebook->SetSize( 2, 2, x-4, y*2/3-4 ); if (m_text) m_text->SetSize( 2, y*2/3+2, x-4, y/3-4 ); } @@ -524,7 +528,7 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event ) { case ID_LISTBOX_ENABLE: { - m_listbox->Enable( !((bool)event.GetInt()) ); + m_listbox->Enable( event.GetInt() == 0 ); break; } case ID_LISTBOX_SEL_NUM: @@ -575,7 +579,7 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event ) { case ID_CHOICE_ENABLE: { - m_choice->Enable( !((bool)event.GetInt()) ); + m_choice->Enable( event.GetInt() == 0 ); break; } case ID_CHOICE_SEL_NUM: @@ -625,7 +629,7 @@ void MyPanel::OnComboButtons( wxCommandEvent &event ) { case ID_COMBO_ENABLE: { - m_combo->Enable( !((bool)event.GetInt()) ); + m_combo->Enable( event.GetInt() == 0 ); break; } case ID_COMBO_SEL_NUM: @@ -675,7 +679,7 @@ void MyPanel::OnRadioButtons( wxCommandEvent &event ) { case ID_RADIOBOX_ENABLE: { - m_radio->Enable( !((bool)event.GetInt()) ); + m_radio->Enable( event.GetInt() == 0 ); break; } case ID_RADIOBOX_SEL_NUM: diff --git a/samples/controls/controls.rc b/samples/controls/controls.rc index 7655c62a4c..1016ec86f5 100644 --- a/samples/controls/controls.rc +++ b/samples/controls/controls.rc @@ -1,3 +1,11 @@ mondrian ICON "mondrian.ico" -#include "wx/msw/wx.rc" +/* +list ICON "icons/list.ico" +choice ICON "icons/choice.ico" +combo ICON "icons/combo.ico" +text ICON "icons/text.ico" +radio ICON "icons/radio.ico" +*/ + +#include "wx/msw/wx.rc" -- 2.45.2