X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d921af5140af576cf7651d4f47d5dc00a83e37f5..a2b9e9520297da0f7d13e4cc2e36acdf2bda105d:/include/wx/mac/button.h?ds=inline diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h index f400b6da20..23e9044f00 100644 --- a/include/wx/mac/button.h +++ b/include/wx/mac/button.h @@ -12,14 +12,14 @@ #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();