Remove deprecated code from GdkGc
This commit is contained in:
committed by
Javier Jardón
parent
b9b8efc528
commit
134690ed8f
@ -522,16 +522,12 @@ GdkFunction
|
|||||||
gdk_gc_new
|
gdk_gc_new
|
||||||
gdk_gc_new_with_values
|
gdk_gc_new_with_values
|
||||||
gdk_gc_get_screen
|
gdk_gc_get_screen
|
||||||
gdk_gc_ref
|
|
||||||
gdk_gc_unref
|
|
||||||
gdk_gc_destroy
|
|
||||||
gdk_gc_set_values
|
gdk_gc_set_values
|
||||||
gdk_gc_get_values
|
gdk_gc_get_values
|
||||||
gdk_gc_set_foreground
|
gdk_gc_set_foreground
|
||||||
gdk_gc_set_background
|
gdk_gc_set_background
|
||||||
gdk_gc_set_rgb_fg_color
|
gdk_gc_set_rgb_fg_color
|
||||||
gdk_gc_set_rgb_bg_color
|
gdk_gc_set_rgb_bg_color
|
||||||
gdk_gc_set_font
|
|
||||||
gdk_gc_set_function
|
gdk_gc_set_function
|
||||||
gdk_gc_set_fill
|
gdk_gc_set_fill
|
||||||
GdkFill
|
GdkFill
|
||||||
|
|||||||
@ -148,33 +148,6 @@ useful. For bitmaps, %GDK_AND and %GDK_OR are also useful.
|
|||||||
@Returns:
|
@Returns:
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gdk_gc_ref ##### -->
|
|
||||||
<para>
|
|
||||||
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@gc:
|
|
||||||
@Returns:
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gdk_gc_unref ##### -->
|
|
||||||
<para>
|
|
||||||
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@gc:
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### MACRO gdk_gc_destroy ##### -->
|
|
||||||
<para>
|
|
||||||
This function is obsolete and should not be used.
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@Deprecated: Use g_object_unref() instead
|
|
||||||
<!-- # Unused Parameters # -->
|
|
||||||
@gc: a #GdkGC.
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gdk_gc_set_values ##### -->
|
<!-- ##### FUNCTION gdk_gc_set_values ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
@ -230,15 +203,6 @@ This function is obsolete and should not be used.
|
|||||||
@color:
|
@color:
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gdk_gc_set_font ##### -->
|
|
||||||
<para>
|
|
||||||
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@gc:
|
|
||||||
@font:
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gdk_gc_set_function ##### -->
|
<!-- ##### FUNCTION gdk_gc_set_function ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
|
|||||||
@ -588,11 +588,6 @@ gdk_draw_layout_with_colors
|
|||||||
gdk_gc_new
|
gdk_gc_new
|
||||||
gdk_gc_get_type G_GNUC_CONST
|
gdk_gc_get_type G_GNUC_CONST
|
||||||
gdk_gc_new_with_values
|
gdk_gc_new_with_values
|
||||||
#ifndef GDK_DISABLE_DEPRECATED
|
|
||||||
gdk_gc_ref
|
|
||||||
gdk_gc_unref
|
|
||||||
gdk_gc_set_font
|
|
||||||
#endif
|
|
||||||
gdk_gc_get_values
|
gdk_gc_get_values
|
||||||
gdk_gc_set_values
|
gdk_gc_set_values
|
||||||
gdk_gc_set_foreground
|
gdk_gc_set_foreground
|
||||||
|
|||||||
53
gdk/gdkgc.c
53
gdk/gdkgc.c
@ -222,36 +222,6 @@ gdk_gc_finalize (GObject *object)
|
|||||||
G_OBJECT_CLASS (gdk_gc_parent_class)->finalize (object);
|
G_OBJECT_CLASS (gdk_gc_parent_class)->finalize (object);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* gdk_gc_ref:
|
|
||||||
* @gc: a #GdkGC
|
|
||||||
*
|
|
||||||
* Deprecated function; use g_object_ref() instead.
|
|
||||||
*
|
|
||||||
* Return value: the gc.
|
|
||||||
*
|
|
||||||
* Deprecated: 2.0: Use g_object_ref() instead.
|
|
||||||
**/
|
|
||||||
GdkGC *
|
|
||||||
gdk_gc_ref (GdkGC *gc)
|
|
||||||
{
|
|
||||||
return (GdkGC *) g_object_ref (gc);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* gdk_gc_unref:
|
|
||||||
* @gc: a #GdkGC
|
|
||||||
*
|
|
||||||
* Decrement the reference count of @gc.
|
|
||||||
*
|
|
||||||
* Deprecated: 2.0: Use g_object_unref() instead.
|
|
||||||
**/
|
|
||||||
void
|
|
||||||
gdk_gc_unref (GdkGC *gc)
|
|
||||||
{
|
|
||||||
g_object_unref (gc);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gdk_gc_get_values:
|
* gdk_gc_get_values:
|
||||||
* @gc: a #GdkGC.
|
* @gc: a #GdkGC.
|
||||||
@ -409,29 +379,6 @@ gdk_gc_set_background (GdkGC *gc,
|
|||||||
gdk_gc_set_values (gc, &values, GDK_GC_BACKGROUND);
|
gdk_gc_set_values (gc, &values, GDK_GC_BACKGROUND);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* gdk_gc_set_font:
|
|
||||||
* @gc: a #GdkGC.
|
|
||||||
* @font: the new font.
|
|
||||||
*
|
|
||||||
* Sets the font for a graphics context. (Note that
|
|
||||||
* all text-drawing functions in GDK take a @font
|
|
||||||
* argument; the value set here is used when that
|
|
||||||
* argument is %NULL.)
|
|
||||||
**/
|
|
||||||
void
|
|
||||||
gdk_gc_set_font (GdkGC *gc,
|
|
||||||
GdkFont *font)
|
|
||||||
{
|
|
||||||
GdkGCValues values;
|
|
||||||
|
|
||||||
g_return_if_fail (GDK_IS_GC (gc));
|
|
||||||
g_return_if_fail (font != NULL);
|
|
||||||
|
|
||||||
values.font = font;
|
|
||||||
gdk_gc_set_values (gc, &values, GDK_GC_FONT);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gdk_gc_set_function:
|
* gdk_gc_set_function:
|
||||||
* @gc: a #GdkGC.
|
* @gc: a #GdkGC.
|
||||||
|
|||||||
12
gdk/gdkgc.h
12
gdk/gdkgc.h
@ -226,11 +226,6 @@ GdkGC *gdk_gc_new_with_values (GdkDrawable *drawable,
|
|||||||
GdkGCValues *values,
|
GdkGCValues *values,
|
||||||
GdkGCValuesMask values_mask);
|
GdkGCValuesMask values_mask);
|
||||||
|
|
||||||
#ifndef GDK_DISABLE_DEPRECATED
|
|
||||||
GdkGC *gdk_gc_ref (GdkGC *gc);
|
|
||||||
void gdk_gc_unref (GdkGC *gc);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void gdk_gc_get_values (GdkGC *gc,
|
void gdk_gc_get_values (GdkGC *gc,
|
||||||
GdkGCValues *values);
|
GdkGCValues *values);
|
||||||
void gdk_gc_set_values (GdkGC *gc,
|
void gdk_gc_set_values (GdkGC *gc,
|
||||||
@ -240,10 +235,6 @@ void gdk_gc_set_foreground (GdkGC *gc,
|
|||||||
const GdkColor *color);
|
const GdkColor *color);
|
||||||
void gdk_gc_set_background (GdkGC *gc,
|
void gdk_gc_set_background (GdkGC *gc,
|
||||||
const GdkColor *color);
|
const GdkColor *color);
|
||||||
#ifndef GDK_DISABLE_DEPRECATED
|
|
||||||
void gdk_gc_set_font (GdkGC *gc,
|
|
||||||
GdkFont *font);
|
|
||||||
#endif /* GDK_DISABLE_DEPRECATED */
|
|
||||||
void gdk_gc_set_function (GdkGC *gc,
|
void gdk_gc_set_function (GdkGC *gc,
|
||||||
GdkFunction function);
|
GdkFunction function);
|
||||||
void gdk_gc_set_fill (GdkGC *gc,
|
void gdk_gc_set_fill (GdkGC *gc,
|
||||||
@ -293,9 +284,6 @@ void gdk_gc_set_rgb_bg_color (GdkGC *gc,
|
|||||||
const GdkColor *color);
|
const GdkColor *color);
|
||||||
GdkScreen * gdk_gc_get_screen (GdkGC *gc);
|
GdkScreen * gdk_gc_get_screen (GdkGC *gc);
|
||||||
|
|
||||||
#ifndef GDK_DISABLE_DEPRECATED
|
|
||||||
#define gdk_gc_destroy g_object_unref
|
|
||||||
#endif /* GDK_DISABLE_DEPRECATED */
|
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user