X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1454b4426152f97530538f002f5d72cd1007155a..86381d4297f0225448823369a0df73ba67664078:/samples/statbar/statbar.cpp diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp index ec474a05a3..8afb461b09 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" @@ -54,15 +54,7 @@ #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 @@ -73,10 +65,8 @@ 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 @@ -110,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 }; @@ -134,26 +124,21 @@ 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); @@ -165,6 +150,7 @@ class MyFrame : public wxMDIParentFrame void OnPopStatusText(wxCommandEvent& event); void OnResetFieldsWidth(wxCommandEvent& event); + void OnShowFieldsRect(wxCommandEvent& event); void OnSetStatusFields(wxCommandEvent& event); void OnSetStatusFont(wxCommandEvent& event); void OnRecreateStatusBar(wxCommandEvent& event); @@ -223,6 +209,7 @@ enum StatusBar_PopText, StatusBar_SetFont, StatusBar_ResetFieldsWidth, + StatusBar_ShowFieldsRect, StatusBar_Recreate, StatusBar_Toggle, @@ -262,6 +249,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) 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) @@ -278,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) @@ -289,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 @@ -318,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) @@ -337,9 +326,9 @@ 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)); @@ -347,26 +336,30 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) m_statbarPaneStyle = wxSB_NORMAL; m_field = 1; -#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 - // 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", @@ -382,25 +375,45 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) statbarMenu->Append(StatusBar_SetFields, wxT("&Set field count\tCtrl-C"), wxT("Set the number of status bar fields")); 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(); @@ -416,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(); @@ -559,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); @@ -633,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); @@ -766,7 +795,8 @@ 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; @@ -851,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 @@ -860,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); @@ -870,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); @@ -902,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 @@ -939,7 +960,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); @@ -951,18 +974,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() @@ -974,12 +998,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(); } @@ -989,16 +1008,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()