remove unneeded wxCHECK_MSG: GetNextMessage() can get the msg even if the event loop...

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

diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp
index df98791d5ff4fcb28c87989d2df5dd990a920661..042bfc645a43b892790923d43b3b8ad32c1e1d55 100644 (file)
--- a/samples/statbar/statbar.cpp
+++ b/samples/statbar/statbar.cpp
@@ -48,17 +48,25 @@
 
 #include "wx/datetime.h"
 #include "wx/numdlg.h"
 
 #include "wx/datetime.h"
 #include "wx/numdlg.h"

+#include "wx/fontdlg.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
 #ifdef __WXMOTIF__
 
 // 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
 //#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


@@ -96,7 +104,9 @@ public:
     void UpdateClock();
 
     // event handlers
     void UpdateClock();
 
     // event handlers

+#if wxUSE_TIMER

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

+#endif

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


@@ -116,9 +126,13 @@ private:
         Field_Max
     };
 
         Field_Max
     };
 

+#if wxUSE_TIMER

     wxTimer m_timer;
     wxTimer m_timer;

+#endif

 
 

+#if wxUSE_CHECKBOX

     wxCheckBox *m_checkbox;
     wxCheckBox *m_checkbox;

+#endif

 #ifdef USE_STATIC_BITMAP
     wxStaticBitmap *m_statbmp;
 #else
 #ifdef USE_STATIC_BITMAP
     wxStaticBitmap *m_statbmp;
 #else


@@ -144,8 +158,14 @@ class MyFrame : public wxMDIParentFrame
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 

+    void OnResetFieldsWidth(wxCommandEvent& event);

     void OnSetStatusFields(wxCommandEvent& event);
     void OnSetStatusFields(wxCommandEvent& event);

+    void OnSetStatusTexts(wxCommandEvent& event);
+    void OnSetStatusFont(wxCommandEvent& event);

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

+    void OnSetStyleNormal(wxCommandEvent& event);
+    void OnSetStyleFlat(wxCommandEvent& event);
+    void OnSetStyleRaised(wxCommandEvent& event);

 
 private:
     enum StatBarKind
 
 private:
     enum StatBarKind


@@ -154,15 +174,23 @@ private:
         StatBar_Custom,
         StatBar_Max
     } m_statbarKind;
         StatBar_Custom,
         StatBar_Max
     } m_statbarKind;

-    void OnUpdateSetStatusFields(wxUpdateUIEvent& event);
+
+
+    void OnUpdateForDefaultStatusbar(wxUpdateUIEvent& event);

     void OnUpdateStatusBarToggle(wxUpdateUIEvent& event);
     void OnUpdateStatusBarToggle(wxUpdateUIEvent& event);

+    void OnUpdateSetStyleNormal(wxUpdateUIEvent& event);
+    void OnUpdateSetStyleFlat(wxUpdateUIEvent& event);
+    void OnUpdateSetStyleRaised(wxUpdateUIEvent& event);

     void OnStatusBarToggle(wxCommandEvent& event);
     void DoCreateStatusBar(StatBarKind kind);
     void OnStatusBarToggle(wxCommandEvent& event);
     void DoCreateStatusBar(StatBarKind kind);

+    void ApplyStyle();

 
     wxStatusBar *m_statbarDefault;
     MyStatusBar *m_statbarCustom;
 
 
     wxStatusBar *m_statbarDefault;
     MyStatusBar *m_statbarCustom;
 

-    // any class wishing to process wxWindows events must use this macro
+    int m_statbarStyle;
+
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -182,21 +210,30 @@ enum
 {
     // menu items
     StatusBar_Quit = 1,
 {
     // menu items
     StatusBar_Quit = 1,

+

     StatusBar_SetFields,
     StatusBar_SetFields,

+    StatusBar_SetTexts,
+    StatusBar_SetFont,
+    StatusBar_ResetFieldsWidth,
+

     StatusBar_Recreate,
     StatusBar_About,
     StatusBar_Toggle,
     StatusBar_Recreate,
     StatusBar_About,
     StatusBar_Toggle,

-    StatusBar_Checkbox = 1000
+    StatusBar_Checkbox = 1000,
+    StatusBar_SetStyle,
+    StatusBar_SetStyleNormal,
+    StatusBar_SetStyleFlat,
+    StatusBar_SetStyleRaised

 };
 
 static const int BITMAP_SIZE_X = 32;
 static const int BITMAP_SIZE_Y = 15;
 
 // ----------------------------------------------------------------------------
 };
 
 static const int BITMAP_SIZE_X = 32;
 static const int BITMAP_SIZE_Y = 15;
 
 // ----------------------------------------------------------------------------

