X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45e6e6f8ab806b337dffeb3b52fec7eba3c845ef..3c01c5951189e13b8b4a5d7b288b54d4a57a30f8:/samples/statbar/statbar.cpp?ds=sidebyside diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp index 8915cd4c40..4b705b4a01 100644 --- a/samples/statbar/statbar.cpp +++ b/samples/statbar/statbar.cpp @@ -48,17 +48,25 @@ #include "wx/datetime.h" #include "wx/numdlg.h" +#include "wx/fontdlg.h" + +#ifndef __WXMSW__ + #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 - #define USE_STATIC_BITMAP -#endif + // ---------------------------------------------------------------------------- // resources @@ -90,7 +98,7 @@ public: class MyStatusBar : public wxStatusBar { public: - MyStatusBar(wxWindow *parent); + MyStatusBar(wxWindow *parent, long style = wxSTB_DEFAULT_STYLE); virtual ~MyStatusBar(); void UpdateClock(); @@ -150,32 +158,33 @@ class MyFrame : public wxMDIParentFrame void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); + void OnResetFieldsWidth(wxCommandEvent& event); void OnSetStatusFields(wxCommandEvent& event); + void OnSetStatusTexts(wxCommandEvent& event); + void OnSetStatusFont(wxCommandEvent& event); void OnRecreateStatusBar(wxCommandEvent& event); - void OnSetStyleNormal(wxCommandEvent& event); - void OnSetStyleFlat(wxCommandEvent& event); - void OnSetStyleRaised(wxCommandEvent& event); + + void OnSetPaneStyle(wxCommandEvent& event); + void OnSetStyle(wxCommandEvent& event); private: - enum StatBarKind + enum StatusBarKind { StatBar_Default, StatBar_Custom, StatBar_Max } m_statbarKind; - void OnUpdateSetStatusFields(wxUpdateUIEvent& event); + + + void OnUpdateForDefaultStatusbar(wxUpdateUIEvent& event); void OnUpdateStatusBarToggle(wxUpdateUIEvent& event); - void OnUpdateSetStyleNormal(wxUpdateUIEvent& event); - void OnUpdateSetStyleFlat(wxUpdateUIEvent& event); - void OnUpdateSetStyleRaised(wxUpdateUIEvent& event); + void OnUpdateSetPaneStyle(wxUpdateUIEvent& event); + void OnUpdateSetStyle(wxUpdateUIEvent& event); void OnStatusBarToggle(wxCommandEvent& event); - void DoCreateStatusBar(StatBarKind kind); - void ApplyStyle(); + void DoCreateStatusBar(StatusBarKind kind, long style); + void ApplyPaneStyle(); - wxStatusBar *m_statbarDefault; - MyStatusBar *m_statbarCustom; - - int m_statbarStyle; + int m_statbarPaneStyle; // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() @@ -196,16 +205,27 @@ public: enum { // menu items - StatusBar_Quit = 1, - StatusBar_SetFields, + StatusBar_Quit = wxID_EXIT, + StatusBar_About = wxID_ABOUT, + + StatusBar_SetFields = wxID_HIGHEST+1, + StatusBar_SetTexts, + StatusBar_SetFont, + StatusBar_ResetFieldsWidth, + StatusBar_Recreate, - StatusBar_About, StatusBar_Toggle, - StatusBar_Checkbox = 1000, - StatusBar_SetStyle, - StatusBar_SetStyleNormal, - StatusBar_SetStyleFlat, - StatusBar_SetStyleRaised + StatusBar_Checkbox, + StatusBar_SetPaneStyle, + StatusBar_SetPaneStyleNormal, + StatusBar_SetPaneStyleFlat, + StatusBar_SetPaneStyleRaised, + + StatusBar_SetStyleSizeGrip, + StatusBar_SetStyleEllipsizeStart, + StatusBar_SetStyleEllipsizeMiddle, + StatusBar_SetStyleEllipsizeEnd, + StatusBar_SetStyleShowTips }; static const int BITMAP_SIZE_X = 32; @@ -225,17 +245,29 @@ 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_SetFont, MyFrame::OnSetStatusFont) + 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_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) + EVT_MENU(StatusBar_SetStyleEllipsizeEnd, MyFrame::OnSetStyle) + EVT_MENU(StatusBar_SetStyleShowTips, MyFrame::OnSetStyle) + + EVT_UPDATE_UI_RANGE(StatusBar_SetFields, StatusBar_ResetFieldsWidth, + MyFrame::OnUpdateForDefaultStatusbar) 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) + EVT_UPDATE_UI_RANGE(StatusBar_SetPaneStyleNormal, StatusBar_SetPaneStyleRaised, + MyFrame::OnUpdateSetPaneStyle) + EVT_UPDATE_UI_RANGE(StatusBar_SetStyleSizeGrip, StatusBar_SetStyleShowTips, + MyFrame::OnUpdateSetStyle) END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyStatusBar, wxStatusBar) @@ -272,7 +304,7 @@ bool MyApp::OnInit() // 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) @@ -291,15 +323,14 @@ 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; - m_statbarCustom = NULL; + SetIcon(wxICON(sample)); - m_statbarStyle = wxSB_NORMAL; + m_statbarPaneStyle = wxSB_NORMAL; #ifdef __WXMAC__ // we need this in order to allow the about menu relocation, since ABOUT is @@ -312,19 +343,39 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) menuFile->Append(StatusBar_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); wxMenu *statbarMenu = new wxMenu; + + wxMenu *statbarStyleMenu = new wxMenu; + statbarStyleMenu->Append(StatusBar_SetStyleSizeGrip, _T("wxSTB_SIZE_GRIP"), _T("Toggles the wxSTB_SIZE_GRIP style"), true); + statbarStyleMenu->Append(StatusBar_SetStyleShowTips, _T("wxSTB_SHOW_TIPS"), _T("Toggles the wxSTB_SHOW_TIPS style"), true); + statbarStyleMenu->AppendSeparator(); + statbarStyleMenu->Append(StatusBar_SetStyleEllipsizeStart, _T("wxSTB_ELLIPSIZE_START"), _T("Toggles the wxSTB_ELLIPSIZE_START style"), true); + statbarStyleMenu->Append(StatusBar_SetStyleEllipsizeMiddle, _T("wxSTB_ELLIPSIZE_MIDDLE"), _T("Toggles the wxSTB_ELLIPSIZE_MIDDLE style"), true); + statbarStyleMenu->Append(StatusBar_SetStyleEllipsizeEnd, _T("wxSTB_ELLIPSIZE_END"), _T("Toggles the wxSTB_ELLIPSIZE_END style"), true); + statbarMenu->Append(StatusBar_SetPaneStyle, _T("Status bar style"), statbarStyleMenu); + statbarMenu->AppendSeparator(); + statbarMenu->Append(StatusBar_SetFields, _T("&Set field count\tCtrl-C"), _T("Set the number of status bar fields")); + statbarMenu->Append(StatusBar_SetTexts, _T("&Set field text\tCtrl-T"), + _T("Set the text to display for each status bar field")); + statbarMenu->Append(StatusBar_SetFont, _T("&Set field font\tCtrl-F"), + _T("Set the font to use for rendering status bar fields")); + + wxMenu *statbarPaneStyleMenu = new wxMenu; + statbarPaneStyleMenu->Append(StatusBar_SetPaneStyleNormal, _T("&Normal"), _T("Sets the style of the first field to normal (sunken) look"), true); + statbarPaneStyleMenu->Append(StatusBar_SetPaneStyleFlat, _T("&Flat"), _T("Sets the style of the first field to flat look"), true); + statbarPaneStyleMenu->Append(StatusBar_SetPaneStyleRaised, _T("&Raised"), _T("Sets the style of the first field to raised look"), true); + statbarMenu->Append(StatusBar_SetPaneStyle, _T("Field style"), statbarPaneStyleMenu); + + 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 *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")); @@ -338,76 +389,107 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) SetMenuBar(menuBar); // create default status bar to start with - CreateStatusBar(2); - m_statbarKind = StatBar_Default; + DoCreateStatusBar(StatBar_Default, wxSTB_DEFAULT_STYLE); SetStatusText(_T("Welcome to wxWidgets!")); - - m_statbarDefault = GetStatusBar(); } MyFrame::~MyFrame() { - SetStatusBar(NULL); - - delete m_statbarDefault; - delete m_statbarCustom; } -void MyFrame::DoCreateStatusBar(MyFrame::StatBarKind kind) +void MyFrame::DoCreateStatusBar(MyFrame::StatusBarKind kind, long style) { wxStatusBar *statbarOld = GetStatusBar(); if ( statbarOld ) { - statbarOld->Hide(); + SetStatusBar(NULL); + delete statbarOld; } + wxStatusBar *statbarNew = NULL; switch ( kind ) { case StatBar_Default: - SetStatusBar(m_statbarDefault); + statbarNew = new wxStatusBar(this, wxID_ANY, style, "wxStatusBar"); + statbarNew->SetFieldsCount(2); break; - + case StatBar_Custom: - if ( !m_statbarCustom ) - { - m_statbarCustom = new MyStatusBar(this); - } - SetStatusBar(m_statbarCustom); + statbarNew = new MyStatusBar(this, style); break; default: - wxFAIL_MSG(wxT("unknown stat bar kind")); + wxFAIL_MSG(wxT("unknown status bar kind")); } - ApplyStyle(); - GetStatusBar()->Show(); + SetStatusBar(statbarNew); + ApplyPaneStyle(); PositionStatusBar(); m_statbarKind = kind; } -void MyFrame::OnUpdateSetStatusFields(wxUpdateUIEvent& event) + +// ---------------------------------------------------------------------------- +// main frame - event handlers +// ---------------------------------------------------------------------------- + +void MyFrame::OnUpdateForDefaultStatusbar(wxUpdateUIEvent& event) +{ + // only allow this feature for the default status bar + wxStatusBar *sb = GetStatusBar(); + if (!sb) + return; + + event.Enable(sb->GetName() == "wxStatusBar"); +} + +void MyFrame::OnSetStatusTexts(wxCommandEvent& WXUNUSED(event)) { - // only allow the settings of the number of status fields for the default - // status bar wxStatusBar *sb = GetStatusBar(); - event.Enable(sb == m_statbarDefault); + 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); + + sb->SetStatusText(txt, i); + } +} + +void MyFrame::OnSetStatusFont(wxCommandEvent& WXUNUSED(event)) +{ + wxStatusBar *sb = GetStatusBar(); + if (!sb) + return; + + wxFont fnt = wxGetFontFromUser(this, sb->GetFont(), "Choose statusbar font"); + if (fnt.IsOk()) + { + sb->SetFont(fnt); + sb->SetSize(sb->GetBestSize()); + } } -// event handlers void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event)) { wxStatusBar *sb = GetStatusBar(); + if (!sb) + return; 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 @@ -453,6 +535,18 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event)) } } +void MyFrame::OnResetFieldsWidth(wxCommandEvent& WXUNUSED(event)) +{ + wxStatusBar *pStat = GetStatusBar(); + if (!pStat) + return; + + int n = pStat->GetFieldsCount(); + pStat->SetStatusWidths(n, NULL); + for (int i=0; iSetStatusText("same size", i); +} + void MyFrame::OnUpdateStatusBarToggle(wxUpdateUIEvent& event) { event.Check(GetStatusBar() != NULL); @@ -463,19 +557,20 @@ void MyFrame::OnStatusBarToggle(wxCommandEvent& WXUNUSED(event)) wxStatusBar *statbarOld = GetStatusBar(); if ( statbarOld ) { - statbarOld->Hide(); SetStatusBar(NULL); + delete statbarOld; } else { - DoCreateStatusBar(m_statbarKind); + DoCreateStatusBar(m_statbarKind, wxSTB_DEFAULT_STYLE); } } void MyFrame::OnRecreateStatusBar(wxCommandEvent& WXUNUSED(event)) { DoCreateStatusBar(m_statbarKind == StatBar_Custom ? StatBar_Default - : StatBar_Custom); + : StatBar_Custom, + wxSTB_DEFAULT_STYLE); } void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) @@ -490,67 +585,140 @@ 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)) +void MyFrame::OnUpdateSetPaneStyle(wxUpdateUIEvent& event) { - m_statbarStyle = wxSB_NORMAL; - ApplyStyle(); -} - -void MyFrame::OnSetStyleFlat(wxCommandEvent & WXUNUSED(event)) -{ - m_statbarStyle = wxSB_FLAT; - ApplyStyle(); + switch (event.GetId()) + { + case StatusBar_SetPaneStyleNormal: + event.Check(m_statbarPaneStyle == wxSB_NORMAL); + break; + case StatusBar_SetPaneStyleFlat: + event.Check(m_statbarPaneStyle == wxSB_FLAT); + break; + case StatusBar_SetPaneStyleRaised: + event.Check(m_statbarPaneStyle == wxSB_RAISED); + break; + } } -void MyFrame::OnSetStyleRaised(wxCommandEvent & WXUNUSED(event)) +void MyFrame::OnSetPaneStyle(wxCommandEvent& event) { - m_statbarStyle = wxSB_RAISED; - ApplyStyle(); + switch (event.GetId()) + { + case StatusBar_SetPaneStyleNormal: + m_statbarPaneStyle = wxSB_NORMAL; + break; + case StatusBar_SetPaneStyleFlat: + m_statbarPaneStyle = wxSB_FLAT; + break; + case StatusBar_SetPaneStyleRaised: + m_statbarPaneStyle = wxSB_RAISED; + break; + } + + ApplyPaneStyle(); } -void MyFrame::ApplyStyle() +void MyFrame::ApplyPaneStyle() { wxStatusBar *sb = GetStatusBar(); + if (!sb) + return; + int fields = sb->GetFieldsCount(); int *styles = new int[fields]; for (int i = 1; i < fields; i++) styles[i] = wxSB_NORMAL; - styles[0] = m_statbarStyle; + styles[0] = m_statbarPaneStyle; sb->SetStatusStyles(fields, styles); delete [] styles; } +void MyFrame::OnUpdateSetStyle(wxUpdateUIEvent& event) +{ + long currentStyle = wxSTB_DEFAULT_STYLE; + if (GetStatusBar()) + currentStyle = GetStatusBar()->GetWindowStyle(); + + switch (event.GetId()) + { + case StatusBar_SetStyleSizeGrip: + event.Check((currentStyle & wxSTB_SIZEGRIP) != 0); + break; + case StatusBar_SetStyleShowTips: + event.Check((currentStyle & wxSTB_SHOW_TIPS) != 0); + break; + + case StatusBar_SetStyleEllipsizeStart: + event.Check((currentStyle & wxSTB_ELLIPSIZE_START) != 0); + break; + case StatusBar_SetStyleEllipsizeMiddle: + event.Check((currentStyle & wxSTB_ELLIPSIZE_MIDDLE) != 0); + break; + case StatusBar_SetStyleEllipsizeEnd: + event.Check((currentStyle & wxSTB_ELLIPSIZE_END) != 0); + break; + } +} + +void MyFrame::OnSetStyle(wxCommandEvent& event) +{ + long oldStyle = wxSTB_DEFAULT_STYLE; + if (GetStatusBar()) + oldStyle = GetStatusBar()->GetWindowStyle(); + +#define STB_ELLIPSIZE_MASK (wxSTB_ELLIPSIZE_START|wxSTB_ELLIPSIZE_MIDDLE|wxSTB_ELLIPSIZE_END) + + long newStyle = oldStyle; + long newStyleBit = 0; + switch (event.GetId()) + { + case StatusBar_SetStyleSizeGrip: + newStyleBit = wxSTB_SIZEGRIP; + break; + case StatusBar_SetStyleShowTips: + newStyleBit = wxSTB_SHOW_TIPS; + break; + + case StatusBar_SetStyleEllipsizeStart: + newStyleBit = wxSTB_ELLIPSIZE_START; + newStyle &= ~STB_ELLIPSIZE_MASK; + break; + case StatusBar_SetStyleEllipsizeMiddle: + newStyleBit = wxSTB_ELLIPSIZE_MIDDLE; + newStyle &= ~STB_ELLIPSIZE_MASK; + break; + case StatusBar_SetStyleEllipsizeEnd: + newStyleBit = wxSTB_ELLIPSIZE_END; + newStyle &= ~STB_ELLIPSIZE_MASK; + break; + } + + newStyle = event.IsChecked() ? (newStyle | newStyleBit) : + (newStyle & ~newStyleBit); + if (newStyle != oldStyle) + { + DoCreateStatusBar(m_statbarKind, newStyle); + SetStatusText("Status bar recreated with a new style"); + } +} + // ---------------------------------------------------------------------------- // MyAboutDialog // ---------------------------------------------------------------------------- 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")); @@ -576,10 +744,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); } // ---------------------------------------------------------------------------- @@ -591,13 +756,13 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent) #pragma warning(disable: 4355) #endif -MyStatusBar::MyStatusBar(wxWindow *parent) - : wxStatusBar(parent, wxID_ANY) +MyStatusBar::MyStatusBar(wxWindow *parent, long style) + : wxStatusBar(parent, wxID_ANY, style, "MyStatusBar") #if wxUSE_TIMER - , m_timer(this) + , m_timer(this) #endif #if wxUSE_CHECKBOX - , m_checkbox(NULL) + , m_checkbox(NULL) #endif { static const int widths[Field_Max] = { -1, 150, BITMAP_SIZE_X, 100 }; @@ -614,15 +779,16 @@ MyStatusBar::MyStatusBar(wxWindow *parent) 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(); } @@ -641,16 +807,16 @@ MyStatusBar::~MyStatusBar() #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); @@ -665,8 +831,17 @@ void MyStatusBar::OnSize(wxSizeEvent& event) return; #endif + // TEMPORARY HACK: TODO find a more general solution +#ifdef wxStatusBarGeneric + wxStatusBar::OnSize(event); +#endif + wxRect rect; - GetFieldRect(Field_Checkbox, rect); + if (!GetFieldRect(Field_Checkbox, rect)) + { + event.Skip(); + return; + } #if wxUSE_CHECKBOX m_checkbox->SetSize(rect.x + 2, rect.y + 2, rect.width - 4, rect.height - 4);