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

Timestamp:

Sep 15, 2001, 11:13:31 AM (24 years ago)

Author:

sandervl

Message:

update

File:

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

trunk/src/comctl32/pager.c

@@ -1 @@
-/* $Id: pager.c,v 1.9 2001-09-05 12:05:01 bird Exp $ */
 /*
  * Pager control
@@ -21 +20 @@
 #include "debugtools.h"
 
+DEFAULT_DEBUG_CHANNEL(pager);
+
 #ifdef __WIN32OS2__
 #include "ccbase.h"
+#undef inline
 #define inline
 #endif
-
-DEFAULT_DEBUG_CHANNEL(pager);
 
 typedef struct
@@ -40 +40 @@
     INT    nPos;       /* scroll position */
     INT    nWidth;     /* from child wnd's response to PGN_CALCSIZE */
-    INT    nHeight;    /* from child wnd's response to PGN_CALCSIZE */
+    INT    nHeight;    /* from child wnd's response to PGN_CALCSIZE */ 
     BOOL   bForward;   /* forward WM_MOUSEMOVE msgs to the contained wnd */
     INT    TLbtnState; /* state of top or left btn */
@@ -58 +58 @@
 #define REPEAT_DELAY     50
 
-/* the horizontal arrows are:
+/* the horizontal arrows are: 
  *
  * 01234    01234
@@ -67 +67 @@
  * 5 **      **
  * 6  *      *
- * 7
+ * 7  
  *
  */
@@ -75 +75 @@
     INT x, y, w, h;
     HPEN hOldPen;
-
+    
     w = r.right - r.left + 1;
     h = r.bottom - r.top + 1;
@@ -108 +108 @@
 }
 
