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

Remove deprecated GtkWidget functions

Browse Source
This commit is contained in:
Javier Jardón 2009-10-08 17:52:34 +02:00 committed by Javier Jardón
parent 2b71ef33fb
commit 0d322676dc
2 changed files with 0 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
gtk/gtkwidget.c
View File

@ -3756,39 +3756,6 @@ gtk_widget_queue_resize_no_redraw (GtkWidget *widget)
_gtk_size_group_queue_resize (widget);
}
/**
* gtk_widget_draw:
* @widget: a #GtkWidget
* @area: area to draw
*
* In GTK+ 1.2, this function would immediately render the
* region @area of a widget, by invoking the virtual draw method of a
* widget. In GTK+ 2.0, the draw method is gone, and instead
* gtk_widget_draw() simply invalidates the specified region of the
* widget, then updates the invalid region of the widget immediately.
* Usually you don't want to update the region immediately for
* performance reasons, so in general gtk_widget_queue_draw_area() is
* a better choice if you want to draw a region of a widget.
**/
void
gtk_widget_draw (GtkWidget *widget,
const GdkRectangle *area)
{
g_return_if_fail (GTK_IS_WIDGET (widget));
if (gtk_widget_is_drawable (widget))
{
if (area)
gtk_widget_queue_draw_area (widget,
area->x, area->y,
area->width, area->height);
else
gtk_widget_queue_draw (widget);
gdk_window_process_updates (widget->window, TRUE);
}
}
/**
* gtk_widget_size_request:
* @widget: a #GtkWidget
@ -7774,76 +7741,6 @@ gtk_widget_error_bell (GtkWidget *widget)
gdk_window_beep (widget->window);
}
/**
* gtk_widget_set_uposition:
* @widget: a #GtkWidget
* @x: x position; -1 to unset x; -2 to leave x unchanged
* @y: y position; -1 to unset y; -2 to leave y unchanged
*
*
* Sets the position of a widget. The funny "u" in the name comes from
* the "user position" hint specified by the X Window System, and
* exists for legacy reasons. This function doesn't work if a widget
* is inside a container; it's only really useful on #GtkWindow.
*
* Don't use this function to center dialogs over the main application
* window; most window managers will do the centering on your behalf
* if you call gtk_window_set_transient_for(), and it's really not
* possible to get the centering to work correctly in all cases from
* application code. But if you insist, use gtk_window_set_position()
* to set #GTK_WIN_POS_CENTER_ON_PARENT, don't do the centering
* manually.
*
* Note that although @x and @y can be individually unset, the position
* is not honoured unless both @x and @y are set.
**/
void
gtk_widget_set_uposition (GtkWidget *widget,
gint x,
gint y)
{
/* FIXME this function is the only place that aux_info->x and
* aux_info->y are even used I believe, and this function is
* deprecated. Should be cleaned up.
*
* (Actually, size_allocate uses them) -Yosh
*/
GtkWidgetAuxInfo *aux_info;
g_return_if_fail (GTK_IS_WIDGET (widget));
aux_info =_gtk_widget_get_aux_info (widget, TRUE);
if (x > -2)
{
if (x == -1)
aux_info->x_set = FALSE;
else
{
aux_info->x_set = TRUE;
aux_info->x = x;
}
}
if (y > -2)
{
if (y == -1)
aux_info->y_set = FALSE;
else
{
aux_info->y_set = TRUE;
aux_info->y = y;
}
}
if (GTK_IS_WINDOW (widget) && aux_info->x_set && aux_info->y_set)
_gtk_window_reposition (GTK_WINDOW (widget), aux_info->x, aux_info->y);
if (gtk_widget_get_visible (widget) && widget->parent)
gtk_widget_size_allocate (widget, &widget->allocation);
}
static void
gtk_widget_set_usize_internal (GtkWidget *widget,
gint width,

69
gtk/gtkwidget.h
View File

@ -860,10 +860,6 @@ void gtk_widget_queue_draw_area (GtkWidget *widget,
gint height);
void gtk_widget_queue_resize (GtkWidget *widget);
void gtk_widget_queue_resize_no_redraw (GtkWidget *widget);
#ifndef GTK_DISABLE_DEPRECATED
void gtk_widget_draw (GtkWidget *widget,
const GdkRectangle *area);
#endif /* GTK_DISABLE_DEPRECATED */
void gtk_widget_size_request (GtkWidget *widget,
GtkRequisition *requisition);
void gtk_widget_size_allocate (GtkWidget *widget,
@ -1011,12 +1007,6 @@ void gtk_widget_set_size_request (GtkWidget *widget,
void gtk_widget_get_size_request (GtkWidget *widget,
gint *width,
gint *height);
#ifndef GTK_DISABLE_DEPRECATED
void gtk_widget_set_uposition (GtkWidget *widget,
gint x,
gint y);
#endif
void gtk_widget_set_events (GtkWidget *widget,
gint events);
void gtk_widget_add_events (GtkWidget *widget,
@ -1041,42 +1031,6 @@ GtkClipboard *gtk_widget_get_clipboard (GtkWidget *widget,
GdkPixmap * gtk_widget_get_snapshot (GtkWidget *widget,
GdkRectangle *clip_rect);
#ifndef GTK_DISABLE_DEPRECATED
/**
* gtk_widget_set_visual:
* @widget: a #GtkWidget
* @visual: a visual
*
* This function is deprecated; it does nothing.
*/
#define gtk_widget_set_visual(widget,visual) ((void) 0)
/**
* gtk_widget_push_visual:
* @visual: a visual
*
* This function is deprecated; it does nothing.
*/
#define gtk_widget_push_visual(visual) ((void) 0)
/**
* gtk_widget_pop_visual:
*
* This function is deprecated; it does nothing.
*/
#define gtk_widget_pop_visual() ((void) 0)
/**
* gtk_widget_set_default_visual:
* @visual: a visual
*
* This function is deprecated; it does nothing.
*/
#define gtk_widget_set_default_visual(visual) ((void) 0)
#endif /* GTK_DISABLE_DEPRECATED */
/* Accessibility support */
AtkObject* gtk_widget_get_accessible (GtkWidget *widget);
@ -1142,29 +1096,6 @@ void gtk_widget_modify_symbolic_color (GtkWidget *widget,
const gchar *name,
const GdkColor *color);
#ifndef GTK_DISABLE_DEPRECATED
/**
* gtk_widget_set_rc_style:
* @widget: a #GtkWidget.
*
* Equivalent to <literal>gtk_widget_set_style (widget, NULL)</literal>.
*
* Deprecated: 2.0: Use gtk_widget_set_style() with a %NULL @style argument instead.
*/
#define gtk_widget_set_rc_style(widget) (gtk_widget_set_style (widget, NULL))
/**
* gtk_widget_restore_default_style:
* @widget: a #GtkWidget.
*
* Equivalent to <literal>gtk_widget_set_style (widget, NULL)</literal>.
*
* Deprecated: 2.0: Use gtk_widget_set_style() with a %NULL @style argument instead.
*/
#define gtk_widget_restore_default_style(widget) (gtk_widget_set_style (widget, NULL))
#endif
PangoContext *gtk_widget_create_pango_context (GtkWidget *widget);
PangoContext *gtk_widget_get_pango_context (GtkWidget *widget);
PangoLayout *gtk_widget_create_pango_layout (GtkWidget *widget,