Changeset 1922 for trunk/src/user32/scroll.cpp

Timestamp:

Dec 1, 1999, 7:23:29 PM (26 years ago)

Author:

cbratschi

Message:

enhanced edit control

File:

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

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.25 1999-11-24 18:21:37 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.26 1999-12-01 18:23:28 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -83 +83 @@
       {
         Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+
         if (!win32wnd) return 0;
-        if (nBar == SB_HORZ) return  Win32BaseWindow::OS2ToWin32Handle(win32wnd->getHorzScrollHandle());
-        else return  Win32BaseWindow::OS2ToWin32Handle(win32wnd->getVertScrollHandle());
+        if (nBar == SB_HORZ)
+          return  (win32wnd->getStyle() & WS_HSCROLL) ? Win32BaseWindow::OS2ToWin32Handle(win32wnd->getHorzScrollHandle()):0;
+        else
+          return (win32wnd->getStyle() & WS_VSCROLL) ? Win32BaseWindow::OS2ToWin32Handle(win32wnd->getVertScrollHandle()):0;
       }
+
     case SB_CTL:
       return hwnd;
@@ -1422 +1426 @@
         {
           action = SA_SSI_HIDE;
+          infoPtr->flags = 0;
           goto done;
         }
@@ -1630 +1635 @@
         dprintf(("ShowScrollBar window not found!"));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return 0;
+        return FALSE;
       }
 
@@ -1663 +1668 @@
   {
     Win32BaseWindow *window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+
     if(!window)
     {
@@ -1674 +1680 @@
       BOOL rc = FALSE;
 
-      if (nBar == SB_VERT || nBar == SB_BOTH)
+      if ((nBar == SB_VERT || nBar == SB_BOTH) && window->getStyle() & WS_VSCROLL)
       {
         HWND hwndScroll =  Win32BaseWindow::OS2ToWin32Handle(window->getVertScrollHandle());
@@ -1690 +1696 @@
         }
       }
-      if (nBar == SB_HORZ || (rc && nBar == SB_BOTH))
+      if ((nBar == SB_HORZ || (rc && nBar == SB_BOTH)) && window->getStyle() & WS_HSCROLL)
       {
-        HWND hwndScroll =  Win32BaseWindow::OS2ToWin32Handle(window->getVertScrollHandle());
+        HWND hwndScroll =  Win32BaseWindow::OS2ToWin32Handle(window->getHorzScrollHandle());
 
         infoPtr = SCROLL_GetInfoPtr(hwndScroll,SB_VERT);