Changeset 3145 for trunk/src/comctl32/toolbar.cpp

Timestamp:

Mar 17, 2000, 6:13:26 PM (25 years ago)

Author:

cbratschi

Message:

trackbar buddy fix, tooltip enhancements

File:

• trunk/src/comctl32/toolbar.cpp (modified) (2 diffs)

trunk/src/comctl32/toolbar.cpp

@@ -1 @@
-/* $Id: toolbar.cpp,v 1.1 2000-02-23 17:09:48 cbratschi Exp $ */
+/* $Id: toolbar.cpp,v 1.2 2000-03-17 17:13:24 cbratschi Exp $ */
 /*
  * Toolbar control
@@ -1613 +1613 @@
 }
 
-//WINE version - not currently used
-#if 0
-static BOOL WINAPI
-TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    TOOLBAR_INFO *infoPtr = (TOOLBAR_INFO *)GetWindowLongA (hwnd, DWL_USER);
-    static HDSA hDsa = NULL;
-
-    switch (uMsg)
-    {
-        case WM_INITDIALOG:
-            infoPtr = (TOOLBAR_INFO *)lParam;
-            SetWindowLongA (hwnd, DWL_USER, (DWORD)infoPtr);
-
-            hDsa = DSA_Create (sizeof(TBUTTON_INFO), 5);
-
-            if (infoPtr)
-            {
-                TBUTTON_INFO *btnPtr;
-                INT i;
-
-                /* insert 'virtual' separator button into 'available buttons' list */
-                SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)"");
-
-                /* copy all buttons and append them to the right listbox */
-                btnPtr = infoPtr->buttons;
-                for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++)
-                {
-                    DSA_InsertItem (hDsa, i, btnPtr);
-
-                    /* FIXME: hidden buttons appear in the 'toolbar buttons' list too */
-                    if (btnPtr->fsState & TBSTATE_HIDDEN)
-                    {
-                        SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)"");
-                    }
-                    else
-                    {
-                        SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)"");
-                    }
-                }
-
-                /* append 'virtual' separator button to the 'toolbar buttons' list */
-                /* TODO */
-            }
-            return TRUE;
-
-        case WM_CLOSE:
-            EndDialog(hwnd, FALSE);
-            return TRUE;
-
-        case WM_COMMAND:
-            switch (LOWORD(wParam))
-            {
-                case IDCANCEL:
-                    EndDialog(hwnd, FALSE);
-                    break;
-            }
-            return TRUE;
-
-        case WM_DESTROY:
-            if (hDsa)
-                DSA_Destroy (hDsa);
-            return TRUE;
-
-        case WM_DRAWITEM:
-            if (wParam == IDC_AVAILBTN_LBOX || wParam == IDC_TOOLBARBTN_LBOX)
-            {
-                LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT)lParam;
-                TBUTTON_INFO btnPtr;
-                RECT rcButton;
-                RECT rcText;
-                HPEN hOldPen;
-                HBRUSH hOldBrush;
-                COLORREF oldText = 0;
-                COLORREF oldBk = 0;
-
-                FIXME("action: %x itemState: %x\n",
-                      lpdis->itemAction, lpdis->itemState);
-
-                DSA_GetItem (hDsa, 0 /*lpdis->itemID*/, &btnPtr);
-
-                if (lpdis->itemState & ODS_FOCUS)
-                {
-                    oldBk = SetBkColor (lpdis->hDC, GetSysColor(COLOR_HIGHLIGHT));
-                    oldText = SetTextColor (lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
-                }
-
-                hOldPen = SelectObject (lpdis->hDC, GetSysColorPen ((lpdis->itemState & ODS_SELECTED)?COLOR_HIGHLIGHT:COLOR_WINDOW));
-                hOldBrush = SelectObject (lpdis->hDC, GetSysColorBrush ((lpdis->itemState & ODS_FOCUS)?COLOR_HIGHLIGHT:COLOR_WINDOW));
-
-                /* fill background rectangle */
-                Rectangle (lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top,
-                           lpdis->rcItem.right, lpdis->rcItem.bottom);
-
-                /* calculate button and text rectangles */
-                CopyRect (&rcButton, &lpdis->rcItem);
-                InflateRect (&rcButton, -1, -1);
-                CopyRect (&rcText, &rcButton);
-                rcButton.right = rcButton.left + infoPtr->nBitmapWidth + 6;
-                rcText.left = rcButton.right + 2;
-
-                /* draw focus rectangle */
-                if (lpdis->itemState & ODS_FOCUS)
-                    DrawFocusRect (lpdis->hDC, &lpdis->rcItem);
-
-                /* draw button */
-                DrawEdge (lpdis->hDC, &rcButton, EDGE_RAISED, BF_RECT|BF_MIDDLE|BF_SOFT);
-
-                /* draw image and text */
-                if (wParam == IDC_AVAILBTN_LBOX && lpdis->itemID == 0)
-                {
-                    /* virtual separator in the 'available' list */
-                    DrawTextA (lpdis->hDC, "Separator", -1, &rcText,
-                               DT_LEFT | DT_VCENTER | DT_SINGLELINE);
-                }
-                else
-                {
-                    /* real button */
-
-                    ImageList_Draw (infoPtr->himlDef, btnPtr.iBitmap, lpdis->hDC,
-                                    rcButton.left+1, rcButton.top+1, ILD_NORMAL);
-//AH: TODO: Find out why this happens!!!
-if ((infoPtr->strings == NULL) || (infoPtr->strings[btnPtr.iString] == NULL))
-  dprintf(("COMCTL32:TOOLBAR:CustomizeDialog - Error drawing string - pointer not found!\n"));
-else
-                    DrawTextW (lpdis->hDC,  infoPtr->strings[btnPtr.iString], -1, &rcText,
-                               DT_LEFT | DT_VCENTER | DT_SINGLELINE);
-
-                }
-
-                if (lpdis->itemState & ODS_FOCUS)
-                {
-                    SetBkColor (lpdis->hDC, oldBk);
-                    SetTextColor (lpdis->hDC, oldText);
-                }
-
-                SelectObject (lpdis->hDC, hOldBrush);
-                SelectObject (lpdis->hDC, hOldPen);
-
-                return TRUE;
-            }
-            return FALSE;
-
-        case WM_MEASUREITEM:
-            if (wParam == IDC_AVAILBTN_LBOX || wParam == IDC_TOOLBARBTN_LBOX)
-            {
-                MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*)lParam;
-
-                if (infoPtr)
-                    lpmis->itemHeight = infoPtr->nBitmapHeight + 8;
-                else
-                    lpmis->itemHeight = 16 + 8; /* default height */
-
-                return TRUE;
-            }
-            return FALSE;
-
-        default:
-            return FALSE;
-    }
-}
-#endif
-
-
 /***********************************************************************
  * TOOLBAR_AddBitmap:  Add the bitmaps to the default image list.