Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

[wxWidgets.git] / include / wx / os2 / button.h

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 272bb088992c72321f8de526ed987da7e9e74419..134c4ce017dfc792a3f1c3e8c2d47261bd4ebb2b 100644 (file)
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        button.h
+// Name:        wx/os2/button.h

 // Purpose:     wxButton class
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
 // Purpose:     wxButton class
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -15,9 +14,9 @@
 #include "wx/control.h"
 
 // Pushbutton
 #include "wx/control.h"
 
 // Pushbutton

-class WXDLLEXPORT wxButton: public wxButtonBase
+class WXDLLIMPEXP_CORE wxButton: public wxButtonBase

 {
 {

- public:
+public:

     inline wxButton() {}
     inline wxButton( wxWindow*          pParent
                     ,wxWindowID         vId
     inline wxButton() {}
     inline wxButton( wxWindow*          pParent
                     ,wxWindowID         vId


@@ -49,10 +48,11 @@ class WXDLLEXPORT wxButton: public wxButtonBase
                 ,const wxValidator& rValidator = wxDefaultValidator
                 ,const wxString&    rsName = wxButtonNameStr
                );
                 ,const wxValidator& rValidator = wxDefaultValidator
                 ,const wxString&    rsName = wxButtonNameStr
                );

-    
+

     virtual ~wxButton();
 
     virtual ~wxButton();
 

-    virtual void     SetDefault(void);
+    virtual wxWindow *SetDefault();
+

     static wxSize    GetDefaultSize(void);
     virtual void     Command(wxCommandEvent& rEvent);
     virtual bool     OS2Command( WXUINT uParam
     static wxSize    GetDefaultSize(void);
     virtual void     Command(wxCommandEvent& rEvent);
     virtual bool     OS2Command( WXUINT uParam