don't use negative windows sizes

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index d68a3b5e1521c12cd07ec2c21054ff58793cfd18..2d8ad5a544e375a3aa1af569a9ab8fa82dab3092 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -384,6 +384,8 @@ void wxFrame::GtkOnSize()
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
             int ww = m_width  - 2*m_miniEdge;
+            if (ww < 0)
+                ww = 0;
             int hh = m_menuBarHeight;
             if (m_menuBarDetached) hh = wxPLACE_HOLDER;
             m_frameMenuBar->m_x = xx;
@@ -423,6 +425,8 @@ void wxFrame::GtkOnSize()
                 ww = m_toolBarDetached ? wxPLACE_HOLDER
                                        : m_frameToolBar->m_width;
                 hh = m_height - 2*m_miniEdge;
+                if (hh < 0)
+                    hh = 0;
 
                 client_area_x_offset += ww;
             }
@@ -445,6 +449,10 @@ void wxFrame::GtkOnSize()
         int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
         int client_w = m_width - client_area_x_offset - 2*m_miniEdge;
         int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
+        if (client_w < 0)
+            client_w = 0;
+        if (client_h < 0)
+            client_h = 0;
         gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
                               m_wxwindow,
                               client_x, client_y, client_w, client_h );
@@ -461,6 +469,8 @@ void wxFrame::GtkOnSize()
         int xx = 0 + m_miniEdge;
         int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;
         int ww = m_width - 2*m_miniEdge;
+        if (ww < 0)
+            ww = 0;
         int hh = wxSTATUS_HEIGHT;
         m_frameStatusBar->m_x = xx;
         m_frameStatusBar->m_y = yy;

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 278629e5fa4a30c4804afd2e6b02d5e95e8ee774..a43befb6c599e85816e6ffd28df341ee154b4cb2 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -1021,6 +1021,10 @@ void wxTopLevelWindowGTK::GtkOnSize()
         int client_y = m_miniEdge + m_miniTitle;
         int client_w = m_width - 2*m_miniEdge;
         int client_h = m_height - 2*m_miniEdge - m_miniTitle;
+        if (client_w < 0)
+            client_w = 0;
+        if (client_h < 0)
+            client_h = 0;
 
         gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
                               m_wxwindow,