Split off gtkprivate.h

The gtkprivate.h header contains GtkWidget-specific private symbols that
are not useful except in a handful of cases. Basically everything
includes gtkprivate.h for the GTK_PARAM_* macros.

https://bugzilla.gnome.org/show_bug.cgi?id=632539

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index bac21b31746d1abd7ba2bfcc4d53aa5bc4d64c4b..2f77957b0626f871952f886efc1cae0b204557b0 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -16,7 +16,7 @@ GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %
 endif
 
 SUBDIRS = theme-bits . tests
-DIST_SUBDIRS=theme-bits tests
+DIST_SUBDIRS = theme-bits tests
 
 if HAVE_PAPI_CUPS
 GTK_PRINT_BACKENDS=file,papi,cups
@@ -396,6 +396,7 @@ gtk_private_h_sources =             \
        gtktreedatalist.h       \
        gtktreeprivate.h        \
        gtkwindow-decorate.h    \
+       gtkwidgetprivate.h      \
        $(gtk_clipboard_dnd_h_sources)
 
 # GTK+ C sources to build the library from

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 2a2555ffdb2f38bb3af1a1d17bc12533b659cf22..f80b6338934d6b2da7257f079254fc910825d441 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -38,6 +38,7 @@
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtksizerequest.h"
+#include "gtkwidgetprivate.h"
 #include "gtkwindow.h"
 #include "gtkintl.h"
 #include "gtktoolbar.h"

diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 9d4e24856fe3ad774f810ade43c513418f895c65..04f3c55cf7c013ab55ae690f6a5a6f7f25138f1a 100644 (file)
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -21,6 +21,8 @@
 #include "config.h"
 #include <string.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "gtkfilefilter.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"

diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c
index 942986d49a0b2a83c4f2ff3431365dde3fbb5e11..55baa8412d504ceccdd201ffbd0f4f552c129a9e 100644 (file)
--- a/gtk/gtkinvisible.c
+++ b/gtk/gtkinvisible.c
@@ -27,6 +27,7 @@
 #include "config.h"
 #include <gdk/gdk.h>
 #include "gtkinvisible.h"
+#include "gtkwidgetprivate.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 42ac35f1ca78aa16ec6b15c6634638cdb1d34bc5..a4d067aa3c53dc59fd161e3aed9e3aa048c1f085 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -59,7 +59,7 @@
 #include "gtkrecentmanager.h"
 #include "gtkselection.h"
 #include "gtksettings.h"
-#include "gtkwidget.h"
+#include "gtkwidgetprivate.h"
 #include "gtkwindow.h"
 #include "gtktooltip.h"
 #include "gtkdebug.h"

diff --git a/gtk/gtkoffscreenwindow.c b/gtk/gtkoffscreenwindow.c
index ee37a9ae1dbea272ec7feb1f59e6c23f77581dc4..e918a1c0ea1f62301da1c3ec2ec441f4c9cbf5c3 100644 (file)
--- a/gtk/gtkoffscreenwindow.c
+++ b/gtk/gtkoffscreenwindow.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include "gtkoffscreenwindow.h"
-
+#include "gtkwidgetprivate.h"
 #include "gtkprivate.h"
 
 /**

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index fa5e5358226994fcf92a1a803145f8464dc17728..f8a19ffe3a4beb0435f3790b430ae68cc4cec170 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -33,6 +33,7 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkplugprivate.h"
+#include "gtkwidgetprivate.h"
 #include "gtkwindow.h"
 
 /**

diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h
index d8fd0c021b5830126e85f129768d3325029d18a2..9060702002278acec0c7c5d3b1498fadb383dd81 100644 (file)
--- a/gtk/gtkprivate.h
+++ b/gtk/gtkprivate.h
@@ -1,69 +1,10 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * 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/.
- */
-
 #ifndef __GTK_PRIVATE_H__
 #define __GTK_PRIVATE_H__
 
-#include <gtk/gtkwidget.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
-void         _gtk_widget_set_visible_flag   (GtkWidget *widget,
-                                             gboolean   visible);
-gboolean     _gtk_widget_get_resize_pending (GtkWidget *widget);
-void         _gtk_widget_set_resize_pending (GtkWidget *widget,
-                                             gboolean   resize_pending);
-gboolean     _gtk_widget_get_in_reparent    (GtkWidget *widget);
-void         _gtk_widget_set_in_reparent    (GtkWidget *widget,
-                                             gboolean   in_reparent);
-gboolean     _gtk_widget_get_anchored       (GtkWidget *widget);
-void         _gtk_widget_set_anchored       (GtkWidget *widget,
-                                             gboolean   anchored);
-gboolean     _gtk_widget_get_shadowed       (GtkWidget *widget);
-void         _gtk_widget_set_shadowed       (GtkWidget *widget,
-                                             gboolean   shadowed);
-gboolean     _gtk_widget_get_alloc_needed   (GtkWidget *widget);
-void         _gtk_widget_set_alloc_needed   (GtkWidget *widget,
-                                             gboolean   alloc_needed);
-gboolean     _gtk_widget_get_width_request_needed  (GtkWidget *widget);
-void         _gtk_widget_set_width_request_needed  (GtkWidget *widget,
-                                                    gboolean   width_request_needed);
-gboolean     _gtk_widget_get_height_request_needed (GtkWidget *widget);
-void         _gtk_widget_set_height_request_needed (GtkWidget *widget,
-                                                    gboolean   height_request_needed);
-
-void _gtk_widget_override_size_request (GtkWidget *widget,
-                                       int        width,
-                                       int        height,
-                                       int       *old_width,
-                                       int       *old_height);
-void _gtk_widget_restore_size_request  (GtkWidget *widget,
-                                       int        old_width,
-                                       int        old_height);
-
 #ifdef G_OS_WIN32
 
 const gchar *_gtk_get_datadir ();
