From 644648466729ddd49e1dc3e299e532c67abebe79 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 22 Oct 2001 21:52:47 +0000 Subject: [PATCH] add a #error unless you define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API, so 2001-10-22 Havoc Pennington * gtk/gtktextlayout.h: add a #error unless you define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API, so people don't use this accidentally * gtk/gtktext*.c: #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API as appropriate. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ docs/reference/gtk/tmpl/gtk-unused.sgml | 18 ++++++++++++++++++ docs/reference/gtk/tmpl/gtkentry.sgml | 7 ++++++- docs/reference/gtk/tmpl/gtklabel.sgml | 10 ++++++++++ docs/reference/gtk/tmpl/gtktextview.sgml | 10 ---------- gtk/gtktextbtree.c | 1 + gtk/gtktextbuffer.c | 1 + gtk/gtktextchild.c | 1 + gtk/gtktextdisplay.c | 1 + gtk/gtktextiter.c | 1 + gtk/gtktextlayout.c | 1 + gtk/gtktextlayout.h | 3 +++ gtk/gtktextmark.c | 2 +- gtk/gtktextsegment.c | 1 + gtk/gtktextview.c | 1 + 21 files changed, 95 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7b28ac0c..13142024e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextlayout.h: add a #error unless you define + GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API, so people don't use this accidentally + + * gtk/gtktext*.c: #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API as appropriate. + 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f7b28ac0c..13142024e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextlayout.h: add a #error unless you define + GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API, so people don't use this accidentally + + * gtk/gtktext*.c: #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API as appropriate. + 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f7b28ac0c..13142024e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextlayout.h: add a #error unless you define + GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API, so people don't use this accidentally + + * gtk/gtktext*.c: #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API as appropriate. + 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f7b28ac0c..13142024e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextlayout.h: add a #error unless you define + GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API, so people don't use this accidentally + + * gtk/gtktext*.c: #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API as appropriate. + 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f7b28ac0c..13142024e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextlayout.h: add a #error unless you define + GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API, so people don't use this accidentally + + * gtk/gtktext*.c: #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API as appropriate. + 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f7b28ac0c..13142024e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextlayout.h: add a #error unless you define + GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API, so people don't use this accidentally + + * gtk/gtktext*.c: #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API as appropriate. + 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f7b28ac0c..13142024e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextlayout.h: add a #error unless you define + GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API, so people don't use this accidentally + + * gtk/gtktext*.c: #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API as appropriate. + 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 7a1385984..992c41f8d 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -750,6 +750,12 @@ You may not attach these to signals created with the @arg2: @arg3: + + + + + + A set of bit flags used to specify the filter being set @@ -1087,12 +1093,24 @@ produce superscript and subscript. + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml index 8362b3d82..97ead1ee3 100644 --- a/docs/reference/gtk/tmpl/gtkentry.sgml +++ b/docs/reference/gtk/tmpl/gtkentry.sgml @@ -349,7 +349,12 @@ to fit. @entry: the object which received the signal. - + + + + + + diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml index 6d64f564a..3c01f8abb 100644 --- a/docs/reference/gtk/tmpl/gtklabel.sgml +++ b/docs/reference/gtk/tmpl/gtklabel.sgml @@ -412,3 +412,13 @@ pointer, it isn't copied. + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktextview.sgml b/docs/reference/gtk/tmpl/gtktextview.sgml index 4c98151c7..f122d3a60 100644 --- a/docs/reference/gtk/tmpl/gtktextview.sgml +++ b/docs/reference/gtk/tmpl/gtktextview.sgml @@ -639,16 +639,6 @@ types related to the text widget and how they work together. @textview: the object which received the signal. - - - - - - - - - - diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index 365953896..a2a043be8 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -52,6 +52,7 @@ * */ +#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include "gtktextbtree.h" #include #include diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index ec2ded7e4..ebd33443d 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -28,6 +28,7 @@ #include #include +#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include "gtkclipboard.h" #include "gtkinvisible.h" #include "gtksignal.h" diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c index 6c573b756..60bf42495 100644 --- a/gtk/gtktextchild.c +++ b/gtk/gtktextchild.c @@ -47,6 +47,7 @@ * */ +#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include "gtktextchild.h" #include "gtktextbtree.h" #include "gtktextlayout.h" diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c index 51ef0ae12..1213e0634 100644 --- a/gtk/gtktextdisplay.c +++ b/gtk/gtktextdisplay.c @@ -74,6 +74,7 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include "gtktextdisplay.h" /* DO NOT go putting private headers in here. This file should only * use the semi-public headers, as with gtktextview.c. diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index ab387f4cd..97fc4b4ad 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -24,6 +24,7 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include "gtktextiter.h" #include "gtktextbtree.h" #include "gtktextiterprivate.h" diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index bcb1aceaf..599c82f30 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -76,6 +76,7 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include "gtksignal.h" #include "gtktextlayout.h" #include "gtktextbtree.h" diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h index 1856aec1f..81881ef18 100644 --- a/gtk/gtktextlayout.h +++ b/gtk/gtktextlayout.h @@ -89,6 +89,9 @@ extern "C" { * canvas item can use it, but users are not supposed * to use it. */ +#ifndef GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API +#error "You are not supposed to be including this file; the equivalent public API is in gtktextview.h" +#endif #include #include diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c index 1be324b11..d7202089b 100644 --- a/gtk/gtktextmark.c +++ b/gtk/gtktextmark.c @@ -47,7 +47,7 @@ * */ - +#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include "gtktextbtree.h" static void gtk_text_mark_init (GtkTextMark *mark); diff --git a/gtk/gtktextsegment.c b/gtk/gtktextsegment.c index 0b1c0cc29..d9634dfea 100644 --- a/gtk/gtktextsegment.c +++ b/gtk/gtktextsegment.c @@ -50,6 +50,7 @@ * */ +#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include "gtktextbtree.h" #include #include diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 3296fc30f..5a5fa96ee 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -26,6 +26,7 @@ #include +#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include "gtkbindings.h" #include "gtkdnd.h" #include "gtkintl.h" -- 2.43.2