unload msimg32.dll earlier (before static cleanup time) to avoid lockups when wx...

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

diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp
index 1ec5da6c11091d9cc1804f17d1fc26b2f85a6dfc..ebb4bacd10802d58d6bfb6c2a681587014551521 100644 (file)
--- a/src/mgl/toplevel.cpp
+++ b/src/mgl/toplevel.cpp
@@ -22,8 +22,9 @@
 // headers
 // ----------------------------------------------------------------------------
 
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/toplevel.h"
     #include "wx/app.h"
 #endif // WX_PRECOMP
 
@@ -108,22 +109,6 @@ bool wxTopLevelWindowMGL::Create(wxWindow *parent,
     return true;
 }
 
-wxTopLevelWindowMGL::~wxTopLevelWindowMGL()
-{
-    m_isBeingDeleted = true;
-
-    wxTopLevelWindows.DeleteObject(this);
-
-    if (wxTheApp->GetTopWindow() == this)
-        wxTheApp->SetTopWindow(NULL);
-
-    if (wxTopLevelWindows.IsEmpty() &&
-        wxTheApp->GetExitOnFrameDelete())
-    {
-        wxTheApp->ExitMainLoop();
-    }
-}
-
 bool wxTopLevelWindowMGL::ShowFullScreen(bool show, long style)
 {
     if (show == m_fsIsShowing) return false; // return what?
@@ -170,7 +155,7 @@ bool wxTopLevelWindowMGL::Show(bool show)
         GetEventHandler()->ProcessEvent(event);
     }
 
-    if ( ret && show && AcceptsFocus() )
+    if ( ret && show && CanAcceptFocus() )
         SetFocus();
         // FIXME_MGL -- don't do this for popup windows?
     return ret;