Implement delayed destruction for wxPopupTransientWindow.

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

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index ebb18cc31c45687d418ebdce9d8fae326408a9b8..e6e68407da9a3e4ab256bfd6fb930b55ca9e6f42 100644 (file)
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        button.h
+// Name:        wx/os2/button.h
 // Purpose:     wxButton class
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
@@ -15,13 +15,13 @@
 #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
-                    ,const wxString&    rsLabel
+                    ,const wxString&    rsLabel = wxEmptyString
                     ,const wxPoint&     rPos = wxDefaultPosition
                     ,const wxSize&      rSize = wxDefaultSize
                     ,long               lStyle = 0
@@ -42,7 +42,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase
 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
-                ,const wxString&    rsLabel
+                ,const wxString&    rsLabel = wxEmptyString
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
@@ -52,7 +52,8 @@ class WXDLLEXPORT wxButton: public wxButtonBase
 
     virtual ~wxButton();
 
-    virtual void     SetDefault(void);
+    virtual wxWindow *SetDefault();
+
     static wxSize    GetDefaultSize(void);
     virtual void     Command(wxCommandEvent& rEvent);
     virtual bool     OS2Command( WXUINT uParam