Fix file paths in wxFileSystemWatcherEvent under OS X.

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

diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp
index 80646a601ffb27f3691971fc03bb5596aee64649..d2ede3f43c4bc713b211c3704156d2294276712a 100644 (file)
--- a/src/mgl/toplevel.cpp
+++ b/src/mgl/toplevel.cpp
@@ -7,6 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -15,16 +22,9 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
+#include "wx/toplevel.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"
-    #include "wx/toplevel.h"

     #include "wx/app.h"
 #endif // WX_PRECOMP
 
     #include "wx/app.h"
 #endif // WX_PRECOMP
 


@@ -109,22 +109,6 @@ bool wxTopLevelWindowMGL::Create(wxWindow *parent,
     return true;
 }
 
     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?
 bool wxTopLevelWindowMGL::ShowFullScreen(bool show, long style)
 {
     if (show == m_fsIsShowing) return false; // return what?


@@ -168,10 +152,10 @@ bool wxTopLevelWindowMGL::Show(bool show)
         m_sizeSet = true;
         wxSizeEvent event(GetSize(), GetId());
         event.SetEventObject(this);
         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;
         SetFocus();
         // FIXME_MGL -- don't do this for popup windows?
     return ret;