-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets 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
 // 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


@@ -206,21 +243,36 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 #endif
     EVT_MENU(StatusBar_Quit,  MyFrame::OnQuit)
     EVT_MENU(StatusBar_SetFields, MyFrame::OnSetStatusFields)
 #endif
     EVT_MENU(StatusBar_Quit,  MyFrame::OnQuit)
     EVT_MENU(StatusBar_SetFields, MyFrame::OnSetStatusFields)

+    EVT_MENU(StatusBar_SetTexts, MyFrame::OnSetStatusTexts)
+    EVT_MENU(StatusBar_SetFont, MyFrame::OnSetStatusFont)
+    EVT_MENU(StatusBar_ResetFieldsWidth, MyFrame::OnResetFieldsWidth)

     EVT_MENU(StatusBar_Recreate, MyFrame::OnRecreateStatusBar)
     EVT_MENU(StatusBar_About, MyFrame::OnAbout)
     EVT_MENU(StatusBar_Toggle, MyFrame::OnStatusBarToggle)
     EVT_MENU(StatusBar_Recreate, MyFrame::OnRecreateStatusBar)
     EVT_MENU(StatusBar_About, MyFrame::OnAbout)
     EVT_MENU(StatusBar_Toggle, MyFrame::OnStatusBarToggle)

+    EVT_MENU(StatusBar_SetStyleNormal, MyFrame::OnSetStyleNormal)
+    EVT_MENU(StatusBar_SetStyleFlat, MyFrame::OnSetStyleFlat)
+    EVT_MENU(StatusBar_SetStyleRaised, MyFrame::OnSetStyleRaised)
+
+    EVT_UPDATE_UI_RANGE(StatusBar_SetFields, StatusBar_ResetFieldsWidth,
+                        MyFrame::OnUpdateForDefaultStatusbar)

     EVT_UPDATE_UI(StatusBar_Toggle, MyFrame::OnUpdateStatusBarToggle)
     EVT_UPDATE_UI(StatusBar_Toggle, MyFrame::OnUpdateStatusBarToggle)

-    EVT_UPDATE_UI(StatusBar_SetFields, MyFrame::OnUpdateSetStatusFields)
+    EVT_UPDATE_UI(StatusBar_SetStyleNormal, MyFrame::OnUpdateSetStyleNormal)
+    EVT_UPDATE_UI(StatusBar_SetStyleFlat, MyFrame::OnUpdateSetStyleFlat)
+    EVT_UPDATE_UI(StatusBar_SetStyleRaised, MyFrame::OnUpdateSetStyleRaised)

 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyStatusBar, wxStatusBar)
     EVT_SIZE(MyStatusBar::OnSize)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyStatusBar, wxStatusBar)
     EVT_SIZE(MyStatusBar::OnSize)

+#if wxUSE_CHECKBOX

     EVT_CHECKBOX(StatusBar_Checkbox, MyStatusBar::OnToggleClock)
     EVT_CHECKBOX(StatusBar_Checkbox, MyStatusBar::OnToggleClock)

+#endif

     EVT_BUTTON(wxID_ANY, MyStatusBar::OnButton)
     EVT_BUTTON(wxID_ANY, MyStatusBar::OnButton)

+#if wxUSE_TIMER

     EVT_TIMER(wxID_ANY, MyStatusBar::OnTimer)
     EVT_TIMER(wxID_ANY, MyStatusBar::OnTimer)

+#endif

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create

 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and


