Changeset 10098 for trunk/src/comctl32/pager.c

Timestamp:

May 15, 2003, 4:26:27 PM (22 years ago)

Author:

sandervl

Message:

Wine resync

File:

• trunk/src/comctl32/pager.c (modified) (9 diffs)

trunk/src/comctl32/pager.c

@@ -837 +837 @@
 
     /* set default settings */
-    infoPtr->hwndChild = (HWND)NULL;
+    infoPtr->hwndChild = NULL;
     infoPtr->bNoResize = dwStyle & CCS_NORESIZE;
     infoPtr->clrBk = GetSysColor(COLOR_BTNFACE);
@@ -898 +898 @@
     DefWindowProcA (hwnd, WM_NCCALCSIZE, wParam, lParam);
 
-    TRACE("orig rect=(%d,%d)-(%d,%d)\n",
+    TRACE("orig rect=(%ld,%ld)-(%ld,%ld)\n",
           lpRect->left, lpRect->top, lpRect->right, lpRect->bottom);
 
@@ -913 +913 @@
         scrollRange = infoPtr->nWidth - (rcmyw.right - rcmyw.left);
 
-        TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%d,%d)-(%d,%d), cursor=(%ld,%ld)\n",
+        TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%ld,%ld)-(%ld,%ld), cursor=(%ld,%ld)\n",
               infoPtr->nPos, scrollRange, infoPtr->nHeight,
               rcmyw.left, rcmyw.top,
@@ -927 +927 @@
             rbrc = wnrc;
             rbrc.left = rbrc.right - infoPtr->nButtonSize;
-            TRACE("horz lt rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n",
+            TRACE("horz lt rect=(%ld,%ld)-(%ld,%ld), rb rect=(%ld,%ld)-(%ld,%ld)\n",
                   ltrc.left, ltrc.top, ltrc.right, ltrc.bottom,
                   rbrc.left, rbrc.top, rbrc.right, rbrc.bottom);
@@ -962 +962 @@
         scrollRange = infoPtr->nHeight - (rcmyw.bottom - rcmyw.top);
 
-        TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%d,%d)-(%d,%d), cursor=(%ld,%ld)\n",
+        TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%ld,%ld)-(%ld,%ld), cursor=(%ld,%ld)\n",
               infoPtr->nPos, scrollRange, infoPtr->nHeight,
               rcmyw.left, rcmyw.top,
@@ -987 +987 @@
             rbrc = wnrc;
             rbrc.left = rbrc.right - infoPtr->nButtonSize;
-            TRACE("vert lt rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n",
+            TRACE("vert lt rect=(%ld,%ld)-(%ld,%ld), rb rect=(%ld,%ld)-(%ld,%ld)\n",
                   ltrc.left, ltrc.top, ltrc.right, ltrc.bottom,
                   rbrc.left, rbrc.top, rbrc.right, rbrc.bottom);
@@ -999 +999 @@
         if (infoPtr->BRbtnState && (lpRect->bottom - infoPtr->nButtonSize > lpRect->top))
             lpRect->bottom -= infoPtr->nButtonSize;
-        /* ???? */
-        if ((lpRect->bottom < 0) || (lpRect->bottom > infoPtr->nHeight))
-            lpRect->bottom = infoPtr->nHeight;
-    }
-
-    TRACE("[%p] client rect set to %dx%d at (%d,%d) BtnState[%d,%d]\n",
+    }
+
+    TRACE("[%p] client rect set to %ldx%ld at (%ld,%ld) BtnState[%d,%d]\n",
           hwnd, lpRect->right-lpRect->left, lpRect->bottom-lpRect->top,
           lpRect->left, lpRect->top,
@@ -1233 +1230 @@
         /* If in one of the buttons the capture and draw buttons */
         if (btnrect) {
-            TRACE("[%p] draw btn (%d,%d)-(%d,%d), Capture %s, style %08lx\n",
+            TRACE("[%p] draw btn (%ld,%ld)-(%ld,%ld), Capture %s, style %08lx\n",
                   hwnd, btnrect->left, btnrect->top,
                   btnrect->right, btnrect->bottom,
@@ -1604 +1601 @@
 PAGER_Unregister (void)
 {
-    UnregisterClassA (WC_PAGESCROLLERA, (HINSTANCE)NULL);
-}
+    UnregisterClassA (WC_PAGESCROLLERA, NULL);
+}