Update to Scintilla 1.48

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

diff --git a/include/wx/mac/radiobut.h b/include/wx/mac/radiobut.h
index 6a2c5b1c6a8790051aac5bec1e3af4abff0d4da1..e418d3f49542da870a7a1689c766a41e8e0ba3e3 100644 (file)
--- a/include/wx/mac/radiobut.h
+++ b/include/wx/mac/radiobut.h
@@ -12,16 +12,14 @@
 #ifndef _WX_RADIOBUT_H_
 #define _WX_RADIOBUT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "radiobut.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
-
 class WXDLLEXPORT wxRadioButton: public wxControl
 {
+  DECLARE_DYNAMIC_CLASS(wxRadioButton)
+ protected:
 public:
     inline wxRadioButton() {}
     inline wxRadioButton(wxWindow *parent, wxWindowID id,
@@ -46,19 +44,14 @@ public:
 
     // implementation 
     
-       virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ); 
+       virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart ); 
     void Command(wxCommandEvent& event);
     wxRadioButton *AddInCycle(wxRadioButton *cycle);
     inline wxRadioButton *NextInCycle() {return m_cycle;}
     
-    void OnIdle( wxIdleEvent &event );
-
-protected:
+  protected:
+  
     wxRadioButton *m_cycle;
-
-private:      
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxRadioButton)
 };
 
 // Not implemented