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

Avoid assertions from wxGtkImage when bitmap is missing

Browse Source 
See #22550
This commit is contained in:
Paul Cornett 2022-06-18 08:09:25 -07:00
parent 49bbb00850
commit 33c2de748a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk/image_gtk.cpp
View File

@ -130,11 +130,16 @@ static gboolean wxGtkImageDraw(GtkWidget* widget, GdkEventExpose* event)
#endif #endif
const wxBitmap bitmap(image->m_provider->Get(scale)); const wxBitmap bitmap(image->m_provider->Get(scale));
#ifndef __WXGTK3__
// We rely on GTK to draw default disabled images
if (!bitmap.IsOk()) if (!bitmap.IsOk())
{
#ifdef __WXGTK3__
// Missing bitmap, just do the default
return wxGtkImageParentClass->draw(widget, cr);
#else
// We rely on GTK to draw default disabled images
return wxGtkImageParentClass->expose_event(widget, event); return wxGtkImageParentClass->expose_event(widget, event);
#endif #endif
}
GtkAllocation alloc; GtkAllocation alloc;
gtk_widget_get_allocation(widget, &alloc); gtk_widget_get_allocation(widget, &alloc);