Got rid wx-license

[wxWidgets.git] / include / wx / mac / button.h

diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h
index f400b6da20e54d4eaf44bbb35986ba6506a39fbd..23e9044f00a29549c60d74909c7494d7f7a3676e 100644 (file)
--- a/include/wx/mac/button.h
+++ b/include/wx/mac/button.h
@@ -12,14 +12,14 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
 #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"
 
 #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
 
 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase


@@ -42,7 +42,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 
            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();
     static wxSize GetDefaultSize();
 
   virtual void SetDefault();