GetOsVersion() is now wxGUIAppTraits method instead of a global function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,6 +18,7 @@
|
|||||||
#include "wx/string.h"
|
#include "wx/string.h"
|
||||||
|
|
||||||
#include "wx/intl.h"
|
#include "wx/intl.h"
|
||||||
|
#include "wx/apptrait.h"
|
||||||
#include "wx/log.h"
|
#include "wx/log.h"
|
||||||
#include "wx/process.h"
|
#include "wx/process.h"
|
||||||
|
|
||||||
@@ -207,7 +208,7 @@ int wxDisplayDepth()
|
|||||||
return g_displayDC->getBitsPerPixel();
|
return g_displayDC->getBitsPerPixel();
|
||||||
}
|
}
|
||||||
|
|
||||||
int wxGetOsVersion(int *majorVsn, int *minorVsn)
|
int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
|
||||||
{
|
{
|
||||||
if ( majorVsn )
|
if ( majorVsn )
|
||||||
*majorVsn = MGL_RELEASE_MAJOR;
|
*majorVsn = MGL_RELEASE_MAJOR;
|
||||||
|
@@ -22,6 +22,7 @@
|
|||||||
#include "wx/os2/private.h"
|
#include "wx/os2/private.h"
|
||||||
#include "wx/timer.h"
|
#include "wx/timer.h"
|
||||||
#include "wx/intl.h"
|
#include "wx/intl.h"
|
||||||
|
#include "wx/apptrait.h"
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#ifdef __EMX__
|
#ifdef __EMX__
|
||||||
@@ -360,9 +361,7 @@ void wxBell()
|
|||||||
DosBeep(1000,1000); // 1kHz during 1 sec.
|
DosBeep(1000,1000); // 1kHz during 1 sec.
|
||||||
}
|
}
|
||||||
|
|
||||||
// Chris Breeze 27/5/98: revised WIN32 code to
|
int wxGUIAppTraits::GetOSVersion(
|
||||||
// detect WindowsNT correctly
|
|
||||||
int wxGetOsVersion(
|
|
||||||
int* pMajorVsn
|
int* pMajorVsn
|
||||||
, int* pMinorVsn
|
, int* pMinorVsn
|
||||||
)
|
)
|
||||||
|
@@ -20,6 +20,7 @@
|
|||||||
#include "wx/setup.h"
|
#include "wx/setup.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
|
#include "wx/apptrait.h"
|
||||||
#include "wx/msgdlg.h"
|
#include "wx/msgdlg.h"
|
||||||
#include "wx/cursor.h"
|
#include "wx/cursor.h"
|
||||||
#include "wx/window.h" // for wxTopLevelWindows
|
#include "wx/window.h" // for wxTopLevelWindows
|
||||||
@@ -97,7 +98,7 @@ void wxBell()
|
|||||||
XBell ((Display*) wxGetDisplay(), 0);
|
XBell ((Display*) wxGetDisplay(), 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
int wxGetOsVersion(int *majorVsn, int *minorVsn)
|
int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
|
||||||
{
|
{
|
||||||
if (majorVsn)
|
if (majorVsn)
|
||||||
*majorVsn = 0;
|
*majorVsn = 0;
|
||||||
|
Reference in New Issue
Block a user