summaryrefslogtreecommitdiff
path: root/gtk/gtktext.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2001-03-15 19:02:23 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-03-15 19:02:23 +0000
commit872efdd9a527e472e5f2724138344fdef3839df4 (patch)
tree6bc28e0f5ea0b1108b26a10a42b798e1e3451263 /gtk/gtktext.c
parent549537e6de0601117aa323006d1a9264fad1503d (diff)
downloadgtk+-872efdd9a527e472e5f2724138344fdef3839df4.tar.gz
Delete.
2001-03-14 Havoc Pennington <hp@redhat.com> * gtk/gtkdata.h, gtk/gtkdata.c: Delete. * gtk/gtk.h: remove gtkdata.h * gtk/Makefile.am: remove gtkdata * gtk/gtktext.c (gtk_text_set_adjustments): connect to "destroy" not "disconnect" on the adjustments. * gtk/gtktooltips.h, gtk/gtktooltips.c: derive from GtkObject not GtkData * gtk/gtkadjustment.h, gtk/gtkadjustment.c: derive from GtkObject not GtkData * configure.in: handle case where X render exists, but Pango lacks Xft support. 2001-03-14 Havoc Pennington <hp@redhat.com> * Makefile.am (gdk-pixbuf-marshal.c): Use different temporary file from gdk-pixbuf-marshal.h, fixes parallel makes. 2001-03-14 Havoc Pennington <hp@redhat.com> * gtk/gtk-docs.sgml: remove gtkdata, gtktreemodelsimple * gtk/gtk.types: remove gtk_data_get_type
Diffstat (limited to 'gtk/gtktext.c')
-rw-r--r--gtk/gtktext.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 9a9829b45e..5a8d86f1a1 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -217,9 +217,6 @@ static void gtk_text_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_text_adjustment (GtkAdjustment *adjustment,
GtkText *text);
-static void gtk_text_disconnect (GtkAdjustment *adjustment,
- GtkText *text);
-
static void gtk_text_insert_text (GtkOldEditable *old_editable,
const gchar *new_text,
gint new_text_length,
@@ -239,6 +236,9 @@ static void gtk_text_set_selection (GtkOldEditable *old_editable,
static void gtk_text_real_set_editable (GtkOldEditable *old_editable,
gboolean is_editable);
+static void gtk_text_adjustment_destroyed (GtkAdjustment *adjustment,
+ GtkText *text);
+
/* Event handlers */
static gint gtk_text_expose (GtkWidget *widget,
GdkEventExpose *event);
@@ -844,8 +844,8 @@ gtk_text_set_adjustments (GtkText *text,
gtk_signal_connect (GTK_OBJECT (text->hadj), "value_changed",
(GtkSignalFunc) gtk_text_adjustment,
text);
- gtk_signal_connect (GTK_OBJECT (text->hadj), "disconnect",
- (GtkSignalFunc) gtk_text_disconnect,
+ gtk_signal_connect (GTK_OBJECT (text->hadj), "destroy",
+ (GtkSignalFunc) gtk_text_adjustment_destroyed,
text);
gtk_text_adjustment (hadj, text);
}
@@ -862,8 +862,8 @@ gtk_text_set_adjustments (GtkText *text,
gtk_signal_connect (GTK_OBJECT (text->vadj), "value_changed",
(GtkSignalFunc) gtk_text_adjustment,
text);
- gtk_signal_connect (GTK_OBJECT (text->vadj), "disconnect",
- (GtkSignalFunc) gtk_text_disconnect,
+ gtk_signal_connect (GTK_OBJECT (text->vadj), "destroy",
+ (GtkSignalFunc) gtk_text_adjustment_destroyed,
text);
gtk_text_adjustment (vadj, text);
}
@@ -2194,8 +2194,8 @@ gtk_text_adjustment (GtkAdjustment *adjustment,
}
static void
-gtk_text_disconnect (GtkAdjustment *adjustment,
- GtkText *text)
+gtk_text_adjustment_destroyed (GtkAdjustment *adjustment,
+ GtkText *text)
{
g_return_if_fail (adjustment != NULL);
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));