X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..1a33ac8fb0f5e43c89bd698618d554c6f7b8b452:/include/wx/mac/button.h diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h index 3fe881919b..23e9044f00 100644 --- a/include/wx/mac/button.h +++ b/include/wx/mac/button.h @@ -6,20 +6,20 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BUTTON_H_ #define _WX_BUTTON_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#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 wxButtonBase @@ -42,7 +42,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - virtual void MacHandleControlClick( WXWidget control , short controlpart ) ; + virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; static wxSize GetDefaultSize(); virtual void SetDefault();