Fix GTK3 build bustage

This commit is contained in:
trav90 2018-04-06 17:38:44 -05:00 • committed by Roy Tam
commit 3e7ff78276
2 changed files with 3 additions and 3 deletions

View file

@ -1035,7 +1035,7 @@ GetWidgetStyleInternal(WidgetNodeType aNodeType)
return GetWidgetStyleWithClass(MOZ_GTK_RADIOMENUITEM, return GetWidgetStyleWithClass(MOZ_GTK_RADIOMENUITEM,
GTK_STYLE_CLASS_RADIO); GTK_STYLE_CLASS_RADIO);
case MOZ_GTK_CHECKMENUITEM_INDICATOR: case MOZ_GTK_CHECKMENUITEM_INDICATOR:
+ return GetWidgetStyleWithClass(MOZ_GTK_CHECKMENUITEM, return GetWidgetStyleWithClass(MOZ_GTK_CHECKMENUITEM,
GTK_STYLE_CLASS_CHECK); GTK_STYLE_CLASS_CHECK);
case MOZ_GTK_PROGRESS_TROUGH: case MOZ_GTK_PROGRESS_TROUGH:
return GetWidgetStyleWithClass(MOZ_GTK_PROGRESSBAR, return GetWidgetStyleWithClass(MOZ_GTK_PROGRESSBAR,

View file

@ -1029,8 +1029,7 @@ moz_gtk_treeview_expander_paint(cairo_t *cr, GdkRectangle* rect,
return MOZ_GTK_SUCCESS; return MOZ_GTK_SUCCESS;
} }
/* See gtk_separator_draw() for reference. /* See gtk_separator_draw() for reference. */
*/
static gint static gint
moz_gtk_combo_box_paint(cairo_t *cr, GdkRectangle* rect, moz_gtk_combo_box_paint(cairo_t *cr, GdkRectangle* rect,
GtkWidgetState* state, GtkWidgetState* state,
@ -1844,6 +1843,7 @@ moz_gtk_menu_item_paint(WidgetNodeType widget, cairo_t *cr, GdkRectangle* rect,
if (widget == MOZ_GTK_MENUBARITEM) { if (widget == MOZ_GTK_MENUBARITEM) {
gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUBAR); gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUBAR);
} }
}
x = rect->x; x = rect->x;
y = rect->y; y = rect->y;