Attachment 112209 Details for Bug 232209

[patch] patch

patch-1.8 (text/plain), 3.32 KB, created by Wolfgang Rosenauer on 2007-01-10 13:36:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wolfgang Rosenauer

Created: 2007-01-10 13:36:13 UTC

Size: 3.32 KB

patch

obsolete

>Index: widget/src/gtk2/nsLookAndFeel.cpp
>===================================================================
>RCS file: /cvsroot/mozilla/widget/src/gtk2/nsLookAndFeel.cpp,v
>retrieving revision 1.23.8.1
>diff -u -p -6 -r1.23.8.1 nsLookAndFeel.cpp
>--- widget/src/gtk2/nsLookAndFeel.cpp	10 Apr 2006 06:09:08 -0000	1.23.8.1
>+++ widget/src/gtk2/nsLookAndFeel.cpp	10 Jan 2007 09:27:16 -0000
>@@ -497,14 +497,16 @@ nsLookAndFeel::InitColors()
>     GtkStyle *style;
> 
>     // tooltip foreground and background
>     style = gtk_rc_get_style_by_paths(gtk_settings_get_default(),
>                                       "gtk-tooltips", "GtkWindow",
>                                       GTK_TYPE_WINDOW);
>-    sInfoBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
>-    sInfoText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
>+    if (style) {
>+        sInfoBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
>+        sInfoText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
>+    }
> 
>     // menu foreground & menu background
>     GtkWidget *accel_label = gtk_accel_label_new("M");
>     GtkWidget *menuitem = gtk_menu_item_new();
>     GtkWidget *menu = gtk_menu_new();
>     gtk_object_ref(GTK_OBJECT(menu));
>@@ -516,20 +518,26 @@ nsLookAndFeel::InitColors()
>     gtk_widget_set_rc_style(accel_label);
>     gtk_widget_set_rc_style(menu);
>     gtk_widget_realize(menu);
>     gtk_widget_realize(accel_label);
> 
>     style = gtk_widget_get_style(accel_label);
>-    sMenuText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
>+    if (style) {
>+        sMenuText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
>+    }
> 
>     style = gtk_widget_get_style(menu);
>-    sMenuBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
>+    if (style) {
>+        sMenuBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
>+    }
>     
>     style = gtk_widget_get_style(menuitem);
>-    sMenuHover = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_PRELIGHT]);
>-    sMenuHoverText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_PRELIGHT]);
>+    if (style) {
>+        sMenuHover = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_PRELIGHT]);
>+        sMenuHoverText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_PRELIGHT]);
>+    }
> 
>     gtk_widget_unref(menu);
> 
> 
>     // button styles
>     GtkWidget *parent = gtk_fixed_new();
>@@ -545,20 +553,24 @@ nsLookAndFeel::InitColors()
>     gtk_widget_set_rc_style(label);
> 
>     gtk_widget_realize(button);
>     gtk_widget_realize(label);
> 
>     style = gtk_widget_get_style(label);
>-    sButtonText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
>+    if (style) {
>+        sButtonText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
>+    }
> 
>     style = gtk_widget_get_style(button);
>-    sButtonBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
>-    sButtonOuterLightBorder =
>-        GDK_COLOR_TO_NS_RGB(style->light[GTK_STATE_NORMAL]);
>-    sButtonInnerDarkBorder =
>-        GDK_COLOR_TO_NS_RGB(style->dark[GTK_STATE_NORMAL]);
>+    if (style) {
>+        sButtonBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
>+        sButtonOuterLightBorder =
>+            GDK_COLOR_TO_NS_RGB(style->light[GTK_STATE_NORMAL]);
>+        sButtonInnerDarkBorder =
>+            GDK_COLOR_TO_NS_RGB(style->dark[GTK_STATE_NORMAL]);
>+    }
> 
>     gtk_widget_destroy(window);
> }
> 
> NS_IMETHODIMP
> nsLookAndFeel::LookAndFeelChanged()

Actions: View | Diff

Attachments on bug 232209: 112209