@@ -238,9 +290,12 @@ IMPLEMENT_APP(MyApp)
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     // create the main application window
     MyFrame *frame = new MyFrame(_T("wxStatusBar sample"),
     // create the main application window
     MyFrame *frame = new MyFrame(_T("wxStatusBar sample"),

-                                 wxPoint(50, 50), wxSize(450, 340));
+                                wxPoint(50, 50), wxSize(450, 340));

 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)


@@ -259,14 +314,18 @@ bool MyApp::OnInit()
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #ifdef USE_MDI_PARENT_FRAME
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #ifdef USE_MDI_PARENT_FRAME

-       : wxMDIParentFrame((wxWindow *)NULL, wxID_ANY, title, pos, size)
+    : wxMDIParentFrame((wxWindow *)NULL, wxID_ANY, title, pos, size)

 #else
 #else

-       : wxFrame((wxWindow *)NULL, wxID_ANY, title, pos, size)
+    : wxFrame((wxWindow *)NULL, wxID_ANY, title, pos, size)

 #endif
 {
 #endif
 {

+    SetIcon(wxICON(sample));
+

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

+    m_statbarStyle = wxSB_NORMAL;
+

 #ifdef __WXMAC__
     // we need this in order to allow the about menu relocation, since ABOUT is
     // not the default id of the about menu
 #ifdef __WXMAC__
     // we need this in order to allow the about menu relocation, since ABOUT is
     // not the default id of the about menu


@@ -280,6 +339,22 @@ 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"));
     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"));
+    statbarMenu->Append(StatusBar_SetFont, _T("&Set field font\tCtrl-F"),
+                        _T("Set the font to use for rendering status bar fields"));
+
+    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"),
+                        _T("Sets all fields to the same width"));
+    statbarMenu->AppendSeparator();
+

     statbarMenu->Append(StatusBar_Toggle, _T("&Toggle Status Bar"),
                         _T("Toggle the status bar display"), true);
     statbarMenu->Append(StatusBar_Recreate, _T("&Recreate\tCtrl-R"),
     statbarMenu->Append(StatusBar_Toggle, _T("&Toggle Status Bar"),
                         _T("Toggle the status bar display"), true);
     statbarMenu->Append(StatusBar_Recreate, _T("&Recreate\tCtrl-R"),


@@ -300,7 +375,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // create default status bar to start with
     CreateStatusBar(2);
     m_statbarKind = StatBar_Default;
     // create default status bar to start with
     CreateStatusBar(2);
     m_statbarKind = StatBar_Default;

-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));

 
     m_statbarDefault = GetStatusBar();
 }
 
     m_statbarDefault = GetStatusBar();
 }


@@ -339,35 +414,65 @@ void MyFrame::DoCreateStatusBar(MyFrame::StatBarKind kind)
             wxFAIL_MSG(wxT("unknown stat bar kind"));
     }
 
             wxFAIL_MSG(wxT("unknown stat bar kind"));
     }
 

+    ApplyStyle();

     GetStatusBar()->Show();
     PositionStatusBar();
 
     m_statbarKind = kind;
 }
 
     GetStatusBar()->Show();
     PositionStatusBar();
 
     m_statbarKind = kind;
 }
 

