diff --git a/samples/docvwmdi/docview.cpp b/samples/docvwmdi/docview.cpp index 9889a2f146..9be2d6edab 100644 --- a/samples/docvwmdi/docview.cpp +++ b/samples/docvwmdi/docview.cpp @@ -78,17 +78,17 @@ bool MyApp::OnInit(void) wxMenu *file_menu = new wxMenu; wxMenu *edit_menu = (wxMenu *) NULL; - file_menu->Append(wxID_NEW, "&New..."); - file_menu->Append(wxID_OPEN, "&Open..."); + file_menu->Append(wxID_NEW, "&New...\tCtrl-N"); + file_menu->Append(wxID_OPEN, "&Open...\tCtrl-X"); file_menu->AppendSeparator(); - file_menu->Append(wxID_EXIT, "E&xit"); + file_menu->Append(wxID_EXIT, "E&xit\tAlt-X"); // A nice touch: a history of files visited. Use this menu. m_docManager->FileHistoryUseMenu(file_menu); wxMenu *help_menu = new wxMenu; - help_menu->Append(DOCVIEW_ABOUT, "&About"); + help_menu->Append(DOCVIEW_ABOUT, "&About\tF1"); wxMenuBar *menu_bar = new wxMenuBar; diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp index 34e515c034..1b1cf2f01e 100644 --- a/samples/mdi/mdi.cpp +++ b/samples/mdi/mdi.cpp @@ -123,11 +123,11 @@ bool MyApp::OnInit() // Make a menubar wxMenu *file_menu = new wxMenu; - file_menu->Append(MDI_NEW_WINDOW, "&New window", "Create a new child window"); - file_menu->Append(MDI_QUIT, "&Exit", "Quit the program"); + file_menu->Append(MDI_NEW_WINDOW, "&New window\tCtrl-N", "Create a new child window"); + file_menu->Append(MDI_QUIT, "&Exit\tAlt-X", "Quit the program"); wxMenu *help_menu = new wxMenu; - help_menu->Append(MDI_ABOUT, "&About"); + help_menu->Append(MDI_ABOUT, "&About\tF1"); wxMenuBar *menu_bar = new wxMenuBar; diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp index 7ffa097f23..3d0bea58c1 100644 --- a/samples/notebook/notebook.cpp +++ b/samples/notebook/notebook.cpp @@ -67,7 +67,6 @@ void MyApp::InitTabView(wxNotebook* notebook, wxPanel* window) m_okButton->SetDefault(); wxLayoutConstraints *c; - c = new wxLayoutConstraints; c->right.SameAs(window, wxRight, 4); c->bottom.SameAs(window, wxBottom, 4); diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp index 158b31403b..ff2ab4a2c8 100644 --- a/samples/statbar/statbar.cpp +++ b/samples/statbar/statbar.cpp @@ -46,16 +46,25 @@ #include "wx/textdlg.h" #include "wx/sizer.h" #include "wx/stattext.h" + #include "wx/bmpbuttn.h" #endif #include "wx/datetime.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 + // ---------------------------------------------------------------------------- // resources // ---------------------------------------------------------------------------- -#include "green.xpm" -#include "red.xpm" +#ifdef USE_STATIC_BITMAP + #include "green.xpm" + #include "red.xpm" +#endif // USE_STATIC_BITMAP // ---------------------------------------------------------------------------- // private classes @@ -87,8 +96,14 @@ public: void OnTimer(wxTimerEvent& event) { UpdateClock(); } void OnSize(wxSizeEvent& event); void OnToggleClock(wxCommandEvent& event); + void OnButton(wxCommandEvent& event); private: + // toggle the state of the status bar controls + void DoToggle(); + + wxBitmap CreateBitmapForButton(bool on = FALSE); + enum { Field_Text, @@ -101,7 +116,11 @@ private: wxTimer m_timer; wxCheckBox *m_checkbox; +#ifdef USE_STATIC_BITMAP wxStaticBitmap *m_statbmp; +#else + wxBitmapButton *m_statbmp; +#endif DECLARE_EVENT_TABLE() }; @@ -180,6 +199,7 @@ END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyStatusBar, wxStatusBar) EVT_SIZE(MyStatusBar::OnSize) EVT_CHECKBOX(StatusBar_Checkbox, MyStatusBar::OnToggleClock) + EVT_BUTTON(-1, MyStatusBar::OnButton) EVT_TIMER(-1, MyStatusBar::OnTimer) END_EVENT_TABLE() @@ -412,7 +432,7 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent) #endif MyStatusBar::MyStatusBar(wxWindow *parent) - : wxStatusBar(parent, -1), m_timer(this) + : wxStatusBar(parent, -1), m_timer(this), m_checkbox(NULL) { static const int widths[Field_Max] = { -1, 150, BITMAP_SIZE_X, 100 }; @@ -422,7 +442,11 @@ MyStatusBar::MyStatusBar(wxWindow *parent) m_checkbox = new wxCheckBox(this, StatusBar_Checkbox, _T("&Toggle clock")); m_checkbox->SetValue(TRUE); +#ifdef USE_STATIC_BITMAP m_statbmp = new wxStaticBitmap(this, -1, wxIcon(green_xpm)); +#else + m_statbmp = new wxBitmapButton(this, -1, CreateBitmapForButton()); +#endif m_timer.Start(1000); @@ -443,27 +467,70 @@ MyStatusBar::~MyStatusBar() } } +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); + wxMemoryDC dc; + dc.SelectObject(bitmap); + dc.SetBrush(on ? *wxGREEN_BRUSH : *wxRED_BRUSH); + dc.SetBackground(*wxLIGHT_GREY_BRUSH); + 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 ( !m_checkbox ) + return; + wxRect rect; GetFieldRect(Field_Checkbox, rect); m_checkbox->SetSize(rect.x + 2, rect.y + 2, rect.width - 4, rect.height - 4); GetFieldRect(Field_Bitmap, rect); - m_statbmp->Move(rect.x + (rect.width - BITMAP_SIZE_X) / 2, - rect.y + (rect.height - BITMAP_SIZE_Y) / 2); +#ifdef USE_BUTTON_FOR_BITMAP + wxSize size(BITMAP_SIZE_X, BITMAP_SIZE_Y); +#else + wxSize size = m_statbmp->GetSize(); +#endif + + m_statbmp->Move(rect.x + (rect.width - size.x) / 2, + rect.y + (rect.height - size.y) / 2); event.Skip(); } -void MyStatusBar::OnToggleClock(wxCommandEvent& event) +void MyStatusBar::OnButton(wxCommandEvent& WXUNUSED(event)) +{ + m_checkbox->SetValue(!m_checkbox->GetValue()); + + DoToggle(); +} + +void MyStatusBar::OnToggleClock(wxCommandEvent& WXUNUSED(event)) +{ + DoToggle(); +} + +void MyStatusBar::DoToggle() { if ( m_checkbox->GetValue() ) { m_timer.Start(1000); +#ifdef USE_STATIC_BITMAP m_statbmp->SetIcon(wxIcon(green_xpm)); +#else + m_statbmp->SetBitmapLabel(CreateBitmapForButton(FALSE)); + m_statbmp->Refresh(); +#endif UpdateClock(); } @@ -471,7 +538,12 @@ void MyStatusBar::OnToggleClock(wxCommandEvent& event) { m_timer.Stop(); +#ifdef USE_STATIC_BITMAP m_statbmp->SetIcon(wxIcon(red_xpm)); +#else + m_statbmp->SetBitmapLabel(CreateBitmapForButton(TRUE)); + m_statbmp->Refresh(); +#endif SetStatusText("", Field_Clock); }