From 65efea39ccfaa911b512fb2cbcb23950f018ff71 Mon Sep 17 00:00:00 2001 From: pinkerton Date: Thu, 16 Apr 1998 22:27:13 +0000 Subject: [PATCH] API change in CIconTextSuite to use string instead of cstring. Also using UGAColorRamp instead of hardcoding colors. (rev sdagley, appr sdagley) git-svn-id: svn://10.0.0.236/trunk@337 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/cmd/macfe/rdfui/CHyperTreeFlexTable.cp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mozilla/cmd/macfe/rdfui/CHyperTreeFlexTable.cp b/mozilla/cmd/macfe/rdfui/CHyperTreeFlexTable.cp index ce488181bd6..e13129ae26c 100644 --- a/mozilla/cmd/macfe/rdfui/CHyperTreeFlexTable.cp +++ b/mozilla/cmd/macfe/rdfui/CHyperTreeFlexTable.cp @@ -27,6 +27,7 @@ // PowerPlant #include #include +#include #include "CHyperTreeHeader.h" #include "URDFUtilities.h" @@ -310,16 +311,13 @@ void CHyperTreeFlexTable::DrawCellContents( const STableCell& inCell, const Rect // the bg color later. // { - static const RGBColor normalColumnColor = { 0xEEEE, 0xEEEE, 0xEEEE }; - static const RGBColor sortedColumnColor = { 0xDDDD, 0xDDDD, 0xDDDD }; - RGBColor backColor; PaneIDT columnPane; Rect backRect = inLocalRect; backRect.bottom--; // leave a one pixel line on the bottom as separator backRect.right++; // cover up vertical dividing line on right side - backColor = inCell.col == header->GetSortedColumn(columnPane) ? sortedColumnColor : normalColumnColor; - ::RGBBackColor(&backColor); + Uint8 backColor = inCell.col == header->GetSortedColumn(columnPane) ? colorRamp_Gray3 : colorRamp_Gray1; + ::RGBBackColor(&UGAColorRamp::GetColor(backColor)); ::EraseRect(&backRect); } @@ -824,7 +822,7 @@ CHyperTreeFlexTable :: DragSelection( bounds.left = iconBounds.left; HT_Resource node = HT_GetNthItem(mViewBeforeDrag, URDFUtilities::PPRowToHTRow(cell.row) ); - cstring finalCaption = CURLDragHelper::MakeIconTextValid ( HT_GetNodeName(node) ); + string finalCaption = CURLDragHelper::MakeIconTextValid ( HT_GetNodeName(node) ); CIconTextSuite* suite = new CIconTextSuite( this, bounds, GetIconID(cell.row), finalCaption, node ); selection.InsertItemsAt ( 1, LArray::index_Last, &suite ); }