Changeset 4945 for trunk/src

Timestamp:

Jan 14, 2001, 6:15:47 PM (25 years ago)

Author:

sandervl

Message:

listbox, combobox and notifyframe fixes

Location:

trunk/src/user32

Files:

• listbox.cpp (modified) (3 diffs)
• pmwindow.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (3 diffs)
• win32wbasepos.cpp (modified) (3 diffs)
• windowword.cpp (modified) (2 diffs)

trunk/src/user32/listbox.cpp

@@ -1 @@
-/* $Id: listbox.cpp,v 1.25 2000-05-22 17:21:08 cbratschi Exp $ */
+/* $Id: listbox.cpp,v 1.26 2001-01-14 17:15:46 sandervl Exp $ */
 /*
  * Listbox controls
@@ -1724 +1724 @@
             else  /* not a directory */
             {
+#ifdef __WIN32OS2__
 #define ATTRIBS (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \
-                 FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE)
+                 FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE | FILE_ATTRIBUTE_NORMAL)
+#else
+#define ATTRIBS (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \
+                 FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE )
+#endif
 
                 if ((attrib & DDL_EXCLUSIVE) &&
@@ -2956 +2961 @@
     if( descr )
     {
-        LRESULT     lRet = LISTBOX_Directory( lphc->hwndself, descr, attrib, dir, bLong );
+#ifdef __WIN32OS2__
+        //bugfix
+        LRESULT lRet = LISTBOX_Directory( lphc->hWndLBox, descr, attrib, dir, bLong );
+#else
+        LRESULT lRet = LISTBOX_Directory( lphc->hwndself, descr, attrib, dir, bLong );
+#endif
 
         RedrawWindow( lphc->hwndself, NULL, 0,

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.111 2000-12-29 18:39:58 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.112 2001-01-14 17:15:46 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -166 +166 @@
         goto RunDefWndProc;
     }
+////    if(teb->o.odin.fIgnoreMsgs) {
+////        goto RunDefWndProc;
+////    }
 
     if((teb->o.odin.msgstate & 1) == 0)
@@ -988 +991 @@
         goto RunDefFrameWndProc;
     }
+////    if(teb->o.odin.fIgnoreMsgs) {
+////        goto RunDefWndProc;
+////    }
 
     if((teb->o.odin.msgstate & 1) == 0)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.228 2000-12-29 18:39:59 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.229 2001-01-14 17:15:47 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2221 +2221 @@
    RECT oldClientRect = rectClient;
 
+    if(getWindowHandle() == 0x68000010) {
+        hParent = 0;
+    }
     if (fuFlags &
        ~(SWP_NOSIZE     | SWP_NOMOVE     | SWP_NOZORDER     |
@@ -2385 +2388 @@
 
     MsgFormatFrame(NULL);
+
     if(RECT_WIDTH(rectClient) != RECT_WIDTH(*oldClientRect) ||
        RECT_HEIGHT(rectClient) != RECT_HEIGHT(*oldClientRect))
     {
-         wpos->flags &= ~SWP_NOSIZE;
+         wpos->flags &= ~(SWP_NOSIZE|SWP_NOCLIENTSIZE);
+         wpos->cx     = RECT_WIDTH(rectWindow);
+         wpos->cy     = RECT_HEIGHT(rectWindow);
+    }
+
+    if(rectClient.left != oldClientRect->left || 
+       rectClient.top != oldClientRect->top)
+    {
+         wpos->flags &= ~(SWP_NOMOVE|SWP_NOCLIENTMOVE);
+         wpos->x      = rectWindow.left;
+         wpos->y      = rectWindow.top;
     }
 

trunk/src/user32/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.17 2000-10-08 14:03:49 sandervl Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.18 2001-01-14 17:15:47 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -133 +133 @@
    NCCALCSIZE_PARAMS params;
    WINDOWPOS winposCopy;
-   LONG result;
+   LONG result = 0;
 
    /* Send WM_NCCALCSIZE message to get new client area */
-//   if((winpos->flags & (SWP_FRAMECHANGED | SWP_NOSIZE)) != SWP_NOSIZE )
-//   {
+   if((winpos->flags & (SWP_FRAMECHANGED | SWP_NOSIZE)) != SWP_NOSIZE )
+   {
         params.rgrc[0] = *newWindowRect;
         if(calcValidRect)
@@ -167 +167 @@
              winpos->flags &= ~SWP_NOCLIENTSIZE;
 
-//   }
-//   else
-//   if(!(winpos->flags & SWP_NOMOVE) && 
-//       (newClientRect->left != rectClient.left || newClientRect->top != rectClient.top)) {
-//            winpos->flags &= ~SWP_NOCLIENTMOVE;
-//   }
+   }
+   else
+   if(!(winpos->flags & SWP_NOMOVE) && 
+       (newClientRect->left != rectClient.left || newClientRect->top != rectClient.top)) {
+            winpos->flags &= ~SWP_NOCLIENTMOVE;
+   }
    return result;
 }

trunk/src/user32/windowword.cpp

@@ -1 @@
-/* $Id: windowword.cpp,v 1.8 2000-02-16 14:28:27 sandervl Exp $ */
+/* $Id: windowword.cpp,v 1.9 2001-01-14 17:15:47 sandervl Exp $ */
 
 /*
@@ -30 +30 @@
     }
     else {
-         dprintf(("SetWindowLongA; window %x not found!", hwnd));
+         dprintf(("SetWindowLongA %d %x; window %x not found!", nIndex, lNewLong, hwnd));
     }
     return 0;