From fbb73d31d85c4f55fc45e115338a4d7eff9e38d0 Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Wed, 2 Dec 1998 07:20:39 +0000 Subject: [PATCH] Eliminated my usage of the "mutable" keyword, since VC4.2 chokes on it. git-svn-id: svn://10.0.0.236/trunk@15618 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/src/xpwidgets/nsHTTreeItem.cpp | 8 ++++---- mozilla/widget/src/xpwidgets/nsHTTreeItem.h | 18 +++++++++--------- mozilla/widget/src/xpwidgets/nsTreeItem.h | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mozilla/widget/src/xpwidgets/nsHTTreeItem.cpp b/mozilla/widget/src/xpwidgets/nsHTTreeItem.cpp index 7a488464530..a2521c8976b 100644 --- a/mozilla/widget/src/xpwidgets/nsHTTreeItem.cpp +++ b/mozilla/widget/src/xpwidgets/nsHTTreeItem.cpp @@ -68,7 +68,7 @@ nsresult nsHTTreeItem::QueryInterface(REFNSIID aIID, void** aInstancePtr) // TreeItem Implementation --------------------- -void nsHTTreeItem::GetItemStyle(nsIDeviceContext* dc, nsTreeItemStyleInfo& styleInfo) const +void nsHTTreeItem::GetItemStyle(nsIDeviceContext* dc, nsTreeItemStyleInfo& styleInfo) { styleInfo.foregroundColor = NS_RGB(0,0,0); styleInfo.backgroundColor = NS_RGB(240,240,240); @@ -85,7 +85,7 @@ void nsHTTreeItem::GetItemStyle(nsIDeviceContext* dc, nsTreeItemStyleInfo& style styleInfo.pBackgroundImage = GetBackgroundImage(); } -nsIImage* nsHTTreeItem::GetTriggerImage() const +nsIImage* nsHTTreeItem::GetTriggerImage() { // TODO: Really read in these properties nsString openTriggerURL("file:///c|/Program%20Files/SL/CLIENT/IMAGES/overlay.gif"); @@ -108,7 +108,7 @@ nsIImage* nsHTTreeItem::GetTriggerImage() const } } -nsIImage* nsHTTreeItem::GetIconImage() const +nsIImage* nsHTTreeItem::GetIconImage() { nsString openIconURL("file:///c|/Program%20Files/SL/CLIENT/IMAGES/OpenRead.gif"); nsString closedIconURL("file:///c|/Program%20Files/SL/CLIENT/IMAGES/ClosedRead.gif"); @@ -127,7 +127,7 @@ nsIImage* nsHTTreeItem::GetIconImage() const } } -nsIImage* nsHTTreeItem::GetBackgroundImage() const +nsIImage* nsHTTreeItem::GetBackgroundImage() { nsString bgURL("http://www.shadowland.org/images/chalk.jpg"); if (mBackgroundRequest == nsnull) diff --git a/mozilla/widget/src/xpwidgets/nsHTTreeItem.h b/mozilla/widget/src/xpwidgets/nsHTTreeItem.h index ad7bff10276..4158691cc82 100644 --- a/mozilla/widget/src/xpwidgets/nsHTTreeItem.h +++ b/mozilla/widget/src/xpwidgets/nsHTTreeItem.h @@ -59,22 +59,22 @@ public: // End of delegated functions virtual void GetItemStyle(nsIDeviceContext* dc, - nsTreeItemStyleInfo& styleInfo) const; + nsTreeItemStyleInfo& styleInfo); virtual void GetTextForColumn(nsTreeColumn* pColumn, nsString& nodeText) const; protected: nsIImageRequest* RequestImage(nsString& reqUrl) const; // Helper to kick off the image load. - nsIImage* GetTriggerImage() const; - nsIImage* GetIconImage() const; - nsIImage* GetBackgroundImage() const; + nsIImage* GetTriggerImage(); + nsIImage* GetIconImage(); + nsIImage* GetBackgroundImage(); protected: - mutable nsIImageRequest* mClosedIconRequest; // Closed image - mutable nsIImageRequest* mOpenIconRequest; // Open image - mutable nsIImageRequest* mClosedTriggerRequest; // Closed trigger image - mutable nsIImageRequest* mOpenTriggerRequest; // Open trigger image - mutable nsIImageRequest* mBackgroundRequest; // The background image + nsIImageRequest* mClosedIconRequest; // Closed image + nsIImageRequest* mOpenIconRequest; // Open image + nsIImageRequest* mClosedTriggerRequest; // Closed trigger image + nsIImageRequest* mOpenTriggerRequest; // Open trigger image + nsIImageRequest* mBackgroundRequest; // The background image }; #endif /* nsHTTreeItem_h___ */ diff --git a/mozilla/widget/src/xpwidgets/nsTreeItem.h b/mozilla/widget/src/xpwidgets/nsTreeItem.h index 1c16b5a200b..c0ed66b3709 100644 --- a/mozilla/widget/src/xpwidgets/nsTreeItem.h +++ b/mozilla/widget/src/xpwidgets/nsTreeItem.h @@ -44,7 +44,7 @@ public: virtual ~nsTreeItem() {}; virtual void GetItemStyle(nsIDeviceContext* dc, - nsTreeItemStyleInfo& styleInfo) const = 0; + nsTreeItemStyleInfo& styleInfo) = 0; virtual void GetTextForColumn(nsTreeColumn* pColumn, nsString& nodeText) const = 0;