expand . into cwd

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

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index a4531b6a12b420b56941ca814baac0782592fe8e..816ed527eb14a369c9e7b8aec3a627a702415352 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -105,7 +105,7 @@ bool wxGetUserId(
 , int                               nType
 )
 {
 , int                               nType
 )
 {

-#ifndef __EMX__
+#if defined(__VISAGECPP__)

     long                            lrc;
     // UPM procs return 0 on success
     lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType);
     long                            lrc;
     // UPM procs return 0 on success
     lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType);


@@ -750,6 +750,7 @@ void wxGetMousePosition(
 // Return TRUE if we have a colour display
 bool wxColourDisplay()
 {
 // Return TRUE if we have a colour display
 bool wxColourDisplay()
 {

+#if 0

     HPS                             hpsScreen;
     HDC                             hdcScreen;
     LONG                            lColors;
     HPS                             hpsScreen;
     HDC                             hdcScreen;
     LONG                            lColors;


@@ -758,6 +759,11 @@ bool wxColourDisplay()
     hdcScreen = ::GpiQueryDevice(hpsScreen);
     ::DevQueryCaps(hdcScreen, CAPS_COLORS, 1L, &lColors);
     return(lColors > 1L);
     hdcScreen = ::GpiQueryDevice(hpsScreen);
     ::DevQueryCaps(hdcScreen, CAPS_COLORS, 1L, &lColors);
     return(lColors > 1L);

+#else
+    // I don't see how the PM display could not be color. Besides, this
+    // was leaking DCs and PSs!!!  MN
+    return TRUE;
+#endif

 }
 
 // Returns depth of screen
 }
 
 // Returns depth of screen


@@ -767,15 +773,20 @@ int wxDisplayDepth()
     HDC                             hdcScreen;
     LONG                            lPlanes;
     LONG                            lBitsPerPixel;
     HDC                             hdcScreen;
     LONG                            lPlanes;
     LONG                            lBitsPerPixel;

-    LONG                            nDepth;
-
-    hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
-    hdcScreen = ::GpiQueryDevice(hpsScreen);
-    ::DevQueryCaps(hdcScreen, CAPS_COLOR_PLANES, 1L, &lPlanes);
-    ::DevQueryCaps(hdcScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitsPerPixel);
-
-    nDepth = (int)(lPlanes * lBitsPerPixel);
-    DevCloseDC(hdcScreen);
+    static LONG                     nDepth = 0;
+
+    // The screen colordepth ain't gonna change. No reason to query
+    // it over and over!
+    if (!nDepth) {
+        hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
+        hdcScreen = ::GpiQueryDevice(hpsScreen);
+        ::DevQueryCaps(hdcScreen, CAPS_COLOR_PLANES, 1L, &lPlanes);
+        ::DevQueryCaps(hdcScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitsPerPixel);
+
+        nDepth = (int)(lPlanes * lBitsPerPixel);
+        ::DevCloseDC(hdcScreen);
+        ::WinReleasePS(hpsScreen);
+    }

     return (nDepth);
 }
 
     return (nDepth);
 }
 


@@ -787,14 +798,18 @@ void wxDisplaySize(
 {
     HPS                             hpsScreen;
     HDC                             hdcScreen;
 {
     HPS                             hpsScreen;
     HDC                             hdcScreen;

-    LONG                            lWidth;
-    LONG                            lHeight;
-
-    hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
-    hdcScreen = ::GpiQueryDevice(hpsScreen);
-    ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L, &lWidth);
-    ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L, &lHeight);
-    DevCloseDC(hdcScreen);
+    static LONG                     lWidth  = 0;
+    static LONG                     lHeight = 0;
+
+    // The screen size ain't gonna change either so just cache the values
+    if (!lWidth) {
+        hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
+        hdcScreen = ::GpiQueryDevice(hpsScreen);
+        ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L, &lWidth);
+        ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L, &lHeight);
+        ::DevCloseDC(hdcScreen);
+        ::WinReleasePS(hpsScreen);
+    }

     *pWidth = (int)lWidth;
     *pHeight = (int)lHeight;
 }
     *pWidth = (int)lWidth;
     *pHeight = (int)lHeight;
 }


@@ -822,6 +837,8 @@ void wxDisplaySizeMM(
                        ,1L
                        ,(PLONG)pHeight
                       );
                        ,1L
                        ,(PLONG)pHeight
                       );

+    ::DevCloseDC(hdcScreen);
+    ::WinReleasePS(hpsScreen);

 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)


@@ -1190,3 +1207,78 @@ void wxDrawBorder(
     }
 } // end of 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)
+
+    //
+    // 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:
+        case wxDECORATIVE:
+        case wxROMAN:
+            strcpy(zFacename,"Times New Roman");
+            break;
+
+        case wxTELETYPE:
+        case wxMODERN:
+            strcpy(zFacename, "Courier");
+            break;
+
+        case wxSWISS:
+        case wxDEFAULT:
+        default:
+            strcpy(zFacename, "Helvetica");
+            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