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

Corrected problem related to wxSIZE_ALLOW_MINUS_ONE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-01-04 16:18:44 +00:00
parent d3e90957cf
commit ce96b7a010
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/radiobox.cpp
View File

@@ -368,9 +368,9 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
int xx = x; int xx = x;
int yy = y; int yy = y;
if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
xx = currentX; xx = currentX;
if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
yy = currentY; yy = currentY;
#if RADIOBTN_PARENT_IS_RADIOBOX #if RADIOBTN_PARENT_IS_RADIOBOX

4
src/msw/slider95.cpp
View File

@@ -353,9 +353,9 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
int currentX, currentY; int currentX, currentY;
GetPosition(&currentX, &currentY); GetPosition(&currentX, &currentY);
if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
x1 = currentX; x1 = currentX;
if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
y1 = currentY; y1 = currentY;
AdjustForParentClientOrigin(x1, y1, sizeFlags); AdjustForParentClientOrigin(x1, y1, sizeFlags);

4
src/msw/slidrmsw.cpp
View File

@@ -324,9 +324,9 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
int currentX, currentY; int currentX, currentY;
GetPosition(&currentX, &currentY); GetPosition(&currentX, &currentY);
if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
x1 = currentX; x1 = currentX;
if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
y1 = currentY; y1 = currentY;
AdjustForParentClientOrigin(x1, y1, sizeFlags); AdjustForParentClientOrigin(x1, y1, sizeFlags);