added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h
index b016c98338de7ff57889a4d999ee674607093cea..2279d8231690ade44322d1c2e3159ce8102044ac 100644 (file)
--- a/include/wx/mac/button.h
+++ b/include/wx/mac/button.h
@@ -12,7 +12,7 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "button.h"
 #endif
 
 #pragma interface "button.h"
 #endif
 


@@ -22,7 +22,7 @@
 WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 
 // Pushbutton
 WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 
 // Pushbutton

-class WXDLLEXPORT wxButton: public wxControl
+class WXDLLEXPORT wxButton: public wxButtonBase

 {
   DECLARE_DYNAMIC_CLASS(wxButton)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxButton)
  public:


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