X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0dbd6262a9ee7d735fb3930707346298f71b2cb7..594ed110f77d9f29f7165a07bb806e5a4fa19b0e:/include/wx/mac/button.h diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h index 68b67d8c96..23e9044f00 100644 --- a/include/wx/mac/button.h +++ b/include/wx/mac/button.h @@ -1,28 +1,28 @@ ///////////////////////////////////////////////////////////////////////////// // Name: button.h // Purpose: wxButton class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BUTTON_H_ #define _WX_BUTTON_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "button.h" #endif #include "wx/control.h" #include "wx/gdicmn.h" -WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; // Pushbutton -class WXDLLEXPORT wxButton: public wxControl +class WXDLLEXPORT wxButton: public wxButtonBase { DECLARE_DYNAMIC_CLASS(wxButton) public: @@ -42,11 +42,13 @@ class WXDLLEXPORT wxButton: public wxControl const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); + virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; + static wxSize GetDefaultSize(); + virtual void SetDefault(); - virtual void SetLabel(const wxString& label); - virtual wxString GetLabel() const ; virtual void Command(wxCommandEvent& event); +protected: + virtual wxSize DoGetBestSize() const ; }; #endif