Changes in trunk/mainwin.cpp [30:10]

File:

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

trunk/mainwin.cpp

@@ -18 +18 @@
  ***/
 
-// ** CreateMainWindow **************************************************** /*FOLD00*/
+// ** CreateMainWindow **************************************************** /*fold00*/
 
 HWND CreateMainWindow (VOID)
 {
-#ifdef _QUIET_
-//#if 1
-    hwndFrame = WinLoadDlg (HWND_OBJECT, NULLHANDLE, NULL, GETMODULE,
-                            ID_DLG_MAIN, NULL);
-#else
     hwndFrame = WinLoadDlg (HWND_DESKTOP, NULLHANDLE, NULL, GETMODULE,
                             ID_DLG_MAIN, NULL);
-#endif
     OldFrameWP = WinSubclassWindow (hwndFrame, FrameProcedure);
 
@@ -76 +70 @@
 }
 
-// ** Drag **************************************************************** /*FOLD00*/
+// ** Drag **************************************************************** /*fold00*/
 
 VOID Drag (HWND hwnd)
@@ -116 +110 @@
 }
 
-// ** FrameProcedure ****************************************************** /*FOLD00*/
+// ** FrameProcedure ****************************************************** /*fold00*/
 
 MRESULT EXPENTRY FrameProcedure (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
@@ -279 +273 @@
             break;
 
-        case WID_PB_SETCAPTURETYPE:
-            //int capType;
-
-            switch (pset->QuerySSWCaptureType ())
-            {
-            case CAP_WINDOWINT:
-                WinSendMsg (hwndFrame, WM_COMMAND,
-                            MPFROM2SHORT (WID_PB_WINDOWINTERIOR,0), 0);
-            case CAP_SCREENREGION:
-                WinSendMsg (hwndFrame, WM_COMMAND,
-                            MPFROM2SHORT (WID_PB_SCREENREGION,0), 0);
-            case CAP_WINDOW:
-                WinSendMsg (hwndFrame, WM_COMMAND,
-                            MPFROM2SHORT (WID_PB_WINDOW,0), 0);
-            default:
-               WinSendMsg (hwndFrame, WM_COMMAND,
-                            MPFROM2SHORT (WID_PB_SCREEN,0), 0);
-            }
-            break;
-
         case WID_PB_SCREEN:
             usCap = CAP_SCREEN;
-#ifdef _QUIET_
-//#if 1
-            WinShowWindow (g_hwndSettingsDialog, FALSE);
-            // WinSendMsg (g_hwndSettingsDialog, WM_CLOSE, 0,0); //Needs to go to the setting dialog
-            // Replace current global with pset->GetSettingDialogHwnd () or such
-            // Need for all 4 cases;
-#endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
             break;
@@ -313 +280 @@
         case WID_PB_SCREENREGION:
             usCap = CAP_SCREENREGION;
-#ifdef _QUIET_
-//#if 1
-            WinShowWindow (g_hwndSettingsDialog, FALSE);
-#endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
             break;
@@ -322 +285 @@
         case WID_PB_WINDOWINTERIOR:
             usCap = CAP_WINDOWINT;
-#ifdef _QUIET_
-//#if 1
-            WinShowWindow (g_hwndSettingsDialog, FALSE);
-#endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
             break;
@@ -331 +290 @@
         case WID_PB_WINDOW:
             usCap = CAP_WINDOW;
-#ifdef _QUIET_
-//#if 1
-            WinShowWindow (g_hwndSettingsDialog, FALSE);
-#endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
             break;
@@ -359 +314 @@
 
         usState = STATE_WAITFORHIDE;
-
-        if (usCap == CAP_SCREENREGION || usCap == CAP_SCREEN) {
-#ifdef _QUIET_
-            hwndParent = WinQueryFocus(HWND_DESKTOP);
-#else
-            hwndParent = WinQueryWindow(hwndFrame, QW_NEXTTOP );
-#endif
-        }
-#ifndef _QUIET_
-//#if 0
         if (WinQueryButtonCheckstate (hwnd, WID_CB_HIDEWINDOW))
             WinShowWindow (WinQueryWindow (hwnd, QW_PARENT), FALSE);
         else
-#endif
             WinSendMsg (hwnd, UM_WINDOWHIDDEN, 0,0);
         return MRESULT (FALSE);
@@ -402 +346 @@
             {
                 usState = STATE_WINDOWSELECTED;
-                int rc = saymsg2(1, hwnd,  "Capture", "Do you wish to continue?");
-                
-                if (rc == 1)
-                    WinPostMsg (hwnd, UM_WINDOWSELECTED,
-                                MPFROMHWND (HWND_DESKTOP),
-                                MPFROMHWND (HWND_DESKTOP));
-                if (rc == 2)
-                    WinSendMsg (hwnd, UM_ABORT, 0,0);
-                if (rc == 3) {
-                    pset->Dialog ();
-                    WinPostMsg (hwnd, UM_WINDOWSELECTED,
-                                MPFROMHWND (HWND_DESKTOP),
-                                MPFROMHWND (HWND_DESKTOP));
-                }
+                WinPostMsg (hwnd, UM_WINDOWSELECTED,
+                            MPFROMHWND (HWND_DESKTOP),
+                            MPFROMHWND (HWND_DESKTOP));
             }
             else
@@ -484 +417 @@
                                                              FALSE));
             hwndCap = HWND (mp1);
-            if (usCap != CAP_SCREENREGION && usCap != CAP_SCREEN)
-                hwndParent = HWND (mp2);
+            hwndParent = HWND (mp2);
             if (pset->SerialCapture ())
             {
@@ -546 +478 @@
             // capture the window to a bitmap and save this
             if (usCap == CAP_SCREENREGION)
-                hbm = CaptureWindow (hwndCap, hwndParent, &rcl, FALSE);
-            else if (usCap == CAP_SCREEN)
-                hbm = CaptureWindow (hwndCap, hwndParent, NULL, FALSE);
+                hbm = CaptureWindow (hwndCap, hwndParent, &rcl, TRUE);
             else
                 hbm = CaptureWindow (hwndCap, hwndParent, NULL, TRUE);
@@ -582 +512 @@
             WinSetCapture (HWND_DESKTOP, NULLHANDLE);
 
-        pset->Load ();
-
         WinSendMsg (hwndSnapshot, UM_STOPCAPTURE, 0,0);
         WinStopTimer (hab, hwnd, ulTimer);
-#ifdef _QUIET_
-//#if 1
-        // ? 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);
-        pset->HideWindow (TRUE);
-#else
+
         // re-show the windows if they are hidden
         // FIXME using global hwndFrame is pretty yukki
@@ -602 +521 @@
         if (! WinIsWindowVisible (hwndSnapshot) && pset->SnapshotWindow ())
             WinShowWindow (hwndSnapshot, TRUE);
-#endif
+
         WinEnableWindow (hwnd, TRUE);
         WinSetActiveWindow (HWND_DESKTOP, hwnd);