diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-10-23 16:02:23 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-10-23 16:02:23 +0000 |
| commit | 4e32ede28751a90f747ccd0a7144bd10aa613a36 (patch) | |
| tree | 29f2e22d6a8c302ccc3f6a420316f49754f9394f /gtk/gtkfontsel.h | |
| parent | 0d5635b36613c0e5eca772e223001d1858433c28 (diff) | |
| download | gdk-pixbuf-4e32ede28751a90f747ccd0a7144bd10aa613a36.tar.gz | |
Remove G_DISABLE_CONST_RETURNS.
Tue Oct 23 11:53:00 2001 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am (INCLUDES): Remove G_DISABLE_CONST_RETURNS.
* gtk/gtkfontsel.[ch]: Make gtk_font_selection_get_font()
G_CONST_RETURN. (Murray Cumming)
* gtk/gtkfontsel.c (gtk_font_selection_dialog_get_preview_text):
Make G_CONST_RETURN.
* gtk/gtkfilesel.c (open_user_dir): Fix bug with freeing
results of g_get_home_dir().
* gtk/gtkfilesel.c: Make filesel->fileop_file a duplicated
copy. Storing the return from gtk_entry_get_text() is evil.
* gtk/gtkcombo.c gtk/gtkcellrenderertext.c gtk/gtkbindings.c
gtk/gtkfilesel.c gtk/gtkfontsel.c gtk/gtkimmodule.c
gtk/gtkobject.c gtk/gtkoldeditable.c gtk/gtktreedatalist.c
gtk/gtksignal.c: Add const.
* gdk/x11/gdkkeys-x11.c (get_direction): Add missing const.
* gtk/gtktreeview.c: Namespace object data keys to be safe, even
if we are setting them on private widgets.
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
Duplicate entry->text before setting it as object data.
Diffstat (limited to 'gtk/gtkfontsel.h')
| -rw-r--r-- | gtk/gtkfontsel.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h index 5d8eb8214..e6a20cfe0 100644 --- a/gtk/gtkfontsel.h +++ b/gtk/gtkfontsel.h @@ -135,13 +135,11 @@ gchar* gtk_font_selection_get_font_name (GtkFontSelection *fontsel); 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); -void gtk_font_selection_set_preview_text (GtkFontSelection *fontsel, - const gchar *text); - - +gboolean gtk_font_selection_set_font_name (GtkFontSelection *fontsel, + const gchar *fontname); +G_CONST_RETURN gchar* gtk_font_selection_get_preview_text (GtkFontSelection *fontsel); +void gtk_font_selection_set_preview_text (GtkFontSelection *fontsel, + const gchar *text); /***************************************************************************** * GtkFontSelectionDialog functions. @@ -175,7 +173,7 @@ gboolean gtk_font_selection_dialog_set_font_name (GtkFontSelectionDialog *fsd /* This returns the text in the preview entry. You should copy the returned text if you need it. */ -gchar* gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd); +G_CONST_RETURN gchar* gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd); /* This sets the text in the preview entry. It will be copied by the entry, so there's no need to g_strdup() it first. */ |