AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

Clean up private headers

Browse Source 
This commit adds a few missing private headers, and cleans up
some irregularities in the existing ones
This commit is contained in:
Matthias Clasen 2014-04-05 02:04:12 -04:00
parent 08e1c85add
commit fee33b1a81
35 changed files with 177 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/Makefile.am
View File

@ -530,6 +530,7 @@ gtk_private_h_sources = \
gtkprivate.h \ gtkprivate.h \
gtkpixelcacheprivate.h \ gtkpixelcacheprivate.h \
gtkquery.h \ gtkquery.h \
gtkrangeprivate.h \
gtkrbtree.h \ gtkrbtree.h \
gtkrecentchooserdefault.h \ gtkrecentchooserdefault.h \
gtkrecentchooserprivate.h \ gtkrecentchooserprivate.h \
@ -563,6 +564,7 @@ gtk_private_h_sources = \
gtkthemingbackgroundprivate.h \ gtkthemingbackgroundprivate.h \
gtkthemingengineprivate.h \ gtkthemingengineprivate.h \
gtktrashmonitor.h \ gtktrashmonitor.h \
gtktoolbarprivate.h \
gtktoolpaletteprivate.h \ gtktoolpaletteprivate.h \
gtktreedatalist.h \ gtktreedatalist.h \
gtktreeprivate.h \ gtktreeprivate.h \

1
gtk/a11y/gtkimageaccessible.c
View File

@ -20,6 +20,7 @@
#include <string.h> #include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gtkimageaccessible.h" #include "gtkimageaccessible.h"
#include "gtktoolbarprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
struct _GtkImageAccessiblePrivate struct _GtkImageAccessiblePrivate

15
gtk/gtkaccelgroup.h
View File

