X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4765d335f603c29f1fd300288ff1d40a118fcf0e..57fbe23f68f9ef92b8ef7e26bd06b399b53e33b2:/include/wx/mac/button.h diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h index b016c98338..2279d82316 100644 --- a/include/wx/mac/button.h +++ b/include/wx/mac/button.h @@ -12,7 +12,7 @@ #ifndef _WX_BUTTON_H_ #define _WX_BUTTON_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "button.h" #endif @@ -22,7 +22,7 @@ WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; // Pushbutton -class WXDLLEXPORT wxButton: public wxControl +class WXDLLEXPORT wxButton: public wxButtonBase { DECLARE_DYNAMIC_CLASS(wxButton) public: @@ -42,7 +42,7 @@ class WXDLLEXPORT wxButton: public wxControl const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ; + virtual void MacHandleControlClick( WXWidget control , short controlpart ) ; static wxSize GetDefaultSize(); virtual void SetDefault();