diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 464a97df06..468a5687ba 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -1501,8 +1501,6 @@ GtkFixed gtk_fixed_new gtk_fixed_put gtk_fixed_move -gtk_fixed_get_has_window -gtk_fixed_set_has_window GTK_FIXED GTK_IS_FIXED diff --git a/docs/reference/gtk/tmpl/gtkfixed.sgml b/docs/reference/gtk/tmpl/gtkfixed.sgml index add592d9d1..db64dcbbc1 100644 --- a/docs/reference/gtk/tmpl/gtkfixed.sgml +++ b/docs/reference/gtk/tmpl/gtkfixed.sgml @@ -125,23 +125,3 @@ Moves a child of a #GtkFixed container to the given position. @widget: the child widget. @x: the horizontal position to move the widget to. @y: the vertical position to move the widget to. - - - - - - - -@fixed: -@Returns: - - - - - - - -@fixed: -@has_window: - - diff --git a/docs/tutorial/gtk-tut.sgml b/docs/tutorial/gtk-tut.sgml index 1dba303bb1..ce927ec044 100755 --- a/docs/tutorial/gtk-tut.sgml +++ b/docs/tutorial/gtk-tut.sgml @@ -6471,15 +6471,15 @@ the position specified by x and y. position. -void gtk_fixed_set_has_window( GtkFixed *fixed, - gboolean has_window ); +void gtk_widget_set_has_window( GtkWidget *widget, + gboolean has_window ); -gboolean gtk_fixed_get_has_window( GtkFixed *fixed ); +gboolean gtk_widget_get_has_window( GtkWidget *widget ); Normally, Fixed widgets don't have their own X window. Since this is different from the behaviour of Fixed widgets in earlier releases of GTK, -the function gtk_fixed_set_has_window() allows the creation of Fixed widgets +the function gtk_widget_set_has_window() allows the creation of Fixed widgets with their own window. It has to be called before realizing the widget. diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 1422bacb65..6157aa14d7 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -1383,10 +1383,6 @@ gtk_fixed_get_type G_GNUC_CONST gtk_fixed_move gtk_fixed_new gtk_fixed_put -#ifndef GTK_DISABLE_DEPRECATED -gtk_fixed_set_has_window -gtk_fixed_get_has_window -#endif #endif #endif diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c index 3106e1f000..9a0d67f0ee 100644 --- a/gtk/gtkfixed.c +++ b/gtk/gtkfixed.c @@ -453,53 +453,5 @@ gtk_fixed_forall (GtkContainer *container, } } -/** - * gtk_fixed_set_has_window: - * @fixed: a #GtkFixed - * @has_window: %TRUE if a separate window should be created - * - * Sets whether a #GtkFixed widget is created with a separate - * #GdkWindow for @widget->window or not. (By default, it will be - * created with no separate #GdkWindow). This function must be called - * while the #GtkFixed is not realized, for instance, immediately after the - * window is created. - * - * This function was added to provide an easy migration path for - * older applications which may expect #GtkFixed to have a separate window. - * - * Deprecated: 2.20: Use gtk_widget_set_has_window() instead. - **/ -void -gtk_fixed_set_has_window (GtkFixed *fixed, - gboolean has_window) -{ - g_return_if_fail (GTK_IS_FIXED (fixed)); - g_return_if_fail (!gtk_widget_get_realized (GTK_WIDGET (fixed))); - - if (has_window != gtk_widget_get_has_window (GTK_WIDGET (fixed))) - { - gtk_widget_set_has_window (GTK_WIDGET (fixed), has_window); - } -} - -/** - * gtk_fixed_get_has_window: - * @fixed: a #GtkWidget - * - * Gets whether the #GtkFixed has its own #GdkWindow. - * See gtk_fixed_set_has_window(). - * - * Return value: %TRUE if @fixed has its own window. - * - * Deprecated: 2.20: Use gtk_widget_get_has_window() instead. - **/ -gboolean -gtk_fixed_get_has_window (GtkFixed *fixed) -{ - g_return_val_if_fail (GTK_IS_FIXED (fixed), FALSE); - - return gtk_widget_get_has_window (GTK_WIDGET (fixed)); -} - #define __GTK_FIXED_C__ #include "gtkaliasdef.c" diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h index b69fb33395..7f2fa96003 100644 --- a/gtk/gtkfixed.h +++ b/gtk/gtkfixed.h @@ -79,11 +79,7 @@ void gtk_fixed_move (GtkFixed *fixed, GtkWidget *widget, gint x, gint y); -#ifndef GTK_DISABLE_DEPRECATED -void gtk_fixed_set_has_window (GtkFixed *fixed, - gboolean has_window); -gboolean gtk_fixed_get_has_window (GtkFixed *fixed); -#endif + G_END_DECLS