cleanup of raw access to bitmaps:

[wxWidgets.git] / src / cocoa / radiobox.mm

diff --git a/src/cocoa/radiobox.mm b/src/cocoa/radiobox.mm
index 1e807be0c6e9834abe605cf87e2b731a7bdde252..8cf200fb4de4ac3c44137334a1d567c12e4eb9a0 100644 (file)
--- a/src/cocoa/radiobox.mm
+++ b/src/cocoa/radiobox.mm
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/radiobox.mm
+// Name:        src/cocoa/radiobox.mm
 // Purpose:     wxRadioBox
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,13 +13,14 @@
 
 #if wxUSE_RADIOBOX
 
+#include "wx/radiobox.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/radiobox.h"
     #include "wx/arrstr.h"
 #endif //WX_PRECOMP
 
-#import <AppKit/NSView.h>
+#include "wx/cocoa/objc/NSView.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
@@ -52,7 +53,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID winid,
 {
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
-    SetNSView([[NSView alloc] initWithFrame: MakeDefaultNSRect(size)]);
+    SetNSView([[WX_GET_OBJC_CLASS(WXNSView) alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
     if(m_parent)
         m_parent->CocoaAddChild(this);
@@ -76,40 +77,31 @@ int wxRadioBox::GetSelection() const
 }
 
     // string access
-int wxRadioBox::GetCount() const
+unsigned int wxRadioBox::GetCount() const
 {
     return 0;
 }
 
-wxString wxRadioBox::GetString(int n) const
+wxString wxRadioBox::GetString(unsigned int n) const
 {
     return wxEmptyString;
 }
 
-void wxRadioBox::SetString(int n, const wxString& label)
+void wxRadioBox::SetString(unsigned int n, const wxString& label)
 {
 }
 
     // change the individual radio button state
-bool wxRadioBox::Enable(int n, bool enable)
+bool wxRadioBox::Enable(unsigned int n, bool enable)
 {
     // TODO
     return false;
 }
 
-void wxRadioBox::Show(int n, bool show)
-{
-}
-
-    // layout parameters
-int wxRadioBox::GetColumnCount() const
-{
-    return 0;
-}
-
-int wxRadioBox::GetRowCount() const
+bool wxRadioBox::Show(unsigned int n, bool show)
 {
-    return 0;
+    // TODO
+    return false;
 }
 
 wxSize wxRadioBox::DoGetBestSize() const
@@ -118,4 +110,3 @@ wxSize wxRadioBox::DoGetBestSize() const
 }
 
 #endif
-