Changeset 942 for trunk/src

Timestamp:

Sep 15, 1999, 6:31:49 PM (26 years ago)

Author:

cbratschi

Message:

bugs fixed

Location:

trunk/src/comctl32

Files:

• trackbar.c (modified) (16 diffs)
• updown.c (modified) (9 diffs)

trunk/src/comctl32/trackbar.c

@@ -1 @@
-/* $Id: trackbar.c,v 1.17 1999-09-12 16:52:46 cbratschi Exp $ */
+/* $Id: trackbar.c,v 1.18 1999-09-15 16:31:48 cbratschi Exp $ */
 /*
  * Trackbar control
@@ -9 +9 @@
  *
  *
- * Status: ready to use
+ * Status: complete
  * Version: 5.00
+ *
+ * Note: TBM_SETTHUMBLENGTH implemented, COMCTL32 5.00 ignores it
  */
 
@@ -484 +486 @@
 //draw thumb, call only from draw!
 
-static VOID TRACKBAR_DrawThumb(TRACKBAR_INFO *infoPtr,HDC hdc,DWORD dwStyle)
+static VOID TRACKBAR_DrawThumb(TRACKBAR_INFO *infoPtr,HWND hwnd,HDC hdc,DWORD dwStyle)
 {
     if (!(dwStyle & TBS_NOTHUMB))
@@ -491 +493 @@
       RECT thumb = infoPtr->rcThumb;
 
-      if (infoPtr->flags & TB_DRAG_MODE) hbr = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT));
+      if (infoPtr->flags & TB_DRAG_MODE || !IsWindowEnabled(hwnd)) hbr = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT));
       else hbr = CreateSolidBrush(GetSysColor(COLOR_3DFACE));
       hbrOld = SelectObject(hdc,hbr);
@@ -730 +732 @@
     if (infoPtr->flags & TB_THUMBCHANGED)
     {
-      if (infoPtr->flags & TB_THUMBSIZECHANGED) TRACKBAR_CalcChannel(hwnd,infoPtr);
+      if (infoPtr->flags & TB_THUMBSIZECHANGED)
+      {
+        TRACKBAR_CalcChannel(hwnd,infoPtr);
+        TRACKBAR_CalcSelection(hwnd,infoPtr);
+      }
       TRACKBAR_CalcThumb(hwnd,infoPtr);
     }
@@ -851 +857 @@
     if (!(cdres & CDRF_SKIPDEFAULT))
     {
-      TRACKBAR_DrawThumb(infoPtr,hdc,dwStyle);
+      TRACKBAR_DrawThumb(infoPtr,hwnd,hdc,dwStyle);
 
       if (cdctlres & CDRF_NOTIFYITEMDRAW)
@@ -862 +868 @@
     }
 
-    if (infoPtr->bFocus) DrawFocusRect(hdc,&rcClient);
+    if (infoPtr->bFocus && IsWindowEnabled(hwnd)) DrawFocusRect(hdc,&rcClient);
 
     if (cdctlres & CDRF_NOTIFYPOSTPAINT)
@@ -1222 +1228 @@
 
 
-/*      case TBM_GETUNICODEFORMAT: */
-
+static
+TRACKBAR_GetUnicodeFormat(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  return FALSE; //Unicode not used
+}
 
 static LRESULT
@@ -1622 +1631 @@
     return 0;
 }
-
-
-/*      case TBM_SETUNICODEFORMAT: */
-
 
 static LRESULT
@@ -2044 +2049 @@
 
 static LRESULT
