From f368b5b9ab2bb43ffc705f60bfbbf4b89730aeea Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Tue, 4 Apr 2006 13:54:02 +0000
Subject: [PATCH] gdk_bitmap/pixmap_unref -> gdk_drawable_unref

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/bitmap.cpp   | 12 ++++++------
 src/gtk/cursor.cpp   |  8 ++++----
 src/gtk/dcclient.cpp |  8 ++++----
 src/gtk/minifram.cpp |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index b550603..aec6a5d 100644
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -82,7 +82,7 @@ wxMask::wxMask( const wxBitmap& bitmap )
 wxMask::~wxMask()
 {
     if (m_bitmap)
-        gdk_bitmap_unref( m_bitmap );
+        gdk_drawable_unref( m_bitmap );
 }
 
 bool wxMask::Create( const wxBitmap& bitmap,
@@ -90,7 +90,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
 {
     if (m_bitmap)
     {
-        gdk_bitmap_unref( m_bitmap );
+        gdk_drawable_unref( m_bitmap );
         m_bitmap = (GdkBitmap*) NULL;
     }
 
@@ -196,7 +196,7 @@ bool wxMask::Create( const wxBitmap& bitmap )
 {
     if (m_bitmap)
     {
-        gdk_bitmap_unref( m_bitmap );
+        gdk_drawable_unref( m_bitmap );
         m_bitmap = (GdkBitmap*) NULL;
     }
 
@@ -257,9 +257,9 @@ wxBitmapRefData::wxBitmapRefData()
 wxBitmapRefData::~wxBitmapRefData()
 {
     if (m_pixmap)
-        gdk_pixmap_unref( m_pixmap );
+        gdk_drawable_unref( m_pixmap );
     if (m_bitmap)
-        gdk_bitmap_unref( m_bitmap );
+        gdk_drawable_unref( 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_pixmap_unref( M_BMPDATA->m_pixmap );
+        gdk_drawable_unref( M_BMPDATA->m_pixmap );
         M_BMPDATA->m_pixmap = NULL;
     }
 }
diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index d9c7652..6d66823 100644
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -144,8 +144,8 @@ wxCursor::wxCursor(const char bits[], int width, int  height,
                  data, mask, fg->GetColor(), bg->GetColor(),
                  hotSpotX, hotSpotY );
 
-    gdk_bitmap_unref( data );
-    gdk_bitmap_unref( mask );
+    gdk_drawable_unref( data );
+    gdk_drawable_unref( mask );
 }
 
 #if wxUSE_IMAGE
@@ -296,8 +296,8 @@ wxCursor::wxCursor( const wxImage & image )
                                 hotSpotX, hotSpotY
                              );
 
-    gdk_bitmap_unref( data );
-    gdk_bitmap_unref( mask );
+    gdk_drawable_unref( data );
+    gdk_drawable_unref( mask );
     delete [] bits;
     delete [] maskBits;
 }
diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 2ec9984..975d6eb 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1158,7 +1158,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
 
         gdk_draw_drawable( m_window, m_textGC, bitmap2, 0, 0, xx, yy, -1, -1 );
 
-        gdk_bitmap_unref( bitmap2 );
+        gdk_drawable_unref( bitmap2 );
         gdk_gc_unref( gc );
     }
     else
@@ -1200,7 +1200,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
     }
 
     if (new_mask)
-        gdk_bitmap_unref( new_mask );
+        gdk_drawable_unref( new_mask );
 }
 
 bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
@@ -1412,7 +1412,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
             gdk_draw_drawable( m_window, m_textGC, bitmap, xsrc, ysrc, cx, cy, cw, ch );
 
-            gdk_bitmap_unref( bitmap );
+            gdk_drawable_unref( bitmap );
             gdk_gc_unref( gc );
         }
         else
@@ -1441,7 +1441,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         }
 
         if (new_mask)
-            gdk_bitmap_unref( new_mask );
+            gdk_drawable_unref( new_mask );
     }
     else // use_bitmap_method
     {
diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index f209407..335fa4a 100644
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -290,8 +290,8 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
                             );
 
         GtkWidget *pw = gtk_pixmap_new( pixmap, mask );
-        gdk_bitmap_unref( mask );
-        gdk_pixmap_unref( pixmap );
+        gdk_drawable_unref( mask );
+        gdk_drawable_unref( pixmap );
         gtk_widget_show( pw );
 
         GtkWidget *close_button = gtk_button_new();
-- 
2.7.4