diff --git a/mozilla/gfx/src/motif/nsDeviceContextUnix.cpp b/mozilla/gfx/src/motif/nsDeviceContextUnix.cpp index 8c880838698..ffa2dc28c34 100644 --- a/mozilla/gfx/src/motif/nsDeviceContextUnix.cpp +++ b/mozilla/gfx/src/motif/nsDeviceContextUnix.cpp @@ -67,6 +67,8 @@ nsDeviceContextUnix :: nsDeviceContextUnix() mNativeDisplay = nsnull; + mDepth = 0 ; + mColormap = 0 ; } nsDeviceContextUnix :: ~nsDeviceContextUnix() @@ -110,7 +112,6 @@ nsresult nsDeviceContextUnix :: Init(nsNativeDeviceContext aNativeDeviceContext) if (mNativeDisplay == nsnull) { mNativeDisplay = gNativeDeviceContext; } -fprintf(stderr, "mNativeDisplay 0x%x\n", mNativeDisplay); mTwipsToPixels = (((float)::XDisplayWidth((Display *)mNativeDisplay, DefaultScreen((Display *)mNativeDisplay))) / ((float)::XDisplayWidthMM((Display *)mNativeDisplay,DefaultScreen((Display *)mNativeDisplay) )) * 25.4) / @@ -336,6 +337,11 @@ void nsDeviceContextUnix :: InstallColormap() XWindowAttributes wa; + + /* Already installed? */ + if (0 != mColormap) + return; + // Find the depth of this visual ::XGetWindowAttributes(mSurface->display, mSurface->drawable,