X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b8bff20d0c6e2bdcce229b75ee892369e713d52..be71e18af4e329233714e2e0b59049ef6b3c606d:/samples/statbar/statbar.cpp

diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp
index 52e4f5d037..1d9ded23ac 100644
--- a/samples/statbar/statbar.cpp
+++ b/samples/statbar/statbar.cpp
@@ -45,16 +45,27 @@
     #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
 // ----------------------------------------------------------------------------
 
-#include "green.xpm"
-#include "red.xpm"
+#ifdef USE_STATIC_BITMAP
+    #include "green.xpm"
+    #include "red.xpm"
+#endif // USE_STATIC_BITMAP
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -86,8 +97,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,
@@ -100,7 +117,11 @@ private:
     wxTimer m_timer;
 
     wxCheckBox *m_checkbox;
+#ifdef USE_STATIC_BITMAP
     wxStaticBitmap *m_statbmp;
+#else
+    wxBitmapButton *m_statbmp;
+#endif
 
     DECLARE_EVENT_TABLE()
 };
@@ -179,6 +200,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()
 
@@ -294,8 +316,8 @@ void MyFrame::DoCreateStatusBar(MyFrame::StatBarKind kind)
             wxFAIL_MSG("unknown stat bar kind");
     }
 
-    PositionStatusBar();
     GetStatusBar()->Show();
+    PositionStatusBar();
 
     m_statbarKind = kind;
 }
@@ -331,11 +353,12 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event))
         sb->SetFieldsCount(nFields, widths);
 
         wxLogStatus(this,
-                    wxString::Format("Status bar now has %ld fields", nFields));
+                    wxString::Format(wxT("Status bar now has %ld fields"),
+                                     nFields));
     }
     else
     {
-        wxLogStatus(this, "Cancelled");
+        wxLogStatus(this, wxT("Cancelled"));
     }
 }
 
@@ -370,6 +393,8 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent)
                                           "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);
@@ -386,7 +411,9 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent)
     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);
 
@@ -407,7 +434,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 };
 
@@ -417,7 +444,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);
 
@@ -438,27 +469,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();
     }
@@ -466,7 +540,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);
     }