summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog15
-rw-r--r--ChangeLog.pre-2-015
-rw-r--r--ChangeLog.pre-2-1015
-rw-r--r--ChangeLog.pre-2-215
-rw-r--r--ChangeLog.pre-2-415
-rw-r--r--ChangeLog.pre-2-615
-rw-r--r--ChangeLog.pre-2-815
-rw-r--r--gtk/gtk-boxed.defs47
-rw-r--r--gtk/gtkcellrenderertext.c2
-rw-r--r--gtk/gtktexttag.c4
-rw-r--r--gtk/gtktextview.c2
11 files changed, 128 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog
index dfb7e1e1e3..0ddcfcacf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2001-07-02 James Henstridge <james@daa.com.au>
+
+ * gtk/gtktextview.c (gtk_text_view_class_init): same here for
+ PANGO_TYPE_TAB_ARRAY.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): same here, but also
+ for PANGO_TYPE_TAB_ARRAY.
+
+ * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init):
+ s/GTK_TYPE_PANGO_FONT_DESCRIPTION/PANGO_TYPE_FONT_DESCRIPTION/
+
+ * gtk/gtk-boxed.defs: move all the boxed definitions to the top of
+ the file. Remove Pango types from defs -- they are now defined in
+ libpango.
+
Mon Jul 2 06:35:10 2001 Tim Janik <timj@gtk.org>
* gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index dfb7e1e1e3..0ddcfcacf5 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,18 @@
+2001-07-02 James Henstridge <james@daa.com.au>
+
+ * gtk/gtktextview.c (gtk_text_view_class_init): same here for
+ PANGO_TYPE_TAB_ARRAY.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): same here, but also
+ for PANGO_TYPE_TAB_ARRAY.
+
+ * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init):
+ s/GTK_TYPE_PANGO_FONT_DESCRIPTION/PANGO_TYPE_FONT_DESCRIPTION/
+
+ * gtk/gtk-boxed.defs: move all the boxed definitions to the top of
+ the file. Remove Pango types from defs -- they are now defined in
+ libpango.
+
Mon Jul 2 06:35:10 2001 Tim Janik <timj@gtk.org>
* gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index dfb7e1e1e3..0ddcfcacf5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,18 @@
+2001-07-02 James Henstridge <james@daa.com.au>
+
+ * gtk/gtktextview.c (gtk_text_view_class_init): same here for
+ PANGO_TYPE_TAB_ARRAY.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): same here, but also
+ for PANGO_TYPE_TAB_ARRAY.
+
+ * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init):
+ s/GTK_TYPE_PANGO_FONT_DESCRIPTION/PANGO_TYPE_FONT_DESCRIPTION/
+
+ * gtk/gtk-boxed.defs: move all the boxed definitions to the top of
+ the file. Remove Pango types from defs -- they are now defined in
+ libpango.
+
Mon Jul 2 06:35:10 2001 Tim Janik <timj@gtk.org>
* gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index dfb7e1e1e3..0ddcfcacf5 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,18 @@
+2001-07-02 James Henstridge <james@daa.com.au>
+
+ * gtk/gtktextview.c (gtk_text_view_class_init): same here for
+ PANGO_TYPE_TAB_ARRAY.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): same here, but also
+ for PANGO_TYPE_TAB_ARRAY.
+
+ * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init):
+ s/GTK_TYPE_PANGO_FONT_DESCRIPTION/PANGO_TYPE_FONT_DESCRIPTION/
+
+ * gtk/gtk-boxed.defs: move all the boxed definitions to the top of
+ the file. Remove Pango types from defs -- they are now defined in
+ libpango.
+
Mon Jul 2 06:35:10 2001 Tim Janik <timj@gtk.org>
* gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index dfb7e1e1e3..0ddcfcacf5 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,18 @@
+2001-07-02 James Henstridge <james@daa.com.au>
+
+ * gtk/gtktextview.c (gtk_text_view_class_init): same here for
+ PANGO_TYPE_TAB_ARRAY.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): same here, but also
+ for PANGO_TYPE_TAB_ARRAY.
+
+ * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init):
+ s/GTK_TYPE_PANGO_FONT_DESCRIPTION/PANGO_TYPE_FONT_DESCRIPTION/
+
+ * gtk/gtk-boxed.defs: move all the boxed definitions to the top of
+ the file. Remove Pango types from defs -- they are now defined in
+ libpango.
+
Mon Jul 2 06:35:10 2001 Tim Janik <timj@gtk.org>
* gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index dfb7e1e1e3..0ddcfcacf5 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,18 @@
+2001-07-02 James Henstridge <james@daa.com.au>
+
+ * gtk/gtktextview.c (gtk_text_view_class_init): same here for
+ PANGO_TYPE_TAB_ARRAY.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): same here, but also
+ for PANGO_TYPE_TAB_ARRAY.
+
+ * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init):
+ s/GTK_TYPE_PANGO_FONT_DESCRIPTION/PANGO_TYPE_FONT_DESCRIPTION/
+
+ * gtk/gtk-boxed.defs: move all the boxed definitions to the top of
+ the file. Remove Pango types from defs -- they are now defined in
+ libpango.
+
Mon Jul 2 06:35:10 2001 Tim Janik <timj@gtk.org>
* gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index dfb7e1e1e3..0ddcfcacf5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,18 @@
+2001-07-02 James Henstridge <james@daa.com.au>
+
+ * gtk/gtktextview.c (gtk_text_view_class_init): same here for
+ PANGO_TYPE_TAB_ARRAY.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): same here, but also
+ for PANGO_TYPE_TAB_ARRAY.
+
+ * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init):
+ s/GTK_TYPE_PANGO_FONT_DESCRIPTION/PANGO_TYPE_FONT_DESCRIPTION/
+
+ * gtk/gtk-boxed.defs: move all the boxed definitions to the top of
+ the file. Remove Pango types from defs -- they are now defined in
+ libpango.
+
Mon Jul 2 06:35:10 2001 Tim Janik <timj@gtk.org>
* gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/
diff --git a/gtk/gtk-boxed.defs b/gtk/gtk-boxed.defs
index 9a3a34c0b1..ff71bf0e90 100644
--- a/gtk/gtk-boxed.defs
+++ b/gtk/gtk-boxed.defs
@@ -27,6 +27,25 @@
gtk_requisition_free
"sizeof(GtkRequisition)")
+;; TextView
+
+(define-boxed GtkTextIter
+ gtk_text_iter_copy
+ gtk_text_iter_free)
+
+(define-boxed GtkTextAttributes
+ gtk_text_attributes_ref
+ gtk_text_attributes_unref)
+
+;; TreeView
+(define-boxed GtkTreeIter
+ gtk_tree_iter_copy
+ gtk_tree_iter_free)
+
+(define-boxed GtkTreePath
+ gtk_tree_path_copy
+ gtk_tree_path_free)
+
;;; Gdk boxed types
;(define-boxed GdkPoint
@@ -1289,34 +1308,6 @@
((GtkText text)
(uint nchars)))
-;; TextView
-
-(define-boxed GtkTextIter
- gtk_text_iter_copy
- gtk_text_iter_free)
-
-
-(define-boxed GtkTextAttributes
- gtk_text_attributes_ref
- gtk_text_attributes_unref)
-
-(define-boxed PangoTabArray
- pango_tab_array_copy
- pango_tab_array_free)
-
-(define-boxed PangoFontDescription
- pango_font_description_copy
- pango_font_description_free)
-
-;; TreeView
-(define-boxed GtkTreeIter
- gtk_tree_iter_copy
- gtk_tree_iter_free)
-
-(define-boxed GtkTreePath
- gtk_tree_path_copy
- gtk_tree_path_free)
-
;; Alignment
(define-object GtkAlignment (GtkBin))
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index f79e1c8f8a..24043e1291 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -217,7 +217,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
g_param_spec_boxed ("font_desc",
_("Font"),
_("Font description as a PangoFontDescription struct"),
- GTK_TYPE_PANGO_FONT_DESCRIPTION,
+ PANGO_TYPE_FONT_DESCRIPTION,
G_PARAM_READABLE | G_PARAM_WRITABLE));
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 902e9becc3..1c331b3b9a 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -291,7 +291,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
g_param_spec_boxed ("font_desc",
_("Font"),
_("Font description as a PangoFontDescription struct"),
- GTK_TYPE_PANGO_FONT_DESCRIPTION,
+ PANGO_TYPE_FONT_DESCRIPTION,
G_PARAM_READABLE | G_PARAM_WRITABLE));
@@ -492,7 +492,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
g_param_spec_boxed ("tabs",
_("Tabs"),
_("Custom tabs for this text"),
- GTK_TYPE_PANGO_TAB_ARRAY,
+ PANGO_TYPE_TAB_ARRAY,
G_PARAM_READABLE | G_PARAM_WRITABLE));
g_object_class_install_property (object_class,
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index b5750b3aa3..736c9f06e5 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -608,7 +608,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
g_param_spec_boxed ("tabs",
_("Tabs"),
_("Custom tabs for this text"),
- GTK_TYPE_PANGO_TAB_ARRAY,
+ PANGO_TYPE_TAB_ARRAY,
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
View Lorry Controller Status