separator: Don't use padding and borders wrongly

[~andy/gtk] / gtk / gtktexttypes.c

diff --git a/gtk/gtktexttypes.c b/gtk/gtktexttypes.c
index 86a79c290775b40dc28dbe3cf328dcb3ada27abf..65133653524396e7b5572a9b78fd4342918a5fb0 100644 (file)
--- a/gtk/gtktexttypes.c
+++ b/gtk/gtktexttypes.c
@@ -1,11 +1,41 @@
-#include <config.h>
+/* GTK - The GIMP Toolkit
+ * gtktexttypes.c Copyright (C) 2000 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#include "config.h"
 #include "gtktexttypes.h"
-#include "gtkalias.h"
 
 /* These are used to represent embedded non-character objects
  * if you return a string representation of a text buffer
  */
-const gchar gtk_text_unknown_char_utf8[] = { '\xEF', '\xBF', '\xBC', '\0' };
+const gchar _gtk_text_unknown_char_utf8[] = { '\xEF', '\xBF', '\xBC', '\0' };
+
+/* This is to be used only by libgtk test programs */
+const gchar *
+gtk_text_unknown_char_utf8_gtk_tests_only (void)
+{
+  return _gtk_text_unknown_char_utf8;
+}
 
 static inline gboolean
 inline_byte_begins_utf8_char (const gchar *byte)
@@ -18,6 +48,3 @@ gtk_text_byte_begins_utf8_char (const gchar *byte)
 {
   return inline_byte_begins_utf8_char (byte);
 }
-
-#define __GTK_TEXT_TYPES_C__
-#include "gtkaliasdef.c"