@ -229,27 +229,12 @@ GDK_AVAILABLE_IN_ALL
GdkModifierType GdkModifierType
gtk_accelerator_get_default_mod_mask (void); gtk_accelerator_get_default_mod_mask (void);
/* --- internal --- */
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
GtkAccelGroupEntry* gtk_accel_group_query (GtkAccelGroup *accel_group, GtkAccelGroupEntry* gtk_accel_group_query (GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods, GdkModifierType accel_mods,
guint *n_entries); 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 G_END_DECLS
#endif /* __GTK_ACCEL_GROUP_H__ */ #endif /* __GTK_ACCEL_GROUP_H__ */

20
gtk/gtkaccelgroupprivate.h
View File

@ -1,5 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* GTK - The GIMP Toolkit /* GTK - The GIMP Toolkit
* Copyright (C) 1998, 2001 Tim Janik
* Copyright (C) Javier Jardón <jjardon@gnome.org> * Copyright (C) Javier Jardón <jjardon@gnome.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -20,6 +21,10 @@
#define __GTK_ACCEL_GROUP_PRIVATE_H__ #define __GTK_ACCEL_GROUP_PRIVATE_H__
#include <gtk/gtkaccelgroup.h>
G_BEGIN_DECLS
struct _GtkAccelGroupPrivate struct _GtkAccelGroupPrivate
{ {
guint lock_count; guint lock_count;
@ -29,4 +34,17 @@ struct _GtkAccelGroupPrivate
GtkAccelGroupEntry *priv_accels; 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__ */

1
gtk/gtkaccelmap.c
View File

@ -18,6 +18,7 @@
#include "config.h" #include "config.h"
#include "gtkaccelmapprivate.h" #include "gtkaccelmapprivate.h"
#include "gtkaccelgroupprivate.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkwindowprivate.h" #include "gtkwindowprivate.h"

4
gtk/gtkaccelmapprivate.h
View File

@ -19,10 +19,6 @@
#define __GTK_ACCEL_MAP_PRIVATE_H__ #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> #include <gtk/gtkaccelmap.h>
G_BEGIN_DECLS G_BEGIN_DECLS

5
gtk/gtkappchooserprivate.h
View File

@ -29,6 +29,8 @@
#include "gtkappchooserwidget.h" #include "gtkappchooserwidget.h"
#include "gtkentry.h" #include "gtkentry.h"
G_BEGIN_DECLS
typedef struct _GtkAppChooserIface GtkAppChooserIface; typedef struct _GtkAppChooserIface GtkAppChooserIface;
typedef GtkAppChooserIface GtkAppChooserInterface; typedef GtkAppChooserIface GtkAppChooserInterface;
@ -45,4 +47,7 @@ void
_gtk_app_chooser_widget_set_search_entry (GtkAppChooserWidget *self, _gtk_app_chooser_widget_set_search_entry (GtkAppChooserWidget *self,
GtkEntry *entry); GtkEntry *entry);
G_END_DECLS
#endif /* __GTK_APP_CHOOSER_PRIVATE_H__ */ #endif /* __GTK_APP_CHOOSER_PRIVATE_H__ */

2
gtk/gtkapplication-quartz-menu.c
View File

@ -23,7 +23,7 @@
#include "gtkapplicationprivate.h" #include "gtkapplicationprivate.h"
#include "gtkmenutracker.h" #include "gtkmenutracker.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtktoolbar.h" #include "gtktoolbarprivate.h"
#include "gtkquartz.h" #include "gtkquartz.h"
#include <gdk/quartz/gdkquartz.h> #include <gdk/quartz/gdkquartz.h>

34
gtk/gtkapplicationprivate.h
View File

@ -26,34 +26,27 @@
#include "gtkactionmuxer.h" #include "gtkactionmuxer.h"
G_GNUC_INTERNAL G_BEGIN_DECLS
void gtk_application_window_set_id (GtkApplicationWindow *window, void gtk_application_window_set_id (GtkApplicationWindow *window,
guint id); guint id);
G_GNUC_INTERNAL
GActionGroup * gtk_application_window_get_action_group (GtkApplicationWindow *window); GActionGroup * gtk_application_window_get_action_group (GtkApplicationWindow *window);
G_GNUC_INTERNAL
void gtk_application_handle_window_realize (GtkApplication *application, void gtk_application_handle_window_realize (GtkApplication *application,
GtkWindow *window); GtkWindow *window);
G_GNUC_INTERNAL
void gtk_application_handle_window_map (GtkApplication *application, void gtk_application_handle_window_map (GtkApplication *application,
GtkWindow *window); GtkWindow *window);
G_GNUC_INTERNAL
GtkActionMuxer * gtk_application_get_parent_muxer_for_window (GtkWindow *window); GtkActionMuxer * gtk_application_get_parent_muxer_for_window (GtkWindow *window);
G_GNUC_INTERNAL
gboolean gtk_application_activate_accel (GtkApplication *application, gboolean gtk_application_activate_accel (GtkApplication *application,
GActionGroup *action_group, GActionGroup *action_group,
guint key, guint key,
GdkModifierType modifier); GdkModifierType modifier);
G_GNUC_INTERNAL
void gtk_application_foreach_accel_keys (GtkApplication *application, void gtk_application_foreach_accel_keys (GtkApplication *application,
GtkWindow *window, GtkWindow *window,
GtkWindowKeysForeachFunc callback, GtkWindowKeysForeachFunc callback,
gpointer user_data); gpointer user_data);
G_GNUC_INTERNAL
GtkActionMuxer * gtk_application_get_action_muxer (GtkApplication *application); GtkActionMuxer * gtk_application_get_action_muxer (GtkApplication *application);
G_GNUC_INTERNAL
void gtk_application_insert_action_group (GtkApplication *application, void gtk_application_insert_action_group (GtkApplication *application,
const gchar *name, const gchar *name,
GActionGroup *action_group); GActionGroup *action_group);
@ -153,67 +146,48 @@ typedef struct
GtkWindow *window); GtkWindow *window);
} GtkApplicationImplDBusClass; } GtkApplicationImplDBusClass;
G_GNUC_INTERNAL
GType gtk_application_impl_get_type (void); GType gtk_application_impl_get_type (void);
G_GNUC_INTERNAL
GType gtk_application_impl_dbus_get_type (void); GType gtk_application_impl_dbus_get_type (void);
G_GNUC_INTERNAL
GType gtk_application_impl_x11_get_type (void); GType gtk_application_impl_x11_get_type (void);
G_GNUC_INTERNAL
GType gtk_application_impl_wayland_get_type (void); GType gtk_application_impl_wayland_get_type (void);
G_GNUC_INTERNAL
GType gtk_application_impl_quartz_get_type (void); GType gtk_application_impl_quartz_get_type (void);
G_GNUC_INTERNAL
GtkApplicationImpl * gtk_application_impl_new (GtkApplication *application, GtkApplicationImpl * gtk_application_impl_new (GtkApplication *application,
GdkDisplay *display); GdkDisplay *display);
G_GNUC_INTERNAL
void gtk_application_impl_startup (GtkApplicationImpl *impl, void gtk_application_impl_startup (GtkApplicationImpl *impl,
gboolean register_sesion); gboolean register_sesion);
G_GNUC_INTERNAL
void gtk_application_impl_shutdown (GtkApplicationImpl *impl); void gtk_application_impl_shutdown (GtkApplicationImpl *impl);
G_GNUC_INTERNAL
void gtk_application_impl_before_emit (GtkApplicationImpl *impl, void gtk_application_impl_before_emit (GtkApplicationImpl *impl,
GVariant *platform_data); GVariant *platform_data);
G_GNUC_INTERNAL
void gtk_application_impl_window_added (GtkApplicationImpl *impl, void gtk_application_impl_window_added (GtkApplicationImpl *impl,
GtkWindow *window); GtkWindow *window);
G_GNUC_INTERNAL
void gtk_application_impl_window_removed (GtkApplicationImpl *impl, void gtk_application_impl_window_removed (GtkApplicationImpl *impl,
GtkWindow *window); GtkWindow *window);
G_GNUC_INTERNAL
void gtk_application_impl_active_window_changed (GtkApplicationImpl *impl, void gtk_application_impl_active_window_changed (GtkApplicationImpl *impl,
GtkWindow *window); GtkWindow *window);
G_GNUC_INTERNAL
void gtk_application_impl_handle_window_realize (GtkApplicationImpl *impl, void gtk_application_impl_handle_window_realize (GtkApplicationImpl *impl,
GtkWindow *window); GtkWindow *window);
G_GNUC_INTERNAL
void gtk_application_impl_handle_window_map (GtkApplicationImpl *impl, void gtk_application_impl_handle_window_map (GtkApplicationImpl *impl,
GtkWindow *window); GtkWindow *window);
G_GNUC_INTERNAL
void gtk_application_impl_set_app_menu (GtkApplicationImpl *impl, void gtk_application_impl_set_app_menu (GtkApplicationImpl *impl,
GMenuModel *app_menu); GMenuModel *app_menu);
G_GNUC_INTERNAL
void gtk_application_impl_set_menubar (GtkApplicationImpl *impl, void gtk_application_impl_set_menubar (GtkApplicationImpl *impl,
GMenuModel *menubar); GMenuModel *menubar);
G_GNUC_INTERNAL
guint gtk_application_impl_inhibit (GtkApplicationImpl *impl, guint gtk_application_impl_inhibit (GtkApplicationImpl *impl,
GtkWindow *window, GtkWindow *window,
GtkApplicationInhibitFlags flags, GtkApplicationInhibitFlags flags,
const gchar *reason); const gchar *reason);
G_GNUC_INTERNAL
void gtk_application_impl_uninhibit (GtkApplicationImpl *impl, void gtk_application_impl_uninhibit (GtkApplicationImpl *impl,
guint cookie); guint cookie);
G_GNUC_INTERNAL
gboolean gtk_application_impl_is_inhibited (GtkApplicationImpl *impl, gboolean gtk_application_impl_is_inhibited (GtkApplicationImpl *impl,
GtkApplicationInhibitFlags flags); GtkApplicationInhibitFlags flags);
G_GNUC_INTERNAL
gchar * gtk_application_impl_dbus_get_window_path (GtkApplicationImplDBus *dbus, gchar * gtk_application_impl_dbus_get_window_path (GtkApplicationImplDBus *dbus,
GtkWindow *window); GtkWindow *window);
G_GNUC_INTERNAL
void gtk_application_impl_quartz_setup_menu (GMenuModel *model, void gtk_application_impl_quartz_setup_menu (GMenuModel *model,
GtkActionMuxer *muxer); GtkActionMuxer *muxer);
G_END_DECLS
#endif /* __GTK_APPLICATION_PRIVATE_H__ */ #endif /* __GTK_APPLICATION_PRIVATE_H__ */

