X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..e0dec8753abaf97e006ea1185bfb6775b28df0a8:/samples/statbar/statbar.cpp diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp index db21938159..7ea8202d8e 100644 --- a/samples/statbar/statbar.cpp +++ b/samples/statbar/statbar.cpp @@ -2,7 +2,6 @@ // Name: statbar.cpp // Purpose: wxStatusBar sample // Author: Vadim Zeitlin -// Modified by: // Created: 04.02.00 // RCS-ID: $Id$ // Copyright: (c) Vadim Zeitlin @@ -31,6 +30,7 @@ // for all others, include the necessary headers #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/dcclient.h" #include "wx/log.h" #include "wx/frame.h" #include "wx/statusbr.h" @@ -50,32 +50,23 @@ #include "wx/numdlg.h" #include "wx/fontdlg.h" -#ifndef __WXMSW__ +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" #endif - -// 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 +static const char *SAMPLE_DIALOGS_TITLE = "wxWidgets statbar sample"; // ---------------------------------------------------------------------------- // resources // ---------------------------------------------------------------------------- -#ifdef USE_STATIC_BITMAP - #include "green.xpm" - #include "red.xpm" -#endif // USE_STATIC_BITMAP +#include "green.xpm" +#include "red.xpm" // ---------------------------------------------------------------------------- // private classes @@ -109,20 +100,20 @@ public: #endif void OnSize(wxSizeEvent& event); void OnToggleClock(wxCommandEvent& event); - void OnButton(wxCommandEvent& event); + void OnIdle(wxIdleEvent& event); private: // toggle the state of the status bar controls void DoToggle(); - wxBitmap CreateBitmapForButton(bool on = false); - enum { Field_Text, Field_Checkbox, Field_Bitmap, + Field_NumLockIndicator, Field_Clock, + Field_CapsLockIndicator, Field_Max }; @@ -133,37 +124,37 @@ private: #if wxUSE_CHECKBOX wxCheckBox *m_checkbox; #endif -#ifdef USE_STATIC_BITMAP wxStaticBitmap *m_statbmp; -#else - wxBitmapButton *m_statbmp; -#endif DECLARE_EVENT_TABLE() }; // Define a new frame type: this is going to be our main frame +#ifdef USE_MDI_PARENT_FRAME +class MyFrame : public wxMDIParentFrame +#else class MyFrame : public wxFrame +#endif { 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 OnSetStatusField(wxCommandEvent& event); + void OnSetStatusText(wxCommandEvent& event); + void OnPushStatusText(wxCommandEvent& event); + void OnPopStatusText(wxCommandEvent& event); + void OnResetFieldsWidth(wxCommandEvent& event); + void OnShowFieldsRect(wxCommandEvent& event); void OnSetStatusFields(wxCommandEvent& event); - void OnSetStatusTexts(wxCommandEvent& event); void OnSetStatusFont(wxCommandEvent& event); void OnRecreateStatusBar(wxCommandEvent& event); - + void OnSetPaneStyle(wxCommandEvent& event); void OnSetStyle(wxCommandEvent& event); @@ -186,6 +177,9 @@ private: int m_statbarPaneStyle; + // the index of the field used by some commands + int m_field; + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; @@ -207,11 +201,15 @@ enum // menu items StatusBar_Quit = wxID_EXIT, StatusBar_About = wxID_ABOUT, - + StatusBar_SetFields = wxID_HIGHEST+1, - StatusBar_SetTexts, + StatusBar_SetField, + StatusBar_SetText, + StatusBar_PushText, + StatusBar_PopText, StatusBar_SetFont, StatusBar_ResetFieldsWidth, + StatusBar_ShowFieldsRect, StatusBar_Recreate, StatusBar_Toggle, @@ -220,7 +218,7 @@ enum StatusBar_SetPaneStyleNormal, StatusBar_SetPaneStyleFlat, StatusBar_SetPaneStyleRaised, - + StatusBar_SetStyleSizeGrip, StatusBar_SetStyleEllipsizeStart, StatusBar_SetStyleEllipsizeMiddle, @@ -245,16 +243,20 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #endif EVT_MENU(StatusBar_Quit, MyFrame::OnQuit) EVT_MENU(StatusBar_SetFields, MyFrame::OnSetStatusFields) - EVT_MENU(StatusBar_SetTexts, MyFrame::OnSetStatusTexts) + EVT_MENU(StatusBar_SetField, MyFrame::OnSetStatusField) + EVT_MENU(StatusBar_SetText, MyFrame::OnSetStatusText) + EVT_MENU(StatusBar_PushText, MyFrame::OnPushStatusText) + EVT_MENU(StatusBar_PopText, MyFrame::OnPopStatusText) EVT_MENU(StatusBar_SetFont, MyFrame::OnSetStatusFont) EVT_MENU(StatusBar_ResetFieldsWidth, MyFrame::OnResetFieldsWidth) + EVT_MENU(StatusBar_ShowFieldsRect, MyFrame::OnShowFieldsRect) EVT_MENU(StatusBar_Recreate, MyFrame::OnRecreateStatusBar) EVT_MENU(StatusBar_About, MyFrame::OnAbout) EVT_MENU(StatusBar_Toggle, MyFrame::OnStatusBarToggle) EVT_MENU(StatusBar_SetPaneStyleNormal, MyFrame::OnSetPaneStyle) EVT_MENU(StatusBar_SetPaneStyleFlat, MyFrame::OnSetPaneStyle) EVT_MENU(StatusBar_SetPaneStyleRaised, MyFrame::OnSetPaneStyle) - + EVT_MENU(StatusBar_SetStyleSizeGrip, MyFrame::OnSetStyle) EVT_MENU(StatusBar_SetStyleEllipsizeStart, MyFrame::OnSetStyle) EVT_MENU(StatusBar_SetStyleEllipsizeMiddle, MyFrame::OnSetStyle) @@ -264,7 +266,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_UPDATE_UI_RANGE(StatusBar_SetFields, StatusBar_ResetFieldsWidth, MyFrame::OnUpdateForDefaultStatusbar) EVT_UPDATE_UI(StatusBar_Toggle, MyFrame::OnUpdateStatusBarToggle) - EVT_UPDATE_UI_RANGE(StatusBar_SetPaneStyleNormal, StatusBar_SetPaneStyleRaised, + EVT_UPDATE_UI_RANGE(StatusBar_SetPaneStyleNormal, + StatusBar_SetPaneStyleRaised, MyFrame::OnUpdateSetPaneStyle) EVT_UPDATE_UI_RANGE(StatusBar_SetStyleSizeGrip, StatusBar_SetStyleShowTips, MyFrame::OnUpdateSetStyle) @@ -275,10 +278,10 @@ BEGIN_EVENT_TABLE(MyStatusBar, wxStatusBar) #if wxUSE_CHECKBOX EVT_CHECKBOX(StatusBar_Checkbox, MyStatusBar::OnToggleClock) #endif - EVT_BUTTON(wxID_ANY, MyStatusBar::OnButton) #if wxUSE_TIMER EVT_TIMER(wxID_ANY, MyStatusBar::OnTimer) #endif + EVT_IDLE(MyStatusBar::OnIdle) END_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create @@ -304,7 +307,7 @@ bool MyApp::OnInit() // create the main application window MyFrame *frame = new MyFrame(wxT("wxStatusBar sample"), - wxPoint(50, 50), wxSize(450, 340)); + wxPoint(50, 50), wxSize(450, 340)); // and show it (the frames, unlike simple controls, are not shown when // created initially) @@ -323,61 +326,94 @@ bool MyApp::OnInit() // frame constructor MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) #ifdef USE_MDI_PARENT_FRAME - : wxMDIParentFrame((wxWindow *)NULL, wxID_ANY, title, pos, size) + : wxMDIParentFrame(NULL, wxID_ANY, title, pos, size) #else - : wxFrame((wxWindow *)NULL, wxID_ANY, title, pos, size) + : wxFrame(NULL, wxID_ANY, title, pos, size) #endif { SetIcon(wxICON(sample)); m_statbarPaneStyle = 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 - wxApp::s_macAboutMenuItemId = StatusBar_About; -#endif + m_field = 1; // create a menu bar wxMenu *menuFile = new wxMenu; - menuFile->Append(StatusBar_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program")); + menuFile->Append(StatusBar_Quit, wxT("E&xit\tAlt-X"), + wxT("Quit this program")); wxMenu *statbarMenu = new wxMenu; - + wxMenu *statbarStyleMenu = new wxMenu; - statbarStyleMenu->Append(StatusBar_SetStyleSizeGrip, wxT("wxSTB_SIZE_GRIP"), wxT("Toggles the wxSTB_SIZE_GRIP style"), true); - statbarStyleMenu->Append(StatusBar_SetStyleShowTips, wxT("wxSTB_SHOW_TIPS"), wxT("Toggles the wxSTB_SHOW_TIPS style"), true); + statbarStyleMenu->Append(StatusBar_SetStyleSizeGrip, wxT("wxSTB_SIZE_GRIP"), + wxT("Toggles the wxSTB_SIZE_GRIP style"), true); + statbarStyleMenu->Append(StatusBar_SetStyleShowTips, wxT("wxSTB_SHOW_TIPS"), + wxT("Toggles the wxSTB_SHOW_TIPS style"), true); statbarStyleMenu->AppendSeparator(); - statbarStyleMenu->Append(StatusBar_SetStyleEllipsizeStart, wxT("wxSTB_ELLIPSIZE_START"), wxT("Toggles the wxSTB_ELLIPSIZE_START style"), true); - statbarStyleMenu->Append(StatusBar_SetStyleEllipsizeMiddle, wxT("wxSTB_ELLIPSIZE_MIDDLE"), wxT("Toggles the wxSTB_ELLIPSIZE_MIDDLE style"), true); - statbarStyleMenu->Append(StatusBar_SetStyleEllipsizeEnd, wxT("wxSTB_ELLIPSIZE_END"), wxT("Toggles the wxSTB_ELLIPSIZE_END style"), true); - statbarMenu->Append(StatusBar_SetPaneStyle, wxT("Status bar style"), statbarStyleMenu); + statbarStyleMenu->AppendCheckItem(StatusBar_SetStyleEllipsizeStart, + wxT("wxSTB_ELLIPSIZE_START"), + wxT("Toggle wxSTB_ELLIPSIZE_START style")); + statbarStyleMenu->AppendCheckItem(StatusBar_SetStyleEllipsizeMiddle, + wxT("wxSTB_ELLIPSIZE_MIDDLE"), + wxT("Toggle wxSTB_ELLIPSIZE_MIDDLE style")); + statbarStyleMenu->AppendCheckItem(StatusBar_SetStyleEllipsizeEnd, + wxT("wxSTB_ELLIPSIZE_END"), + wxT("Toggle wxSTB_ELLIPSIZE_END style")); + statbarMenu->Append(StatusBar_SetPaneStyle, wxT("Status bar style"), + statbarStyleMenu); + statbarMenu->AppendSeparator(); + + statbarMenu->Append(StatusBar_SetField, "Set active field &number\tCtrl-N", + "Set the number of field used by the next commands."); + statbarMenu->Append(StatusBar_SetText, wxT("Set field &text\tCtrl-T"), + wxT("Set the text of the selected field.")); + statbarMenu->Append(StatusBar_PushText, "P&ush field text\tCtrl-P", + "Push a message on top the selected field."); + statbarMenu->Append(StatusBar_PopText, "&Pop field text\tShift-Ctrl-P", + "Restore the previous contents of the selected field."); statbarMenu->AppendSeparator(); statbarMenu->Append(StatusBar_SetFields, wxT("&Set field count\tCtrl-C"), wxT("Set the number of status bar fields")); - statbarMenu->Append(StatusBar_SetTexts, wxT("&Set field text\tCtrl-T"), - wxT("Set the text to display for each status bar field")); statbarMenu->Append(StatusBar_SetFont, wxT("&Set field font\tCtrl-F"), - wxT("Set the font to use for rendering status bar fields")); + wxT("Set the font to use for status bar fields")); wxMenu *statbarPaneStyleMenu = new wxMenu; - statbarPaneStyleMenu->Append(StatusBar_SetPaneStyleNormal, wxT("&Normal"), wxT("Sets the style of the first field to normal (sunken) look"), true); - statbarPaneStyleMenu->Append(StatusBar_SetPaneStyleFlat, wxT("&Flat"), wxT("Sets the style of the first field to flat look"), true); - statbarPaneStyleMenu->Append(StatusBar_SetPaneStyleRaised, wxT("&Raised"), wxT("Sets the style of the first field to raised look"), true); - statbarMenu->Append(StatusBar_SetPaneStyle, wxT("Field style"), statbarPaneStyleMenu); + statbarPaneStyleMenu->AppendCheckItem + ( + StatusBar_SetPaneStyleNormal, + wxT("&Normal"), + wxT("Sets the style of the first field to normal (sunken) look") + ); + statbarPaneStyleMenu->AppendCheckItem + ( + StatusBar_SetPaneStyleFlat, + wxT("&Flat"), + wxT("Sets the style of the first field to flat look") + ); + statbarPaneStyleMenu->AppendCheckItem + ( + StatusBar_SetPaneStyleRaised, + wxT("&Raised"), + wxT("Sets the style of the first field to raised look") + ); + statbarMenu->Append(StatusBar_SetPaneStyle, wxT("Field style"), + statbarPaneStyleMenu); statbarMenu->Append(StatusBar_ResetFieldsWidth, wxT("Reset field widths"), wxT("Sets all fields to the same width")); + statbarMenu->Append(StatusBar_ShowFieldsRect, + wxT("Sho&w field rectangles\tCtrl-W"), + wxT("Visually show field rectangles")); statbarMenu->AppendSeparator(); - statbarMenu->Append(StatusBar_Toggle, wxT("&Toggle Status Bar"), - wxT("Toggle the status bar display"), true); + statbarMenu->AppendCheckItem(StatusBar_Toggle, wxT("&Toggle Status Bar"), + wxT("Toggle the status bar display")); statbarMenu->Append(StatusBar_Recreate, wxT("&Recreate\tCtrl-R"), wxT("Toggle status bar format")); wxMenu *helpMenu = new wxMenu; - helpMenu->Append(StatusBar_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog")); + helpMenu->Append(StatusBar_About, wxT("&About\tCtrl-A"), + wxT("Show about dialog")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar(); @@ -393,10 +429,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) SetStatusText(wxT("Welcome to wxWidgets!")); } -MyFrame::~MyFrame() -{ -} - void MyFrame::DoCreateStatusBar(MyFrame::StatusBarKind kind, long style) { wxStatusBar *statbarOld = GetStatusBar(); @@ -413,7 +445,7 @@ void MyFrame::DoCreateStatusBar(MyFrame::StatusBarKind kind, long style) statbarNew = new wxStatusBar(this, wxID_ANY, style, "wxStatusBar"); statbarNew->SetFieldsCount(2); break; - + case StatBar_Custom: statbarNew = new MyStatusBar(this, style); break; @@ -440,25 +472,94 @@ void MyFrame::OnUpdateForDefaultStatusbar(wxUpdateUIEvent& event) wxStatusBar *sb = GetStatusBar(); if (!sb) return; - + event.Enable(sb->GetName() == "wxStatusBar"); } -void MyFrame::OnSetStatusTexts(wxCommandEvent& WXUNUSED(event)) +void MyFrame::OnSetStatusField(wxCommandEvent& WXUNUSED(event)) { wxStatusBar *sb = GetStatusBar(); if (!sb) return; - wxString txt; - for (int i=0; iGetFieldsCount(); i++) - { - txt = - wxGetTextFromUser(wxString::Format("Enter the text for the %d-th field:", i+1), - "Input field text", "A dummy test string", this); + long rc = wxGetNumberFromUser + ( + "Configure the field index to be used by the set, push " + "and pop text commands in the menu.\n" + "\n" + "0 corresponds to the first field, 1 to the second one " + "and so on.", + "Field &index:", + SAMPLE_DIALOGS_TITLE, + m_field, + 0, + sb->GetFieldsCount() - 1, + NULL + ); + + if ( rc == -1 ) + return; + + m_field = rc; + + wxLogStatus("Status bar text will be set for field #%d", m_field); +} + +void MyFrame::OnSetStatusText(wxCommandEvent& WXUNUSED(event)) +{ + wxStatusBar *sb = GetStatusBar(); + if (!sb) + return; + + wxString txt = wxGetTextFromUser + ( + wxString::Format + ( + "Enter the text from for the field #%d", + m_field + ), + SAMPLE_DIALOGS_TITLE, + sb->GetStatusText(m_field), + this + ); + + if ( txt.empty() ) + return; + + sb->SetStatusText(txt, m_field); +} + +// the current depth of the stack used by Push/PopStatusText() +static int gs_depth = 0; + +void MyFrame::OnPushStatusText(wxCommandEvent& WXUNUSED(event)) +{ + wxStatusBar *sb = GetStatusBar(); + if (!sb) + return; + + static int s_countPush = 0; + sb->PushStatusText(wxString::Format + ( + "Pushed message #%d (depth = %d)", + ++s_countPush, ++gs_depth + ), m_field); +} - sb->SetStatusText(txt, i); +void MyFrame::OnPopStatusText(wxCommandEvent& WXUNUSED(event)) +{ + wxStatusBar *sb = GetStatusBar(); + if (!sb) + return; + + if ( !gs_depth ) + { + wxLogStatus("No message to pop."); + return; } + + gs_depth--; + sb->PopStatusText(m_field); } void MyFrame::OnSetStatusFont(wxCommandEvent& WXUNUSED(event)) @@ -467,7 +568,8 @@ void MyFrame::OnSetStatusFont(wxCommandEvent& WXUNUSED(event)) if (!sb) return; - wxFont fnt = wxGetFontFromUser(this, sb->GetFont(), "Choose statusbar font"); + wxFont + fnt = wxGetFontFromUser(this, sb->GetFont(), "Choose status bar font"); if (fnt.IsOk()) { sb->SetFont(fnt); @@ -485,7 +587,7 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event)) ( wxT("Select the number of fields in the status bar"), wxT("Fields:"), - wxT("wxWidgets statusbar sample"), + SAMPLE_DIALOGS_TITLE, sb->GetFieldsCount(), 1, 5, this @@ -528,6 +630,9 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event)) SetStatusText(s, n); } + + if ( m_field >= nFields ) + m_field = nFields - 1; } else { @@ -538,15 +643,34 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnResetFieldsWidth(wxCommandEvent& WXUNUSED(event)) { wxStatusBar *pStat = GetStatusBar(); - if (!pStat) + if ( !pStat ) return; - - int n = pStat->GetFieldsCount(); + + const int n = pStat->GetFieldsCount(); pStat->SetStatusWidths(n, NULL); - for (int i=0; iSetStatusText("same size", i); } +void MyFrame::OnShowFieldsRect(wxCommandEvent& WXUNUSED(event)) +{ + wxStatusBar *pStat = GetStatusBar(); + if ( !pStat ) + return; + + wxClientDC dc(pStat); + dc.SetPen(*wxRED_PEN); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + + const int n = pStat->GetFieldsCount(); + for ( int i = 0; i < n; i++ ) + { + wxRect r; + if ( pStat->GetFieldRect(i, r) ) + dc.DrawRectangle(r); + } +} + void MyFrame::OnUpdateStatusBarToggle(wxUpdateUIEvent& event) { event.Check(GetStatusBar() != NULL); @@ -615,7 +739,7 @@ void MyFrame::OnSetPaneStyle(wxCommandEvent& event) m_statbarPaneStyle = wxSB_RAISED; break; } - + ApplyPaneStyle(); } @@ -624,7 +748,7 @@ void MyFrame::ApplyPaneStyle() wxStatusBar *sb = GetStatusBar(); if (!sb) return; - + int fields = sb->GetFieldsCount(); int *styles = new int[fields]; @@ -671,8 +795,9 @@ void MyFrame::OnSetStyle(wxCommandEvent& event) if (GetStatusBar()) oldStyle = GetStatusBar()->GetWindowStyle(); -#define STB_ELLIPSIZE_MASK (wxSTB_ELLIPSIZE_START|wxSTB_ELLIPSIZE_MIDDLE|wxSTB_ELLIPSIZE_END) - + #define STB_ELLIPSIZE_MASK \ + (wxSTB_ELLIPSIZE_START|wxSTB_ELLIPSIZE_MIDDLE|wxSTB_ELLIPSIZE_END) + long newStyle = oldStyle; long newStyleBit = 0; switch (event.GetId()) @@ -697,7 +822,7 @@ void MyFrame::OnSetStyle(wxCommandEvent& event) newStyle &= ~STB_ELLIPSIZE_MASK; break; } - + newStyle = event.IsChecked() ? (newStyle | newStyleBit) : (newStyle & ~newStyleBit); if (newStyle != oldStyle) @@ -756,6 +881,9 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent) #pragma warning(disable: 4355) #endif +static const char *numlockIndicators[] = { "OFF", "NUM" }; +static const char *capslockIndicators[] = { "", "CAPS" }; + MyStatusBar::MyStatusBar(wxWindow *parent, long style) : wxStatusBar(parent, wxID_ANY, style, "MyStatusBar") #if wxUSE_TIMER @@ -765,7 +893,18 @@ MyStatusBar::MyStatusBar(wxWindow *parent, long style) , m_checkbox(NULL) #endif { - static const int widths[Field_Max] = { -1, 150, BITMAP_SIZE_X, 100 }; + // compute the size needed for num lock indicator pane + wxClientDC dc(this); + wxSize sizeNumLock = dc.GetTextExtent(numlockIndicators[0]); + sizeNumLock.IncTo(dc.GetTextExtent(numlockIndicators[1])); + + int widths[Field_Max]; + widths[Field_Text] = -1; // growable + widths[Field_Checkbox] = 150; + widths[Field_Bitmap] = BITMAP_SIZE_X; + widths[Field_NumLockIndicator] = sizeNumLock.x; + widths[Field_Clock] = 100; + widths[Field_CapsLockIndicator] = dc.GetTextExtent(capslockIndicators[1]).x; SetFieldsCount(Field_Max); SetStatusWidths(Field_Max, widths); @@ -775,13 +914,7 @@ MyStatusBar::MyStatusBar(wxWindow *parent, long style) m_checkbox->SetValue(true); #endif -#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); @@ -807,23 +940,6 @@ MyStatusBar::~MyStatusBar() #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 @@ -831,11 +947,6 @@ void MyStatusBar::OnSize(wxSizeEvent& event) return; #endif - // TEMPORARY HACK: TODO find a more general solution -#ifdef wxStatusBarGeneric - wxStatusBar::OnSize(event); -#endif - wxRect rect; if (!GetFieldRect(Field_Checkbox, rect)) { @@ -844,7 +955,9 @@ void MyStatusBar::OnSize(wxSizeEvent& event) } #if wxUSE_CHECKBOX - m_checkbox->SetSize(rect.x + 2, rect.y + 2, rect.width - 4, rect.height - 4); + wxRect rectCheck = rect; + rectCheck.Deflate(2); + m_checkbox->SetSize(rectCheck); #endif GetFieldRect(Field_Bitmap, rect); @@ -856,18 +969,19 @@ void MyStatusBar::OnSize(wxSizeEvent& event) event.Skip(); } -void MyStatusBar::OnButton(wxCommandEvent& WXUNUSED(event)) +void MyStatusBar::OnToggleClock(wxCommandEvent& WXUNUSED(event)) { -#if wxUSE_CHECKBOX - m_checkbox->SetValue(!m_checkbox->GetValue()); -#endif - DoToggle(); } -void MyStatusBar::OnToggleClock(wxCommandEvent& WXUNUSED(event)) +void MyStatusBar::OnIdle(wxIdleEvent& event) { - DoToggle(); + SetStatusText(numlockIndicators[wxGetKeyState(WXK_NUMLOCK)], + Field_NumLockIndicator); + SetStatusText(capslockIndicators[wxGetKeyState(WXK_CAPITAL)], + Field_CapsLockIndicator); + + event.Skip(); } void MyStatusBar::DoToggle() @@ -879,12 +993,7 @@ void MyStatusBar::DoToggle() 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(); } @@ -894,16 +1003,11 @@ void MyStatusBar::DoToggle() 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(wxEmptyString, Field_Clock); } -#endif +#endif // wxUSE_CHECKBOX } void MyStatusBar::UpdateClock()