fixed a design flaw in wxFontMapper that prevented automatic creation of wxConfig...

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

diff --git a/include/wx/mac/radiobut.h b/include/wx/mac/radiobut.h
index 9de7a224c5deb48eb953b44f80163231fb86b6dd..eb92a106145a35c850c696a2cf214f37853f3718 100644 (file)
--- a/include/wx/mac/radiobut.h
+++ b/include/wx/mac/radiobut.h
@@ -16,44 +16,42 @@
 #pragma interface "radiobut.h"
 #endif
 
 #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:
 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)
            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);
 
            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 SetValue(bool val);
+    virtual bool GetValue() const ;

 
 

+    // implementation 
+    

        virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ); 
        virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ); 

-  void Command(wxCommandEvent& event);
-  wxRadioButton *AddInCycle(wxRadioButton *cycle);
-  inline wxRadioButton *NextInCycle() {return m_cycle;}
-
+    void Command(wxCommandEvent& event);
+    wxRadioButton *AddInCycle(wxRadioButton *cycle);
+    inline wxRadioButton *NextInCycle() {return m_cycle;}
+    

   protected:
   
   protected:
   

-  wxRadioButton *m_cycle;  
+    wxRadioButton *m_cycle;

 };
 
 // Not implemented
 };
 
 // Not implemented