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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index eb820f7f15c7725effb31c30c6cc5d930fee86e1..f8e5019b0d4083b9a7f288f3225ec7819f1dfe84 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -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 (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;
     }
     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)
 
 /*
     if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index d3dac9b822199a567c78df5dbadbe472230cccc3..2786d91934b6c0e1617a3cebae9f9049bcbce267 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -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 (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;
         }
         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)
         {
 
         if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
         {

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index eb820f7f15c7725effb31c30c6cc5d930fee86e1..f8e5019b0d4083b9a7f288f3225ec7819f1dfe84 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -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 (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;
     }
     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)
 
 /*
     if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index d3dac9b822199a567c78df5dbadbe472230cccc3..2786d91934b6c0e1617a3cebae9f9049bcbce267 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -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 (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;
         }
         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)
         {
 
         if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
         {