4
gtk/gtkclipboard-waylandprivate.h
View File

@ -25,6 +25,8 @@
#include <gdk/wayland/gdkwayland.h> #include <gdk/wayland/gdkwayland.h>
#include <gtk/gtkclipboardprivate.h> #include <gtk/gtkclipboardprivate.h>
G_BEGIN_DECLS
#define GTK_TYPE_CLIPBOARD_WAYLAND (gtk_clipboard_wayland_get_type ()) #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_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)) #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; GType gtk_clipboard_wayland_get_type (void) G_GNUC_CONST;
G_END_DECLS
#endif /* GDK_WINDOWING_WAYLAND */ #endif /* GDK_WINDOWING_WAYLAND */
#endif /* __GTK_CLIPBOARD_WAYLAND_WAYLAND_PRIVATE_H__ */ #endif /* __GTK_CLIPBOARD_WAYLAND_WAYLAND_PRIVATE_H__ */

4
gtk/gtkclipboardprivate.h
View File

@ -22,6 +22,8 @@
#include <gtk/gtkclipboard.h> #include <gtk/gtkclipboard.h>
G_BEGIN_DECLS
#define GTK_CLIPBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CLIPBOARD, GtkClipboardClass)) #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_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)) #define GTK_CLIPBOARD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CLIPBOARD, GtkClipboardClass))
@ -82,4 +84,6 @@ struct _GtkClipboardClass
GdkEventOwnerChange *event); GdkEventOwnerChange *event);
}; };
G_END_DECLS
#endif /* __GTK_CLIPBOARD_PRIVATE_H__ */ #endif /* __GTK_CLIPBOARD_PRIVATE_H__ */

