X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2919ab326e60322b63ae9b5d50e83bb5156efce..e4de825ee6f3f991e2aa86159d6e3457afb6a8e0:/samples/statbar/statbar.cpp diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp index 7761a5e1d5..86d8f23d24 100644 --- a/samples/statbar/statbar.cpp +++ b/samples/statbar/statbar.cpp @@ -49,16 +49,19 @@ #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 - #define USE_STATIC_BITMAP -#endif + // ---------------------------------------------------------------------------- // resources @@ -96,7 +99,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 +121,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 @@ -144,6 +153,7 @@ class MyFrame : public wxMDIParentFrame void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); + void OnResetFieldsWidth(wxCommandEvent& event); void OnSetStatusFields(wxCommandEvent& event); void OnRecreateStatusBar(wxCommandEvent& event); void OnSetStyleNormal(wxCommandEvent& event); @@ -157,6 +167,8 @@ private: StatBar_Custom, StatBar_Max } m_statbarKind; + + void OnUpdateResetFieldsWidth(wxUpdateUIEvent& event); void OnUpdateSetStatusFields(wxUpdateUIEvent& event); void OnUpdateStatusBarToggle(wxUpdateUIEvent& event); void OnUpdateSetStyleNormal(wxUpdateUIEvent& event); @@ -192,6 +204,7 @@ enum // menu items StatusBar_Quit = 1, StatusBar_SetFields, + StatusBar_ResetFieldsWidth, StatusBar_Recreate, StatusBar_About, StatusBar_Toggle, @@ -219,12 +232,15 @@ 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) @@ -234,9 +250,13 @@ 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 @@ -257,9 +277,12 @@ 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)); + wxPoint(50, 50), wxSize(450, 340)); // and show it (the frames, unlike simple controls, are not shown when // created initially) @@ -278,9 +301,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((wxWindow *)NULL, wxID_ANY, title, pos, size) #else - : wxFrame((wxWindow *)NULL, wxID_ANY, title, pos, size) + : wxFrame((wxWindow *)NULL, wxID_ANY, title, pos, size) #endif { m_statbarDefault = NULL; @@ -301,10 +324,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) wxMenu *statbarMenu = new wxMenu; statbarMenu->Append(StatusBar_SetFields, _T("&Set field count\tCtrl-C"), _T("Set the number of status bar fields")); - 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 *statbarStyleMenu = new wxMenu; statbarStyleMenu->Append(StatusBar_SetStyleNormal, _T("&Normal"), _T("Sets the style of the first field to normal (sunken) look"), true); @@ -312,6 +331,15 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) 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, _T("&About...\tCtrl-A"), _T("Show about dialog")); @@ -387,14 +415,14 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event)) wxStatusBar *sb = GetStatusBar(); long nFields = wxGetNumberFromUser - ( + ( _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 @@ -440,9 +468,29 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event)) } } +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); + } +} + void MyFrame::OnUpdateStatusBarToggle(wxUpdateUIEvent& event) { - event.Check(GetStatusBar() != 0); + event.Check(GetStatusBar() != NULL); } void MyFrame::OnStatusBarToggle(wxCommandEvent& WXUNUSED(event)) @@ -451,23 +499,18 @@ 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)) { DoCreateStatusBar(m_statbarKind == StatBar_Custom ? StatBar_Default - : StatBar_Custom); + : StatBar_Custom); } void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) @@ -497,19 +540,19 @@ void MyFrame::OnUpdateSetStyleRaised(wxUpdateUIEvent &event) event.Check(m_statbarStyle == wxSB_RAISED); } -void MyFrame::OnSetStyleNormal(wxCommandEvent &event) +void MyFrame::OnSetStyleNormal(wxCommandEvent & WXUNUSED(event)) { m_statbarStyle = wxSB_NORMAL; ApplyStyle(); } -void MyFrame::OnSetStyleFlat(wxCommandEvent &event) +void MyFrame::OnSetStyleFlat(wxCommandEvent & WXUNUSED(event)) { m_statbarStyle = wxSB_FLAT; ApplyStyle(); } -void MyFrame::OnSetStyleRaised(wxCommandEvent &event) +void MyFrame::OnSetStyleRaised(wxCommandEvent & WXUNUSED(event)) { m_statbarStyle = wxSB_RAISED; ApplyStyle(); @@ -536,13 +579,13 @@ void MyFrame::ApplyStyle() // ---------------------------------------------------------------------------- MyAboutDialog::MyAboutDialog(wxWindow *parent) - : wxDialog(parent, wxID_ANY, wxString(_T("About statbar")), + : wxDialog(parent, wxID_ANY, wxString(_T("About statbar")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { wxStaticText *text = new wxStaticText(this, wxID_ANY, - _T("wxStatusBar sample\n") - _T("(c) 2000 Vadim Zeitlin")); + _T("wxStatusBar sample\n") + _T("(c) 2000 Vadim Zeitlin")); wxButton *btn = new wxButton(this, wxID_OK, _T("&Close")); @@ -568,10 +611,7 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent) sizerTop->Add(-1, 10, 1, wxGROW); sizerTop->Add(statbarBottom, 0, wxGROW); - SetSizer(sizerTop); - - sizerTop->Fit(this); - sizerTop->SetSizeHints(this); + SetSizerAndFit(sizerTop); } // ---------------------------------------------------------------------------- @@ -584,27 +624,38 @@ 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)); #else m_statbmp = new wxBitmapButton(this, wxID_ANY, CreateBitmapForButton(), - wxDefaultPosition, wxDefaultSize, - wxBU_EXACTFIT); + 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(); } @@ -615,22 +666,24 @@ 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) { - static const int BMP_BUTTON_SIZE_X = 10; - static const int BMP_BUTTON_SIZE_Y = 9; - - wxBitmap bitmap(BMP_BUTTON_SIZE_X, BMP_BUTTON_SIZE_Y); + 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.SetBackground(*wxLIGHT_GREY_BRUSH); + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); dc.Clear(); dc.DrawEllipse(0, 0, BMP_BUTTON_SIZE_X, BMP_BUTTON_SIZE_Y); dc.SelectObject(wxNullBitmap); @@ -640,13 +693,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(); @@ -659,7 +716,9 @@ void MyStatusBar::OnSize(wxSizeEvent& event) void MyStatusBar::OnButton(wxCommandEvent& WXUNUSED(event)) { +#if wxUSE_CHECKBOX m_checkbox->SetValue(!m_checkbox->GetValue()); +#endif DoToggle(); } @@ -671,9 +730,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)); @@ -686,7 +748,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)); @@ -697,6 +761,7 @@ void MyStatusBar::DoToggle() SetStatusText(wxEmptyString, Field_Clock); } +#endif } void MyStatusBar::UpdateClock()