Changes in trunk/bitmap.cpp [28:11]

File:

• trunk/bitmap.cpp (modified) (3 diffs)

trunk/bitmap.cpp

@@ -19 +19 @@
 
 // ** CaptureWindow ******************************************************* /*FOLD00*/
-#include <ctype.h>
+
 #define MAX_WAIT   15
 
@@ -36 +36 @@
 
     // wait for the selected window to rise to the surface
-    if (f)
+    if ((hwndParent != HWND_DESKTOP) &&  f)
     {
         WinSetWindowPos (hwndParent, HWND_TOP, 0,0, 0,0, SWP_ZORDER);
@@ -149 +149 @@
                sizeof (aptl) / sizeof (POINTL), /* Number of points in aptl */
                aptl, ROP_SRCCOPY, BBO_IGNORE);
-
-    SWCNTRL  swctl;
-    PID      pid;
-    TID      tid;
-    BOOL screen = FALSE, region = FALSE;
-    CHAR title[11];
-
-    if (!f) {
-        //hwndParent = WinQueryFocus(HWND_DESKTOP);
-        if (hwndParent == hwndFrame) {
-            hwndParent = WinQueryWindow(hwndFrame, QW_NEXTTOP );
-        }
-        screen = TRUE;
-        if (prcl)
-            region = TRUE;
-    }
-
-    int rc = WinQueryWindowProcess(hwndParent, &pid, &tid);
-    if (WinQuerySwitchEntry(WinQuerySwitchHandle(hwndParent, pid),
-                            &swctl))
-        WinQuerySwitchEntry(WinQuerySwitchHandle(NULLHANDLE, pid),
-                            &swctl);
-
-    char buffer[MAXNAMEL+4];
-    int length = strlen( swctl.szSwtitle );
-    strcpy(buffer, swctl.szSwtitle);
-    char *p;
-    p = buffer;
-    for (int i = 0; i < (length < 11 ? length : 11); i++) {
-        if ( ispunct( *p ) || *p == '\\' || isblank( *p )) {
-            *p = '_';
-        }
-        p++;
-    }
-
-    if (region)
-        snprintf( title, length < 8 ? length + 3 : 11, "SR%s", buffer);
-    else if (screen)
-        snprintf( title, length < 8 ? length + 3 : 11, "SC%s", buffer);
-    else
-        snprintf( title, length < 8 ? length + 3 : 11, "WD%s", buffer);
-
-    SaveBitmap (hbm, hpsMem, sWidth, sHeight, bmp.cBitCount, title);
+    SaveBitmap (hbm, hpsMem, sWidth, sHeight, bmp.cBitCount);
 
     // re-associate the previous bit map and the memory presentation space