Changeset 2426 for trunk/src/user32/new/scroll.cpp

Timestamp:

Jan 13, 2000, 2:54:55 PM (26 years ago)

Author:

sandervl

Message:

wm_activate fixes, scrollbar fix, drawframe fix

File:

• trunk/src/user32/new/scroll.cpp (modified) (3 diffs)

trunk/src/user32/new/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.9 2000-01-12 15:14:16 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.10 2000-01-13 13:54:53 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -125 +125 @@
         if (!win32wnd) return FALSE;
         rectClient = *win32wnd->getClientRectPtr();
-        mapWin32Rect(win32wnd->getParent() ? win32wnd->getParent()->getOS2WindowHandle():OSLIB_HWND_DESKTOP,win32wnd->getOS2FrameWindowHandle(),&rectClient);
+        if(win32wnd->getParent())
+                mapWin32Rect(win32wnd->getParent() ? win32wnd->getParent()->getOS2WindowHandle():OSLIB_HWND_DESKTOP,win32wnd->getOS2FrameWindowHandle(),&rectClient);
         lprect->left   = rectClient.left;
         lprect->top    = rectClient.bottom;
@@ -147 +148 @@
         if (!win32wnd) return FALSE;
         rectClient = *win32wnd->getClientRectPtr();
-        mapWin32Rect(win32wnd->getParent() ? win32wnd->getParent()->getOS2WindowHandle():OSLIB_HWND_DESKTOP,win32wnd->getOS2FrameWindowHandle(),&rectClient);
+        if(win32wnd->getParent())
+                mapWin32Rect(win32wnd->getParent() ? win32wnd->getParent()->getOS2WindowHandle():OSLIB_HWND_DESKTOP,win32wnd->getOS2FrameWindowHandle(),&rectClient);
         lprect->left   = rectClient.right;
         lprect->top    = rectClient.top;