gdk_bitmap/pixmap_unref -> gdk_drawable_unref

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index b550603e7d6cc28abe90d5c54e5575c8f07d6595..aec6a5d031499e4339becb9667ee720af7e5d0e8 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -82,7 +82,7 @@ wxMask::wxMask( const wxBitmap& bitmap )
 wxMask::~wxMask()
 {
     if (m_bitmap)
 wxMask::~wxMask()
 {
     if (m_bitmap)

-        gdk_bitmap_unref( m_bitmap );
+        gdk_drawable_unref( m_bitmap );

 }
 
 bool wxMask::Create( const wxBitmap& bitmap,
 }
 
 bool wxMask::Create( const wxBitmap& bitmap,


@@ -90,7 +90,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
 {
     if (m_bitmap)
     {
 {
     if (m_bitmap)
     {

-        gdk_bitmap_unref( m_bitmap );
+        gdk_drawable_unref( m_bitmap );

         m_bitmap = (GdkBitmap*) NULL;
     }
 
         m_bitmap = (GdkBitmap*) NULL;
     }
 


@@ -196,7 +196,7 @@ bool wxMask::Create( const wxBitmap& bitmap )
 {
     if (m_bitmap)
     {
 {
     if (m_bitmap)
     {

-        gdk_bitmap_unref( m_bitmap );
+        gdk_drawable_unref( m_bitmap );

         m_bitmap = (GdkBitmap*) NULL;
     }
 
         m_bitmap = (GdkBitmap*) NULL;
     }
 


@@ -257,9 +257,9 @@ wxBitmapRefData::wxBitmapRefData()
 wxBitmapRefData::~wxBitmapRefData()
 {
     if (m_pixmap)
 wxBitmapRefData::~wxBitmapRefData()
 {
     if (m_pixmap)

-        gdk_pixmap_unref( m_pixmap );
+        gdk_drawable_unref( m_pixmap );

     if (m_bitmap)
     if (m_bitmap)

-        gdk_bitmap_unref( m_bitmap );
+        gdk_drawable_unref( m_bitmap );

     if (m_pixbuf)
         gdk_pixbuf_unref( m_pixbuf );
     delete m_mask;
     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())
     {
     }
     if (keep == Pixbuf && HasPixmap())
     {

-        gdk_pixmap_unref( M_BMPDATA->m_pixmap );
+        gdk_drawable_unref( M_BMPDATA->m_pixmap );

         M_BMPDATA->m_pixmap = NULL;
     }
 }
         M_BMPDATA->m_pixmap = NULL;
     }
 }

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index d9c765244e58c382e8d5a878d1ae59e4cd5df4c5..6d66823e40f9b1f5cd6d25dedd8e148ca2964cac 100644 (file)
--- 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 );
 
                  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
 }
 
 #if wxUSE_IMAGE


@@ -296,8 +296,8 @@ wxCursor::wxCursor( const wxImage & image )
                                 hotSpotX, hotSpotY
                              );
 
                                 hotSpotX, hotSpotY
                              );
 

-    gdk_bitmap_unref( data );
-    gdk_bitmap_unref( mask );
+    gdk_drawable_unref( data );
+    gdk_drawable_unref( mask );

     delete [] bits;
     delete [] maskBits;
 }
     delete [] bits;
     delete [] maskBits;
 }

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 2ec99841b196c92483a29be34e2db711aea5aa71..975d6ebc46832edf0eb8dd1e7bb597aae6fff976 100644 (file)
--- 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_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
         gdk_gc_unref( gc );
     }
     else


@@ -1200,7 +1200,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
     }
 
     if (new_mask)
     }
 
     if (new_mask)

-        gdk_bitmap_unref( new_mask );
+        gdk_drawable_unref( new_mask );

 }
 
 bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 }
 
 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_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
             gdk_gc_unref( gc );
         }
         else


@@ -1441,7 +1441,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         }
 
         if (new_mask)
         }
 
         if (new_mask)

-            gdk_bitmap_unref( new_mask );
+            gdk_drawable_unref( new_mask );

     }
     else // use_bitmap_method
     {
     }
     else // use_bitmap_method
     {

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index f209407663b76c0b1ee58fed9dddcad40490ad8a..335fa4aa401644d9986f957923f711ce587c330d 100644 (file)
--- 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 );
                             );
 
         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();
         gtk_widget_show( pw );
 
         GtkWidget *close_button = gtk_button_new();