Changeset 170 for trunk/mainwin.cpp

Timestamp:

Sep 22, 2025, 10:04:44 PM (3 weeks ago)

Author:

Gregg Young

Message:

Rework Gotcha's dialogs to work better with the new font sizing in WPS. Replace some global variables with more C++ alternatives

File:

• trunk/mainwin.cpp (modified) (10 diffs)

trunk/mainwin.cpp

@@ -171 +171 @@
                              SWP_SHOW | SWP_MOVE | SWP_SIZE | SWP_ZORDER);
 #endif
-            HMQ hmq;
-            BOOL bUniCodeFont = FALSE;
-            CHAR ucFont[FACESIZE];
+            HMQ hmq = WinQueryWindowULong( hwnd, QWL_HMQ);
     
             if (pset->GetLangID() == RU) {
-                hmq = WinQueryWindowULong( hwnd, QWL_HMQ);
                 WinSetCp(hmq, 866);
-                bUniCodeFont = TRUE;
             }
             else if (pset->GetLangID() == CZ || pset->GetLangID() == PL) {
-                hmq = WinQueryWindowULong( hwnd, QWL_HMQ);
                 WinSetCp(hmq, 852);
-                bUniCodeFont = TRUE;
             }
             else {
-                hmq = WinQueryWindowULong( hwnd, QWL_HMQ);
                 WinSetCp(hmq, 850);
             }
-    
+#if 0
             if (pset->GetLangID() == RU || pset->GetLangID() == CZ || pset->GetLangID() == PL) {
                 strcpy(ucFont, "9.Times New Roman MT 30");
@@ -198 +191 @@
                 WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
             }
+#endif
         }
 #ifdef _QUIET_
@@ -205 +199 @@
                            MPFROMLONG (pset->DelayedCapture ()),
                            MPFROMLONG (0));
-        WinSetFocus( WinWindowFromID (g_hwndPage0, WID_RB_FILE), FALSE );
+        WinSetFocus( WinWindowFromID (pset->GethwndPage0(), WID_RB_FILE), FALSE );
         return MRESULT (FALSE);
 #else
@@ -346 +340 @@
             usCap = CAP_SCREEN;
 #ifdef _QUIET_
-            WinShowWindow (g_hwndSettingsDialog, FALSE);
+            WinShowWindow (pset->GethwndSettingsDialog(), FALSE);
 #endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
@@ -354 +348 @@
             usCap = CAP_SCREENREGION;
 #ifdef _QUIET_
-            WinShowWindow (g_hwndSettingsDialog, FALSE);
+            WinShowWindow (pset->GethwndSettingsDialog(), FALSE);
 #endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
@@ -362 +356 @@
             usCap = CAP_WINDOWINT;
 #ifdef _QUIET_
-            WinShowWindow (g_hwndSettingsDialog, FALSE);
+            WinShowWindow (pset->GethwndSettingsDialog(), FALSE);
 #endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
@@ -370 +364 @@
             usCap = CAP_WINDOW;
 #ifdef _QUIET_
-            WinShowWindow (g_hwndSettingsDialog, FALSE);
+            WinShowWindow (pset->GethwndSettingsDialog(), FALSE);
 #endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
@@ -540 +534 @@
     case WM_TIMER:
         ulCountdown --;
-       
+#ifndef _QUIET_
         if( ulCountdown % 20 == 0 )
             WinSendMsg (hwndSnapshot, UM_COUNTDOWN,
                         MPFROMLONG (ulCountdown), 0);
+#endif
         if (pset->DelayCountdown () && !pset->SerialCapture ())
             DoCountdown (ulCountdown);
@@ -626 +621 @@
         // ? FIXME to give option to reshow window.
         if (WinQueryButtonCheckstate (hwnd, WID_CB_HIDEWINDOW))
-            WinSendMsg (g_hwndSettingsDialog, WM_CLOSE, 0,0);
-        else if (WinIsWindow ( hab, g_hwndSettingsDialog) &&
-            ! WinIsWindowVisible (g_hwndSettingsDialog))
-            WinShowWindow (g_hwndSettingsDialog, TRUE);
+            WinSendMsg (pset->GethwndSettingsDialog(), WM_CLOSE, 0,0);
+        else if (WinIsWindow ( hab, pset->GethwndSettingsDialog()) &&
+            ! WinIsWindowVisible (pset->GethwndSettingsDialog()))
+            WinShowWindow (pset->GethwndSettingsDialog(), TRUE);
         pset->HideWindow (TRUE);
 #else
@@ -649 +644 @@
     LogDebug( "MainWin:WindowProcedure:WinDefWindowProc->0x%04x", msg );
 #endif
-    if (hwnd ==  g_hwndPage0)
+    if (hwnd == pset->GethwndPage0())
         return WinDefDlgProc (hwnd, msg, mp1, mp2);
     else