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

Fix setting fonts and colours for wxToggleButton with bitmaps in wxGTK.

Browse Source 
Apply the fixes of r54138 to wxToggleButton too, the problem of #3939 was not
specific to just plain wxButtons.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-01-19 12:58:53 +00:00
parent bdef0d8ff7
commit 2a14facb0f
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gtk/tglbtn.cpp
View File

@@ -22,6 +22,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
#include "wx/gtk/private/list.h"
extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnDrag;
@@ -213,7 +214,23 @@ GtkLabel *wxToggleButton::GTKGetLabel() const
void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style) void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)
{ {
GTKApplyStyle(m_widget, style); GTKApplyStyle(m_widget, style);
GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style); GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget));
GTKApplyStyle(child, style);
// for buttons with images, the path to the label is (at least in 2.12)
// GtkButton -> GtkAlignment -> GtkHBox -> GtkLabel
if ( GTK_IS_ALIGNMENT(child) )
{
GtkWidget* box = gtk_bin_get_child(GTK_BIN(child));
if ( GTK_IS_BOX(box) )
{
wxGtkList list(gtk_container_get_children(GTK_CONTAINER(box)));
for (GList* item = list; item; item = item->next)
{
GTKApplyStyle(GTK_WIDGET(item->data), style);
}
}
}
} }
// Get the "best" size for this control. // Get the "best" size for this control.