fixed bug with the caret positioning after SetValue() introduced by the last commit

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

diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp
index dc3e41156dcf0fd2e959a38ba283daa8127ba64c..e1aed5d11a0f9d510154adfa5b802115040967cc 100644 (file)
--- a/samples/statbar/statbar.cpp
+++ b/samples/statbar/statbar.cpp
@@ -17,11 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "statbar.cpp"
-    #pragma interface "statbar.cpp"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -33,26 +28,39 @@
     #error "You need to set wxUSE_STATUSBAR to 1 to compile this sample"
 #endif // wxUSE_STATUSBAR
 
     #error "You need to set wxUSE_STATUSBAR to 1 to compile this sample"
 #endif // wxUSE_STATUSBAR
 

-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// for all others, include the necessary headers

 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
     #include "wx/statusbr.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
     #include "wx/statusbr.h"

-    #include "wx/datetime.h"

     #include "wx/timer.h"
     #include "wx/checkbox.h"
     #include "wx/statbmp.h"
     #include "wx/menu.h"
     #include "wx/msgdlg.h"
     #include "wx/timer.h"
     #include "wx/checkbox.h"
     #include "wx/statbmp.h"
     #include "wx/menu.h"
     #include "wx/msgdlg.h"

+    #include "wx/textdlg.h"
+    #include "wx/sizer.h"
+    #include "wx/stattext.h"
+    #include "wx/bmpbuttn.h"
+    #include "wx/dcmemory.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
 // ----------------------------------------------------------------------------
 
 #endif
 
 // ----------------------------------------------------------------------------
 // resources
 // ----------------------------------------------------------------------------
 

-#include "green.xpm"
-#include "red.xpm"
+#ifdef USE_STATIC_BITMAP
+    #include "green.xpm"
+    #include "red.xpm"
+#endif // USE_STATIC_BITMAP

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -81,10 +89,17 @@ public:
     void UpdateClock();
 
     // event handlers
     void UpdateClock();
 
     // event handlers

+    void OnTimer(wxTimerEvent& event) { UpdateClock(); }

     void OnSize(wxSizeEvent& event);
     void OnToggleClock(wxCommandEvent& event);
     void OnSize(wxSizeEvent& event);
     void OnToggleClock(wxCommandEvent& event);

+    void OnButton(wxCommandEvent& event);

 
 private:
 
 private:

+    // toggle the state of the status bar controls
+    void DoToggle();
+
+    wxBitmap CreateBitmapForButton(bool on = FALSE);
+

     enum
     {
         Field_Text,
     enum
     {
         Field_Text,


@@ -94,19 +109,14 @@ private:
         Field_Max
     };
 
         Field_Max
     };
 

-    class MyTimer : public wxTimer
-    {
-    public:
-        MyTimer(MyStatusBar *statbar) {m_statbar = statbar; }
-
-        virtual void Notify() { m_statbar->UpdateClock(); }
-
-    private:
-        MyStatusBar *m_statbar;
-    } m_timer;
+    wxTimer m_timer;

 
     wxCheckBox *m_checkbox;
 
     wxCheckBox *m_checkbox;

+#ifdef USE_STATIC_BITMAP

     wxStaticBitmap *m_statbmp;
     wxStaticBitmap *m_statbmp;

+#else
+    wxBitmapButton *m_statbmp;
+#endif

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -122,6 +132,8 @@ public:
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

+
+    void OnSetStatusFields(wxCommandEvent& event);

     void OnRecreateStatusBar(wxCommandEvent& event);
 
 private:
     void OnRecreateStatusBar(wxCommandEvent& event);
 
 private:


@@ -141,6 +153,13 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+// Our about dialog ith its status bar
+class MyAboutDialog : public wxDialog
+{
+public:
+    MyAboutDialog(wxWindow *parent);
+};
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -150,6 +169,7 @@ enum
 {
     // menu items
     StatusBar_Quit = 1,
 {
     // menu items
     StatusBar_Quit = 1,

+    StatusBar_SetFields,

     StatusBar_Recreate,
     StatusBar_About,
     StatusBar_Checkbox = 1000
     StatusBar_Recreate,
     StatusBar_About,
     StatusBar_Checkbox = 1000


@@ -167,6 +187,7 @@ static const int BITMAP_SIZE_Y = 15;
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(StatusBar_Quit,  MyFrame::OnQuit)
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(StatusBar_Quit,  MyFrame::OnQuit)

+    EVT_MENU(StatusBar_SetFields, MyFrame::OnSetStatusFields)

     EVT_MENU(StatusBar_Recreate, MyFrame::OnRecreateStatusBar)
     EVT_MENU(StatusBar_About, MyFrame::OnAbout)
 END_EVENT_TABLE()
     EVT_MENU(StatusBar_Recreate, MyFrame::OnRecreateStatusBar)
     EVT_MENU(StatusBar_About, MyFrame::OnAbout)
 END_EVENT_TABLE()


@@ -174,6 +195,8 @@ END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(MyStatusBar, wxStatusBar)
     EVT_SIZE(MyStatusBar::OnSize)
     EVT_CHECKBOX(StatusBar_Checkbox, MyStatusBar::OnToggleClock)
 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()
 
 // Create a new application object: this macro will allow wxWindows to create
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWindows to create


@@ -230,6 +253,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuFile->Append(StatusBar_Quit, "E&xit\tAlt-X", "Quit this program");
 
     wxMenu *statbarMenu = new wxMenu;
     menuFile->Append(StatusBar_Quit, "E&xit\tAlt-X", "Quit this program");
 
     wxMenu *statbarMenu = new wxMenu;

+    statbarMenu->Append(StatusBar_SetFields, "&Set field count\tCtrl-C",
+                        "Set the number of status bar fields");

     statbarMenu->Append(StatusBar_Recreate, "&Recreate\tCtrl-R",
                         "Toggle status bar format");
 
     statbarMenu->Append(StatusBar_Recreate, "&Recreate\tCtrl-R",
                         "Toggle status bar format");
 


@@ -283,16 +308,74 @@ void MyFrame::DoCreateStatusBar(MyFrame::StatBarKind kind)
             break;
 
         default:
             break;
 
         default:

-            wxFAIL_MSG("unknown stat bar kind");
+            wxFAIL_MSG(wxT("unknown stat bar kind"));

     }
 
     }
 

-    PositionStatusBar();

     GetStatusBar()->Show();
     GetStatusBar()->Show();

+    PositionStatusBar();

 
     m_statbarKind = kind;
 }
 
 // event handlers
 
     m_statbarKind = kind;
 }
 
 // event handlers