-/* the vertical arrows are:
+/* the vertical arrows are: 
  *
  * 01234567    01234567
- * 1******        **
+ * 1******        **  
  * 2 ****        ****
  * 3  **        ******
@@ -122 +122 @@
     INT x, y, w, h;
     HPEN hOldPen;
-
+    
     w = r.right - r.left + 1;
     h = r.bottom - r.top + 1;
@@ -166 +166 @@
 
     if ((rc.right - rc.left <= 0) || (rc.bottom - rc.top <= 0))
-        return;
+        return;  
 
     hBrush = CreateSolidBrush(clrBk);
@@ -173 +173 @@
     FillRect(hdc, &rc, hBrush);
 
-    if (btnState == PGF_HOT)
+    if (btnState == PGF_HOT) 
     {
        DrawEdge( hdc, &rc, BDR_RAISEDINNER, BF_RECT);
@@ -181 +181 @@
            PAGER_DrawVertArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft);
     }
-    else if (btnState == PGF_NORMAL)
+    else if (btnState == PGF_NORMAL) 
     {
        DrawEdge (hdc, &rc, BDR_OUTER, BF_FLAT);
@@ -189 +189 @@
            PAGER_DrawVertArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft);
     }
-    else if (btnState == PGF_DEPRESSED)
+    else if (btnState == PGF_DEPRESSED) 
     {
        DrawEdge( hdc, &rc, BDR_SUNKENOUTER, BF_RECT);
@@ -197 +197 @@
            PAGER_DrawVertArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft);
     }
-    else if (btnState == PGF_GRAYED)
+    else if (btnState == PGF_GRAYED) 
     {
        DrawEdge (hdc, &rc, BDR_OUTER, BF_FLAT);
@@ -234 +234 @@
 PAGER_GetButtonState (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
     LRESULT btnState = PGF_INVISIBLE;
     INT btn = (INT)lParam;
@@ -251 +251 @@
 PAGER_GetPos(HWND hwnd)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
     TRACE("[%04x] returns %d\n", hwnd, infoPtr->nPos);
     return (LRESULT)infoPtr->nPos;
@@ -259 +259 @@
 PAGER_GetButtonSize(HWND hwnd)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
     TRACE("[%04x] returns %d\n", hwnd, infoPtr->nButtonSize);
     return (LRESULT)infoPtr->nButtonSize;
@@ -267 +267 @@
 PAGER_GetBorder(HWND hwnd)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
     TRACE("[%04x] returns %d\n", hwnd, infoPtr->nBorder);
     return (LRESULT)infoPtr->nBorder;
@@ -275 +275 @@
 PAGER_GetBkColor(HWND hwnd)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
     TRACE("[%04x] returns %06lx\n", hwnd, infoPtr->clrBk);
     return (LRESULT)infoPtr->clrBk;
 }
 
-static void
-PAGER_CalcSize (HWND hwnd, INT* size, BOOL getWidth)
+static void 
+PAGER_CalcSize (HWND hwnd, INT* size, BOOL getWidth) 
 {
     NMPGCALCSIZE nmpgcs;
@@ -291 +291 @@
     nmpgcs.iWidth = getWidth ? *size : 0;
     nmpgcs.iHeight = getWidth ? 0 : *size;
-    SendMessageA (hwnd, WM_NOTIFY,
+    SendMessageA (GetParent (hwnd), WM_NOTIFY,
                   (WPARAM)nmpgcs.hdr.idFrom, (LPARAM)&nmpgcs);
 
@@ -334 +334 @@
                 infoPtr->nHeight = wndSize;
 
-            TRACE("[%04x] SWP %dx%d at (%d,%d)\n", hwnd,
+            TRACE("[%04x] SWP %dx%d at (%d,%d)\n", hwnd, 
                          infoPtr->nWidth, infoPtr->nHeight,
                          0, -nPos);
@@ -380 +380 @@
 }
 
-static void
+static void 
 PAGER_GrayAndRestoreBtns(PAGER_INFO* infoPtr, INT scrollRange,
                          BOOL* needsResize, BOOL* needsRepaint)
@@ -417 +417 @@
 
 
-static void
+static void 
 PAGER_NormalizeBtns(PAGER_INFO* infoPtr, BOOL* needsRepaint)
 {
@@ -433 +433 @@
 }
 
-static void
+static void 
 PAGER_HideGrayBtns(PAGER_INFO* infoPtr, BOOL* needsResize)
 {
@@ -464 +464 @@
         PAGER_HideGrayBtns(infoPtr, &resizeClient);
 
-    if (resizeClient) /* initiate NCCalcSize to resize client wnd */
-        SetWindowPos(hwnd, 0,0,0,0,0,
+    if (resizeClient) /* initiate NCCalcSize to resize client wnd */ {
+        SetWindowPos(hwnd, 0,0,0,0,0, 
                      SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE |
                      SWP_NOZORDER | SWP_NOACTIVATE);
+    }
 
     if (repaintBtns)
-        SendMessageA(hwnd, WM_NCPAINT, 0, 0);
-}
-
-static LRESULT
+        SendMessageA(hwnd, WM_NCPAINT, 0, 0); 
+}
+
+static LRESULT  
 PAGER_SetPos(HWND hwnd, INT newPos, BOOL fromBtnPress)
 {
@@ -500 +501 @@
 
 static LRESULT
-PAGER_HandleWindowPosChanging(HWND hwnd, WINDOWPOS *winpos)
+PAGER_HandleWindowPosChanging(HWND hwnd, WPARAM wParam, WINDOWPOS *winpos)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
@@ -510 +511 @@
          * (i.e. height for a horizontal pager, or width for a vertical one) */
 
+        /* except if the current dimension is 0 and app is setting for
+         * first time, then save amount as dimension. - GA 8/01 */
+
         if (PAGER_IsHorizontal(hwnd))
-            winpos->cy = infoPtr->nHeight;
+            if (!infoPtr->nHeight && winpos->cy)
+                infoPtr->nHeight = winpos->cy;
+            else
+                winpos->cy = infoPtr->nHeight;
         else
-            winpos->cx = infoPtr->nWidth;
-    }
-
-    return 0;
-}
-
-static void
+            if (!infoPtr->nWidth && winpos->cx)
+                infoPtr->nWidth = winpos->cx;
+            else
+                winpos->cx = infoPtr->nWidth;
+        return 0;
+    }
+
+    DefWindowProcA (hwnd, WM_WINDOWPOSCHANGING, wParam, (LPARAM)winpos);
+
+    return 1;
+}
+
+static INT 
 PAGER_SetFixedWidth(HWND hwnd, PAGER_INFO* infoPtr)
 {
@@ -544 +557 @@
     h = wndRect.bottom - wndRect.top + infoPtr->nButtonSize;
 
-    /* adjust non-scrollable dimension to fit the child */
-    SetWindowPos(hwnd, 0, 0,0, infoPtr->nWidth, h,
-                 SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER);
-
-
     TRACE("[%04x] infoPtr->nWidth set to %d\n",
-           hwnd, infoPtr->nWidth);
-}
-
-static void
+               hwnd, infoPtr->nWidth);
+
+    return h;
+}
+
+static INT 
 PAGER_SetFixedHeight(HWND hwnd, PAGER_INFO* infoPtr)
 {
@@ -578 +588 @@
     w = wndRect.right - wndRect.left + infoPtr->nButtonSize;
 
-    /* adjust non-scrollable dimension to fit the child */
-    SetWindowPos(hwnd, 0, 0,0, w, infoPtr->nHeight,
-                 SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER);
-
     TRACE("[%04x] infoPtr->nHeight set to %d\n",
-           hwnd, infoPtr->nHeight);
+               hwnd, infoPtr->nHeight);
+
+    return w;
 }
 
