do only what is necessary in SetScrollbars(), let the base class do the rest

[wxWidgets.git] / samples / statbar / statbar.cpp

diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp
index 86d8f23d24c7e0bf0d1317e138e86434378e39ce..ff9113fb1983b557b6eb84739b39169b4bdb2786 100644 (file)
--- a/samples/statbar/statbar.cpp
+++ b/samples/statbar/statbar.cpp
@@ -49,6 +49,10 @@
 #include "wx/datetime.h"
 #include "wx/numdlg.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
@@ -155,6 +159,7 @@ class MyFrame : public wxMDIParentFrame
 
     void OnResetFieldsWidth(wxCommandEvent& event);
     void OnSetStatusFields(wxCommandEvent& event);
+    void OnSetStatusTexts(wxCommandEvent& event);
     void OnRecreateStatusBar(wxCommandEvent& event);
     void OnSetStyleNormal(wxCommandEvent& event);
     void OnSetStyleFlat(wxCommandEvent& event);
@@ -168,6 +173,8 @@ private:
         StatBar_Max
     } m_statbarKind;
 
+
+    void OnUpdateSetStatusTexts(wxUpdateUIEvent& event);
     void OnUpdateResetFieldsWidth(wxUpdateUIEvent& event);
     void OnUpdateSetStatusFields(wxUpdateUIEvent& event);
     void OnUpdateStatusBarToggle(wxUpdateUIEvent& event);
@@ -204,6 +211,7 @@ enum
     // menu items
     StatusBar_Quit = 1,
     StatusBar_SetFields,
+    StatusBar_SetTexts,
     StatusBar_ResetFieldsWidth,
     StatusBar_Recreate,
     StatusBar_About,
@@ -232,6 +240,7 @@ 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_ResetFieldsWidth, MyFrame::OnResetFieldsWidth)
     EVT_MENU(StatusBar_Recreate, MyFrame::OnRecreateStatusBar)
     EVT_MENU(StatusBar_About, MyFrame::OnAbout)
@@ -242,6 +251,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
     EVT_UPDATE_UI(StatusBar_ResetFieldsWidth, MyFrame::OnUpdateResetFieldsWidth)
     EVT_UPDATE_UI(StatusBar_Toggle, MyFrame::OnUpdateStatusBarToggle)
+    EVT_UPDATE_UI(StatusBar_SetTexts, MyFrame::OnUpdateSetStatusTexts)
     EVT_UPDATE_UI(StatusBar_SetFields, MyFrame::OnUpdateSetStatusFields)
     EVT_UPDATE_UI(StatusBar_SetStyleNormal, MyFrame::OnUpdateSetStyleNormal)
     EVT_UPDATE_UI(StatusBar_SetStyleFlat, MyFrame::OnUpdateSetStyleFlat)
@@ -306,6 +316,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     : wxFrame((wxWindow *)NULL, wxID_ANY, title, pos, size)
 #endif
 {
+    SetIcon(wxICON(sample));
+
     m_statbarDefault = NULL;
     m_statbarCustom = NULL;
 
@@ -324,11 +336,14 @@ 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_SetTexts, _T("&Set field text\tCtrl-T"),
+                        _T("Set the text to display for each status bar field"));
 
     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);
 
     statbarMenu->Append(StatusBar_ResetFieldsWidth, _T("Reset field widths"),
@@ -401,6 +416,34 @@ void MyFrame::DoCreateStatusBar(MyFrame::StatBarKind kind)
     m_statbarKind = kind;
 }
 
+
+// ----------------------------------------------------------------------------
+// main frame - event handlers
+// ----------------------------------------------------------------------------
+
+void MyFrame::OnUpdateSetStatusTexts(wxUpdateUIEvent& event)
+{
+    // only allow the settings of the text of status fields for the default
+    // status bar
+    wxStatusBar *sb = GetStatusBar();
+    event.Enable(sb == m_statbarDefault);
+}
+
+void MyFrame::OnSetStatusTexts(wxCommandEvent& WXUNUSED(event))
+{
+    wxStatusBar *sb = GetStatusBar();
+
+    wxString txt;
+    for (int i=0; i<sb->GetFieldsCount(); 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::OnUpdateSetStatusFields(wxUpdateUIEvent& event)
 {
     // only allow the settings of the number of status fields for the default
@@ -409,7 +452,6 @@ void MyFrame::OnUpdateSetStatusFields(wxUpdateUIEvent& event)
     event.Enable(sb == m_statbarDefault);
 }
 
-// event handlers
 void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event))
 {
     wxStatusBar *sb = GetStatusBar();