Only call use uppercase letter if control, alt, or shift is held down,

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

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 4ff213b9de3eb93ca82dc39c9b9a90ccb9c38bb6..9db762aa23bf721cca81f5630ca3a2e29238d98a 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -710,7 +710,7 @@ wxChar* wxGetUserHome (
         if ((zHome = wxGetenv(_T("HOME"))) != NULL)
         {
             wxStrcpy(wxBuffer, zHome);
         if ((zHome = wxGetenv(_T("HOME"))) != NULL)
         {
             wxStrcpy(wxBuffer, zHome);

-            Unix2DosFilename(wxBuffer);
+            wxUnix2DosFilename(wxBuffer);

             wxStrcpy(zHome, wxBuffer);
             delete[] wxBuffer;
             return zHome;
             wxStrcpy(zHome, wxBuffer);
             delete[] wxBuffer;
             return zHome;


@@ -1520,4 +1520,9 @@ wxBitmap wxDisableBitmap(
     return(wxNullBitmap);
 } // end of wxDisableBitmap
 
     return(wxNullBitmap);
 } // end of wxDisableBitmap
 

-
+COLORREF wxColourToRGB(
+  const wxColour&                   rColor
+)
+{
+    return(OS2RGB(rColor.Red(), rColor.Green(), rColor.Blue()));
+} // end of wxColourToRGB