Fix missing and broken interface items for Phoenix

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

diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp
index be3119d5e84b039f4395497e9f5c2ffb838cf6e1..8afb461b09e52b2d2dd1e58bf0c5162717ce3b14 100644 (file)
--- a/samples/statbar/statbar.cpp
+++ b/samples/statbar/statbar.cpp
@@ -54,15 +54,7 @@
     #include "../sample.xpm"
 #endif
 
-
-// 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
-
 //#define USE_MDI_PARENT_FRAME 1
-
 #ifdef USE_MDI_PARENT_FRAME
     #include "wx/mdi.h"
 #endif // USE_MDI_PARENT_FRAME
@@ -73,10 +65,8 @@ static const char *SAMPLE_DIALOGS_TITLE = "wxWidgets statbar sample";
 // resources
 // ----------------------------------------------------------------------------
 
-#ifdef USE_STATIC_BITMAP
-    #include "green.xpm"
-    #include "red.xpm"
-#endif // USE_STATIC_BITMAP
+#include "green.xpm"
+#include "red.xpm"
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -110,20 +100,20 @@ public:
 #endif
     void OnSize(wxSizeEvent& event);
     void OnToggleClock(wxCommandEvent& event);
-    void OnButton(wxCommandEvent& event);
+    void OnIdle(wxIdleEvent& event);
 
 private:
     // toggle the state of the status bar controls
     void DoToggle();
 
-    wxBitmap CreateBitmapForButton(bool on = false);
-
     enum
     {
         Field_Text,
         Field_Checkbox,
         Field_Bitmap,
+        Field_NumLockIndicator,
         Field_Clock,
+        Field_CapsLockIndicator,
         Field_Max
     };
 
@@ -134,11 +124,7 @@ private:
 #if wxUSE_CHECKBOX
     wxCheckBox *m_checkbox;
 #endif
-#ifdef USE_STATIC_BITMAP
     wxStaticBitmap *m_statbmp;
-#else
-    wxBitmapButton *m_statbmp;
-#endif
 
     DECLARE_EVENT_TABLE()
 };
@@ -292,10 +278,10 @@ BEGIN_EVENT_TABLE(MyStatusBar, wxStatusBar)
 #if wxUSE_CHECKBOX
     EVT_CHECKBOX(StatusBar_Checkbox, MyStatusBar::OnToggleClock)
 #endif
-    EVT_BUTTON(wxID_ANY, MyStatusBar::OnButton)
 #if wxUSE_TIMER
     EVT_TIMER(wxID_ANY, MyStatusBar::OnTimer)
 #endif
+    EVT_IDLE(MyStatusBar::OnIdle)
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWidgets to create
@@ -895,6 +881,9 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent)
     #pragma warning(disable: 4355)
 #endif
 
+static const char *numlockIndicators[] = { "OFF", "NUM" };
+static const char *capslockIndicators[] = { "", "CAPS" };
+
 MyStatusBar::MyStatusBar(wxWindow *parent, long style)
         : wxStatusBar(parent, wxID_ANY, style, "MyStatusBar")
 #if wxUSE_TIMER
@@ -904,7 +893,18 @@ MyStatusBar::MyStatusBar(wxWindow *parent, long style)
             , m_checkbox(NULL)
 #endif
 {
-    static const int widths[Field_Max] = { -1, 150, BITMAP_SIZE_X, 100 };
+    // compute the size needed for num lock indicator pane
+    wxClientDC dc(this);
+    wxSize sizeNumLock = dc.GetTextExtent(numlockIndicators[0]);
+    sizeNumLock.IncTo(dc.GetTextExtent(numlockIndicators[1]));
+
+    int widths[Field_Max];
+    widths[Field_Text] = -1; // growable
+    widths[Field_Checkbox] = 150;
+    widths[Field_Bitmap] = BITMAP_SIZE_X;
+    widths[Field_NumLockIndicator] = sizeNumLock.x;
+    widths[Field_Clock] = 100;
+    widths[Field_CapsLockIndicator] = dc.GetTextExtent(capslockIndicators[1]).x;
 
     SetFieldsCount(Field_Max);
     SetStatusWidths(Field_Max, widths);
@@ -914,13 +914,7 @@ MyStatusBar::MyStatusBar(wxWindow *parent, long style)
     m_checkbox->SetValue(true);
 #endif
 
-#ifdef USE_STATIC_BITMAP
     m_statbmp = new wxStaticBitmap(this, wxID_ANY, wxIcon(green_xpm));
-#else
-    m_statbmp = new wxBitmapButton(this, wxID_ANY, CreateBitmapForButton(),
-                                wxDefaultPosition, wxDefaultSize,
-                                wxBU_EXACTFIT);
-#endif
 
 #if wxUSE_TIMER
     m_timer.Start(1000);
@@ -946,23 +940,6 @@ MyStatusBar::~MyStatusBar()
 #endif
 }
 
-#define BMP_BUTTON_SIZE_X  10
-#define BMP_BUTTON_SIZE_Y  10
-
-wxBitmap MyStatusBar::CreateBitmapForButton(bool on)
-{
-    wxBitmap bitmap(BMP_BUTTON_SIZE_X+1, BMP_BUTTON_SIZE_Y+1);
-    wxMemoryDC dc;
-    dc.SelectObject(bitmap);
-    dc.SetBrush(on ? *wxGREEN_BRUSH : *wxRED_BRUSH);
-    dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
-    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 wxUSE_CHECKBOX
@@ -997,18 +974,19 @@ void MyStatusBar::OnSize(wxSizeEvent& event)
     event.Skip();
 }
 
-void MyStatusBar::OnButton(wxCommandEvent& WXUNUSED(event))
+void MyStatusBar::OnToggleClock(wxCommandEvent& WXUNUSED(event))
 {
-#if wxUSE_CHECKBOX
-    m_checkbox->SetValue(!m_checkbox->GetValue());
-#endif
-
     DoToggle();
 }
 
-void MyStatusBar::OnToggleClock(wxCommandEvent& WXUNUSED(event))
+void MyStatusBar::OnIdle(wxIdleEvent& event)
 {
-    DoToggle();
+    SetStatusText(numlockIndicators[wxGetKeyState(WXK_NUMLOCK)],
+                  Field_NumLockIndicator);
+    SetStatusText(capslockIndicators[wxGetKeyState(WXK_CAPITAL)],
+                  Field_CapsLockIndicator);
+
+    event.Skip();
 }
 
 void MyStatusBar::DoToggle()
@@ -1020,12 +998,7 @@ void MyStatusBar::DoToggle()
         m_timer.Start(1000);
 #endif
 
-#ifdef USE_STATIC_BITMAP
         m_statbmp->SetIcon(wxIcon(green_xpm));
-#else
-        m_statbmp->SetBitmapLabel(CreateBitmapForButton(false));
-        m_statbmp->Refresh();
-#endif
 
         UpdateClock();
     }
@@ -1035,16 +1008,11 @@ void MyStatusBar::DoToggle()
         m_timer.Stop();
 #endif
 
-#ifdef USE_STATIC_BITMAP
         m_statbmp->SetIcon(wxIcon(red_xpm));
-#else
-        m_statbmp->SetBitmapLabel(CreateBitmapForButton(true));
-        m_statbmp->Refresh();
-#endif
 
         SetStatusText(wxEmptyString, Field_Clock);
     }
-#endif
+#endif // wxUSE_CHECKBOX
 }
 
 void MyStatusBar::UpdateClock()