@@ -85,10 +26,6 @@ const gchar *_gtk_get_data_prefix ();
 
 #endif /* G_OS_WIN32 */
 
-gboolean _gtk_fnmatch (const char *pattern,
-                      const char *string,
-                      gboolean    no_leading_period);
-
 #define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
 #define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
 #define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
@@ -102,30 +39,9 @@ gboolean _gtk_fnmatch (const char *pattern,
 #define GTK_DEFAULT_ACCEL_MOD_MASK GDK_META_MASK
 #endif
 
-
-/* With GtkWidget     , a widget may be requested
- * its width for 2 or maximum 3 heights in one resize
- * (Note this define is limited by the bitfield sizes
- * defined on the SizeRequestCache structure).
- */
-#define GTK_SIZE_REQUEST_CACHED_SIZES 3
-
-typedef struct
-{
-  gint   for_size;
-  gint   minimum_size;
-  gint   natural_size;
-} SizeRequest;
-
-typedef struct {
-  SizeRequest widths[GTK_SIZE_REQUEST_CACHED_SIZES];
-  SizeRequest heights[GTK_SIZE_REQUEST_CACHED_SIZES];
-  guint       cached_widths : 2;
-  guint       cached_heights : 2;
-  guint       last_cached_width : 2;
-  guint       last_cached_height : 2;
-} SizeRequestCache;
-
+gboolean _gtk_fnmatch (const char *pattern,
+                      const char *string,
+                      gboolean    no_leading_period);
 
 G_END_DECLS
 

diff --git a/gtk/gtkrecentfilter.c b/gtk/gtkrecentfilter.c
index 1f2b1fbf2dcb0b5d8dd8464d5239348e3ccf0b99..40897053c5a3faeb65ba36eaa3b42d3790c2ecda 100644 (file)
--- a/gtk/gtkrecentfilter.c
+++ b/gtk/gtkrecentfilter.c
@@ -21,6 +21,8 @@
 #include "config.h"
 #include <string.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "gtkrecentfilter.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"

diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index c14f9e5af44f6bed58718e4224354fecf7a31aae..19b7cee18eae49a8c0d9de918975a7df345a73c3 100644 (file)
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -103,6 +103,7 @@
 
 #include "gtkrecentmanager.h"
 #include "gtkintl.h"
+#include "gtksettings.h"
 #include "gtkstock.h"
 #include "gtkicontheme.h"
 #include "gtktypebuiltins.h"

diff --git a/gtk/gtksearchenginesimple.c b/gtk/gtksearchenginesimple.c
index f311c192f3e283964b19c4ccbdd21322c9b0e6f9..20698b2543b3f74ee8877c23411cfdb731771ec8 100644 (file)
--- a/gtk/gtksearchenginesimple.c
+++ b/gtk/gtksearchenginesimple.c
@@ -34,6 +34,8 @@
 #include <ftw.h>
 #endif
 
+#include <gdk/gdk.h>
+
 #include "gtksearchenginesimple.h"
 #include "gtkprivate.h"
 
@@ -188,6 +190,7 @@ send_batch (SearchThreadData *data)
       
       gdk_threads_add_idle (search_thread_add_hits_idle, hits);
     }
+
   data->uri_hits = NULL;
 }
 

diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index 62ce9ea7e203669f18505eeb05b242f424081837..be24f64869c2233cc2c7be4b69d373eae1fcacc4 100644 (file)
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -20,13 +20,13 @@
 
 #include "config.h"
 #include <string.h>
+
+#include "gtkbuildable.h"
 #include "gtkcontainer.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtksizegroup-private.h"
