diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-08-23 23:30:43 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-08-23 23:30:43 +0000 |
| commit | f0f3c6bfd28f66aebd5bf611056849cca647f7f6 (patch) | |
| tree | d7fdecb388cc56973dd0d0677861f177158199e7 /gtk/gtkfontsel.h | |
| parent | 9751c05b33c3c77e48ee9517a54c307e3041af2f (diff) | |
| download | gtk+-f0f3c6bfd28f66aebd5bf611056849cca647f7f6.tar.gz | |
Deprecate gtk_menu_bar_append/prepend/insert, forgot to do this when we
Thu Aug 23 19:10:01 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate
gtk_menu_bar_append/prepend/insert, forgot to do this
when we deprecated gtk_menu_append/prepend/insert.
* gtk/gtkmenu.h (gtk_menu_insert): Add casts to deprecated
compat macros.
* gtk/gtkmenu.c: Fix problem with static gtk_menu_insert() being
renamed by compat macro.
* gtk/gtkfontsel.h: Deprecated gtk_font_selection_get_font(),
gtk_font_selection_dialog_get_font(). (Suggested by
Vitaly Tishkov, #59383)
Diffstat (limited to 'gtk/gtkfontsel.h')
| -rw-r--r-- | gtk/gtkfontsel.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h index a35ebd12fc..aa39d16372 100644 --- a/gtk/gtkfontsel.h +++ b/gtk/gtkfontsel.h @@ -123,7 +123,11 @@ struct _GtkFontSelectionDialogClass GtkType gtk_font_selection_get_type (void) G_GNUC_CONST; GtkWidget* gtk_font_selection_new (void); gchar* gtk_font_selection_get_font_name (GtkFontSelection *fontsel); + +#ifndef GTK_DISABLE_DEPRECATED GdkFont* gtk_font_selection_get_font (GtkFontSelection *fontsel); +#endif /* GTK_DISABLE_DEPRECATED */ + gboolean gtk_font_selection_set_font_name (GtkFontSelection *fontsel, const gchar *fontname); gchar* gtk_font_selection_get_preview_text (GtkFontSelection *fontsel); @@ -148,10 +152,12 @@ GtkWidget* gtk_font_selection_dialog_new (const gchar *title); You should g_free() the returned font name after you're done with it. */ gchar* gtk_font_selection_dialog_get_font_name (GtkFontSelectionDialog *fsd); +#ifndef GTK_DISABLE_DEPRECATED /* This will return the current GdkFont, or NULL if none is selected or there was a problem loading it. Remember to use gdk_font_ref/unref() if you want to use the font (in a style, for example). */ GdkFont* gtk_font_selection_dialog_get_font (GtkFontSelectionDialog *fsd); +#endif /* GTK_DISABLE_DEPRECATED */ /* This sets the currently displayed font. It should be a valid X Logical Font Description font name (anything else will be ignored), e.g. |