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 fe3f47987009d93558353f0058c5b99d38119720..9da363eb5091ac37898a824c91c99fd6ce8cf120 100644 (file)
--- 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;
 
     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 ) ;
 
     OSStatus err;
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index e43aaa6dbaf9d85650496a067e9d280f8925b0e7..b1c9af8e45978c272092dcb24ff445f1068d9cd4 100644 (file)
--- 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;
 
     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)
 
     SInt32 maxValue = 1 /* kControlCheckboxCheckedValue */;
     if (style & wxCHK_3STATE)

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index da6e2588685f4c460fa39c2ef1d001b05555c308..68ad272a3c62648b4284ca4512f7212c0fcdf9de 100644 (file)
--- 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 );
 
 
     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 )
 
     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 5a83609f27cf2c7daafcf33f3ec8647993e1cb2a..7f866d2536a798508dad6b75a2319fbe34c8f573 100644 (file)
--- 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;
 
     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 );
 
 
     Rect bounds = wxMacGetBoundsForControl( this, pos, size );
 

diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index 53dfd546351fe5bf588c804dcef97a56929e3fa9..9080cab4f11b910c7994c43c9d559ef40d156be7 100644 (file)
--- 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;
 
     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 );
 
 
     Rect bounds = wxMacGetBoundsForControl( this, pos, size );
 

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 236c88000eeb194913f7e3db34ccdd549ebc59bf..fdbdf4ba0fd22daa06c4289e32978ebadb216a77 100644 (file)
--- 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)
 {
 
 void wxStaticText::DoSetLabel(const wxString& label)
 {

+    m_labelOrig = label;

     m_label = RemoveMnemonics(label);
 
     wxMacCFStringHolder str( m_label, m_font.GetEncoding() );
     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 3e974ca9a479dedeebb7707adda5af44f4bcf6fe..27bb8c15e6e6aeb764c9ca2a76ff2c3193548efd 100644 (file)
--- 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;
     
     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 ) ;
     
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;