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

handle style changes correctly in GtkPizza

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-19 21:30:14 +00:00
parent 984e8d0b6b
commit 22aff5795e
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gtk/win_gtk.c
View File

@@ -60,6 +60,8 @@ static void gtk_pizza_draw (GtkWidget *widget,
#endif /* __WXGTK20__ */
static gint gtk_pizza_expose (GtkWidget *widget,
GdkEventExpose *event);
static void gtk_pizza_style_set (GtkWidget *widget,
GtkStyle *previous_style);
static void gtk_pizza_add (GtkContainer *container,
GtkWidget *widget);
static void gtk_pizza_remove (GtkContainer *container,
@@ -164,6 +166,7 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
widget_class->draw = gtk_pizza_draw;
#endif
widget_class->expose_event = gtk_pizza_expose;
widget_class->style_set = gtk_pizza_style_set;
container_class->add = gtk_pizza_add;
container_class->remove = gtk_pizza_remove;
@@ -587,7 +590,7 @@ gtk_pizza_realize (GtkWidget *widget)
widget->style = gtk_style_attach (widget->style, widget->window);
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
gtk_style_set_background (widget->style, pizza->bin_window, GTK_STATE_NORMAL );
/*
gdk_window_set_back_pixmap( widget->window, NULL, FALSE );
gdk_window_set_back_pixmap( pizza->bin_window, NULL, FALSE );
@@ -807,6 +810,18 @@ gtk_pizza_expose (GtkWidget *widget,
#endif
}
static void
gtk_pizza_style_set(GtkWidget *widget, GtkStyle *previous_style)
{
if (GTK_WIDGET_REALIZED(widget))
{
gtk_style_set_background(widget->style, widget->window, GTK_STATE_NORMAL);
gtk_style_set_background(widget->style, GTK_PIZZA(widget)->bin_window, GTK_STATE_NORMAL );
}
(* GTK_WIDGET_CLASS (pizza_parent_class)->style_set) (widget, previous_style);
}
static void
gtk_pizza_add (GtkContainer *container,
GtkWidget *widget)

17
src/gtk1/win_gtk.c
View File

@@ -60,6 +60,8 @@ static void gtk_pizza_draw (GtkWidget *widget,
#endif /* __WXGTK20__ */
static gint gtk_pizza_expose (GtkWidget *widget,
GdkEventExpose *event);
static void gtk_pizza_style_set (GtkWidget *widget,
GtkStyle *previous_style);
static void gtk_pizza_add (GtkContainer *container,
GtkWidget *widget);
static void gtk_pizza_remove (GtkContainer *container,
@@ -164,6 +166,7 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
widget_class->draw = gtk_pizza_draw;
#endif
widget_class->expose_event = gtk_pizza_expose;
widget_class->style_set = gtk_pizza_style_set;
container_class->add = gtk_pizza_add;
container_class->remove = gtk_pizza_remove;
@@ -587,7 +590,7 @@ gtk_pizza_realize (GtkWidget *widget)
widget->style = gtk_style_attach (widget->style, widget->window);
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
gtk_style_set_background (widget->style, pizza->bin_window, GTK_STATE_NORMAL );
/*
gdk_window_set_back_pixmap( widget->window, NULL, FALSE );
gdk_window_set_back_pixmap( pizza->bin_window, NULL, FALSE );
@@ -807,6 +810,18 @@ gtk_pizza_expose (GtkWidget *widget,
#endif
}
static void
gtk_pizza_style_set(GtkWidget *widget, GtkStyle *previous_style)
{
if (GTK_WIDGET_REALIZED(widget))
{
gtk_style_set_background(widget->style, widget->window, GTK_STATE_NORMAL);
gtk_style_set_background(widget->style, GTK_PIZZA(widget)->bin_window, GTK_STATE_NORMAL );
}
(* GTK_WIDGET_CLASS (pizza_parent_class)->style_set) (widget, previous_style);
}
static void
gtk_pizza_add (GtkContainer *container,
GtkWidget *widget)