projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't use the same parameter name twice, HP compiler actually checks
[wxWidgets.git]
/
src
/
cocoa
/
radiobox.mm
diff --git
a/src/cocoa/radiobox.mm
b/src/cocoa/radiobox.mm
index 4319dcfb387ebc5d01ffea231f3744f46b66993d..6ce3aa2dd366e8a427808cef97ed03aa7d7c65e6 100644
(file)
--- a/
src/cocoa/radiobox.mm
+++ b/
src/cocoa/radiobox.mm
@@
-24,6
+24,7
@@
#include "wx/cocoa/string.h"
#include "wx/cocoa/autorelease.h"
#include "wx/cocoa/string.h"
#include "wx/cocoa/autorelease.h"
+#import <Foundation/NSArray.h>
#include "wx/cocoa/objc/NSView.h"
#import <AppKit/NSButton.h>
#import <AppKit/NSBox.h>
#include "wx/cocoa/objc/NSView.h"
#import <AppKit/NSButton.h>
#import <AppKit/NSBox.h>
@@
-95,7
+96,7
@@
bool wxRadioBox::Create(wxWindow *parent, wxWindowID winid,
NSMutableArray *allCells = [NSMutableArray arrayWithCapacity:n];
for(int i=0; i<n; ++i)
{
NSMutableArray *allCells = [NSMutableArray arrayWithCapacity:n];
for(int i=0; i<n; ++i)
{
-
[currCell setTitle: wxNSStringWithWxString(wxStripMenuCodes(choices[i], wxStrip_Mnemonics))]
;
+
CocoaSetLabelForObject(choices[i], currCell)
;
[allCells addObject: currCell];
[currCell release];
// NOTE: We can still safely message currCell as the array has retained it.
[allCells addObject: currCell];
[currCell release];
// NOTE: We can still safely message currCell as the array has retained it.
@@
-161,11
+162,16
@@
bool wxRadioBox::Create(wxWindow *parent, wxWindowID winid,
[theBox release];
[theBox release];
-
[GetNSBox() setTitle:wxNSStringWithWxString(wxStripMenuCodes(title, wxStrip_Mnemonics))]
;
+
CocoaSetLabelForObject(title, GetNSBox())
;
// [GetNSBox() setBorderType:NSLineBorder]; // why??
SetMajorDim(majorDim, style);
// [GetNSBox() setBorderType:NSLineBorder]; // why??
SetMajorDim(majorDim, style);
+ // Set the selection to the first item if we have any items.
+ // This is for parity with other wx ports which do the same thing.
+ if(n > 0)
+ SetSelection(0);
+
if(m_parent)
m_parent->CocoaAddChild(this);
if(m_parent)
m_parent->CocoaAddChild(this);
@@
-228,7
+234,7
@@
void wxRadioBox::SetString(unsigned int n, const wxString& label)
{
int r = GetRowForIndex(n);
int c = GetColumnForIndex(n);
{
int r = GetRowForIndex(n);
int c = GetColumnForIndex(n);
-
[[GetNSMatrix() cellAtRow:r column:c] setTitle:wxNSStringWithWxString(wxStripMenuCodes(label, wxStrip_Mnemonics))]
;
+
CocoaSetLabelForObject(label, [GetNSMatrix() cellAtRow:r column:c])
;
}
// change the individual radio button state
}
// change the individual radio button state