X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46ae103b9f08fc4e447d16a6a92b03cf55ee3189..3e1924dd5f5744c3e2a8973de9b3e4f372b7fd85:/src/mgl/toplevel.cpp?ds=sidebyside diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp index 69bbdf584a..d2ede3f43c 100644 --- a/src/mgl/toplevel.cpp +++ b/src/mgl/toplevel.cpp @@ -7,6 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + // ============================================================================ // declarations // ============================================================================ @@ -15,16 +22,12 @@ // headers // ---------------------------------------------------------------------------- -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" +#include "wx/toplevel.h" -#ifdef __BORLANDC__ -#pragma hdrstop -#endif +#ifndef WX_PRECOMP + #include "wx/app.h" +#endif // WX_PRECOMP -#include "wx/defs.h" -#include "wx/toplevel.h" -#include "wx/app.h" #include "wx/mgl/private.h" // ---------------------------------------------------------------------------- @@ -106,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.Number() == 0) && - (wxTheApp->GetExitOnFrameDelete())) - { - wxTheApp->ExitMainLoop(); - } -} - bool wxTopLevelWindowMGL::ShowFullScreen(bool show, long style) { if (show == m_fsIsShowing) return false; // return what? @@ -165,10 +152,10 @@ bool wxTopLevelWindowMGL::Show(bool show) m_sizeSet = true; wxSizeEvent event(GetSize(), GetId()); event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); } - if ( ret && show && AcceptsFocus() ) + if ( ret && show && CanAcceptFocus() ) SetFocus(); // FIXME_MGL -- don't do this for popup windows? return ret;