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

fixed GTK styles handling:

Browse Source 
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:
Václav Slavík
2004-06-14 17:34:00 +00:00
parent fae763d088
commit f40fdaa339
82 changed files with 294 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk1/listbox.cpp
View File

@@ -575,12 +575,14 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
gtk_widget_realize( GTK_BIN(list_item)->child );
// Apply current widget style to the new list_item
if (m_widgetStyle)
GtkRcStyle *style = CreateWidgetStyle();
if (style)
{
gtk_widget_set_style( GTK_WIDGET( list_item ), m_widgetStyle );
gtk_widget_modify_style( GTK_WIDGET( list_item ), style );
GtkBin *bin = GTK_BIN( list_item );
GtkWidget *label = GTK_WIDGET( bin->child );
gtk_widget_set_style( label, m_widgetStyle );
gtk_widget_modify_style( label, style );
gtk_rc_style_unref( style );
}
#if wxUSE_TOOLTIPS
@@ -981,11 +983,9 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
return FALSE;
}
void wxListBox::ApplyWidgetStyle()
void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
{
SetWidgetStyle();
if (m_backgroundColour.Ok())
if (m_hasBgCol && m_backgroundColour.Ok())
{
GdkWindow *window = GTK_WIDGET(m_list)->window;
if ( window )
@@ -999,11 +999,11 @@ void wxListBox::ApplyWidgetStyle()
GList *child = m_list->children;
while (child)
{
gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
gtk_widget_modify_style( GTK_WIDGET(child->data), style );
GtkBin *bin = GTK_BIN( child->data );
GtkWidget *label = GTK_WIDGET( bin->child );
gtk_widget_set_style( label, m_widgetStyle );
gtk_widget_modify_style( label, style );
child = child->next;
}