-void MyFrame::OnUpdateSetStatusFields(wxUpdateUIEvent& event)
+
+// ----------------------------------------------------------------------------
+// main frame - event handlers
+// ----------------------------------------------------------------------------
+
+void MyFrame::OnUpdateForDefaultStatusbar(wxUpdateUIEvent& event)

 {
 {

-    // only allow the setting of the number of status fields for the default
-    // status bar
+    // only allow this feature for the default status bar

     wxStatusBar *sb = GetStatusBar();
     event.Enable(sb == m_statbarDefault);
 }
 
     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::OnSetStatusFont(wxCommandEvent& WXUNUSED(event))
+{
+    wxStatusBar *sb = GetStatusBar();
+
+    wxFont fnt = wxGetFontFromUser(this, sb->GetFont(), "Choose statusbar font");
+    if (fnt.IsOk())
+    {
+        sb->SetFont(fnt);
+        sb->SetSize(sb->GetBestSize());
+    }
+}

 
 

-// event handlers

 void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event))
 {
     wxStatusBar *sb = GetStatusBar();
 
     long nFields = wxGetNumberFromUser
 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("Select the number of fields in the status bar"),
                     _T("Fields:"),

-                    _T("wxWindows statusbar sample"),
+                    _T("wxWidgets statusbar sample"),

                     sb->GetFieldsCount(),
                     1, 5,
                     this
                     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
 
     // we don't check if the number changed at all on purpose: calling
     // SetFieldsCount() with the same number of fields should be ok


@@ -413,9 +518,21 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void MyFrame::OnResetFieldsWidth(wxCommandEvent& WXUNUSED(event))
+{
+    wxStatusBar *pStat = GetStatusBar();
+    if (pStat)
+    {
+        int n = pStat->GetFieldsCount();
+        pStat->SetStatusWidths(n, NULL);
+        for (int i=0; i<n; i++)
+            pStat->SetStatusText("same size", i);
+    }
+}
+

 void MyFrame::OnUpdateStatusBarToggle(wxUpdateUIEvent& event)
 {
 void MyFrame::OnUpdateStatusBarToggle(wxUpdateUIEvent& event)
 {

-    event.Check(GetStatusBar() != 0);
+    event.Check(GetStatusBar() != NULL);

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


@@ -424,23 +541,18 @@ void MyFrame::OnStatusBarToggle(wxCommandEvent& WXUNUSED(event))
     if ( statbarOld )
     {
         statbarOld->Hide();
     if ( statbarOld )
     {
         statbarOld->Hide();

-        SetStatusBar(0);
+        SetStatusBar(NULL);

     }
     else
     {
         DoCreateStatusBar(m_statbarKind);
     }
     }
     else
     {
         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))
 {
     DoCreateStatusBar(m_statbarKind == StatBar_Custom ? StatBar_Default
 }
 
 void MyFrame::OnRecreateStatusBar(wxCommandEvent& WXUNUSED(event))
 {
     DoCreateStatusBar(m_statbarKind == StatBar_Custom ? StatBar_Default

-                                                      : StatBar_Custom);
+                                                    : StatBar_Custom);

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


@@ -455,18 +567,67 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     dlg.ShowModal();
 }
 
     dlg.ShowModal();
 }
 

+void MyFrame::OnUpdateSetStyleNormal(wxUpdateUIEvent &event)
+{
+    event.Check(m_statbarStyle == wxSB_NORMAL);
+}
+
+void MyFrame::OnUpdateSetStyleFlat(wxUpdateUIEvent &event)
+{
+    event.Check(m_statbarStyle == wxSB_FLAT);
+}
+
+void MyFrame::OnUpdateSetStyleRaised(wxUpdateUIEvent &event)
+{
+    event.Check(m_statbarStyle == wxSB_RAISED);
+}
+
+void MyFrame::OnSetStyleNormal(wxCommandEvent & WXUNUSED(event))
+{
+    m_statbarStyle = wxSB_NORMAL;
+    ApplyStyle();
+}
+
+void MyFrame::OnSetStyleFlat(wxCommandEvent & WXUNUSED(event))
+{
+    m_statbarStyle = wxSB_FLAT;
+    ApplyStyle();
+}
+
+void MyFrame::OnSetStyleRaised(wxCommandEvent & WXUNUSED(event))
+{
+    m_statbarStyle = wxSB_RAISED;
+    ApplyStyle();
+}
+
+void MyFrame::ApplyStyle()
+{
+    wxStatusBar *sb = GetStatusBar();
+    int fields = sb->GetFieldsCount();
+    int *styles = new int[fields];
+
+    for (int i = 1; i < fields; i++)
+        styles[i] = wxSB_NORMAL;
+
+    styles[0] = m_statbarStyle;
+
+    sb->SetStatusStyles(fields, styles);
+
+    delete [] styles;
+}
+

 // ----------------------------------------------------------------------------
 // MyAboutDialog
 // ----------------------------------------------------------------------------
 
 MyAboutDialog::MyAboutDialog(wxWindow *parent)
 // ----------------------------------------------------------------------------
 // MyAboutDialog
 // ----------------------------------------------------------------------------
 
 MyAboutDialog::MyAboutDialog(wxWindow *parent)

-             : wxDialog(parent, wxID_ANY, wxString(_T("About statbar")),
+            : wxDialog(parent, wxID_ANY, wxString(_T("About statbar")),

                         wxDefaultPosition, wxDefaultSize,
                         wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
     wxStaticText *text = new wxStaticText(this, wxID_ANY,
                         wxDefaultPosition, wxDefaultSize,
                         wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
     wxStaticText *text = new wxStaticText(this, wxID_ANY,

-                                          _T("wxStatusBar sample\n")
-                                          _T("(c) 2000 Vadim Zeitlin"));
+                                        _T("wxStatusBar sample\n")
+                                        _T("(c) 2000 Vadim Zeitlin"));

 
     wxButton *btn = new wxButton(this, wxID_OK, _T("&Close"));
 
 
     wxButton *btn = new wxButton(this, wxID_OK, _T("&Close"));
 


@@ -492,11 +653,7 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent)
     sizerTop->Add(-1, 10, 1, wxGROW);
     sizerTop->Add(statbarBottom, 0, wxGROW);
 
     sizerTop->Add(-1, 10, 1, wxGROW);
     sizerTop->Add(statbarBottom, 0, wxGROW);
 

-    SetAutoLayout(true);
-    SetSizer(sizerTop);
-
-    sizerTop->Fit(this);
-    sizerTop->SetSizeHints(this);
+    SetSizerAndFit(sizerTop);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -509,27 +666,38 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent)
 #endif
 
 MyStatusBar::MyStatusBar(wxWindow *parent)
 #endif
 
 MyStatusBar::MyStatusBar(wxWindow *parent)

-           : wxStatusBar(parent, wxID_ANY), m_timer(this), m_checkbox(NULL)
+        : wxStatusBar(parent, wxID_ANY)
+#if wxUSE_TIMER
+            , m_timer(this)
+#endif
+#if wxUSE_CHECKBOX
+            , m_checkbox(NULL)
+#endif

 {
     static const int widths[Field_Max] = { -1, 150, BITMAP_SIZE_X, 100 };
 
     SetFieldsCount(Field_Max);
     SetStatusWidths(Field_Max, widths);
 
 {
     static const int widths[Field_Max] = { -1, 150, BITMAP_SIZE_X, 100 };
 
     SetFieldsCount(Field_Max);
     SetStatusWidths(Field_Max, widths);
 

+#if wxUSE_CHECKBOX

     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);

+#endif

 
 #ifdef USE_STATIC_BITMAP
     m_statbmp = new wxStaticBitmap(this, wxID_ANY, wxIcon(green_xpm));
 #else
     m_statbmp = new wxBitmapButton(this, wxID_ANY, CreateBitmapForButton(),
 
 #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);
+                                wxDefaultPosition, wxDefaultSize,
+                                wxBU_EXACTFIT);

 #endif
 
 #endif
 

+#if wxUSE_TIMER

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

+#endif

 
 

-    SetMinHeight(BITMAP_SIZE_Y);
+    SetMinHeight(wxMax(m_statbmp->GetBestSize().GetHeight(),
+                       m_checkbox->GetBestSize().GetHeight()));

 
     UpdateClock();
 }
 
     UpdateClock();
 }


