unifying CFTypes

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

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index eb68ae30f2e5e19bd5e70d2763d0ab64b866cba8..3a29953622cebe0e984756290fb75956683bb37b 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -326,7 +326,7 @@ private :
 #if wxUSE_TIMER 
     wxMacToolTipTimer* m_timer ;
 #endif
 #if wxUSE_TIMER 
     wxMacToolTipTimer* m_timer ;
 #endif

-    wxMacCFStringHolder m_helpTextRef ;
+    wxCFStringRef m_helpTextRef ;

 } ;
 
 // Quartz 
 } ;
 
 // Quartz 


@@ -781,7 +781,7 @@ public :
 
 protected :
     wxString    m_label;
 
 protected :
     wxString    m_label;

-    wxMacCFStringHolder m_cfLabel;
+    wxCFStringRef m_cfLabel;

     void *      m_data;
     SInt32      m_order;
     DataBrowserPropertyID m_colId;
     void *      m_data;
     SInt32      m_order;
     DataBrowserPropertyID m_colId;