Updates for Y positioning

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

diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp
index 595b1a828b7eec4cfeb62b9d258b3dcb9f912a27..c70e6f3865e4942d613403029cb05c2e9d79c68c 100644 (file)
--- a/src/mgl/toplevel.cpp
+++ b/src/mgl/toplevel.cpp
@@ -29,6 +29,7 @@
 #include "wx/defs.h"
 #include "wx/toplevel.h"
 #include "wx/app.h"
+#include "wx/mgl/private.h"
 
 // ----------------------------------------------------------------------------
 // idle system
@@ -55,6 +56,7 @@ void wxTopLevelWindowMGL::Init()
     m_isIconized = FALSE;
     m_isMaximized = FALSE;
     m_fsIsShowing = FALSE;
+    m_sizeSet = FALSE;
 }
 
 bool wxTopLevelWindowMGL::Create(wxWindow *parent,
@@ -77,10 +79,12 @@ bool wxTopLevelWindowMGL::Create(wxWindow *parent,
             size.y = sizeDpy.y / 5;
     }
     
-    wxWindow::Create(parent, id, pos, sizeOrig, style, name);
+    wxWindow::Create(NULL, id, pos, sizeOrig, style, name);
+    SetParent(parent);
+    if ( parent )
+        parent->AddChild(this);
 
     wxTopLevelWindows.Append(this);
-
     m_title = title;
 
     return TRUE;
@@ -137,6 +141,17 @@ bool wxTopLevelWindowMGL::ShowFullScreen(bool show, long style)
 bool wxTopLevelWindowMGL::Show(bool show)
 {
     bool ret = wxTopLevelWindowBase::Show(show);
+
+    // If this is the first time Show was called, send size event,
+    // so that the frame can adjust itself (think auto layout or single child)
+    if ( !m_sizeSet )
+    {
+        m_sizeSet = TRUE;
+        wxSizeEvent event(GetSize(), GetId());
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
+    }
+
     if ( ret && show && AcceptsFocus() )
         SetFocus();
         // FIXME_MGL -- don't do this for popup windows?
@@ -145,16 +160,19 @@ bool wxTopLevelWindowMGL::Show(bool show)
 
 void wxTopLevelWindowMGL::Maximize(bool maximize)
 {
+    int x, y, w, h;
+    wxClientDisplayRect(&x, &y, &w, &h);
+
+    rect_t screenRect = MGL_defRect(x, y, w, h);
+    MGL_wmInvalidateRect(g_winMng, &screenRect);
+
     if ( maximize && !m_isMaximized )
     {
-        int x, y, w, h;
-        
         m_isMaximized = TRUE;
 
         GetPosition(&m_savedFrame.x, &m_savedFrame.y);
         GetSize(&m_savedFrame.width, &m_savedFrame.height);
 
-        wxClientDisplayRect(&x, &y, &w, &h);
         SetSize(x, y, w, h);
     }
     else if ( !maximize && m_isMaximized )
@@ -182,9 +200,11 @@ void wxTopLevelWindowMGL::Restore()
     }
 }
 
-void wxTopLevelWindowMGL::Iconize(bool iconize)
+void wxTopLevelWindowMGL::Iconize(bool WXUNUSED(iconize))
 {
-    // FIXME_MGL - use wxDesktop for this
+    wxFAIL_MSG(wxT("Iconize not supported under wxMGL"));
+    // FIXME_MGL - Iconize is not supported in fullscreen mode.
+    //             It will be supported in windowed mode (if ever implemented in MGL...)
 }
 
 bool wxTopLevelWindowMGL::IsIconized() const