805753 - Gtk 2.10 compat layer misses gtk_widget_set_has_window

Status: RESOLVED FIXED

(Core :: Widget: Gtk, defect)

Description

[Frank Wein [:mcsmurf]]

Bug 794285 added a new source compat layer for building with GTK 2.10. Bug 793501 added two new functions, which are provided by gtk 2.18 and above:
gtk_widget_get_has_window and
gtk_widget_set_has_window

So the gtk 2.10 src compat layer should be fixed to include those two functions.

Comment 1

[Stefan Sitter [:ssitter]]

Linux x86_64 comm-central lightning build is currently broken due to this error: https://tinderbox.mozilla.org/showlog.cgi?log=CalendarTrunk/1351245600.1351248498.23652.gz#err0

Comment 2

[Ian Neal]

Attachment: Fix compat layer

I don't have a pre gtk2.18 box to test this against.

Comment 3

[Karl Tomlinson (:karlt)]

Comment on attachment 675857 [details] [diff] [review]
Fix compat layer

> static inline void
>+gtk_widget_set_has_window(GtkWidget *widget, gboolean has_window)
>+{
>+  if (has_window)
>+    GTK_WIDGET_UNSET_FLAGS (widget, GTK_WIDGET_NO_WINDOW);
>+  else
>+    GTK_WIDGET_SET_FLAGS (widget, GTK_WIDGET_NO_WINDOW);
>+}
>+
>+static inline void

Need to use GTK_NO_WINDOW for the flag.
(GTK_WIDGET_NO_WINDOW is the test macro.)
Otherwise this is what is needed.

Comment 4

[Ian Neal]

Attachment: Revised compat layer fix [Checked in: Comment 6]

Comment 5

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Comment on attachment 675959 [details] [diff] [review]
Revised compat layer fix [Checked in: Comment 6]

Review of attachment 675959 [details] [diff] [review]:
-----------------------------------------------------------------

::: widget/gtk2/compat/gtk/gtkwidget.h
@@ +98,5 @@
> +{
> +  if (has_window)
> +    GTK_WIDGET_UNSET_FLAGS (widget, GTK_NO_WINDOW);
> +  else
> +    GTK_WIDGET_SET_FLAGS (widget, GTK_NO_WINDOW);

{}

Comment 6

[Ian Neal]

Comment on attachment 675959 [details] [diff] [review]
Revised compat layer fix [Checked in: Comment 6]

https://hg.mozilla.org/mozilla-central/rev/f161ad73100b