fixes to refreshing code in wxTreeCtrl

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

diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp
index 52e4f5d0373b73571c2187291d14d428e3515d52..436c6dd44ec69bba7a3e1232b0662af0406e2f60 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"
 


@@ -45,16 +40,32 @@
     #include "wx/msgdlg.h"
     #include "wx/textdlg.h"
     #include "wx/sizer.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"
 
 #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_MDI_PARENT_FRAME 1
+
+#ifdef USE_MDI_PARENT_FRAME
+    #include "wx/mdi.h"
+#endif // USE_MDI_PARENT_FRAME
+    #define USE_STATIC_BITMAP
+#endif
+

 // ----------------------------------------------------------------------------
 // resources
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // 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


@@ -86,8 +97,14 @@ public:
     void OnTimer(wxTimerEvent& event) { UpdateClock(); }
     void OnSize(wxSizeEvent& event);
     void OnToggleClock(wxCommandEvent& event);
     void OnTimer(wxTimerEvent& event) { UpdateClock(); }
     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,


@@ -100,7 +117,11 @@ private:
     wxTimer m_timer;
 
     wxCheckBox *m_checkbox;
     wxTimer m_timer;
 
     wxCheckBox *m_checkbox;

+#ifdef USE_STATIC_BITMAP

     wxStaticBitmap *m_statbmp;
     wxStaticBitmap *m_statbmp;

+#else
+    wxBitmapButton *m_statbmp;
+#endif

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -111,7 +132,11 @@ class MyFrame : public wxFrame
 public:
     // ctor(s)
     MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
 public:
     // ctor(s)
     MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);

+#ifdef USE_MDI_PARENT_FRAME
+class MyFrame : public wxMDIParentFrame
+#else

     virtual ~MyFrame();
     virtual ~MyFrame();

+#endif

 
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
 
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);


@@ -127,7 +152,9 @@ private:
         StatBar_Custom,
         StatBar_Max
     } m_statbarKind;
         StatBar_Custom,
         StatBar_Max
     } m_statbarKind;

-
+    void OnUpdateSetStatusFields(wxUpdateUIEvent& event);
+    void OnUpdateStatusBarToggle(wxUpdateUIEvent& event);
+    void OnStatusBarToggle(wxCommandEvent& event);

     void DoCreateStatusBar(StatBarKind kind);
 
     wxStatusBar *m_statbarDefault;
     void DoCreateStatusBar(StatBarKind kind);
 
     wxStatusBar *m_statbarDefault;


@@ -156,6 +183,7 @@ enum
     StatusBar_SetFields,
     StatusBar_Recreate,
     StatusBar_About,
     StatusBar_SetFields,
     StatusBar_Recreate,
     StatusBar_About,

+    StatusBar_Toggle,

     StatusBar_Checkbox = 1000
 };
 
     StatusBar_Checkbox = 1000
 };
 


@@ -169,16 +197,24 @@ static const int BITMAP_SIZE_Y = 15;
 // the event tables connect the wxWindows events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 // the event tables connect the wxWindows events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.

+#ifdef USE_MDI_PARENT_FRAME
+BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame)
+#else

 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

+#endif

     EVT_MENU(StatusBar_Quit,  MyFrame::OnQuit)
     EVT_MENU(StatusBar_SetFields, MyFrame::OnSetStatusFields)
     EVT_MENU(StatusBar_Recreate, MyFrame::OnRecreateStatusBar)
     EVT_MENU(StatusBar_About, MyFrame::OnAbout)
     EVT_MENU(StatusBar_Quit,  MyFrame::OnQuit)
     EVT_MENU(StatusBar_SetFields, MyFrame::OnSetStatusFields)
     EVT_MENU(StatusBar_Recreate, MyFrame::OnRecreateStatusBar)
     EVT_MENU(StatusBar_About, MyFrame::OnAbout)

+    EVT_MENU(StatusBar_Toggle, MyFrame::OnStatusBarToggle)
+    EVT_UPDATE_UI(StatusBar_Toggle, MyFrame::OnUpdateStatusBarToggle)
+    EVT_UPDATE_UI(StatusBar_SetFields, MyFrame::OnUpdateSetStatusFields)

 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyStatusBar, wxStatusBar)
     EVT_SIZE(MyStatusBar::OnSize)
     EVT_CHECKBOX(StatusBar_Checkbox, MyStatusBar::OnToggleClock)
 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()
 
     EVT_TIMER(-1, MyStatusBar::OnTimer)
 END_EVENT_TABLE()
 


@@ -220,7 +256,11 @@ bool MyApp::OnInit()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)

