Added style parameter to wxPopupWindow ctors so they match the Create method.

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

diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp
index 1cf60d5e6f7469f68c4e6171f459de0b0a280cc1..595b1a828b7eec4cfeb62b9d258b3dcb9f912a27 100644 (file)
--- a/src/mgl/toplevel.cpp
+++ b/src/mgl/toplevel.cpp
@@ -82,8 +82,6 @@ bool wxTopLevelWindowMGL::Create(wxWindow *parent,
     wxTopLevelWindows.Append(this);
 
     m_title = title;
-    
-    // FIXME_MGL -- should activate itself when shown!
 
     return TRUE;
 }
@@ -139,8 +137,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;
 }