X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32b8ec418aee4e38877d4cb79e2984c766dcc358..08a15c0d899daad0ff8cc2ed4c06ff78b8ec3cc3:/samples/widgets/button.cpp diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp index da3ed2cc91..c04855340c 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 @@ -320,7 +322,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