diff options
| author | Manish Singh <yosh@gimp.org> | 2002-11-17 22:04:03 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 2002-11-17 22:04:03 +0000 |
| commit | 89fd6ad3de860129877c65a95b68ba6a6c503706 (patch) | |
| tree | 0ab6fea0e35535806a748d3b76bb94f3fbcad5f5 /gdk/gdkfont.h | |
| parent | 1d2c2268be0179b534e390e954a173c553ff091a (diff) | |
| download | gtk+-89fd6ad3de860129877c65a95b68ba6a6c503706.tar.gz | |
add -DGDK_DISABLE_DEPRECATED
Sun Nov 17 13:45:08 2002 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am: add -DGDK_DISABLE_DEPRECATED
* gdk/gdk.c (gdk_exit): remove obsolete comment
* gdk/gdk.h: declare gdk_input_add_full if GTK_COMPILATION for
gtk_input_add_full
* gdk/gdkcolor.c (gdk_color_white, gdk_color_black): use
gdk_colormap_alloc_color instead of gdk_color_alloc
* gdk/gdkcolor.h: declare gdk_colormap_change if GDK_COMPILATION for
gdk_colors_store. Also, gdk_colors_{alloc,free} for
gdk_rgb_try_colormap
* gdk/gdkdrawable.h: declare gdk_draw_string if GTK_COMPILATION for
gtk_default_draw_string. Also, gdk_draw_text and gdk_draw_text_wc
if GDK_COMPILATION for the respective gdk_window_ and gdk_pixmap_
functions.
* gdk/gdkfont.c: #undef GDK_DISABLE_DEPRECATED, completely compat
code here
* gdk/gdkfont.h: allow the GdkFont structure and a few gdk_font_
functions for compat code in GDK_COMPILATION and GTK_COMPILATION.
* gdk/gdkrgb.c (gdk_rgb_cmap_fail, gdk_rgb_try_colormap): use
gdk_colormap_free_colors instead of gdk_colors_free.
* gdk/gdkrgb.c (gdk_draw_rgb_image_core): no need to set fg/bg
for own_gc, unused.
* gdk/gdkwindow.h: declare gdk_window_get_deskrelative_origin if
GTK_COMPILATION for gtk_handle_box_button_changed.
* gdk/x11/Makefile.am: add -DGDK_DISABLE_DEPRECATED, renmae
-DINSIDE_GDK_X11 to -DGDK_COMPILATION
* gdk/x11/gdkcolor-x11.c: remove duplicate doc string for
gdk_colormap_alloc_colors.
* gdk/x11/gdkfont-x11.c: #undef GDK_DISABLE_DEPRECATED, completely
compat code here
* gdk/x11/gdkx.h: use GDK_COMPILATION instead of INSIDE_GDK_X11,
allow a few gdk_x11_font_ functions if GDK_COMPILATION for compat
code
* gtk/Makefile.am: add -DGDK_DISABLE_DEPRECATED
* gtk/gtkclist.c
* gtk/gtkctree.c
* gtk/gtkpixmap.c
* gtk/gtkpreview.c
* gtk/gtktext.c: #undef GDK_DISABLE_DEPRECATED, deprecated widget
* gtk/gtkhandlebox.c (gtk_handle_box_motion): use
gdk_window_set_geometry_hints instead of gdk_window_set_hints.
* gtk/gtkmain.c (gtk_exit): call exit directly
* gtktipsquery.c (gtk_tips_query_real_start_query)
* gtk/gtktreeitem.c (gtk_tree_item_add_pixmaps): remove some
deprecated GDK usage.
Diffstat (limited to 'gdk/gdkfont.h')
| -rw-r--r-- | gdk/gdkfont.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/gdk/gdkfont.h b/gdk/gdkfont.h index 5ff42873e4..32d66e9d63 100644 --- a/gdk/gdkfont.h +++ b/gdk/gdkfont.h @@ -1,4 +1,4 @@ -#ifndef GDK_DISABLE_DEPRECATED +#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION) || defined(GTK_COMPILATION) #ifndef __GDK_FONT_H__ #define __GDK_FONT_H__ @@ -31,11 +31,11 @@ struct _GdkFont GType gdk_font_get_type (void); -#ifndef GDK_MULTIHEAD_SAFE -GdkFont* gdk_font_load (const gchar *font_name); -GdkFont* gdk_fontset_load (const gchar *fontset_name); -GdkFont* gdk_font_from_description (PangoFontDescription *font_desc); -#endif +GdkFont* gdk_font_ref (GdkFont *font); +void gdk_font_unref (GdkFont *font); +gint gdk_font_id (const GdkFont *font); +gboolean gdk_font_equal (const GdkFont *fonta, + const GdkFont *fontb); GdkFont *gdk_font_load_for_display (GdkDisplay *display, const gchar *font_name); @@ -44,11 +44,13 @@ GdkFont *gdk_fontset_load_for_display (GdkDisplay *display, GdkFont *gdk_font_from_description_for_display (GdkDisplay *display, PangoFontDescription *font_desc); -GdkFont* gdk_font_ref (GdkFont *font); -void gdk_font_unref (GdkFont *font); -gint gdk_font_id (const GdkFont *font); -gboolean gdk_font_equal (const GdkFont *fonta, - const GdkFont *fontb); +#ifndef GDK_DISABLE_DEPRECATED + +#ifndef GDK_MULTIHEAD_SAFE +GdkFont* gdk_font_load (const gchar *font_name); +GdkFont* gdk_fontset_load (const gchar *fontset_name); +GdkFont* gdk_font_from_description (PangoFontDescription *font_desc); +#endif gint gdk_string_width (GdkFont *font, const gchar *string); @@ -103,10 +105,12 @@ void gdk_string_extents (GdkFont *font, GdkDisplay * gdk_font_get_display (GdkFont *font); +#endif /* GDK_DISABLE_DEPRECATED */ + #ifdef __cplusplus } #endif /* __cplusplus */ #endif /* __GDK_FONT_H__ */ -#endif /* GDK_DISABLE_DEPRECATED */ +#endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION || GTK_COMPILATION */ |