wxMGL compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index dcd2a766e07cb1eaf4e842c35a5172b73e03029d..084bc9f162fcedb0274db45dcf99fb20027ffaa3 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -16,6 +16,8 @@
     #pragma interface "evtloop.h"
 #endif
 
     #pragma interface "evtloop.h"
 #endif
 

+#include "wx/utils.h"
+

 class WXDLLEXPORT wxEventLoopImpl;
 
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxEventLoopImpl;
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index c1e6aca51774893ff24b1ed8cb3a5e866f079735..fa98fc1e935dad011176227a21ba06d411dcf6aa 100644 (file)
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@@ -46,7 +46,9 @@ public:
 
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
 
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();

-
+    
+    virtual void Exit();
+    virtual void WakeUpIdle();

     virtual bool Yield(bool onlyIfNeeded = FALSE);
 
     virtual wxDisplayModeInfo GetDisplayMode() const { return m_displayMode; }
     virtual bool Yield(bool onlyIfNeeded = FALSE);
 
     virtual wxDisplayModeInfo GetDisplayMode() const { return m_displayMode; }

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index d92b40c293ecb58b52c7a8d0447aa871a261d958..dffb68253cd5086a2f005231e6c4cf07ffa376e0 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -208,7 +208,7 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

-wxApp::wxApp() : m_mainLoop(NULL)
+wxApp::wxApp()

 {
 }
 
 {
 }
 

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index a5c2f9349716369a005ca1269f00fa41aeaf3492..209597e1409a93f910f58eaf7dffdde6ac0c1378 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -208,24 +208,26 @@ int wxDisplayDepth()
     return g_displayDC->getBitsPerPixel();
 }
 
     return g_displayDC->getBitsPerPixel();
 }
 

-int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()

 {
 {

-    if ( majorVsn )
-        *majorVsn = MGL_RELEASE_MAJOR;
-    if ( minorVsn )
-        *minorVsn = MGL_RELEASE_MINOR;
-
+    static wxToolkitInfo info;
+    info.shortName = _T("mgluniv");
+    info.name = _T("wxMGL");
+    info.versionMajor = MGL_RELEASE_MAJOR;
+    info.versionMinor = MGL_RELEASE_MINOR;
+    info.os = wxGTK;

 #if defined(__UNIX__)
 #if defined(__UNIX__)

-    return wxMGL_UNIX;
+    info.os = wxMGL_UNIX;

 #elif defined(__OS2__)
 #elif defined(__OS2__)

-    return wxMGL_OS2;
+    info.os = wxMGL_OS2;

 #elif defined(__WIN32__)
 #elif defined(__WIN32__)

-    return wxMGL_WIN32;
+    info.os = wxMGL_WIN32;

 #elif defined(__DOS__)
 #elif defined(__DOS__)

-    return wxMGL_DOS;
+    info.os = wxMGL_DOS;

 #else
     #error Platform not supported by wxMGL!
 #endif
 #else
     #error Platform not supported by wxMGL!
 #endif

+    return info;

 }
 
 
 }