projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
using common GetContentScaleFactor throughout part 2/2
[wxWidgets.git]
/
src
/
cocoa
/
radiobut.mm
diff --git
a/src/cocoa/radiobut.mm
b/src/cocoa/radiobut.mm
index 7054adae238aa51aebaa0cca199f033b6564b39b..70820d4a1875c12346bc1555b7ac4a9e625b56ac 100644
(file)
--- a/
src/cocoa/radiobut.mm
+++ b/
src/cocoa/radiobut.mm
@@
-6,7
+6,7
@@
// Created: 2003/03/16
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
// Created: 2003/03/16
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
@@
-28,7
+28,6
@@
WX_DEFINE_LIST(wxRadioButtonList);
WX_DEFINE_LIST(wxRadioButtonList);
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
// wxRadioButtonBase == wxControl
BEGIN_EVENT_TABLE(wxRadioButton, wxControl)
END_EVENT_TABLE()
// wxRadioButtonBase == wxControl
BEGIN_EVENT_TABLE(wxRadioButton, wxControl)
END_EVENT_TABLE()
@@
-77,7
+76,7
@@
bool wxRadioButton::Create(wxWindow *parent, wxWindowID winid,
SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]);
[m_cocoaNSView release];
[GetNSButton() setButtonType: NSRadioButton];
SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]);
[m_cocoaNSView release];
[GetNSButton() setButtonType: NSRadioButton];
-
[GetNSButton() setTitle:wxNSStringWithWxString(label)]
;
+
CocoaSetLabelForObject(label, GetNSButton())
;
// If it's the first in a group, it should be selected
if(style&wxRB_GROUP)
[GetNSButton() setState: NSOnState];
// If it's the first in a group, it should be selected
if(style&wxRB_GROUP)
[GetNSButton() setState: NSOnState];
@@
-145,6
+144,17
@@
bool wxRadioButton::GetValue() const
return state==NSOnState;
}
return state==NSOnState;
}
+void wxRadioButton::SetLabel(const wxString& label)
+{
+ wxAutoNSAutoreleasePool pool;
+ CocoaSetLabelForObject(label, GetNSButton());
+}
+
+wxString wxRadioButton::GetLabel() const
+{
+ return wxStringWithNSString([GetNSButton() title]);
+}
+
/**
* If this radio button is part of a group, this method turns off every other
* button in the group. If this radio button is not part of a group, this
/**
* If this radio button is part of a group, this method turns off every other
* button in the group. If this radio button is not part of a group, this
@@
-172,7
+182,7
@@
void wxRadioButton::Cocoa_wxNSButtonAction(void)
{
Cocoa_DeselectOtherButtonsInTheGroup();
}
{
Cocoa_DeselectOtherButtonsInTheGroup();
}
- wxCommandEvent event(wxEVT_
COMMAND_RADIOBUTTON_SELECTED
, GetId());
+ wxCommandEvent event(wxEVT_
RADIOBUTTON
, GetId());
InitCommandEvent(event); // event.SetEventObject(this);
event.SetInt(GetValue());
Command(event);
InitCommandEvent(event); // event.SetEventObject(this);
event.SetInt(GetValue());
Command(event);