@@ -540,22 +708,24 @@ MyStatusBar::MyStatusBar(wxWindow *parent)
 
 MyStatusBar::~MyStatusBar()
 {
 
 MyStatusBar::~MyStatusBar()
 {

+#if wxUSE_TIMER

     if ( m_timer.IsRunning() )
     {
         m_timer.Stop();
     }
     if ( m_timer.IsRunning() )
     {
         m_timer.Stop();
     }

+#endif

 }
 
 }
 

+#define BMP_BUTTON_SIZE_X  10
+#define BMP_BUTTON_SIZE_Y  10
+

 wxBitmap MyStatusBar::CreateBitmapForButton(bool on)
 {
 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);
+    wxBitmap bitmap(BMP_BUTTON_SIZE_X+1, BMP_BUTTON_SIZE_Y+1);

     wxMemoryDC dc;
     dc.SelectObject(bitmap);
     dc.SetBrush(on ? *wxGREEN_BRUSH : *wxRED_BRUSH);
     wxMemoryDC dc;
     dc.SelectObject(bitmap);
     dc.SetBrush(on ? *wxGREEN_BRUSH : *wxRED_BRUSH);

-    dc.SetBackground(*wxLIGHT_GREY_BRUSH);
+    dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);

     dc.Clear();
     dc.DrawEllipse(0, 0, BMP_BUTTON_SIZE_X, BMP_BUTTON_SIZE_Y);
     dc.SelectObject(wxNullBitmap);
     dc.Clear();
     dc.DrawEllipse(0, 0, BMP_BUTTON_SIZE_X, BMP_BUTTON_SIZE_Y);
     dc.SelectObject(wxNullBitmap);


