fixed menubar attaching: create it first, THEN set pointer to it

[wxWidgets.git] / src / mgl / window.cpp

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index 12fd871b8d2433b783e3d7733395077bdbd4b946..5c1cab3bf154f9afa2c3495d9aac7ffe85727a95 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -960,7 +960,7 @@ void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             width = currentW;
         }
     }
-
+    
     if ( height == -1 )
     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
@@ -979,6 +979,16 @@ void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             height = currentH;
         }
     }
+    
+    int maxWidth = GetMaxWidth(),
+        minWidth = GetMinWidth(),    
+        maxHeight = GetMaxHeight(),
+        minHeight = GetMinHeight();
+        
+    if ( minWidth != -1 && width < minWidth ) width = minWidth;
+    if ( maxWidth != -1 && width > maxWidth ) width = maxWidth;
+    if ( minHeight != -1 && height < minHeight ) height = minHeight;
+    if ( maxHeight != -1 && height > maxHeight ) height = maxHeight;
 
     if ( m_wnd->x != x || m_wnd->y != y || 
          (int)m_wnd->width != width || (int)m_wnd->height != height )