Changeset 1351 for trunk/src

Timestamp:

Oct 18, 1999, 1:59:58 PM (26 years ago)

Author:

sandervl

Message:

Listbox changes + EnumChildWindow rewrite

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (2 diffs)
• listbox.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (3 diffs)
• win32wbase.h (modified) (2 diffs)
• window.cpp (modified) (2 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.15 1999-10-17 15:46:07 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.16 1999-10-18 11:59:57 sandervl Exp $ */
 
 /*
@@ -1011 +1011 @@
        sendEraseBkgnd (wnd);
 
+#if 1
+   WinUpdateWindow(wnd->getOS2FrameWindowHandle());
+#else
    wnd->MsgPaint(0);
+#endif
 
    SetFS(sel);

trunk/src/user32/listbox.cpp

@@ -1 @@
-/* $Id: listbox.cpp,v 1.8 1999-10-18 10:54:03 sandervl Exp $ */
+/* $Id: listbox.cpp,v 1.9 1999-10-18 11:59:57 sandervl Exp $ */
 /*
  * Listbox controls
@@ -199 +199 @@
     else
     {
+        info.nMin  = 0;
+        info.nMax  = descr->nb_items - 1;
         info.nPos  = descr->top_item;
-
         info.nPage = LISTBOX_GetCurrentPageSize( hwnd, descr );
         info.fMask = SIF_RANGE | SIF_POS | SIF_PAGE;
-        info.nMin  = 0;
-        info.nMax = descr->nb_items;
-
         if (descr->style & LBS_DISABLENOSCROLL)
             info.fMask |= SIF_DISABLENOSCROLL;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.53 1999-10-18 10:54:04 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.54 1999-10-18 11:59:58 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -607 +607 @@
   {
         hwndHorzScroll = OSLibWinQueryScrollBarHandle(OS2HwndFrame, OSLIB_HSCROLL);
-        OSLibWinShowScrollBar(OS2HwndFrame, hwndHorzScroll, OSLIB_HSCROLL, FALSE, TRUE);
+//        OSLibWinShowScrollBar(OS2HwndFrame, hwndHorzScroll, OSLIB_HSCROLL, FALSE, TRUE);
   }
 
   if (dwStyle & WS_VSCROLL) {
         hwndVertScroll = OSLibWinQueryScrollBarHandle(OS2HwndFrame, OSLIB_VSCROLL);
-        OSLibWinShowScrollBar(OS2HwndFrame, hwndVertScroll, OSLIB_VSCROLL, FALSE, TRUE);
+//        OSLibWinShowScrollBar(OS2HwndFrame, hwndVertScroll, OSLIB_VSCROLL, FALSE, TRUE);
   }
 
@@ -2171 +2171 @@
 }
 //******************************************************************************
+//TODO: Should not enumerate children that are created during the enumeration!
+//******************************************************************************
+BOOL Win32BaseWindow::EnumChildWindows(WNDENUMPROC lpfn, LPARAM lParam)
+{
+ BOOL rc = TRUE;
+ HWND hwnd;
+ Win32BaseWindow *prevchild = 0, *child = 0;
+
+        dprintf(("EnumChildWindows of %x parameter %x %x (%x)", getWindowHandle(), lpfn, lParam, getFirstChild()));
+    for (child = (Win32BaseWindow *)getFirstChild(); child; child = (Win32BaseWindow *)child->getNextChild())
+    {
+        dprintf(("EnumChildWindows: enumerating child %x", child->getWindowHandle()));
+        hwnd = child->getWindowHandle();
+        if(lpfn(hwnd, lParam) == FALSE)
+        {
+                rc = FALSE;
+                break;
+        }
+        //check if the window still exists
+        if(!::IsWindow(hwnd))
+        {
+            child = prevchild;
+            continue;
+        }
+        if(child->getFirstChild() != NULL)
+        {
+            dprintf(("EnumChildWindows: Enumerate children of %x", child->getWindowHandle()));
+            if(child->EnumChildWindows(lpfn, lParam) == FALSE)
+            {
+                rc = FALSE;
+                break;
+            }
+        }
+        prevchild = child;
+    }
+    return rc;
+}
+//******************************************************************************
 //******************************************************************************
 Win32BaseWindow *Win32BaseWindow::FindWindowById(int id)

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.29 1999-10-17 20:18:46 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.30 1999-10-18 11:59:58 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -203 +203 @@
                              BOOL fUnicode = 0);
 
+           BOOL EnumChildWindows(WNDENUMPROC lpfn, LPARAM lParam);
+
     static HWND Win32ToOS2Handle(HWND hwnd);
     static HWND Win32ToOS2FrameHandle(HWND hwnd);

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.20 1999-10-17 20:18:46 sandervl Exp $ */
+/* $Id: window.cpp,v 1.21 1999-10-18 11:59:58 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -1274 +1274 @@
 BOOL WIN32API EnumChildWindows(HWND hwnd, WNDENUMPROC lpfn, LPARAM lParam)
 {
- Win32BaseWindow *window, *parentwindow;
+ Win32BaseWindow *window;
  BOOL   rc = TRUE;
  ULONG  henum;
  HWND   hwndNext;
 
-  dprintf(("EnumChildWindows %x %x\n", hwnd, lParam));
-
-  parentwindow = Win32BaseWindow::GetWindowFromHandle(hwnd);
-  if(!parentwindow) {
-        dprintf(("EnumChildWindows, window %x not found", hwnd));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+  if(lpfn == NULL) {
+        dprintf(("EnumChildWindows invalid parameter %x %x\n", hwnd, lParam)); 
+        SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
   }
-
-  henum = OSLibWinBeginEnumWindows(OSLIB_HWND_DESKTOP);
-  while ((hwndNext = OSLibWinGetNextWindow(henum)) != 0)
-  {
-        window = Win32BaseWindow::GetWindowFromOS2Handle(hwndNext);
-        if(window == NULL) {
-                window = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndNext);
-                if(!window) {
-                        //OS/2 window or non-frame window, so skip it
-                        continue;
-                }
-        }
-        if((rc = lpfn(window->getWindowHandle(), lParam)) == FALSE)
-        {
-                rc = FALSE;
-                break;
-        }
+  window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+  if(!window) {
+        dprintf(("EnumChildWindows, window %x not found", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return FALSE;
   }
-  OSLibWinEndEnumWindows(henum);
-  return rc;
+  return window->EnumChildWindows(lpfn, lParam);
 }
 //******************************************************************************