Add support for EVT_WEB_VIEW_NEWWINDOW to the OSX WebKit backend.

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

diff --git a/src/osx/carbon/srchctrl.cpp b/src/osx/carbon/srchctrl.cpp
index 099b462873699743daddf52d195fc9fd42c9adf4..929340920de8ae873d1c18bca7bf46427e4440ee 100644 (file)
--- 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
 // Created:     2006-02-19
 // RCS-ID:      $Id$
 // Copyright:   Vince Harron

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 ///////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".


@@ -39,7 +39,7 @@ public :
                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;

-                             
+

     // search field options
     virtual void ShowSearchButton( bool show );
     virtual bool IsSearchButtonVisible() const;
     // 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 void SetSearchMenu( wxMenu* menu );
 
     virtual void SetDescriptiveText(const wxString& text);

-    
+

     virtual bool SetFocus();
 
 private:
     virtual bool SetFocus();
 
 private:


@@ -204,13 +204,13 @@ bool wxMacSearchFieldControl::SetFocus()
     return true;
 }
 
     return true;
 }
 

-wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxTextCtrl* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxSearchCtrl* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& str,
                                     const wxString& str,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

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