rtti api mods added

[wxWidgets.git] / src / os2 / utils.cpp

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 9db762aa23bf721cca81f5630ca3a2e29238d98a..1611b069413dae376d6397a23c7d4e36722ab189 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -6,7 +6,7 @@
 // Created:     09/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Created:     09/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".


@@ -22,6 +22,7 @@
 #include "wx/os2/private.h"
 #include "wx/timer.h"
 #include "wx/intl.h"
 #include "wx/os2/private.h"
 #include "wx/timer.h"
 #include "wx/intl.h"

+#include "wx/apptrait.h"

 
 #include <ctype.h>
 #ifdef __EMX__
 
 #include <ctype.h>
 #ifdef __EMX__


@@ -282,7 +283,7 @@ void wxUsleep(
   unsigned long                     ulMilliseconds
 )
 {
   unsigned long                     ulMilliseconds
 )
 {

-    ::DosSleep(ulMilliseconds/1000l);
+    ::DosSleep(ulMilliseconds);

 }
 
 void wxSleep(
 }
 
 void wxSleep(


@@ -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
-// detect WindowsNT correctly
-int wxGetOsVersion(
+int wxGUIAppTraits::GetOSVersion(

   int*                              pMajorVsn
 , int*                              pMinorVsn
 )
   int*                              pMajorVsn
 , int*                              pMinorVsn
 )