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

Ensure all buttons with images have associated wxGtkImage

Browse Source 
Replace GtkImage with wxGtkImage if necessary, to ensure that we can
always use our own class, to profit from its support for high DPI
images, even for the buttons using stock IDs and so creating GtkImage by
default.

See #19288.
This commit is contained in:
Vadim Zeitlin
2021-10-17 00:56:22 +02:00
parent fbb2ec85ef
commit 10b7659acd
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk/anybutton.cpp
View File

@@ -190,12 +190,9 @@ void wxAnyButton::GTKDoShowBitmap(const wxBitmap& bitmap)
if (image == NULL) if (image == NULL)
image = gtk_bin_get_child(GTK_BIN(m_widget)); image = gtk_bin_get_child(GTK_BIN(m_widget));
wxCHECK_RET(GTK_IS_IMAGE(image), "must have image widget"); wxCHECK_RET(WX_GTK_IS_IMAGE(image), "must have image widget");
if (WX_GTK_IS_IMAGE(image)) WX_GTK_IMAGE(image)->Set(bitmap);
WX_GTK_IMAGE(image)->Set(bitmap);
else
gtk_image_set_from_pixbuf(GTK_IMAGE(image), bitmap.GetPixbuf());
} }
wxBitmap wxAnyButton::DoGetBitmap(State which) const wxBitmap wxAnyButton::DoGetBitmap(State which) const
@@ -220,6 +217,14 @@ void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which)
else else
{ {
GtkWidget *image = gtk_button_get_image(GTK_BUTTON(m_widget)); GtkWidget *image = gtk_button_get_image(GTK_BUTTON(m_widget));
if ( image && !WX_GTK_IS_IMAGE(image) )
{
// This must be the GtkImage created for stock buttons, we
// want to replace it with our own wxGtkImage as only it
// handles showing appropriately-sized bitmaps in high DPI.
image = NULL;
}
if ( image && !bitmap.IsOk() ) if ( image && !bitmap.IsOk() )
{ {
gtk_container_remove(GTK_CONTAINER(m_widget), image); gtk_container_remove(GTK_CONTAINER(m_widget), image);