X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5eff438331d2b56b2770e1e369b03e843426a7f..404b319a85dadd7decf7a5a5331020520031a41c:/src/generic/srchctlg.cpp?ds=sidebyside

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 8e472f4888..4e9fd4bb83 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -72,6 +72,10 @@ public:
         InvalidateBestSize();
     }
 
+    virtual wxWindow* GetMainWindowOfCompositeControl()
+    {
+        return m_search;
+    }
 
     // provide access to the base class protected methods to wxSearchCtrl which
     // needs to forward to them
@@ -168,7 +172,11 @@ public:
           m_bmp(bmp)
     { }
 
-    void SetBitmapLabel(const wxBitmap& label) { m_bmp = label; }
+    void SetBitmapLabel(const wxBitmap& label)
+    {
+        m_bmp = label;
+        InvalidateBestSize();
+    }
 
     // The buttons in wxSearchCtrl shouldn't accept focus from keyboard because
     // this would interfere with the usual TAB processing: the user expects
@@ -178,6 +186,11 @@ public:
     // 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
     {
@@ -1172,9 +1185,10 @@ void wxSearchCtrl::RecalcBitmaps()
     }
 }
 
-void wxSearchCtrl::OnCancelButton( wxCommandEvent& WXUNUSED(event) )
+void wxSearchCtrl::OnCancelButton( wxCommandEvent& event )
 {
     m_text->Clear();
+    event.Skip();
 }
 
 void wxSearchCtrl::OnSetFocus( wxFocusEvent& /*event*/ )