From 4ea97b34138d2ea946f924cf6a75021b19188e45 Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Mon, 15 Nov 2004 18:12:35 +0000 Subject: [PATCH] Bug 269922 /Users/timeless/mozilla/layout/html/base/src/nsObjectFrame.cpp:3931: warning: `void ConvertTwipsToPixels(nsPresContext&, nsRect&, nsRect&)' defined but not used r=bz sr=bz git-svn-id: svn://10.0.0.236/trunk@165367 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsObjectFrame.cpp | 4 ++-- mozilla/layout/html/base/src/nsObjectFrame.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 01032fcf9f8..8c19fff00e5 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -377,7 +377,7 @@ private: nsresult EnsureCachedAttrParamArrays(); }; -#if defined(XP_WIN) || defined(XP_MAC) || defined(XP_MACOSX) +#if defined(XP_WIN) || (defined(DO_DIRTY_INTERSECT) && (defined(XP_MAC) || defined(XP_MACOSX))) static void ConvertTwipsToPixels(nsPresContext& aPresContext, nsRect& aTwipsRect, nsRect& aPixelRect); #endif @@ -3925,7 +3925,7 @@ void nsPluginInstanceOwner::SetPluginHost(nsIPluginHost* aHost) mPluginHost = aHost; } -#if defined(XP_WIN) || defined(XP_MAC) || defined(XP_MACOSX) +#if defined(XP_WIN) || (defined(DO_DIRTY_INTERSECT) && (defined(XP_MAC) || defined(XP_MACOSX))) // convert frame coordinates from twips to pixels static void ConvertTwipsToPixels(nsPresContext& aPresContext, nsRect& aTwipsRect, nsRect& aPixelRect) { diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 01032fcf9f8..8c19fff00e5 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -377,7 +377,7 @@ private: nsresult EnsureCachedAttrParamArrays(); }; -#if defined(XP_WIN) || defined(XP_MAC) || defined(XP_MACOSX) +#if defined(XP_WIN) || (defined(DO_DIRTY_INTERSECT) && (defined(XP_MAC) || defined(XP_MACOSX))) static void ConvertTwipsToPixels(nsPresContext& aPresContext, nsRect& aTwipsRect, nsRect& aPixelRect); #endif @@ -3925,7 +3925,7 @@ void nsPluginInstanceOwner::SetPluginHost(nsIPluginHost* aHost) mPluginHost = aHost; } -#if defined(XP_WIN) || defined(XP_MAC) || defined(XP_MACOSX) +#if defined(XP_WIN) || (defined(DO_DIRTY_INTERSECT) && (defined(XP_MAC) || defined(XP_MACOSX))) // convert frame coordinates from twips to pixels static void ConvertTwipsToPixels(nsPresContext& aPresContext, nsRect& aTwipsRect, nsRect& aPixelRect) {