Partially implement wxRadioBox for wxCocoa.

Copyright 2007 Software 2000 Ltd.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/radiobox.h b/include/wx/cocoa/radiobox.h
index d2712281b5e604a27fdf416192e0f0609495c4f8..e628f593dfc25a0d0881d85b60cffb3a39e18971 100644 (file)
--- a/include/wx/cocoa/radiobox.h
+++ b/include/wx/cocoa/radiobox.h
@@ -13,6 +13,7 @@
 #define __WX_COCOA_RADIOBOX_H__
 
 // #include "wx/cocoa/NSButton.h"
+DECLARE_WXCOCOA_OBJC_CLASS(NSMatrix);
 
 // ========================================================================
 // wxRadioBox
@@ -21,7 +22,7 @@ class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase// , protec
 {
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
     DECLARE_EVENT_TABLE()
-//    WX_DECLARE_COCOA_OWNER(NSButton,NSControl,NSView)
+    WX_DECLARE_COCOA_OWNER(NSBox,NSView,NSView)
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
@@ -106,6 +107,7 @@ public:
     virtual void SetString(unsigned int n, const wxString& label);
     // change the individual radio button state
 protected:
+    WX_NSMatrix GetNSMatrix() const;
     virtual wxSize DoGetBestSize() const;
 };
 

diff --git a/src/cocoa/radiobox.mm b/src/cocoa/radiobox.mm
index 8cf200fb4de4ac3c44137334a1d567c12e4eb9a0..c67639ccf10f7ed18592f810f9ae478de32d7274 100644 (file)
--- a/src/cocoa/radiobox.mm
+++ b/src/cocoa/radiobox.mm
@@ -6,6 +6,7 @@
 // Created:     2003/02/15
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
+//              (c) 2007 Software 2000 Ltd.
 // Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -20,7 +21,13 @@
     #include "wx/arrstr.h"
 #endif //WX_PRECOMP
 
+#include "wx/cocoa/string.h"
+#include "wx/cocoa/autorelease.h"
+
 #include "wx/cocoa/objc/NSView.h"
