Fix broken and missing DataView interface items for Phoenix

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

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 8e472f4888174e0597bd434464850e4edd9d3147..91000de3cb9a7a2124571ef2deb1322c3e562626 100644 (file)
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -168,7 +168,11 @@ public:
           m_bmp(bmp)
     { }
 
           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
 
     // The buttons in wxSearchCtrl shouldn't accept focus from keyboard because
     // this would interfere with the usual TAB processing: the user expects


@@ -1172,9 +1176,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*/ )