Updated to version 1.40 of Scintilla

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

diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp
index 1cf60d5e6f7469f68c4e6171f459de0b0a280cc1..3f2bbcd209f4d9f904cb33430b9fa8cf3dcf32b8 100644 (file)
--- a/src/mgl/toplevel.cpp
+++ b/src/mgl/toplevel.cpp
@@ -77,13 +77,14 @@ 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;
-    
-    // FIXME_MGL -- should activate itself when shown!
 
     return TRUE;
 }
@@ -139,8 +140,9 @@ bool wxTopLevelWindowMGL::ShowFullScreen(bool show, long style)
 bool wxTopLevelWindowMGL::Show(bool show)
 {
     bool ret = wxTopLevelWindowBase::Show(show);
-    if ( ret && show )
+    if ( ret && show && AcceptsFocus() )
         SetFocus();
+        // FIXME_MGL -- don't do this for popup windows?
     return ret;
 }