@@ -602 +610 @@
             PAGER_SetPos(hwnd, 0, FALSE);
         }
-        else
+        else 
         {
             PAGER_UpdateBtns(hwnd, infoPtr, scrollRange, TRUE);
@@ -663 +671 @@
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    INT hw;
 
     infoPtr->hwndChild = IsWindow ((HWND)lParam) ? (HWND)lParam : 0;
@@ -670 +679 @@
         TRACE("[%04x] hwndChild=%04x\n", hwnd, infoPtr->hwndChild);
 
-        if (PAGER_IsHorizontal(hwnd))
-            PAGER_SetFixedHeight(hwnd, infoPtr);
-        else
-            PAGER_SetFixedWidth(hwnd, infoPtr);
+        if (PAGER_IsHorizontal(hwnd)) {
+            hw = PAGER_SetFixedHeight(hwnd, infoPtr);
+            /* adjust non-scrollable dimension to fit the child */
+            SetWindowPos(hwnd, 0, 0,0, hw, infoPtr->nHeight, 
+                         SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER |
+                         SWP_NOSIZE | SWP_NOACTIVATE);
+        }
+        else {
+            hw = PAGER_SetFixedWidth(hwnd, infoPtr);
+            /* adjust non-scrollable dimension to fit the child */
+            SetWindowPos(hwnd, 0, 0,0, infoPtr->nWidth, hw, 
+                         SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER |
+                         SWP_NOSIZE | SWP_NOACTIVATE);
+        }
 
         /* position child within the page scroller */
         SetWindowPos(infoPtr->hwndChild, HWND_TOP,
                      0,0,0,0,
-                     SWP_SHOWWINDOW | SWP_NOSIZE);
+                     SWP_SHOWWINDOW | SWP_NOSIZE);  /* native is 0 */
 
         infoPtr->nPos = -1;
@@ -701 +720 @@
         nmpgScroll.hdr.code = PGN_SCROLL;
 
-        GetWindowRect(hwnd, &rcWnd);
-        GetClientRect(hwnd, &nmpgScroll.rcParent);
+        GetWindowRect(hwnd, &rcWnd);  
+        GetClientRect(hwnd, &nmpgScroll.rcParent);  
         nmpgScroll.iXpos = nmpgScroll.iYpos = 0;
         nmpgScroll.iDir = dir;
@@ -717 +736 @@
         }
         nmpgScroll.iScroll -= 2*infoPtr->nButtonSize;
