And gdk_drawable_unref is in turn deprecated in favor of g_object_unref

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2006-04-04 14:06:00 +00:00
parent f368b5b9ab
commit f5af73080a
4 changed files with 16 additions and 16 deletions

View File

@@ -82,7 +82,7 @@ wxMask::wxMask( const wxBitmap& bitmap )
wxMask::~wxMask()
{
if (m_bitmap)
gdk_drawable_unref( m_bitmap );
g_object_unref (G_OBJECT (m_bitmap));
}
bool wxMask::Create( const wxBitmap& bitmap,
@@ -90,7 +90,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
{
if (m_bitmap)
{
gdk_drawable_unref( m_bitmap );
g_object_unref (G_OBJECT (m_bitmap));
m_bitmap = (GdkBitmap*) NULL;
}
@@ -196,7 +196,7 @@ bool wxMask::Create( const wxBitmap& bitmap )
{
if (m_bitmap)
{
gdk_drawable_unref( m_bitmap );
g_object_unref (G_OBJECT (m_bitmap));
m_bitmap = (GdkBitmap*) NULL;
}
@@ -257,9 +257,9 @@ wxBitmapRefData::wxBitmapRefData()
wxBitmapRefData::~wxBitmapRefData()
{
if (m_pixmap)
gdk_drawable_unref( m_pixmap );
g_object_unref (G_OBJECT (m_pixmap));
if (m_bitmap)
gdk_drawable_unref( m_bitmap );
g_object_unref (G_OBJECT (m_bitmap));
if (m_pixbuf)
gdk_pixbuf_unref( m_pixbuf );
delete m_mask;
@@ -1518,7 +1518,7 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
}
if (keep == Pixbuf && HasPixmap())
{
gdk_drawable_unref( M_BMPDATA->m_pixmap );
g_object_unref (G_OBJECT (M_BMPDATA->m_pixmap));
M_BMPDATA->m_pixmap = NULL;
}
}