projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't reset bullet number and outline number when applying style sheet.
[wxWidgets.git]
/
src
/
cocoa
/
checkbox.mm
diff --git
a/src/cocoa/checkbox.mm
b/src/cocoa/checkbox.mm
index c17d1152fcde79448f2a5d0e2d8b03effda96dff..eba72f400c2be2afc463a0f749f837619007dade 100644
(file)
--- a/
src/cocoa/checkbox.mm
+++ b/
src/cocoa/checkbox.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"
@@
-47,7
+47,7
@@
bool wxCheckBox::Create(wxWindow *parent, wxWindowID winid,
[m_cocoaNSView release];
[GetNSButton() setButtonType: NSSwitchButton];
[GetNSButton() setAllowsMixedState: Is3State()];
[m_cocoaNSView release];
[GetNSButton() setButtonType: NSSwitchButton];
[GetNSButton() setAllowsMixedState: Is3State()];
-
[GetNSButton() setTitle:wxNSStringWithWxString(GetLabelText(label))]
;
+
CocoaSetLabelForObject(label, GetNSButton())
;
[GetNSControl() sizeToFit];
if(m_parent)
[GetNSControl() sizeToFit];
if(m_parent)
@@
-140,7
+140,7
@@
void wxCheckBox::Cocoa_wxNSButtonAction(void)
void wxCheckBox::SetLabel(const wxString& s)
{
wxAutoNSAutoreleasePool pool;
void wxCheckBox::SetLabel(const wxString& s)
{
wxAutoNSAutoreleasePool pool;
-
[GetNSButton() setTitle:wxNSStringWithWxString(s)]
;
+
CocoaSetLabelForObject(s, GetNSButton())
;
}
wxString wxCheckBox::GetLabel() const
}
wxString wxCheckBox::GetLabel() const