diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2025-09-20 19:19:41 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2025-09-20 19:19:41 +0200 |
| commit | 63ec5715054be18ac4db5675e067b41c955d03b9 (patch) | |
| tree | 42bb5764b05bd3bc5bffadb55f4375e6dce8a521 /app/wlib/gtklib/button.c | |
| parent | 6c1a798b0302034a7fdcaf93b8f014e2e458c2a0 (diff) | |
| parent | e7d20cf352688bf717a01f4e6d9e6f497c2bea4c (diff) | |
Update upstream source from tag 'upstream/5.3.1Beta2'
Update to upstream version '5.3.1Beta2'
with Debian dir 36e53756d97319b1944d0ea744717abc9326f697
Diffstat (limited to 'app/wlib/gtklib/button.c')
| -rw-r--r-- | app/wlib/gtklib/button.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/wlib/gtklib/button.c b/app/wlib/gtklib/button.c index 7193b11..c337f46 100644 --- a/app/wlib/gtklib/button.c +++ b/app/wlib/gtklib/button.c @@ -33,6 +33,7 @@ #include "gtkint.h" #include "i18n.h" +#include "assert.h" #define MIN_BUTTON_WIDTH (80) @@ -97,7 +98,11 @@ void wlibSetLabel( bm = (wIcon_p)labelStr; if (bm->gtkIconType == gtkIcon_pixmap) { - pixbuf = gdk_pixbuf_new_from_xpm_data((const char**)bm->bits); + // check gdk_pixbuf header + assert ( *(int*)bm->bits == 0x47646b50 || + *(int*)bm->bits == 0x506b6447 ); + pixbuf = gdk_pixbuf_new_from_inline( -1, bm->bits, FALSE, NULL );
+ } else { pixbuf = wlibPixbufFromXBM( bm ); } |