Changeset 6043 for trunk/src

Timestamp:

Jun 18, 2001, 11:00:50 AM (24 years ago)

Author:

sandervl

Message:

sizegrip & sizebox scrollbar size fixes

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (6 diffs)
• scroll.cpp (modified) (4 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.58 2001-06-15 14:07:21 sandervl Exp $
+; $Id: USER32.DEF,v 1.59 2001-06-18 09:00:50 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -305 +305 @@
     GetPriorityClipboardFormat  = _GetPriorityClipboardFormat@8 @276
     GetProcessWindowStation    = _GetProcessWindowStation@0  @277
-    GetProgmanWindow           = _GetProgmanWindow@0                 ;@289
+    GetProgmanWindow           = _GetProgmanWindow@0         @1289
     GetPropA                   = _GetPropA@8                 @278
     GetPropW                   = _GetPropW@8                 @279
     GetQueueStatus             = _GetQueueStatus@4           @280
+    GetScrollBarInfo           = _GetScrollBarInfo@12        @1281
     GetScrollInfo              = _GetScrollInfo@12           @281
     GetScrollPos               = _GetScrollPos@8             @282
@@ -320 +321 @@
     GetTabbedTextExtentA       = _GetTabbedTextExtentA@20    @290
     GetTabbedTextExtentW       = _GetTabbedTextExtentW@20    @291
-    GetTaskmanWindow           = _GetTaskmanWindow@0                  ;@304
+    GetTaskmanWindow           = _GetTaskmanWindow@0         @1304
     GetThreadDesktop           = _GetThreadDesktop@4         @292
     GetTopWindow               = _GetTopWindow@4             @293
@@ -375 +376 @@
     IsDlgButtonChecked         = _IsDlgButtonChecked@8       @344
     IsHungThread               = _IsHungThread@4             @345
-    IsHungAppWindow            = _IsHungAppWindow@8
+    IsHungAppWindow            = _IsHungAppWindow@8          @1345
     IsIconic                   = _IsIconic@4                 @346
     IsMenu                     = _IsMenu@4                   @347
@@ -522 +523 @@
     SetParent                  = _SetParent@8                @489
     SetProcessWindowStation    = _SetProcessWindowStation@4  @490
-    SetProgmanWindow           = _SetProgmanWindow@4                 ;@522 ?
+    SetProgmanWindow           = _SetProgmanWindow@4         @1522
     SetPropA                   = _SetPropA@12                @491
     SetPropW                   = _SetPropW@12                @492
@@ -531 +532 @@
     SetScrollRange             = _SetScrollRange@20          @497
     SetShellWindow             = _SetShellWindow@4           @498
-    SetShellWindowEx           = _SetShellWindowEx@8                 ;@531 ?
+    SetShellWindowEx           = _SetShellWindowEx@8         @1531
     SetSysColors               = _SetSysColors@12            @499
     SetSysColorsTemp           = _SetSysColorsTemp@0         @500
     SetSystemCursor            = _SetSystemCursor@8          @501
-    SetTaskmanWindow           = _SetTaskmanWindow@4                 ;@537
+    SetTaskmanWindow           = _SetTaskmanWindow@4         @1537
     SetThreadDesktop           = _SetThreadDesktop@4         @502
     SetTimer                   = _SetTimer@16                @503

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.40 2001-06-17 21:08:00 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.41 2001-06-18 09:00:50 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -679 +679 @@
 
       w = GetSystemMetrics(SM_CXVSCROLL);
+#ifdef __WIN32OS2__
+      if(lpCreat->style & (SBS_SIZEBOX | SBS_SIZEGRIP)) {
+           h = GetSystemMetrics(SM_CYHSCROLL);
+      }
+      else h = lpCreat->cy;
+#else
       h = lpCreat->cy;
-
+#endif
       if (lpCreat->style & SBS_LEFTALIGN)
         MoveWindow(hwnd,lpCreat->x,lpCreat->y,w,h,FALSE);
@@ -689 +695 @@
       INT w,h;
 
+#ifdef __WIN32OS2__
+      if(lpCreat->style & (SBS_SIZEBOX | SBS_SIZEGRIP)) {
+           w = GetSystemMetrics(SM_CXVSCROLL);
+      }
+      else w = lpCreat->cx;
+#else
       w = lpCreat->cx;
+#endif
+
       h = GetSystemMetrics(SM_CYHSCROLL);
 
@@ -1601 +1615 @@
 }
 
-//CB: not listed in user32.exp -> don't know the id!
-
 BOOL WINAPI GetScrollBarInfo(HWND hwnd,LONG idObject,PSCROLLBARINFO psbi)
 {