From 8607312feff19b938a7113aa5ef1338005f1bb58 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 5 Oct 2022 22:37:19 -0400 Subject: [PATCH 1/2] gdk: Cosmetics Add a define for each renderer. --- gdk/gdkconfig.h.meson | 2 ++ gdk/meson.build | 2 ++ 2 files changed, 4 insertions(+) diff --git a/gdk/gdkconfig.h.meson b/gdk/gdkconfig.h.meson index 867b430e43..d5b48f3184 100644 --- a/gdk/gdkconfig.h.meson +++ b/gdk/gdkconfig.h.meson @@ -16,6 +16,8 @@ G_BEGIN_DECLS #mesondefine GDK_WINDOWING_WAYLAND #mesondefine GDK_WINDOWING_WIN32 +#mesondefine GDK_RENDERING_CAIRO +#mesondefine GDK_RENDERING_GL #mesondefine GDK_RENDERING_VULKAN G_END_DECLS diff --git a/gdk/meson.build b/gdk/meson.build index 6c1deecc04..c690ef821e 100644 --- a/gdk/meson.build +++ b/gdk/meson.build @@ -161,6 +161,8 @@ gdkconfig_cdata.set('GDK_WINDOWING_WAYLAND', wayland_enabled) gdkconfig_cdata.set('GDK_WINDOWING_WIN32', win32_enabled) gdkconfig_cdata.set('GDK_WINDOWING_BROADWAY', broadway_enabled) gdkconfig_cdata.set('GDK_WINDOWING_MACOS', macos_enabled) +gdkconfig_cdata.set('GDK_RENDERING_CAIRO', true) +gdkconfig_cdata.set('GDK_RENDERING_GL', true) gdkconfig_cdata.set('GDK_RENDERING_VULKAN', have_vulkan) gdkconfig = configure_file( From 7c5e1c61952a03d8bf45adb54e3121fd5473dcac Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 5 Oct 2022 22:59:51 -0400 Subject: [PATCH 2/2] gtk: Rename some private headers Improve the consistency of our private header naming, by add 'private' to a bunch of them. --- gtk/a11y/gtkatspipango.c | 2 +- gtk/a11y/gtkatspitext.c | 2 +- gtk/a11y/gtkatspitextbuffer.c | 2 +- gtk/gskpango.c | 2 +- gtk/{gskpango.h => gskpangoprivate.h} | 6 +++--- gtk/gtkcssshadowvalue.c | 2 +- gtk/gtkdragicon.c | 2 +- gtk/gtkentry.c | 4 ++-- gtk/gtkfilechooserwidget.c | 2 +- gtk/gtkfilesystemmodel.c | 2 +- gtk/gtkinscription.c | 2 +- gtk/gtklabel.c | 4 ++-- gtk/gtkliststore.c | 2 +- gtk/gtkpango.c | 2 +- gtk/{gtkpango.h => gtkpangoprivate.h} | 6 +++--- gtk/gtkpathbar.c | 2 +- gtk/{gtkpathbar.h => gtkpathbarprivate.h} | 8 ++++---- gtk/gtkplacessidebar.c | 2 +- gtk/gtksnapshot.c | 2 +- gtk/gtktext.c | 4 ++-- gtk/gtktextattributes.c | 2 +- gtk/{gtktextattributes.h => gtktextattributesprivate.h} | 4 ++-- gtk/gtktextbtree.c | 6 +++--- gtk/{gtktextbtree.h => gtktextbtreeprivate.h} | 6 +++--- gtk/gtktextbuffer.c | 4 ++-- gtk/gtktextbufferprivate.h | 2 +- gtk/gtktextchild.c | 2 +- gtk/gtktextchildprivate.h | 2 +- gtk/gtktextiter.c | 2 +- gtk/gtktextiterprivate.h | 4 ++-- gtk/gtktextlayout.c | 6 +++--- gtk/gtktextlayoutprivate.h | 2 +- gtk/gtktextlinedisplaycache.c | 2 +- gtk/gtktextmark.c | 2 +- gtk/gtktextmarkprivate.h | 2 +- gtk/gtktextsegment.c | 2 +- gtk/{gtktextsegment.h => gtktextsegmentprivate.h} | 4 ++-- gtk/gtktexttag.c | 2 +- gtk/gtktexttagprivate.h | 2 +- gtk/gtktexttypes.c | 2 +- gtk/{gtktexttypes.h => gtktexttypesprivate.h} | 4 ++-- gtk/gtktextutil.c | 2 +- gtk/{gtktextutil.h => gtktextutilprivate.h} | 6 +++--- gtk/gtktextview.c | 4 ++-- gtk/gtktextviewprivate.h | 2 +- gtk/gtktrashmonitor.c | 2 +- gtk/{gtktrashmonitor.h => gtktrashmonitorprivate.h} | 6 +++--- gtk/gtktreedatalist.c | 2 +- gtk/{gtktreedatalist.h => gtktreedatalistprivate.h} | 6 +++--- gtk/gtktreemodelsort.c | 2 +- gtk/gtktreestore.c | 2 +- testsuite/gtk/textbuffer.c | 2 +- 52 files changed, 80 insertions(+), 80 deletions(-) rename gtk/{gskpango.h => gskpangoprivate.h} (96%) rename gtk/{gtkpango.h => gtkpangoprivate.h} (96%) rename gtk/{gtkpathbar.h => gtkpathbarprivate.h} (91%) rename gtk/{gtktextattributes.h => gtktextattributesprivate.h} (98%) rename gtk/{gtktextbtree.h => gtktextbtreeprivate.h} (99%) rename gtk/{gtktextsegment.h => gtktextsegmentprivate.h} (98%) rename gtk/{gtktexttypes.h => gtktexttypesprivate.h} (97%) rename gtk/{gtktextutil.h => gtktextutilprivate.h} (94%) rename gtk/{gtktrashmonitor.h => gtktrashmonitorprivate.h} (93%) rename gtk/{gtktreedatalist.h => gtktreedatalistprivate.h} (95%) diff --git a/gtk/a11y/gtkatspipango.c b/gtk/a11y/gtkatspipango.c index f0f3ed746f..2ca7bd419b 100644 --- a/gtk/a11y/gtkatspipango.c +++ b/gtk/a11y/gtkatspipango.c @@ -18,7 +18,7 @@ #include "config.h" #include "gtkatspipangoprivate.h" -#include "gtkpango.h" +#include "gtkpangoprivate.h" void gtk_pango_get_font_attributes (PangoFontDescription *font, diff --git a/gtk/a11y/gtkatspitext.c b/gtk/a11y/gtkatspitext.c index 1e6c8c5ae7..efd588a8b2 100644 --- a/gtk/a11y/gtkatspitext.c +++ b/gtk/a11y/gtkatspitext.c @@ -35,7 +35,7 @@ #include "gtkentryprivate.h" #include "gtkinscriptionprivate.h" #include "gtklabelprivate.h" -#include "gtkpango.h" +#include "gtkpangoprivate.h" #include "gtkpasswordentryprivate.h" #include "gtksearchentryprivate.h" #include "gtkspinbuttonprivate.h" diff --git a/gtk/a11y/gtkatspitextbuffer.c b/gtk/a11y/gtkatspitextbuffer.c index bb8869db62..81afecab2c 100644 --- a/gtk/a11y/gtkatspitextbuffer.c +++ b/gtk/a11y/gtkatspitextbuffer.c @@ -21,7 +21,7 @@ #include "gtkatspipangoprivate.h" #include "gtktextbufferprivate.h" #include "gtktextviewprivate.h" -#include "gtkpango.h" +#include "gtkpangoprivate.h" void gtk_text_view_add_default_attributes (GtkTextView *view, diff --git a/gtk/gskpango.c b/gtk/gskpango.c index e96c84a2fc..41a4b1a7bc 100644 --- a/gtk/gskpango.c +++ b/gtk/gskpango.c @@ -21,7 +21,7 @@ #include "gsk/gsk.h" #include "gsk/gskrendernodeprivate.h" -#include "gskpango.h" +#include "gskpangoprivate.h" #include "gtksnapshotprivate.h" #include "gtktextlayoutprivate.h" #include "gtktextviewprivate.h" diff --git a/gtk/gskpango.h b/gtk/gskpangoprivate.h similarity index 96% rename from gtk/gskpango.h rename to gtk/gskpangoprivate.h index 672128d1c1..5641f9cd67 100644 --- a/gtk/gskpango.h +++ b/gtk/gskpangoprivate.h @@ -16,8 +16,8 @@ * License along with this library. If not, see . */ -#ifndef __GSK_PANGO_H__ -#define __GSK_PANGO_H__ +#ifndef __GSK_PANGO_PRIVATE_H__ +#define __GSK_PANGO_PRIVATE_H__ #include #include "gtk/gtksnapshot.h" @@ -85,4 +85,4 @@ void gsk_pango_renderer_release (GskPangoRenderer *crenderer G_END_DECLS -#endif /* __GSK_PANGO_H__ */ +#endif /* __GSK_PANGO_PRIVATE_H__ */ diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c index ba74f321ad..66029dbff4 100644 --- a/gtk/gtkcssshadowvalue.c +++ b/gtk/gtkcssshadowvalue.c @@ -25,7 +25,7 @@ #include "gtkcssnumbervalueprivate.h" #include "gtkcsscolorvalueprivate.h" #include "gtksnapshotprivate.h" -#include "gtkpango.h" +#include "gtkpangoprivate.h" #include "gsk/gskcairoblurprivate.h" #include "gsk/gskroundedrectprivate.h" diff --git a/gtk/gtkdragicon.c b/gtk/gtkdragicon.c index f82dbb6aeb..8918caf5eb 100644 --- a/gtk/gtkdragicon.c +++ b/gtk/gtkdragicon.c @@ -34,7 +34,7 @@ #include "gtkimage.h" #include "gtklabel.h" #include "gtkrendernodepaintableprivate.h" -#include "gtktextutil.h" +#include "gtktextutilprivate.h" /** diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 3c2febf3c0..e66812ba18 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -48,7 +48,7 @@ #include "gtklabel.h" #include "gtkmain.h" #include "gtkmarshalers.h" -#include "gtkpango.h" +#include "gtkpangoprivate.h" #include "gtkpopover.h" #include "gtkprivate.h" #include "gtkprogressbar.h" @@ -56,7 +56,7 @@ #include "gtksnapshot.h" #include "gtktextprivate.h" #include "gtktexthandleprivate.h" -#include "gtktextutil.h" +#include "gtktextutilprivate.h" #include "gtktooltip.h" #include "gtktypebuiltins.h" #include "gtkwidgetprivate.h" diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index e2bf702c04..c86a08a4bf 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -45,7 +45,7 @@ #include "gtkmessagedialog.h" #include "gtkmountoperation.h" #include "gtkpaned.h" -#include "gtkpathbar.h" +#include "gtkpathbarprivate.h" #include "gtkplacessidebarprivate.h" #include "gtkplacesviewprivate.h" #include "gtkprivate.h" diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index 10fe1ec5e5..46d7f10b91 100644 --- a/gtk/gtkfilesystemmodel.c +++ b/gtk/gtkfilesystemmodel.c @@ -25,7 +25,7 @@ #include "gtkfilechooserutils.h" #include "gtkmarshalers.h" -#include "gtktreedatalist.h" +#include "gtktreedatalistprivate.h" #include "gtktreednd.h" #include "gtktreemodel.h" #include "gtkfilter.h" diff --git a/gtk/gtkinscription.c b/gtk/gtkinscription.c index 42dff1eada..598c6600c0 100644 --- a/gtk/gtkinscription.c +++ b/gtk/gtkinscription.c @@ -23,7 +23,7 @@ #include "gtkcssnodeprivate.h" #include "gtkcssstylechangeprivate.h" -#include "gtkpango.h" +#include "gtkpangoprivate.h" #include "gtksnapshot.h" #include "gtktypebuiltins.h" #include "gtkwidgetprivate.h" diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 7602401d3c..9e2ce06cd6 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -35,7 +35,7 @@ #include #include "gtkmarshalers.h" #include "gtknotebook.h" -#include "gtkpango.h" +#include "gtkpangoprivate.h" #include "gtkprivate.h" #include "gtkshortcut.h" #include "gtkshortcutcontroller.h" @@ -43,7 +43,7 @@ #include "gtkshow.h" #include "gtksnapshot.h" #include "gtkstylecontextprivate.h" -#include "gtktextutil.h" +#include "gtktextutilprivate.h" #include "gtktooltip.h" #include "gtktypebuiltins.h" #include "gtkwidgetprivate.h" diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index acf7b8942f..4e442bed31 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -22,7 +22,7 @@ #include #include "gtktreemodel.h" #include "gtkliststore.h" -#include "gtktreedatalist.h" +#include "gtktreedatalistprivate.h" #include "gtktreednd.h" #include "gtkbuildable.h" #include "gtkbuilderprivate.h" diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c index 3ba6c23aba..68a80e5c46 100644 --- a/gtk/gtkpango.c +++ b/gtk/gtkpango.c @@ -23,7 +23,7 @@ */ #include "config.h" -#include "gtkpango.h" +#include "gtkpangoprivate.h" #include #include "gtkbuilderprivate.h" diff --git a/gtk/gtkpango.h b/gtk/gtkpangoprivate.h similarity index 96% rename from gtk/gtkpango.h rename to gtk/gtkpangoprivate.h index 3d673d9b0a..cb16bcb331 100644 --- a/gtk/gtkpango.h +++ b/gtk/gtkpangoprivate.h @@ -22,8 +22,8 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef __GTK_PANGO_H__ -#define __GTK_PANGO_H__ +#ifndef __GTK_PANGO_PRIVATE_H__ +#define __GTK_PANGO_PRIVATE_H__ #include #include "gtkbuildable.h" @@ -63,4 +63,4 @@ const char *pango_align_to_string (PangoAlignment align); G_END_DECLS -#endif /* __GTK_PANGO_H__ */ +#endif /* __GTK_PANGO_PRIVATE_H__ */ diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index 9e4916d562..62aa838d2a 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -18,7 +18,7 @@ #include "config.h" -#include "gtkpathbar.h" +#include "gtkpathbarprivate.h" #include diff --git a/gtk/gtkpathbar.h b/gtk/gtkpathbarprivate.h similarity index 91% rename from gtk/gtkpathbar.h rename to gtk/gtkpathbarprivate.h index 11ed72455d..3b20985929 100644 --- a/gtk/gtkpathbar.h +++ b/gtk/gtkpathbarprivate.h @@ -1,4 +1,4 @@ -/* gtkpathbar.h +/* gtkpathbarprivate.h * Copyright (C) 2004 Red Hat, Inc., Jonathan Blandford * * This library is free software; you can redistribute it and/or @@ -15,8 +15,8 @@ * License along with this library. If not, see . */ -#ifndef __GTK_PATH_BAR_H__ -#define __GTK_PATH_BAR_H__ +#ifndef __GTK_PATH_BAR_PRIVATE_H__ +#define __GTK_PATH_BAR_PRIVATE_H__ #include "gtkwidget.h" @@ -38,4 +38,4 @@ void _gtk_path_bar_down (GtkPathBar *path_bar); G_END_DECLS -#endif /* __GTK_PATH_BAR_H__ */ +#endif /* __GTK_PATH_BAR_PRIVATE_H__ */ diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c index 0e6120c7b8..b2fb2aaeb8 100644 --- a/gtk/gtkplacessidebar.c +++ b/gtk/gtkplacessidebar.c @@ -41,7 +41,7 @@ #include "gtkmountoperation.h" #include "gtkscrolledwindow.h" #include "gtksettings.h" -#include "gtktrashmonitor.h" +#include "gtktrashmonitorprivate.h" #include "gtktypebuiltins.h" #include "gtkprivatetypebuiltins.h" #include "gtkpopovermenu.h" diff --git a/gtk/gtksnapshot.c b/gtk/gtksnapshot.c index afa27b45f1..f3902fa376 100644 --- a/gtk/gtksnapshot.c +++ b/gtk/gtksnapshot.c @@ -35,7 +35,7 @@ #include "gsk/gskrendernodeprivate.h" #include "gsk/gskroundedrectprivate.h" -#include "gtk/gskpango.h" +#include "gtk/gskpangoprivate.h" #define GDK_ARRAY_NAME gtk_snapshot_nodes #define GDK_ARRAY_TYPE_NAME GtkSnapshotNodes diff --git a/gtk/gtktext.c b/gtk/gtktext.c index ba3e22387f..b7c40370b0 100644 --- a/gtk/gtktext.c +++ b/gtk/gtktext.c @@ -49,7 +49,7 @@ #include "gtkmagnifierprivate.h" #include "gtkmain.h" #include "gtkmarshalers.h" -#include "gtkpango.h" +#include "gtkpangoprivate.h" #include "gtkpopovermenu.h" #include "gtkprivate.h" #include "gtksettings.h" @@ -57,7 +57,7 @@ #include "gtkstylecontextprivate.h" #include "gtktexthandleprivate.h" #include "gtktexthistoryprivate.h" -#include "gtktextutil.h" +#include "gtktextutilprivate.h" #include "gtktooltip.h" #include "gtktypebuiltins.h" #include "gtkwidgetprivate.h" diff --git a/gtk/gtktextattributes.c b/gtk/gtktextattributes.c index 856b4f3310..d8cef2518e 100644 --- a/gtk/gtktextattributes.c +++ b/gtk/gtktextattributes.c @@ -49,7 +49,7 @@ #include "config.h" -#include "gtktextattributes.h" +#include "gtktextattributesprivate.h" #include "gtktexttagprivate.h" /** diff --git a/gtk/gtktextattributes.h b/gtk/gtktextattributesprivate.h similarity index 98% rename from gtk/gtktextattributes.h rename to gtk/gtktextattributesprivate.h index 3aa01c8690..71b4ad6b35 100644 --- a/gtk/gtktextattributes.h +++ b/gtk/gtktextattributesprivate.h @@ -47,8 +47,8 @@ * */ -#ifndef __GTK_TEXT_ATTRIBUTES_H__ -#define __GTK_TEXT_ATTRIBUTES_H__ +#ifndef __GTK_TEXT_ATTRIBUTES_PRIVATE_H__ +#define __GTK_TEXT_ATTRIBUTES_PRIVATE_H__ #include diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index cdf100e4fe..2a756e49d4 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -53,7 +53,7 @@ */ #include "config.h" -#include "gtktextbtree.h" +#include "gtktextbtreeprivate.h" #include #include #include @@ -65,8 +65,8 @@ #include "gtktextiterprivate.h" #include "gtkdebug.h" #include "gtktextmarkprivate.h" -#include "gtktextsegment.h" -#include "gtkpango.h" +#include "gtktextsegmentprivate.h" +#include "gtkpangoprivate.h" #include "gdkprivate.h" /* diff --git a/gtk/gtktextbtree.h b/gtk/gtktextbtreeprivate.h similarity index 99% rename from gtk/gtktextbtree.h rename to gtk/gtktextbtreeprivate.h index 66e61c686f..86e79a4b0e 100644 --- a/gtk/gtktextbtree.h +++ b/gtk/gtktextbtreeprivate.h @@ -22,8 +22,8 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef __GTK_TEXT_BTREE_H__ -#define __GTK_TEXT_BTREE_H__ +#ifndef __GTK_TEXT_BTREE_PRIVATE_H__ +#define __GTK_TEXT_BTREE_PRIVATE_H__ #if 0 #define DEBUG_VALIDATION_AND_SCROLLING @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include G_BEGIN_DECLS diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 0d59288d93..c396a5e015 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -31,11 +31,11 @@ #include "gtktextbuffer.h" #include "gtktexthistoryprivate.h" #include "gtktextbufferprivate.h" -#include "gtktextbtree.h" +#include "gtktextbtreeprivate.h" #include "gtktextiterprivate.h" #include "gtktexttagprivate.h" #include "gtktexttagtableprivate.h" -#include "gtkpango.h" +#include "gtkpangoprivate.h" #include "gtkprivate.h" #define DEFAULT_MAX_UNDO 200 diff --git a/gtk/gtktextbufferprivate.h b/gtk/gtktextbufferprivate.h index ef22648ac5..941bc6f05d 100644 --- a/gtk/gtktextbufferprivate.h +++ b/gtk/gtktextbufferprivate.h @@ -19,7 +19,7 @@ #define __GTK_TEXT_BUFFER_PRIVATE_H__ #include -#include "gtktexttypes.h" +#include "gtktexttypesprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c index c64654835c..b3ca5908f6 100644 --- a/gtk/gtktextchild.c +++ b/gtk/gtktextchild.c @@ -49,7 +49,7 @@ #include "config.h" #include "gtktextchild.h" -#include "gtktextbtree.h" +#include "gtktextbtreeprivate.h" #include "gtktextlayoutprivate.h" #include "gtkprivate.h" diff --git a/gtk/gtktextchildprivate.h b/gtk/gtktextchildprivate.h index b3d1127f7a..e8e94b51d7 100644 --- a/gtk/gtktextchildprivate.h +++ b/gtk/gtktextchildprivate.h @@ -50,7 +50,7 @@ #ifndef __GTK_TEXT_CHILD_PRIVATE_H__ #define __GTK_TEXT_CHILD_PRIVATE_H__ -#include +#include G_BEGIN_DECLS diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index fcc4597656..9ffbf581a3 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -24,7 +24,7 @@ #include "config.h" #include "gtktextiter.h" -#include "gtktextbtree.h" +#include "gtktextbtreeprivate.h" #include "gtktextbufferprivate.h" #include "gtktextiterprivate.h" #include "gtkdebug.h" diff --git a/gtk/gtktextiterprivate.h b/gtk/gtktextiterprivate.h index e9503995f7..d044cdc8cc 100644 --- a/gtk/gtktextiterprivate.h +++ b/gtk/gtktextiterprivate.h @@ -30,8 +30,8 @@ G_BEGIN_DECLS #include -#include -#include +#include +#include GtkTextLineSegment *_gtk_text_iter_get_indexable_segment (const GtkTextIter *iter); GtkTextLineSegment *_gtk_text_iter_get_any_segment (const GtkTextIter *iter); diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index f394984977..ce97ff6252 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -82,12 +82,12 @@ #include "gtkcsscolorvalueprivate.h" #include "gtkmarshalers.h" #include "gtkstylecontextprivate.h" -#include "gtktextbtree.h" +#include "gtktextbtreeprivate.h" #include "gtktextbufferprivate.h" #include "gtktextiterprivate.h" #include "gtktextlinedisplaycacheprivate.h" -#include "gtktextutil.h" -#include "gskpango.h" +#include "gtktextutilprivate.h" +#include "gskpangoprivate.h" #include "gtksnapshotprivate.h" #include "gtkwidgetprivate.h" #include "gtktextviewprivate.h" diff --git a/gtk/gtktextlayoutprivate.h b/gtk/gtktextlayoutprivate.h index 480d1ada62..1aff8acf72 100644 --- a/gtk/gtktextlayoutprivate.h +++ b/gtk/gtktextlayoutprivate.h @@ -79,7 +79,7 @@ #define __GTK_TEXT_LAYOUT_PRIVATE_H__ #include -#include +#include G_BEGIN_DECLS diff --git a/gtk/gtktextlinedisplaycache.c b/gtk/gtktextlinedisplaycache.c index 414d533cc2..1269f5654d 100644 --- a/gtk/gtktextlinedisplaycache.c +++ b/gtk/gtktextlinedisplaycache.c @@ -19,7 +19,7 @@ #include "config.h" -#include "gtktextbtree.h" +#include "gtktextbtreeprivate.h" #include "gtktextbufferprivate.h" #include "gtktextiterprivate.h" #include "gtktextlinedisplaycacheprivate.h" diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c index ac4a2f1f22..f1c5edb4be 100644 --- a/gtk/gtktextmark.c +++ b/gtk/gtktextmark.c @@ -48,7 +48,7 @@ */ #include "config.h" -#include "gtktextbtree.h" +#include "gtktextbtreeprivate.h" #include "gtkprivate.h" diff --git a/gtk/gtktextmarkprivate.h b/gtk/gtktextmarkprivate.h index ca09d46149..7e584ad0f2 100644 --- a/gtk/gtktextmarkprivate.h +++ b/gtk/gtktextmarkprivate.h @@ -25,7 +25,7 @@ #ifndef __GTK_TEXT_MARK_PRIVATE_H__ #define __GTK_TEXT_MARK_PRIVATE_H__ -#include +#include #include "gtktextlayoutprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtktextsegment.c b/gtk/gtktextsegment.c index 0680b73cfa..e243b5a267 100644 --- a/gtk/gtktextsegment.c +++ b/gtk/gtktextsegment.c @@ -51,7 +51,7 @@ */ #include "config.h" -#include "gtktextbtree.h" +#include "gtktextbtreeprivate.h" #include #include #include diff --git a/gtk/gtktextsegment.h b/gtk/gtktextsegmentprivate.h similarity index 98% rename from gtk/gtktextsegment.h rename to gtk/gtktextsegmentprivate.h index ce093d4301..7f59f28e99 100644 --- a/gtk/gtktextsegment.h +++ b/gtk/gtktextsegmentprivate.h @@ -22,8 +22,8 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef __GTK_TEXT_SEGMENT_H__ -#define __GTK_TEXT_SEGMENT_H__ +#ifndef __GTK_TEXT_SEGMENT_PRIVATE_H__ +#define __GTK_TEXT_SEGMENT_PRIVATE_H__ #include #include diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 397dac13af..7d28a8996f 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -76,7 +76,7 @@ #include #include "gtktexttag.h" -#include "gtktexttypes.h" +#include "gtktexttypesprivate.h" #include "gtktexttagtable.h" #include "gtktexttagtableprivate.h" #include "gtkmarshalers.h" diff --git a/gtk/gtktexttagprivate.h b/gtk/gtktexttagprivate.h index 57ce42c2c6..4092fc1532 100644 --- a/gtk/gtktexttagprivate.h +++ b/gtk/gtktexttagprivate.h @@ -26,7 +26,7 @@ #define __GTK_TEXT_TAG_PRIVATE_H__ #include -#include +#include typedef struct _GtkTextBTreeNode GtkTextBTreeNode; diff --git a/gtk/gtktexttypes.c b/gtk/gtktexttypes.c index f9646ac9b8..6b5ee3c5a1 100644 --- a/gtk/gtktexttypes.c +++ b/gtk/gtktexttypes.c @@ -23,7 +23,7 @@ */ #include "config.h" -#include "gtktexttypes.h" +#include "gtktexttypesprivate.h" /* These are used to represent embedded non-character objects * if you return a string representation of a text buffer diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypesprivate.h similarity index 97% rename from gtk/gtktexttypes.h rename to gtk/gtktexttypesprivate.h index 1d799ee952..c996e184c0 100644 --- a/gtk/gtktexttypes.h +++ b/gtk/gtktexttypesprivate.h @@ -22,8 +22,8 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef __GTK_TEXT_TYPES_H__ -#define __GTK_TEXT_TYPES_H__ +#ifndef __GTK_TEXT_TYPES_PRIVATE_H__ +#define __GTK_TEXT_TYPES_PRIVATE_H__ #include #include diff --git a/gtk/gtktextutil.c b/gtk/gtktextutil.c index 425ae65a2b..0ec6216dbe 100644 --- a/gtk/gtktextutil.c +++ b/gtk/gtktextutil.c @@ -25,7 +25,7 @@ #include "config.h" #include "gtktextview.h" -#include "gtktextutil.h" +#include "gtktextutilprivate.h" #include "gtkcsscolorvalueprivate.h" #include "gtkstylecontextprivate.h" diff --git a/gtk/gtktextutil.h b/gtk/gtktextutilprivate.h similarity index 94% rename from gtk/gtktextutil.h rename to gtk/gtktextutilprivate.h index 512532c4d0..11e47a74a5 100644 --- a/gtk/gtktextutil.h +++ b/gtk/gtktextutilprivate.h @@ -22,8 +22,8 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#ifndef __GTK_TEXT_UTIL_H__ -#define __GTK_TEXT_UTIL_H__ +#ifndef __GTK_TEXT_UTIL_PRIVATE_H__ +#define __GTK_TEXT_UTIL_PRIVATE_H__ G_BEGIN_DECLS @@ -48,4 +48,4 @@ gboolean _gtk_text_util_get_block_cursor_location (PangoLayout *layout, G_END_DECLS -#endif /* __GTK_TEXT_UTIL_H__ */ +#endif /* __GTK_TEXT_UTIL_PRIVATE_H__ */ diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 7277035dbe..754083b9a1 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -42,7 +42,7 @@ #include "gtktextiterprivate.h" #include "gtkimmulticontext.h" #include "gtkprivate.h" -#include "gtktextutil.h" +#include "gtktextutilprivate.h" #include "gtkwidgetprivate.h" #include "gtkwindow.h" #include "gtkscrollable.h" @@ -53,7 +53,7 @@ #include "gtkpopover.h" #include "gtkmagnifierprivate.h" #include "gtkemojichooser.h" -#include "gtkpango.h" +#include "gtkpangoprivate.h" #include "gtknative.h" #include "gtkwidgetprivate.h" #include "gtkjoinedmenuprivate.h" diff --git a/gtk/gtktextviewprivate.h b/gtk/gtktextviewprivate.h index 13d9af255e..1cc9b79147 100644 --- a/gtk/gtktextviewprivate.h +++ b/gtk/gtktextviewprivate.h @@ -20,7 +20,7 @@ #define __GTK_TEXT_VIEW_PRIVATE_H__ #include "gtktextview.h" -#include "gtktextattributes.h" +#include "gtktextattributesprivate.h" #include "gtkcssnodeprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtktrashmonitor.c b/gtk/gtktrashmonitor.c index 3990d65852..94dfca819b 100644 --- a/gtk/gtktrashmonitor.c +++ b/gtk/gtktrashmonitor.c @@ -22,7 +22,7 @@ #include "gtkprivate.h" #include "gtkmarshalers.h" -#include "gtktrashmonitor.h" +#include "gtktrashmonitorprivate.h" #define UPDATE_RATE_SECONDS 1 diff --git a/gtk/gtktrashmonitor.h b/gtk/gtktrashmonitorprivate.h similarity index 93% rename from gtk/gtktrashmonitor.h rename to gtk/gtktrashmonitorprivate.h index 619d5c3304..32bdc05536 100644 --- a/gtk/gtktrashmonitor.h +++ b/gtk/gtktrashmonitorprivate.h @@ -18,8 +18,8 @@ * Authors: Federico Mena Quintero */ -#ifndef __GTK_TRASH_MONITOR_H__ -#define __GTK_TRASH_MONITOR_H__ +#ifndef __GTK_TRASH_MONITOR_PRIVATE_H__ +#define __GTK_TRASH_MONITOR_PRIVATE_H__ #include @@ -44,4 +44,4 @@ gboolean _gtk_trash_monitor_get_has_trash (GtkTrashMonitor *monitor); G_END_DECLS -#endif /* __GTK_TRASH_MONITOR_H__ */ +#endif /* __GTK_TRASH_MONITOR_PRIVATE_H__ */ diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c index b5a479ad29..4e35edbe56 100644 --- a/gtk/gtktreedatalist.c +++ b/gtk/gtktreedatalist.c @@ -19,7 +19,7 @@ */ #include "config.h" -#include "gtktreedatalist.h" +#include "gtktreedatalistprivate.h" #include /* node allocation diff --git a/gtk/gtktreedatalist.h b/gtk/gtktreedatalistprivate.h similarity index 95% rename from gtk/gtktreedatalist.h rename to gtk/gtktreedatalistprivate.h index 676311786f..77aa710961 100644 --- a/gtk/gtktreedatalist.h +++ b/gtk/gtktreedatalistprivate.h @@ -15,8 +15,8 @@ * License along with this library. If not, see . */ -#ifndef __GTK_TREE_DATA_LIST_H__ -#define __GTK_TREE_DATA_LIST_H__ +#ifndef __GTK_TREE_DATA_LIST_PRIVATE_H__ +#define __GTK_TREE_DATA_LIST_PRIVATE_H__ #include #include @@ -78,4 +78,4 @@ GList *_gtk_tree_data_list_set_header (GList * gpointer data, GDestroyNotify destroy); -#endif /* __GTK_TREE_DATA_LIST_H__ */ +#endif /* __GTK_TREE_DATA_LIST_PRIVATE_H__ */ diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index ee4bbcfe14..0d800da62d 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -22,7 +22,7 @@ #include "gtktreemodelsort.h" #include "gtktreesortable.h" #include "gtktreestore.h" -#include "gtktreedatalist.h" +#include "gtktreedatalistprivate.h" #include "gtkprivate.h" #include "gtktreednd.h" diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 81ce21a674..308f1c2853 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -20,7 +20,7 @@ #include #include "gtktreemodel.h" #include "gtktreestore.h" -#include "gtktreedatalist.h" +#include "gtktreedatalistprivate.h" #include "gtktreednd.h" #include "gtkbuildable.h" #include "gtkbuilderprivate.h" diff --git a/testsuite/gtk/textbuffer.c b/testsuite/gtk/textbuffer.c index f500cd65f3..13409314d7 100644 --- a/testsuite/gtk/textbuffer.c +++ b/testsuite/gtk/textbuffer.c @@ -21,7 +21,7 @@ #include #include -#include "gtk/gtktexttypes.h" /* Private header, for UNKNOWN_CHAR */ +#include "gtk/gtktexttypesprivate.h" /* Private header, for UNKNOWN_CHAR */ #include "gtk/gtktextbufferprivate.h" /* Private header */ static void