X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6c881b4486f22ef78a778595968774af92a597b..e4de825ee6f3f991e2aa86159d6e3457afb6a8e0:/samples/statbar/statbar.cpp diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp index e77afd285b..86d8f23d24 100644 --- a/samples/statbar/statbar.cpp +++ b/samples/statbar/statbar.cpp @@ -17,11 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "statbar.cpp" - #pragma interface "statbar.cpp" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -36,6 +31,7 @@ // for all others, include the necessary headers #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/log.h" #include "wx/frame.h" #include "wx/statusbr.h" #include "wx/timer.h" @@ -46,16 +42,35 @@ #include "wx/textdlg.h" #include "wx/sizer.h" #include "wx/stattext.h" + #include "wx/bmpbuttn.h" + #include "wx/dcmemory.h" #endif #include "wx/datetime.h" +#include "wx/numdlg.h" + + +// define this for the platforms which don't support wxBitmapButton (such as +// Motif), else a wxBitmapButton will be used +#ifdef __WXMOTIF__ + #define USE_STATIC_BITMAP +#endif + +//#define USE_MDI_PARENT_FRAME 1 + +#ifdef USE_MDI_PARENT_FRAME + #include "wx/mdi.h" +#endif // USE_MDI_PARENT_FRAME + // ---------------------------------------------------------------------------- // resources // ---------------------------------------------------------------------------- -#include "green.xpm" -#include "red.xpm" +#ifdef USE_STATIC_BITMAP + #include "green.xpm" + #include "red.xpm" +#endif // USE_STATIC_BITMAP // ---------------------------------------------------------------------------- // private classes @@ -84,11 +99,19 @@ public: void UpdateClock(); // event handlers - void OnTimer(wxTimerEvent& event) { UpdateClock(); } +#if wxUSE_TIMER + void OnTimer(wxTimerEvent& WXUNUSED(event)) { UpdateClock(); } +#endif void OnSize(wxSizeEvent& event); void OnToggleClock(wxCommandEvent& event); + void OnButton(wxCommandEvent& event); private: + // toggle the state of the status bar controls + void DoToggle(); + + wxBitmap CreateBitmapForButton(bool on = false); + enum { Field_Text, @@ -98,10 +121,18 @@ private: Field_Max }; +#if wxUSE_TIMER wxTimer m_timer; +#endif +#if wxUSE_CHECKBOX wxCheckBox *m_checkbox; +#endif +#ifdef USE_STATIC_BITMAP wxStaticBitmap *m_statbmp; +#else + wxBitmapButton *m_statbmp; +#endif DECLARE_EVENT_TABLE() }; @@ -112,14 +143,22 @@ class MyFrame : public wxFrame public: // ctor(s) MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size); +#ifdef USE_MDI_PARENT_FRAME +class MyFrame : public wxMDIParentFrame +#else virtual ~MyFrame(); +#endif // event handlers (these functions should _not_ be virtual) void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); + void OnResetFieldsWidth(wxCommandEvent& event); void OnSetStatusFields(wxCommandEvent& event); void OnRecreateStatusBar(wxCommandEvent& event); + void OnSetStyleNormal(wxCommandEvent& event); + void OnSetStyleFlat(wxCommandEvent& event); + void OnSetStyleRaised(wxCommandEvent& event); private: enum StatBarKind @@ -129,12 +168,22 @@ private: StatBar_Max } m_statbarKind; + void OnUpdateResetFieldsWidth(wxUpdateUIEvent& event); + void OnUpdateSetStatusFields(wxUpdateUIEvent& event); + void OnUpdateStatusBarToggle(wxUpdateUIEvent& event); + void OnUpdateSetStyleNormal(wxUpdateUIEvent& event); + void OnUpdateSetStyleFlat(wxUpdateUIEvent& event); + void OnUpdateSetStyleRaised(wxUpdateUIEvent& event); + void OnStatusBarToggle(wxCommandEvent& event); void DoCreateStatusBar(StatBarKind kind); + void ApplyStyle(); wxStatusBar *m_statbarDefault; MyStatusBar *m_statbarCustom; - // any class wishing to process wxWindows events must use this macro + int m_statbarStyle; + + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; @@ -155,35 +204,62 @@ enum // menu items StatusBar_Quit = 1, StatusBar_SetFields, + StatusBar_ResetFieldsWidth, StatusBar_Recreate, StatusBar_About, - StatusBar_Checkbox = 1000 + StatusBar_Toggle, + StatusBar_Checkbox = 1000, + StatusBar_SetStyle, + StatusBar_SetStyleNormal, + StatusBar_SetStyleFlat, + StatusBar_SetStyleRaised }; static const int BITMAP_SIZE_X = 32; static const int BITMAP_SIZE_Y = 15; // ---------------------------------------------------------------------------- -// event tables and other macros for wxWindows +// event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -// the event tables connect the wxWindows events with the functions (event +// the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. +#ifdef USE_MDI_PARENT_FRAME +BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame) +#else BEGIN_EVENT_TABLE(MyFrame, wxFrame) +#endif EVT_MENU(StatusBar_Quit, MyFrame::OnQuit) EVT_MENU(StatusBar_SetFields, MyFrame::OnSetStatusFields) + EVT_MENU(StatusBar_ResetFieldsWidth, MyFrame::OnResetFieldsWidth) EVT_MENU(StatusBar_Recreate, MyFrame::OnRecreateStatusBar) EVT_MENU(StatusBar_About, MyFrame::OnAbout) + EVT_MENU(StatusBar_Toggle, MyFrame::OnStatusBarToggle) + EVT_MENU(StatusBar_SetStyleNormal, MyFrame::OnSetStyleNormal) + EVT_MENU(StatusBar_SetStyleFlat, MyFrame::OnSetStyleFlat) + EVT_MENU(StatusBar_SetStyleRaised, MyFrame::OnSetStyleRaised) + + EVT_UPDATE_UI(StatusBar_ResetFieldsWidth, MyFrame::OnUpdateResetFieldsWidth) + EVT_UPDATE_UI(StatusBar_Toggle, MyFrame::OnUpdateStatusBarToggle) + EVT_UPDATE_UI(StatusBar_SetFields, MyFrame::OnUpdateSetStatusFields) + EVT_UPDATE_UI(StatusBar_SetStyleNormal, MyFrame::OnUpdateSetStyleNormal) + EVT_UPDATE_UI(StatusBar_SetStyleFlat, MyFrame::OnUpdateSetStyleFlat) + EVT_UPDATE_UI(StatusBar_SetStyleRaised, MyFrame::OnUpdateSetStyleRaised) END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyStatusBar, wxStatusBar) EVT_SIZE(MyStatusBar::OnSize) +#if wxUSE_CHECKBOX EVT_CHECKBOX(StatusBar_Checkbox, MyStatusBar::OnToggleClock) - EVT_TIMER(-1, MyStatusBar::OnTimer) +#endif + EVT_BUTTON(wxID_ANY, MyStatusBar::OnButton) +#if wxUSE_TIMER + EVT_TIMER(wxID_ANY, MyStatusBar::OnTimer) +#endif END_EVENT_TABLE() -// Create a new application object: this macro will allow wxWindows to create +// Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a // static object for many reasons) and also declares the accessor function // wxGetApp() which will return the reference of the right type (i.e. MyApp and @@ -201,18 +277,21 @@ IMPLEMENT_APP(MyApp) // `Main program' equivalent: the program execution "starts" here bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // create the main application window - MyFrame *frame = new MyFrame("wxStatusBar sample", - wxPoint(50, 50), wxSize(450, 340)); + MyFrame *frame = new MyFrame(_T("wxStatusBar sample"), + wxPoint(50, 50), wxSize(450, 340)); // and show it (the frames, unlike simple controls, are not shown when // created initially) - frame->Show(TRUE); + frame->Show(true); // success: wxApp::OnRun() will be called which will enter the main message - // loop and the application will run. If we returned FALSE here, the + // loop and the application will run. If we returned 'false' here, the // application would exit immediately. - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -221,11 +300,17 @@ bool MyApp::OnInit() // frame constructor MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, -1, title, pos, size) +#ifdef USE_MDI_PARENT_FRAME + : wxMDIParentFrame((wxWindow *)NULL, wxID_ANY, title, pos, size) +#else + : wxFrame((wxWindow *)NULL, wxID_ANY, title, pos, size) +#endif { m_statbarDefault = NULL; m_statbarCustom = NULL; + m_statbarStyle = wxSB_NORMAL; + #ifdef __WXMAC__ // we need this in order to allow the about menu relocation, since ABOUT is // not the default id of the about menu @@ -234,29 +319,43 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) // create a menu bar wxMenu *menuFile = new wxMenu; - menuFile->Append(StatusBar_Quit, "E&xit\tAlt-X", "Quit this program"); + menuFile->Append(StatusBar_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); wxMenu *statbarMenu = new wxMenu; - statbarMenu->Append(StatusBar_SetFields, "&Set field count\tCtrl-C", - "Set the number of status bar fields"); - statbarMenu->Append(StatusBar_Recreate, "&Recreate\tCtrl-R", - "Toggle status bar format"); + statbarMenu->Append(StatusBar_SetFields, _T("&Set field count\tCtrl-C"), + _T("Set the number of status bar fields")); + + wxMenu *statbarStyleMenu = new wxMenu; + statbarStyleMenu->Append(StatusBar_SetStyleNormal, _T("&Normal"), _T("Sets the style of the first field to normal (sunken) look"), true); + statbarStyleMenu->Append(StatusBar_SetStyleFlat, _T("&Flat"), _T("Sets the style of the first field to flat look"), true); + statbarStyleMenu->Append(StatusBar_SetStyleRaised, _T("&Raised"), _T("Sets the style of the first field to raised look"), true); + statbarMenu->Append(StatusBar_SetStyle, _T("Field style"), statbarStyleMenu); + + statbarMenu->Append(StatusBar_ResetFieldsWidth, _T("Reset field widths"), + _T("Sets all fields to the same width")); + statbarMenu->AppendSeparator(); + + statbarMenu->Append(StatusBar_Toggle, _T("&Toggle Status Bar"), + _T("Toggle the status bar display"), true); + statbarMenu->Append(StatusBar_Recreate, _T("&Recreate\tCtrl-R"), + _T("Toggle status bar format")); wxMenu *helpMenu = new wxMenu; - helpMenu->Append(StatusBar_About, "&About...\tCtrl-A", "Show about dialog"); + helpMenu->Append(StatusBar_About, _T("&About...\tCtrl-A"), _T("Show about dialog")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar(); - menuBar->Append(menuFile, "&File"); - menuBar->Append(statbarMenu, "&Status bar"); - menuBar->Append(helpMenu, "&Help"); + menuBar->Append(menuFile, _T("&File")); + menuBar->Append(statbarMenu, _T("&Status bar")); + menuBar->Append(helpMenu, _T("&Help")); // ... and attach this menu bar to the frame SetMenuBar(menuBar); // create default status bar to start with CreateStatusBar(2); - SetStatusText("Welcome to wxWindows!"); + m_statbarKind = StatBar_Default; + SetStatusText(_T("Welcome to wxWidgets!")); m_statbarDefault = GetStatusBar(); } @@ -292,64 +391,132 @@ void MyFrame::DoCreateStatusBar(MyFrame::StatBarKind kind) break; default: - wxFAIL_MSG("unknown stat bar kind"); + wxFAIL_MSG(wxT("unknown stat bar kind")); } - PositionStatusBar(); + ApplyStyle(); GetStatusBar()->Show(); + PositionStatusBar(); m_statbarKind = kind; } +void MyFrame::OnUpdateSetStatusFields(wxUpdateUIEvent& event) +{ + // only allow the settings of the number of status fields for the default + // status bar + wxStatusBar *sb = GetStatusBar(); + event.Enable(sb == m_statbarDefault); +} + // event handlers void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event)) { wxStatusBar *sb = GetStatusBar(); long nFields = wxGetNumberFromUser - ( - "Select the number of fields in the status bar", - "Fields:", - "wxWindows statusbar sample", + ( + _T("Select the number of fields in the status bar"), + _T("Fields:"), + _T("wxWidgets statusbar sample"), sb->GetFieldsCount(), 1, 5, this - ); + ); // we don't check if the number changed at all on purpose: calling // SetFieldsCount() with the same number of fields should be ok if ( nFields != -1 ) { - // we set the widths only for 2 of them, otherwise let all the fields - // have equal width (the default behaviour) - const int *widths = NULL; - if ( nFields == 2 ) + static const int widthsFor2Fields[] = { 200, -1 }; + static const int widthsFor3Fields[] = { -1, -2, -1 }; + static const int widthsFor4Fields[] = { 100, -1, 100, -2, 100 }; + + static const int *widthsAll[] = + { + NULL, // 1 field: default + widthsFor2Fields, // 2 fields: 1 fixed, 1 var + widthsFor3Fields, // 3 fields: 3 var + widthsFor4Fields, // 4 fields: 3 fixed, 2 vars + NULL // 5 fields: default (all have same width) + }; + + const int * const widths = widthsAll[nFields - 1]; + sb->SetFieldsCount(nFields, widths); + + wxString s; + for ( long n = 0; n < nFields; n++ ) { - static const int widthsFor2Fields[2] = { 200, -1 }; - widths = widthsFor2Fields; + if ( widths ) + { + if ( widths[n] > 0 ) + s.Printf(_T("fixed (%d)"), widths[n]); + else + s.Printf(_T("variable (*%d)"), -widths[n]); + } + else + { + s = _T("default"); + } + + SetStatusText(s, n); } + } + else + { + wxLogStatus(this, wxT("Cancelled")); + } +} - sb->SetFieldsCount(nFields, widths); +void MyFrame::OnUpdateResetFieldsWidth(wxUpdateUIEvent& event) +{ + // only allow the settings of the number of status fields for the default + // status bar + wxStatusBar *sb = GetStatusBar(); + event.Enable(sb == m_statbarDefault); +} + +void MyFrame::OnResetFieldsWidth(wxCommandEvent& WXUNUSED(event)) +{ + wxStatusBar *pStat = GetStatusBar(); + if (pStat) + { + int n = pStat->GetFieldsCount(); + pStat->SetStatusWidths(n, NULL); + for (int i=0; iSetStatusText("same size", i); + } +} - wxLogStatus(this, - wxString::Format("Status bar now has %ld fields", nFields)); +void MyFrame::OnUpdateStatusBarToggle(wxUpdateUIEvent& event) +{ + event.Check(GetStatusBar() != NULL); +} + +void MyFrame::OnStatusBarToggle(wxCommandEvent& WXUNUSED(event)) +{ + wxStatusBar *statbarOld = GetStatusBar(); + if ( statbarOld ) + { + statbarOld->Hide(); + SetStatusBar(NULL); } else { - wxLogStatus(this, "Cancelled"); + DoCreateStatusBar(m_statbarKind); } } void MyFrame::OnRecreateStatusBar(wxCommandEvent& WXUNUSED(event)) { DoCreateStatusBar(m_statbarKind == StatBar_Custom ? StatBar_Default - : StatBar_Custom); + : StatBar_Custom); } void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - // TRUE is to force the frame to close - Close(TRUE); + // true is to force the frame to close + Close(true); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) @@ -358,44 +525,93 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) dlg.ShowModal(); } +void MyFrame::OnUpdateSetStyleNormal(wxUpdateUIEvent &event) +{ + event.Check(m_statbarStyle == wxSB_NORMAL); +} + +void MyFrame::OnUpdateSetStyleFlat(wxUpdateUIEvent &event) +{ + event.Check(m_statbarStyle == wxSB_FLAT); +} + +void MyFrame::OnUpdateSetStyleRaised(wxUpdateUIEvent &event) +{ + event.Check(m_statbarStyle == wxSB_RAISED); +} + +void MyFrame::OnSetStyleNormal(wxCommandEvent & WXUNUSED(event)) +{ + m_statbarStyle = wxSB_NORMAL; + ApplyStyle(); +} + +void MyFrame::OnSetStyleFlat(wxCommandEvent & WXUNUSED(event)) +{ + m_statbarStyle = wxSB_FLAT; + ApplyStyle(); +} + +void MyFrame::OnSetStyleRaised(wxCommandEvent & WXUNUSED(event)) +{ + m_statbarStyle = wxSB_RAISED; + ApplyStyle(); +} + +void MyFrame::ApplyStyle() +{ + wxStatusBar *sb = GetStatusBar(); + int fields = sb->GetFieldsCount(); + int *styles = new int[fields]; + + for (int i = 1; i < fields; i++) + styles[i] = wxSB_NORMAL; + + styles[0] = m_statbarStyle; + + sb->SetStatusStyles(fields, styles); + + delete [] styles; +} + // ---------------------------------------------------------------------------- // MyAboutDialog // ---------------------------------------------------------------------------- MyAboutDialog::MyAboutDialog(wxWindow *parent) - : wxDialog(parent, -1, wxString("About statbar"), + : wxDialog(parent, wxID_ANY, wxString(_T("About statbar")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { - wxStaticText *text = new wxStaticText(this, -1, - "wxStatusBar sample\n" - "(c) 2000 Vadim Zeitlin"); + wxStaticText *text = new wxStaticText(this, wxID_ANY, + _T("wxStatusBar sample\n") + _T("(c) 2000 Vadim Zeitlin")); + + wxButton *btn = new wxButton(this, wxID_OK, _T("&Close")); // create the top status bar without the size grip (default style), // otherwise it looks weird - wxStatusBar *statbarTop = new wxStatusBar(this, -1, 0); + wxStatusBar *statbarTop = new wxStatusBar(this, wxID_ANY, 0); statbarTop->SetFieldsCount(3); - statbarTop->SetStatusText("This is a top status bar", 0); - statbarTop->SetStatusText("in a dialog", 1); - statbarTop->SetStatusText("Great, isn't it?", 2); + statbarTop->SetStatusText(_T("This is a top status bar"), 0); + statbarTop->SetStatusText(_T("in a dialog"), 1); + statbarTop->SetStatusText(_T("Great, isn't it?"), 2); - wxStatusBar *statbarBottom = new wxStatusBar(this, -1); + wxStatusBar *statbarBottom = new wxStatusBar(this, wxID_ANY); statbarBottom->SetFieldsCount(2); - statbarBottom->SetStatusText("This is a bottom status bar", 0); - statbarBottom->SetStatusText("in a dialog", 1); + statbarBottom->SetStatusText(_T("This is a bottom status bar"), 0); + statbarBottom->SetStatusText(_T("in a dialog"), 1); wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); sizerTop->Add(statbarTop, 0, wxGROW); sizerTop->Add(-1, 10, 1, wxGROW); - sizerTop->Add(text, 0, wxCENTRE); + sizerTop->Add(text, 0, wxCENTRE | wxRIGHT | wxLEFT, 20); + sizerTop->Add(-1, 10, 1, wxGROW); + sizerTop->Add(btn, 0, wxCENTRE | wxRIGHT | wxLEFT, 20); sizerTop->Add(-1, 10, 1, wxGROW); sizerTop->Add(statbarBottom, 0, wxGROW); - SetAutoLayout(TRUE); - SetSizer(sizerTop); - - sizerTop->Fit(this); - sizerTop->SetSizeHints(this); + SetSizerAndFit(sizerTop); } // ---------------------------------------------------------------------------- @@ -408,21 +624,38 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent) #endif MyStatusBar::MyStatusBar(wxWindow *parent) - : wxStatusBar(parent, -1), m_timer(this) + : wxStatusBar(parent, wxID_ANY) +#if wxUSE_TIMER + , m_timer(this) +#endif +#if wxUSE_CHECKBOX + , m_checkbox(NULL) +#endif { static const int widths[Field_Max] = { -1, 150, BITMAP_SIZE_X, 100 }; SetFieldsCount(Field_Max); SetStatusWidths(Field_Max, widths); +#if wxUSE_CHECKBOX m_checkbox = new wxCheckBox(this, StatusBar_Checkbox, _T("&Toggle clock")); - m_checkbox->SetValue(TRUE); + m_checkbox->SetValue(true); +#endif - m_statbmp = new wxStaticBitmap(this, -1, wxIcon(green_xpm)); +#ifdef USE_STATIC_BITMAP + m_statbmp = new wxStaticBitmap(this, wxID_ANY, wxIcon(green_xpm)); +#else + m_statbmp = new wxBitmapButton(this, wxID_ANY, CreateBitmapForButton(), + wxDefaultPosition, wxDefaultSize, + wxBU_EXACTFIT); +#endif +#if wxUSE_TIMER m_timer.Start(1000); +#endif - SetMinHeight(BITMAP_SIZE_Y); + SetMinHeight(wxMax(m_statbmp->GetBestSize().GetHeight(), + m_checkbox->GetBestSize().GetHeight())); UpdateClock(); } @@ -433,44 +666,102 @@ MyStatusBar::MyStatusBar(wxWindow *parent) MyStatusBar::~MyStatusBar() { +#if wxUSE_TIMER if ( m_timer.IsRunning() ) { m_timer.Stop(); } +#endif +} + +#define BMP_BUTTON_SIZE_X 10 +#define BMP_BUTTON_SIZE_Y 10 + +wxBitmap MyStatusBar::CreateBitmapForButton(bool on) +{ + wxBitmap bitmap(BMP_BUTTON_SIZE_X+1, BMP_BUTTON_SIZE_Y+1); + wxMemoryDC dc; + dc.SelectObject(bitmap); + dc.SetBrush(on ? *wxGREEN_BRUSH : *wxRED_BRUSH); + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); + dc.Clear(); + dc.DrawEllipse(0, 0, BMP_BUTTON_SIZE_X, BMP_BUTTON_SIZE_Y); + dc.SelectObject(wxNullBitmap); + + return bitmap; } void MyStatusBar::OnSize(wxSizeEvent& event) { +#if wxUSE_CHECKBOX + if ( !m_checkbox ) + return; +#endif + wxRect rect; GetFieldRect(Field_Checkbox, rect); +#if wxUSE_CHECKBOX m_checkbox->SetSize(rect.x + 2, rect.y + 2, rect.width - 4, rect.height - 4); +#endif GetFieldRect(Field_Bitmap, rect); - m_statbmp->Move(rect.x + (rect.width - BITMAP_SIZE_X) / 2, - rect.y + (rect.height - BITMAP_SIZE_Y) / 2); + wxSize size = m_statbmp->GetSize(); + + m_statbmp->Move(rect.x + (rect.width - size.x) / 2, + rect.y + (rect.height - size.y) / 2); event.Skip(); } -void MyStatusBar::OnToggleClock(wxCommandEvent& event) +void MyStatusBar::OnButton(wxCommandEvent& WXUNUSED(event)) +{ +#if wxUSE_CHECKBOX + m_checkbox->SetValue(!m_checkbox->GetValue()); +#endif + + DoToggle(); +} + +void MyStatusBar::OnToggleClock(wxCommandEvent& WXUNUSED(event)) +{ + DoToggle(); +} + +void MyStatusBar::DoToggle() { +#if wxUSE_CHECKBOX if ( m_checkbox->GetValue() ) { +#if wxUSE_TIMER m_timer.Start(1000); +#endif +#ifdef USE_STATIC_BITMAP m_statbmp->SetIcon(wxIcon(green_xpm)); +#else + m_statbmp->SetBitmapLabel(CreateBitmapForButton(false)); + m_statbmp->Refresh(); +#endif UpdateClock(); } else // don't show clock { +#if wxUSE_TIMER m_timer.Stop(); +#endif +#ifdef USE_STATIC_BITMAP m_statbmp->SetIcon(wxIcon(red_xpm)); +#else + m_statbmp->SetBitmapLabel(CreateBitmapForButton(true)); + m_statbmp->Refresh(); +#endif - SetStatusText("", Field_Clock); + SetStatusText(wxEmptyString, Field_Clock); } +#endif } void MyStatusBar::UpdateClock()