-
+  
         SendMessageA (hwnd, WM_NOTIFY,
                     (WPARAM)nmpgScroll.hdr.idFrom, (LPARAM)&nmpgScroll);
-
+  
         TRACE("[%04x] PGN_SCROLL returns iScroll=%d\n", hwnd, nmpgScroll.iScroll);
 
@@ -770 +789 @@
         FIXME("[%04x] Drag and Drop style is not implemented yet.\n", hwnd);
     /*
-     * If neither horizontal nor vertical style specified, default to vertical.
-     * This is probably not necessary, since the style may be set later on as
-     * the control is initialized, but just in case it isn't, set it here.
-     */
+         * If neither horizontal nor vertical style specified, default to vertical.
+         * This is probably not necessary, since the style may be set later on as
+         * the control is initialized, but just in case it isn't, set it here.
+         */
     if (!(dwStyle & PGS_HORZ) && !(dwStyle & PGS_VERT))
     {
@@ -799 +818 @@
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
     LPRECT lpRect = (LPRECT)lParam;
+    RECT rcChildw, rcmyw, wnrc, lbrc, rbrc;
+    POINT cursor;
+
     /*
      * lParam points to a RECT struct.  On entry, the struct
-     * contains the proposed wnd rectangle for the window.
+     * contains the proposed wnd rectangle for the window. 
      * On exit, the struct should contain the screen
      * coordinates of the corresponding window's client area.
      */
+        
+    DefWindowProcA (hwnd, WM_NCCALCSIZE, wParam, lParam);
 
     if (PAGER_IsHorizontal(hwnd))
     {
-        if (infoPtr->TLbtnState) /* != PGF_INVISIBLE */
-            lpRect->left += infoPtr->nButtonSize;
-        if (infoPtr->BRbtnState)
-            lpRect->right -= infoPtr->nButtonSize;
+        infoPtr->nWidth = lpRect->right - lpRect->left;
+        PAGER_CalcSize (hwnd, &infoPtr->nWidth, TRUE);
+        GetWindowRect (infoPtr->hwndChild, &rcChildw);
+        MapWindowPoints (0, hwnd, (LPPOINT)&rcChildw, 2);
+        GetCursorPos (&cursor);
+        GetWindowRect (hwnd, &rcmyw);
+        if (PtInRect (&rcmyw, cursor)) {
+            GetWindowRect (hwnd, &wnrc);
+            lbrc = wnrc;
+            lbrc.right = lbrc.left + infoPtr->nButtonSize;
+            rbrc = wnrc;
+            rbrc.left = rbrc.right - infoPtr->nButtonSize;
+            TRACE("horz lb rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n",
+                  lbrc.left, lbrc.top, lbrc.right, lbrc.bottom,
+                  rbrc.left, rbrc.top, rbrc.right, rbrc.bottom);
+            if (PtInRect (&lbrc, cursor) && infoPtr->TLbtnState)
+                RedrawWindow (hwnd, 0, 0, RDW_INVALIDATE | RDW_ERASE);
+            if (PtInRect (&rbrc, cursor) && infoPtr->BRbtnState)
+                RedrawWindow (hwnd, 0, 0, RDW_INVALIDATE | RDW_ERASE);
+        }
+        if (infoPtr->TLbtnState) /* != PGF_INVISIBLE */
+            lpRect->left += infoPtr->nButtonSize;
+        if (infoPtr->BRbtnState) 
+            lpRect->right -= infoPtr->nButtonSize;
     }
     else
     {
-        if (infoPtr->TLbtnState)
-            lpRect->top += infoPtr->nButtonSize;
-        if (infoPtr->BRbtnState)
-            lpRect->bottom -= infoPtr->nButtonSize;
+        /* native does: (from trace of IE4 opening "Favorites" frame) 
+         *        DefWindowProc
+         *        WM_NOITFY  PGN_CALCSIZE w/ dwFlag=2
+         *        GetWindowRect (child, &rc)
+         *        MapWindowPoints (0, syspager, &rc, 2)
+         *        GetCursorPos( &cur )
+         *        GetWindowRect (syspager, &rc2)
+         *        PtInRect (&rc2, cur.x, cur.y) rtns 0
+         *        returns with rect empty
+         */
+        infoPtr->nHeight = lpRect->bottom - lpRect->top;
+        PAGER_CalcSize (hwnd, &infoPtr->nHeight, FALSE);
+        GetWindowRect (infoPtr->hwndChild, &rcChildw);
+        MapWindowPoints (0, hwnd, (LPPOINT)&rcChildw, 2);
+        GetCursorPos (&cursor);
+        GetWindowRect (hwnd, &rcmyw);
+        if (PtInRect (&rcmyw, cursor)) {
+
+            /* native does:
+             *    GetWindowRect(pager, &rc)
+             *    PtInRect(btn-left????, cur.x, cur.y)
+             *    if true -> ???
+             *    PtInRect(btn-right????, cur.x, cur.y)
+             *    if true
+             *      RedrawWindow(pager, 0, 0, 5)
+             *      return TRUE
+             */
+
+            GetWindowRect (hwnd, &wnrc);
+            lbrc = wnrc;
+            lbrc.right = lbrc.left + infoPtr->nButtonSize;
+            rbrc = wnrc;
+            rbrc.left = rbrc.right - infoPtr->nButtonSize;
+            TRACE("vert lb rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n",
+                  lbrc.left, lbrc.top, lbrc.right, lbrc.bottom,
+                  rbrc.left, rbrc.top, rbrc.right, rbrc.bottom);
+            if (PtInRect (&lbrc, cursor) && infoPtr->TLbtnState)
+                RedrawWindow (hwnd, 0, 0, RDW_INVALIDATE | RDW_ERASE);
+            if (PtInRect (&rbrc, cursor) && infoPtr->BRbtnState)
+                RedrawWindow (hwnd, 0, 0, RDW_INVALIDATE | RDW_ERASE);
+        }
+        if (infoPtr->TLbtnState)
+            lpRect->top += infoPtr->nButtonSize;
+        if (infoPtr->BRbtnState)
+            lpRect->bottom -= infoPtr->nButtonSize;
+        /* ???? */
+        if ((lpRect->bottom < 0) || (lpRect->bottom > infoPtr->nHeight))
+            lpRect->bottom = infoPtr->nHeight;
     }
 
@@ -864 +952 @@
                      bHorizontal, TRUE, infoPtr->TLbtnState);
     PAGER_DrawButton(hdc, infoPtr->clrBk, rcBottomRight,
-                     bHorizontal, FALSE, infoPtr->BRbtnState);
+                     bHorizontal, FALSE, infoPtr->BRbtnState); 
 
     ReleaseDC( hwnd, hdc );
