[gtk+] gtkcontainer: Move private functions to private header



commit 7b0d77def54fa0e95fd9a82a2cd2c90e89ecdcd1
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Jun 6 00:31:59 2011 +0100

    gtkcontainer: Move private functions to private header
    
    https://bugzilla.gnome.org/show_bug.cgi?id=651707

 gtk/Makefile.am           |    1 +
 gtk/gtkcontainer.c        |    1 +
 gtk/gtkcontainer.h        |   16 ----------------
 gtk/gtkcontainerprivate.h |   44 ++++++++++++++++++++++++++++++++++++++++++++
 gtk/gtkmenubar.c          |    1 +
 gtk/gtkoffscreenwindow.c  |    1 +
 gtk/gtksizegroup.c        |    1 +
 gtk/gtkwidget.c           |    1 +
 gtk/gtkwindow.c           |    1 +
 9 files changed, 51 insertions(+), 16 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 19b187a..1fd9555 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -386,6 +386,7 @@ gtk_private_h_sources =		\
 	gtkbuilderprivate.h	\
 	gtkbuttonprivate.h	\
 	gtkcellareaboxcontextprivate.h	\
+	gtkcontainerprivate.h   \
 	gtkcssparserprivate.h	\
 	gtkcssproviderprivate.h	\
 	gtkcssselectorprivate.h	\
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 4b27fd6..fc27dd1 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include "gtkcontainer.h"
+#include "gtkcontainerprivate.h"
 
 #include <stdarg.h>
 #include <string.h>
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index a19d90f..afd2ace 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -221,22 +221,6 @@ void    gtk_container_forall		     (GtkContainer *container,
 
 void    gtk_container_class_handle_border_width (GtkContainerClass *klass);
 
-/* Non-public methods */
-void	_gtk_container_queue_resize	     (GtkContainer *container);
-void	_gtk_container_resize_invalidate     (GtkContainer *container);
-void    _gtk_container_clear_resize_widgets   (GtkContainer *container);
-gchar*	_gtk_container_child_composite_name   (GtkContainer *container,
-					      GtkWidget	   *child);
-void   _gtk_container_dequeue_resize_handler (GtkContainer *container);
-GList *_gtk_container_focus_sort             (GtkContainer     *container,
-					      GList            *children,
-					      GtkDirectionType  direction,
-					      GtkWidget        *old_focus);
-gboolean _gtk_container_get_need_resize      (GtkContainer     *container);
-void     _gtk_container_set_need_resize      (GtkContainer     *container,
-                                              gboolean          need_resize);
-gboolean _gtk_container_get_reallocate_redraws (GtkContainer   *container);
-
 GtkWidgetPath * gtk_container_get_path_for_child (GtkContainer      *container,
                                                   GtkWidget         *child);
 
diff --git a/gtk/gtkcontainerprivate.h b/gtk/gtkcontainerprivate.h
new file mode 100644
index 0000000..4d77979
--- /dev/null
+++ b/gtk/gtkcontainerprivate.h
@@ -0,0 +1,44 @@
+/* GTK - The GIMP Toolkit
+ *
+ * Copyright (C) 2011 Javier Jardón
+ *
+ * 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.1 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/>.
+ */
+
+
+#ifndef __GTK_CONTAINER_PRIVATE_H__
+#define __GTK_CONTAINER_PRIVATE_H__
+
+G_BEGIN_DECLS
+
+
+void     _gtk_container_queue_resize           (GtkContainer *container);
+void     _gtk_container_resize_invalidate      (GtkContainer *container);
+void     _gtk_container_clear_resize_widgets   (GtkContainer *container);
+gchar*   _gtk_container_child_composite_name   (GtkContainer *container,
+                                                GtkWidget    *child);
+void     _gtk_container_dequeue_resize_handler (GtkContainer *container);
+GList *  _gtk_container_focus_sort             (GtkContainer     *container,
+                                                GList            *children,
+                                                GtkDirectionType  direction,
+                                                GtkWidget        *old_focus);
+gboolean _gtk_container_get_need_resize        (GtkContainer *container);
+void     _gtk_container_set_need_resize        (GtkContainer *container,
+                                                gboolean      need_resize);
+gboolean _gtk_container_get_reallocate_redraws (GtkContainer *container);
+
+
+G_END_DECLS
+
+#endif /* __GTK_CONTAINER_PRIVATE_H__ */
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 521f814..c54bc79 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -48,6 +48,7 @@
 #include "gtksettings.h"
 #include "gtksizerequest.h"
 #include "gtkwindow.h"
+#include "gtkcontainerprivate.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
diff --git a/gtk/gtkoffscreenwindow.c b/gtk/gtkoffscreenwindow.c
index a787e6b..7be0fb3 100644
--- a/gtk/gtkoffscreenwindow.c
+++ b/gtk/gtkoffscreenwindow.c
@@ -22,6 +22,7 @@
 
 #include "gtkoffscreenwindow.h"
 #include "gtkwidgetprivate.h"
+#include "gtkcontainerprivate.h"
 #include "gtkprivate.h"
 
 /**
diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index 27324cf..ba9a803 100644
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -28,6 +28,7 @@
 #include "gtkprivate.h"
 #include "gtksizegroup-private.h"
 #include "gtkwidgetprivate.h"
+#include "gtkcontainerprivate.h"
 
 
 /**
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 95079d9..17ebd44 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -48,6 +48,7 @@
 #include "gtkwidget.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindowprivate.h"
+#include "gtkcontainerprivate.h"
 #include "gtkbindings.h"
 #include "gtkprivate.h"
 #include "gtkaccessible.h"
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index cf476ac..76d029e 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -48,6 +48,7 @@
 #include "gtkplug.h"
 #include "gtkbuildable.h"
 #include "gtkwidgetprivate.h"
+#include "gtkcontainerprivate.h"
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]