Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxMGL compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-09-18 10:01:59 +00:00
parent e46d2a18df
commit 752464f9f3
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/evtloop.h
View File

@@ -16,6 +16,8 @@
#pragma interface "evtloop.h" #pragma interface "evtloop.h"
#endif #endif
#include "wx/utils.h"
class WXDLLEXPORT wxEventLoopImpl; class WXDLLEXPORT wxEventLoopImpl;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

4
include/wx/mgl/app.h
View File

@@ -46,7 +46,9 @@ public:
virtual bool Initialize(int& argc, wxChar **argv); virtual bool Initialize(int& argc, wxChar **argv);
virtual void CleanUp(); virtual void CleanUp();
virtual void Exit();
virtual void WakeUpIdle();
virtual bool Yield(bool onlyIfNeeded = FALSE); virtual bool Yield(bool onlyIfNeeded = FALSE);
virtual wxDisplayModeInfo GetDisplayMode() const { return m_displayMode; } virtual wxDisplayModeInfo GetDisplayMode() const { return m_displayMode; }

2
src/mgl/app.cpp
View File

@@ -208,7 +208,7 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
END_EVENT_TABLE() END_EVENT_TABLE()
wxApp::wxApp() : m_mainLoop(NULL) wxApp::wxApp()
{ {
} }

22
src/mgl/utils.cpp
View File

@@ -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 ) static wxToolkitInfo info;
*majorVsn = MGL_RELEASE_MAJOR; info.shortName = _T("mgluniv");
if ( minorVsn ) info.name = _T("wxMGL");
*minorVsn = MGL_RELEASE_MINOR; 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 #else
#error Platform not supported by wxMGL! #error Platform not supported by wxMGL!
#endif #endif
return info;
} }