From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 14 Jul 2007 05:47:37 +0000 (+0000)
Subject: adapting to new m_labelOrig label member
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ab0f37b97b488f0ec3082dbb0abac66bd0c48bd6?hp=6a4cbac17af82fdf6b8220b309da74b735d616fb

adapting to new m_labelOrig label member

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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index fe3f479870..9da363eb50 100644
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -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 ) ;
diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index e43aaa6dba..b1c9af8e45 100644
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -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)
diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index da6e258868..68ad272a3c 100644
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -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 )
diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 5a83609f27..7f866d2536 100644
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -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 );
 
diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index 53dfd54635..9080cab4f1 100644
--- a/src/mac/carbon/statbox.cpp
+++ b/src/mac/carbon/statbox.cpp
@@ -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 );
 
diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 236c88000e..fdbdf4ba0f 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -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() );
diff --git a/src/mac/carbon/tglbtn.cpp b/src/mac/carbon/tglbtn.cpp
index 3e974ca9a4..27bb8c15e6 100644
--- a/src/mac/carbon/tglbtn.cpp
+++ b/src/mac/carbon/tglbtn.cpp
@@ -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 ) ;