X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0185cd097844887c308a81fbd137676086ae8580..0dfef5a8124ac0f1bb2aed6ef5ddfa833e8e2c6e:/samples/controls/controls.cpp diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index ac99563156..8fc5a7ca9f 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -65,8 +65,6 @@ #include "wx/spinctrl.h" #endif // wxUSE_SPINCTRL -#include "wx/calctrl.h" - //---------------------------------------------------------------------- // class definitions //---------------------------------------------------------------------- @@ -107,15 +105,12 @@ public: #endif // wxUSE_SPINBTN #if wxUSE_SPINCTRL - void OnSpinCtrl(wxCommandEvent& event); + void OnSpinCtrl(wxSpinEvent& event); #endif // wxUSE_SPINCTRL void OnEnableAll(wxCommandEvent& event); void OnChangeColour(wxCommandEvent& event); - - void OnCalendar(wxCalendarEvent& event); - void OnCalendarWeekDayClick(wxCalendarEvent& event); - void OnCalendarChange(wxCalendarEvent& event); + void OnTestButton(wxCommandEvent& event); wxListBox *m_listbox, *m_listboxSorted; @@ -145,10 +140,9 @@ public: wxStaticText *m_label; - wxCalendarCtrl *m_calendar; - wxStaticText *m_date; - private: + wxLog *m_logTargetOld; + DECLARE_EVENT_TABLE() }; @@ -159,6 +153,7 @@ public: void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); + void OnClearLog(wxCommandEvent& event); #if wxUSE_TOOLTIPS void OnSetTooltipDelay(wxCommandEvent& event); @@ -202,16 +197,17 @@ IMPLEMENT_APP(MyApp) enum { - MINIMAL_QUIT = 100, - MINIMAL_TEXT, - MINIMAL_ABOUT, + CONTROLS_QUIT = 100, + CONTROLS_TEXT, + CONTROLS_ABOUT, + CONTROLS_CLEAR_LOG, // tooltip menu - MINIMAL_SET_TOOLTIP_DELAY = 200, - MINIMAL_ENABLE_TOOLTIPS, + CONTROLS_SET_TOOLTIP_DELAY = 200, + CONTROLS_ENABLE_TOOLTIPS, // panel menu - MINIMAL_ENABLE_ALL + CONTROLS_ENABLE_ALL }; bool MyApp::OnInit() @@ -229,7 +225,7 @@ bool MyApp::OnInit() MyFrame *frame = new MyFrame((wxFrame *) NULL, "Controls wxWindows App", x, y, 540, 430); - + frame->SetSizeHints( 500, 425 ); // Give it an icon @@ -240,25 +236,27 @@ bool MyApp::OnInit() wxMenu *file_menu = new wxMenu("", wxMENU_TEAROFF); - file_menu->Append(MINIMAL_ABOUT, "&About\tF1"); + file_menu->Append(CONTROLS_CLEAR_LOG, "&Clear log\tCtrl-L"); + file_menu->AppendSeparator(); + file_menu->Append(CONTROLS_ABOUT, "&About\tF1"); file_menu->AppendSeparator(); - file_menu->Append(MINIMAL_QUIT, "E&xit\tAlt-X", "Quit controls sample"); + file_menu->Append(CONTROLS_QUIT, "E&xit\tAlt-X", "Quit controls sample"); wxMenuBar *menu_bar = new wxMenuBar; menu_bar->Append(file_menu, "&File"); #if wxUSE_TOOLTIPS wxMenu *tooltip_menu = new wxMenu; - tooltip_menu->Append(MINIMAL_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D"); + tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D"); tooltip_menu->AppendSeparator(); - tooltip_menu->Append(MINIMAL_ENABLE_TOOLTIPS, "&Toggle tooltips\tCtrl-T", + tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, "&Toggle tooltips\tCtrl-T", "enable/disable tooltips", TRUE); - tooltip_menu->Check(MINIMAL_ENABLE_TOOLTIPS, TRUE); + tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, TRUE); menu_bar->Append(tooltip_menu, "&Tooltips"); #endif // wxUSE_TOOLTIPS wxMenu *panel_menu = new wxMenu; - panel_menu->Append(MINIMAL_ENABLE_ALL, "&Disable all\tCtrl-E", + panel_menu->Append(CONTROLS_ENABLE_ALL, "&Disable all\tCtrl-E", "Enable/disable all panel controls", TRUE); menu_bar->Append(panel_menu, "&Panel"); @@ -328,9 +326,10 @@ const int ID_BTNPROGRESS = 183; const int ID_BUTTON_LABEL = 184; const int ID_SPINCTRL = 185; -const int ID_CHANGE_COLOUR = 200; +const int ID_BUTTON_TEST1 = 190; +const int ID_BUTTON_TEST2 = 191; -const int ID_CALENDAR = 210; +const int ID_CHANGE_COLOUR = 200; BEGIN_EVENT_TABLE(MyPanel, wxPanel) EVT_SIZE ( MyPanel::OnSize) @@ -382,11 +381,8 @@ EVT_SPINCTRL (ID_SPINCTRL, MyPanel::OnSpinCtrl) #endif // wxUSE_SPINCTRL EVT_BUTTON (ID_BUTTON_LABEL, MyPanel::OnUpdateLabel) EVT_CHECKBOX (ID_CHANGE_COLOUR, MyPanel::OnChangeColour) - -EVT_CALENDAR (ID_CALENDAR, MyPanel::OnCalendar) -EVT_CALENDAR_SEL_CHANGED(ID_CALENDAR, MyPanel::OnCalendarChange) -EVT_CALENDAR_WEEKDAY_CLICKED(ID_CALENDAR, MyPanel::OnCalendarWeekDayClick) - +EVT_BUTTON (ID_BUTTON_TEST1, MyPanel::OnTestButton) +EVT_BUTTON (ID_BUTTON_TEST2, MyPanel::OnTestButton) END_EVENT_TABLE() MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) @@ -395,12 +391,14 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) { 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, 250), wxSize(100, 50), wxTE_MULTILINE); + m_text->SetBackgroundColour("wheat"); - //delete wxLog::SetActiveTarget(new wxLogStderr); + wxLog::AddTraceMask(_T("focus")); + m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text)); - m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) ); + m_notebook = new wxNotebook(this, ID_NOTEBOOK); wxString choices[] = { @@ -481,11 +479,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_listbox->SetToolTip( "This is a list box" ); #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 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) ); + 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 wxButton( 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 wxButton( panel, ID_LISTBOX_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) ); button->SetDefault(); @@ -517,27 +515,27 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_choice->SetSelection(2); m_choice->SetBackgroundColour( "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, "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) ); + (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); panel = new wxPanel(m_notebook); - (void)new wxStaticBox( panel, -1, "Box around combobox", + (void)new wxStaticBox( panel, -1, "&Box around combobox", wxPoint(5, 5), wxSize(150, 100)); - m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(20,20), 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_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_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_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); wxString choices2[] = @@ -549,28 +547,29 @@ 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 ); + (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, "T&his", wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS ); #if wxUSE_TOOLTIPS + m_combo->SetToolTip("This is a natural\ncombobox - can you believe me?"); 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 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 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), 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); - (void)new wxStaticBox( panel, -1, "wxGauge and wxSlider", wxPoint(10,10), wxSize(200,130) ); + (void)new wxStaticBox( panel, -1, "&wxGauge and wxSlider", wxPoint(10,10), wxSize(200,130) ); m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30) ); m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,-1), wxSL_LABELS ); - (void)new wxStaticBox( panel, -1, "Explanation", wxPoint(220,10), wxSize(270,130) ); + (void)new wxStaticBox( panel, -1, "&Explanation", wxPoint(220,10), wxSize(270,130) ); #ifdef __WXMOTIF__ // No wrapping text in wxStaticText yet :-( (void)new wxStaticText( panel, -1, @@ -599,7 +598,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_spinbutton->SetRange(-10,30); m_spinbutton->SetValue(initialSpinValue); - m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "Show progress dialog", + m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "&Show progress dialog", wxPoint(300, 160) ); #endif // wxUSE_SPINBTN @@ -633,11 +632,14 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) (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)); +#ifdef __WXMSW__ + // test for masked bitmap display + bitmap = wxBitmap("test2.bmp", wxBITMAP_TYPE_BMP); + if (bitmap.Ok()) + { + bitmap.SetMask(new wxMask(bitmap, *wxBLUE)); + (void)new wxStaticBitmap /* wxBitmapButton */ (panel, -1, bitmap, wxPoint(300, 120)); + } #endif wxBitmap bmp1(wxTheApp->GetStdIcon(wxICON_INFORMATION)), @@ -652,42 +654,14 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) bmpBtn->SetBitmapSelected(bmp2); bmpBtn->SetBitmapFocus(bmp3); - (void)new wxButton(panel, ID_BUTTON_LABEL, "Toggle label", wxPoint(250, 20)); + (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, wxALIGN_RIGHT | wxST_NO_AUTORESIZE); + m_label->SetForegroundColour( *wxBLUE ); m_notebook->AddPage(panel, "wxBitmapXXX"); - // wxCalendarCtrl - - panel = new wxPanel(m_notebook); - panel->SetAutoLayout( TRUE ); - - wxString date; - date.Printf("Selected date: %s", - wxDateTime::Today().FormatISODate().c_str()); - m_date = new wxStaticText(panel, -1, date); - m_calendar = new wxCalendarCtrl(panel, ID_CALENDAR); - - c = new wxLayoutConstraints; - c->left.SameAs( panel, wxLeft, 10 ); - c->centreY.SameAs( m_calendar, wxCentreY ); - c->height.AsIs(); - c->width.AsIs(); - - m_date->SetConstraints(c); - - c = new wxLayoutConstraints; - c->left.SameAs( m_date, wxRight, 10 ); - c->top.SameAs( panel, wxTop, 10 ); - c->height.AsIs(); - c->width.AsIs(); - - m_calendar->SetConstraints(c); - - m_notebook->AddPage(panel, "wxCalendar"); - // layout constraints panel = new wxPanel(m_notebook); @@ -699,7 +673,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) c->left.SameAs( panel, wxLeft, 10 ); c->width.PercentOf( panel, wxWidth, 40 ); - wxButton *pMyButton = new wxButton(panel, -1, "Test Button" ); + wxButton *pMyButton = new wxButton(panel, ID_BUTTON_TEST1, "Test Button &1" ); pMyButton->SetConstraints( c ); c = new wxLayoutConstraints; @@ -708,7 +682,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) c->right.SameAs( panel, wxRight, 10 ); c->width.PercentOf( panel, wxWidth, 40 ); - wxButton *pMyButton2 = new wxButton(panel, -1, "Test Button 2" ); + wxButton *pMyButton2 = new wxButton(panel, ID_BUTTON_TEST2, "Test Button &2" ); pMyButton2->SetConstraints( c ); m_notebook->AddPage(panel, "wxLayoutConstraint"); @@ -720,9 +694,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL ); - sizer->Add( new wxButton(panel, -1, "Test Button" ), 3, 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, "Test Button 2" ), 3, wxGROW|wxALL, 10 ); + sizer->Add( new wxButton(panel, -1, "Test Button &2" ), 3, wxGROW|wxALL, 10 ); panel->SetSizer( sizer ); @@ -764,25 +738,10 @@ void MyPanel::OnPageChanged( wxNotebookEvent &event ) *m_text << "Notebook selection is " << event.GetSelection() << "\n"; } -void MyPanel::OnCalendar(wxCalendarEvent& event) +void MyPanel::OnTestButton(wxCommandEvent& event) { - *m_text << "Selected " << event.GetDate().FormatISODate() << - " from calendar\n"; -} - -void MyPanel::OnCalendarChange(wxCalendarEvent& event) -{ - wxString s; - s.Printf("Selected date: %s", event.GetDate().FormatISODate().c_str()); - - m_date->SetLabel(s); -} - -void MyPanel::OnCalendarWeekDayClick(wxCalendarEvent& event) -{ - *m_text << "Clicked on " - << wxDateTime::GetWeekDayName(event.GetWeekDay()) - << "\n"; + wxLogMessage(_T("Button %c clicked."), + event.GetId() == ID_BUTTON_TEST1 ? _T('1') : _T('2')); } void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event)) @@ -795,13 +754,13 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event)) SetBackgroundColour(s_colOld); s_colOld = wxNullColour; - m_lbSelectThis->SetForegroundColour("yellow"); - m_lbSelectThis->SetBackgroundColour("blue"); + m_lbSelectThis->SetForegroundColour("red"); + m_lbSelectThis->SetBackgroundColour("white"); } else { - s_colOld = GetBackgroundColour(); - SetBackgroundColour("green"); + s_colOld = wxColour("red"); + SetBackgroundColour("white"); m_lbSelectThis->SetForegroundColour("white"); m_lbSelectThis->SetBackgroundColour("red"); @@ -815,6 +774,12 @@ void MyPanel::OnListBox( wxCommandEvent &event ) { // GetParent()->Move(100, 100); + if (event.GetInt() == -1) + { + m_text->AppendText( "ListBox has no selections anymore\n" ); + return; + } + wxListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox : m_listboxSorted; @@ -828,17 +793,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 - m_text->AppendText( obj->GetData() ); + m_text->AppendText( obj->GetData() ); 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( obj->GetData() ); + m_text->AppendText( obj->GetData() ); else - m_text->AppendText( wxString("none") ); + m_text->AppendText( wxString("none") ); m_text->AppendText( "'\n" ); } @@ -1104,7 +1069,7 @@ void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) ) #if wxUSE_SPINCTRL -void MyPanel::OnSpinCtrl(wxCommandEvent& event) +void MyPanel::OnSpinCtrl(wxSpinEvent& event) { wxString s; s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"), @@ -1211,6 +1176,9 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) ) MyPanel::~MyPanel() { + //wxLog::RemoveTraceMask(_T("focus")); + delete wxLog::SetActiveTarget(m_logTargetOld); + delete m_notebook->GetImageList(); } @@ -1219,14 +1187,15 @@ MyPanel::~MyPanel() //---------------------------------------------------------------------- BEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU(MINIMAL_QUIT, MyFrame::OnQuit) - EVT_MENU(MINIMAL_ABOUT, MyFrame::OnAbout) + EVT_MENU(CONTROLS_QUIT, MyFrame::OnQuit) + EVT_MENU(CONTROLS_ABOUT, MyFrame::OnAbout) + EVT_MENU(CONTROLS_CLEAR_LOG, MyFrame::OnClearLog) #if wxUSE_TOOLTIPS - EVT_MENU(MINIMAL_SET_TOOLTIP_DELAY, MyFrame::OnSetTooltipDelay) - EVT_MENU(MINIMAL_ENABLE_TOOLTIPS, MyFrame::OnToggleTooltips) + EVT_MENU(CONTROLS_SET_TOOLTIP_DELAY, MyFrame::OnSetTooltipDelay) + EVT_MENU(CONTROLS_ENABLE_TOOLTIPS, MyFrame::OnToggleTooltips) #endif // wxUSE_TOOLTIPS - EVT_MENU(MINIMAL_ENABLE_ALL, MyFrame::OnEnableAll) + EVT_MENU(CONTROLS_ENABLE_ALL, MyFrame::OnEnableAll) EVT_SIZE(MyFrame::OnSize) EVT_MOVE(MyFrame::OnMove) @@ -1257,6 +1226,11 @@ void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) ) wxEndBusyCursor(); } +void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event)) +{ + m_panel->m_text->Clear(); +} + #if wxUSE_TOOLTIPS void MyFrame::OnSetTooltipDelay(wxCommandEvent& event) { @@ -1325,11 +1299,11 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) ) wxString msg; msg.Printf( #ifdef __WXMSW__ - _T("Focus: wxWindow = %p, HWND = %08x"), + _T("Focus: %s, HWND = %08x"), #else - _T("Focus: wxWindow = %p"), + _T("Focus: %s"), #endif - s_windowFocus + s_windowFocus->GetClassInfo()->GetClassName() #ifdef __WXMSW__ , s_windowFocus->GetHWND() #endif