old compilation fix for AIX from Ian Brown

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

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index c42628a26dda8b9dbced50d25aa1303578625a57..6710cdf97ce4dfd0ea7f824adf72edd7b778a621 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -198,6 +198,13 @@ bool wxShell(
     return (rc != 0);
 }
 
     return (rc != 0);
 }
 

+// Shutdown or reboot the PC
+bool wxShutdown(wxShutdownFlags wFlags)
+{
+    // TODO
+    return FALSE;
+}
+

 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 long wxGetFreeMemory()
 {
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 long wxGetFreeMemory()
 {


@@ -291,6 +298,8 @@ void wxFlushEvents()
 //  wxYield();
 }
 
 //  wxYield();
 }
 

+#if WXWIN_COMPATIBILITY_2_2
+

 // Output a debug mess., in a system dependent fashion.
 void wxDebugMsg(
   const wxChar*                     zFmt ...
 // Output a debug mess., in a system dependent fashion.
 void wxDebugMsg(
   const wxChar*                     zFmt ...


@@ -343,6 +352,8 @@ void wxFatalError(
     DosExit(EXIT_PROCESS, ulRc);
 }
 
     DosExit(EXIT_PROCESS, ulRc);
 }
 

+#endif // WXWIN_COMPATIBILITY_2_2
+

 // Emit a beeeeeep
 void wxBell()
 {
 // Emit a beeeeeep
 void wxBell()
 {


@@ -1221,7 +1232,7 @@ void wxOS2SetFont(
         return;
 
     //
         return;
 
     //

-    // The fonts available for Presentation Params are just three
+    // The fonts available for Presentation Params are just a few

     // outline fonts, the rest are available to the GPI, so we must
     // map the families to one of these three
     //
     // outline fonts, the rest are available to the GPI, so we must
     // map the families to one of these three
     //


@@ -1232,25 +1243,25 @@ void wxOS2SetFont(
             break;
 
         case wxDECORATIVE:
             break;
 
         case wxDECORATIVE:

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

         case wxROMAN:
         case wxROMAN:

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

             break;
 
         case wxTELETYPE:
             break;
 
         case wxTELETYPE:

-            strcpy(zFacename, "Courier");
+            strcpy(zFacename, "Courier New");

             break;
 
         case wxMODERN:
             break;
 
         case wxMODERN:

-            strcpy(zFacename, "System VIO");
-            break;
-
-        case wxSWISS:
-            strcpy(zFacename, "Helv");
+            strcpy(zFacename, "Courier New");

             break;
 
         case wxDEFAULT:
         default:
             break;
 
         case wxDEFAULT:
         default:

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

             break;
     }
 
             break;
     }