X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e181c7a2c32193fc8138cc32ed07984eadd4a21..ec2df34e27ba41f202ecbf096cdfed082a9ddb8f:/src/osx/carbon/srchctrl.cpp diff --git a/src/osx/carbon/srchctrl.cpp b/src/osx/carbon/srchctrl.cpp index 84af34d60f..929340920d 100644 --- a/src/osx/carbon/srchctrl.cpp +++ b/src/osx/carbon/srchctrl.cpp @@ -5,7 +5,7 @@ // Created: 2006-02-19 // RCS-ID: $Id$ // Copyright: Vince Harron -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx.h". @@ -39,7 +39,7 @@ public : const wxString& str, const wxPoint& pos, const wxSize& size, long style ) ; - + // search field options virtual void ShowSearchButton( bool show ); virtual bool IsSearchButtonVisible() const; @@ -50,7 +50,7 @@ public : virtual void SetSearchMenu( wxMenu* menu ); virtual void SetDescriptiveText(const wxString& text); - + virtual bool SetFocus(); private: @@ -66,7 +66,7 @@ static const EventTypeSpec eventList[] = // implementation // ============================================================================ -static pascal OSStatus wxMacSearchControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +static pascal OSStatus wxMacSearchControlEventHandler( EventHandlerCallRef WXUNUSED(handler) , EventRef event , void *data ) { OSStatus result = eventNotHandledErr ; @@ -122,6 +122,7 @@ wxMacSearchFieldControl::wxMacSearchFieldControl( wxTextCtrl *wxPeer, ::InstallControlEventHandler( m_controlRef, GetwxMacSearchControlEventHandlerUPP(), GetEventTypeCount(eventList), eventList, wxPeer, NULL); + SetNeedsFrame(false); wxMacUnicodeTextControl::InstallEventHandlers(); } @@ -203,14 +204,14 @@ bool wxMacSearchFieldControl::SetFocus() return true; } -wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxTextCtrl* wxpeer, - wxWindowMac* parent, - wxWindowID id, +wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxSearchCtrl* wxpeer, + wxWindowMac* WXUNUSED(parent), + wxWindowID WXUNUSED(id), const wxString& str, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, - long extraStyle) + long style, + long WXUNUSED(extraStyle)) { wxMacControl* peer = new wxMacSearchFieldControl( wxpeer , str , pos , size , style );