diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-07-03 21:21:25 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-07-03 21:21:25 +0000 |
| commit | 50b1a5a9dc04af7ebdeeea29552d435fed0328d1 (patch) | |
| tree | f461370f16e906edafc3c404dbcba1bb83e6c180 /gtk | |
| parent | 01212ce1709bc85d03576969c45397cf20c3dcc1 (diff) | |
| download | gtk+-50b1a5a9dc04af7ebdeeea29552d435fed0328d1.tar.gz | |
Use g_get_charset() instead of g_get_codeset().
Mon Jul 3 17:08:14 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):
Use g_get_charset() instead of g_get_codeset().
* gtk/gtkframe.[ch] gtkframe.h gtk/gtktextmark.h:
Comment out some strdup'ing functions to keep timj
happy until we finish fighting this out.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkframe.c | 6 | ||||
| -rw-r--r-- | gtk/gtkframe.h | 3 | ||||
| -rw-r--r-- | gtk/gtklabel.h | 2 | ||||
| -rw-r--r-- | gtk/gtktextmark.h | 3 |
4 files changed, 11 insertions, 3 deletions
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index f063b9356b..55e491f250 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -72,6 +72,12 @@ static void gtk_frame_real_compute_child_allocation (GtkFrame *frame, static GtkBinClass *parent_class = NULL; +/* Here until I convince timj about memory management behavior + */ +gchar * gtk_frame_get_label (GtkFrame *frame); +gchar * gtk_label_get_text (GtkLabel *label); + + GtkType gtk_frame_get_type (void) { diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h index caeb47bd51..ee0122c163 100644 --- a/gtk/gtkframe.h +++ b/gtk/gtkframe.h @@ -72,7 +72,8 @@ GtkType gtk_frame_get_type (void); GtkWidget* gtk_frame_new (const gchar *label); void gtk_frame_set_label (GtkFrame *frame, const gchar *label); -gchar * gtk_frame_get_label (GtkFrame *frame); +/* Temporarily commented out until memory management behavior is figured out */ +/* gchar * gtk_frame_get_label (GtkFrame *frame); */ void gtk_frame_set_label_widget (GtkFrame *frame, GtkWidget *title_widget); void gtk_frame_set_label_align (GtkFrame *frame, diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index e6cf87a441..e85703a0da 100644 --- a/gtk/gtklabel.h +++ b/gtk/gtklabel.h @@ -72,7 +72,7 @@ GtkType gtk_label_get_type (void); GtkWidget *gtk_label_new (const char *str); void gtk_label_set_text (GtkLabel *label, const char *str); -gchar * gtk_label_get_text (GtkLabel *label); +/* Temporarily commented out until memory management behavior is figured out *//* gchar * gtk_label_get_text (GtkLabel *label); */ void gtk_label_set_justify (GtkLabel *label, GtkJustification jtype); void gtk_label_set_pattern (GtkLabel *label, diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h index 0fa2f0dd52..9079e11e4b 100644 --- a/gtk/gtktextmark.h +++ b/gtk/gtktextmark.h @@ -13,7 +13,8 @@ void gtk_text_mark_set_visible (GtkTextMark *mark, gboolean setting); gboolean gtk_text_mark_is_visible (GtkTextMark *mark); -char * gtk_text_mark_get_name (GtkTextMark *mark); +/* Temporarily commented out until memory management behavior is figured out */ +/* char * gtk_text_mark_get_name (GtkTextMark *mark); */ #ifdef __cplusplus } |