Fix compilation for MinGW with wxUSE_IPV6==1.

[wxWidgets.git] / src / generic / srchctlg.cpp

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index acf408c2dd4a8ab7e9cb5dcbc4db74100d6c0765..4e9fd4bb83cc143a14537a2d1abeaa235846cd5f 100644 (file)
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -72,6 +72,10 @@ public:
         InvalidateBestSize();
     }
 
         InvalidateBestSize();
     }
 

+    virtual wxWindow* GetMainWindowOfCompositeControl()
+    {
+        return m_search;
+    }

 
     // provide access to the base class protected methods to wxSearchCtrl which
     // needs to forward to them
 
     // provide access to the base class protected methods to wxSearchCtrl which
     // needs to forward to them


@@ -182,6 +186,11 @@ public:
     // is really no reason for it to be able to get focus from keyboard.
     virtual bool AcceptsFocusFromKeyboard() const { return false; }
 
     // is really no reason for it to be able to get focus from keyboard.
     virtual bool AcceptsFocusFromKeyboard() const { return false; }
 

+    virtual wxWindow* GetMainWindowOfCompositeControl()
+    {
+        return m_search;
+    }
+

 protected:
     wxSize DoGetBestSize() const
     {
 protected:
     wxSize DoGetBestSize() const
     {


@@ -1176,9 +1185,10 @@ void wxSearchCtrl::RecalcBitmaps()
     }
 }
 
     }
 }
 

-void wxSearchCtrl::OnCancelButton( wxCommandEvent& WXUNUSED(event) )
+void wxSearchCtrl::OnCancelButton( wxCommandEvent& event )

 {
     m_text->Clear();
 {
     m_text->Clear();

+    event.Skip();

 }
 
 void wxSearchCtrl::OnSetFocus( wxFocusEvent& /*event*/ )
 }
 
 void wxSearchCtrl::OnSetFocus( wxFocusEvent& /*event*/ )