From 3756d92367c2485c20a9c64d0f95e089bc187a95 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 4 Feb 2016 13:37:50 +0100 Subject: [PATCH] Move private widget path functions away We don't put private functions in public headers anymore. https://bugzilla.gnome.org/show_bug.cgi?id=761339 --- gtk/Makefile.am | 1 + gtk/gtkcssnodedeclaration.c | 1 + gtk/gtkwidget.c | 1 + gtk/gtkwidgetpath.c | 1 + gtk/gtkwidgetpath.h | 5 ----- gtk/gtkwidgetpathprivate.h | 31 +++++++++++++++++++++++++++++++ 6 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 gtk/gtkwidgetpathprivate.h diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 5afd1a101b..53b163f7fb 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -560,6 +560,7 @@ gtk_private_h_sources = \ gtktreedatalist.h \ gtktreeprivate.h \ gtkwidgetprivate.h \ + gtkwidgetpathprivate.h \ gtkwin32themeprivate.h \ gtkwindowprivate.h \ gtktreemenu.h \ diff --git a/gtk/gtkcssnodedeclaration.c b/gtk/gtkcssnodedeclaration.c index 78441c8cb0..ca6324aec6 100644 --- a/gtk/gtkcssnodedeclaration.c +++ b/gtk/gtkcssnodedeclaration.c @@ -18,6 +18,7 @@ #include "config.h" #include "gtkcssnodedeclarationprivate.h" +#include "gtkwidgetpathprivate.h" #include diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 7a05c5654f..3b7b062436 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -68,6 +68,7 @@ #include "a11y/gtkwidgetaccessible.h" #include "gtkapplicationprivate.h" #include "gtkgestureprivate.h" +#include "gtkwidgetpathprivate.h" /* for the use of round() */ #include "fallback-c89.c" diff --git a/gtk/gtkwidgetpath.c b/gtk/gtkwidgetpath.c index f0297dff32..2a5ad19871 100644 --- a/gtk/gtkwidgetpath.c +++ b/gtk/gtkwidgetpath.c @@ -26,6 +26,7 @@ #include "gtkstylecontextprivate.h" #include "gtktypebuiltins.h" #include "gtkwidget.h" +#include "gtkwidgetpathprivate.h" /** * SECTION:gtkwidgetpath diff --git a/gtk/gtkwidgetpath.h b/gtk/gtkwidgetpath.h index 6ef1dbc7bd..52b03b5603 100644 --- a/gtk/gtkwidgetpath.h +++ b/gtk/gtkwidgetpath.h @@ -171,11 +171,6 @@ GDK_AVAILABLE_IN_ALL gboolean gtk_widget_path_has_parent (const GtkWidgetPath *path, GType type); -/* private API goes here */ - -void gtk_widget_path_iter_add_qclass (GtkWidgetPath *path, - gint pos, - GQuark qname); G_END_DECLS diff --git a/gtk/gtkwidgetpathprivate.h b/gtk/gtkwidgetpathprivate.h new file mode 100644 index 0000000000..5a7bfb5388 --- /dev/null +++ b/gtk/gtkwidgetpathprivate.h @@ -0,0 +1,31 @@ +/* GTK - The GIMP Toolkit + * Copyright (C) 2010 Carlos Garnacho + * + * 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 . + */ + +#ifndef __GTK_WIDGET_PATH_PRIVATE_H__ +#define __GTK_WIDGET_PATH_PRIVATE_H__ + +#include + +G_BEGIN_DECLS + +void gtk_widget_path_iter_add_qclass (GtkWidgetPath *path, + gint pos, + GQuark qname); + +G_END_DECLS + +#endif /* __GTK_WIDGET_PATH_PRIVATE_H__ */