-       : wxFrame((wxFrame *)NULL, -1, title, pos, size)
+#ifdef USE_MDI_PARENT_FRAME
+       : wxMDIParentFrame((wxWindow *)NULL, -1, title, pos, size)
+#else
+       : wxFrame((wxWindow *)NULL, -1, title, pos, size)
+#endif

 {
     m_statbarDefault = NULL;
     m_statbarCustom = NULL;
 {
     m_statbarDefault = NULL;
     m_statbarCustom = NULL;


@@ -238,6 +278,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     wxMenu *statbarMenu = new wxMenu;
     statbarMenu->Append(StatusBar_SetFields, "&Set field count\tCtrl-C",
                         "Set the number of status bar fields");
     wxMenu *statbarMenu = new wxMenu;
     statbarMenu->Append(StatusBar_SetFields, "&Set field count\tCtrl-C",
                         "Set the number of status bar fields");

+    statbarMenu->Append(StatusBar_Toggle, "&Toggle Status Bar",
+                        "Toggle the status bar display", true);

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


@@ -255,6 +297,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     // create default status bar to start with
     CreateStatusBar(2);
 
     // create default status bar to start with
     CreateStatusBar(2);

+    m_statbarKind = StatBar_Default;

     SetStatusText("Welcome to wxWindows!");
 
     m_statbarDefault = GetStatusBar();
     SetStatusText("Welcome to wxWindows!");
 
     m_statbarDefault = GetStatusBar();


@@ -291,15 +334,24 @@ 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;
 }
 
 
     m_statbarKind = kind;
 }
 

+void MyFrame::OnUpdateSetStatusFields(wxUpdateUIEvent& event)
+{
+    // only allow the setting of the number of status fields for the default
+    // status bar
+    wxStatusBar *sb = GetStatusBar();
+    event.Enable(sb == m_statbarDefault);
+}
+
+

 // event handlers
 void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event))
 {
 // event handlers
 void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event))
 {


@@ -307,9 +359,9 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event))
 
     long nFields = wxGetNumberFromUser
                    (
 
     long nFields = wxGetNumberFromUser
                    (

-                    "Select the number of fields in the status bar",
-                    "Fields:",
-                    "wxWindows statusbar sample",
+                    _T("Select the number of fields in the status bar"),
+                    _T("Fields:"),
+                    _T("wxWindows statusbar sample"),

                     sb->GetFieldsCount(),
                     1, 5,
                     this
                     sb->GetFieldsCount(),
                     1, 5,
                     this


@@ -319,24 +371,68 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event))
     // SetFieldsCount() with the same number of fields should be ok
     if ( nFields != -1 )
     {
     // SetFieldsCount() with the same number of fields should be ok
     if ( nFields != -1 )
     {

-        // we set the widths only for 2 of them, otherwise let all the fields
-        // have equal width (the default behaviour)
-        const int *widths = NULL;
-        if ( nFields == 2 )
+        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++ )

         {
         {

-            static const int widthsFor2Fields[2] = { 200, -1 };
-            widths = widthsFor2Fields;
+            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"));
+    }
+}

 
 

-        sb->SetFieldsCount(nFields, widths);
+void MyFrame::OnUpdateStatusBarToggle(wxUpdateUIEvent& event)
+{
+       event.Check(GetStatusBar() != 0);
+}

 
 

-        wxLogStatus(this,
-                    wxString::Format("Status bar now has %ld fields", nFields));
+void MyFrame::OnStatusBarToggle(wxCommandEvent& WXUNUSED(event))
+{
+    wxStatusBar *statbarOld = GetStatusBar();
+    if ( statbarOld )
+    {
+        statbarOld->Hide();
+        SetStatusBar(0);

     }
     else
     {
     }
     else
     {

-        wxLogStatus(this, "Cancelled");
+        DoCreateStatusBar(m_statbarKind);

     }
     }

+#ifdef __WXMSW__
+    // The following is a kludge suggested by Vadim Zeitlin (one of the wxWindows
+    // authors) while we look for a proper fix..
+//    SendSizeEvent();
+#endif

 }
 
 void MyFrame::OnRecreateStatusBar(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnRecreateStatusBar(wxCommandEvent& WXUNUSED(event))


@@ -370,6 +466,8 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent)
                                           "wxStatusBar sample\n"
                                           "(c) 2000 Vadim Zeitlin");
 
                                           "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);
     // create the top status bar without the size grip (default style),
     // otherwise it looks weird
     wxStatusBar *statbarTop = new wxStatusBar(this, -1, 0);


@@ -386,7 +484,9 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent)
     wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     sizerTop->Add(statbarTop, 0, wxGROW);
     sizerTop->Add(-1, 10, 1, wxGROW);
     wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     sizerTop->Add(statbarTop, 0, wxGROW);
     sizerTop->Add(-1, 10, 1, wxGROW);

-    sizerTop->Add(text, 0, wxCENTRE);
+    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);
 
     sizerTop->Add(-1, 10, 1, wxGROW);
     sizerTop->Add(statbarBottom, 0, wxGROW);
 


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


@@ -417,7 +517,13 @@ 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);
 

+#ifdef USE_STATIC_BITMAP

     m_statbmp = new wxStaticBitmap(this, -1, wxIcon(green_xpm));
     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);
 


@@ -438,27 +544,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);
 

+#ifdef USE_STATIC_BITMAP

         m_statbmp->SetIcon(wxIcon(green_xpm));
         m_statbmp->SetIcon(wxIcon(green_xpm));

+#else
+        m_statbmp->SetBitmapLabel(CreateBitmapForButton(FALSE));
+        m_statbmp->Refresh();
+#endif

 
         UpdateClock();
     }
 
         UpdateClock();
     }


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

+#ifdef USE_STATIC_BITMAP

         m_statbmp->SetIcon(wxIcon(red_xpm));
         m_statbmp->SetIcon(wxIcon(red_xpm));

+#else
+        m_statbmp->SetBitmapLabel(CreateBitmapForButton(TRUE));
+        m_statbmp->Refresh();
+#endif

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