GtkData nukage
- From: Havoc Pennington <hp redhat com>
- To: gtk-devel-list gnome org
- Subject: GtkData nukage
- Date: 14 Mar 2001 19:44:32 -0500
Hi,
I asked about this a long time ago with no objections, but I have a
patch now to remove GtkData entirely.
If anyone feels that GtkData is a key piece of functionality, complain
very soon.
Havoc
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/ChangeLog,v
retrieving revision 1.1812
diff -u -u -r1.1812 ChangeLog
--- ChangeLog 2001/03/14 22:03:21 1.1812
+++ ChangeLog 2001/03/15 00:41:48
@@ -1,3 +1,23 @@
+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 HideToshi Tajima <tajima happy sunsoft eng sun com>
* gtk/gtkimmulticontext.c (gtk_im_multicontext_set_cursor_pos):
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gtk+/configure.in,v
retrieving revision 1.198
diff -u -u -r1.198 configure.in
--- configure.in 2001/02/13 04:56:05 1.198
+++ configure.in 2001/03/15 00:41:48
@@ -440,6 +440,12 @@
AC_CHECK_LIB(Xft, XftFontOpen, have_xft=true, :, -lXrender -lXext $X_LIBS $FREETYPE_LIBS)
,:,-lXext $X_LIBS)
+ ## be sure we also have Pango built with xft support
+ if ! $PKG_CONFIG --exists pangoxft ; then
+ have_xft=false
+ AC_MSG_WARN([X render extension found, but Pango lacks Xft support])
+ fi
+
if $have_xft = 'true' ; then
X_LIBS="-lXft -lXrender -lXext $FREETYPE_LIBS $X_LIBS"
AC_DEFINE(HAVE_XFT)
@@ -447,7 +453,7 @@
fi
AC_SUBST(XFT_LIBS)
- AM_CONDITIONAL(HAVE_XFT, $have_xft)
+ AM_CONDITIONAL(HAVE_XFT, $have_xft)
# Check for XIM support.
Index: docs/reference/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/docs/reference/ChangeLog,v
retrieving revision 1.55
diff -u -u -r1.55 ChangeLog
--- docs/reference/ChangeLog 2001/03/08 06:15:15 1.55
+++ docs/reference/ChangeLog 2001/03/15 00:41:51
@@ -1,3 +1,9 @@
+2001-03-14 Havoc Pennington <hp redhat com>
+
+ * gtk/gtk-docs.sgml: remove gtkdata, gtktreemodelsimple
+
+ * gtk/gtk.types: remove gtk_data_get_type
+
Wed Mar 7 23:58:53 2001 Owen Taylor <otaylor redhat com>
* gtk/tmpl/gtkwidget.sgml: Document ::hierarchy-changed.
Index: docs/reference/gdk-pixbuf/gdk-pixbuf.hierarchy
===================================================================
RCS file: /cvs/gnome/gtk+/docs/reference/gdk-pixbuf/gdk-pixbuf.hierarchy,v
retrieving revision 1.3
diff -u -u -r1.3 gdk-pixbuf.hierarchy
--- docs/reference/gdk-pixbuf/gdk-pixbuf.hierarchy 2001/03/07 21:10:41 1.3
+++ docs/reference/gdk-pixbuf/gdk-pixbuf.hierarchy 2001/03/15 00:41:51
@@ -1,2 +1,7 @@
GObject
+ GdkDrawable
+ GdkWindow
+ GdkDrawableImplX11
+ GdkWindowImplX11
+ GdkColormap
GdkPixbufLoader
Index: docs/reference/gtk/gtk-docs.sgml
===================================================================
RCS file: /cvs/gnome/gtk+/docs/reference/gtk/gtk-docs.sgml,v
retrieving revision 1.13
diff -u -u -r1.13 gtk-docs.sgml
--- docs/reference/gtk/gtk-docs.sgml 2001/02/09 06:14:34 1.13
+++ docs/reference/gtk/gtk-docs.sgml 2001/03/15 00:41:51
@@ -19,7 +19,6 @@
<!entity GtkContainer SYSTEM "sgml/gtkcontainer.sgml">
<!entity GtkCTree SYSTEM "sgml/gtkctree.sgml">
<!entity GtkCurve SYSTEM "sgml/gtkcurve.sgml">
-<!entity GtkData SYSTEM "sgml/gtkdata.sgml">
<!entity GtkDialog SYSTEM "sgml/gtkdialog.sgml">
<!entity GtkDrawingArea SYSTEM "sgml/gtkdrawingarea.sgml">
<!entity gtk-GtkEditable SYSTEM "sgml/gtkeditable.sgml">
@@ -100,7 +99,6 @@
<!entity gtk-GtkTreeStore SYSTEM "sgml/gtktreestore.sgml">
<!entity gtk-GtkTreeViewColumn SYSTEM "sgml/gtktreeviewcolumn.sgml">
<!entity gtk-GtkTreeView SYSTEM "sgml/gtktreeview.sgml">
-<!entity gtk-GtkTreeModelSimple SYSTEM "sgml/gtktreemodelsimple.sgml">
<!entity gtk-GtkCellRenderer SYSTEM "sgml/gtkcellrenderer.sgml">
<!entity gtk-GtkCellRendererPixbuf SYSTEM "sgml/gtkcellrendererpixbuf.sgml">
<!entity gtk-GtkCellRendererText SYSTEM "sgml/gtkcellrenderertext.sgml">
Index: docs/reference/gtk/gtk.hierarchy
===================================================================
RCS file: /cvs/gnome/gtk+/docs/reference/gtk/gtk.hierarchy,v
retrieving revision 1.6
diff -u -u -r1.6 gtk.hierarchy
--- docs/reference/gtk/gtk.hierarchy 2001/03/07 14:49:12 1.6
+++ docs/reference/gtk/gtk.hierarchy 2001/03/15 00:41:51
@@ -96,12 +96,11 @@
GtkPreview
GtkProgress
GtkProgressBar
- GtkData
- GtkAdjustment
- GtkTooltips
+ GtkAdjustment
GtkIMContext
GtkIMMulticontext
GtkItemFactory
+ GtkTooltips
GtkTextBuffer
GtkTextTag
GtkTextTagTable
Index: docs/reference/gtk/gtk.types
===================================================================
RCS file: /cvs/gnome/gtk+/docs/reference/gtk/gtk.types,v
retrieving revision 1.3
diff -u -u -r1.3 gtk.types
--- docs/reference/gtk/gtk.types 2000/11/14 16:36:19 1.3
+++ docs/reference/gtk/gtk.types 2001/03/15 00:41:51
@@ -19,7 +19,6 @@
gtk_container_get_type
gtk_ctree_get_type
gtk_curve_get_type
-gtk_data_get_type
gtk_dialog_get_type
gtk_drawing_area_get_type
gtk_entry_get_type
Index: docs/reference/gtk/tmpl/gtk-unused.sgml
===================================================================
RCS file: /cvs/gnome/gtk+/docs/reference/gtk/tmpl/gtk-unused.sgml,v
retrieving revision 1.22
diff -u -u -r1.22 gtk-unused.sgml
--- docs/reference/gtk/tmpl/gtk-unused.sgml 2001/03/12 18:46:51 1.22
+++ docs/reference/gtk/tmpl/gtk-unused.sgml 2001/03/15 00:41:51
@@ -247,6 +247,20 @@
@a:
+<!-- ##### STRUCT GtkData ##### -->
+<para>
+The #GtkData-struct struct contains no public fields.
+</para>
+
+
+<!-- ##### SIGNAL GtkData::disconnect ##### -->
+<para>
+Emitted to notify any views on the #GtkData object to disconnect from it,
+possibly because the #GtkData object is about to be destroyed.
+</para>
+
+ data: the object which received the signal.
+
<!-- ##### SIGNAL GtkEditable::activate ##### -->
<para>
Indicates that the user has activated the widget
Index: docs/reference/gtk/tmpl/gtkdata.sgml
===================================================================
RCS file: /cvs/gnome/gtk+/docs/reference/gtk/tmpl/gtkdata.sgml,v
retrieving revision 1.2
diff -u -u -r1.2 gtkdata.sgml
--- docs/reference/gtk/tmpl/gtkdata.sgml 1999/09/22 21:30:57 1.2
+++ docs/reference/gtk/tmpl/gtkdata.sgml 2001/03/15 00:41:51
@@ -22,17 +22,3 @@
</para>
-<!-- ##### STRUCT GtkData ##### -->
-<para>
-The #GtkData-struct struct contains no public fields.
-</para>
-
-
-<!-- ##### SIGNAL GtkData::disconnect ##### -->
-<para>
-Emitted to notify any views on the #GtkData object to disconnect from it,
-possibly because the #GtkData object is about to be destroyed.
-</para>
-
- data: the object which received the signal.
-
Index: gdk-pixbuf/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/ChangeLog,v
retrieving revision 1.281
diff -u -u -r1.281 ChangeLog
--- gdk-pixbuf/ChangeLog 2001/03/07 14:49:14 1.281
+++ gdk-pixbuf/ChangeLog 2001/03/15 00:41:51
@@ -1,3 +1,8 @@
+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.
+
Thu Mar 1 04:01:57 2001 Tim Janik <timj gtk org>
* test-gdk-pixbuf.c: fixed includes.
Index: gdk-pixbuf/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/Makefile.am,v
retrieving revision 1.83
diff -u -u -r1.83 Makefile.am
--- gdk-pixbuf/Makefile.am 2001/01/22 23:09:42 1.83
+++ gdk-pixbuf/Makefile.am 2001/03/15 00:41:51
@@ -241,6 +241,6 @@
gdk-pixbuf-marshal.c: gdk-pixbuf-marshal.list
cd $(srcdir) \
- && glib-genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmh \
- && (cmp -s xgen-gmh gdk-pixbuf-marshal.c || cp xgen-gmh gdk-pixbuf-marshal.c) \
- && rm -f xgen-gmh xgen-gmh~
+ && glib-genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmc \
+ && (cmp -s xgen-gmc gdk-pixbuf-marshal.c || cp xgen-gmc gdk-pixbuf-marshal.c) \
+ && rm -f xgen-gmc xgen-gmc~
Index: gtk/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v
retrieving revision 1.156
diff -u -u -r1.156 Makefile.am
--- gtk/Makefile.am 2001/02/21 09:28:47 1.156
+++ gtk/Makefile.am 2001/03/15 00:41:51
@@ -79,7 +79,6 @@
gtkcellrenderertextpixbuf.h \
gtkcellrenderertoggle.h \
gtkcellrendererpixbuf.h \
- gtkdata.h \
gtkdebug.h \
gtkdialog.h \
gtkdnd.h \
@@ -238,7 +237,6 @@
gtkcontainer.c \
gtkctree.c \
gtkcurve.c \
- gtkdata.c \
gtkdialog.c \
gtkdnd.c \
gtkdrawingarea.c \
Index: gtk/gtk.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtk.h,v
retrieving revision 1.46
diff -u -u -r1.46 gtk.h
--- gtk/gtk.h 2001/02/21 09:28:53 1.46
+++ gtk/gtk.h 2001/03/15 00:41:51
@@ -58,7 +58,6 @@
#include <gtk/gtkcontainer.h>
#include <gtk/gtkctree.h>
#include <gtk/gtkcurve.h>
-#include <gtk/gtkdata.h>
#include <gtk/gtkdialog.h>
#include <gtk/gtkdnd.h>
#include <gtk/gtkdrawingarea.h>
Index: gtk/gtkadjustment.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkadjustment.c,v
retrieving revision 1.20
diff -u -u -r1.20 gtkadjustment.c
--- gtk/gtkadjustment.c 2000/12/13 01:34:38 1.20
+++ gtk/gtkadjustment.c 2001/03/15 00:41:51
@@ -61,7 +61,7 @@
(GtkClassInitFunc) NULL,
};
- adjustment_type = gtk_type_unique (GTK_TYPE_DATA, &adjustment_info);
+ adjustment_type = gtk_type_unique (GTK_TYPE_OBJECT, &adjustment_info);
}
return adjustment_type;
Index: gtk/gtkadjustment.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkadjustment.h,v
retrieving revision 1.13
diff -u -u -r1.13 gtkadjustment.h
--- gtk/gtkadjustment.h 2000/08/30 00:33:37 1.13
+++ gtk/gtkadjustment.h 2001/03/15 00:41:51
@@ -29,7 +29,7 @@
#include <gdk/gdk.h>
-#include <gtk/gtkdata.h>
+#include <gtk/gtkobject.h>
#ifdef __cplusplus
@@ -50,7 +50,7 @@
struct _GtkAdjustment
{
- GtkData data;
+ GtkObject parent_instance;
gfloat lower;
gfloat upper;
@@ -62,7 +62,7 @@
struct _GtkAdjustmentClass
{
- GtkDataClass parent_class;
+ GtkObjectClass parent_class;
void (* changed) (GtkAdjustment *adjustment);
void (* value_changed) (GtkAdjustment *adjustment);
Index: gtk/gtktext.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktext.c,v
retrieving revision 1.94
diff -u -u -r1.94 gtktext.c
--- gtk/gtktext.c 2001/03/09 20:28:14 1.94
+++ gtk/gtktext.c 2001/03/15 00:41:52
@@ -217,9 +217,6 @@
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_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_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_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 @@
}
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));
Index: gtk/gtktooltips.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktooltips.c,v
retrieving revision 1.31
diff -u -u -r1.31 gtktooltips.c
--- gtk/gtktooltips.c 2001/02/17 17:21:21 1.31
+++ gtk/gtktooltips.c 2001/03/15 00:41:52
@@ -62,7 +62,7 @@
static gint gtk_tooltips_paint_window (GtkTooltips *tooltips);
static void gtk_tooltips_draw_tips (GtkTooltips *tooltips);
-static GtkDataClass *parent_class;
+static GtkObjectClass *parent_class;
static const gchar *tooltips_data_key = "_GtkTooltipsData";
GtkType
@@ -84,7 +84,7 @@
(GtkClassInitFunc) NULL,
};
- tooltips_type = gtk_type_unique (GTK_TYPE_DATA, &tooltips_info);
+ tooltips_type = gtk_type_unique (GTK_TYPE_OBJECT, &tooltips_info);
}
return tooltips_type;
@@ -96,7 +96,7 @@
GtkObjectClass *object_class;
object_class = (GtkObjectClass*) class;
- parent_class = gtk_type_class (GTK_TYPE_DATA);
+ parent_class = gtk_type_class (GTK_TYPE_OBJECT);
object_class->destroy = gtk_tooltips_destroy;
}
Index: gtk/gtktooltips.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktooltips.h,v
retrieving revision 1.17
diff -u -u -r1.17 gtktooltips.h
--- gtk/gtktooltips.h 2001/02/17 17:21:21 1.17
+++ gtk/gtktooltips.h 2001/03/15 00:41:52
@@ -28,7 +28,7 @@
#define __GTK_TOOLTIPS_H__
#include <gdk/gdk.h>
-#include <gtk/gtkdata.h>
+#include <gtk/gtkobject.h>
#ifdef __cplusplus
@@ -58,7 +58,7 @@
struct _GtkTooltips
{
- GtkData data;
+ GtkObject parent_instance;
GtkWidget *tip_window;
GtkWidget *tip_label;
@@ -74,7 +74,7 @@
struct _GtkTooltipsClass
{
- GtkDataClass parent_class;
+ GtkObjectClass parent_class;
};
GtkType gtk_tooltips_get_type (void) G_GNUC_CONST;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]