rtti api mods added

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

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 4ff213b9de3eb93ca82dc39c9b9a90ccb9c38bb6..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
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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/apptrait.h"
 
 #include <ctype.h>
 #ifdef __EMX__
@@ -282,7 +283,7 @@ void wxUsleep(
   unsigned long                     ulMilliseconds
 )
 {
-    ::DosSleep(ulMilliseconds/1000l);
+    ::DosSleep(ulMilliseconds);
 }
 
 void wxSleep(
@@ -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
 )
@@ -710,7 +709,7 @@ wxChar* wxGetUserHome (
         if ((zHome = wxGetenv(_T("HOME"))) != NULL)
         {
             wxStrcpy(wxBuffer, zHome);
-            Unix2DosFilename(wxBuffer);
+            wxUnix2DosFilename(wxBuffer);
             wxStrcpy(zHome, wxBuffer);
             delete[] wxBuffer;
             return zHome;
@@ -1520,4 +1519,9 @@ wxBitmap wxDisableBitmap(
     return(wxNullBitmap);
 } // end of wxDisableBitmap
 
-
+COLORREF wxColourToRGB(
+  const wxColour&                   rColor
+)
+{
+    return(OS2RGB(rColor.Red(), rColor.Green(), rColor.Blue()));
+} // end of wxColourToRGB