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

Merge branch 'gtk-always-use-wxgtkimage'

Browse Source 
Ensure all buttons with images have associated wxGtkImage as this is
required for showing high resolution bitmaps in them in high DPI.

See https://github.com/wxWidgets/wxWidgets/pull/2548
This commit is contained in:
Vadim Zeitlin
2021-10-17 23:27:49 +02:00
parent def2691fd2 4e366b2cfb
commit 411cad6cd9
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk/anybutton.cpp
View File

@@ -186,16 +186,10 @@ void wxAnyButton::GTKDoShowBitmap(const wxBitmap& bitmap)
{ {
wxCHECK_RET(bitmap.IsOk(), "invalid bitmap"); wxCHECK_RET(bitmap.IsOk(), "invalid bitmap");
GtkWidget* image = gtk_button_get_image(GTK_BUTTON(m_widget)); GtkWidget* const image = gtk_button_get_image(GTK_BUTTON(m_widget));
if (image == NULL) wxCHECK_RET(WX_GTK_IS_IMAGE(image), "must have image widget");
image = gtk_bin_get_child(GTK_BIN(m_widget));
wxCHECK_RET(GTK_IS_IMAGE(image), "must have image widget"); WX_GTK_IMAGE(image)->Set(bitmap);
if (WX_GTK_IS_IMAGE(image))
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 +214,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);