237 + gRadiobutton.check.styleLabel = moz_gtk_style_create(&path[2], |
238 + gRadiobutton.check.styleLabel = moz_gtk_style_create(&path[2], |
238 + gRadiobutton.check.style); |
239 + gRadiobutton.check.style); |
239 } |
240 } |
240 return MOZ_GTK_SUCCESS; |
241 return MOZ_GTK_SUCCESS; |
241 } |
242 } |
242 @@ -215,13 +358,31 @@ ensure_radiobutton_widget() |
243 @@ -215,25 +359,62 @@ ensure_radiobutton_widget() |
243 static gint |
244 static gint |
244 ensure_scrollbar_widget() |
245 ensure_scrollbar_widget() |
245 { |
246 { |
246 - if (!gVertScrollbarWidget) { |
247 - if (!gVertScrollbarWidget) { |
247 - gVertScrollbarWidget = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL); |
248 - gVertScrollbarWidget = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL); |
248 - setup_widget_prototype(gVertScrollbarWidget); |
249 - setup_widget_prototype(gVertScrollbarWidget); |
249 - } |
250 - } |
250 - if (!gHorizScrollbarWidget) { |
251 - if (!gHorizScrollbarWidget) { |
251 - gHorizScrollbarWidget = gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL, NULL); |
252 - gHorizScrollbarWidget = gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL, NULL); |
252 - setup_widget_prototype(gHorizScrollbarWidget); |
253 - setup_widget_prototype(gHorizScrollbarWidget); |
|
254 - } |
253 + if (!gVertScrollbar.widget && !gHorizScrollbar.widget) { |
255 + if (!gVertScrollbar.widget && !gHorizScrollbar.widget) { |
254 + GtkCssNode path[] = { |
256 + GtkCssNode path[] = { |
255 + { GTK_TYPE_SCROLLBAR, "scrollbar", "horizontal", NULL }, |
257 + { GTK_TYPE_SCROLLBAR, "scrollbar", "horizontal", "bottom"}, |
256 + { GTK_TYPE_SCROLLBAR, "scrollbar", "vertical", NULL }, |
258 + { GTK_TYPE_SCROLLBAR, "scrollbar", "vertical", "right" }, |
257 + { GTK_TYPE_SCROLLBAR, "trough", NULL, NULL }, |
259 + { G_TYPE_NONE, "contents", NULL, NULL }, |
258 + { GTK_TYPE_SCROLLBAR, "slider", NULL, NULL } |
260 + { G_TYPE_NONE, "trough", NULL, NULL }, |
|
261 + { G_TYPE_NONE, "slider", NULL, NULL } |
259 + }; |
262 + }; |
|
263 + |
|
264 + gHorizScrollbar.widget = gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL, NULL); |
|
265 + setup_widget_prototype(gHorizScrollbar.widget); |
|
266 + |
|
267 + gHorizScrollbar.scroll.style = moz_gtk_style_create(path, NULL); |
|
268 + gHorizScrollbar.scroll.styleContents = moz_gtk_style_create(path+2, |
|
269 + gHorizScrollbar.scroll.style); |
|
270 + gHorizScrollbar.scroll.styleTrough = moz_gtk_style_create(path+3, |
|
271 + gHorizScrollbar.scroll.styleContents); |
|
272 + gHorizScrollbar.scroll.styleSlider = moz_gtk_style_create(path+4, |
|
273 + gHorizScrollbar.scroll.styleTrough); |
260 + |
274 + |
261 + gVertScrollbar.widget = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL); |
275 + gVertScrollbar.widget = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL); |
262 + setup_widget_prototype(gVertScrollbar.widget); |
276 + setup_widget_prototype(gVertScrollbar.widget); |
263 + |
277 + |
264 + gVertScrollbar.scroll.style = moz_gtk_style_create(path+1, NULL); |
278 + gVertScrollbar.scroll.style = moz_gtk_style_create(path+1, NULL); |
265 + gVertScrollbar.scroll.styleTrough = moz_gtk_style_create(path+2, |
279 + gVertScrollbar.scroll.styleContents = moz_gtk_style_create(path+2, |
266 + gVertScrollbar.scroll.style); |
280 + gVertScrollbar.scroll.style); |
267 + gVertScrollbar.scroll.styleSlider = moz_gtk_style_create(path+3, |
281 + gVertScrollbar.scroll.styleTrough = moz_gtk_style_create(path+3, |
|
282 + gVertScrollbar.scroll.styleContents); |
|
283 + gVertScrollbar.scroll.styleSlider = moz_gtk_style_create(path+4, |
268 + gVertScrollbar.scroll.styleTrough); |
284 + gVertScrollbar.scroll.styleTrough); |
269 + |
285 + |
270 + gHorizScrollbar.widget = gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL, NULL); |
286 + } |
271 + setup_widget_prototype(gHorizScrollbar.widget); |
|
272 + |
|
273 + gHorizScrollbar.scroll.style = moz_gtk_style_create(path, NULL); |
|
274 + gHorizScrollbar.scroll.styleTrough = moz_gtk_style_create(path+2, |
|
275 + gHorizScrollbar.scroll.style); |
|
276 + gHorizScrollbar.scroll.styleSlider = moz_gtk_style_create(path+3, |
|
277 + gHorizScrollbar.scroll.styleTrough); |
|
278 } |
|
279 return MOZ_GTK_SUCCESS; |
287 return MOZ_GTK_SUCCESS; |
280 } |
288 } |
281 @@ -229,11 +390,24 @@ ensure_scrollbar_widget() |
289 |
282 static gint |
290 static gint |
283 ensure_spin_widget() |
291 ensure_spin_widget() |
284 { |
292 { |
285 - if (!gSpinWidget) { |
293 - if (!gSpinWidget) { |
286 - gSpinWidget = gtk_spin_button_new(NULL, 1, 0); |
294 - gSpinWidget = gtk_spin_button_new(NULL, 1, 0); |
399 + }; |
407 + }; |
400 + |
408 + |
401 ensure_menu_popup_widget(); |
409 ensure_menu_popup_widget(); |
402 gCheckMenuItemWidget = gtk_check_menu_item_new_with_label("M"); |
410 gCheckMenuItemWidget = gtk_check_menu_item_new_with_label("M"); |
403 gtk_menu_shell_append(GTK_MENU_SHELL(gMenuPopupWidget), |
411 gtk_menu_shell_append(GTK_MENU_SHELL(gMenuPopupWidget), |
404 @@ -757,7 +958,7 @@ moz_gtk_checkbox_get_metrics(gint* indic |
412 @@ -757,7 +965,7 @@ moz_gtk_checkbox_get_metrics(gint* indic |
405 { |
413 { |
406 ensure_checkbox_widget(); |
414 ensure_checkbox_widget(); |
407 |
415 |
408 - gtk_widget_style_get (gCheckboxWidget, |
416 - gtk_widget_style_get (gCheckboxWidget, |
409 + gtk_widget_style_get (gCheckbox.widget, |
417 + gtk_widget_style_get (gCheckbox.widget, |
410 "indicator_size", indicator_size, |
418 "indicator_size", indicator_size, |
411 "indicator_spacing", indicator_spacing, |
419 "indicator_spacing", indicator_spacing, |
412 NULL); |
420 NULL); |
413 @@ -770,7 +971,7 @@ moz_gtk_radio_get_metrics(gint* indicato |
421 @@ -770,7 +978,7 @@ moz_gtk_radio_get_metrics(gint* indicato |
414 { |
422 { |
415 ensure_radiobutton_widget(); |
423 ensure_radiobutton_widget(); |
416 |
424 |
417 - gtk_widget_style_get (gRadiobuttonWidget, |
425 - gtk_widget_style_get (gRadiobuttonWidget, |
418 + gtk_widget_style_get (gRadiobutton.widget, |
426 + gtk_widget_style_get (gRadiobutton.widget, |
419 "indicator_size", indicator_size, |
427 "indicator_size", indicator_size, |
420 "indicator_spacing", indicator_spacing, |
428 "indicator_spacing", indicator_spacing, |
421 NULL); |
429 NULL); |
422 @@ -783,13 +984,12 @@ moz_gtk_get_focus_outline_size(gint* foc |
430 @@ -783,13 +991,12 @@ moz_gtk_get_focus_outline_size(gint* foc |
423 { |
431 { |
424 GtkBorder border; |
432 GtkBorder border; |
425 GtkBorder padding; |
433 GtkBorder padding; |
426 - GtkStyleContext *style; |
434 - GtkStyleContext *style; |
427 + GtkStyleContext* style = gEntry.entry.style; |
435 + GtkStyleContext* style = gEntry.entry.style; |
434 + gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border); |
442 + gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border); |
435 + gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding); |
443 + gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding); |
436 *focus_h_width = border.left + padding.left; |
444 *focus_h_width = border.left + padding.left; |
437 *focus_v_width = border.top + padding.top; |
445 *focus_v_width = border.top + padding.top; |
438 return MOZ_GTK_SUCCESS; |
446 return MOZ_GTK_SUCCESS; |
439 @@ -826,7 +1026,7 @@ moz_gtk_button_get_default_overflow(gint |
447 @@ -826,7 +1033,7 @@ moz_gtk_button_get_default_overflow(gint |
440 GtkBorder* default_outside_border; |
448 GtkBorder* default_outside_border; |
441 |
449 |
442 ensure_button_widget(); |
450 ensure_button_widget(); |
443 - gtk_widget_style_get(gButtonWidget, |
451 - gtk_widget_style_get(gButtonWidget, |
444 + gtk_widget_style_get(gButton.widget, |
452 + gtk_widget_style_get(gButton.widget, |
445 "default-outside-border", &default_outside_border, |
453 "default-outside-border", &default_outside_border, |
446 NULL); |
454 NULL); |
447 |
455 |
448 @@ -849,7 +1049,7 @@ moz_gtk_button_get_default_border(gint* |
456 @@ -849,7 +1056,7 @@ moz_gtk_button_get_default_border(gint* |
449 GtkBorder* default_border; |
457 GtkBorder* default_border; |
450 |
458 |
451 ensure_button_widget(); |
459 ensure_button_widget(); |
452 - gtk_widget_style_get(gButtonWidget, |
460 - gtk_widget_style_get(gButtonWidget, |
453 + gtk_widget_style_get(gButton.widget, |
461 + gtk_widget_style_get(gButton.widget, |
454 "default-border", &default_border, |
462 "default-border", &default_border, |
455 NULL); |
463 NULL); |
456 |
464 |
457 @@ -940,7 +1140,7 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec |
465 @@ -940,7 +1147,7 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec |
458 |
466 |
459 if (state->focused) { |
467 if (state->focused) { |
460 GtkBorder border; |
468 GtkBorder border; |
461 - gtk_style_context_get_border(style, state_flags, &border); |
469 - gtk_style_context_get_border(style, state_flags, &border); |
462 + moz_gtk_get_style_border(style, state_flags, &border); |
470 + moz_gtk_get_style_border(style, state_flags, &border); |
463 x += border.left; |
471 x += border.left; |
464 y += border.top; |
472 y += border.top; |
465 width -= (border.left + border.right); |
473 width -= (border.left + border.right); |
466 @@ -961,15 +1161,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec |
474 @@ -961,15 +1168,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec |
467 gint indicator_size, indicator_spacing; |
475 gint indicator_size, indicator_spacing; |
468 gint x, y, width, height; |
476 gint x, y, width, height; |
469 gint focus_x, focus_y, focus_width, focus_height; |
477 gint focus_x, focus_y, focus_width, focus_height; |
470 - GtkWidget *w; |
478 - GtkWidget *w; |
471 - GtkStyleContext *style; |
479 - GtkStyleContext *style; |
535 - gtk_style_context_restore(style); |
543 - gtk_style_context_restore(style); |
536 + gtk_style_context_restore(w->check.styleCheck); |
544 + gtk_style_context_restore(w->check.styleCheck); |
537 |
545 |
538 return MOZ_GTK_SUCCESS; |
546 return MOZ_GTK_SUCCESS; |
539 } |
547 } |
540 @@ -1040,8 +1238,8 @@ calculate_button_inner_rect(GtkWidget* b |
548 @@ -1040,8 +1245,8 @@ calculate_button_inner_rect(GtkWidget* b |
541 style = gtk_widget_get_style_context(button); |
549 style = gtk_widget_get_style_context(button); |
542 |
550 |
543 /* This mirrors gtkbutton's child positioning */ |
551 /* This mirrors gtkbutton's child positioning */ |
544 - gtk_style_context_get_border(style, 0, &border); |
552 - gtk_style_context_get_border(style, 0, &border); |
545 - gtk_style_context_get_padding(style, 0, &padding); |
553 - gtk_style_context_get_padding(style, 0, &padding); |
546 + gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border); |
554 + gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border); |
547 + gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding); |
555 + gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding); |
548 |
556 |
549 inner_rect->x = rect->x + border.left + padding.left; |
557 inner_rect->x = rect->x + border.left + padding.left; |
550 inner_rect->y = rect->y + padding.top + border.top; |
558 inner_rect->y = rect->y + padding.top + border.top; |
551 @@ -1107,9 +1305,9 @@ moz_gtk_scrollbar_button_paint(cairo_t * |
559 @@ -1107,9 +1312,9 @@ moz_gtk_scrollbar_button_paint(cairo_t * |
552 ensure_scrollbar_widget(); |
560 ensure_scrollbar_widget(); |
553 |
561 |
554 if (flags & MOZ_GTK_STEPPER_VERTICAL) |
562 if (flags & MOZ_GTK_STEPPER_VERTICAL) |
555 - scrollbar = gVertScrollbarWidget; |
563 - scrollbar = gVertScrollbarWidget; |
556 + scrollbar = gVertScrollbar.widget; |
564 + scrollbar = gVertScrollbar.widget; |
593 - gtk_style_context_add_class(style, GTK_STYLE_CLASS_TROUGH); |
601 - gtk_style_context_add_class(style, GTK_STYLE_CLASS_TROUGH); |
594 - |
602 - |
595 gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); |
603 gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); |
596 gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height); |
604 gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height); |
597 |
605 |
598 @@ -1202,7 +1397,6 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW |
606 @@ -1202,7 +1404,6 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW |
599 gtk_render_focus(style, cr, |
607 gtk_render_focus(style, cr, |
600 rect->x, rect->y, rect->width, rect->height); |
608 rect->x, rect->y, rect->width, rect->height); |
601 } |
609 } |
602 - gtk_style_context_restore(style); |
610 - gtk_style_context_restore(style); |
603 return MOZ_GTK_SUCCESS; |
611 return MOZ_GTK_SUCCESS; |
604 } |
612 } |
605 |
613 |
606 @@ -1214,25 +1408,21 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi |
614 @@ -1214,25 +1415,21 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi |
607 { |
615 { |
608 GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); |
616 GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); |
609 GtkStyleContext* style; |
617 GtkStyleContext* style; |
610 - GtkScrollbar *scrollbar; |
618 - GtkScrollbar *scrollbar; |
611 GtkAdjustment *adj; |
619 GtkAdjustment *adj; |
635 gtk_style_context_set_state(style, state_flags); |
643 gtk_style_context_set_state(style, state_flags); |
636 - |
644 - |
637 gtk_style_context_get_margin (style, state_flags, &margin); |
645 gtk_style_context_get_margin (style, state_flags, &margin); |
638 |
646 |
639 gtk_render_slider(style, cr, |
647 gtk_render_slider(style, cr, |
640 @@ -1243,8 +1433,6 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi |
648 @@ -1243,8 +1440,6 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi |
641 (widget == MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL) ? |
649 (widget == MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL) ? |
642 GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL); |
650 GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL); |
643 |
651 |
644 - gtk_style_context_restore(style); |
652 - gtk_style_context_restore(style); |
645 - |
653 - |
646 return MOZ_GTK_SUCCESS; |
654 return MOZ_GTK_SUCCESS; |
647 } |
655 } |
648 |
656 |
649 @@ -1255,8 +1443,8 @@ moz_gtk_spin_paint(cairo_t *cr, GdkRecta |
657 @@ -1255,8 +1450,8 @@ moz_gtk_spin_paint(cairo_t *cr, GdkRecta |
650 GtkStyleContext* style; |
658 GtkStyleContext* style; |
651 |
659 |
652 ensure_spin_widget(); |
660 ensure_spin_widget(); |
653 - gtk_widget_set_direction(gSpinWidget, direction); |
661 - gtk_widget_set_direction(gSpinWidget, direction); |
654 - style = gtk_widget_get_style_context(gSpinWidget); |
662 - style = gtk_widget_get_style_context(gSpinWidget); |
655 + gtk_widget_set_direction(gSpin.widget, direction); |
663 + gtk_widget_set_direction(gSpin.widget, direction); |
656 + style = gSpin.spin.style; |
664 + style = gSpin.spin.style; |
657 gtk_style_context_save(style); |
665 gtk_style_context_save(style); |
658 gtk_style_context_add_class(style, GTK_STYLE_CLASS_SPINBUTTON); |
666 gtk_style_context_add_class(style, GTK_STYLE_CLASS_SPINBUTTON); |
659 gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); |
667 gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); |
660 @@ -1275,11 +1463,10 @@ moz_gtk_spin_updown_paint(cairo_t *cr, G |
668 @@ -1275,11 +1470,10 @@ moz_gtk_spin_updown_paint(cairo_t *cr, G |
661 GtkStyleContext* style; |
669 GtkStyleContext* style; |
662 |
670 |
663 ensure_spin_widget(); |
671 ensure_spin_widget(); |
664 - style = gtk_widget_get_style_context(gSpinWidget); |
672 - style = gtk_widget_get_style_context(gSpinWidget); |
665 + style = gSpin.spin.style; |
673 + style = gSpin.spin.style; |
669 - gtk_widget_set_direction(gSpinWidget, direction); |
677 - gtk_widget_set_direction(gSpinWidget, direction); |
670 + gtk_widget_set_direction(gSpin.widget, direction); |
678 + gtk_widget_set_direction(gSpin.widget, direction); |
671 |
679 |
672 gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); |
680 gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); |
673 gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height); |
681 gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height); |
674 @@ -1445,15 +1632,13 @@ moz_gtk_vpaned_paint(cairo_t *cr, GdkRec |
682 @@ -1445,15 +1639,13 @@ moz_gtk_vpaned_paint(cairo_t *cr, GdkRec |
675 static gint |
683 static gint |
676 moz_gtk_entry_paint(cairo_t *cr, GdkRectangle* rect, |
684 moz_gtk_entry_paint(cairo_t *cr, GdkRectangle* rect, |
677 GtkWidgetState* state, |
685 GtkWidgetState* state, |
678 - GtkWidget* widget, GtkTextDirection direction) |
686 - GtkWidget* widget, GtkTextDirection direction) |
679 + MozGtkWidget* w, GtkTextDirection direction) |
687 + MozGtkWidget* w, GtkTextDirection direction) |
700 gtk_style_context_save(style); |
708 gtk_style_context_save(style); |
701 - gtk_style_context_add_class(style, GTK_STYLE_CLASS_ENTRY); |
709 - gtk_style_context_add_class(style, GTK_STYLE_CLASS_ENTRY); |
702 |
710 |
703 /* Now paint the shadow and focus border. |
711 /* Now paint the shadow and focus border. |
704 * We do like in gtk_entry_draw_frame, we first draw the shadow, a tad |
712 * We do like in gtk_entry_draw_frame, we first draw the shadow, a tad |
705 @@ -1526,7 +1710,7 @@ moz_gtk_treeview_paint(cairo_t *cr, GdkR |
713 @@ -1526,7 +1717,7 @@ moz_gtk_treeview_paint(cairo_t *cr, GdkR |
706 style = gtk_widget_get_style_context(gScrolledWindowWidget); |
714 style = gtk_widget_get_style_context(gScrolledWindowWidget); |
707 gtk_style_context_save(style); |
715 gtk_style_context_save(style); |
708 gtk_style_context_add_class(style, GTK_STYLE_CLASS_FRAME); |
716 gtk_style_context_add_class(style, GTK_STYLE_CLASS_FRAME); |
709 - gtk_style_context_get_border(style, state_flags, &border); |
717 - gtk_style_context_get_border(style, state_flags, &border); |
710 + moz_gtk_get_style_border(style, state_flags, &border); |
718 + moz_gtk_get_style_border(style, state_flags, &border); |
711 xthickness = border.left; |
719 xthickness = border.left; |
712 ythickness = border.top; |
720 ythickness = border.top; |
713 |
721 |
714 @@ -1697,7 +1881,7 @@ moz_gtk_combo_box_paint(cairo_t *cr, Gdk |
722 @@ -1697,7 +1888,7 @@ moz_gtk_combo_box_paint(cairo_t *cr, Gdk |
715 if (direction == GTK_TEXT_DIR_LTR) { |
723 if (direction == GTK_TEXT_DIR_LTR) { |
716 GtkBorder padding; |
724 GtkBorder padding; |
717 GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); |
725 GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); |
718 - gtk_style_context_get_padding(style, state_flags, &padding); |
726 - gtk_style_context_get_padding(style, state_flags, &padding); |
719 + moz_gtk_get_style_padding(style, state_flags, &padding); |
727 + moz_gtk_get_style_padding(style, state_flags, &padding); |
720 arrow_rect.x -= padding.left; |
728 arrow_rect.x -= padding.left; |
721 } |
729 } |
722 else |
730 else |
723 @@ -1799,29 +1983,27 @@ moz_gtk_container_paint(cairo_t *cr, Gdk |
731 @@ -1799,29 +1990,27 @@ moz_gtk_container_paint(cairo_t *cr, Gdk |
724 gboolean isradio, GtkTextDirection direction) |
732 gboolean isradio, GtkTextDirection direction) |
725 { |
733 { |
726 GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); |
734 GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); |
727 - GtkStyleContext* style; |
735 - GtkStyleContext* style; |
728 - GtkWidget *widget; |
736 - GtkWidget *widget; |
848 - gtk_style_context_add_class(style, GTK_STYLE_CLASS_PROGRESSBAR); |
856 - gtk_style_context_add_class(style, GTK_STYLE_CLASS_PROGRESSBAR); |
849 + gtk_widget_set_direction(gProgressBar.widget, direction); |
857 + gtk_widget_set_direction(gProgressBar.widget, direction); |
850 |
858 |
851 if (widget == MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE || |
859 if (widget == MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE || |
852 widget == MOZ_GTK_PROGRESS_CHUNK_VERTICAL_INDETERMINATE) { |
860 widget == MOZ_GTK_PROGRESS_CHUNK_VERTICAL_INDETERMINATE) { |
853 @@ -2072,12 +2236,14 @@ moz_gtk_progress_chunk_paint(cairo_t *cr |
861 @@ -2072,12 +2243,14 @@ moz_gtk_progress_chunk_paint(cairo_t *cr |
854 // gtk_render_activity was used to render progress chunks on GTK versions |
862 // gtk_render_activity was used to render progress chunks on GTK versions |
855 // before 3.13.7, see bug 1173907. |
863 // before 3.13.7, see bug 1173907. |
856 if (!gtk_check_version(3, 13, 7)) { |
864 if (!gtk_check_version(3, 13, 7)) { |
857 - gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); |
865 - gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); |
858 - gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height); |
866 - gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height); |
867 } |
875 } |
868 - gtk_style_context_restore(style); |
876 - gtk_style_context_restore(style); |
869 |
877 |
870 return MOZ_GTK_SUCCESS; |
878 return MOZ_GTK_SUCCESS; |
871 } |
879 } |
872 @@ -2094,7 +2260,7 @@ moz_gtk_get_tab_thickness(void) |
880 @@ -2094,7 +2267,7 @@ moz_gtk_get_tab_thickness(void) |
873 |
881 |
874 style = gtk_widget_get_style_context(gTabWidget); |
882 style = gtk_widget_get_style_context(gTabWidget); |
875 gtk_style_context_add_class(style, GTK_STYLE_CLASS_NOTEBOOK); |
883 gtk_style_context_add_class(style, GTK_STYLE_CLASS_NOTEBOOK); |
876 - gtk_style_context_get_border(style, 0, &border); |
884 - gtk_style_context_get_border(style, 0, &border); |
877 + gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border); |
885 + gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border); |
878 |
886 |
879 if (border.top < 2) |
887 if (border.top < 2) |
880 return 2; /* some themes don't set ythickness correctly */ |
888 return 2; /* some themes don't set ythickness correctly */ |
881 @@ -2290,7 +2456,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan |
889 @@ -2290,7 +2463,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan |
882 gtk_style_context_save(style); |
890 gtk_style_context_save(style); |
883 moz_gtk_tab_prepare_style_context(style, flags); |
891 moz_gtk_tab_prepare_style_context(style, flags); |
884 |
892 |
885 - gtk_style_context_get_padding(style, GetStateFlagsFromGtkWidgetState(state), &padding); |
893 - gtk_style_context_get_padding(style, GetStateFlagsFromGtkWidgetState(state), &padding); |
886 + moz_gtk_get_style_padding(style, GetStateFlagsFromGtkWidgetState(state), &padding); |
894 + moz_gtk_get_style_padding(style, GetStateFlagsFromGtkWidgetState(state), &padding); |
887 |
895 |
888 focusRect.x += padding.left; |
896 focusRect.x += padding.left; |
889 focusRect.width -= (padding.left + padding.right); |
897 focusRect.width -= (padding.left + padding.right); |
890 @@ -2406,7 +2572,7 @@ moz_gtk_tab_scroll_arrow_paint(cairo_t * |
898 @@ -2406,7 +2579,7 @@ moz_gtk_tab_scroll_arrow_paint(cairo_t * |
891 } |
899 } |
892 |
900 |
893 static gint |
901 static gint |
894 -moz_gtk_menu_bar_paint(cairo_t *cr, GdkRectangle* rect, |
902 -moz_gtk_menu_bar_paint(cairo_t *cr, GdkRectangle* rect, |
895 +moz_gtk_menu_bar_paint(cairo_t *cr, GdkRectangle* rect, GtkWidgetState* state, |
903 +moz_gtk_menu_bar_paint(cairo_t *cr, GdkRectangle* rect, GtkWidgetState* state, |
896 GtkTextDirection direction) |
904 GtkTextDirection direction) |
897 { |
905 { |
898 GtkStyleContext* style; |
906 GtkStyleContext* style; |
899 @@ -2467,7 +2633,7 @@ moz_gtk_menu_separator_paint(cairo_t *cr |
907 @@ -2467,7 +2640,7 @@ moz_gtk_menu_separator_paint(cairo_t *cr |
900 border_width = gtk_container_get_border_width(GTK_CONTAINER(gMenuSeparatorWidget)); |
908 border_width = gtk_container_get_border_width(GTK_CONTAINER(gMenuSeparatorWidget)); |
901 |
909 |
902 style = gtk_widget_get_style_context(gMenuSeparatorWidget); |
910 style = gtk_widget_get_style_context(gMenuSeparatorWidget); |
903 - gtk_style_context_get_padding(style, 0, &padding); |
911 - gtk_style_context_get_padding(style, 0, &padding); |
904 + gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding); |
912 + gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding); |
905 |
913 |
906 x = rect->x + border_width; |
914 x = rect->x + border_width; |
907 y = rect->y + border_width; |
915 y = rect->y + border_width; |
908 @@ -2521,7 +2687,8 @@ moz_gtk_menu_item_paint(cairo_t *cr, Gdk |
916 @@ -2521,7 +2694,8 @@ moz_gtk_menu_item_paint(cairo_t *cr, Gdk |
909 item_widget = gMenuItemWidget; |
917 item_widget = gMenuItemWidget; |
910 } |
918 } |
911 style = gtk_widget_get_style_context(item_widget); |
919 style = gtk_widget_get_style_context(item_widget); |
912 - gtk_style_context_save(style); |
920 - gtk_style_context_save(style); |
913 +// TODO - FIX! |
921 +// TODO - FIX! |
914 +// gtk_style_context_save(style); |
922 +// gtk_style_context_save(style); |
915 |
923 |
916 if (flags & MOZ_TOPLEVEL_MENU_ITEM) { |
924 if (flags & MOZ_TOPLEVEL_MENU_ITEM) { |
917 gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUBAR); |
925 gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUBAR); |
918 @@ -2540,7 +2707,7 @@ moz_gtk_menu_item_paint(cairo_t *cr, Gdk |
926 @@ -2540,7 +2714,7 @@ moz_gtk_menu_item_paint(cairo_t *cr, Gdk |
919 |
927 |
920 gtk_render_background(style, cr, x, y, w, h); |
928 gtk_render_background(style, cr, x, y, w, h); |
921 gtk_render_frame(style, cr, x, y, w, h); |
929 gtk_render_frame(style, cr, x, y, w, h); |
922 - gtk_style_context_restore(style); |
930 - gtk_style_context_restore(style); |
923 +// gtk_style_context_restore(style); |
931 +// gtk_style_context_restore(style); |
924 } |
932 } |
925 |
933 |
926 return MOZ_GTK_SUCCESS; |
934 return MOZ_GTK_SUCCESS; |
927 @@ -2556,7 +2723,10 @@ moz_gtk_menu_arrow_paint(cairo_t *cr, Gd |
935 @@ -2556,7 +2730,10 @@ moz_gtk_menu_arrow_paint(cairo_t *cr, Gd |
928 |
936 |
929 ensure_menu_item_widget(); |
937 ensure_menu_item_widget(); |
930 gtk_widget_set_direction(gMenuItemWidget, direction); |
938 gtk_widget_set_direction(gMenuItemWidget, direction); |
931 - |
939 - |
932 +/* |
940 +/* |
934 + GTK_STATE_FLAG_DIR_RTL; |
942 + GTK_STATE_FLAG_DIR_RTL; |
935 +*/ |
943 +*/ |
936 style = gtk_widget_get_style_context(gMenuItemWidget); |
944 style = gtk_widget_get_style_context(gMenuItemWidget); |
937 gtk_style_context_save(style); |
945 gtk_style_context_save(style); |
938 gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUITEM); |
946 gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUITEM); |
939 @@ -2606,7 +2776,7 @@ moz_gtk_check_menu_item_paint(cairo_t *c |
947 @@ -2606,7 +2783,7 @@ moz_gtk_check_menu_item_paint(cairo_t *c |
940 } |
948 } |
941 |
949 |
942 gtk_style_context_set_state(style, state_flags); |
950 gtk_style_context_set_state(style, state_flags); |
943 - gtk_style_context_get_padding(style, state_flags, &padding); |
951 - gtk_style_context_get_padding(style, state_flags, &padding); |
944 + moz_gtk_get_style_padding(style, state_flags, &padding); |
952 + moz_gtk_get_style_padding(style, state_flags, &padding); |
945 |
953 |
946 offset = gtk_container_get_border_width(GTK_CONTAINER(gCheckMenuItemWidget)) + |
954 offset = gtk_container_get_border_width(GTK_CONTAINER(gCheckMenuItemWidget)) + |
947 padding.left + 2; |
955 padding.left + 2; |
948 @@ -2658,7 +2828,7 @@ moz_gtk_add_style_border(GtkStyleContext |
956 @@ -2658,7 +2835,7 @@ moz_gtk_add_style_border(GtkStyleContext |
949 { |
957 { |
950 GtkBorder border; |
958 GtkBorder border; |
951 |
959 |
952 - gtk_style_context_get_border(style, 0, &border); |
960 - gtk_style_context_get_border(style, 0, &border); |
953 + gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border); |
961 + gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border); |
954 |
962 |
955 *left += border.left; |
963 *left += border.left; |
956 *right += border.right; |
964 *right += border.right; |
957 @@ -2667,12 +2837,22 @@ moz_gtk_add_style_border(GtkStyleContext |
965 @@ -2667,12 +2844,22 @@ moz_gtk_add_style_border(GtkStyleContext |
958 } |
966 } |
959 |
967 |
960 static void |
968 static void |
961 +moz_gtk_get_style_border(GtkStyleContext* style, GtkStateFlags state_flags, |
969 +moz_gtk_get_style_border(GtkStyleContext* style, GtkStateFlags state_flags, |
962 + GtkBorder *border) |
970 + GtkBorder *border) |
1037 + moz_gtk_add_style_padding(gEntry.entry.style, left, top, right, bottom); |
1045 + moz_gtk_add_style_padding(gEntry.entry.style, left, top, right, bottom); |
1038 + moz_gtk_add_style_border(gEntry.entry.style, left, top, right, bottom); |
1046 + moz_gtk_add_style_border(gEntry.entry.style, left, top, right, bottom); |
1039 |
1047 |
1040 return MOZ_GTK_SUCCESS; |
1048 return MOZ_GTK_SUCCESS; |
1041 } |
1049 } |
1042 @@ -2759,7 +2940,7 @@ moz_gtk_get_widget_border(GtkThemeWidget |
1050 @@ -2759,7 +2947,7 @@ moz_gtk_get_widget_border(GtkThemeWidget |
1043 break; |
1051 break; |
1044 case MOZ_GTK_DROPDOWN_ENTRY: |
1052 case MOZ_GTK_DROPDOWN_ENTRY: |
1045 ensure_combo_box_entry_widgets(); |
1053 ensure_combo_box_entry_widgets(); |
1046 - w = gComboBoxEntryTextareaWidget; |
1054 - w = gComboBoxEntryTextareaWidget; |
1047 + w = gComboBoxEntryTextarea.widget; |
1055 + w = gComboBoxEntryTextarea.widget; |
1048 break; |
1056 break; |
1049 case MOZ_GTK_DROPDOWN_ARROW: |
1057 case MOZ_GTK_DROPDOWN_ARROW: |
1050 ensure_combo_box_entry_widgets(); |
1058 ensure_combo_box_entry_widgets(); |
1051 @@ -2795,7 +2976,7 @@ moz_gtk_get_widget_border(GtkThemeWidget |
1059 @@ -2795,7 +2983,7 @@ moz_gtk_get_widget_border(GtkThemeWidget |
1052 |
1060 |
1053 if (!wide_separators) { |
1061 if (!wide_separators) { |
1054 style = gtk_widget_get_style_context(gComboBoxSeparatorWidget); |
1062 style = gtk_widget_get_style_context(gComboBoxSeparatorWidget); |
1055 - gtk_style_context_get_border(style, 0, &border); |
1063 - gtk_style_context_get_border(style, 0, &border); |
1056 + gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border); |
1064 + gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border); |
1057 separator_width = border.left; |
1065 separator_width = border.left; |
1058 } |
1066 } |
1059 } |
1067 } |
1060 @@ -2814,14 +2995,17 @@ moz_gtk_get_widget_border(GtkThemeWidget |
1068 @@ -2814,14 +3002,17 @@ moz_gtk_get_widget_border(GtkThemeWidget |
1061 w = gTabWidget; |
1069 w = gTabWidget; |
1062 break; |
1070 break; |
1063 case MOZ_GTK_PROGRESSBAR: |
1071 case MOZ_GTK_PROGRESSBAR: |
1064 - ensure_progress_widget(); |
1072 - ensure_progress_widget(); |
1065 - w = gProgressWidget; |
1073 - w = gProgressWidget; |
1127 + |
1135 + |
1128 +gint |
1136 +gint |
1129 moz_gtk_get_tab_scroll_arrow_size(gint* width, gint* height) |
1137 moz_gtk_get_tab_scroll_arrow_size(gint* width, gint* height) |
1130 { |
1138 { |
1131 gint arrow_size; |
1139 gint arrow_size; |
1132 @@ -3022,7 +3233,7 @@ moz_gtk_get_toolbar_separator_width(gint |
1140 @@ -3022,7 +3240,7 @@ moz_gtk_get_toolbar_separator_width(gint |
1133 "separator-width", &separator_width, |
1141 "separator-width", &separator_width, |
1134 NULL); |
1142 NULL); |
1135 /* Just in case... */ |
1143 /* Just in case... */ |
1136 - gtk_style_context_get_border(style, 0, &border); |
1144 - gtk_style_context_get_border(style, 0, &border); |
1137 + gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border); |
1145 + gtk_style_context_get_border(style, gtk_style_context_get_state(style), &border); |
1138 *size = MAX(*size, (wide_separators ? separator_width : border.left)); |
1146 *size = MAX(*size, (wide_separators ? separator_width : border.left)); |
1139 return MOZ_GTK_SUCCESS; |
1147 return MOZ_GTK_SUCCESS; |
1140 } |
1148 } |
1141 @@ -3064,7 +3275,7 @@ moz_gtk_get_menu_separator_height(gint * |
1149 @@ -3064,7 +3282,7 @@ moz_gtk_get_menu_separator_height(gint * |
1142 border_width = gtk_container_get_border_width(GTK_CONTAINER(gMenuSeparatorWidget)); |
1150 border_width = gtk_container_get_border_width(GTK_CONTAINER(gMenuSeparatorWidget)); |
1143 |
1151 |
1144 style = gtk_widget_get_style_context(gMenuSeparatorWidget); |
1152 style = gtk_widget_get_style_context(gMenuSeparatorWidget); |
1145 - gtk_style_context_get_padding(style, 0, &padding); |
1153 - gtk_style_context_get_padding(style, 0, &padding); |
1146 + gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding); |
1154 + gtk_style_context_get_padding(style, gtk_style_context_get_state(style), &padding); |
1147 |
1155 |
1148 gtk_style_context_save(style); |
1156 gtk_style_context_save(style); |
1149 gtk_style_context_add_class(style, GTK_STYLE_CLASS_SEPARATOR); |
1157 gtk_style_context_add_class(style, GTK_STYLE_CLASS_SEPARATOR); |
1150 @@ -3122,15 +3333,21 @@ moz_gtk_get_scrollbar_metrics(MozGtkScro |
1158 @@ -3122,15 +3340,21 @@ moz_gtk_get_scrollbar_metrics(MozGtkScro |
1151 { |
1159 { |
1152 ensure_scrollbar_widget(); |
1160 ensure_scrollbar_widget(); |
1153 |
1161 |
1154 - gtk_widget_style_get (gHorizScrollbarWidget, |
1162 - gtk_widget_style_get (gHorizScrollbarWidget, |
1155 + gtk_widget_style_get (gHorizScrollbar.widget, |
1163 + gtk_widget_style_get (gHorizScrollbar.widget, |
1170 + gtk_range_get_min_slider_size(GTK_RANGE(gVertScrollbar.widget)); |
1178 + gtk_range_get_min_slider_size(GTK_RANGE(gVertScrollbar.widget)); |
1171 + } |
1179 + } |
1172 |
1180 |
1173 return MOZ_GTK_SUCCESS; |
1181 return MOZ_GTK_SUCCESS; |
1174 } |
1182 } |
1175 @@ -3155,7 +3372,7 @@ moz_gtk_images_in_buttons() |
1183 @@ -3155,7 +3379,7 @@ moz_gtk_images_in_buttons() |
1176 GtkSettings* settings; |
1184 GtkSettings* settings; |
1177 |
1185 |
1178 ensure_button_widget(); |
1186 ensure_button_widget(); |
1179 - settings = gtk_widget_get_settings(gButtonWidget); |
1187 - settings = gtk_widget_get_settings(gButtonWidget); |
1180 + settings = gtk_widget_get_settings(gButton.widget); |
1188 + settings = gtk_widget_get_settings(gButton.widget); |
1181 |
1189 |
1182 g_object_get(settings, "gtk-button-images", &result, NULL); |
1190 g_object_get(settings, "gtk-button-images", &result, NULL); |
1183 return result; |
1191 return result; |
1184 @@ -3183,7 +3400,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType |
1192 @@ -3183,7 +3407,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType |
1185 } |
1193 } |
1186 ensure_button_widget(); |
1194 ensure_button_widget(); |
1187 return moz_gtk_button_paint(cr, rect, state, |
1195 return moz_gtk_button_paint(cr, rect, state, |
1188 - (GtkReliefStyle) flags, gButtonWidget, |
1196 - (GtkReliefStyle) flags, gButtonWidget, |
1189 + (GtkReliefStyle) flags, gButton.widget, |
1197 + (GtkReliefStyle) flags, gButton.widget, |
1190 direction); |
1198 direction); |
1191 break; |
1199 break; |
1192 case MOZ_GTK_CHECKBUTTON: |
1200 case MOZ_GTK_CHECKBUTTON: |
1193 @@ -3233,7 +3450,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType |
1201 @@ -3233,7 +3457,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType |
1194 case MOZ_GTK_SPINBUTTON_ENTRY: |
1202 case MOZ_GTK_SPINBUTTON_ENTRY: |
1195 ensure_spin_widget(); |
1203 ensure_spin_widget(); |
1196 return moz_gtk_entry_paint(cr, rect, state, |
1204 return moz_gtk_entry_paint(cr, rect, state, |
1197 - gSpinWidget, direction); |
1205 - gSpinWidget, direction); |
1198 + &gSpin, direction); |
1206 + &gSpin, direction); |
1199 break; |
1207 break; |
1200 case MOZ_GTK_GRIPPER: |
1208 case MOZ_GTK_GRIPPER: |
1201 return moz_gtk_gripper_paint(cr, rect, state, |
1209 return moz_gtk_gripper_paint(cr, rect, state, |
1202 @@ -3260,7 +3477,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType |
1210 @@ -3260,7 +3484,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType |
1203 case MOZ_GTK_ENTRY: |
1211 case MOZ_GTK_ENTRY: |
1204 ensure_entry_widget(); |
1212 ensure_entry_widget(); |
1205 return moz_gtk_entry_paint(cr, rect, state, |
1213 return moz_gtk_entry_paint(cr, rect, state, |
1206 - gEntryWidget, direction); |
1214 - gEntryWidget, direction); |
1207 + &gEntry, direction); |
1215 + &gEntry, direction); |
1208 break; |
1216 break; |
1209 case MOZ_GTK_DROPDOWN: |
1217 case MOZ_GTK_DROPDOWN: |
1210 return moz_gtk_combo_box_paint(cr, rect, state, direction); |
1218 return moz_gtk_combo_box_paint(cr, rect, state, direction); |
1211 @@ -3272,7 +3489,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType |
1219 @@ -3272,7 +3496,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType |
1212 case MOZ_GTK_DROPDOWN_ENTRY: |
1220 case MOZ_GTK_DROPDOWN_ENTRY: |
1213 ensure_combo_box_entry_widgets(); |
1221 ensure_combo_box_entry_widgets(); |
1214 return moz_gtk_entry_paint(cr, rect, state, |
1222 return moz_gtk_entry_paint(cr, rect, state, |
1215 - gComboBoxEntryTextareaWidget, direction); |
1223 - gComboBoxEntryTextareaWidget, direction); |
1216 + &gComboBoxEntryTextarea, direction); |
1224 + &gComboBoxEntryTextarea, direction); |
1217 break; |
1225 break; |
1218 case MOZ_GTK_CHECKBUTTON_CONTAINER: |
1226 case MOZ_GTK_CHECKBUTTON_CONTAINER: |
1219 case MOZ_GTK_RADIOBUTTON_CONTAINER: |
1227 case MOZ_GTK_RADIOBUTTON_CONTAINER: |
1220 @@ -3324,7 +3541,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType |
1228 @@ -3324,7 +3548,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType |
1221 (GtkArrowType) flags, direction); |
1229 (GtkArrowType) flags, direction); |
1222 break; |
1230 break; |
1223 case MOZ_GTK_MENUBAR: |
1231 case MOZ_GTK_MENUBAR: |
1224 - return moz_gtk_menu_bar_paint(cr, rect, direction); |
1232 - return moz_gtk_menu_bar_paint(cr, rect, direction); |
1225 + return moz_gtk_menu_bar_paint(cr, rect, state, direction); |
1233 + return moz_gtk_menu_bar_paint(cr, rect, state, direction); |
1226 break; |
1234 break; |
1227 case MOZ_GTK_MENUPOPUP: |
1235 case MOZ_GTK_MENUPOPUP: |
1228 return moz_gtk_menu_popup_paint(cr, rect, direction); |
1236 return moz_gtk_menu_popup_paint(cr, rect, direction); |
1229 @@ -3375,7 +3592,7 @@ GtkWidget* moz_gtk_get_scrollbar_widget( |
1237 @@ -3375,7 +3599,7 @@ GtkWidget* moz_gtk_get_scrollbar_widget( |
1230 { |
1238 { |
1231 MOZ_ASSERT(is_initialized, "Forgot to call moz_gtk_init()"); |
1239 MOZ_ASSERT(is_initialized, "Forgot to call moz_gtk_init()"); |
1232 ensure_scrollbar_widget(); |
1240 ensure_scrollbar_widget(); |
1233 - return gHorizScrollbarWidget; |
1241 - return gHorizScrollbarWidget; |
1234 + return gVertScrollbar.widget; |
1242 + return gVertScrollbar.widget; |
1235 } |
1243 } |
1236 |
1244 |
1237 gboolean moz_gtk_has_scrollbar_buttons(void) |
1245 gboolean moz_gtk_has_scrollbar_buttons(void) |
1238 @@ -3383,7 +3600,7 @@ gboolean moz_gtk_has_scrollbar_buttons(v |
1246 @@ -3383,7 +3607,7 @@ gboolean moz_gtk_has_scrollbar_buttons(v |
1239 gboolean backward, forward, secondary_backward, secondary_forward; |
1247 gboolean backward, forward, secondary_backward, secondary_forward; |
1240 MOZ_ASSERT(is_initialized, "Forgot to call moz_gtk_init()"); |
1248 MOZ_ASSERT(is_initialized, "Forgot to call moz_gtk_init()"); |
1241 ensure_scrollbar_widget(); |
1249 ensure_scrollbar_widget(); |
1242 - gtk_widget_style_get (gHorizScrollbarWidget, |
1250 - gtk_widget_style_get (gHorizScrollbarWidget, |
1243 + gtk_widget_style_get (gHorizScrollbar.widget, |
1251 + gtk_widget_style_get (gHorizScrollbar.widget, |
1244 "has-backward-stepper", &backward, |
1252 "has-backward-stepper", &backward, |
1245 "has-forward-stepper", &forward, |
1253 "has-forward-stepper", &forward, |
1246 "has-secondary-backward-stepper", &secondary_backward, |
1254 "has-secondary-backward-stepper", &secondary_backward, |
1247 @@ -3409,17 +3626,19 @@ moz_gtk_shutdown() |
1255 @@ -3409,17 +3633,19 @@ moz_gtk_shutdown() |
1248 |
1256 |
1249 gProtoWindow = NULL; |
1257 gProtoWindow = NULL; |
1250 gProtoLayout = NULL; |
1258 gProtoLayout = NULL; |
1251 - gButtonWidget = NULL; |
1259 - gButtonWidget = NULL; |
1252 + |
1260 + |