AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 06:21:14 +00:00
Code Issues Projects Releases Wiki Activity

textview: Make the semi-private headrs really private

Browse Source 
Rename the files to have the private.h ending.

And remove gtktextdisplay.h from the installed files.
This commit is contained in:
Benjamin Otte 2017-11-11 05:01:31 +01:00
parent d18b10a3d7
commit 17600b6bab
14 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtktextbtree.c
View File

@ -52,7 +52,6 @@
*
*/
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "config.h"
#include "gtktextbtree.h"
#include <string.h>
@ -62,7 +61,7 @@
#include "gtktexttag.h"
#include "gtktexttagprivate.h"
#include "gtktexttagtable.h"
#include "gtktextlayout.h"
#include "gtktextlayoutprivate.h"
#include "gtktextiterprivate.h"
#include "gtkdebug.h"
#include "gtktextmarkprivate.h"

1
gtk/gtktextbuffer.c
View File

@ -27,7 +27,6 @@
#include <string.h>
#include <stdarg.h>
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "gtkclipboard.h"
#include "gtkdnd.h"
#include "gtkinvisible.h"

3
gtk/gtktextchild.c
View File

@ -47,11 +47,10 @@
*
*/
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "config.h"
#include "gtktextchild.h"
#include "gtktextbtree.h"
#include "gtktextlayout.h"
#include "gtktextlayoutprivate.h"
#include "gtkintl.h"
#define CHECK_IN_BUFFER(anchor) \

3
gtk/gtktextdisplay.c
View File

@ -73,9 +73,8 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "config.h"
#include "gtktextdisplay.h"
#include "gtktextdisplayprivate.h"
#include "gtktextviewprivate.h"
#include "gtkwidgetprivate.h"
#include "gtkstylecontextprivate.h"

8
gtk/gtktextdisplay.h → gtk/gtktextdisplayprivate.h
View File

@ -73,10 +73,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_TEXT_DISPLAY_H__
#define __GTK_TEXT_DISPLAY_H__
#ifndef __GTK_TEXT_DISPLAY_PRIVATE_H__
#define __GTK_TEXT_DISPLAY_PRIVATE_H__
#include <gtk/gtktextlayout.h>
#include "gtktextlayoutprivate.h"
G_BEGIN_DECLS
@ -97,4 +97,4 @@ void gtk_text_layout_draw (GtkTextLayout *layout,
G_END_DECLS
#endif /* __GTK_TEXT_DISPLAY_H__ */
#endif /* __GTK_TEXT_DISPLAY_PRIVATE_H__ */

1
gtk/gtktextiter.c
View File

@ -22,7 +22,6 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "config.h"
#include "gtktextiter.h"
#include "gtktextbtree.h"

3
gtk/gtktextlayout.c
View File

@ -75,10 +75,9 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "config.h"
#include "gtkmarshalers.h"
#include "gtktextlayout.h"
#include "gtktextlayoutprivate.h"
#include "gtktextbtree.h"
#include "gtktextbufferprivate.h"
#include "gtktextiterprivate.h"

16
gtk/gtktextlayout.h → gtk/gtktextlayoutprivate.h
View File

@ -75,18 +75,8 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_TEXT_LAYOUT_H__
#define __GTK_TEXT_LAYOUT_H__
/* This is a "semi-private" header; it is intended for
* use by the text widget, and the text canvas item,
* but that’s all. We may have to install it so the
* 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
#ifndef __GTK_TEXT_LAYOUT_PRIVATE_H__
#define __GTK_TEXT_LAYOUT_PRIVATE_H__
#include <gtk/gtk.h>
#include <gtk/gtktextattributes.h>
@ -476,4 +466,4 @@ void gtk_text_layout_spew (GtkTextLayout *layout);
G_END_DECLS
#endif /* __GTK_TEXT_LAYOUT_H__ */
#endif /* __GTK_TEXT_LAYOUT_PRIVATE_H__ */

1
gtk/gtktextmark.c
View File

@ -47,7 +47,6 @@
*
*/
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "config.h"
#include "gtktextbtree.h"
#include "gtkprivate.h"

2
gtk/gtktextmarkprivate.h
View File

@ -26,7 +26,7 @@
#define __GTK_TEXT_MARK_PRIVATE_H__
#include <gtk/gtktexttypes.h>
#include <gtk/gtktextlayout.h>
#include "gtktextlayoutprivate.h"
G_BEGIN_DECLS

3
gtk/gtktextsegment.c
View File

@ -50,7 +50,6 @@
*
*/
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "config.h"
#include "gtktextbtree.h"
#include <string.h>
@ -58,7 +57,7 @@
#include <stdio.h>
#include "gtktexttag.h"
#include "gtktexttagtable.h"
#include "gtktextlayout.h"
#include "gtktextlayoutprivate.h"
#include "gtktextiterprivate.h"
#include "gtkdebug.h"

4
gtk/gtktextutil.c
View File

@ -27,9 +27,7 @@
#include "gtktextview.h"
#include "gtktextutil.h"
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "gtktextdisplay.h"
#include "gtktextdisplayprivate.h"
#include "gtktextbuffer.h"
#include "gtkmenuitem.h"
#include "gtkintl.h"

3
gtk/gtktextview.c
View File

@ -29,7 +29,6 @@
#include <string.h>
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "gtkadjustmentprivate.h"
#include "gtkbindings.h"
#include "gtkdnd.h"
@ -44,7 +43,7 @@
#include "gtksettings.h"
#include "gtkselectionprivate.h"
#include "gtktextbufferrichtext.h"
#include "gtktextdisplay.h"
#include "gtktextdisplayprivate.h"
#include "gtktextiterprivate.h"
#include "gtkimmulticontext.h"
#include "gtkprivate.h"

2
gtk/meson.build
View File

@ -556,7 +556,6 @@ gtk_public_headers = files([
'gtktextbuffer.h',
'gtktextbufferrichtext.h',
'gtktextchild.h',
'gtktextdisplay.h',
'gtktextiter.h',
'gtktextmark.h',
'gtktexttag.h',
@ -1004,7 +1003,6 @@ if build_gir
'--c-include=gtk/gtk.h',
'--include-uninstalled=./gtk/Gdk-4.0.gir',
'--include-uninstalled=./gtk/Gsk-4.0.gir',
'-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API',
'-DGTK_COMPILATION',
])
gtk_dep_sources += gtk_gir