@@ -565,13 +735,26 @@ wxBitmap MyStatusBar::CreateBitmapForButton(bool on)
 
 void MyStatusBar::OnSize(wxSizeEvent& event)
 {
 
 void MyStatusBar::OnSize(wxSizeEvent& event)
 {

+#if wxUSE_CHECKBOX

     if ( !m_checkbox )
         return;
     if ( !m_checkbox )
         return;

+#endif
+
+    // TEMPORARY HACK: TODO find a more general solution
+#ifdef wxStatusBarGeneric
+    wxStatusBar::OnSize(event);
+#endif

 
     wxRect rect;
 
     wxRect rect;

-    GetFieldRect(Field_Checkbox, rect);
+    if (!GetFieldRect(Field_Checkbox, rect))
+    {
+        event.Skip();
+        return;
+    }

 
 

+#if wxUSE_CHECKBOX

     m_checkbox->SetSize(rect.x + 2, rect.y + 2, rect.width - 4, rect.height - 4);
     m_checkbox->SetSize(rect.x + 2, rect.y + 2, rect.width - 4, rect.height - 4);

+#endif

 
     GetFieldRect(Field_Bitmap, rect);
     wxSize size = m_statbmp->GetSize();
 
     GetFieldRect(Field_Bitmap, rect);
     wxSize size = m_statbmp->GetSize();


@@ -584,7 +767,9 @@ void MyStatusBar::OnSize(wxSizeEvent& event)
 
 void MyStatusBar::OnButton(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyStatusBar::OnButton(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_CHECKBOX

     m_checkbox->SetValue(!m_checkbox->GetValue());
     m_checkbox->SetValue(!m_checkbox->GetValue());

+#endif

 
     DoToggle();
 }
 
     DoToggle();
 }


@@ -596,9 +781,12 @@ void MyStatusBar::OnToggleClock(wxCommandEvent& WXUNUSED(event))
 
 void MyStatusBar::DoToggle()
 {
 
 void MyStatusBar::DoToggle()
 {

+#if wxUSE_CHECKBOX

     if ( m_checkbox->GetValue() )
     {
     if ( m_checkbox->GetValue() )
     {

+#if wxUSE_TIMER

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

+#endif

 
 #ifdef USE_STATIC_BITMAP
         m_statbmp->SetIcon(wxIcon(green_xpm));
 
 #ifdef USE_STATIC_BITMAP
         m_statbmp->SetIcon(wxIcon(green_xpm));


@@ -611,7 +799,9 @@ void MyStatusBar::DoToggle()
     }
     else // don't show clock
     {
     }
     else // don't show clock
     {

+#if wxUSE_TIMER

         m_timer.Stop();
         m_timer.Stop();

+#endif

 
 #ifdef USE_STATIC_BITMAP
         m_statbmp->SetIcon(wxIcon(red_xpm));
 
 #ifdef USE_STATIC_BITMAP
         m_statbmp->SetIcon(wxIcon(red_xpm));


@@ -620,8 +810,9 @@ void MyStatusBar::DoToggle()
         m_statbmp->Refresh();
 #endif
 
         m_statbmp->Refresh();
 #endif
 

-        SetStatusText(_T(""), Field_Clock);
+        SetStatusText(wxEmptyString, Field_Clock);

     }
     }

+#endif

 }
 
 void MyStatusBar::UpdateClock()
 }
 
 void MyStatusBar::UpdateClock()