@@ -870 +958 @@
 }
 
-static INT
+static INT 
 PAGER_HitTest (HWND hwnd, LPPOINT pt)
 {
@@ -977 +1065 @@
         if(!(trackinfo.dwFlags & TME_LEAVE)) {
             trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */
-
+ 
            /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */
            /* and can properly deactivate the hot button */
@@ -983 +1071 @@
         }
 
-        SendMessageA(hwnd, WM_NCPAINT, 0, 0);
+        SendMessageA(hwnd, WM_NCPAINT, 0, 0); 
     }
 
@@ -1026 +1114 @@
 
     TRACE("[%04x]\n", hwnd);
-
+        
     hit = PAGER_HitTest(hwnd, &pt);
 
@@ -1034 +1122 @@
         repaintBtns = infoPtr->TLbtnState != PGF_DEPRESSED;
         infoPtr->TLbtnState = PGF_DEPRESSED;
-        SetTimer(hwnd, TIMERID1, INITIAL_DELAY, 0);
+        SetTimer(hwnd, TIMERID1, INITIAL_DELAY, 0); 
     }
     else if (hit == HTRIGHT || hit == HTBOTTOM)
@@ -1040 +1128 @@
         repaintBtns = infoPtr->BRbtnState != PGF_DEPRESSED;
         infoPtr->BRbtnState = PGF_DEPRESSED;
