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

Timestamp:

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

Author:

sandervl

Message:

EB's fixes + scrollbar changes

File:

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

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.12 1999-10-04 09:56:00 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.13 1999-10-07 09:28:00 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -693 +693 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinShowScrollBar(HWND hwndParent, int scrollBar, BOOL fShow)
-{
- HWND hwndScroll;
-
-   if(scrollBar == OSLIB_VSCROLL) {
-        hwndScroll = WinWindowFromID(hwndParent, FID_VERTSCROLL);
+BOOL OSLibWinShowScrollBar(HWND hwndParent, HWND hwndScroll, int scrollBar, BOOL fShow)
+{
+   if(hwndScroll == NULL) {
+        dprintf(("OSLibWinShowScrollBar: scrollbar %d (parent %x) not found!", scrollBar, hwndParent));
+        return FALSE;
    }
-   else hwndScroll = WinWindowFromID(hwndParent, FID_HORZSCROLL);
-
-   if(hwndScroll == NULL)
-        return FALSE;
-
-   if(fShow != WinIsWindowVisible(hwndScroll)) {
-        WinShowWindow(hwndScroll, fShow);
+
+   if(fShow != WinIsWindowVisible(hwndScroll)) 
+   {
+         WinSetParent(hwndScroll, fShow ? hwndParent : HWND_OBJECT, FALSE);
+         WinSendMsg(hwndParent, WM_UPDATEFRAME,
+                    MPFROMLONG( ( scrollBar == OSLIB_VSCROLL ) ? FCF_VERTSCROLL 
+                                                               : FCF_HORZSCROLL),
+                    MPVOID );
+
+         WinShowWindow(hwndScroll, fShow);
    }
    return TRUE;   
@@ -712 +714 @@
 //******************************************************************************
 //******************************************************************************
-ULONG OSLibWinGetScrollPos(HWND hwndParent, int scrollBar)
-{
- HWND hwndScroll;
-
+HWND OSLibWinQueryScrollBarHandle(HWND hwndParent, int scrollBar)
+{
    if(scrollBar == OSLIB_VSCROLL) {
-        hwndScroll = WinWindowFromID(hwndParent, FID_VERTSCROLL);
+        return WinWindowFromID(hwndParent, FID_VERTSCROLL);
    }
-   else hwndScroll = WinWindowFromID(hwndParent, FID_HORZSCROLL);
-
+   else return WinWindowFromID(hwndParent, FID_HORZSCROLL);
+}
+//******************************************************************************
+//******************************************************************************
+ULONG OSLibWinGetScrollPos(HWND hwndParent, HWND hwndScroll)
+{
    if(hwndScroll == NULL)
         return 0;
@@ -728 +732 @@
 //******************************************************************************
 //******************************************************************************
-ULONG OSLibWinSetScrollPos(HWND hwndParent, int scrollBar, int pos, int fRedraw)
-{
- HWND  hwndScroll;
+ULONG OSLibWinSetScrollPos(HWND hwndParent, HWND hwndScroll, int pos, int fRedraw)
+{
  ULONG oldPos;
-
-   if(scrollBar == OSLIB_VSCROLL) {
-        hwndScroll = WinWindowFromID(hwndParent, FID_VERTSCROLL);
-   }
-   else hwndScroll = WinWindowFromID(hwndParent, FID_HORZSCROLL);
 
    if(hwndScroll == NULL)
@@ -750 +748 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinSetScrollRange(HWND hwndParent, int scrollBar, int minpos, 
+BOOL OSLibWinSetScrollRange(HWND hwndParent, HWND hwndScroll, int minpos, 
                             int maxpos, int fRedraw)
 {
- HWND hwndScroll;
-
-   if(scrollBar == OSLIB_VSCROLL) {
-        hwndScroll = WinWindowFromID(hwndParent, FID_VERTSCROLL);
-   }
-   else hwndScroll = WinWindowFromID(hwndParent, FID_HORZSCROLL);
-
    if(hwndScroll == NULL)
         return 0;
@@ -769 +760 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinSetScrollPageSize(HWND hwndParent, int scrollBar, int pagesize, 
+BOOL OSLibWinSetScrollPageSize(HWND hwndParent, HWND hwndScroll, int pagesize, 
                                int totalsize, int fRedraw)
 {
- HWND hwndScroll;
-
-   if(scrollBar == OSLIB_VSCROLL) {
-        hwndScroll = WinWindowFromID(hwndParent, FID_VERTSCROLL);
-   }
-   else hwndScroll = WinWindowFromID(hwndParent, FID_HORZSCROLL);
-
    if(hwndScroll == NULL)
         return 0;
@@ -889 +873 @@
 //******************************************************************************
 //******************************************************************************
+BOOL OSLibSetWindowID(HWND hwnd, ULONG value)
+{
+  dprintf(("OSLibSetWindowID hwnd:%x ID:%x", hwnd, value));
+  return WinSetWindowULong(hwnd, QWS_ID, value);
+}
+//******************************************************************************
+//******************************************************************************