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

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index c6e03327464ba09c89d8dea4864d10ece52c3e29..a5c2f9349716369a005ca1269f00fa41aeaf3492 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -18,6 +18,7 @@
 #include "wx/string.h"
 
 #include "wx/intl.h"
+#include "wx/apptrait.h"
 #include "wx/log.h"
 #include "wx/process.h"
 
@@ -207,7 +208,7 @@ int wxDisplayDepth()
     return g_displayDC->getBitsPerPixel();
 }
 
-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
 {
     if ( majorVsn )
         *majorVsn = MGL_RELEASE_MAJOR;

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index f6e2cde567b9f263a654be6078c5e3d3635ccb09..59b47374bbdae5239e9e0830b71c8806e7bf82b9 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -22,6 +22,7 @@
 #include "wx/os2/private.h"
 #include "wx/timer.h"
 #include "wx/intl.h"
+#include "wx/apptrait.h"
 
 #include <ctype.h>
 #ifdef __EMX__
@@ -360,9 +361,7 @@ void wxBell()
     DosBeep(1000,1000); // 1kHz during 1 sec.
 }
 
-// Chris Breeze 27/5/98: revised WIN32 code to
-// detect WindowsNT correctly
-int wxGetOsVersion(
+int wxGUIAppTraits::GetOSVersion(
   int*                              pMajorVsn
 , int*                              pMinorVsn
 )

diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index 05aa9ad7ff6ea48349b3e401776b5d1068535344..0dedaec50522d6ed5db3fc625d26fb6320919458 100644 (file)
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -20,6 +20,7 @@
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"
+#include "wx/apptrait.h"
 #include "wx/msgdlg.h"
 #include "wx/cursor.h"
 #include "wx/window.h" // for wxTopLevelWindows
@@ -97,7 +98,7 @@ void wxBell()
     XBell ((Display*) wxGetDisplay(), 0);
 }
 
-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
 {
     if (majorVsn)
         *majorVsn = 0;