wxMGL compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16,6 +16,8 @@
|
||||
#pragma interface "evtloop.h"
|
||||
#endif
|
||||
|
||||
#include "wx/utils.h"
|
||||
|
||||
class WXDLLEXPORT wxEventLoopImpl;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -47,6 +47,8 @@ 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; }
|
||||
|
@@ -208,7 +208,7 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
|
||||
wxApp::wxApp() : m_mainLoop(NULL)
|
||||
wxApp::wxApp()
|
||||
{
|
||||
}
|
||||
|
||||
|
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user