don't modify the output variable if ToXXX() fails to convert (modified patch 1849041)

[wxWidgets.git] / src / mac / carbon / textctrl.cpp

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index f44ec41d345ec4ae6a4e20abc90b9e5e89731d43..eb8d7e194095e3549a89e00ca2054bd6f080ae5f 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -44,6 +44,7 @@
 
 #include "wx/filefn.h"
 #include "wx/sysopt.h"
 
 #include "wx/filefn.h"
 #include "wx/sysopt.h"

+#include "wx/thread.h"

 
 #include "wx/mac/uma.h"
 #include "wx/mac/carbon/private/mactext.h"
 
 #include "wx/mac/uma.h"
 #include "wx/mac/carbon/private/mactext.h"


@@ -1338,7 +1339,7 @@ bool wxMacUnicodeTextControl::Create( wxTextCtrl *wxPeer,
     Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;
     Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;

-    wxMacCFStringHolder cf(st , m_font.GetEncoding()) ;
+    wxCFStringRef cf(st , m_font.GetEncoding()) ;

     CFStringRef cfr = cf ;
 
     m_valueTag = kControlEditTextCFStringTag ;
     CFStringRef cfr = cf ;
 
     m_valueTag = kControlEditTextCFStringTag ;


@@ -1382,7 +1383,7 @@ wxString wxMacUnicodeTextControl::GetStringValue() const
     CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;
     if ( value )
     {
     CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;
     if ( value )
     {

-        wxMacCFStringHolder cf(value) ;
+        wxCFStringRef cf(value) ;

         result = cf.AsString() ;
     }
 
         result = cf.AsString() ;
     }
 


@@ -1399,7 +1400,7 @@ void wxMacUnicodeTextControl::SetStringValue( const wxString &str )
 {
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;
 {
     wxString st = str ;
     wxMacConvertNewlines10To13( &st ) ;

-    wxMacCFStringHolder cf( st , m_font.GetEncoding() ) ;
+    wxCFStringRef cf( st , m_font.GetEncoding() ) ;

     verify_noerr( SetData<CFStringRef>( 0, m_valueTag , cf ) ) ;
 }
 
     verify_noerr( SetData<CFStringRef>( 0, m_valueTag , cf ) ) ;
 }
 


@@ -1465,7 +1466,7 @@ void wxMacUnicodeTextControl::SetSelection( long from , long to )
     CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;
     if ( value )
     {
     CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;
     if ( value )
     {

-        wxMacCFStringHolder cf(value) ;
+        wxCFStringRef cf(value) ;

         textLength = cf.AsString().length() ;
     }
 
         textLength = cf.AsString().length() ;
     }
 


@@ -1498,7 +1499,7 @@ void wxMacUnicodeTextControl::WriteText( const wxString& str )
 
     if ( HasFocus() )
     {
 
     if ( HasFocus() )
     {

-        wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
+        wxCFStringRef cf(st , m_font.GetEncoding() ) ;

         CFStringRef value = cf ;
         SetData<CFStringRef>( 0, kControlEditTextInsertCFStringRefTag, &value );
     }
         CFStringRef value = cf ;
         SetData<CFStringRef>( 0, kControlEditTextInsertCFStringRefTag, &value );
     }