+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("wxWindows 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
+    if ( nFields != -1 )
+    {
+        static const int widthsFor2Fields[] = { 200, -1 };
+        static const int widthsFor3Fields[] = { -1, -2, -1 };
+        static const int widthsFor4Fields[] = { 100, -1, 100, -2, 100 };
+
+        static const int *widthsAll[] =
+        {
+            NULL,               // 1 field: default
+            widthsFor2Fields,   // 2 fields: 1 fixed, 1 var
+            widthsFor3Fields,   // 3 fields: 3 var
+            widthsFor4Fields,   // 4 fields: 3 fixed, 2 vars
+            NULL                // 5 fields: default (all have same width)
+        };
+
+        const int * const widths = widthsAll[nFields - 1];
+        sb->SetFieldsCount(nFields, widths);
+
+        wxString s;
+        for ( long n = 0; n < nFields; n++ )
+        {
+            if ( widths )
+            {
+                if ( widths[n] > 0 )
+                    s.Printf(_T("fixed (%d)"), widths[n]);
+                else
+                    s.Printf(_T("variable (*%d)"), -widths[n]);
+            }
+            else
+            {
+                s = _T("default");
+            }
+
+            SetStatusText(s, n);
+        }
+    }
+    else
+    {
+        wxLogStatus(this, wxT("Cancelled"));
+    }
+}
+

 void MyFrame::OnRecreateStatusBar(wxCommandEvent& WXUNUSED(event))
 {
     DoCreateStatusBar(m_statbarKind == StatBar_Custom ? StatBar_Default
 void MyFrame::OnRecreateStatusBar(wxCommandEvent& WXUNUSED(event))
 {
     DoCreateStatusBar(m_statbarKind == StatBar_Custom ? StatBar_Default


@@ -307,16 +390,65 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageBox("wxStatusBar sample\n(c) 2000 Vadim Zeitlin",
-                 "About statbar", wxOK | wxICON_INFORMATION, this);
+    MyAboutDialog dlg(this);
+    dlg.ShowModal();
+}
+
+// ----------------------------------------------------------------------------
+// MyAboutDialog
+// ----------------------------------------------------------------------------
+
+MyAboutDialog::MyAboutDialog(wxWindow *parent)
+             : wxDialog(parent, -1, wxString("About statbar"),
+                        wxDefaultPosition, wxDefaultSize,
+                        wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+{
+    wxStaticText *text = new wxStaticText(this, -1,
+                                          "wxStatusBar sample\n"
+                                          "(c) 2000 Vadim Zeitlin");
+
+    wxButton *btn = new wxButton(this, wxID_OK, "&Close");
+
+    // create the top status bar without the size grip (default style),
+    // otherwise it looks weird
+    wxStatusBar *statbarTop = new wxStatusBar(this, -1, 0);
+    statbarTop->SetFieldsCount(3);
+    statbarTop->SetStatusText("This is a top status bar", 0);
+    statbarTop->SetStatusText("in a dialog", 1);
+    statbarTop->SetStatusText("Great, isn't it?", 2);
+
+    wxStatusBar *statbarBottom = new wxStatusBar(this, -1);
+    statbarBottom->SetFieldsCount(2);
+    statbarBottom->SetStatusText("This is a bottom status bar", 0);
+    statbarBottom->SetStatusText("in a dialog", 1);
+
+    wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
+    sizerTop->Add(statbarTop, 0, wxGROW);
+    sizerTop->Add(-1, 10, 1, wxGROW);
+    sizerTop->Add(text, 0, wxCENTRE | wxRIGHT | wxLEFT, 20);
+    sizerTop->Add(-1, 10, 1, wxGROW);
+    sizerTop->Add(btn, 0, wxCENTRE | wxRIGHT | wxLEFT, 20);
+    sizerTop->Add(-1, 10, 1, wxGROW);
+    sizerTop->Add(statbarBottom, 0, wxGROW);
+
+    SetAutoLayout(TRUE);
+    SetSizer(sizerTop);
+
+    sizerTop->Fit(this);
+    sizerTop->SetSizeHints(this);

 }
 
 // ----------------------------------------------------------------------------
 // MyStatusBar
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // MyStatusBar
 // ----------------------------------------------------------------------------
 

+#ifdef __VISUALC__
+    // 'this' : used in base member initializer list -- so what??
+    #pragma warning(disable: 4355)
+#endif
+

 MyStatusBar::MyStatusBar(wxWindow *parent)
 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 };
 
 {
     static const int widths[Field_Max] = { -1, 150, BITMAP_SIZE_X, 100 };
 


@@ -326,13 +458,25 @@ MyStatusBar::MyStatusBar(wxWindow *parent)
     m_checkbox = new wxCheckBox(this, StatusBar_Checkbox, _T("&Toggle clock"));
     m_checkbox->SetValue(TRUE);
 
     m_checkbox = new wxCheckBox(this, StatusBar_Checkbox, _T("&Toggle clock"));
     m_checkbox->SetValue(TRUE);
 

-    m_statbmp = new wxStaticBitmap(this, -1, wxICON(green));
+#ifdef USE_STATIC_BITMAP
+    m_statbmp = new wxStaticBitmap(this, -1, wxIcon(green_xpm));
+#else
+    m_statbmp = new wxBitmapButton(this, -1, CreateBitmapForButton(),
+                                   wxDefaultPosition, wxDefaultSize,
+                                   wxBU_EXACTFIT);
+#endif

 
     m_timer.Start(1000);
 
 
     m_timer.Start(1000);
 

+    SetMinHeight(BITMAP_SIZE_Y);
+

     UpdateClock();
 }
 
     UpdateClock();
 }
 

+#ifdef __VISUALC__
+    #pragma warning(default: 4355)
+#endif
+

 MyStatusBar::~MyStatusBar()
 {
     if ( m_timer.IsRunning() )
 MyStatusBar::~MyStatusBar()
 {
     if ( m_timer.IsRunning() )


@@ -341,27 +485,66 @@ 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)
 {
 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);
     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);
+    wxSize size = m_statbmp->GetSize();
+
+    m_statbmp->Move(rect.x + (rect.width - size.x) / 2,
+                    rect.y + (rect.height - size.y) / 2);

 
     event.Skip();
 }
 
 
     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);
 
 {
     if ( m_checkbox->GetValue() )
     {
         m_timer.Start(1000);
 

-        m_statbmp->SetIcon(wxICON(green));
+#ifdef USE_STATIC_BITMAP
+        m_statbmp->SetIcon(wxIcon(green_xpm));
+#else
+        m_statbmp->SetBitmapLabel(CreateBitmapForButton(FALSE));
+        m_statbmp->Refresh();
+#endif

 
         UpdateClock();
     }
 
         UpdateClock();
     }


@@ -369,7 +552,12 @@ void MyStatusBar::OnToggleClock(wxCommandEvent& event)
     {
         m_timer.Stop();
 
     {
         m_timer.Stop();
 

-        m_statbmp->SetIcon(wxICON(red));
+#ifdef USE_STATIC_BITMAP
+        m_statbmp->SetIcon(wxIcon(red_xpm));
+#else
+        m_statbmp->SetBitmapLabel(CreateBitmapForButton(TRUE));
+        m_statbmp->Refresh();
+#endif

 
         SetStatusText("", Field_Clock);
     }
 
         SetStatusText("", Field_Clock);
     }