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

fix for last commit: didn't work if mask was white

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-01-03 06:58:11 +00:00
parent 8805143613
commit e60f8377be
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/gtk/cursor.cpp
View File

@@ -201,8 +201,29 @@ wxCursor::wxCursor( const wxImage & image )
return; return;
} }
unsigned long keyMaskColor = 0;
GdkPixmap* mask;
if (bHasMask)
{
keyMaskColor = wxImageHistogram::MakeKey(
image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue());
// get mask before image is modified
wxBitmap bitmap(image, 1);
mask = bitmap.GetMask()->GetBitmap();
g_object_ref(mask);
}
else
{
const int size = ((w + 7) / 8) * h;
char* bits = new char[size];
memset(bits, 0xff, size);
mask = gdk_bitmap_create_from_data(
wxGetRootWindow()->window, bits, w, h);
delete[] bits;
}
// modify image so wxBitmap can be used to convert to pixmap // modify image so wxBitmap can be used to convert to pixmap
image_copy.UnShare(); image_copy.SetMask(false);
int i, j; int i, j;
wxByte* data = image_copy.GetData(); wxByte* data = image_copy.GetData();
for (j = 0; j < h; j++) for (j = 0; j < h; j++)
@@ -219,28 +240,8 @@ wxCursor::wxCursor( const wxImage & image )
} }
} }
} }
wxBitmap bitmap(image_copy, 1); wxBitmap bitmap(image_copy, 1);
unsigned long keyMaskColor = 0;
GdkPixmap* mask;
if (bHasMask)
{
keyMaskColor = wxImageHistogram::MakeKey(
image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue());
mask = bitmap.GetMask()->GetBitmap();
g_object_ref(mask);
}
else
{
const int size = ((w + 7) / 8) * h;
char* bits = new char[size];
memset(bits, 0xff, size);
mask = gdk_bitmap_create_from_data(
bitmap.GetPixmap(), bits, w, h);
delete[] bits;
}
// find the most frequent color(s) // find the most frequent color(s)
wxImageHistogram histogram; wxImageHistogram histogram;
image.ComputeHistogram(histogram); image.ComputeHistogram(histogram);