don't use deprecated toolbar API

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

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 2beebcf6137fcd621533bd79fca2695e6d83db2a..fd18cb07ea4c118dfdda651b4a4b1c9368cd518c 100644 (file)
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -139,17 +139,17 @@ public:
     // needs to forward to them
     void DoSetValue(const wxString& value, int flags)
     {
-        m_text->DoSetValue(value, flags);
+        wxTextCtrl::DoSetValue(value, flags);
     }
 
     bool DoLoadFile(const wxString& file, int fileType)
     {
-        return m_text->DoLoadFile(file, fileType);
+        return wxTextCtrl::DoLoadFile(file, fileType);
     }
 
     bool DoSaveFile(const wxString& file, int fileType)
     {
-        return m_text->DoSaveFile(file, fileType);
+        return wxTextCtrl::DoSaveFile(file, fileType);
     }
 
 protected:
@@ -532,6 +532,8 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
     y += BORDER;
     width -= horizontalBorder*2;
     height -= BORDER*2;
+    if (width < 0) width = 0;
+    if (height < 0) height = 0;
 
     wxSize sizeSearch(0,0);
     wxSize sizeCancel(0,0);
@@ -558,6 +560,7 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
         cancelMargin = 0;
     }
     wxCoord textWidth = width - sizeSearch.x - sizeCancel.x - searchMargin - cancelMargin - 1;
+    if (textWidth < 0) textWidth = 0;
 
     // position the subcontrols inside the client area
 
@@ -914,6 +917,21 @@ wxTextCtrl& operator<<(double d);
 wxTextCtrl& operator<<(const wxChar c);
 #endif
 
+void wxSearchCtrl::DoSetValue(const wxString& value, int flags)
+{
+    m_text->DoSetValue(value, flags);
+}
+
+bool wxSearchCtrl::DoLoadFile(const wxString& file, int fileType)
+{
+    return m_text->DoLoadFile(file, fileType);
+}
+
+bool wxSearchCtrl::DoSaveFile(const wxString& file, int fileType)
+{
+    return m_text->DoSaveFile(file, fileType);
+}
+
 // do the window-specific processing after processing the update event
 void wxSearchCtrl::DoUpdateWindowUI(wxUpdateUIEvent& event)
 {