Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change deprecated gdk_image_get to gdk_drawable_get_image

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-08-11 17:34:54 +00:00
parent dad5ae6ddc
commit 4d1ebc8664
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/bitmap.cpp
View File

@@ -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; dstbyteperline = (width + 7) / 8;
dst = (char*) malloc(dstbyteperline*height); 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, 0, 0,
GetWidth(), GetHeight() ); GetWidth(), GetHeight() );
} }
@@ -781,7 +781,7 @@ wxImage wxBitmap::ConvertToImage() const
GdkImage *gdk_image_mask = (GdkImage*) NULL; GdkImage *gdk_image_mask = (GdkImage*) NULL;
if (GetMask()) if (GetMask())
{ {
gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(), gdk_image_mask = gdk_drawable_get_image( GetMask()->GetBitmap(),
0, 0, 0, 0,
GetWidth(), GetHeight() ); GetWidth(), GetHeight() );