never return negative client sizes, fixes #15338

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-16 05:13:35 +00:00
parent b545d7ab09
commit c93a9c50a5
1 changed files with 15 additions and 2 deletions
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -872,9 +872,22 @@ void wxWindowMac::DoGetClientSize( int *x, int *y ) const

 #endif
    if (x)
-       *x = ww;
+    {
+        // we shouldn't return invalid width
+        if ( ww < 0 )
+            ww = 0;
+        
+        *x = ww;
+    }
+    
    if (y)
-       *y = hh;
+    {
+        // we shouldn't return invalid height
+        if ( hh < 0 )
+            hh = 0;
+        
+        *y = hh;
+    }
 }

 bool wxWindowMac::SetCursor(const wxCursor& cursor)