wxFrameNameStr was already delivered by #include one line earlier.

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

diff --git a/include/wx/mac/classic/radiobox.h b/include/wx/mac/classic/radiobox.h
index c9642e2debcaecaad1d243b8d670be74b763d647..4f184209ce736d760cc6d7207c3003978c95a100 100644 (file)
--- a/include/wx/mac/classic/radiobox.h
+++ b/include/wx/mac/classic/radiobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobox.h
+// Name:        wx/mac/classic/radiobox.h

 // Purpose:     wxRadioBox class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxRadioBox class
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,10 +12,6 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "radiobox.h"
-#endif
-

 // List box item
 class WXDLLEXPORT wxBitmap ;
 
 // List box item
 class WXDLLEXPORT wxBitmap ;
 


@@ -58,28 +54,24 @@ public:
              const wxValidator& val = wxDefaultValidator,
              const wxString& name = wxRadioBoxNameStr);
 
              const wxValidator& val = wxDefaultValidator,
              const wxString& name = wxRadioBoxNameStr);
 

-// Specific functions (in wxWindows2 reference)
+// Specific functions (in wxWidgets2 reference)

     virtual void SetSelection(int item);
     virtual int GetSelection() const;
 
     virtual void SetSelection(int item);
     virtual int GetSelection() const;
 

-    inline virtual int GetCount() const { return m_noItems; } ;
+    virtual size_t GetCount() const { return m_noItems; } ;

 
     virtual wxString GetString(int item) const;
     virtual void SetString(int item, const wxString& label) ;
 
 
     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 bool Enable(int item, bool enable = true);
+    virtual bool Show(int item, bool show = true);

 
 

-
-    virtual bool Enable(bool enable = TRUE);
+    virtual bool Enable(bool enable = true);

     virtual wxString GetLabel() const;
     virtual void SetLabel(const wxString& label) ;
     virtual wxString GetLabel() const;
     virtual void SetLabel(const wxString& label) ;

-    virtual bool Show(bool show = TRUE);
+    virtual bool Show(bool show = true);

 
 

-// Other external functions 
+// Other external functions

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


@@ -88,14 +80,14 @@ public:
     inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
     void OnRadioButton( wxCommandEvent& event ) ;
     inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
     void OnRadioButton( wxCommandEvent& event ) ;

+

 protected:
 protected:

-    wxRadioButton        *m_radioButtonCycle;
+    wxRadioButton    *m_radioButtonCycle;

 
 

-    int               m_majorDim ;
-    int               m_noItems;
+    size_t            m_noItems;

     int               m_noRowsOrCols;
 
     int               m_noRowsOrCols;
 

-// Internal functions 
+// Internal functions

     virtual wxSize DoGetBestSize() const ;
     virtual void DoSetSize(int x, int y,
                            int width, int height,
     virtual wxSize DoGetBestSize() const ;
     virtual void DoSetSize(int x, int y,
                            int width, int height,