Changeset 1511 for trunk/src/user32/win32wbase.cpp

Timestamp:

Oct 29, 1999, 6:06:56 PM (26 years ago)

Author:

cbratschi

Message:

scrollbar updates

File:

• trunk/src/user32/win32wbase.cpp (modified) (4 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.66 1999-10-28 23:51:05 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.67 1999-10-29 16:06:56 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -596 +596 @@
 
   if (dwStyle & WS_HSCROLL)
-  {
-        hwndHorzScroll = OSLibWinQueryScrollBarHandle(OS2HwndFrame, OSLIB_HSCROLL);
-//        OSLibWinShowScrollBar(OS2HwndFrame, hwndHorzScroll, OSLIB_HSCROLL, FALSE, TRUE);
-  }
-
-  if (dwStyle & WS_VSCROLL) {
-        hwndVertScroll = OSLibWinQueryScrollBarHandle(OS2HwndFrame, OSLIB_VSCROLL);
-//        OSLibWinShowScrollBar(OS2HwndFrame, hwndVertScroll, OSLIB_VSCROLL, FALSE, TRUE);
-  }
-
-  //CB: switch off -> OS/2 scrollbars
+    hwndHorzScroll = OSLibWinQueryScrollBarHandle(OS2HwndFrame, OSLIB_HSCROLL);
+
+  if (dwStyle & WS_VSCROLL)
+    hwndVertScroll = OSLibWinQueryScrollBarHandle(OS2HwndFrame, OSLIB_VSCROLL);
+
   subclassScrollBars(dwStyle & WS_HSCROLL,dwStyle & WS_VSCROLL);
 
@@ -732 +726 @@
     SendInternalMessageA(WM_DESTROY, 0, 0);
 
-    if (hwndHorzScroll && OSLibWinQueryWindow(hwndHorzScroll,QWOS_PARENT) == OSLIB_HWND_OBJECT) OSLibWinDestroyWindow(hwndHorzScroll);
-    if (hwndVertScroll && OSLibWinQueryWindow(hwndVertScroll,QWOS_PARENT) == OSLIB_HWND_OBJECT) OSLibWinDestroyWindow(hwndVertScroll);
+    if (hwndHorzScroll && OSLibWinQueryWindow(hwndHorzScroll,QWOS_PARENT) == OSLibWinQueryObjectWindow()) OSLibWinDestroyWindow(hwndHorzScroll);
+    if (hwndVertScroll && OSLibWinQueryWindow(hwndVertScroll,QWOS_PARENT) == OSLibWinQueryObjectWindow()) OSLibWinDestroyWindow(hwndVertScroll);
 
     if(getFirstChild() == NULL) {
@@ -1248 +1242 @@
 }
 //******************************************************************************
-//TODO: Not complete (flags)
 //******************************************************************************
 SCROLLBAR_INFO *Win32BaseWindow::getScrollInfo(int nBar)
 {
-    switch(nBar) {
+  switch(nBar)
+  {
     case SB_HORZ:
-        if(horzScrollInfo) {
-            //CB:horzScrollInfo->CurVal = OSLibWinGetScrollPos(OS2HwndFrame, hwndHorzScroll);
-            return horzScrollInfo;
-        }
-        break;
+      return horzScrollInfo;
+
     case SB_VERT:
-        if(vertScrollInfo) {
-            //CB:vertScrollInfo->CurVal = OSLibWinGetScrollPos(OS2HwndFrame, hwndVertScroll);
-            return vertScrollInfo;
-        }
-        break;
-    }
-    return NULL;
+      return vertScrollInfo;
+  }
+
+  return NULL;
 }
 /***********************************************************************/