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 1d705ea93661ec2866d0a640f383e19b8b586dda..15de85ecd50cd0a312abc66efd559d6c98be42d7 100644 (file)
--- 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 c237d9154278d006b74361dbd56057902d346bb5..41fa9c9cbc19ab5b7ced118f03c7480482e3ab28 100644 (file)
--- 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 );