Added extra hit test style for more accurate reporting

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

diff --git a/src/cocoa/radiobox.mm b/src/cocoa/radiobox.mm
index ff0626e5c50b8907e3709fc8d51e38c2c3982b52..a6e87e742f7dac6a851f09b467b418b0ff78cb1c 100644 (file)
--- a/src/cocoa/radiobox.mm
+++ b/src/cocoa/radiobox.mm
@@ -1,18 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/radiobox.mm
+// Name:        src/cocoa/radiobox.mm

 // Purpose:     wxRadioBox
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
 // Purpose:     wxRadioBox
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15

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

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#if wxUSE_RADIOBOX
+
+#include "wx/radiobox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/radiobox.h"
+    #include "wx/arrstr.h"

 #endif //WX_PRECOMP
 
 #import <AppKit/NSView.h>
 #endif //WX_PRECOMP
 
 #import <AppKit/NSView.h>


@@ -22,6 +27,21 @@ BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxRadioBox,NSTextField,NSControl,NSView)
 
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxRadioBox,NSTextField,NSControl,NSView)
 

+bool wxRadioBox::Create(wxWindow *parent, wxWindowID winid,
+            const wxString& title,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            int majorDim,
+            long style, const wxValidator& validator,
+            const wxString& name)
+{
+    wxCArrayString chs(choices);
+
+    return Create(parent, winid, title, pos, size, chs.GetCount(),
+                  chs.GetStrings(), majorDim, style, validator, name);
+}
+

 bool wxRadioBox::Create(wxWindow *parent, wxWindowID winid,
             const wxString& title,
             const wxPoint& pos,
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID winid,
             const wxString& title,
             const wxPoint& pos,


@@ -57,37 +77,36 @@ int wxRadioBox::GetSelection() const
 }
 
     // string access
 }
 
     // string access

-int wxRadioBox::GetCount() const
+unsigned int wxRadioBox::GetCount() const

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-wxString wxRadioBox::GetString(int n) const
+wxString wxRadioBox::GetString(unsigned int n) const

 {
     return wxEmptyString;
 }
 
 {
     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
 {
 }
 
     // change the individual radio button state

-void wxRadioBox::Enable(int n, bool enable)
+bool wxRadioBox::Enable(unsigned int n, bool enable)

 {
 {

+    // TODO
+    return false;

 }
 
 }
 

-void wxRadioBox::Show(int n, bool show)
+bool wxRadioBox::Show(unsigned int n, bool show)

 {
 {

+    // TODO
+    return false;

 }
 
 }
 

-    // layout parameters
-int wxRadioBox::GetColumnCount() const
+wxSize wxRadioBox::DoGetBestSize() const

 {
 {

-    return 0;
-}
-
-int wxRadioBox::GetRowCount() const
-{
-    return 0;
+    return wxSize(50,50);

 }
 
 }
 

+#endif