AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

layout: Remove deprecated API

Browse Source
This commit is contained in:
Rico Tzschichholz 2016-10-23 12:38:31 +02:00
parent 5c5f8f4672
commit d69f657aec
3 changed files with 6 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/reference/gtk/gtk4-sections.txt
View File

@ -1858,10 +1858,6 @@ gtk_layout_put
gtk_layout_move
gtk_layout_set_size
gtk_layout_get_size
gtk_layout_get_hadjustment
gtk_layout_get_vadjustment
gtk_layout_set_hadjustment
gtk_layout_set_vadjustment
gtk_layout_get_bin_window
<SUBSECTION Standard>
GTK_LAYOUT

99
gtk/gtklayout.c
View File

@ -210,51 +210,6 @@ gtk_layout_get_bin_window (GtkLayout *layout)
return layout->priv->bin_window;
}
/**
* gtk_layout_get_hadjustment:
* @layout: a #GtkLayout
*
* This function should only be called after the layout has been
* placed in a #GtkScrolledWindow or otherwise configured for
* scrolling. It returns the #GtkAdjustment used for communication
* between the horizontal scrollbar and @layout.
*
* See #GtkScrolledWindow, #GtkScrollbar, #GtkAdjustment for details.
*
* Returns: (transfer none): horizontal scroll adjustment
*
* Deprecated: 3.0: Use gtk_scrollable_get_hadjustment()
**/
GtkAdjustment*
gtk_layout_get_hadjustment (GtkLayout *layout)
{
g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
return layout->priv->hadjustment;
}
/**
* gtk_layout_get_vadjustment:
* @layout: a #GtkLayout
*
* This function should only be called after the layout has been
* placed in a #GtkScrolledWindow or otherwise configured for
* scrolling. It returns the #GtkAdjustment used for communication
* between the vertical scrollbar and @layout.
*
* See #GtkScrolledWindow, #GtkScrollbar, #GtkAdjustment for details.
*
* Returns: (transfer none): vertical scroll adjustment
*
* Deprecated: 3.0: Use gtk_scrollable_get_vadjustment()
**/
GtkAdjustment*
gtk_layout_get_vadjustment (GtkLayout *layout)
{
g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
return layout->priv->vadjustment;
}
static void
gtk_layout_set_hadjustment_values (GtkLayout *layout)
{
@ -323,8 +278,8 @@ gtk_layout_finalize (GObject *object)
}
static void
gtk_layout_do_set_hadjustment (GtkLayout *layout,
GtkAdjustment *adjustment)
gtk_layout_set_hadjustment (GtkLayout *layout,
GtkAdjustment *adjustment)
{
GtkLayoutPrivate *priv;
@ -352,30 +307,9 @@ gtk_layout_do_set_hadjustment (GtkLayout *layout,
g_object_notify (G_OBJECT (layout), "hadjustment");
}
/**
* gtk_layout_set_hadjustment:
* @layout: a #GtkLayout
* @adjustment: (allow-none): new scroll adjustment
*
* Sets the horizontal scroll adjustment for the layout.
*
* See #GtkScrolledWindow, #GtkScrollbar, #GtkAdjustment for details.
*
* Deprecated: 3.0: Use gtk_scrollable_set_hadjustment()
**/
void
gtk_layout_set_hadjustment (GtkLayout *layout,
GtkAdjustment *adjustment)
{
g_return_if_fail (GTK_IS_LAYOUT (layout));
g_return_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment));
gtk_layout_do_set_hadjustment (layout, adjustment);
}
static void
gtk_layout_do_set_vadjustment (GtkLayout *layout,
GtkAdjustment *adjustment)
gtk_layout_set_vadjustment (GtkLayout *layout,
GtkAdjustment *adjustment)
{
GtkLayoutPrivate *priv;
@ -403,27 +337,6 @@ gtk_layout_do_set_vadjustment (GtkLayout *layout,
g_object_notify (G_OBJECT (layout), "vadjustment");
}
/**
* gtk_layout_set_vadjustment:
* @layout: a #GtkLayout
* @adjustment: (allow-none): new scroll adjustment
*
* Sets the vertical scroll adjustment for the layout.
*
* See #GtkScrolledWindow, #GtkScrollbar, #GtkAdjustment for details.
*
* Deprecated: 3.0: Use gtk_scrollable_set_vadjustment()
**/
void
gtk_layout_set_vadjustment (GtkLayout *layout,
GtkAdjustment *adjustment)
{
g_return_if_fail (GTK_IS_LAYOUT (layout));
g_return_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment));
gtk_layout_do_set_vadjustment (layout, adjustment);
}
static GtkLayoutChild*
get_child (GtkLayout *layout,
GtkWidget *widget)
@ -744,10 +657,10 @@ gtk_layout_set_property (GObject *object,
switch (prop_id)
{
case PROP_HADJUSTMENT:
gtk_layout_do_set_hadjustment (layout, g_value_get_object (value));
gtk_layout_set_hadjustment (layout, g_value_get_object (value));
break;
case PROP_VADJUSTMENT:
gtk_layout_do_set_vadjustment (layout, g_value_get_object (value));
gtk_layout_set_vadjustment (layout, g_value_get_object (value));
break;
case PROP_HSCROLL_POLICY:
if (priv->hscroll_policy != g_value_get_enum (value))

12
gtk/gtklayout.h
View File

@ -98,18 +98,6 @@ void gtk_layout_get_size (GtkLayout *layout,
guint *width,
guint *height);
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_hadjustment)
GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout *layout);
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_vadjustment)
GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout *layout);
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_hadjustment)
void gtk_layout_set_hadjustment (GtkLayout *layout,
GtkAdjustment *adjustment);
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_vadjustment)
void gtk_layout_set_vadjustment (GtkLayout *layout,
GtkAdjustment *adjustment);
G_END_DECLS
#endif /* __GTK_LAYOUT_H__ */