aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2011-06-16 09:55:19 +1000
committernyamatongwe <devnull@localhost>2011-06-16 09:55:19 +1000
commit1d84925321e4e9710e564337a8c2f055e51d06ba (patch)
tree0d8e5e1a9bf0eee4803c0d21c3425d1f9e8d455c
parentdff36ad39b933cce980ed84ca5a26e078395c8a4 (diff)
downloadscintilla-mirror-1d84925321e4e9710e564337a8c2f055e51d06ba.tar.gz
Moved style attach calls to before background setting which
uses the style. From Mitchell Foral.
-rw-r--r--gtk/ScintillaGTK.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 44d3d0810..6488fb609 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -432,20 +432,20 @@ void ScintillaGTK::RealizeThis(GtkWidget *widget) {
gtk_widget_set_window(widget, gdk_window_new(gtk_widget_get_parent_window(widget), &attrs,
GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_CURSOR));
gdk_window_set_user_data(gtk_widget_get_window(widget), widget);
+ // Deprecated: should chain up to parent class' "realize" implementation
+ gtk_widget_style_attach(widget);
gdk_window_set_background(gtk_widget_get_window(widget),
&(gtk_widget_get_style(widget)->bg[GTK_STATE_NORMAL]));
gdk_window_show(gtk_widget_get_window(widget));
gdk_cursor_unref(cursor);
- // Deprecated: should chain up to parent class' "realize" implementation
- gtk_widget_style_attach(widget);
#else
widget->window = gdk_window_new(gtk_widget_get_parent_window(widget), &attrs,
GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_CURSOR);
gdk_window_set_user_data(widget->window, widget);
+ widget->style = gtk_style_attach(widget->style, widget->window);
gdk_window_set_background(widget->window, &widget->style->bg[GTK_STATE_NORMAL]);
gdk_window_show(widget->window);
gdk_cursor_unref(cursor);
- widget->style = gtk_style_attach(widget->style, widget->window);
#endif
wPreedit = gtk_window_new(GTK_WINDOW_POPUP);
wPreeditDraw = gtk_drawing_area_new();