Fixed some duff #ifdefs

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

diff --git a/include/wx/mac/radiobox.h b/include/wx/mac/radiobox.h
index 665635334b94fa45a3c7f55152f984f4b604a46f..f2262eea389ec2f67f080522a88bf03f1a969453 100644 (file)
--- a/include/wx/mac/radiobox.h
+++ b/include/wx/mac/radiobox.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        radiobox.h
 // Purpose:     wxRadioBox class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        radiobox.h
 // Purpose:     wxRadioBox class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 

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

 #pragma interface "radiobox.h"
 #endif
 
 #pragma interface "radiobox.h"
 #endif
 


@@ -23,64 +23,65 @@ class WXDLLEXPORT wxRadioButton ;
 
 class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase
 {
 
 class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase
 {

-       DECLARE_DYNAMIC_CLASS(wxRadioBox)
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)

 public:
 // Constructors & destructor
 public:
 // Constructors & destructor

-       wxRadioBox();
-       inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
+    wxRadioBox();
+    inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,

              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
              int majorDim = 0, long style = wxRA_HORIZONTAL,
              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
              int majorDim = 0, long style = wxRA_HORIZONTAL,
              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)

-               {
-                       Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
-               }
-       ~wxRadioBox();
-       bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
+        {
+            Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
+        }
+    ~wxRadioBox();
+    bool Create(wxWindow *parent, wxWindowID id, const wxString& title,

              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
              int majorDim = 0, long style = wxRA_HORIZONTAL,
              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
 
 // Specific functions (in wxWindows2 reference)
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
              int majorDim = 0, long style = wxRA_HORIZONTAL,
              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
 
 // Specific functions (in wxWindows2 reference)

-       virtual void SetSelection(int item);
-       virtual int GetSelection() const;
-       
-       inline virtual int GetCount() const { return m_noItems; } ;
+    virtual void SetSelection(int item);
+    virtual int GetSelection() const;

 
 

-       virtual wxString GetString(int item) const;
-       virtual void SetString(int item, const wxString& label) ;
-       
-       virtual void Enable(int item, bool enable);
-       virtual void Show(int item, bool show) ;
+    inline virtual int GetCount() const { return m_noItems; } ;
+
+    virtual wxString GetString(int item) const;
+    virtual void SetString(int item, const wxString& label) ;
+
+    virtual void Enable(int item, bool enable);
+    virtual void Show(int item, bool show) ;

 
     virtual int GetColumnCount() const ;
     virtual int GetRowCount() const ;
 
 
 
     virtual int GetColumnCount() const ;
     virtual int GetRowCount() const ;
 
 

-       bool Enable(bool enable);
-       wxString GetLabel() const;
-       void SetLabel(const wxString& label) ;
-       bool Show(bool show);
+    virtual bool Enable(bool enable = TRUE);
+    virtual wxString GetLabel() const;
+    virtual void SetLabel(const wxString& label) ;
+    virtual bool Show(bool show = TRUE);

 
 // Other external functions 
 
 // Other external functions 

-       void Command(wxCommandEvent& event);
-       void SetFocus();
+    void Command(wxCommandEvent& event);
+    void SetFocus();

 
 // Other variable access functions
 
 // Other variable access functions

-       inline int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
-       inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
+    inline int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
+    inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }

 
 

-       void OnRadioButton( wxCommandEvent& event ) ;
+    void OnRadioButton( wxCommandEvent& event ) ;

 protected:
 protected:

-       wxRadioButton           *m_radioButtonCycle;
-       
-       int               m_majorDim ;
-       int               m_noItems;
-       int               m_noRowsOrCols;
+    wxRadioButton        *m_radioButtonCycle;
+
+    int               m_majorDim ;
+    int               m_noItems;
+    int               m_noRowsOrCols;

 
 // Internal functions 
 
 // Internal functions 

-       virtual void DoSetSize(int x, int y,
+    virtual wxSize DoGetBestSize() const ;
+    virtual void DoSetSize(int x, int y,

                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);