Remove mSurface and SetDrawingSurface to fix bustage. mSurface was a write-only void* variable taking inconsistent types.

This commit is contained in:
dbaron%dbaron.org 2004-07-18 18:21:03 +00:00
Родитель 2ae58d3226
Коммит b354c81d35
3 изменённых файлов: 0 добавлений и 6 удалений

Просмотреть файл

@ -78,7 +78,6 @@ PRUint32 nsDeviceContextMac::sNumberOfScreens = 0;
*/ */
nsDeviceContextMac :: nsDeviceContextMac() nsDeviceContextMac :: nsDeviceContextMac()
: DeviceContextImpl(), : DeviceContextImpl(),
mSurface(nsnull),
mOldPort(nsnull) mOldPort(nsnull)
{ {
} }
@ -696,7 +695,6 @@ GrafPtr thePort;
::GetPort(&mOldPort); ::GetPort(&mOldPort);
thePort = (GrafPtr)::PrOpenDoc(((nsDeviceContextSpecMac*)(this->mSpec).get())->mPrtRec,nsnull,nsnull); thePort = (GrafPtr)::PrOpenDoc(((nsDeviceContextSpecMac*)(this->mSpec).get())->mPrtRec,nsnull,nsnull);
((nsDeviceContextSpecMac*)(this->mSpec).get())->mPrinterPort = (TPrPort*)thePort; ((nsDeviceContextSpecMac*)(this->mSpec).get())->mPrinterPort = (TPrPort*)thePort;
SetDrawingSurface(((nsDeviceContextSpecMac*)(this->mSpec).get())->mPrtRec);
SetPort(thePort); SetPort(thePort);
} }
return NS_OK; return NS_OK;

Просмотреть файл

@ -67,8 +67,6 @@ public:
NS_IMETHOD GetScrollBarDimensions(float &aWidth, float &aHeight) const; NS_IMETHOD GetScrollBarDimensions(float &aWidth, float &aHeight) const;
NS_IMETHOD GetSystemFont(nsSystemFontID anID, nsFont *aFont) const; NS_IMETHOD GetSystemFont(nsSystemFontID anID, nsFont *aFont) const;
void SetDrawingSurface(nsIDrawingSurface* aSurface) { mSurface = aSurface; }
NS_IMETHOD CheckFontExistence(const nsString& aFontName); NS_IMETHOD CheckFontExistence(const nsString& aFontName);
NS_IMETHOD GetDepth(PRUint32& aDepth); NS_IMETHOD GetDepth(PRUint32& aDepth);
@ -99,7 +97,6 @@ protected:
void FindScreenForSurface ( nsIScreen** outScreen ) ; void FindScreenForSurface ( nsIScreen** outScreen ) ;
nsIDrawingSurface* mSurface;
Rect mPageRect; Rect mPageRect;
nsCOMPtr<nsIDeviceContextSpec> mSpec; nsCOMPtr<nsIDeviceContextSpec> mSpec;
GrafPtr mOldPort; GrafPtr mOldPort;

Просмотреть файл

@ -232,7 +232,6 @@ void nsRenderingContextMac::SelectDrawingSurface(nsDrawingSurfaceMac* aSurface,
if (!mContext) return; if (!mContext) return;
// GS and context initializations // GS and context initializations
((nsDeviceContextMac *)mContext)->SetDrawingSurface(mPort);
#if 0 #if 0
((nsDeviceContextMac *)mContext)->InstallColormap(); ((nsDeviceContextMac *)mContext)->InstallColormap();
#endif #endif