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 9de7a224c5deb48eb953b44f80163231fb86b6dd..e418d3f49542da870a7a1689c766a41e8e0ba3e3 100644 (file)
--- a/include/wx/mac/radiobut.h
+++ b/include/wx/mac/radiobut.h
@@ -12,48 +12,46 @@
 #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,
+public:
+    inline wxRadioButton() {}
+    inline wxRadioButton(wxWindow *parent, wxWindowID id,
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxRadioButtonNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
+    {
+        Create(parent, id, label, pos, size, style, validator, name);
+    }
 
-  bool Create(wxWindow *parent, wxWindowID id,
+    bool Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxRadioButtonNameStr);
 
-  virtual void SetValue(bool val);
-  virtual bool GetValue() const ;
-
-       virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ); 
-  void Command(wxCommandEvent& event);
-  wxRadioButton *AddInCycle(wxRadioButton *cycle);
-  inline wxRadioButton *NextInCycle() {return m_cycle;}
+    virtual void SetValue(bool val);
+    virtual bool GetValue() const ;
 
+    // implementation 
+    
+       virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart ); 
+    void Command(wxCommandEvent& event);
+    wxRadioButton *AddInCycle(wxRadioButton *cycle);
+    inline wxRadioButton *NextInCycle() {return m_cycle;}
+    
   protected:
   
-  wxRadioButton *m_cycle;  
+    wxRadioButton *m_cycle;
 };
 
 // Not implemented