adaption for CW 8.3 and quick hack for unicode text control size

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

diff --git a/src/cocoa/radiobox.mm b/src/cocoa/radiobox.mm
index 71b8994bad8f880546692d5e7db85a258442664d..93d5043e4711fcda2822da5c8c85d2cac4fbf5d6 100644 (file)
--- a/src/cocoa/radiobox.mm
+++ b/src/cocoa/radiobox.mm
@@ -9,14 +9,35 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/app.h"
-#include "wx/radiobox.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/radiobox.h"
+    #include "wx/arrstr.h"
+#endif //WX_PRECOMP
+
+#import <AppKit/NSView.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
 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,
@@ -28,15 +49,17 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID winid,
 {
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
-    m_cocoaNSView = NULL;
+    SetNSView([[NSView alloc] initWithFrame: MakeDefaultNSRect(size)]);
+    [m_cocoaNSView release];
     if(m_parent)
         m_parent->CocoaAddChild(this);
+    SetInitialFrameRect(pos,size);
+
     return true;
 }
 
 wxRadioBox::~wxRadioBox()
 {
-    CocoaRemoveFromParent();
 }
 
     // selection
@@ -84,3 +107,8 @@ int wxRadioBox::GetRowCount() const
     return 0;
 }
 
+wxSize wxRadioBox::DoGetBestSize() const
+{
+    return wxSize(50,50);
+}
+