Changeset 6928 for trunk/src

Timestamp:

Oct 2, 2001, 7:14:10 PM (24 years ago)

Author:

sandervl

Message:

small updates for frame tracking

Location:

trunk/src/user32

Files:

• oslibres.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (5 diffs)
• win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.20 2001-08-26 14:23:33 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.21 2001-10-02 17:14:09 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -627 +627 @@
 
    free(pszSetupString);
+   if(!hObject) {
+       dprintf(("ERROR: WinCreateObject failed!!"));
+   }
    return hObject != 0;
 }

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.149 2001-09-30 22:24:41 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.150 2001-10-02 17:14:09 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1472 +1472 @@
   APIRET    rc;
   BOOL      ret;
+  HWND      hwnd = win32wnd->getWindowHandle();
 
     if(!fInit) {
@@ -1481 +1482 @@
         fInit = TRUE;
     }
-    dprintf(("FrameTrackFrame: %x %x", win32wnd->getWindowHandle(), flags));
+    dprintf(("FrameTrackFrame: %x %x", hwnd, flags));
     track.cxBorder = 4;
     track.cyBorder = 4;  /* 4 pel wide lines used for rectangle */
@@ -1516 +1517 @@
     BOOL fDynamicDrag = WinQuerySysValue(HWND_DESKTOP, SVOS_DYNAMICDRAG);
 
+    //TODO: send WM_QUERYDRAGICON to fetch icon (not really necessary)
+
+    SendMessageA( hwnd, WM_ENTERSIZEMOVE_W, 0, 0);
+
     SEL sel = RestoreOS2FS();
     if(fDynamicDrag && WinTrackWindow) {
@@ -1522 +1527 @@
     else ret = WinTrackRect(hwndTracking, NULL, &track);
     SetFS(sel);
+
+//TODO:
+//    if (HOOK_CallHooksA( WH_CBT_W, HCBT_MOVESIZE_W, (WPARAM)hwnd, (LPARAM)&sizingRect )) moved = FALSE;
+
+    SendMessageA( hwnd, WM_EXITSIZEMOVE_W, 0, 0 );
+    SendMessageA( hwnd, WM_SETVISIBLE_W, !IsIconic(hwnd), 0L);
 
     if(ret) {

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.287 2001-10-01 17:28:08 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.288 2001-10-02 17:14:10 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2499 +2499 @@
     {//don't change size; modify internal structures only
         //TODO: not 100% correct yet (activate)
+        dprintf2(("state < STATE_POST_WMNCCREATE"));
         if(!(fuFlags & SWP_NOZORDER)) {
             hwndLinkAfter = hwndInsertAfter;
@@ -2543 +2544 @@
 
     if (swp.fl == 0) {
+        dprintf2(("swp.fl == 0"));
         if(fuFlags & SWP_FRAMECHANGED)
         {