avoid setting a negative window size

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 49b469f03310bc7e7d9262a887b928ce4e4f0265..fd18cb07ea4c118dfdda651b4a4b1c9368cd518c 100644 (file)
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -532,6 +532,8 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
     y += BORDER;
     width -= horizontalBorder*2;
     height -= BORDER*2;
     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);
 
     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;
         cancelMargin = 0;
     }
     wxCoord textWidth = width - sizeSearch.x - sizeCancel.x - searchMargin - cancelMargin - 1;

+    if (textWidth < 0) textWidth = 0;

 
     // position the subcontrols inside the client area
 
 
     // position the subcontrols inside the client area