No code changes, fixed various typos.

[wxWidgets.git] / samples / widgets / button.cpp

diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp
index c04855340c99ba340391ac3ed4e8f500c862c6b0..8bebe83b7f1ae807f1afc7137f4dcd54fe56c487 100644 (file)
--- a/samples/widgets/button.cpp
+++ b/samples/widgets/button.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample

 // Name:        button.cpp
 // Purpose:     Part of the widgets sample showing wxButton
 // Author:      Vadim Zeitlin
 // Created:     10.04.01
 // Id:          $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin
 // Name:        button.cpp
 // Purpose:     Part of the widgets sample showing wxButton
 // Author:      Vadim Zeitlin
 // Created:     10.04.01
 // Id:          $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin

-// License:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -29,6 +29,7 @@
     #include "wx/app.h"
     #include "wx/log.h"
 
     #include "wx/app.h"
     #include "wx/log.h"
 

+    #include "wx/bmpbuttn.h"

     #include "wx/button.h"
     #include "wx/checkbox.h"
     #include "wx/radiobox.h"
     #include "wx/button.h"
     #include "wx/checkbox.h"
     #include "wx/radiobox.h"


@@ -38,6 +39,8 @@
 
 #include "wx/artprov.h"
 #include "wx/sizer.h"
 
 #include "wx/artprov.h"
 #include "wx/sizer.h"

+#include "wx/dcmemory.h"
+#include "wx/commandlinkbutton.h"

 
 #include "widgets.h"
 
 
 #include "widgets.h"
 


@@ -50,12 +53,21 @@
 // control ids
 enum
 {
 // control ids
 enum
 {

-    ButtonPage_Reset = 100,
+    ButtonPage_Reset = wxID_HIGHEST,

     ButtonPage_ChangeLabel,
     ButtonPage_ChangeLabel,

+    ButtonPage_ChangeNote,

     ButtonPage_Button
 };
 
 // radio boxes
     ButtonPage_Button
 };
 
 // radio boxes

