Fixed bug: wxPropertyGridInterface::SetPropertyReadOnly() with wxPG_DONT_RECURSE...

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

diff --git a/src/osx/carbon/srchctrl.cpp b/src/osx/carbon/srchctrl.cpp
index 84af34d60fa92221a2272055988938d9fa289146..099b462873699743daddf52d195fc9fd42c9adf4 100644 (file)
--- a/src/osx/carbon/srchctrl.cpp
+++ b/src/osx/carbon/srchctrl.cpp
@@ -66,7 +66,7 @@ static const EventTypeSpec eventList[] =
 // implementation
 // ============================================================================
 
 // 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 ;
 
 {
     OSStatus result = eventNotHandledErr ;
 


@@ -122,6 +122,7 @@ wxMacSearchFieldControl::wxMacSearchFieldControl( wxTextCtrl *wxPeer,
 
     ::InstallControlEventHandler( m_controlRef, GetwxMacSearchControlEventHandlerUPP(),
         GetEventTypeCount(eventList), eventList, wxPeer, NULL);
 
     ::InstallControlEventHandler( m_controlRef, GetwxMacSearchControlEventHandlerUPP(),
         GetEventTypeCount(eventList), eventList, wxPeer, NULL);

+    SetNeedsFrame(false);

     wxMacUnicodeTextControl::InstallEventHandlers();
 }
 
     wxMacUnicodeTextControl::InstallEventHandlers();
 }
 


@@ -204,13 +205,13 @@ bool wxMacSearchFieldControl::SetFocus()
 }
 
 wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxTextCtrl* wxpeer, 
 }
 
 wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxTextCtrl* wxpeer, 

-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowMac* WXUNUSED(parent), 
+                                    wxWindowID WXUNUSED(id), 

                                     const wxString& str,
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 
                                     const wxString& str,
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 

-                                    long extraStyle)
+                                    long WXUNUSED(extraStyle))

 {
     wxMacControl* peer = new wxMacSearchFieldControl( wxpeer , str , pos , size , style );
 
 {
     wxMacControl* peer = new wxMacSearchFieldControl( wxpeer , str , pos , size , style );