From f8d63e197433156d57e73240e8ce519cdf894fa0 Mon Sep 17 00:00:00 2001 From: "jaggernaut%netscape.com" Date: Fri, 10 Feb 2006 22:49:06 +0000 Subject: [PATCH] Bug 100476: Convert uses of member functions ToNewUnicode, ToNewCString and ToNewUTF8String to their global versions and remove support from nsCString and nsString. r=dbaron, rs=scc git-svn-id: svn://10.0.0.236/trunk@189643 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/src/mac/nsDeviceContextMac.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mozilla/widget/src/mac/nsDeviceContextMac.cpp b/mozilla/widget/src/mac/nsDeviceContextMac.cpp index 2ccb7d00a40..98b9bb333f3 100644 --- a/mozilla/widget/src/mac/nsDeviceContextMac.cpp +++ b/mozilla/widget/src/mac/nsDeviceContextMac.cpp @@ -65,6 +65,7 @@ #include "nsRegionMac.h" #include "nsIScreenManager.h" #include "nsIServiceManager.h" +#include "nsReadableUtils.h" PRUint32 nsDeviceContextMac::mPixelsPerInch = 96; @@ -1095,7 +1096,7 @@ EnumerateFamily(nsHashKey *aKey, void *aData, void* closure) int j = info->mIndex; - PRUnichar* str = (((FontNameKey*)aKey)->mString).ToNewUnicode(); + PRUnichar* str = ToNewUnicode(((FontNameKey*)aKey)->mString); if (!str) { for (j = j - 1; j >= 0; j--) { nsMemory::Free(array[j]); @@ -1164,7 +1165,7 @@ EnumerateFont(nsHashKey *aKey, void *aData, void* closure) short fondID = (short) aData; ScriptCode script = ::FontToScript(fondID); if(script == info->mScript) { - PRUnichar* str = (((FontNameKey*)aKey)->mString).ToNewUnicode(); + PRUnichar* str = ToNewUnicode(((FontNameKey*)aKey)->mString); if (!str) { for (j = j - 1; j >= 0; j--) { nsMemory::Free(array[j]);