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

Fix creating cursor from XBM data with GTK3, see #17916

Browse Source
This commit is contained in:
Paul Cornett
2017-07-15 11:52:01 -07:00
parent 05ced5ce01
commit a9c1f17131
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/cursor.cpp
View File

@@ -109,9 +109,9 @@ wxCursor::wxCursor(const char bits[], int width, int height,
#ifdef __WXGTK3__ #ifdef __WXGTK3__
wxBitmap bitmap(bits, width, height); wxBitmap bitmap(bits, width, height);
if (maskBits) if (maskBits)
bitmap.SetMask(new wxMask(wxBitmap(maskBits, width, height))); bitmap.SetMask(new wxMask(wxBitmap(maskBits, width, height), *wxWHITE));
GdkPixbuf* pixbuf = bitmap.GetPixbuf(); GdkPixbuf* pixbuf = bitmap.GetPixbuf();
if (fg || bg) if ((fg && *fg != *wxBLACK) || (bg && *bg != *wxWHITE))
{ {
const int stride = gdk_pixbuf_get_rowstride(pixbuf); const int stride = gdk_pixbuf_get_rowstride(pixbuf);
const int n_channels = gdk_pixbuf_get_n_channels(pixbuf); const int n_channels = gdk_pixbuf_get_n_channels(pixbuf);
@@ -121,7 +121,7 @@ wxCursor::wxCursor(const char bits[], int width, int height,
guchar* p = data; guchar* p = data;
for (int i = 0; i < width; i++, p += n_channels) for (int i = 0; i < width; i++, p += n_channels)
{ {
if (p[0]) if (p[0] == 0)
{ {
if (fg) if (fg)
{ {