Changed wxGTK's notion of SetSize() to never allow setting
the width and height to -1 even if the wxALLOW_MINUS_ONE flag is set. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
2c519e86c2
commit
d44c23ceb6
@ -593,16 +593,14 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
|
||||
{
|
||||
if (x != -1) m_x = x;
|
||||
if (y != -1) m_y = y;
|
||||
if (width != -1) m_width = width;
|
||||
if (height != -1) m_height = height;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_x = x;
|
||||
m_y = y;
|
||||
m_width = width;
|
||||
m_height = height;
|
||||
}
|
||||
if (width != -1) m_width = width;
|
||||
if (height != -1) m_height = height;
|
||||
|
||||
/*
|
||||
if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
|
||||
|
@ -2691,16 +2691,14 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
|
||||
{
|
||||
if (x != -1) m_x = x + pizza->xoffset;
|
||||
if (y != -1) m_y = y + pizza->yoffset;
|
||||
if (width != -1) m_width = width;
|
||||
if (height != -1) m_height = height;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_x = x + pizza->xoffset;
|
||||
m_y = y + pizza->yoffset;
|
||||
m_width = width;
|
||||
m_height = height;
|
||||
}
|
||||
if (width != -1) m_width = width;
|
||||
if (height != -1) m_height = height;
|
||||
|
||||
if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
|
||||
{
|
||||
|
@ -593,16 +593,14 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
|
||||
{
|
||||
if (x != -1) m_x = x;
|
||||
if (y != -1) m_y = y;
|
||||
if (width != -1) m_width = width;
|
||||
if (height != -1) m_height = height;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_x = x;
|
||||
m_y = y;
|
||||
m_width = width;
|
||||
m_height = height;
|
||||
}
|
||||
if (width != -1) m_width = width;
|
||||
if (height != -1) m_height = height;
|
||||
|
||||
/*
|
||||
if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
|
||||
|
@ -2691,16 +2691,14 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
|
||||
{
|
||||
if (x != -1) m_x = x + pizza->xoffset;
|
||||
if (y != -1) m_y = y + pizza->yoffset;
|
||||
if (width != -1) m_width = width;
|
||||
if (height != -1) m_height = height;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_x = x + pizza->xoffset;
|
||||
m_y = y + pizza->yoffset;
|
||||
m_width = width;
|
||||
m_height = height;
|
||||
}
|
||||
if (width != -1) m_width = width;
|
||||
if (height != -1) m_height = height;
|
||||
|
||||
if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user