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 2147e1c931bfd41898d7f51e1527475759f4aaa4..0f5d7d53ac1b3d6668873d08d0b988bdf92a7661 100644 (file)
--- a/include/wx/mac/carbon/radiobox.h
+++ b/include/wx/mac/carbon/radiobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        radiobox.h
+// Name:        wx/mac/carbon/radiobox.h
 // Purpose:     wxRadioBox class
 // Author:      Stefan Csomor
 // Modified by:
@@ -12,10 +12,6 @@
 #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,7 +58,7 @@ 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) ;
@@ -70,10 +66,6 @@ public:
     virtual bool Enable(int item, bool enable = true);
     virtual bool Show(int item, bool show = true);
 
-    virtual int GetColumnCount() const ;
-    virtual int GetRowCount() const ;
-
-
     virtual bool Enable(bool enable = true);
     virtual wxString GetLabel() const;
     virtual void SetLabel(const wxString& label) ;
@@ -88,11 +80,11 @@ 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