From 752464f9f300b318475cec1400d60580c44e9242 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Thu, 18 Sep 2003 10:01:59 +0000
Subject: [PATCH] wxMGL compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/evtloop.h | 2 ++
include/wx/mgl/app.h | 4 +++-
src/mgl/app.cpp | 2 +-
src/mgl/utils.cpp | 22 ++++++++++++----------
4 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index dcd2a766e0..084bc9f162 100644
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -16,6 +16,8 @@
#pragma interface "evtloop.h"
#endif
+#include "wx/utils.h"
+
class WXDLLEXPORT wxEventLoopImpl;
// ----------------------------------------------------------------------------
diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index c1e6aca517..fa98fc1e93 100644
--- 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 void Exit();
+ virtual void WakeUpIdle();
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 d92b40c293..dffb68253c 100644
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -208,7 +208,7 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
END_EVENT_TABLE()
-wxApp::wxApp() : m_mainLoop(NULL)
+wxApp::wxApp()
{
}
diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index a5c2f93497..209597e140 100644
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -208,24 +208,26 @@ int wxDisplayDepth()
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__)
- return wxMGL_UNIX;
+ info.os = wxMGL_UNIX;
#elif defined(__OS2__)
- return wxMGL_OS2;
+ info.os = wxMGL_OS2;
#elif defined(__WIN32__)
- return wxMGL_WIN32;
+ info.os = wxMGL_WIN32;
#elif defined(__DOS__)
- return wxMGL_DOS;
+ info.os = wxMGL_DOS;
#else
#error Platform not supported by wxMGL!
#endif
+ return info;
}
--
2.47.2