add a #error unless you define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API, so

2001-10-22  Havoc Pennington  <hp@redhat.com>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index f7b28ac0cd1454e289e5e0acc8e01f6d2cb022a1..13142024efa3d57db4a8a75f1f926262fe98dd88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-22  Havoc Pennington  <hp@redhat.com>
+
+       * 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  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f7b28ac0cd1454e289e5e0acc8e01f6d2cb022a1..13142024efa3d57db4a8a75f1f926262fe98dd88 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2001-10-22  Havoc Pennington  <hp@redhat.com>
+
+       * 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  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f7b28ac0cd1454e289e5e0acc8e01f6d2cb022a1..13142024efa3d57db4a8a75f1f926262fe98dd88 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2001-10-22  Havoc Pennington  <hp@redhat.com>
+
+       * 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  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f7b28ac0cd1454e289e5e0acc8e01f6d2cb022a1..13142024efa3d57db4a8a75f1f926262fe98dd88 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2001-10-22  Havoc Pennington  <hp@redhat.com>
+
+       * 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  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f7b28ac0cd1454e289e5e0acc8e01f6d2cb022a1..13142024efa3d57db4a8a75f1f926262fe98dd88 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2001-10-22  Havoc Pennington  <hp@redhat.com>
+
+       * 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  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f7b28ac0cd1454e289e5e0acc8e01f6d2cb022a1..13142024efa3d57db4a8a75f1f926262fe98dd88 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2001-10-22  Havoc Pennington  <hp@redhat.com>
+
+       * 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  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f7b28ac0cd1454e289e5e0acc8e01f6d2cb022a1..13142024efa3d57db4a8a75f1f926262fe98dd88 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2001-10-22  Havoc Pennington  <hp@redhat.com>
+
+       * 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  <hp@redhat.com>
 
        * 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 7a138598492df70716b0dc59fac51683bbfc828b..992c41f8d661a69445446e7b41fc38beaec04c1a 100644 (file)
--- 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: 
 
+<!-- ##### ARG GtkEntry:text-position ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ENUM GtkFontFilterType ##### -->
 <para>
 A set of bit flags used to specify the filter being set
@@ -1087,12 +1093,24 @@ produce superscript and subscript.
 </para>
 
 
+<!-- ##### ARG GtkTextView:height-lines ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ARG GtkTextView:justify ##### -->
 <para>
 
 </para>
 
 
+<!-- ##### ARG GtkTextView:width-columns ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT GtkTreeModelSort ##### -->
 <para>
 

diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml
index 8362b3d822f9358de93344f4738d1f3fda4f6e1e..97ead1ee305815d6da5df02e3b8449883a3042f3 100644 (file)
--- 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.
 
-<!-- ##### ARG GtkEntry:text-position ##### -->
+<!-- ##### ARG GtkEntry:cursor-position ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEntry:selection-bound ##### -->
 <para>
 
 </para>

diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml
index 6d64f564a3cd9edd67fb1983ad7dffe22c871604..3c01f8abb9b22080f209fbfa97c9d7038c108a46 100644 (file)
--- a/docs/reference/gtk/tmpl/gtklabel.sgml
+++ b/docs/reference/gtk/tmpl/gtklabel.sgml
@@ -412,3 +412,13 @@ pointer, it isn't copied.
 
 </para>
 
+<!-- ##### ARG GtkLabel:cursor-position ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:selection-bound ##### -->
+<para>
+
+</para>
+

diff --git a/docs/reference/gtk/tmpl/gtktextview.sgml b/docs/reference/gtk/tmpl/gtktextview.sgml
index 4c98151c78f85b8576d661f58c00c53c22cd737e..f122d3a6053e70df1566d6879acddbb60e2c8197 100644 (file)
--- 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.
 
-<!-- ##### ARG GtkTextView:height-lines ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:width-columns ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkTextView:pixels-above-lines ##### -->
 <para>
 

diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index 3659538960e03292e0d79b023aded3c208927417..a2a043be87750bc0fd9a3845edfd172c2e3e9478 100644 (file)
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -52,6 +52,7 @@
  *
  */
 
+#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include "gtktextbtree.h"
 #include <string.h>
 #include <ctype.h>

diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index ec2ded7e49f83228b201607478cd724b5ebddd06..ebd33443d9721abf822d79a36220bb048bfba4f7 100644 (file)
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <stdarg.h>
 
+#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 6c573b7568f54f0cc5bca33d6b1858c00db3dde4..60bf4249506c5cce7d63461ba70610119ebb974d 100644 (file)
--- 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 51ef0ae12580fc40482a82b7565d2d7a81b8ecea..1213e0634b9e6e9e9c7227942f7b0f51c649d149 100644 (file)
--- 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 ab387f4cd144a01173e9811310f0df26431f1497..97fc4b4ad6a1e330922aa6574f400fc0262f9490 100644 (file)
--- 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 bcb1aceaff98b52b750a62354ffc25077f5f1e21..599c82f30219253f520acfc3782d0dbe38638d5e 100644 (file)
--- 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 1856aec1fa53068ef88139a322fc96c0509905e0..81881ef18deeba44f31dfb90af03f6a782e41e08 100644 (file)
--- 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 <gtk/gtktextbuffer.h>
 #include <gtk/gtktextiter.h>

diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c
index 1be324b11a948af2fcd4d4869b2336640dc42d6d..d7202089b0336db658b1f59071d46759b7cd9066 100644 (file)
--- 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 0b1c0cc290f4defb11d11d5ff5c6a1c5e5a5e0cf..d9634dfea9abf6de76e274b633ab41936f55fce8 100644 (file)
--- a/gtk/gtktextsegment.c
+++ b/gtk/gtktextsegment.c
@@ -50,6 +50,7 @@
  *
  */
 
+#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include "gtktextbtree.h"
 #include <string.h>
 #include <ctype.h>

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 3296fc30f654e778cea61625af28333c25e539a3..5a5fa96ee5a3efbf96c741c4199f2069d0dd659c 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -26,6 +26,7 @@
 
 #include <string.h>
 
+#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include "gtkbindings.h"
 #include "gtkdnd.h"
 #include "gtkintl.h"