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

Timestamp:

Jun 9, 2001, 4:50:26 PM (24 years ago)

Author:

sandervl

Message:

reference count (window + class objects) rewrite

File:

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

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.38 2001-05-20 10:44:04 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.39 2001-06-09 14:50:19 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -21 +21 @@
 #include "oslibwin.h"
 #include "initterm.h"
-#include "pmframe.h"
 
 #define DBG_LOCALLOG    DBG_scroll
@@ -84 +83 @@
         case SB_HORZ:
         case SB_VERT:
-          win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-          if (!win32wnd) return NULL;
-          return win32wnd->getScrollInfo(nBar);
+        {
+            SCROLLBAR_INFO *pInfo;
+            win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+
+            if (!win32wnd) return NULL;
+            pInfo = win32wnd->getScrollInfo(nBar);
+            RELEASE_WNDOBJ(win32wnd);
+            return pInfo;
+        }
 
         case SB_CTL:
@@ -133 +138 @@
           lprect->left--;
           lprect->right++;
-        } else if (win32wnd->getStyle() & WS_VSCROLL)
+        } 
+        else 
+        if (win32wnd->getStyle() & WS_VSCROLL)
             lprect->right++;
+        RELEASE_WNDOBJ(win32wnd);
         vertical = FALSE;
         break;
@@ -154 +162 @@
           lprect->top--;
           lprect->bottom++;
-        } else if (win32wnd->getStyle() & WS_HSCROLL)
+        } 
+        else 
+        if (win32wnd->getStyle() & WS_HSCROLL)
           lprect->bottom++;
+        RELEASE_WNDOBJ(win32wnd);
         vertical = TRUE;
         break;
@@ -1492 +1503 @@
                     BOOL fShow  /* [I] TRUE = show, FALSE = hide  */)
 {
-    Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
     BOOL fShowH = (nBar == SB_HORZ) ? fShow : 0;
     BOOL fShowV = (nBar == SB_VERT) ? fShow : 0;
+    DWORD dwStyle;
 
     dprintf(("ShowScrollBar %04x %d %d\n", hwnd, nBar, fShow));
-    if (!win32wnd) return FALSE;
+    if (!IsWindow(hwnd)) return FALSE;
+
+    dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
 
     //CB: does Win32 send a WM_STYLECHANGED message?
@@ -1510 +1523 @@
         if (fShow)
         {
-            fShowH = !(win32wnd->getStyle() & WS_HSCROLL);
-            win32wnd->setStyle(win32wnd->getStyle() | WS_HSCROLL);
+            fShowH = !(dwStyle & WS_HSCROLL);
+            SetWindowLongA(hwnd, GWL_STYLE, dwStyle | WS_HSCROLL);
         }
         else  /* hide it */
         {
-            fShowH = (win32wnd->getStyle() & WS_HSCROLL);
-            win32wnd->setStyle(win32wnd->getStyle() & ~WS_HSCROLL);
+            fShowH = (dwStyle & WS_HSCROLL);
+            SetWindowLongA(hwnd, GWL_STYLE, dwStyle & ~WS_HSCROLL);
         }
         if( nBar == SB_HORZ )
@@ -1528 +1541 @@
         if (fShow)
         {
-            fShowV = !(win32wnd->getStyle() & WS_VSCROLL);
-            win32wnd->setStyle(win32wnd->getStyle() | WS_VSCROLL);
+            fShowV = !(dwStyle & WS_VSCROLL);
+            SetWindowLongA(hwnd, GWL_STYLE, dwStyle | WS_VSCROLL);
         }
         else  /* hide it */
         {
-            fShowV = (win32wnd->getStyle() & WS_VSCROLL);
-            win32wnd->setStyle(win32wnd->getStyle() & ~WS_VSCROLL);
+            fShowV = (dwStyle & WS_VSCROLL);
+            SetWindowLongA(hwnd, GWL_STYLE, dwStyle & ~WS_VSCROLL);
         }
         if ( nBar == SB_VERT )