fix digitalmars bug (ambiguous symbol)

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

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index 45f77b88ae150d4309768e29ca659f4e2a4da61e..dffb68253cd5086a2f005231e6c4cf07ffa376e0 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "app.h"
 #endif
 
@@ -204,11 +204,11 @@ static void wxDestroyMGL_WM()
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxApp::OnIdle)
+    EVT_IDLE(wxAppBase::OnIdle)
 END_EVENT_TABLE()
 
 
-wxApp::wxApp() : m_mainLoop(NULL)
+wxApp::wxApp()
 {
 }
 
@@ -272,66 +272,9 @@ bool wxApp::OnInitGui()
     return TRUE;
 }
 
-void wxApp::OnIdle(wxIdleEvent &event)
-{
-    static bool s_inOnIdle = FALSE;
-
-    /* Avoid recursion (via ProcessEvent default case) */
-    if (s_inOnIdle)
-        return;
-
-    s_inOnIdle = TRUE;
-
-    /* Resend in the main thread events which have been prepared in other
-       threads */
-    ProcessPendingEvents();
-
-    // 'Garbage' collection of windows deleted with Close().
-    DeletePendingObjects();
-
-#if wxUSE_LOG
-    // flush the logged messages if any
-    wxLog::FlushActive();
-#endif // wxUSE_LOG
-
-    // Send OnIdle events to all windows
-    if ( SendIdleEvents() )
-        event.RequestMore(TRUE);
-
-    s_inOnIdle = FALSE;
-}
-
-int wxApp::MainLoop()
-{
-    int rt;
-    m_mainLoop = new wxEventLoop;
-
-    rt = m_mainLoop->Run();
-
-    delete m_mainLoop;
-    m_mainLoop = NULL;
-    return rt;
-}
-
-void wxApp::ExitMainLoop()
-{
-    if ( m_mainLoop )
-        m_mainLoop->Exit(0);
-}
-
 bool wxApp::Initialized()
 {
-    return (wxTopLevelWindows.GetCount() != 0);
-}
-
-bool wxApp::Pending()
-{
-    return wxEventLoop::GetActive()->Pending();
-}
-
-void wxApp::Dispatch()
-{
-    wxEventLoop::GetActive()->Dispatch();
+    return wxTopLevelWindows.GetCount() != 0;
 }
 
 bool wxApp::Initialize(int& argc, wxChar **argv)