+#import <AppKit/NSButton.h>
+#import <AppKit/NSBox.h>
+#import <AppKit/NSMatrix.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
@@ -51,13 +58,102 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID winid,
             long style, const wxValidator& validator,
             const wxString& name)
 {
+    // We autorelease heavily so we want our own pool
+    wxAutoNSAutoreleasePool pool;
+
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
-    SetNSView([[WX_GET_OBJC_CLASS(WXNSView) alloc] initWithFrame: MakeDefaultNSRect(size)]);
+
+    majorDim = majorDim == 0 ? n : majorDim;
+    // TODO: Don't forget to call SetMajorDim
+    // We can't yet as we can't implement GetCount() until after
+    // we make the NSMatrix.
+    int minorDim = (n + majorDim - 1) / majorDim;
+
+
+    // Create a prototype cell for use with the NSMatrix build
+    NSCell *currCell = [[NSButtonCell alloc] initTextCell:@""];
+    [(NSButtonCell*)currCell setButtonType:NSRadioButton];
+
+    // Build up an array of all cells plus any extra empty cells
+    NSMutableArray *allCells = [NSMutableArray arrayWithCapacity:n];
+    for(int i=0; i<n; ++i)
+    {
+        [currCell setTitle: wxNSStringWithWxString(choices[i])];
+        [allCells addObject: currCell];
+        [currCell release];
+        // NOTE: We can still safely message currCell as the array has retained it.
+        currCell = [currCell copy];
+    }
+    [currCell release];
+
+    // NOTE: Although an image cell with no image is documented to return NSZeroSize from
+    // the cellSize method, the documentation is WRONG.  It will actually return a huge size
+    // (thousands) which makes every cell in the matrix that big. Not good.
+    // Be safe and initialize a text cell with an empty string.  That always works.
+    currCell = [[NSCell alloc] initTextCell:@""];
+    for(int i=n; i < majorDim * minorDim; ++i)
+    {
+        [allCells addObject: currCell];
+        // NOTE: Use the same instance.. this should work and save some heap allocations.
+        // It will, however, make the selection rather indeterminate if the user clicks
+        // on the empty space.
+#if 0
+       [currCell release];
+       currCell = [currCell copy];
+#endif
+    }
+    [currCell release];
+    currCell = NULL;
+
+    // Although the documentation on addColumnWithCells:/addRowWithCells: explicitly
+    // states that it will determine the initial dimension upon the first call if
+    // the initial size is 0x0 it LIES.  It will fail an assertion in the code
+    // if you use the simpler initWithFrame: initializer.
+    // Therefore, we specify the major dimension and leave the minor dimension as 0
+    // so that we can add the rows/columns without failing the assertion.
+    NSMatrix* radioBox = [[NSMatrix alloc]
+               initWithFrame:NSZeroRect
+               mode:NSRadioModeMatrix
+               cellClass:nil
+               numberOfRows:style&wxRA_SPECIFY_COLS?0:majorDim
+               numberOfColumns:style&wxRA_SPECIFY_COLS?majorDim:0
+       ];
+
+    SEL addMajorWithCellsSelector;
+    // If column count is the major dimension then we add by row
+    if( style & wxRA_SPECIFY_COLS )
+        addMajorWithCellsSelector = @selector(addRowWithCells:);
+    // If row count is the major dimension then we add by column
+    else
+        addMajorWithCellsSelector = @selector(addColumnWithCells:);
+
+    for(int i=0; i<minorDim; ++i)
+    {
+        [radioBox
+            performSelector:addMajorWithCellsSelector
+            withObject:[allCells subarrayWithRange:NSMakeRange(i*majorDim, majorDim)]];
+    }
+
+    //make and set up an NSBox (TODO: Just derive from wxStaticBox)
+    SetNSView([[NSBox alloc] initWithFrame:MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
+
+    // Replace the box's content view with the NSMatrix we just created
+    [GetNSBox() setContentView:radioBox];
+    [radioBox release]; // The NSBox retains it for us.
+
+    [GetNSBox() setTitle:wxNSStringWithWxString(title)];
+//    [GetNSBox() setBorderType:NSLineBorder]; // why??
+
+    SetMajorDim(majorDim, style);
+
     if(m_parent)
         m_parent->CocoaAddChild(this);
-    SetInitialFrameRect(pos,size);
+
+    // Do the sizer dance
+    [GetNSBox() sizeToFit];
+    SetInitialFrameRect(pos, size);
 
     return true;
 }
@@ -66,6 +162,11 @@ wxRadioBox::~wxRadioBox()
 {
 }
 
+WX_NSMatrix wxRadioBox::GetNSMatrix() const
+{
+    return (NSMatrix*)[(NSBox*)m_cocoaNSView contentView];
+}
+
     // selection
 void wxRadioBox::SetSelection(int n)
 {
@@ -79,7 +180,12 @@ int wxRadioBox::GetSelection() const
     // string access
 unsigned int wxRadioBox::GetCount() const
 {
-    return 0;
+    NSMatrix *radioBox = GetNSMatrix();
+    NSInteger rowCount, columnCount;
+    [radioBox getNumberOfRows:&rowCount columns:&columnCount];
+
+    // FIXME: This is wrong if padding cells were made
+    return rowCount * columnCount;
 }
 
 wxString wxRadioBox::GetString(unsigned int n) const
@@ -106,7 +212,9 @@ bool wxRadioBox::Show(unsigned int n, bool show)
 
 wxSize wxRadioBox::DoGetBestSize() const
 {
-    return wxSize(50,50);
+    // The NSBox responds to sizeToFit by sending sizeToFit to its contentView
+    // which is the NSMatrix and does the right thing.
+    return wxControl::DoGetBestSize();
 }
 
 #endif