From 54465cc4acd53921f00339abd8fcbab4550bf090 Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 6 Apr 2018 17:38:44 -0500 Subject: Fix GTK3 build bustage --- widget/gtk/WidgetStyleCache.cpp | 2 +- widget/gtk/gtk3drawing.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'widget') diff --git a/widget/gtk/WidgetStyleCache.cpp b/widget/gtk/WidgetStyleCache.cpp index 301d93db3..f35a451aa 100644 --- a/widget/gtk/WidgetStyleCache.cpp +++ b/widget/gtk/WidgetStyleCache.cpp @@ -1035,7 +1035,7 @@ GetWidgetStyleInternal(WidgetNodeType aNodeType) return GetWidgetStyleWithClass(MOZ_GTK_RADIOMENUITEM, GTK_STYLE_CLASS_RADIO); case MOZ_GTK_CHECKMENUITEM_INDICATOR: -+ return GetWidgetStyleWithClass(MOZ_GTK_CHECKMENUITEM, + return GetWidgetStyleWithClass(MOZ_GTK_CHECKMENUITEM, GTK_STYLE_CLASS_CHECK); case MOZ_GTK_PROGRESS_TROUGH: return GetWidgetStyleWithClass(MOZ_GTK_PROGRESSBAR, diff --git a/widget/gtk/gtk3drawing.cpp b/widget/gtk/gtk3drawing.cpp index 6b0f9cddc..c592fa51c 100644 --- a/widget/gtk/gtk3drawing.cpp +++ b/widget/gtk/gtk3drawing.cpp @@ -1029,8 +1029,7 @@ moz_gtk_treeview_expander_paint(cairo_t *cr, GdkRectangle* rect, return MOZ_GTK_SUCCESS; } -/* See gtk_separator_draw() for reference. -*/ +/* See gtk_separator_draw() for reference. */ static gint moz_gtk_combo_box_paint(cairo_t *cr, GdkRectangle* rect, GtkWidgetState* state, @@ -1844,6 +1843,7 @@ moz_gtk_menu_item_paint(WidgetNodeType widget, cairo_t *cr, GdkRectangle* rect, if (widget == MOZ_GTK_MENUBARITEM) { gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUBAR); } + } x = rect->x; y = rect->y; -- cgit v1.2.3