move Freeze() and Thaw() to wxWindowBase to ensure that they behave consistently...

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

diff --git a/src/mac/carbon/srchctrl.cpp b/src/mac/carbon/srchctrl.cpp
index 24da3d7f70a895977e1e0b285c223de2aa20b83d..4a786293913a22b3ef4df5c668325bd21a9f9642 100644 (file)
--- a/src/mac/carbon/srchctrl.cpp
+++ b/src/mac/carbon/srchctrl.cpp
@@ -159,7 +159,7 @@ void wxMacSearchFieldControl::SetDescriptiveText(const wxString& text)
 {
     verify_noerr( HISearchFieldSetDescriptiveText(
                       m_controlRef,
-                      wxMacCFStringHolder( text, wxFont::GetDefaultEncoding() )));
+                      wxCFStringRef( text, wxFont::GetDefaultEncoding() )));
 }
 
 wxString wxMacSearchFieldControl::GetDescriptiveText() const
@@ -168,7 +168,7 @@ wxString wxMacSearchFieldControl::GetDescriptiveText() const
     verify_noerr( HISearchFieldCopyDescriptiveText( m_controlRef, &cfStr ));
     if ( cfStr )
     {
-        return wxMacCFStringHolder(cfStr).AsString();
+        return wxCFStringRef(cfStr).AsString();
     }
     else
     {