7
gtk/gtkcoloreditorprivate.h
View File

@ -18,10 +18,6 @@
#ifndef __GTK_COLOR_EDITOR_H__ #ifndef __GTK_COLOR_EDITOR_H__
#define __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> #include <gtk/gtkbox.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -57,10 +53,7 @@ struct _GtkColorEditorClass
}; };
G_GNUC_INTERNAL
GType gtk_color_editor_get_type (void) G_GNUC_CONST; GType gtk_color_editor_get_type (void) G_GNUC_CONST;
G_GNUC_INTERNAL
GtkWidget * gtk_color_editor_new (void); GtkWidget * gtk_color_editor_new (void);
G_END_DECLS G_END_DECLS

7
gtk/gtkcolorplaneprivate.h
View File

@ -18,10 +18,6 @@
#ifndef __GTK_COLOR_PLANE_H__ #ifndef __GTK_COLOR_PLANE_H__
#define __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/gtkdrawingarea.h>
#include <gtk/gtktypes.h> #include <gtk/gtktypes.h>
@ -58,10 +54,7 @@ struct _GtkColorPlaneClass
}; };
G_GNUC_INTERNAL
GType gtk_color_plane_get_type (void) G_GNUC_CONST; GType gtk_color_plane_get_type (void) G_GNUC_CONST;
G_GNUC_INTERNAL
GtkWidget * gtk_color_plane_new (GtkAdjustment *h_adj, GtkWidget * gtk_color_plane_new (GtkAdjustment *h_adj,
GtkAdjustment *s_adj, GtkAdjustment *s_adj,
GtkAdjustment *v_adj); GtkAdjustment *v_adj);

9
gtk/gtkcolorscaleprivate.h
View File

@ -18,10 +18,6 @@
#ifndef __GTK_COLOR_SCALE_H__ #ifndef __GTK_COLOR_SCALE_H__
#define __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> #include <gtk/gtkscale.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -62,14 +58,9 @@ typedef enum
GTK_COLOR_SCALE_ALPHA GTK_COLOR_SCALE_ALPHA
} GtkColorScaleType; } GtkColorScaleType;
G_GNUC_INTERNAL
GType gtk_color_scale_get_type (void) G_GNUC_CONST; GType gtk_color_scale_get_type (void) G_GNUC_CONST;
G_GNUC_INTERNAL
GtkWidget * gtk_color_scale_new (GtkAdjustment *adjustment, GtkWidget * gtk_color_scale_new (GtkAdjustment *adjustment,
GtkColorScaleType type); GtkColorScaleType type);
G_GNUC_INTERNAL
void gtk_color_scale_set_rgba (GtkColorScale *scale, void gtk_color_scale_set_rgba (GtkColorScale *scale,
const GdkRGBA *color); const GdkRGBA *color);

22
gtk/gtkcolorswatchprivate.h
View File

