From: Vadim Zeitlin Date: Mon, 9 Apr 2007 11:18:54 +0000 (+0000) Subject: compilation fixes after last commit X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b7276b44ce5db60d1dea4a70d863d674cc1aca96 compilation fixes after last commit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h index 1d705ea936..15de85ecd5 100644 --- a/include/wx/os2/button.h +++ b/include/wx/os2/button.h @@ -17,7 +17,7 @@ // Pushbutton class WXDLLEXPORT wxButton: public wxButtonBase { - public: +public: inline wxButton() {} inline wxButton( wxWindow* pParent ,wxWindowID vId @@ -52,6 +52,8 @@ class WXDLLEXPORT wxButton: public wxButtonBase virtual ~wxButton(); + virtual wxWindow *SetDefault(); + static wxSize GetDefaultSize(void); virtual void Command(wxCommandEvent& rEvent); virtual bool OS2Command( WXUINT uParam diff --git a/src/os2/button.cpp b/src/os2/button.cpp index c237d91542..41fa9c9cbc 100644 --- a/src/os2/button.cpp +++ b/src/os2/button.cpp @@ -231,12 +231,12 @@ bool wxButton::SendClickEvent() return ProcessCommand(vEvent); } // end of wxButton::SendClickEvent -void wxButton::SetDefault() +wxWindow *wxButton::SetDefault() { // // Set this one as the default button both for wxWidgets and Windows // - wxWindow* pWinOldDefault = wxButtonBase::Set(); + wxWindow* pWinOldDefault = wxButtonBase::SetDefault(); SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), false); SetDefaultStyle( this, true );