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 816ed527eb14a369c9e7b8aec3a627a702415352..c42628a26dda8b9dbced50d25aa1303578625a57 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -1218,6 +1218,7 @@ void wxOS2SetFont(
     char                            zStyle[30];
 
     if (hWnd == NULLHANDLE)
     char                            zStyle[30];
 
     if (hWnd == NULLHANDLE)

+        return;

 
     //
     // The fonts available for Presentation Params are just three
 
     //
     // The fonts available for Presentation Params are just three


@@ -1227,20 +1228,29 @@ void wxOS2SetFont(
     switch(rFont.GetFamily())
     {
         case wxSCRIPT:
     switch(rFont.GetFamily())
     {
         case wxSCRIPT:

+            strcpy(zFacename, "Script");
+            break;
+

         case wxDECORATIVE:
         case wxROMAN:
         case wxDECORATIVE:
         case wxROMAN:

-            strcpy(zFacename,"Times New Roman");
+            strcpy(zFacename,"Tms Rmn");

             break;
 
         case wxTELETYPE:
             break;
 
         case wxTELETYPE:

-        case wxMODERN:

             strcpy(zFacename, "Courier");
             break;
 
             strcpy(zFacename, "Courier");
             break;
 

+        case wxMODERN:
+            strcpy(zFacename, "System VIO");
+            break;
+

         case wxSWISS:
         case wxSWISS:

+            strcpy(zFacename, "Helv");
+            break;
+

         case wxDEFAULT:
         default:
         case wxDEFAULT:
         default:

-            strcpy(zFacename, "Helvetica");
+            strcpy(zFacename, "System VIO");

             break;
     }
 
             break;
     }