[gtk+] gtkwidget: Move private functions to private header
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gtkwidget: Move private functions to private header
- Date: Sat, 4 Jun 2011 12:01:14 +0000 (UTC)
commit fdf979dce2423c3b91d3d8579f7b6e12f640c89d
Author: Javier Jardón <jjardon gnome org>
Date: Thu Jun 2 15:25:12 2011 +0200
gtkwidget: Move private functions to private header
https://bugzilla.gnome.org/show_bug.cgi?id=651707
gtk/gtkmenu.c | 1 +
gtk/gtkmenuitem.c | 1 +
gtk/gtkwidget.h | 41 -----------------------------------------
gtk/gtkwidgetprivate.h | 42 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 44 insertions(+), 41 deletions(-)
---
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 90ae933..a781d6c 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -110,6 +110,7 @@
#include "gtkvscrollbar.h"
#include "gtksettings.h"
#include "gtkprivate.h"
+#include "gtkwidgetprivate.h"
#include "gtkintl.h"
#include "gtktypebuiltins.h"
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index b8e0746..ea19152 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -40,6 +40,7 @@
#include "gtkprivate.h"
#include "gtkbuildable.h"
#include "gtkactivatable.h"
+#include "gtkwidgetprivate.h"
#include "gtkintl.h"
#include "gtktypebuiltins.h"
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 078de3e..739e911 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -526,8 +526,6 @@ gboolean gtk_widget_remove_accelerator (GtkWidget *widget,
void gtk_widget_set_accel_path (GtkWidget *widget,
const gchar *accel_path,
GtkAccelGroup *accel_group);
-const gchar* _gtk_widget_get_accel_path (GtkWidget *widget,
- gboolean *locked);
GList* gtk_widget_list_accel_closures (GtkWidget *widget);
gboolean gtk_widget_can_activate_accel (GtkWidget *widget,
guint signal_id);
@@ -938,45 +936,6 @@ GtkRequisition *gtk_requisition_new (void) G_GNUC_MALLOC;
GtkRequisition *gtk_requisition_copy (const GtkRequisition *requisition);
void gtk_requisition_free (GtkRequisition *requisition);
-GdkEventExpose * _gtk_cairo_get_event (cairo_t *cr);
-
-void _gtk_widget_draw_internal (GtkWidget *widget,
- cairo_t *cr,
- gboolean clip_to_size);
-void _gtk_widget_set_has_default (GtkWidget *widget,
- gboolean has_default);
-void _gtk_widget_set_has_grab (GtkWidget *widget,
- gboolean has_grab);
-void _gtk_widget_set_is_toplevel (GtkWidget *widget,
- gboolean is_toplevel);
-
-void _gtk_widget_grab_notify (GtkWidget *widget,
- gboolean was_grabbed);
-
-void _gtk_widget_propagate_hierarchy_changed (GtkWidget *widget,
- GtkWidget *previous_toplevel);
-void _gtk_widget_propagate_screen_changed (GtkWidget *widget,
- GdkScreen *previous_screen);
-void _gtk_widget_propagate_composited_changed (GtkWidget *widget);
-
-void _gtk_widget_set_device_window (GtkWidget *widget,
- GdkDevice *device,
- GdkWindow *pointer_window);
-GdkWindow *_gtk_widget_get_device_window (GtkWidget *widget,
- GdkDevice *device);
-GList * _gtk_widget_list_devices (GtkWidget *widget);
-
-void _gtk_widget_synthesize_crossing (GtkWidget *from,
- GtkWidget *to,
- GdkDevice *device,
- GdkCrossingMode mode);
-
-gpointer _gtk_widget_peek_request_cache (GtkWidget *widget);
-
-void _gtk_widget_buildable_finish_accelerator (GtkWidget *widget,
- GtkWidget *toplevel,
- gpointer user_data);
-
gboolean gtk_widget_in_destruction (GtkWidget *widget);
GtkStyleContext * gtk_widget_get_style_context (GtkWidget *widget);
diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 7d298c6..afda633 100644
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -115,6 +115,48 @@ gboolean _gtk_widget_get_translation_to_window (GtkWidget *widget,
int *y);
void _gtk_widget_free_cached_sizes (GtkWidget *widget);
+const gchar* _gtk_widget_get_accel_path (GtkWidget *widget,
+ gboolean *locked);
+
+GdkEventExpose * _gtk_cairo_get_event (cairo_t *cr);
+
+void _gtk_widget_draw_internal (GtkWidget *widget,
+ cairo_t *cr,
+ gboolean clip_to_size);
+void _gtk_widget_set_has_default (GtkWidget *widget,
+ gboolean has_default);
+void _gtk_widget_set_has_grab (GtkWidget *widget,
+ gboolean has_grab);
+void _gtk_widget_set_is_toplevel (GtkWidget *widget,
+ gboolean is_toplevel);
+
+void _gtk_widget_grab_notify (GtkWidget *widget,
+ gboolean was_grabbed);
+
+void _gtk_widget_propagate_hierarchy_changed (GtkWidget *widget,
+ GtkWidget *previous_toplevel);
+void _gtk_widget_propagate_screen_changed (GtkWidget *widget,
+ GdkScreen *previous_screen);
+void _gtk_widget_propagate_composited_changed (GtkWidget *widget);
+
+void _gtk_widget_set_device_window (GtkWidget *widget,
+ GdkDevice *device,
+ GdkWindow *pointer_window);
+GdkWindow * _gtk_widget_get_device_window (GtkWidget *widget,
+ GdkDevice *device);
+GList * _gtk_widget_list_devices (GtkWidget *widget);
+
+void _gtk_widget_synthesize_crossing (GtkWidget *from,
+ GtkWidget *to,
+ GdkDevice *device,
+ GdkCrossingMode mode);
+
+gpointer _gtk_widget_peek_request_cache (GtkWidget *widget);
+
+void _gtk_widget_buildable_finish_accelerator (GtkWidget *widget,
+ GtkWidget *toplevel,
+ gpointer user_data);
+
G_END_DECLS
#endif /* __GTK_WIDGET_PRIVATE_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]