gdk_pixbuf_unref -> g_object_unref

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

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index 8cdcb39bf7ca8fa5ed76702ac262fc5bf500aa90..c31b1c8c8e169de986459500413b56107b4ac12b 100644 (file)
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -273,7 +273,7 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
                                                 GDK_INTERP_BILINEAR);
         if (p2)
         {
                                                 GDK_INTERP_BILINEAR);
         if (p2)
         {

-            gdk_pixbuf_unref(pixbuf);
+            g_object_unref (G_OBJECT (pixbuf));

             pixbuf = p2;
         }
     }
             pixbuf = p2;
         }
     }

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 47dbc17fc56a7a4a24e6c0a00110813b677ce5f1..07d4a143aa9eb2657856fab65d090cde2243202f 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -261,7 +261,7 @@ wxBitmapRefData::~wxBitmapRefData()
     if (m_bitmap)
         g_object_unref (G_OBJECT (m_bitmap));
     if (m_pixbuf)
     if (m_bitmap)
         g_object_unref (G_OBJECT (m_bitmap));
     if (m_pixbuf)

-        gdk_pixbuf_unref( m_pixbuf );
+        g_object_unref (G_OBJECT (m_pixbuf));

     delete m_mask;
 #if wxUSE_PALETTE
     delete m_palette;
     delete m_mask;
 #if wxUSE_PALETTE
     delete m_palette;


@@ -1485,7 +1485,7 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
                     }
                 }
 
                     }
                 }
 

-                gdk_pixbuf_unref(pmask);
+                g_object_unref (G_OBJECT (pmask));

             }
         }
     }
             }
         }
     }


@@ -1513,7 +1513,7 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
 {
     if (keep == Pixmap && HasPixbuf())
     {
 {
     if (keep == Pixmap && HasPixbuf())
     {

-        gdk_pixbuf_unref( M_BMPDATA->m_pixbuf );
+        g_object_unref (G_OBJECT (M_BMPDATA->m_pixbuf));

         M_BMPDATA->m_pixbuf = NULL;
     }
     if (keep == Pixbuf && HasPixmap())
         M_BMPDATA->m_pixbuf = NULL;
     }
     if (keep == Pixbuf && HasPixmap())