Use the best instead of current page size in OS X preferences dialog.

[wxWidgets.git] / src / osx / srchctrl_osx.cpp

diff --git a/src/osx/srchctrl_osx.cpp b/src/osx/srchctrl_osx.cpp
index d9ec1194f9263cf28fabf8ff548ef942f6b583de..03332a69106c42a01e3165af123ff034680a2ea4 100644 (file)
--- a/src/osx/srchctrl_osx.cpp
+++ b/src/osx/srchctrl_osx.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implements mac carbon wxSearchCtrl
 // Author:      Vince Harron
 // Created:     2006-02-19
-// RCS-ID:      $Id: srchctrl.cpp 54820 2008-07-29 20:04:11Z SC $
+// RCS-ID:      $Id$
 // Copyright:   Vince Harron
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -68,7 +68,7 @@ void wxSearchCtrl::Init()
 
 wxSearchWidgetImpl* wxSearchCtrl::GetSearchPeer() const
 {
-    return dynamic_cast<wxSearchWidgetImpl*> (m_peer);
+    return dynamic_cast<wxSearchWidgetImpl*> (GetPeer());
 }
 
 wxSearchCtrl::~wxSearchCtrl()
@@ -168,7 +168,7 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
             const wxValidator& validator,
             const wxString& name)
 {
-    m_macIsUserPane = false ;
+    DontCreatePeer();
     m_editable = true ;
 
     if ( ! (style & wxNO_BORDER) )
@@ -185,7 +185,7 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
     }
 
 
-    m_peer = wxWidgetImpl::CreateSearchControl( this, GetParent(), GetId(), value, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateSearchControl( this, GetParent(), GetId(), value, pos, size, style, GetExtraStyle() ));
 
     MacPostControlCreate(pos, size) ;
 
@@ -203,7 +203,7 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
 
 bool wxSearchCtrl::HandleSearchFieldSearchHit()
 {
-    wxCommandEvent event(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, m_windowId );
+    wxCommandEvent event(wxEVT_SEARCHCTRL_SEARCH_BTN, m_windowId );
     event.SetEventObject(this);
 
     // provide the string to search for directly in the event, this is more
@@ -215,7 +215,7 @@ bool wxSearchCtrl::HandleSearchFieldSearchHit()
 
 bool wxSearchCtrl::HandleSearchFieldCancelHit()
 {
-    wxCommandEvent event(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, m_windowId );
+    wxCommandEvent event(wxEVT_SEARCHCTRL_CANCEL_BTN, m_windowId );
     event.SetEventObject(this);
     return ProcessCommand(event);
 }