-#include "gtkbuildable.h"
-
-
+#include "gtkwidgetprivate.h"
 
 struct _GtkSizeGroupPrivate
 {

diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c
index c3d0398fac439ced08594922a79d839d6fd04f2c..55979f41b5b4753f77b9d80a6f53d35d4be18efd 100644 (file)
--- a/gtk/gtksizerequest.c
+++ b/gtk/gtksizerequest.c
@@ -22,11 +22,14 @@
  */
 
 #include <config.h>
+
 #include "gtksizerequest.h"
-#include "gtksizegroup-private.h"
+
 #include "gtkdebug.h"
-#include "gtkprivate.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
+#include "gtksizegroup-private.h"
+#include "gtkwidgetprivate.h"
 
 /* looks for a cached size request for this for_size. If not
  * found, returns the oldest entry so it can be overwritten

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 3c28fdebb0dd37c0fccfa466d7b0c45579fe4100..a41a2479bc91d233407745e2c99e18a025a8cec5 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -47,6 +47,7 @@
 #include "gdk/gdkkeysyms.h"
 #include "gtkprivate.h"
 #include "gtktextutil.h"
+#include "gtkwidgetprivate.h"
 #include "gtkwindow.h"
 
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 662b7e0940b96c912dd58a89f2746f4b6da516b8..6dc0bfaf106e64d92df79477e9b0405086796aa2 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -45,6 +45,7 @@
 #include "gtktreemodelsort.h"
 #include "gtktooltip.h"
 #include "gtkprivate.h"
+#include "gtkwidgetprivate.h"
 
 #define GTK_TREE_VIEW_PRIORITY_VALIDATE (GDK_PRIORITY_REDRAW + 5)
 #define GTK_TREE_VIEW_PRIORITY_SCROLL_SYNC (GTK_TREE_VIEW_PRIORITY_VALIDATE + 2)

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 38fab006bbcae7de107ad0aa6e0ce778bf72f21f..98429e1b45ba49a85ab3d5ba89d3faaea25c2e39 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -42,6 +42,7 @@
 #include "gtksettings.h"
 #include "gtksizegroup-private.h"
 #include "gtkwidget.h"
+#include "gtkwidgetprivate.h"
 #include "gtkwindow.h"
 #include "gtkbindings.h"
 #include "gtkprivate.h"

diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
new file mode 100644 (file)
index 0000000..b31efd9
--- /dev/null
+++ b/gtk/gtkwidgetprivate.h
@@ -0,0 +1,93 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * 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/.
+ */
+
+#ifndef __GTK_WIDGET_PRIVATE_H__
+#define __GTK_WIDGET_PRIVATE_H__
+
+G_BEGIN_DECLS
+
+/* With GtkWidget, a widget may be requested
+ * its width for 2 or maximum 3 heights in one resize
+ * (Note this define is limited by the bitfield sizes
+ * defined on the SizeRequestCache structure).
+ */
+#define GTK_SIZE_REQUEST_CACHED_SIZES   (3)
+
+typedef struct
+{
+  /* the size this request is for */
+  gint for_size;
+
+  gint minimum_size;
+  gint natural_size;
+} SizeRequest;
+
+typedef struct {
+  SizeRequest widths[GTK_SIZE_REQUEST_CACHED_SIZES];
+  SizeRequest heights[GTK_SIZE_REQUEST_CACHED_SIZES];
+
+  guint       cached_widths      : 2;
+  guint       cached_heights     : 2;
+  guint       last_cached_width  : 2;
+  guint       last_cached_height : 2;
+} SizeRequestCache;
+
+void         _gtk_widget_set_visible_flag   (GtkWidget *widget,
+                                             gboolean   visible);
+gboolean     _gtk_widget_get_resize_pending (GtkWidget *widget);
+void         _gtk_widget_set_resize_pending (GtkWidget *widget,
+                                             gboolean   resize_pending);
+gboolean     _gtk_widget_get_in_reparent    (GtkWidget *widget);
+void         _gtk_widget_set_in_reparent    (GtkWidget *widget,
+                                             gboolean   in_reparent);
+gboolean     _gtk_widget_get_anchored       (GtkWidget *widget);
+void         _gtk_widget_set_anchored       (GtkWidget *widget,
+                                             gboolean   anchored);
+gboolean     _gtk_widget_get_shadowed       (GtkWidget *widget);
+void         _gtk_widget_set_shadowed       (GtkWidget *widget,
+                                             gboolean   shadowed);
+gboolean     _gtk_widget_get_alloc_needed   (GtkWidget *widget);
+void         _gtk_widget_set_alloc_needed   (GtkWidget *widget,
+                                             gboolean   alloc_needed);
+gboolean     _gtk_widget_get_width_request_needed  (GtkWidget *widget);
+void         _gtk_widget_set_width_request_needed  (GtkWidget *widget,
+                                                    gboolean   width_request_needed);
+gboolean     _gtk_widget_get_height_request_needed (GtkWidget *widget);
+void         _gtk_widget_set_height_request_needed (GtkWidget *widget,
+                                                    gboolean   height_request_needed);
+
+void _gtk_widget_override_size_request (GtkWidget *widget,
+                                       int        width,
+                                       int        height,
+                                       int       *old_width,
+                                       int       *old_height);
+void _gtk_widget_restore_size_request  (GtkWidget *widget,
+                                       int        old_width,
+                                       int        old_height);
+
+G_END_DECLS
+
+#endif /* __GTK_WIDGET_PRIVATE_H__ */

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 00b4aaa397ae2bfec562010cd1a87946d912ae59..7db0793e5dc4d0449955c617ad688f1d133be189 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -47,8 +47,8 @@
 #include "gtkicontheme.h"
 #include "gtkmarshalers.h"
 #include "gtkplug.h"
-#include "gtkprivate.h"
 #include "gtkbuildable.h"
+#include "gtkwidgetprivate.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"