Applied patch [ 603104 ] wxX11 wxClientDC, wxPaintDC fix

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

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 816ed527eb14a369c9e7b8aec3a627a702415352..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()
 {


@@ -1218,28 +1229,38 @@ 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 a few

     // 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:
     // 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 wxDECORATIVE:

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

         case wxROMAN:
             strcpy(zFacename,"Times New Roman");
             break;
 
         case wxTELETYPE:
         case wxROMAN:
             strcpy(zFacename,"Times New Roman");
             break;
 
         case wxTELETYPE:

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

         case wxMODERN:
         case wxMODERN:

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

             break;
 
             break;
 

-        case wxSWISS:

         case wxDEFAULT:
         default:
         case wxDEFAULT:
         default:

+        case wxSWISS:

             strcpy(zFacename, "Helvetica");
             break;
     }
             strcpy(zFacename, "Helvetica");
             break;
     }