Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 1d705ea93661ec2866d0a640f383e19b8b586dda..e6e68407da9a3e4ab256bfd6fb930b55ca9e6f42 100644 (file)
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxButton class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxButton class
 // Author:      David Webster
 // Modified by:


@@ -15,9 +15,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


@@ -52,6 +52,8 @@ class WXDLLEXPORT wxButton: public wxButtonBase
 
     virtual ~wxButton();
 
 
     virtual ~wxButton();
 

+    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