only set parent frame ontop when the current frame being destructed is active

[wxWidgets.git] / src / msw / gaugemsw.cpp

diff --git a/src/msw/gaugemsw.cpp b/src/msw/gaugemsw.cpp
index 1af85748f9d9c671216f3f28b33a198f9e1ddcd3..1d46d463d339d3025449dfe0a5fcecb2c71cbdde 100644 (file)
--- a/src/msw/gaugemsw.cpp
+++ b/src/msw/gaugemsw.cpp
@@ -754,7 +754,8 @@ BOOL FAR PASCAL gaugeInit(HINSTANCE hInstance)
     /*  Get a DC to determine whether device is mono or not, and set
      *  default foreground/background colors as appropriate.
      */
     /*  Get a DC to determine whether device is mono or not, and set
      *  default foreground/background colors as appropriate.
      */

-    if ((hdc = CreateIC(_T("DISPLAY"), NULL, NULL, 0L)))
+    hdc = CreateIC(_T("DISPLAY"), NULL, NULL, 0L) ;
+    if (hdc)

     {
         /* check for mono-display */
         if ((GetDeviceCaps(hdc, BITSPIXEL) == 1) &&
     {
         /* check for mono-display */
         if ((GetDeviceCaps(hdc, BITSPIXEL) == 1) &&


@@ -1127,7 +1128,8 @@ zyzgForceRepaint3D:
 
         case WM_SETFONT:
             /* if NULL hFont, use system font */
 
         case WM_SETFONT:
             /* if NULL hFont, use system font */

-            if (!(hFont = (HFONT)wParam))
+            hFont = (HFONT)wParam ;
+            if (!hFont)

                 hFont = (HFONT) GetStockObject(SYSTEM_FONT);
 
             pgauge->hFont = hFont;
                 hFont = (HFONT) GetStockObject(SYSTEM_FONT);
 
             pgauge->hFont = hFont;