adapting to new m_labelOrig label member

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-07-14 05:47:37 +00:00
parent 6a4cbac17a
commit ab0f37b97b
7 changed files with 7 additions and 6 deletions

View File

@@ -43,7 +43,7 @@ bool wxButton::Create(wxWindow *parent,
if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )
return false;
m_label = label ;
m_labelOrig = m_label = label ;
OSStatus err;
Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

View File

@@ -36,7 +36,7 @@ bool wxCheckBox::Create(wxWindow *parent,
if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
return false;
m_label = label ;
m_labelOrig = m_label = label ;
SInt32 maxValue = 1 /* kControlCheckboxCheckedValue */;
if (style & wxCHK_3STATE)

View File

@@ -107,7 +107,7 @@ bool wxRadioBox::Create( wxWindow *parent,
SetMajorDim( majorDim == 0 ? n : majorDim, style );
m_label = label;
m_labelOrig = m_label = label;
Rect bounds = wxMacGetBoundsForControl( this, pos, size );
if ( bounds.right <= bounds.left )

View File

@@ -33,7 +33,7 @@ bool wxRadioButton::Create( wxWindow *parent,
if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
return false;
m_label = label;
m_labelOrig = m_label = label;
Rect bounds = wxMacGetBoundsForControl( this, pos, size );

View File

@@ -32,7 +32,7 @@ bool wxStaticBox::Create( wxWindow *parent,
if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
return false;
m_label = label;
m_labelOrig = m_label = label;
Rect bounds = wxMacGetBoundsForControl( this, pos, size );

View File

@@ -186,6 +186,7 @@ bool wxStaticText::SetFont(const wxFont& font)
void wxStaticText::DoSetLabel(const wxString& label)
{
m_labelOrig = label;
m_label = RemoveMnemonics(label);
wxMacCFStringHolder str( m_label, m_font.GetEncoding() );

View File

@@ -54,7 +54,7 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
return false;
m_label = label ;
m_labelOrig = m_label = label ;
Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;