+TRACKBAR_SetUnicodeFormat(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  //wParam = new format
+
+  return FALSE; //previous was no Unicode
+}
+
+static LRESULT
 TRACKBAR_CaptureChanged (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2089 +2102 @@
 
 //    TRACE (trackbar,"\n");
-    if (!infoPtr->bFocus)
+    if (!infoPtr->bFocus && IsWindowEnabled(hwnd))
     {
       infoPtr->bFocus = TRUE;
@@ -2112 +2125 @@
 
     infoPtr->flags &= ~TB_DRAG_MODE;
-    if (infoPtr->bFocus)
+    if (infoPtr->bFocus && IsWindowEnabled(hwnd))
     {
       infoPtr->bFocus = FALSE;
@@ -2200 +2213 @@
 }
 
+static LRESULT
+TRACKBAR_Enable(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  TRACKBAR_INFO *infoPtr = TRACKBAR_GetInfoPtr(hwnd);
+
+  if (wParam) infoPtr->bFocus = (GetFocus() == hwnd);
+  else infoPtr->bFocus = FALSE;
+
+  TRACKBAR_Refresh(hwnd);
+
+  return 0;
+}
 
 static LRESULT
@@ -2346 +2371 @@
         return TRACKBAR_GetToolTips (hwnd, wParam, lParam);
 
-/*      case TBM_GETUNICODEFORMAT: */
+    case TBM_GETUNICODEFORMAT:
+        return TRACKBAR_GetUnicodeFormat(hwnd,wParam,lParam);
 
     case TBM_SETBUDDY:
@@ -2393 +2419 @@
         return TRACKBAR_SetToolTips (hwnd, wParam, lParam);
 
-/*      case TBM_SETUNICODEFORMAT: */
-
+    case TBM_SETUNICODEFORMAT:
+        return TRACKBAR_SetUnicodeFormat(hwnd,wParam,lParam);
 
     case WM_CAPTURECHANGED:
@@ -2405 +2431 @@
         return TRACKBAR_Destroy (hwnd, wParam, lParam);
 
-/*      case WM_ENABLE: */
-
-/*      case WM_ERASEBKGND: */
-/*          return 0; */
+    case WM_ENABLE:
+        return TRACKBAR_Enable(hwnd,wParam,lParam);
+
+    case WM_ERASEBKGND:
+        return 1;
 
     case WM_GETDLGCODE:

trunk/src/comctl32/updown.c

@@ -1 @@
-/* $Id: updown.c,v 1.7 1999-08-14 16:13:16 cbratschi Exp $ */
+/* $Id: updown.c,v 1.8 1999-09-15 16:31:49 cbratschi Exp $ */
 /*
  * Updown control
@@ -18 +18 @@
  *     - listbox as buddy window
  *     - acceleration
- *     - base 16
+ *     - base 16 -> bug: 9->B (should be A)
  *     - UDS_ALIGNLEFT, ~UDS_WRAP
  *       (tested - they work)
@@ -133 +133 @@
 
   return  ( ((dwStyle & (UDS_ALIGNLEFT | UDS_ALIGNRIGHT)) != 0) &&
-            (SendMessageA(hwnd, UDM_GETBUDDY, 0, 0) != 0) &&
-            (lstrcmpiA(infoPtr->szBuddyClass, "EDIT") == 0 ) );
+            (SendMessageA(hwnd, UDM_GETBUDDY, 0, 0) != 0) &&
+            (lstrcmpiA(infoPtr->szBuddyClass, "EDIT") == 0 ) );
 }
 
@@ -209 +209 @@
  * Returns the thousand sep. If an error occurs, it returns ','.
  */
-static char UPDOWN_GetThousandSep()
+static char UPDOWN_GetThousandSep(VOID)
 {
   char sep[2];
@@ -430 +430 @@
   RECT         budRect;  /* new coord for the buddy */
   int          x,width;  /* new x position and width for the up-down */
-        
+
   /* Is it a valid bud? */
   if(!IsWindow(hwndBud))
@@ -476 +476 @@
   GetWindowRect(infoPtr->Buddy, &budRect);
   MapWindowPoints(HWND_DESKTOP, GetParent(infoPtr->Buddy),
-                  (POINT *)(&budRect.left), 2);
+                  (POINT *)(&budRect.left), 2);
 
   /* now do the positioning */
@@ -490 +490 @@
   /* first adjust the buddy to accomodate the up/down */
   SetWindowPos(infoPtr->Buddy, 0, budRect.left, budRect.top,
-               budRect.right  - budRect.left, budRect.bottom - budRect.top,
-               SWP_NOACTIVATE|SWP_NOZORDER);
+               budRect.right  - budRect.left, budRect.bottom - budRect.top,
+               SWP_NOACTIVATE|SWP_NOZORDER);
 
   /* now position the up/down */
@@ -512 +512 @@
 
   SetWindowPos (hwnd, infoPtr->Buddy,
-                x, budRect.top-DEFAULT_ADDTOP,
-                width, (budRect.bottom-budRect.top)+DEFAULT_ADDTOP+DEFAULT_ADDBOT,
-                SWP_NOACTIVATE);
+                x, budRect.top-DEFAULT_ADDTOP,
+                width, (budRect.bottom-budRect.top)+DEFAULT_ADDTOP+DEFAULT_ADDBOT,
+                SWP_NOACTIVATE);
 
   return TRUE;
-}       
+}
 
 /***********************************************************************
@@ -1133 +1133 @@
         else
         {
-          UPDOWN_GetBuddyInt(upDownHwnd);
+          UPDOWN_GetBuddyInt(upDownHwnd);
           UPDOWN_DoAction(upDownHwnd, 1, wParam==VK_UP);
         }