@ -15,12 +15,8 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __GTK_COLOR_SWATCH_H__ #ifndef __GTK_COLOR_SWATCH_PRIVATE_H__
#define __GTK_COLOR_SWATCH_H__ #define __GTK_COLOR_SWATCH_PRIVATE_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/gtkdrawingarea.h>
@ -61,39 +57,27 @@ struct _GtkColorSwatchClass
}; };
G_GNUC_INTERNAL
GType gtk_color_swatch_get_type (void) G_GNUC_CONST; GType gtk_color_swatch_get_type (void) G_GNUC_CONST;
G_GNUC_INTERNAL
GtkWidget * gtk_color_swatch_new (void); GtkWidget * gtk_color_swatch_new (void);
G_GNUC_INTERNAL
void gtk_color_swatch_set_rgba (GtkColorSwatch *swatch, void gtk_color_swatch_set_rgba (GtkColorSwatch *swatch,
const GdkRGBA *color); const GdkRGBA *color);
G_GNUC_INTERNAL
gboolean gtk_color_swatch_get_rgba (GtkColorSwatch *swatch, gboolean gtk_color_swatch_get_rgba (GtkColorSwatch *swatch,
GdkRGBA *color); GdkRGBA *color);
G_GNUC_INTERNAL
void gtk_color_swatch_set_hsva (GtkColorSwatch *swatch, void gtk_color_swatch_set_hsva (GtkColorSwatch *swatch,
gdouble h, gdouble h,
gdouble s, gdouble s,
gdouble v, gdouble v,
gdouble a); gdouble a);
G_GNUC_INTERNAL
void gtk_color_swatch_set_can_drop (GtkColorSwatch *swatch, void gtk_color_swatch_set_can_drop (GtkColorSwatch *swatch,
gboolean can_drop); gboolean can_drop);
G_GNUC_INTERNAL
void gtk_color_swatch_set_icon (GtkColorSwatch *swatch, void gtk_color_swatch_set_icon (GtkColorSwatch *swatch,
const gchar *icon); const gchar *icon);
G_GNUC_INTERNAL
void gtk_color_swatch_set_use_alpha (GtkColorSwatch *swatch, void gtk_color_swatch_set_use_alpha (GtkColorSwatch *swatch,
gboolean use_alpha); gboolean use_alpha);
G_GNUC_INTERNAL
void gtk_color_swatch_set_selectable (GtkColorSwatch *swatch, void gtk_color_swatch_set_selectable (GtkColorSwatch *swatch,
gboolean selectable); gboolean selectable);
G_GNUC_INTERNAL
gboolean gtk_color_swatch_get_selectable (GtkColorSwatch *swatch); gboolean gtk_color_swatch_get_selectable (GtkColorSwatch *swatch);
G_END_DECLS G_END_DECLS
#endif /* __GTK_COLOR_SWATCH_H__ */ #endif /* __GTK_COLOR_SWATCH_PRIVATE_H__ */

4
gtk/gtkheaderbarprivate.h
View File

@ -20,9 +20,13 @@
#ifndef __GTK_HEADER_BAR_PRIVATE_H__ #ifndef __GTK_HEADER_BAR_PRIVATE_H__
#define __GTK_HEADER_BAR_PRIVATE_H__ #define __GTK_HEADER_BAR_PRIVATE_H__
G_BEGIN_DECLS
gboolean _gtk_header_bar_shows_app_menu (GtkHeaderBar *bar); gboolean _gtk_header_bar_shows_app_menu (GtkHeaderBar *bar);
void _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar); void _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar);
gboolean _gtk_header_bar_update_window_icon (GtkHeaderBar *bar, gboolean _gtk_header_bar_update_window_icon (GtkHeaderBar *bar,
GtkWindow *window); GtkWindow *window);
G_END_DECLS
#endif /* __GTK_HEADER_BAR_PRIVATE_H__ */ #endif /* __GTK_HEADER_BAR_PRIVATE_H__ */

4
gtk/gtknumerableiconprivate.h
View File

@ -24,7 +24,11 @@
#include "gtknumerableicon.h" #include "gtknumerableicon.h"
G_BEGIN_DECLS
void _gtk_numerable_icon_set_background_icon_size (GtkNumerableIcon *self, void _gtk_numerable_icon_set_background_icon_size (GtkNumerableIcon *self,
gint icon_size); gint icon_size);
G_END_DECLS
#endif /* __GTK_NUMERABLE_ICON_PRIVATE_H__ */ #endif /* __GTK_NUMERABLE_ICON_PRIVATE_H__ */

