Changeset 30 for trunk/mainwin.cpp

Timestamp:

Mar 13, 2018, 11:51:18 PM (7 years ago)

Author:

Gregg Young

Message:

Changes to allow building either Gotcha or Gotchaq. Gotchaq requires defining _QUIET_. Ticket #10

File:

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

trunk/mainwin.cpp

@@ -18 +18 @@
  ***/
 
-// ** CreateMainWindow **************************************************** /*fold00*/
+// ** CreateMainWindow **************************************************** /*FOLD00*/
 
 HWND CreateMainWindow (VOID)
 {
-//#ifdef _QUIET_
-#if 1
+#ifdef _QUIET_
+//#if 1
     hwndFrame = WinLoadDlg (HWND_OBJECT, NULLHANDLE, NULL, GETMODULE,
                             ID_DLG_MAIN, NULL);
@@ -301 +301 @@
         case WID_PB_SCREEN:
             usCap = CAP_SCREEN;
-//#ifdef _Quiet_
-#if 1
+#ifdef _QUIET_
+//#if 1
             WinShowWindow (g_hwndSettingsDialog, FALSE);
             // WinSendMsg (g_hwndSettingsDialog, WM_CLOSE, 0,0); //Needs to go to the setting dialog
@@ -313 +313 @@
         case WID_PB_SCREENREGION:
             usCap = CAP_SCREENREGION;
-//#ifdef _Quiet_
-#if 1
+#ifdef _QUIET_
+//#if 1
             WinShowWindow (g_hwndSettingsDialog, FALSE);
 #endif
@@ -322 +322 @@
         case WID_PB_WINDOWINTERIOR:
             usCap = CAP_WINDOWINT;
-//#ifdef _Quiet_
-#if 1
+#ifdef _QUIET_
+//#if 1
             WinShowWindow (g_hwndSettingsDialog, FALSE);
 #endif
@@ -331 +331 @@
         case WID_PB_WINDOW:
             usCap = CAP_WINDOW;
-//#ifdef _Quiet_
-#if 1
+#ifdef _QUIET_
+//#if 1
             WinShowWindow (g_hwndSettingsDialog, FALSE);
 #endif
@@ -360 +360 @@
         usState = STATE_WAITFORHIDE;
 
-        if (usCap == CAP_SCREENREGION || usCap == CAP_SCREEN)
+        if (usCap == CAP_SCREENREGION || usCap == CAP_SCREEN) {
+#ifdef _QUIET_
             hwndParent = WinQueryFocus(HWND_DESKTOP);
-//#ifndef _QUIET_
-#if 0
+#else
+            hwndParent = WinQueryWindow(hwndFrame, QW_NEXTTOP );
+#endif
+        }
+#ifndef _QUIET_
+//#if 0
         if (WinQueryButtonCheckstate (hwnd, WID_CB_HIDEWINDOW))
             WinShowWindow (WinQueryWindow (hwnd, QW_PARENT), FALSE);
@@ -581 +586 @@
         WinSendMsg (hwndSnapshot, UM_STOPCAPTURE, 0,0);
         WinStopTimer (hab, hwnd, ulTimer);
-//#ifdef _QUIET_
-#if 1
+#ifdef _QUIET_
+//#if 1
         // ? FIXME to give option to reshow window.
         if (WinQueryButtonCheckstate (hwnd, WID_CB_HIDEWINDOW))