X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..05e0b047d879cdbfade7f2ab346c0acdf3e29f96:/samples/statbar/statbar.cpp?ds=sidebyside diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp index c6c1ddb2be..91cf5c9c90 100644 --- a/samples/statbar/statbar.cpp +++ b/samples/statbar/statbar.cpp @@ -96,7 +96,9 @@ public: void UpdateClock(); // event handlers +#if wxUSE_TIMER void OnTimer(wxTimerEvent& WXUNUSED(event)) { UpdateClock(); } +#endif void OnSize(wxSizeEvent& event); void OnToggleClock(wxCommandEvent& event); void OnButton(wxCommandEvent& event); @@ -116,9 +118,13 @@ 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 @@ -146,6 +152,9 @@ class MyFrame : public wxMDIParentFrame void OnSetStatusFields(wxCommandEvent& event); void OnRecreateStatusBar(wxCommandEvent& event); + void OnSetStyleNormal(wxCommandEvent& event); + void OnSetStyleFlat(wxCommandEvent& event); + void OnSetStyleRaised(wxCommandEvent& event); private: enum StatBarKind @@ -156,12 +165,18 @@ private: } m_statbarKind; 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; + int m_statbarStyle; + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; @@ -186,7 +201,11 @@ enum StatusBar_Recreate, StatusBar_About, StatusBar_Toggle, - StatusBar_Checkbox = 1000 + StatusBar_Checkbox = 1000, + StatusBar_SetStyle, + StatusBar_SetStyleNormal, + StatusBar_SetStyleFlat, + StatusBar_SetStyleRaised }; static const int BITMAP_SIZE_X = 32; @@ -209,15 +228,25 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) 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_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) +#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 wxWidgets to create @@ -238,6 +267,9 @@ 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(_T("wxStatusBar sample"), wxPoint(50, 50), wxSize(450, 340)); @@ -267,6 +299,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) 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 @@ -285,6 +319,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) statbarMenu->Append(StatusBar_Recreate, _T("&Recreate\tCtrl-R"), _T("Toggle status bar format")); + 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); + wxMenu *helpMenu = new wxMenu; helpMenu->Append(StatusBar_About, _T("&About...\tCtrl-A"), _T("Show about dialog")); @@ -339,6 +379,7 @@ void MyFrame::DoCreateStatusBar(MyFrame::StatBarKind kind) wxFAIL_MSG(wxT("unknown stat bar kind")); } + ApplyStyle(); GetStatusBar()->Show(); PositionStatusBar(); @@ -347,13 +388,12 @@ void MyFrame::DoCreateStatusBar(MyFrame::StatBarKind kind) void MyFrame::OnUpdateSetStatusFields(wxUpdateUIEvent& event) { - // only allow the setting of the number of status fields for the default + // 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)) { @@ -415,7 +455,7 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnUpdateStatusBarToggle(wxUpdateUIEvent& event) { - event.Check(GetStatusBar() != 0); + event.Check(GetStatusBar() != NULL); } void MyFrame::OnStatusBarToggle(wxCommandEvent& WXUNUSED(event)) @@ -424,17 +464,12 @@ void MyFrame::OnStatusBarToggle(wxCommandEvent& WXUNUSED(event)) if ( statbarOld ) { statbarOld->Hide(); - SetStatusBar(0); + SetStatusBar(NULL); } else { DoCreateStatusBar(m_statbarKind); } -#ifdef __WXMSW__ - // The following is a kludge suggested by Vadim Zeitlin (one of the wxWidgets - // authors) while we look for a proper fix.. -// SendSizeEvent(); -#endif } void MyFrame::OnRecreateStatusBar(wxCommandEvent& WXUNUSED(event)) @@ -455,6 +490,55 @@ 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 // ---------------------------------------------------------------------------- @@ -492,11 +576,7 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent) sizerTop->Add(-1, 10, 1, wxGROW); sizerTop->Add(statbarBottom, 0, wxGROW); - SetAutoLayout(true); - SetSizer(sizerTop); - - sizerTop->Fit(this); - sizerTop->SetSizeHints(this); + SetSizerAndFit(sizerTop); } // ---------------------------------------------------------------------------- @@ -509,15 +589,23 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent) #endif MyStatusBar::MyStatusBar(wxWindow *parent) - : wxStatusBar(parent, wxID_ANY), m_timer(this), m_checkbox(NULL) + : 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); +#endif #ifdef USE_STATIC_BITMAP m_statbmp = new wxStaticBitmap(this, wxID_ANY, wxIcon(green_xpm)); @@ -527,7 +615,9 @@ MyStatusBar::MyStatusBar(wxWindow *parent) wxBU_EXACTFIT); #endif +#if wxUSE_TIMER m_timer.Start(1000); +#endif SetMinHeight(BITMAP_SIZE_Y); @@ -540,10 +630,12 @@ MyStatusBar::MyStatusBar(wxWindow *parent) MyStatusBar::~MyStatusBar() { +#if wxUSE_TIMER if ( m_timer.IsRunning() ) { m_timer.Stop(); } +#endif } wxBitmap MyStatusBar::CreateBitmapForButton(bool on) @@ -565,13 +657,17 @@ wxBitmap MyStatusBar::CreateBitmapForButton(bool on) 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); wxSize size = m_statbmp->GetSize(); @@ -584,7 +680,9 @@ void MyStatusBar::OnSize(wxSizeEvent& event) void MyStatusBar::OnButton(wxCommandEvent& WXUNUSED(event)) { +#if wxUSE_CHECKBOX m_checkbox->SetValue(!m_checkbox->GetValue()); +#endif DoToggle(); } @@ -596,9 +694,12 @@ void MyStatusBar::OnToggleClock(wxCommandEvent& WXUNUSED(event)) 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)); @@ -611,7 +712,9 @@ void MyStatusBar::DoToggle() } else // don't show clock { +#if wxUSE_TIMER m_timer.Stop(); +#endif #ifdef USE_STATIC_BITMAP m_statbmp->SetIcon(wxIcon(red_xpm)); @@ -620,8 +723,9 @@ void MyStatusBar::DoToggle() m_statbmp->Refresh(); #endif - SetStatusText(_T(""), Field_Clock); + SetStatusText(wxEmptyString, Field_Clock); } +#endif } void MyStatusBar::UpdateClock()