intel pict fixes

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

diff --git a/include/wx/mac/carbon/radiobox.h b/include/wx/mac/carbon/radiobox.h
index a3e5f388021e57474b32d50add32fbc0b2e114f5..0f5d7d53ac1b3d6668873d08d0b988bdf92a7661 100644 (file)
--- a/include/wx/mac/carbon/radiobox.h
+++ b/include/wx/mac/carbon/radiobox.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        radiobox.h
+// Name:        wx/mac/carbon/radiobox.h
 // Purpose:     wxRadioBox class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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 ;
 
@@ -62,24 +58,20 @@ public:
     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 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 bool Show(bool show = TRUE);
+    virtual bool Show(bool show = true);
 
-// Other external functions 
+// Other external functions
     void Command(wxCommandEvent& event);
     void SetFocus();
 
@@ -88,14 +80,14 @@ public:
     inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
     void OnRadioButton( wxCommandEvent& event ) ;
+
 protected:
-    wxRadioButton        *m_radioButtonCycle;
+    wxRadioButton    *m_radioButtonCycle;
 
-    int               m_majorDim ;
-    int               m_noItems;
+    size_t            m_noItems;
     int               m_noRowsOrCols;
 
-// Internal functions 
+// Internal functions
     virtual wxSize DoGetBestSize() const ;
     virtual void DoSetSize(int x, int y,
                            int width, int height,