X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/os2/button.h?ds=sidebyside diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h index ba408a4214..134c4ce017 100644 --- 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 -// RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,13 +14,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 +41,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 +51,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