X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32b8ec418aee4e38877d4cb79e2984c766dcc358..6344162a81f74b3fbab0803405eebc0c0b83e797:/samples/widgets/button.cpp diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp index da3ed2cc91..d14df3ae57 100644 --- a/samples/widgets/button.cpp +++ b/samples/widgets/button.cpp @@ -26,6 +26,7 @@ // for all others, include the necessary headers #ifndef WX_PRECOMP + #include "wx/app.h" #include "wx/log.h" #include "wx/button.h" @@ -35,6 +36,7 @@ #include "wx/textctrl.h" #endif +#include "wx/artprov.h" #include "wx/sizer.h" #include "widgets.h" @@ -111,8 +113,8 @@ protected: wxTextCtrl *m_textLabel; private: - DECLARE_EVENT_TABLE(); - DECLARE_WIDGETS_PAGE(ButtonWidgetsPage); + DECLARE_EVENT_TABLE() + DECLARE_WIDGETS_PAGE(ButtonWidgetsPage) }; // ---------------------------------------------------------------------------- @@ -219,7 +221,7 @@ ButtonWidgetsPage::ButtonWidgetsPage(wxNotebook *notebook, sizerRight->Add(0, 0, 1, wxCENTRE); sizerRight->Add(m_button, 1, wxCENTRE); sizerRight->Add(0, 0, 1, wxCENTRE); - sizerRight->SetMinSize(250, 0); + sizerRight->SetMinSize(150, 0); m_sizerButton = sizerRight; // save it to modify it later // the 3 panes panes compose the window @@ -264,7 +266,7 @@ void ButtonWidgetsPage::CreateButton() 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; @@ -278,7 +280,7 @@ void ButtonWidgetsPage::CreateButton() switch ( m_radioHAlign->GetSelection() ) { case ButtonHAlign_Left: - flags |= wxALIGN_LEFT; + flags |= wxBU_LEFT; break; default: @@ -286,18 +288,17 @@ void ButtonWidgetsPage::CreateButton() // fall through case ButtonHAlign_Centre: - flags |= wxALIGN_CENTRE_HORIZONTAL; break; case ButtonHAlign_Right: - flags |= wxALIGN_RIGHT; + flags |= wxBU_RIGHT; break; } switch ( m_radioVAlign->GetSelection() ) { case ButtonVAlign_Top: - flags |= wxALIGN_TOP; + flags |= wxBU_TOP; break; default: @@ -309,7 +310,7 @@ void ButtonWidgetsPage::CreateButton() break; case ButtonVAlign_Bottom: - flags |= wxALIGN_BOTTOM; + flags |= wxBU_BOTTOM; break; } @@ -320,7 +321,7 @@ void ButtonWidgetsPage::CreateButton() #ifdef __WXUNIVERSAL__ if ( m_chkImage->GetValue() ) { - m_button->SetImageLabel(wxTheApp->GetStdIcon(wxICON_INFORMATION)); + m_button->SetImageLabel(wxArtProvider::GetIcon(wxART_INFORMATION)); } #endif // wxUniv