[gtk+] Clean up private headers
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Clean up private headers
- Date: Sat, 5 Apr 2014 06:06:40 +0000 (UTC)
commit fee33b1a8148c1315b9db6a18719b355b78ddde1
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Apr 5 02:04:12 2014 -0400
Clean up private headers
This commit adds a few missing private headers, and cleans up
some irregularities in the existing ones
gtk/Makefile.am | 2 +
gtk/a11y/gtkimageaccessible.c | 1 +
gtk/gtkaccelgroup.h | 15 ----------
gtk/gtkaccelgroupprivate.h | 20 +++++++++++++-
gtk/gtkaccelmap.c | 1 +
gtk/gtkaccelmapprivate.h | 4 ---
gtk/gtkappchooserprivate.h | 5 +++
gtk/gtkapplication-quartz-menu.c | 2 +-
gtk/gtkapplicationprivate.h | 34 +++---------------------
gtk/gtkclipboard-waylandprivate.h | 4 +++
gtk/gtkclipboardprivate.h | 4 +++
gtk/gtkcoloreditorprivate.h | 7 -----
gtk/gtkcolorplaneprivate.h | 7 -----
gtk/gtkcolorscaleprivate.h | 9 ------
gtk/gtkcolorswatchprivate.h | 22 ++-------------
gtk/gtkheaderbarprivate.h | 4 +++
gtk/gtknumerableiconprivate.h | 4 +++
gtk/gtkpressandholdprivate.h | 5 ---
gtk/gtkrange.c | 1 +
gtk/gtkrange.h | 16 -----------
gtk/gtkrangeprivate.h | 53 +++++++++++++++++++++++++++++++++++++
gtk/gtkscale.c | 1 +
gtk/gtkscrollbar.c | 1 +
gtk/gtkscrolledwindow.c | 1 +
gtk/gtkselectionprivate.h | 6 ++--
gtk/gtkseparatortoolitem.c | 2 +-
gtk/gtksizegroup-private.h | 6 +++-
gtk/gtkthemingengineprivate.h | 4 +++
gtk/gtktoolbar.c | 1 +
gtk/gtktoolbar.h | 8 -----
gtk/gtktoolbarprivate.h | 46 ++++++++++++++++++++++++++++++++
gtk/gtktoolbutton.c | 2 +-
gtk/gtktoolpaletteprivate.h | 4 +++
gtk/gtktreeprivate.h | 5 +--
gtk/gtkwidget.c | 1 +
35 files changed, 177 insertions(+), 131 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 68b3eeb..c281666 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -530,6 +530,7 @@ gtk_private_h_sources = \
gtkprivate.h \
gtkpixelcacheprivate.h \
gtkquery.h \
+ gtkrangeprivate.h \
gtkrbtree.h \
gtkrecentchooserdefault.h \
gtkrecentchooserprivate.h \
@@ -563,6 +564,7 @@ gtk_private_h_sources = \
gtkthemingbackgroundprivate.h \
gtkthemingengineprivate.h \
gtktrashmonitor.h \
+ gtktoolbarprivate.h \
gtktoolpaletteprivate.h \
gtktreedatalist.h \
gtktreeprivate.h \
diff --git a/gtk/a11y/gtkimageaccessible.c b/gtk/a11y/gtkimageaccessible.c
index 08ab518..57b7e09 100644
--- a/gtk/a11y/gtkimageaccessible.c
+++ b/gtk/a11y/gtkimageaccessible.c
@@ -20,6 +20,7 @@
#include <string.h>
#include <gtk/gtk.h>
#include "gtkimageaccessible.h"
+#include "gtktoolbarprivate.h"
#include "gtkintl.h"
struct _GtkImageAccessiblePrivate
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index 25b85cd..ffc2e7d 100644
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -229,27 +229,12 @@ GDK_AVAILABLE_IN_ALL
GdkModifierType
gtk_accelerator_get_default_mod_mask (void);
-
-/* --- internal --- */
GDK_AVAILABLE_IN_ALL
GtkAccelGroupEntry* gtk_accel_group_query (GtkAccelGroup *accel_group,
guint accel_key,
GdkModifierType accel_mods,
guint *n_entries);
-void _gtk_accel_group_reconnect (GtkAccelGroup *accel_group,
- GQuark accel_path_quark);
-GSList* _gtk_accel_group_get_accelerables (GtkAccelGroup *accel_group);
-
-struct _GtkAccelGroupEntry
-{
- GtkAccelKey key;
- GClosure *closure;
- GQuark accel_path_quark;
-};
-
-
G_END_DECLS
-
#endif /* __GTK_ACCEL_GROUP_H__ */
diff --git a/gtk/gtkaccelgroupprivate.h b/gtk/gtkaccelgroupprivate.h
index f1eb28a..0537f1f 100644
--- a/gtk/gtkaccelgroupprivate.h
+++ b/gtk/gtkaccelgroupprivate.h
@@ -1,5 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* GTK - The GIMP Toolkit
+ * Copyright (C) 1998, 2001 Tim Janik
* Copyright (C) Javier Jardón <jjardon gnome org>
*
* This library is free software; you can redistribute it and/or
@@ -20,6 +21,10 @@
#define __GTK_ACCEL_GROUP_PRIVATE_H__
+#include <gtk/gtkaccelgroup.h>
+
+G_BEGIN_DECLS
+
struct _GtkAccelGroupPrivate
{
guint lock_count;
@@ -29,4 +34,17 @@ struct _GtkAccelGroupPrivate
GtkAccelGroupEntry *priv_accels;
};
-#endif /* __GTK_ACCEL_GROUP_PRIVATE_H__ */
+void _gtk_accel_group_reconnect (GtkAccelGroup *accel_group,
+ GQuark accel_path_quark);
+GSList* _gtk_accel_group_get_accelerables (GtkAccelGroup *accel_group);
+
+struct _GtkAccelGroupEntry
+{
+ GtkAccelKey key;
+ GClosure *closure;
+ GQuark accel_path_quark;
+};
+
+G_END_DECLS
+
+#endif /* __GTK_ACCEL_GROUP_PRIVATE_H__ */
diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index 791a593..c3a196d 100644
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -18,6 +18,7 @@
#include "config.h"
#include "gtkaccelmapprivate.h"
+#include "gtkaccelgroupprivate.h"
#include "gtkmarshalers.h"
#include "gtkwindowprivate.h"
diff --git a/gtk/gtkaccelmapprivate.h b/gtk/gtkaccelmapprivate.h
index e825dd3..8be1e5e 100644
--- a/gtk/gtkaccelmapprivate.h
+++ b/gtk/gtkaccelmapprivate.h
@@ -19,10 +19,6 @@
#define __GTK_ACCEL_MAP_PRIVATE_H__
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#include <gtk/gtkaccelmap.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkappchooserprivate.h b/gtk/gtkappchooserprivate.h
index 609bc18..b5fe2e9 100644
--- a/gtk/gtkappchooserprivate.h
+++ b/gtk/gtkappchooserprivate.h
@@ -29,6 +29,8 @@
#include "gtkappchooserwidget.h"
#include "gtkentry.h"
+G_BEGIN_DECLS
+
typedef struct _GtkAppChooserIface GtkAppChooserIface;
typedef GtkAppChooserIface GtkAppChooserInterface;
@@ -45,4 +47,7 @@ void
_gtk_app_chooser_widget_set_search_entry (GtkAppChooserWidget *self,
GtkEntry *entry);
+
+G_END_DECLS
+
#endif /* __GTK_APP_CHOOSER_PRIVATE_H__ */
diff --git a/gtk/gtkapplication-quartz-menu.c b/gtk/gtkapplication-quartz-menu.c
index 41fbea6..cff1bc9 100644
--- a/gtk/gtkapplication-quartz-menu.c
+++ b/gtk/gtkapplication-quartz-menu.c
@@ -23,7 +23,7 @@
#include "gtkapplicationprivate.h"
#include "gtkmenutracker.h"
#include "gtkicontheme.h"
-#include "gtktoolbar.h"
+#include "gtktoolbarprivate.h"
#include "gtkquartz.h"
#include <gdk/quartz/gdkquartz.h>
diff --git a/gtk/gtkapplicationprivate.h b/gtk/gtkapplicationprivate.h
index 3ba26d5..5378c23 100644
--- a/gtk/gtkapplicationprivate.h
+++ b/gtk/gtkapplicationprivate.h
@@ -26,34 +26,27 @@
#include "gtkactionmuxer.h"
-G_GNUC_INTERNAL
+G_BEGIN_DECLS
+
void gtk_application_window_set_id (GtkApplicationWindow *window,
guint id);
-G_GNUC_INTERNAL
GActionGroup * gtk_application_window_get_action_group (GtkApplicationWindow *window);
-G_GNUC_INTERNAL
void gtk_application_handle_window_realize (GtkApplication
*application,
GtkWindow *window);
-G_GNUC_INTERNAL
void gtk_application_handle_window_map (GtkApplication
*application,
GtkWindow *window);
-G_GNUC_INTERNAL
GtkActionMuxer * gtk_application_get_parent_muxer_for_window (GtkWindow *window);
-G_GNUC_INTERNAL
gboolean gtk_application_activate_accel (GtkApplication
*application,
GActionGroup
*action_group,
guint key,
GdkModifierType modifier);
-G_GNUC_INTERNAL
void gtk_application_foreach_accel_keys (GtkApplication
*application,
GtkWindow *window,
GtkWindowKeysForeachFunc callback,
gpointer
user_data);
-G_GNUC_INTERNAL
GtkActionMuxer * gtk_application_get_action_muxer (GtkApplication
*application);
-G_GNUC_INTERNAL
void gtk_application_insert_action_group (GtkApplication
*application,
const gchar *name,
GActionGroup
*action_group);
@@ -153,67 +146,48 @@ typedef struct
GtkWindow *window);
} GtkApplicationImplDBusClass;
-G_GNUC_INTERNAL
GType gtk_application_impl_get_type (void);
-G_GNUC_INTERNAL
GType gtk_application_impl_dbus_get_type (void);
-G_GNUC_INTERNAL
GType gtk_application_impl_x11_get_type (void);
-G_GNUC_INTERNAL
GType gtk_application_impl_wayland_get_type (void);
-G_GNUC_INTERNAL
GType gtk_application_impl_quartz_get_type (void);
-G_GNUC_INTERNAL
GtkApplicationImpl * gtk_application_impl_new (GtkApplication
*application,
GdkDisplay
*display);
-G_GNUC_INTERNAL
void gtk_application_impl_startup (GtkApplicationImpl *impl,
gboolean
register_sesion);
-G_GNUC_INTERNAL
void gtk_application_impl_shutdown (GtkApplicationImpl *impl);
-G_GNUC_INTERNAL
void gtk_application_impl_before_emit (GtkApplicationImpl *impl,
GVariant
*platform_data);
-G_GNUC_INTERNAL
void gtk_application_impl_window_added (GtkApplicationImpl *impl,
GtkWindow
*window);
-G_GNUC_INTERNAL
void gtk_application_impl_window_removed (GtkApplicationImpl *impl,
GtkWindow
*window);
-G_GNUC_INTERNAL
void gtk_application_impl_active_window_changed (GtkApplicationImpl *impl,
GtkWindow
*window);
-G_GNUC_INTERNAL
void gtk_application_impl_handle_window_realize (GtkApplicationImpl *impl,
GtkWindow
*window);
-G_GNUC_INTERNAL
void gtk_application_impl_handle_window_map (GtkApplicationImpl *impl,
GtkWindow
*window);
-G_GNUC_INTERNAL
void gtk_application_impl_set_app_menu (GtkApplicationImpl *impl,
GMenuModel
*app_menu);
-G_GNUC_INTERNAL
void gtk_application_impl_set_menubar (GtkApplicationImpl *impl,
GMenuModel
*menubar);
-G_GNUC_INTERNAL
guint gtk_application_impl_inhibit (GtkApplicationImpl *impl,
GtkWindow *window,
GtkApplicationInhibitFlags flags,
const gchar
*reason);
-G_GNUC_INTERNAL
void gtk_application_impl_uninhibit (GtkApplicationImpl *impl,
guint
cookie);
-G_GNUC_INTERNAL
gboolean gtk_application_impl_is_inhibited (GtkApplicationImpl *impl,
GtkApplicationInhibitFlags flags);
-G_GNUC_INTERNAL
gchar * gtk_application_impl_dbus_get_window_path (GtkApplicationImplDBus *dbus,
GtkWindow
*window);
-G_GNUC_INTERNAL
void gtk_application_impl_quartz_setup_menu (GMenuModel *model,
GtkActionMuxer *muxer);
+G_END_DECLS
+
#endif /* __GTK_APPLICATION_PRIVATE_H__ */
diff --git a/gtk/gtkclipboard-waylandprivate.h b/gtk/gtkclipboard-waylandprivate.h
index d2d1f22..466d63e 100644
--- a/gtk/gtkclipboard-waylandprivate.h
+++ b/gtk/gtkclipboard-waylandprivate.h
@@ -25,6 +25,8 @@
#include <gdk/wayland/gdkwayland.h>
#include <gtk/gtkclipboardprivate.h>
+G_BEGIN_DECLS
+
#define GTK_TYPE_CLIPBOARD_WAYLAND (gtk_clipboard_wayland_get_type ())
#define GTK_CLIPBOARD_WAYLAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GTK_TYPE_CLIPBOARD_WAYLAND, GtkClipboardWayland))
#define GTK_IS_CLIPBOARD_WAYLAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
GTK_TYPE_CLIPBOARD_WAYLAND))
@@ -51,6 +53,8 @@ struct _GtkClipboardWaylandClass
GType gtk_clipboard_wayland_get_type (void) G_GNUC_CONST;
+G_END_DECLS
+
#endif /* GDK_WINDOWING_WAYLAND */
#endif /* __GTK_CLIPBOARD_WAYLAND_WAYLAND_PRIVATE_H__ */
diff --git a/gtk/gtkclipboardprivate.h b/gtk/gtkclipboardprivate.h
index 48e1b05..2e0127f 100644
--- a/gtk/gtkclipboardprivate.h
+++ b/gtk/gtkclipboardprivate.h
@@ -22,6 +22,8 @@
#include <gtk/gtkclipboard.h>
+G_BEGIN_DECLS
+
#define GTK_CLIPBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CLIPBOARD,
GtkClipboardClass))
#define GTK_IS_CLIPBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CLIPBOARD))
#define GTK_CLIPBOARD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CLIPBOARD,
GtkClipboardClass))
@@ -82,4 +84,6 @@ struct _GtkClipboardClass
GdkEventOwnerChange *event);
};
+G_END_DECLS
+
#endif /* __GTK_CLIPBOARD_PRIVATE_H__ */
diff --git a/gtk/gtkcoloreditorprivate.h b/gtk/gtkcoloreditorprivate.h
index 51a3123..c0d40b3 100644
--- a/gtk/gtkcoloreditorprivate.h
+++ b/gtk/gtkcoloreditorprivate.h
@@ -18,10 +18,6 @@
#ifndef __GTK_COLOR_EDITOR_H__
#define __GTK_COLOR_EDITOR_H__
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#include <gtk/gtkbox.h>
G_BEGIN_DECLS
@@ -57,10 +53,7 @@ struct _GtkColorEditorClass
};
-G_GNUC_INTERNAL
GType gtk_color_editor_get_type (void) G_GNUC_CONST;
-
-G_GNUC_INTERNAL
GtkWidget * gtk_color_editor_new (void);
G_END_DECLS
diff --git a/gtk/gtkcolorplaneprivate.h b/gtk/gtkcolorplaneprivate.h
index 01c1ddb..abb1a81 100644
--- a/gtk/gtkcolorplaneprivate.h
+++ b/gtk/gtkcolorplaneprivate.h
@@ -18,10 +18,6 @@
#ifndef __GTK_COLOR_PLANE_H__
#define __GTK_COLOR_PLANE_H__
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#include <gtk/gtkdrawingarea.h>
#include <gtk/gtktypes.h>
@@ -58,10 +54,7 @@ struct _GtkColorPlaneClass
};
-G_GNUC_INTERNAL
GType gtk_color_plane_get_type (void) G_GNUC_CONST;
-
-G_GNUC_INTERNAL
GtkWidget * gtk_color_plane_new (GtkAdjustment *h_adj,
GtkAdjustment *s_adj,
GtkAdjustment *v_adj);
diff --git a/gtk/gtkcolorscaleprivate.h b/gtk/gtkcolorscaleprivate.h
index 1b843f3..9ce776b 100644
--- a/gtk/gtkcolorscaleprivate.h
+++ b/gtk/gtkcolorscaleprivate.h
@@ -18,10 +18,6 @@
#ifndef __GTK_COLOR_SCALE_H__
#define __GTK_COLOR_SCALE_H__
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#include <gtk/gtkscale.h>
G_BEGIN_DECLS
@@ -62,14 +58,9 @@ typedef enum
GTK_COLOR_SCALE_ALPHA
} GtkColorScaleType;
-G_GNUC_INTERNAL
GType gtk_color_scale_get_type (void) G_GNUC_CONST;
-
-G_GNUC_INTERNAL
GtkWidget * gtk_color_scale_new (GtkAdjustment *adjustment,
GtkColorScaleType type);
-
-G_GNUC_INTERNAL
void gtk_color_scale_set_rgba (GtkColorScale *scale,
const GdkRGBA *color);
diff --git a/gtk/gtkcolorswatchprivate.h b/gtk/gtkcolorswatchprivate.h
index 67ed175..f7e80bc 100644
--- a/gtk/gtkcolorswatchprivate.h
+++ b/gtk/gtkcolorswatchprivate.h
@@ -15,12 +15,8 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GTK_COLOR_SWATCH_H__
-#define __GTK_COLOR_SWATCH_H__
-
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
+#ifndef __GTK_COLOR_SWATCH_PRIVATE_H__
+#define __GTK_COLOR_SWATCH_PRIVATE_H__
#include <gtk/gtkdrawingarea.h>
@@ -61,39 +57,27 @@ struct _GtkColorSwatchClass
};
-G_GNUC_INTERNAL
GType gtk_color_swatch_get_type (void) G_GNUC_CONST;
-
-G_GNUC_INTERNAL
GtkWidget * gtk_color_swatch_new (void);
-
-G_GNUC_INTERNAL
void gtk_color_swatch_set_rgba (GtkColorSwatch *swatch,
const GdkRGBA *color);
-G_GNUC_INTERNAL
gboolean gtk_color_swatch_get_rgba (GtkColorSwatch *swatch,
GdkRGBA *color);
-G_GNUC_INTERNAL
void gtk_color_swatch_set_hsva (GtkColorSwatch *swatch,
gdouble h,
gdouble s,
gdouble v,
gdouble a);
-G_GNUC_INTERNAL
void gtk_color_swatch_set_can_drop (GtkColorSwatch *swatch,
gboolean can_drop);
-G_GNUC_INTERNAL
void gtk_color_swatch_set_icon (GtkColorSwatch *swatch,
const gchar *icon);
-G_GNUC_INTERNAL
void gtk_color_swatch_set_use_alpha (GtkColorSwatch *swatch,
gboolean use_alpha);
-G_GNUC_INTERNAL
void gtk_color_swatch_set_selectable (GtkColorSwatch *swatch,
gboolean selectable);
-G_GNUC_INTERNAL
gboolean gtk_color_swatch_get_selectable (GtkColorSwatch *swatch);
G_END_DECLS
-#endif /* __GTK_COLOR_SWATCH_H__ */
+#endif /* __GTK_COLOR_SWATCH_PRIVATE_H__ */
diff --git a/gtk/gtkheaderbarprivate.h b/gtk/gtkheaderbarprivate.h
index 66c5433..e11506d 100644
--- a/gtk/gtkheaderbarprivate.h
+++ b/gtk/gtkheaderbarprivate.h
@@ -20,9 +20,13 @@
#ifndef __GTK_HEADER_BAR_PRIVATE_H__
#define __GTK_HEADER_BAR_PRIVATE_H__
+G_BEGIN_DECLS
+
gboolean _gtk_header_bar_shows_app_menu (GtkHeaderBar *bar);
void _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar);
gboolean _gtk_header_bar_update_window_icon (GtkHeaderBar *bar,
GtkWindow *window);
+G_END_DECLS
+
#endif /* __GTK_HEADER_BAR_PRIVATE_H__ */
diff --git a/gtk/gtknumerableiconprivate.h b/gtk/gtknumerableiconprivate.h
index aee567a..cea6d64 100644
--- a/gtk/gtknumerableiconprivate.h
+++ b/gtk/gtknumerableiconprivate.h
@@ -24,7 +24,11 @@
#include "gtknumerableicon.h"
+G_BEGIN_DECLS
+
void _gtk_numerable_icon_set_background_icon_size (GtkNumerableIcon *self,
gint icon_size);
+G_END_DECLS
+
#endif /* __GTK_NUMERABLE_ICON_PRIVATE_H__ */
diff --git a/gtk/gtkpressandholdprivate.h b/gtk/gtkpressandholdprivate.h
index 4dcc698..5574484 100644
--- a/gtk/gtkpressandholdprivate.h
+++ b/gtk/gtkpressandholdprivate.h
@@ -53,13 +53,8 @@ struct _GtkPressAndHoldClass
};
-G_GNUC_INTERNAL
GType gtk_press_and_hold_get_type (void) G_GNUC_CONST;
-
-G_GNUC_INTERNAL
GtkPressAndHold * gtk_press_and_hold_new (void);
-
-G_GNUC_INTERNAL
void gtk_press_and_hold_process_event (GtkPressAndHold *pah,
GdkEvent *event);
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index c66d2bd..6978674 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -29,6 +29,7 @@
#include <math.h>
#include "gtkrange.h"
+#include "gtkrangeprivate.h"
#include "gtkadjustment.h"
#include "gtkcolorscaleprivate.h"
diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index 94c809c..24a7ea1 100644
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -173,22 +173,6 @@ void gtk_range_set_round_digits (GtkRange *range
GDK_AVAILABLE_IN_ALL
gint gtk_range_get_round_digits (GtkRange *range);
-/* internal API */
-gdouble _gtk_range_get_wheel_delta (GtkRange *range,
- GdkEventScroll *event);
-void _gtk_range_set_has_origin (GtkRange *range,
- gboolean has_origin);
-gboolean _gtk_range_get_has_origin (GtkRange *range);
-void _gtk_range_set_stop_values (GtkRange *range,
- gdouble *values,
- gint n_values);
-gint _gtk_range_get_stop_positions (GtkRange *range,
- gint **values);
-void _gtk_range_set_steppers (GtkRange *range,
- gboolean has_a,
- gboolean has_b,
- gboolean has_c,
- gboolean has_d);
G_END_DECLS
diff --git a/gtk/gtkrangeprivate.h b/gtk/gtkrangeprivate.h
new file mode 100644
index 0000000..52512ef
--- /dev/null
+++ b/gtk/gtkrangeprivate.h
@@ -0,0 +1,53 @@
+/* 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, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * 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_RANGE_PRIVATE_H__
+#define __GTK_RANGE_PRIVATE_H__
+
+
+#include <gtk/gtkrange.h>
+
+
+G_BEGIN_DECLS
+
+gdouble _gtk_range_get_wheel_delta (GtkRange *range,
+ GdkEventScroll *event);
+void _gtk_range_set_has_origin (GtkRange *range,
+ gboolean has_origin);
+gboolean _gtk_range_get_has_origin (GtkRange *range);
+void _gtk_range_set_stop_values (GtkRange *range,
+ gdouble *values,
+ gint n_values);
+gint _gtk_range_get_stop_positions (GtkRange *range,
+ gint **values);
+void _gtk_range_set_steppers (GtkRange *range,
+ gboolean has_a,
+ gboolean has_b,
+ gboolean has_c,
+ gboolean has_d);
+
+G_END_DECLS
+
+
+#endif /* __GTK_RANGE_PRIVATE_H__ */
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 435f877..ace2053 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -29,6 +29,7 @@
#include <stdlib.h>
#include "gtkscaleprivate.h"
+#include "gtkrangeprivate.h"
#include "gtkadjustment.h"
#include "gtkbindings.h"
diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index 2fbbeba..a609045 100644
--- a/gtk/gtkscrollbar.c
+++ b/gtk/gtkscrollbar.c
@@ -26,6 +26,7 @@
#include "config.h"
#include "gtkscrollbar.h"
+#include "gtkrangeprivate.h"
#include "gtkadjustment.h"
#include "gtkintl.h"
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index b93689c..8c33e98 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -35,6 +35,7 @@
#include "gtkprivate.h"
#include "gtkscrollable.h"
#include "gtkscrollbar.h"
+#include "gtkrangeprivate.h"
#include "gtktypebuiltins.h"
#include "gtkviewport.h"
#include "gtkwidgetprivate.h"
diff --git a/gtk/gtkselectionprivate.h b/gtk/gtkselectionprivate.h
index e3a4aa5..bd5c634 100644
--- a/gtk/gtkselectionprivate.h
+++ b/gtk/gtkselectionprivate.h
@@ -28,8 +28,8 @@
* sent.
*/
-#ifndef __GTK_SELECTIONPRIVATE_H__
-#define __GTK_SELECTIONPRIVATE_H__
+#ifndef __GTK_SELECTION_PRIVATE_H__
+#define __GTK_SELECTION_PRIVATE_H__
#include "gtkselection.h"
@@ -67,4 +67,4 @@ gboolean _gtk_selection_property_notify (GtkWidget *widget,
G_END_DECLS
-#endif /* __GTK_SELECTIONPRIVATE_H__ */
+#endif /* __GTK_SELECTION_PRIVATE_H__ */
diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c
index c6c2a4f..b8ded83 100644
--- a/gtk/gtkseparatortoolitem.c
+++ b/gtk/gtkseparatortoolitem.c
@@ -21,7 +21,7 @@
#include "gtkseparatormenuitem.h"
#include "gtkseparatortoolitem.h"
#include "gtkintl.h"
-#include "gtktoolbar.h"
+#include "gtktoolbarprivate.h"
#include "gtkprivate.h"
/**
diff --git a/gtk/gtksizegroup-private.h b/gtk/gtksizegroup-private.h
index 5eab6cf..11b6fa8 100644
--- a/gtk/gtksizegroup-private.h
+++ b/gtk/gtksizegroup-private.h
@@ -21,7 +21,9 @@
#include <gtk/gtksizegroup.h>
-/**
+G_BEGIN_DECLS
+
+/*
* GtkQueueResizeFlags:
* @GTK_QUEUE_RESIZE_INVALIDATE_ONLY: invalidate all cached sizes
* as we would normally do when a widget is queued for resize,
@@ -42,4 +44,6 @@ GHashTable * _gtk_size_group_get_widget_peers (GtkWidget *for_widget,
void _gtk_size_group_queue_resize (GtkWidget *widget,
GtkQueueResizeFlags flags);
+G_END_DECLS
+
#endif /* __GTK_SIZE_GROUP_PRIVATE_H__ */
diff --git a/gtk/gtkthemingengineprivate.h b/gtk/gtkthemingengineprivate.h
index 53262e1..1b61eb4 100644
--- a/gtk/gtkthemingengineprivate.h
+++ b/gtk/gtkthemingengineprivate.h
@@ -22,6 +22,8 @@
#include "gtk/gtkthemingengine.h"
#include "gtk/gtkcssvalueprivate.h"
+G_BEGIN_DECLS
+
void _gtk_theming_engine_paint_spinner (cairo_t *cr,
gdouble radius,
gdouble progress,
@@ -33,4 +35,6 @@ void _gtk_theming_engine_set_context (GtkThemingEngine *engine,
GtkStyleContext *context);
GtkStyleContext *_gtk_theming_engine_get_context (GtkThemingEngine *engine);
+G_END_DECLS
+
#endif /* __GTK_THEMING_ENGINE_PRIVATE_H__ */
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index c572924..33d91da 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -34,6 +34,7 @@
#include <string.h>
#include "gtktoolbar.h"
+#include "gtktoolbarprivate.h"
#include "gtkarrow.h"
#include "gtkbindings.h"
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 6cf0532..f91ecfb 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -146,14 +146,6 @@ void gtk_toolbar_set_drop_highlight_item (GtkToolbar *toolbar,
gint index_);
-/* internal functions */
-gchar * _gtk_toolbar_elide_underscores (const gchar *original);
-void _gtk_toolbar_paint_space_line (GtkWidget *widget,
- GtkToolbar *toolbar,
- cairo_t *cr);
-gint _gtk_toolbar_get_default_space_size (void);
-
-
G_END_DECLS
#endif /* __GTK_TOOLBAR_H__ */
diff --git a/gtk/gtktoolbarprivate.h b/gtk/gtktoolbarprivate.h
new file mode 100644
index 0000000..c63e901
--- /dev/null
+++ b/gtk/gtktoolbarprivate.h
@@ -0,0 +1,46 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ * GtkToolbar copyright (C) Federico Mena
+ *
+ * Copyright (C) 2002 Anders Carlsson <andersca gnome org>
+ * Copyright (C) 2002 James Henstridge <james daa com au>
+ * Copyright (C) 2003 Soeren Sandmann <sandmann daimi au dk>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * 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_TOOLBAR_PRIVATE_H__
+#define __GTK_TOOLBAR_PRIVATE_H__
+
+#include <gtk/gtktoolbar.h>
+
+G_BEGIN_DECLS
+
+gchar * _gtk_toolbar_elide_underscores (const gchar *original);
+void _gtk_toolbar_paint_space_line (GtkWidget *widget,
+ GtkToolbar *toolbar,
+ cairo_t *cr);
+gint _gtk_toolbar_get_default_space_size (void);
+
+
+G_END_DECLS
+
+#endif /* __GTK_TOOLBAR_PRIVATE_H__ */
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index e5ac792..c8a51a6 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -27,7 +27,7 @@
#include "deprecated/gtkstock.h"
#include "gtkbox.h"
#include "gtkintl.h"
-#include "gtktoolbar.h"
+#include "gtktoolbarprivate.h"
#include "deprecated/gtkactivatable.h"
#include "gtkactionable.h"
#include "gtkprivate.h"
diff --git a/gtk/gtktoolpaletteprivate.h b/gtk/gtktoolpaletteprivate.h
index 87e544b..a2e94e2 100644
--- a/gtk/gtktoolpaletteprivate.h
+++ b/gtk/gtktoolpaletteprivate.h
@@ -23,6 +23,8 @@
#include <gtk/gtk.h>
+G_BEGIN_DECLS
+
void _gtk_tool_palette_get_item_size (GtkToolPalette *palette,
GtkRequisition *item_size,
gboolean homogeneous_only,
@@ -49,4 +51,6 @@ gint _gtk_tool_item_group_get_size_for_limit (GtkToolItemGroup *group,
GtkSizeGroup *_gtk_tool_palette_get_size_group (GtkToolPalette *palette);
+G_END_DECLS
+
#endif /* __GTK_TOOL_PALETTE_PRIVATE_H__ */
diff --git a/gtk/gtktreeprivate.h b/gtk/gtktreeprivate.h
index 9d0c301..d813352 100644
--- a/gtk/gtktreeprivate.h
+++ b/gtk/gtktreeprivate.h
@@ -19,13 +19,12 @@
#define __GTK_TREE_PRIVATE_H__
-G_BEGIN_DECLS
-
-
#include <gtk/gtktreeview.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtkrbtree.h>
+G_BEGIN_DECLS
+
#define TREE_VIEW_DRAG_WIDTH 6
typedef enum
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index de1a3ef..d3d78dd 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -35,6 +35,7 @@
#include "gtkcontainer.h"
#include "gtkaccelmapprivate.h"
+#include "gtkaccelgroupprivate.h"
#include "gtkclipboard.h"
#include "gtkcssstylepropertyprivate.h"
#include "gtkcssnumbervalueprivate.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