-        SetTimer(hwnd, TIMERID1, INITIAL_DELAY, 0);
+        SetTimer(hwnd, TIMERID1, INITIAL_DELAY, 0); 
     }
 
     if (repaintBtns)
-        SendMessageA(hwnd, WM_NCPAINT, 0, 0);
+        SendMessageA(hwnd, WM_NCPAINT, 0, 0); 
 
     switch(hit)
@@ -1089 +1177 @@
 PAGER_EraseBackground (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
+    POINT pt, ptorig;
+    HDC hdc = (HDC)wParam;
+    HWND parent;
+
+    /* native does:
+     *   parent = GetParent(pager)
+     *   pt.x=0; pt.y=0; ?????
+     *   MapWindowPoints(pager, parent, &pt, 1)
+     *   OffsetWindowOrgEx(hdc, pt.x, pt.y, &ptorg)
+     *   SendMessageA(parent, WM_ERASEBKGND, hdc, 0)
+     *   SetWindowOrgEx(hdc, 0, 0, 0)
+     */
+
+    pt.x = 0;
+    pt.y = 0;
+    parent = GetParent(hwnd);
+    MapWindowPoints(hwnd, parent, &pt, 1);
+    OffsetWindowOrgEx (hdc, pt.x, pt.y, &ptorig);
+    SendMessageA (parent, WM_ERASEBKGND, wParam, lParam);
+    SetWindowOrgEx (hdc, ptorig.x, ptorig.y, 0);
+
+
+#if 0
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
     HBRUSH hBrush = CreateSolidBrush(infoPtr->clrBk);
@@ -1104 +1215 @@
 
     DeleteObject (hBrush);
+#endif
+
     return TRUE;
 }
@@ -1131 +1244 @@
 
     if (!infoPtr && (uMsg != WM_CREATE))
-    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        return DefWindowProcA (hwnd, uMsg, wParam, lParam);
 
     switch (uMsg)
@@ -1157 +1270 @@
         case PGM_RECALCSIZE:
             return PAGER_RecalcSize(hwnd);
-
+    
         case PGM_SETBKCOLOR:
             return PAGER_SetBkColor (hwnd, wParam, lParam);
@@ -1186 +1299 @@
 
         case WM_WINDOWPOSCHANGING:
-            return PAGER_HandleWindowPosChanging (hwnd, (WINDOWPOS*)lParam);
+            return PAGER_HandleWindowPosChanging (hwnd, wParam, (WINDOWPOS*)lParam);
 
         case WM_NCCALCSIZE:
@@ -1205 +1318 @@
             if (infoPtr->bForward && infoPtr->hwndChild)
                 PostMessageA(infoPtr->hwndChild, WM_MOUSEMOVE, wParam, lParam);
-            return TRUE;
+            return TRUE;                        
 
         case WM_MOUSELEAVE:
-            return PAGER_MouseLeave (hwnd, wParam, lParam);
+            return PAGER_MouseLeave (hwnd, wParam, lParam);     
 
         case WM_LBUTTONDOWN:
@@ -1220 +1333 @@
 /*
         case WM_PAINT:
-            return PAGER_Paint (hwnd, wParam);
+            return PAGER_Paint (hwnd, wParam); 
 */
         case WM_TIMER:
@@ -1234 +1347 @@
             {
                 PAGER_Scroll(hwnd, infoPtr->direction);
-                SetTimer(hwnd, TIMERID2, REPEAT_DELAY, 0);
+                SetTimer(hwnd, TIMERID2, REPEAT_DELAY, 0);          
             }
             break;
@@ -1267 +1380 @@
     wndClass.hbrBackground = 0;
     wndClass.lpszClassName = WC_PAGESCROLLERA;
-
+ 
     RegisterClassA (&wndClass);
 }