X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/505af178e72ed7a4d133c301d024976e188de354..b867ed682da3e66894e748628ff95cdba68023bc:/include/wx/mac/button.h?ds=sidebyside diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h index 680652b3e7..f2cebe9e94 100644 --- a/include/wx/mac/button.h +++ b/include/wx/mac/button.h @@ -1,25 +1,25 @@ ///////////////////////////////////////////////////////////////////////////// // 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(__APPLE__) #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( ControlHandle control , SInt16 controlpart ) ; + virtual void MacHandleControlClick( WXWidget control , short controlpart ) ; static wxSize GetDefaultSize(); virtual void SetDefault();