corrected path splitting for mac relative paths

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

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 5f9b616d9e6a419dd83043be7b526c380abcfe55..c42628a26dda8b9dbced50d25aa1303578625a57 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -762,7 +762,7 @@ bool wxColourDisplay()
 #else
     // I don't see how the PM display could not be color. Besides, this
     // was leaking DCs and PSs!!!  MN
-    return true;
+    return TRUE;
 #endif
 }
 
@@ -1207,3 +1207,88 @@ void wxDrawBorder(
     }
 } // end of wxDrawBorder
 
+void wxOS2SetFont(
+  HWND                              hWnd
+, const wxFont&                     rFont
+)
+{
+    char                            zFont[128];
+    char                            zFacename[30];
+    char                            zWeight[30];
+    char                            zStyle[30];
+
+    if (hWnd == NULLHANDLE)
+        return;
+
+    //
+    // The fonts available for Presentation Params are just three
+    // outline fonts, the rest are available to the GPI, so we must
+    // map the families to one of these three
+    //
+    switch(rFont.GetFamily())
+    {
+        case wxSCRIPT:
+            strcpy(zFacename, "Script");
+            break;
+
+        case wxDECORATIVE:
+        case wxROMAN:
+            strcpy(zFacename,"Tms Rmn");
+            break;
+
+        case wxTELETYPE:
+            strcpy(zFacename, "Courier");
+            break;
+
+        case wxMODERN:
+            strcpy(zFacename, "System VIO");
+            break;
+
+        case wxSWISS:
+            strcpy(zFacename, "Helv");
+            break;
+
+        case wxDEFAULT:
+        default:
+            strcpy(zFacename, "System VIO");
+            break;
+    }
+
+    switch(rFont.GetWeight())
+    {
+        default:
+        case wxNORMAL:
+        case wxLIGHT:
+            zWeight[0] = '\0';
+            break;
+
+        case wxBOLD:
+        case wxFONTWEIGHT_MAX:
+            strcpy(zWeight, "Bold");
+            break;
+    }
+
+    switch(rFont.GetStyle())
+    {
+        case wxITALIC:
+        case wxSLANT:
+            strcpy(zStyle, "Italic");
+            break;
+
+        default:
+            zStyle[0] = '\0';
+            break;
+    }
+    sprintf(zFont, "%d.%s", rFont.GetPointSize(), zFacename);
+    if (zWeight[0] != '\0')
+    {
+        strcat(zFont, " ");
+        strcat(zFont, zWeight);
+    }
+    if (zStyle[0] != '\0')
+    {
+        strcat(zFont, " ");
+        strcat(zFont, zStyle);
+    }
+    ::WinSetPresParam(hWnd, PP_FONTNAMESIZE, strlen(zFont) + 1, (PVOID)zFont);
+} // end of wxOS2SetFont