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

Timestamp:

Oct 7, 1999, 11:28:02 AM (26 years ago)

Author:

sandervl

Message:

EB's fixes + scrollbar changes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.25 1999-10-06 07:56:37 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.26 1999-10-07 09:28:01 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -126 +126 @@
   horzScrollInfo     = NULL;
   vertScrollInfo     = NULL;
-
+  hwndHorzScroll     = 0;
+  hwndVertScroll     = 0;
 }
 //******************************************************************************
@@ -160 +161 @@
         horzScrollInfo = NULL;
   }
+  //TODO: Destroy windows if they're not associated with our window anymore (showwindow false)?
+//  hwndHorzScroll
+//  hwndVertScroll
+
 }
 //******************************************************************************
@@ -475 +480 @@
 #endif
 
+  if (cs->style & WS_HSCROLL)
+  {
+        hwndHorzScroll = OSLibWinQueryScrollBarHandle(OS2HwndFrame, OSLIB_HSCROLL);
+  }
+
+  if (cs->style & WS_VSCROLL) {
+        hwndVertScroll = OSLibWinQueryScrollBarHandle(OS2HwndFrame, OSLIB_VSCROLL);
+  }
+
   fakeWinBase.hwndThis     = OS2Hwnd;
   fakeWinBase.pWindowClass = windowClass;
@@ -491 +505 @@
         }
   }
-  else  windowId = (UINT)cs->hMenu;
+  else
+  {
+        setWindowId((DWORD)cs->hMenu);
+  }
 
   //Set icon from class
@@ -1258 +1275 @@
     case SB_HORZ:
         if(horzScrollInfo) {
-            horzScrollInfo->CurVal = OSLibWinGetScrollPos(OS2HwndFrame, OSLIB_HSCROLL);
+            horzScrollInfo->CurVal = OSLibWinGetScrollPos(OS2HwndFrame, hwndHorzScroll);
             return horzScrollInfo;
         }
@@ -1264 +1281 @@
     case SB_VERT:
         if(vertScrollInfo) {
-            vertScrollInfo->CurVal = OSLibWinGetScrollPos(OS2HwndFrame, OSLIB_VSCROLL);
+            vertScrollInfo->CurVal = OSLibWinGetScrollPos(OS2HwndFrame, hwndVertScroll);
             return vertScrollInfo;
         }
@@ -1277 +1294 @@
 {
   SCROLLBAR_INFO *infoPtr;
+  HWND            hwndScroll;
   ULONG           scrollType;
   int             new_flags;
@@ -1286 +1304 @@
         }
         infoPtr = horzScrollInfo;
+        hwndScroll = hwndHorzScroll;
         scrollType = OSLIB_HSCROLL;
         break;
@@ -1293 +1312 @@
         }
         infoPtr = vertScrollInfo;
+        hwndScroll = hwndVertScroll;
         scrollType = OSLIB_VSCROLL;
         break;
@@ -1309 +1329 @@
         {
             infoPtr->Page = info->nPage;
-            OSLibWinSetScrollPageSize(OS2HwndFrame, scrollType, info->nPage, infoPtr->MaxVal, fRedraw);
+            OSLibWinSetScrollPageSize(OS2HwndFrame, hwndScroll, info->nPage, infoPtr->MaxVal, fRedraw);
         }
     }
@@ -1319 +1339 @@
         {
             infoPtr->CurVal = info->nPos;
-            OSLibWinSetScrollPos(OS2HwndFrame, scrollType, info->nPos, fRedraw);
+            OSLibWinSetScrollPos(OS2HwndFrame, hwndScroll, info->nPos, fRedraw);
         }
     }
@@ -1341 +1361 @@
                 infoPtr->MaxVal = info->nMax;
 
-                OSLibWinSetScrollRange(OS2HwndFrame, scrollType, info->nMin, info->nMax, fRedraw);
+                OSLibWinSetScrollRange(OS2HwndFrame, hwndScroll, info->nMin, info->nMax, fRedraw);
             }
         }
@@ -2381 +2401 @@
         case GWL_HWNDPARENT:
                 return SetParent((HWND)value);
-
         case GWL_ID:
                 oldval = getWindowId();
@@ -2460 +2479 @@
 //******************************************************************************
 //******************************************************************************
+void Win32BaseWindow::setWindowId(DWORD id)
+{
+   windowId = id;
+   OSLibSetWindowID(OS2HwndFrame, id);
+}
+//******************************************************************************
+//******************************************************************************
 Win32BaseWindow *Win32BaseWindow::GetWindowFromHandle(HWND hwnd)
 {