change deprecated gdk_image_get to gdk_drawable_get_image

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 7b944d6738b3a26ee22db5965168c0eba1f44ffe..33719df01fb180eea2f691d517c605285c61122d 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -343,7 +343,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
     }
     else
     {
     }
     else
     {

-        GdkImage* img = gdk_image_get(GetPixmap(), 0, 0, GetWidth(), GetHeight());
+        GdkImage* img = gdk_drawable_get_image(GetPixmap(), 0, 0, GetWidth(), GetHeight());

 
         wxCHECK_MSG(img, bmp, wxT("couldn't create image"));
 
 
         wxCHECK_MSG(img, bmp, wxT("couldn't create image"));
 


@@ -443,7 +443,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
         {
             dstbyteperline = (width + 7) / 8;
             dst = (char*) malloc(dstbyteperline*height);
         {
             dstbyteperline = (width + 7) / 8;
             dst = (char*) malloc(dstbyteperline*height);

-            img = gdk_image_get( GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight() );
+            img = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight());

 
             for (int h = 0; h < height; h++)
             {
 
             for (int h = 0; h < height; h++)
             {


@@ -767,7 +767,7 @@ wxImage wxBitmap::ConvertToImage() const
 
         if (HasPixmap())
         {
 
         if (HasPixmap())
         {

-            gdk_image = gdk_image_get( GetPixmap(),
+            gdk_image = gdk_drawable_get_image( GetPixmap(),

                                        0, 0,
                                        GetWidth(), GetHeight() );
         }
                                        0, 0,
                                        GetWidth(), GetHeight() );
         }


@@ -781,7 +781,7 @@ wxImage wxBitmap::ConvertToImage() const
         GdkImage *gdk_image_mask = (GdkImage*) NULL;
         if (GetMask())
         {
         GdkImage *gdk_image_mask = (GdkImage*) NULL;
         if (GetMask())
         {

-            gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(),
+            gdk_image_mask = gdk_drawable_get_image( GetMask()->GetBitmap(),

                                             0, 0,
                                             GetWidth(), GetHeight() );
 
                                             0, 0,
                                             GetWidth(), GetHeight() );