Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-12 10:40:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

stomp a few more bugs from my previous checkin.

Browse Source
This commit is contained in:
pavlov%pavlov.net 1999-03-21 21:31:58 +00:00
parent bf6da2157f
commit 1d2ade1398
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gfx/src/gtk/nsDrawingSurfaceGTK.cpp
View File

@ -58,8 +58,8 @@ nsDrawingSurfaceGTK :: nsDrawingSurfaceGTK()
nsDrawingSurfaceGTK :: ~nsDrawingSurfaceGTK()
{
if (mPixmap)
#ifdef NS_GTK_REF
if (mPixmap)
::gdk_pixmap_unref(mPixmap);
#endif
if (mImage)
@ -159,7 +159,8 @@ NS_IMETHODIMP nsDrawingSurfaceGTK :: Unlock(void)
}
*/
::gdk_image_destroy(mImage);
if (mImage)
::gdk_image_destroy(mImage);
mImage = nsnull;
mLocked = PR_FALSE;
@ -177,6 +178,7 @@ NS_IMETHODIMP nsDrawingSurfaceGTK :: GetDimensions(PRUint32 *aWidth, PRUint32 *a
NS_IMETHODIMP nsDrawingSurfaceGTK :: IsOffscreen(PRBool *aOffScreen)
{
*aOffScreen = mIsOffscreen;
return NS_OK;
}
@ -196,7 +198,9 @@ NS_IMETHODIMP nsDrawingSurfaceGTK :: Init(GdkDrawable *aDrawable, GdkGC *aGC)
{
mGC = aGC;
mPixmap = aDrawable;
// this is definatly going to be on the screen, as it will be the window of a
// widget or something.
mIsOffscreen = PR_FALSE;
return NS_OK;
}
@ -211,7 +215,11 @@ NS_IMETHODIMP nsDrawingSurfaceGTK :: Init(GdkGC *aGC, PRUint32 aWidth,
mHeight = aHeight;
mFlags = aFlags;
// we can draw on this offscreen because it has no parent
mIsOffscreen = PR_TRUE;
mPixmap = ::gdk_pixmap_new(nsnull, mWidth, mHeight, mDepth);
g_print("pixmap is not going to be freed\n");
return NS_OK;
}
@ -233,6 +241,11 @@ GdkGC *nsDrawingSurfaceGTK::GetGC(void)
return mGC;
}
/* below are utility functions used mostly for nsRenderingContext and nsImage
* to plug into gdk_* functions for drawing. You should not set a pointer
* that might hang around with the return from these. instead use the ones
* above. pav
*/
GdkDrawable *nsDrawingSurfaceGTK::GetDrawable(void)
{
return mPixmap;

9
gfx/src/gtk/nsDrawingSurfaceGTK.h
View File

@ -48,10 +48,16 @@ public:
NS_IMETHOD Init(GdkDrawable *aDrawable, GdkGC *aGC);
NS_IMETHOD Init(GdkGC *aGC, PRUint32 aWidth, PRUint32 aHeight, PRUint32 aFlags);
/* get the GC and manage the GdkGC's refcount */
NS_IMETHOD GetGC(GdkGC *aGC);
NS_IMETHOD ReleaseGC(void);
// things that are useful to me.
/* below are utility functions used mostly for nsRenderingContext and nsImage
* to plug into gdk_* functions for drawing. You should not set a pointer
* that might hang around with the return from these. instead use the ones
* above. pav
*/
GdkGC *GetGC(void);
GdkDrawable *GetDrawable(void);
@ -64,6 +70,7 @@ private:
PRUint32 mWidth;
PRUint32 mHeight;
PRUint32 mFlags;
PRBool mIsOffscreen;
/* for locks */
GdkImage *mImage;