+enum
+{
+    ButtonImagePos_Left,
+    ButtonImagePos_Right,
+    ButtonImagePos_Top,
+    ButtonImagePos_Bottom
+};
+

 enum
 {
     ButtonHAlign_Left,
 enum
 {
     ButtonHAlign_Left,


@@ -77,8 +89,14 @@ enum
 class ButtonWidgetsPage : public WidgetsPage
 {
 public:
 class ButtonWidgetsPage : public WidgetsPage
 {
 public:

-    ButtonWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
-    virtual ~ButtonWidgetsPage();
+    ButtonWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
+    virtual ~ButtonWidgetsPage(){};
+
+    virtual wxControl *GetWidget() const { return m_button; }
+    virtual void RecreateWidget() { CreateButton(); }
+
+    // lazy creation of the content
+    virtual void CreateContent();

 
 protected:
     // event handlers
 
 protected:
     // event handlers


@@ -87,6 +105,7 @@ protected:
     void OnButton(wxCommandEvent& event);
     void OnButtonReset(wxCommandEvent& event);
     void OnButtonChangeLabel(wxCommandEvent& event);
     void OnButton(wxCommandEvent& event);
     void OnButtonReset(wxCommandEvent& event);
     void OnButtonChangeLabel(wxCommandEvent& event);

+    void OnButtonChangeNote(wxCommandEvent& event);

 
     // reset the wxButton parameters
     void Reset();
 
     // reset the wxButton parameters
     void Reset();


@@ -94,24 +113,61 @@ protected:
     // (re)create the wxButton
     void CreateButton();
 
     // (re)create the wxButton
     void CreateButton();
 

+    // add m_button to m_sizerButton using current value of m_chkFit
+    void AddButtonToSizer();
+
+    // helper function: create a bitmap for wxBitmapButton
+    wxBitmap CreateBitmap(const wxString& label);
+
+

     // the controls
     // ------------
 
     // the check/radio boxes for styles
     // the controls
     // ------------
 
     // the check/radio boxes for styles

-    wxCheckBox *m_chkImage,
+    wxCheckBox *m_chkBitmapOnly,
+               *m_chkTextAndBitmap,

                *m_chkFit,
                *m_chkFit,

+               *m_chkAuthNeeded,
+#if wxUSE_COMMANDLINKBUTTON
+               *m_chkCommandLink,
+#endif // wxUSE_COMMANDLINKBUTTON
+#if wxUSE_MARKUP
+               *m_chkUseMarkup,
+#endif // wxUSE_MARKUP

                *m_chkDefault;
 
                *m_chkDefault;
 

+    // more checkboxes for wxBitmapButton only
+    wxCheckBox *m_chkUsePressed,
+               *m_chkUseFocused,
+               *m_chkUseCurrent,
+               *m_chkUseDisabled;
+
+    // and an image position choice used if m_chkTextAndBitmap is on
+    wxRadioBox *m_radioImagePos;
+

     wxRadioBox *m_radioHAlign,
                *m_radioVAlign;
 
     wxRadioBox *m_radioHAlign,
                *m_radioVAlign;
 

-    // the gauge itself and the sizer it is in
+    // the button itself and the sizer it is in

     wxButton *m_button;
     wxButton *m_button;

+
+#if wxUSE_COMMANDLINKBUTTON
+    // same as m_button or NULL if not showing a command link button currently
+    wxCommandLinkButton *m_cmdLnkButton;
+#endif // wxUSE_COMMANDLINKBUTTON
+

     wxSizer *m_sizerButton;
 
     // the text entries for command parameters
     wxTextCtrl *m_textLabel;
 
     wxSizer *m_sizerButton;
 
     // the text entries for command parameters
     wxTextCtrl *m_textLabel;
 

+#if wxUSE_COMMANDLINKBUTTON
+    wxTextCtrl *m_textNote;
+
+    // used to hide or show button for changing note
+    wxSizer *m_sizerNote;
+#endif // wxUSE_COMMANDLINKBUTTON
+

 private:
     DECLARE_EVENT_TABLE()
     DECLARE_WIDGETS_PAGE(ButtonWidgetsPage)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_WIDGETS_PAGE(ButtonWidgetsPage)


@@ -126,28 +182,46 @@ BEGIN_EVENT_TABLE(ButtonWidgetsPage, WidgetsPage)
 
     EVT_BUTTON(ButtonPage_Reset, ButtonWidgetsPage::OnButtonReset)
     EVT_BUTTON(ButtonPage_ChangeLabel, ButtonWidgetsPage::OnButtonChangeLabel)
 
     EVT_BUTTON(ButtonPage_Reset, ButtonWidgetsPage::OnButtonReset)
     EVT_BUTTON(ButtonPage_ChangeLabel, ButtonWidgetsPage::OnButtonChangeLabel)

+    EVT_BUTTON(ButtonPage_ChangeNote, ButtonWidgetsPage::OnButtonChangeNote)

 
 

-    EVT_CHECKBOX(-1, ButtonWidgetsPage::OnCheckOrRadioBox)
-    EVT_RADIOBOX(-1, ButtonWidgetsPage::OnCheckOrRadioBox)
+    EVT_CHECKBOX(wxID_ANY, ButtonWidgetsPage::OnCheckOrRadioBox)
+    EVT_RADIOBOX(wxID_ANY, ButtonWidgetsPage::OnCheckOrRadioBox)

 END_EVENT_TABLE()
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 END_EVENT_TABLE()
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button"));
+#if defined(__WXUNIVERSAL__)
+    #define FAMILY_CTRLS UNIVERSAL_CTRLS
+#else
+    #define FAMILY_CTRLS NATIVE_CTRLS
+#endif
+
+IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, wxT("Button"), FAMILY_CTRLS );

 
 

-ButtonWidgetsPage::ButtonWidgetsPage(wxNotebook *notebook,
-                                       wxImageList *imaglist)
-                  : WidgetsPage(notebook)
+ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book,
+                                     wxImageList *imaglist)
+                  : WidgetsPage(book, imaglist, button_xpm)

 {
 {

-    imaglist->Add(wxBitmap(button_xpm));
-

     // init everything
     // init everything

-    m_chkImage =
+    m_chkBitmapOnly =
+    m_chkTextAndBitmap =

     m_chkFit =
     m_chkFit =

-    m_chkDefault = (wxCheckBox *)NULL;
-
+    m_chkAuthNeeded =
+#if wxUSE_COMMANDLINKBUTTON
+    m_chkCommandLink =
+#endif // wxUSE_COMMANDLINKBUTTON
+#if wxUSE_MARKUP
+    m_chkUseMarkup =
+#endif // wxUSE_MARKUP
+    m_chkDefault =
+    m_chkUsePressed =
+    m_chkUseFocused =
+    m_chkUseCurrent =
+    m_chkUseDisabled = (wxCheckBox *)NULL;
+
+    m_radioImagePos =

     m_radioHAlign =
     m_radioVAlign = (wxRadioBox *)NULL;
 
     m_radioHAlign =
     m_radioVAlign = (wxRadioBox *)NULL;
 


@@ -155,44 +229,75 @@ ButtonWidgetsPage::ButtonWidgetsPage(wxNotebook *notebook,
 
     m_button = (wxButton *)NULL;
     m_sizerButton = (wxSizer *)NULL;
 
     m_button = (wxButton *)NULL;
     m_sizerButton = (wxSizer *)NULL;

+}

 
 

+void ButtonWidgetsPage::CreateContent()
+{

     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane
     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane

-    wxStaticBox *box = new wxStaticBox(this, -1, _T("&Set style"));
+    wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set style"));

 
     wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
 
 
     wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
 

-    m_chkImage = CreateCheckBoxAndAddToSizer(sizerLeft, _T("With &image"));
-    m_chkFit = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Fit exactly"));
-    m_chkDefault = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Default"));
-
-#ifndef __WXUNIVERSAL__
-    // only wxUniv currently supoprts buttons with images
-    m_chkImage->Disable();
-#endif // !wxUniv
-
-    sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
+    m_chkBitmapOnly = CreateCheckBoxAndAddToSizer(sizerLeft, "&Bitmap only");
+    m_chkTextAndBitmap = CreateCheckBoxAndAddToSizer(sizerLeft, "Text &and bitmap");
+    m_chkFit = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Fit exactly"));
+    m_chkAuthNeeded = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Require a&uth"));
+#if wxUSE_COMMANDLINKBUTTON
+    m_chkCommandLink = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Use command &link button"));
+#endif
+#if wxUSE_MARKUP
+    m_chkUseMarkup = CreateCheckBoxAndAddToSizer(sizerLeft, "Interpret &markup");
+#endif // wxUSE_MARKUP
+    m_chkDefault = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Default"));
+
+    sizerLeft->AddSpacer(5);
+
+    wxSizer *sizerUseLabels =
+        new wxStaticBoxSizer(wxVERTICAL, this,
+                "&Use the following bitmaps in addition to the normal one?");
+    m_chkUsePressed = CreateCheckBoxAndAddToSizer(sizerUseLabels,
+        "&Pressed (small help icon)");
+    m_chkUseFocused = CreateCheckBoxAndAddToSizer(sizerUseLabels,
+        "&Focused (small error icon)");
+    m_chkUseCurrent = CreateCheckBoxAndAddToSizer(sizerUseLabels,
+        "&Current (small warning icon)");
+    m_chkUseDisabled = CreateCheckBoxAndAddToSizer(sizerUseLabels,
+        "&Disabled (broken image icon)");
+    sizerLeft->Add(sizerUseLabels, wxSizerFlags().Expand().Border());
+
+    sizerLeft->AddSpacer(10);
+
+    static const wxString dirs[] =
+    {
+        "left", "right", "top", "bottom",
+    };
+    m_radioImagePos = new wxRadioBox(this, wxID_ANY, "Image &position",
+                                     wxDefaultPosition, wxDefaultSize,
+                                     WXSIZEOF(dirs), dirs);
+    sizerLeft->Add(m_radioImagePos, 0, wxGROW | wxALL, 5);
+    sizerLeft->AddSpacer(15);

 
     // should be in sync with enums Button[HV]Align!
     static const wxString halign[] =
     {
 
     // should be in sync with enums Button[HV]Align!
     static const wxString halign[] =
     {

-        _T("left"),
-        _T("centre"),
-        _T("right"),
+        wxT("left"),
+        wxT("centre"),
+        wxT("right"),

     };
 
     static const wxString valign[] =
     {
     };
 
     static const wxString valign[] =
     {

-        _T("top"),
-        _T("centre"),
-        _T("bottom"),
+        wxT("top"),
+        wxT("centre"),
+        wxT("bottom"),

     };
 
     };
 

-    m_radioHAlign = new wxRadioBox(this, -1, _T("&Horz alignment"),
+    m_radioHAlign = new wxRadioBox(this, wxID_ANY, wxT("&Horz alignment"),

                                    wxDefaultPosition, wxDefaultSize,
                                    WXSIZEOF(halign), halign);
                                    wxDefaultPosition, wxDefaultSize,
                                    WXSIZEOF(halign), halign);

-    m_radioVAlign = new wxRadioBox(this, -1, _T("&Vert alignment"),
+    m_radioVAlign = new wxRadioBox(this, wxID_ANY, wxT("&Vert alignment"),

                                    wxDefaultPosition, wxDefaultSize,
                                    WXSIZEOF(valign), valign);
 
                                    wxDefaultPosition, wxDefaultSize,
                                    WXSIZEOF(valign), valign);
 


@@ -201,45 +306,44 @@ ButtonWidgetsPage::ButtonWidgetsPage(wxNotebook *notebook,
 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
 
 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
 

-    wxButton *btn = new wxButton(this, ButtonPage_Reset, _T("&Reset"));
+    wxButton *btn = new wxButton(this, ButtonPage_Reset, wxT("&Reset"));

     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane
     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane

-    wxStaticBox *box2 = new wxStaticBox(this, -1, _T("&Operations"));
+    wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, wxT("&Operations"));

     wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
 
     wxSizer *sizerRow = CreateSizerWithTextAndButton(ButtonPage_ChangeLabel,
     wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
 
     wxSizer *sizerRow = CreateSizerWithTextAndButton(ButtonPage_ChangeLabel,

-                                                     _T("Change label"),
-                                                     -1,
+                                                     wxT("Change label"),
+                                                     wxID_ANY,

                                                      &m_textLabel);
                                                      &m_textLabel);

-
+    m_textLabel->SetValue(wxT("&Press me!"));

     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 

+#if wxUSE_COMMANDLINKBUTTON
+    m_sizerNote = CreateSizerWithTextAndButton(ButtonPage_ChangeNote,
+                                               wxT("Change note"),
+                                               wxID_ANY,
+                                               &m_textNote);
+    m_textNote->SetValue(wxT("Writes down button clicks in the log."));
+
+    sizerMiddle->Add(m_sizerNote, 0, wxALL | wxGROW, 5);
+#endif
+

     // right pane
     // right pane

-    wxSizer *sizerRight = new wxBoxSizer(wxHORIZONTAL);
-    m_button = new wxButton(this, ButtonPage_Button, _T("&Press me!"));
-    sizerRight->Add(0, 0, 1, wxCENTRE);
-    sizerRight->Add(m_button, 1, wxCENTRE);
-    sizerRight->Add(0, 0, 1, wxCENTRE);
-    sizerRight->SetMinSize(150, 0);
-    m_sizerButton = sizerRight; // save it to modify it later
+    m_sizerButton = new wxBoxSizer(wxHORIZONTAL);
+    m_sizerButton->SetMinSize(150, 0);

 
     // the 3 panes panes compose the window
     sizerTop->Add(sizerLeft, 0, wxGROW | (wxALL & ~wxLEFT), 10);
     sizerTop->Add(sizerMiddle, 1, wxGROW | wxALL, 10);
 
     // the 3 panes panes compose the window
     sizerTop->Add(sizerLeft, 0, wxGROW | (wxALL & ~wxLEFT), 10);
     sizerTop->Add(sizerMiddle, 1, wxGROW | wxALL, 10);

-    sizerTop->Add(sizerRight, 1, wxGROW | (wxALL & ~wxRIGHT), 10);
+    sizerTop->Add(m_sizerButton, 1, wxGROW | (wxALL & ~wxRIGHT), 10);

 
 

-    // final initializations
+    // do create the main control

     Reset();
     Reset();

+    CreateButton();

 
 

-    SetAutoLayout(TRUE);

     SetSizer(sizerTop);
     SetSizer(sizerTop);

-
-    sizerTop->Fit(this);
-}
-
-ButtonWidgetsPage::~ButtonWidgetsPage()
-{

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


@@ -248,10 +352,24 @@ ButtonWidgetsPage::~ButtonWidgetsPage()
 
 void ButtonWidgetsPage::Reset()
 {
 
 void ButtonWidgetsPage::Reset()
 {

-    m_chkFit->SetValue(TRUE);
-    m_chkImage->SetValue(FALSE);
-    m_chkDefault->SetValue(FALSE);
+    m_chkBitmapOnly->SetValue(false);
+    m_chkFit->SetValue(true);
+    m_chkAuthNeeded->SetValue(false);
+    m_chkTextAndBitmap->SetValue(false);
+    m_chkDefault->SetValue(false);
+#if wxUSE_COMMANDLINKBUTTON
+    m_chkCommandLink->SetValue(false);
+#endif
+#if wxUSE_MARKUP
+    m_chkUseMarkup->SetValue(false);
+#endif // wxUSE_MARKUP

 
 

+    m_chkUsePressed->SetValue(true);
+    m_chkUseFocused->SetValue(true);
+    m_chkUseCurrent->SetValue(true);
+    m_chkUseDisabled->SetValue(true);
+
+    m_radioImagePos->SetSelection(ButtonImagePos_Left);

     m_radioHAlign->SetSelection(ButtonHAlign_Centre);
     m_radioVAlign->SetSelection(ButtonVAlign_Centre);
 }
     m_radioHAlign->SetSelection(ButtonHAlign_Centre);
     m_radioVAlign->SetSelection(ButtonVAlign_Centre);
 }


@@ -261,88 +379,165 @@ void ButtonWidgetsPage::CreateButton()
     wxString label;
     if ( m_button )
     {
     wxString label;
     if ( m_button )
     {

-        label = m_button->GetLabel();
+#if wxUSE_COMMANDLINKBUTTON
+        if ( m_cmdLnkButton )
+            label = m_cmdLnkButton->GetMainLabel();
+        else
+#endif
+            label = m_button->GetLabel();

 
         size_t count = m_sizerButton->GetChildren().GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
 
         size_t count = m_sizerButton->GetChildren().GetCount();
         for ( size_t n = 0; n < count; n++ )
         {

-            m_sizerButton->Remove(0);
+            m_sizerButton->Remove( 0 );

         }
 
         delete m_button;
     }
         }
 
         delete m_button;
     }

-    else
+
+    if ( label.empty() )

     {
     {

-        label = _T("&Press me!");
+        // creating for the first time or recreating a button after bitmap
+        // button
+        label = m_textLabel->GetValue();

     }
 
     }
 

-    int flags = 0;
+    int flags = ms_defaultFlags;

     switch ( m_radioHAlign->GetSelection() )
     {
         case ButtonHAlign_Left:
     switch ( m_radioHAlign->GetSelection() )
     {
         case ButtonHAlign_Left:

-            flags |= wxALIGN_LEFT;
+            flags |= wxBU_LEFT;

             break;
 
         default:
             break;
 
         default:

-            wxFAIL_MSG(_T("unexpected radiobox selection"));
+            wxFAIL_MSG(wxT("unexpected radiobox selection"));

             // fall through
 
         case ButtonHAlign_Centre:
             // fall through
 
         case ButtonHAlign_Centre:

-            flags |= wxALIGN_CENTRE_HORIZONTAL;

             break;
 
         case ButtonHAlign_Right:
             break;
 
         case ButtonHAlign_Right:

-            flags |= wxALIGN_RIGHT;
+            flags |= wxBU_RIGHT;

             break;
     }
 
     switch ( m_radioVAlign->GetSelection() )
     {
         case ButtonVAlign_Top:
             break;
     }
 
     switch ( m_radioVAlign->GetSelection() )
     {
         case ButtonVAlign_Top:

-            flags |= wxALIGN_TOP;
+            flags |= wxBU_TOP;

             break;
 
         default:
             break;
 
         default:

-            wxFAIL_MSG(_T("unexpected radiobox selection"));
+            wxFAIL_MSG(wxT("unexpected radiobox selection"));

             // fall through
 
         case ButtonVAlign_Centre:
             // fall through
 
         case ButtonVAlign_Centre:

-            flags |= wxALIGN_CENTRE_VERTICAL;
+            // centre vertical alignment is the default (no style)

             break;
 
         case ButtonVAlign_Bottom:
             break;
 
         case ButtonVAlign_Bottom:

-            flags |= wxALIGN_BOTTOM;
+            flags |= wxBU_BOTTOM;

             break;
     }
 
             break;
     }
 

-    m_button = new wxButton(this, ButtonPage_Button, label,
-                            wxDefaultPosition, wxDefaultSize,
-                            flags);
+#if wxUSE_COMMANDLINKBUTTON
+    m_sizerNote->Show(m_chkCommandLink->GetValue());
+#endif
+
+    bool showsBitmap = false;
+    if ( m_chkBitmapOnly->GetValue() )
+    {
+        showsBitmap = true;
+
+        wxBitmapButton *bbtn = new wxBitmapButton(this, ButtonPage_Button,
+                                                  CreateBitmap(wxT("normal")));
+        if ( m_chkUsePressed->GetValue() )
+            bbtn->SetBitmapPressed(CreateBitmap(wxT("pushed")));
+        if ( m_chkUseFocused->GetValue() )
+            bbtn->SetBitmapFocus(CreateBitmap(wxT("focused")));
+        if ( m_chkUseCurrent->GetValue() )
+            bbtn->SetBitmapCurrent(CreateBitmap(wxT("hover")));
+        if ( m_chkUseDisabled->GetValue() )
+            bbtn->SetBitmapDisabled(CreateBitmap(wxT("disabled")));
+        m_button = bbtn;
+#if wxUSE_COMMANDLINKBUTTON
+        m_cmdLnkButton = NULL;
+#endif
+    }
+    else // normal button
+    {
+#if wxUSE_COMMANDLINKBUTTON
+        m_cmdLnkButton = NULL;
+
+        if ( m_chkCommandLink->GetValue() )
+        {
+            m_cmdLnkButton = new wxCommandLinkButton(this, ButtonPage_Button,
+                                                     label,
+                                                     m_textNote->GetValue(),
+                                                     wxDefaultPosition,
+                                                     wxDefaultSize,
+                                                     flags);
+            m_button = m_cmdLnkButton;
+        }
+        else
+#endif // wxUSE_COMMANDLINKBUTTON
+        {
+            m_button = new wxButton(this, ButtonPage_Button, label,
+                                    wxDefaultPosition, wxDefaultSize,
+                                    flags);
+        }
+    }

 
 

-#ifdef __WXUNIVERSAL__
-    if ( m_chkImage->GetValue() )
+    if ( !showsBitmap && m_chkTextAndBitmap->GetValue() )

     {
     {

-        m_button->SetImageLabel(wxArtProvider::GetIcon(wxART_INFORMATION));
+        showsBitmap = true;
+
+        static const wxDirection positions[] =
+        {
+            wxLEFT, wxRIGHT, wxTOP, wxBOTTOM
+        };
+
+        m_button->SetBitmap(wxArtProvider::GetIcon(wxART_INFORMATION, wxART_BUTTON),
+                            positions[m_radioImagePos->GetSelection()]);
+
+        if ( m_chkUsePressed->GetValue() )
+            m_button->SetBitmapPressed(wxArtProvider::GetIcon(wxART_HELP, wxART_BUTTON));
+        if ( m_chkUseFocused->GetValue() )
+            m_button->SetBitmapFocus(wxArtProvider::GetIcon(wxART_ERROR, wxART_BUTTON));
+        if ( m_chkUseCurrent->GetValue() )
+            m_button->SetBitmapCurrent(wxArtProvider::GetIcon(wxART_WARNING, wxART_BUTTON));
+        if ( m_chkUseDisabled->GetValue() )
+            m_button->SetBitmapDisabled(wxArtProvider::GetIcon(wxART_MISSING_IMAGE, wxART_BUTTON));

     }
     }

-#endif // wxUniv
+
+    m_chkUsePressed->Enable(showsBitmap);
+    m_chkUseFocused->Enable(showsBitmap);
+    m_chkUseCurrent->Enable(showsBitmap);
+    m_chkUseDisabled->Enable(showsBitmap);
+
+    if ( m_chkAuthNeeded->GetValue() )
+        m_button->SetAuthNeeded();

 
     if ( m_chkDefault->GetValue() )
 
     if ( m_chkDefault->GetValue() )

-    {

         m_button->SetDefault();
         m_button->SetDefault();

-    }

 
 

+    AddButtonToSizer();
+
+    m_sizerButton->Layout();
+}
+
+void ButtonWidgetsPage::AddButtonToSizer()
+{

     if ( m_chkFit->GetValue() )
     {
     if ( m_chkFit->GetValue() )
     {

-        m_sizerButton->Add(0, 0, 1, wxCENTRE);
-        m_sizerButton->Add(m_button, 1, wxCENTRE);
-        m_sizerButton->Add(0, 0, 1, wxCENTRE);
+        m_sizerButton->AddStretchSpacer(1);
+        m_sizerButton->Add(m_button, wxSizerFlags(0).Centre().Border());
+        m_sizerButton->AddStretchSpacer(1);

     }
     }

-    else
+    else // take up the entire space

     {
     {

-        m_sizerButton->Add(m_button, 1, wxGROW | wxALL, 5);
+        m_sizerButton->Add(m_button, wxSizerFlags(1).Expand().Border());

     }
     }

-
-    m_sizerButton->Layout();

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


@@ -356,18 +551,65 @@ void ButtonWidgetsPage::OnButtonReset(wxCommandEvent& WXUNUSED(event))
     CreateButton();
 }
 
     CreateButton();
 }
 

-void ButtonWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
+void ButtonWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))

 {
     CreateButton();
 {
     CreateButton();

+    Layout(); // make sure the text field for changing note displays correctly.

 }
 
 void ButtonWidgetsPage::OnButtonChangeLabel(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void ButtonWidgetsPage::OnButtonChangeLabel(wxCommandEvent& WXUNUSED(event))
 {

-    m_button->SetLabel(m_textLabel->GetValue());
+    const wxString labelText = m_textLabel->GetValue();
+
+#if wxUSE_COMMANDLINKBUTTON
+    if ( m_cmdLnkButton )
+        m_cmdLnkButton->SetMainLabel(labelText);
+    else
+#endif // wxUSE_COMMANDLINKBUTTON
+    {
+#if wxUSE_MARKUP
+        if ( m_chkUseMarkup->GetValue() )
+            m_button->SetLabelMarkup(labelText);
+        else
+#endif // wxUSE_MARKUP
+            m_button->SetLabel(labelText);
+    }
+
+    m_sizerButton->Layout();

 }
 
 }
 

-void ButtonWidgetsPage::OnButton(wxCommandEvent& event)
+void ButtonWidgetsPage::OnButtonChangeNote(wxCommandEvent& WXUNUSED(event))
+{
+#if wxUSE_COMMANDLINKBUTTON
+    m_cmdLnkButton->SetNote(m_textNote->GetValue());
+
+    m_sizerButton->Layout();
+#endif // wxUSE_COMMANDLINKBUTTON
+}
+
+void ButtonWidgetsPage::OnButton(wxCommandEvent& WXUNUSED(event))
+{
+    wxLogMessage(wxT("Test button clicked."));
+}
+
+// ----------------------------------------------------------------------------
+// bitmap button stuff
+// ----------------------------------------------------------------------------
+
+wxBitmap ButtonWidgetsPage::CreateBitmap(const wxString& label)

 {
 {

-    wxLogMessage(_T("Test button clicked."));
+    wxBitmap bmp(180, 70); // shouldn't hardcode but it's simpler like this
+    wxMemoryDC dc;
+    dc.SelectObject(bmp);
+    dc.SetBackground(wxBrush(*wxCYAN));
+    dc.Clear();
+    dc.SetTextForeground(*wxBLACK);
+    dc.DrawLabel(wxStripMenuCodes(m_textLabel->GetValue()) + wxT("\n")
+                    wxT("(") + label + wxT(" state)"),
+                 wxArtProvider::GetBitmap(wxART_INFORMATION),
+                 wxRect(10, 10, bmp.GetWidth() - 20, bmp.GetHeight() - 20),
+                 wxALIGN_CENTRE);
+
+    return bmp;

 }
 
 }