5
gtk/gtkpressandholdprivate.h
View File

@ -53,13 +53,8 @@ struct _GtkPressAndHoldClass
}; };
G_GNUC_INTERNAL
GType gtk_press_and_hold_get_type (void) G_GNUC_CONST; GType gtk_press_and_hold_get_type (void) G_GNUC_CONST;
G_GNUC_INTERNAL
GtkPressAndHold * gtk_press_and_hold_new (void); GtkPressAndHold * gtk_press_and_hold_new (void);
G_GNUC_INTERNAL
void gtk_press_and_hold_process_event (GtkPressAndHold *pah, void gtk_press_and_hold_process_event (GtkPressAndHold *pah,
GdkEvent *event); GdkEvent *event);

1
gtk/gtkrange.c
View File

@ -29,6 +29,7 @@
#include <math.h> #include <math.h>
#include "gtkrange.h" #include "gtkrange.h"
#include "gtkrangeprivate.h"
#include "gtkadjustment.h" #include "gtkadjustment.h"
#include "gtkcolorscaleprivate.h" #include "gtkcolorscaleprivate.h"

16
gtk/gtkrange.h
View File

@ -173,22 +173,6 @@ void gtk_range_set_round_digits (GtkRange *range
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
gint gtk_range_get_round_digits (GtkRange *range); 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 G_END_DECLS

53
gtk/gtkrangeprivate.h Normal file
View File

@ -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__ */

1
gtk/gtkscale.c
View File

@ -29,6 +29,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "gtkscaleprivate.h" #include "gtkscaleprivate.h"
#include "gtkrangeprivate.h"
#include "gtkadjustment.h" #include "gtkadjustment.h"
#include "gtkbindings.h" #include "gtkbindings.h"

1
gtk/gtkscrollbar.c
View File

@ -26,6 +26,7 @@
#include "config.h" #include "config.h"
#include "gtkscrollbar.h" #include "gtkscrollbar.h"
#include "gtkrangeprivate.h"
#include "gtkadjustment.h" #include "gtkadjustment.h"
#include "gtkintl.h" #include "gtkintl.h"

1
gtk/gtkscrolledwindow.c
View File

@ -35,6 +35,7 @@
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkscrollable.h" #include "gtkscrollable.h"
#include "gtkscrollbar.h" #include "gtkscrollbar.h"
#include "gtkrangeprivate.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkviewport.h" #include "gtkviewport.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"

6
gtk/gtkselectionprivate.h
View File

@ -28,8 +28,8 @@
* sent. * sent.
*/ */
#ifndef __GTK_SELECTIONPRIVATE_H__ #ifndef __GTK_SELECTION_PRIVATE_H__
#define __GTK_SELECTIONPRIVATE_H__ #define __GTK_SELECTION_PRIVATE_H__
#include "gtkselection.h" #include "gtkselection.h"
@ -67,4 +67,4 @@ gboolean _gtk_selection_property_notify (GtkWidget *widget,
G_END_DECLS G_END_DECLS
#endif /* __GTK_SELECTIONPRIVATE_H__ */ #endif /* __GTK_SELECTION_PRIVATE_H__ */

2
gtk/gtkseparatortoolitem.c
View File

@ -21,7 +21,7 @@
#include "gtkseparatormenuitem.h" #include "gtkseparatormenuitem.h"
#include "gtkseparatortoolitem.h" #include "gtkseparatortoolitem.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktoolbar.h" #include "gtktoolbarprivate.h"
#include "gtkprivate.h" #include "gtkprivate.h"
/** /**

6
gtk/gtksizegroup-private.h
View File

@ -21,7 +21,9 @@
#include <gtk/gtksizegroup.h> #include <gtk/gtksizegroup.h>
/** G_BEGIN_DECLS
/*
* GtkQueueResizeFlags: * GtkQueueResizeFlags:
* @GTK_QUEUE_RESIZE_INVALIDATE_ONLY: invalidate all cached sizes * @GTK_QUEUE_RESIZE_INVALIDATE_ONLY: invalidate all cached sizes
* as we would normally do when a widget is queued for resize, * 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, void _gtk_size_group_queue_resize (GtkWidget *widget,
GtkQueueResizeFlags flags); GtkQueueResizeFlags flags);
G_END_DECLS
#endif /* __GTK_SIZE_GROUP_PRIVATE_H__ */ #endif /* __GTK_SIZE_GROUP_PRIVATE_H__ */

4
gtk/gtkthemingengineprivate.h
View File

@ -22,6 +22,8 @@
#include "gtk/gtkthemingengine.h" #include "gtk/gtkthemingengine.h"
#include "gtk/gtkcssvalueprivate.h" #include "gtk/gtkcssvalueprivate.h"
G_BEGIN_DECLS
void _gtk_theming_engine_paint_spinner (cairo_t *cr, void _gtk_theming_engine_paint_spinner (cairo_t *cr,
gdouble radius, gdouble radius,
gdouble progress, gdouble progress,
@ -33,4 +35,6 @@ void _gtk_theming_engine_set_context (GtkThemingEngine *engine,
GtkStyleContext *context); GtkStyleContext *context);
GtkStyleContext *_gtk_theming_engine_get_context (GtkThemingEngine *engine); GtkStyleContext *_gtk_theming_engine_get_context (GtkThemingEngine *engine);
G_END_DECLS
#endif /* __GTK_THEMING_ENGINE_PRIVATE_H__ */ #endif /* __GTK_THEMING_ENGINE_PRIVATE_H__ */

1
gtk/gtktoolbar.c
View File

@ -34,6 +34,7 @@
#include <string.h> #include <string.h>
#include "gtktoolbar.h" #include "gtktoolbar.h"
#include "gtktoolbarprivate.h"
#include "gtkarrow.h" #include "gtkarrow.h"
#include "gtkbindings.h" #include "gtkbindings.h"

8
gtk/gtktoolbar.h
View File

@ -146,14 +146,6 @@ void gtk_toolbar_set_drop_highlight_item (GtkToolbar *toolbar,
gint index_); 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 G_END_DECLS
#endif /* __GTK_TOOLBAR_H__ */ #endif /* __GTK_TOOLBAR_H__ */

46
gtk/gtktoolbarprivate.h Normal file
View File

@ -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__ */

2
gtk/gtktoolbutton.c
View File

@ -27,7 +27,7 @@
#include "deprecated/gtkstock.h" #include "deprecated/gtkstock.h"
#include "gtkbox.h" #include "gtkbox.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktoolbar.h" #include "gtktoolbarprivate.h"
#include "deprecated/gtkactivatable.h" #include "deprecated/gtkactivatable.h"
#include "gtkactionable.h" #include "gtkactionable.h"
#include "gtkprivate.h" #include "gtkprivate.h"

4
gtk/gtktoolpaletteprivate.h
View File

@ -23,6 +23,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
G_BEGIN_DECLS
void _gtk_tool_palette_get_item_size (GtkToolPalette *palette, void _gtk_tool_palette_get_item_size (GtkToolPalette *palette,
GtkRequisition *item_size, GtkRequisition *item_size,
gboolean homogeneous_only, 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); GtkSizeGroup *_gtk_tool_palette_get_size_group (GtkToolPalette *palette);
G_END_DECLS
#endif /* __GTK_TOOL_PALETTE_PRIVATE_H__ */ #endif /* __GTK_TOOL_PALETTE_PRIVATE_H__ */

5
gtk/gtktreeprivate.h
View File

@ -19,13 +19,12 @@
#define __GTK_TREE_PRIVATE_H__ #define __GTK_TREE_PRIVATE_H__
G_BEGIN_DECLS
#include <gtk/gtktreeview.h> #include <gtk/gtktreeview.h>
#include <gtk/gtktreeselection.h> #include <gtk/gtktreeselection.h>
#include <gtk/gtkrbtree.h> #include <gtk/gtkrbtree.h>
G_BEGIN_DECLS
#define TREE_VIEW_DRAG_WIDTH 6 #define TREE_VIEW_DRAG_WIDTH 6
typedef enum typedef enum

1
gtk/gtkwidget.c
View File

@ -35,6 +35,7 @@
#include "gtkcontainer.h" #include "gtkcontainer.h"
#include "gtkaccelmapprivate.h" #include "gtkaccelmapprivate.h"
#include "gtkaccelgroupprivate.h"
#include "gtkclipboard.h" #include "gtkclipboard.h"
#include "gtkcssstylepropertyprivate.h" #include "gtkcssstylepropertyprivate.h"
#include "gtkcssnumbervalueprivate.h" #include "gtkcssnumbervalueprivate.h"