fixed GTK styles handling:
1. don't modify the style unless something changed 2. use gtk_widget_modify_style instead of gtk_widget_set_style, the latter is not recommended by GTK+ developers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -159,11 +159,10 @@ bool wxToggleBitmapButton::Enable(bool enable /*=TRUE*/)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void wxToggleBitmapButton::ApplyWidgetStyle()
|
||||
void wxToggleBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
|
||||
{
|
||||
SetWidgetStyle();
|
||||
gtk_widget_set_style(m_widget, m_widgetStyle);
|
||||
gtk_widget_set_style(BUTTON_CHILD(m_widget), m_widgetStyle);
|
||||
gtk_widget_modify_style(m_widget, style);
|
||||
gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);
|
||||
}
|
||||
|
||||
bool wxToggleBitmapButton::IsOwnGtkWindow(GdkWindow *window)
|
||||
@@ -300,11 +299,10 @@ bool wxToggleButton::Enable(bool enable /*=TRUE*/)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void wxToggleButton::ApplyWidgetStyle()
|
||||
void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)
|
||||
{
|
||||
SetWidgetStyle();
|
||||
gtk_widget_set_style(m_widget, m_widgetStyle);
|
||||
gtk_widget_set_style(BUTTON_CHILD(m_widget), m_widgetStyle);
|
||||
gtk_widget_modify_style(m_widget, style);
|
||||
gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);
|
||||
}
|
||||
|
||||
bool wxToggleButton::IsOwnGtkWindow(GdkWindow *window)
|
||||
|
Reference in New Issue
Block a user