X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/038072e2f1eaf2bf32d748a71234d767ebba8919..4c7852186d48a5b8f406462c2c3fa020f0a052bb:/src/mgl/toplevel.cpp

diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp
index a026f42f92..1cf60d5e6f 100644
--- a/src/mgl/toplevel.cpp
+++ b/src/mgl/toplevel.cpp
@@ -28,6 +28,7 @@
 
 #include "wx/defs.h"
 #include "wx/toplevel.h"
+#include "wx/app.h"
 
 // ----------------------------------------------------------------------------
 // idle system
@@ -50,6 +51,7 @@ extern int g_openDialogs;
 
 void wxTopLevelWindowMGL::Init()
 {
+    m_isShown = FALSE;
     m_isIconized = FALSE;
     m_isMaximized = FALSE;
     m_fsIsShowing = FALSE;
@@ -74,14 +76,14 @@ bool wxTopLevelWindowMGL::Create(wxWindow *parent,
         if ( size.y == -1 )
             size.y = sizeDpy.y / 5;
     }
+    
+    wxWindow::Create(parent, id, pos, sizeOrig, style, name);
 
     wxTopLevelWindows.Append(this);
 
     m_title = title;
-
-
-    if (m_parent) 
-        m_parent->AddChild(this);
+    
+    // FIXME_MGL -- should activate itself when shown!
 
     return TRUE;
 }
@@ -134,24 +136,33 @@ bool wxTopLevelWindowMGL::ShowFullScreen(bool show, long style)
     return TRUE;
 }
 
+bool wxTopLevelWindowMGL::Show(bool show)
+{
+    bool ret = wxTopLevelWindowBase::Show(show);
+    if ( ret && show )
+        SetFocus();
+    return ret;
+}
+
 void wxTopLevelWindowMGL::Maximize(bool maximize)
 {
     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);
-        m_isMaximized = TRUE;
     }
     else if ( !maximize && m_isMaximized )
     {
+        m_isMaximized = FALSE;
         SetSize(m_savedFrame.x, m_savedFrame.y, 
                 m_savedFrame.width, m_savedFrame.height);
-        m_isMaximized = FALSE;
     }
 }
 
@@ -162,11 +173,11 @@ bool wxTopLevelWindowMGL::IsMaximized() const
 
 void wxTopLevelWindowMGL::Restore()
 {
-    if ( m_isIconized )
+    if ( IsIconized() )
     {
         Iconize(FALSE);
     }
-    if ( m_isMaximized )
+    if ( IsMaximized() )
     {
         Maximize(FALSE);
     }
@@ -174,7 +185,7 @@ void wxTopLevelWindowMGL::Restore()
 
 void wxTopLevelWindowMGL::Iconize(bool iconize)
 {
-    // FIXME_MGL
+    // FIXME_MGL - use wxDesktop for this
 }
 
 bool wxTopLevelWindowMGL::IsIconized() const