Corrected bug in DoSetSize() (wxALLOW_MINUS_ONE)

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 57560172e68b1d18709f3f1a15bc7fa7e2b893b0..68afab7f746b3c6cacb7c44e02bfdcac559f7182 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -437,7 +437,7 @@ void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     int old_width = m_width;
     int old_height = m_height;
 
     int old_width = m_width;
     int old_height = m_height;
 

-    if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+    if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)

     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;
     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 37e2910235545f7a66c582105417ee6e56656886..eadb75575f9fb7c5943a2220eb839f31a15c56b7 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -482,7 +482,7 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     int old_width = m_width;
     int old_height = m_height;
 
     int old_width = m_width;
     int old_height = m_height;
 

-    if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+    if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)

     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;
     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 0200936cf0584eb98cb597364f05017ab4aadd15..97cc6cd44a2c4ca60f56284a1b4b60a0e6bb597b 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1983,7 +1983,7 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     }
     else
     {
     }
     else
     {

-        if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+        if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)

         {
             if (x != -1) m_x = x;
             if (y != -1) m_y = y;
         {
             if (x != -1) m_x = x;
             if (y != -1) m_y = y;


@@ -2994,7 +2994,10 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
     while (node)
     {
         wxWindow *child = (wxWindow*) node->Data();
     while (node)
     {
         wxWindow *child = (wxWindow*) node->Data();

-       child->Move( child->m_x + dx, child->m_y + dy );
+       int sx = 0;
+       int sy = 0;
+       child->GetSize( &sx, &sy );
+       child->SetSize( child->m_x + dx, child->m_y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE );

        node = node->Next();
     }
 
        node = node->Next();
     }
 

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 57560172e68b1d18709f3f1a15bc7fa7e2b893b0..68afab7f746b3c6cacb7c44e02bfdcac559f7182 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -437,7 +437,7 @@ void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     int old_width = m_width;
     int old_height = m_height;
 
     int old_width = m_width;
     int old_height = m_height;
 

-    if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+    if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)

     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;
     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 37e2910235545f7a66c582105417ee6e56656886..eadb75575f9fb7c5943a2220eb839f31a15c56b7 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -482,7 +482,7 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     int old_width = m_width;
     int old_height = m_height;
 
     int old_width = m_width;
     int old_height = m_height;
 

-    if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+    if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)

     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;
     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 0200936cf0584eb98cb597364f05017ab4aadd15..97cc6cd44a2c4ca60f56284a1b4b60a0e6bb597b 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -1983,7 +1983,7 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     }
     else
     {
     }
     else
     {

-        if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+        if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)

         {
             if (x != -1) m_x = x;
             if (y != -1) m_y = y;
         {
             if (x != -1) m_x = x;
             if (y != -1) m_y = y;


@@ -2994,7 +2994,10 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
     while (node)
     {
         wxWindow *child = (wxWindow*) node->Data();
     while (node)
     {
         wxWindow *child = (wxWindow*) node->Data();

-       child->Move( child->m_x + dx, child->m_y + dy );
+       int sx = 0;
+       int sy = 0;
+       child->GetSize( &sx, &sy );
+       child->SetSize( child->m_x + dx, child->m_y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE );

        node = node->Next();
     }
 
        node = node->Next();
     }
 

diff --git a/utils/glcanvas/gtk/glcanvas.cpp b/utils/glcanvas/gtk/glcanvas.cpp
index 14d5ac816d92bcc5a5ebf5eb89b4c36dc6df2184..93918cf149cdee1dc1ed6f3a35c3c4011ef34809 100644 (file)
--- a/utils/glcanvas/gtk/glcanvas.cpp
+++ b/utils/glcanvas/gtk/glcanvas.cpp
@@ -350,7 +350,7 @@ void wxGLCanvas::DoSetSize( int x, int y, int width, int height, int sizeFlags )
         int old_width = m_width;
         int old_height = m_height;
 
         int old_width = m_width;
         int old_height = m_height;
 

-        if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+        if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)

         {
             if (x != -1) m_x = x;
             if (y != -1) m_y = y;
         {
             if (x != -1) m_x = x;
             if (y != -1) m_y = y;