Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid setting a negative window size

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-06-23 17:43:09 +00:00
parent 84513dcb32
commit d3ad397447
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/generic/srchctlg.cpp
View File

@@ -532,6 +532,8 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
y += BORDER; y += BORDER;
width -= horizontalBorder*2; width -= horizontalBorder*2;
height -= BORDER*2; height -= BORDER*2;
if (width < 0) width = 0;
if (height < 0) height = 0;
wxSize sizeSearch(0,0); wxSize sizeSearch(0,0);
wxSize sizeCancel(0,0); wxSize sizeCancel(0,0);
@@ -558,6 +560,7 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
cancelMargin = 0; cancelMargin = 0;
} }
wxCoord textWidth = width - sizeSearch.x - sizeCancel.x - searchMargin - cancelMargin - 1; 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