[gtk+] Consistently hide class structs
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Consistently hide class structs
- Date: Fri, 24 Dec 2010 20:55:15 +0000 (UTC)
commit 92f163d40a037ae083b8a55bb2f8129740a42a62
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Dec 24 15:54:12 2010 -0500
Consistently hide class structs
And, since we've decided to keep the structs private, there is
no point in having the standard GObject clas macros anymore either.
gdk/gdkapplaunchcontext.h | 16 +++-----
gdk/gdkapplaunchcontextprivate.h | 7 +++
gdk/gdkcursor.h | 3 -
gdk/gdkcursorprivate.h | 4 ++
gdk/gdkdevice.h | 4 +-
gdk/gdkdevicemanager.h | 5 --
gdk/gdkdevicemanagerprivate.h | 8 ++++
gdk/gdkdeviceprivate.h | 1 +
gdk/gdkdisplay.h | 83 ++++++++++++++++++-------------------
gdk/gdkdisplaymanager.h | 6 +--
gdk/gdkdisplaymanagerprivate.h | 6 +++
gdk/gdkdisplayprivate.h | 5 ++
gdk/gdkdnd.h | 62 ++++++++++++----------------
gdk/gdkdndprivate.h | 8 ++++
gdk/gdkkeys.h | 5 --
gdk/gdkkeysprivate.h | 6 +++
gdk/gdkscreen.h | 33 +++++++--------
gdk/gdkscreenprivate.h | 6 +++
gdk/gdktypes.h | 32 ++++++++-------
gdk/gdkvisual.h | 25 +++++-------
gdk/gdkvisualprivate.h | 6 +++
21 files changed, 173 insertions(+), 158 deletions(-)
---
diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index 509d558..ad1b1f1 100644
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -35,28 +35,24 @@ G_BEGIN_DECLS
#define GDK_TYPE_APP_LAUNCH_CONTEXT (gdk_app_launch_context_get_type ())
#define GDK_APP_LAUNCH_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContext))
-#define GDK_APP_LAUNCH_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContextClass))
#define GDK_IS_APP_LAUNCH_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_APP_LAUNCH_CONTEXT))
-#define GDK_IS_APP_LAUNCH_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDK_TYPE_APP_LAUNCH_CONTEXT))
-#define GDK_APP_LAUNCH_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContextClass))
-typedef GAppLaunchContextClass GdkAppLaunchContextClass;
GType gdk_app_launch_context_get_type (void);
GdkAppLaunchContext *gdk_app_launch_context_new (void);
void gdk_app_launch_context_set_display (GdkAppLaunchContext *context,
- GdkDisplay *display);
+ GdkDisplay *display);
void gdk_app_launch_context_set_screen (GdkAppLaunchContext *context,
- GdkScreen *screen);
+ GdkScreen *screen);
void gdk_app_launch_context_set_desktop (GdkAppLaunchContext *context,
- gint desktop);
+ gint desktop);
void gdk_app_launch_context_set_timestamp (GdkAppLaunchContext *context,
- guint32 timestamp);
+ guint32 timestamp);
void gdk_app_launch_context_set_icon (GdkAppLaunchContext *context,
- GIcon *icon);
+ GIcon *icon);
void gdk_app_launch_context_set_icon_name (GdkAppLaunchContext *context,
- const char *icon_name);
+ const char *icon_name);
G_END_DECLS
diff --git a/gdk/gdkapplaunchcontextprivate.h b/gdk/gdkapplaunchcontextprivate.h
index 94c76a8..2ae0f2a 100644
--- a/gdk/gdkapplaunchcontextprivate.h
+++ b/gdk/gdkapplaunchcontextprivate.h
@@ -26,6 +26,13 @@
G_BEGIN_DECLS
+#define GDK_APP_LAUNCH_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContextClass))
+#define GDK_IS_APP_LAUNCH_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDK_TYPE_APP_LAUNCH_CONTEXT))
+#define GDK_APP_LAUNCH_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContextClass))
+
+
+typedef GAppLaunchContextClass GdkAppLaunchContextClass;
+
struct _GdkAppLaunchContext
{
GAppLaunchContext parent_instance;
diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index 8a88545..89b0ef1 100644
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -38,10 +38,7 @@ G_BEGIN_DECLS
#define GDK_TYPE_CURSOR (gdk_cursor_get_type ())
#define GDK_CURSOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_CURSOR, GdkCursor))
-#define GDK_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_CURSOR, GdkCursorClass))
#define GDK_IS_CURSOR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_CURSOR))
-#define GDK_IS_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_CURSOR))
-#define GDK_CURSOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_CURSOR, GdkCursorClass))
/**
diff --git a/gdk/gdkcursorprivate.h b/gdk/gdkcursorprivate.h
index 6a3a407..3d32ffb 100644
--- a/gdk/gdkcursorprivate.h
+++ b/gdk/gdkcursorprivate.h
@@ -31,6 +31,10 @@
G_BEGIN_DECLS
+#define GDK_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_CURSOR, GdkCursorClass))
+#define GDK_IS_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_CURSOR))
+#define GDK_CURSOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_CURSOR, GdkCursorClass))
+
typedef struct _GdkCursorClass GdkCursorClass;
struct _GdkCursor
diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index 4085fac..ef142eb 100644
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -33,8 +33,6 @@ G_BEGIN_DECLS
#define GDK_DEVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_DEVICE, GdkDevice))
#define GDK_IS_DEVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_DEVICE))
-typedef struct _GdkDevice GdkDevice;
-typedef struct _GdkDeviceClass GdkDeviceClass;
typedef struct _GdkTimeCoord GdkTimeCoord;
/**
@@ -156,7 +154,7 @@ struct _GdkTimeCoord
gdouble axes[GDK_MAX_TIMECOORD_AXES];
};
-GType gdk_device_get_type (void) G_GNUC_CONST;
+GType gdk_device_get_type (void) G_GNUC_CONST;
G_CONST_RETURN gchar *gdk_device_get_name (GdkDevice *device);
gboolean gdk_device_get_has_cursor (GdkDevice *device);
diff --git a/gdk/gdkdevicemanager.h b/gdk/gdkdevicemanager.h
index 2bb6041..d49ef63 100644
--- a/gdk/gdkdevicemanager.h
+++ b/gdk/gdkdevicemanager.h
@@ -31,13 +31,8 @@ G_BEGIN_DECLS
#define GDK_TYPE_DEVICE_MANAGER (gdk_device_manager_get_type ())
#define GDK_DEVICE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_DEVICE_MANAGER, GdkDeviceManager))
-#define GDK_DEVICE_MANAGER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_DEVICE_MANAGER, GdkDeviceManagerClass))
#define GDK_IS_DEVICE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_DEVICE_MANAGER))
-#define GDK_IS_DEVICE_MANAGER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_DEVICE_MANAGER))
-#define GDK_DEVICE_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_DEVICE_MANAGER, GdkDeviceManagerClass))
-typedef struct _GdkDeviceManager GdkDeviceManager;
-typedef struct _GdkDeviceManagerClass GdkDeviceManagerClass;
GType gdk_device_manager_get_type (void) G_GNUC_CONST;
diff --git a/gdk/gdkdevicemanagerprivate.h b/gdk/gdkdevicemanagerprivate.h
index a89a5e9..543f7a9 100644
--- a/gdk/gdkdevicemanagerprivate.h
+++ b/gdk/gdkdevicemanagerprivate.h
@@ -24,6 +24,14 @@
G_BEGIN_DECLS
+
+#define GDK_DEVICE_MANAGER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_DEVICE_MANAGER, GdkDeviceManagerClass))
+#define GDK_IS_DEVICE_MANAGER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_DEVICE_MANAGER))
+#define GDK_DEVICE_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_DEVICE_MANAGER, GdkDeviceManagerClass))
+
+
+typedef struct _GdkDeviceManagerClass GdkDeviceManagerClass;
+
struct _GdkDeviceManager
{
GObject parent_instance;
diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h
index 1e65504..8816576 100644
--- a/gdk/gdkdeviceprivate.h
+++ b/gdk/gdkdeviceprivate.h
@@ -30,6 +30,7 @@ G_BEGIN_DECLS
#define GDK_IS_DEVICE_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_DEVICE))
#define GDK_DEVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_DEVICE, GdkDeviceClass))
+typedef struct _GdkDeviceClass GdkDeviceClass;
typedef struct _GdkDeviceKey GdkDeviceKey;
struct _GdkDeviceKey
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 1445d37..c7732f3 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -1,7 +1,7 @@
/*
* gdkdisplay.h
- *
- * Copyright 2001 Sun Microsystems Inc.
+ *
+ * Copyright 2001 Sun Microsystems Inc.
*
* Erwann Chenede <erwann chenede sun com>
*
@@ -36,13 +36,10 @@ G_BEGIN_DECLS
#define GDK_TYPE_DISPLAY (gdk_display_get_type ())
#define GDK_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY, GdkDisplay))
+#define GDK_IS_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY))
#ifndef GDK_DISABLE_DEPRECATED
#define GDK_DISPLAY_OBJECT(object) GDK_DISPLAY(object)
#endif
-#define GDK_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY, GdkDisplayClass))
-#define GDK_IS_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY))
-#define GDK_IS_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY))
-#define GDK_DISPLAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY, GdkDisplayClass))
typedef struct _GdkDisplayPointerHooks GdkDisplayPointerHooks;
typedef struct _GdkDisplayDeviceHooks GdkDisplayDeviceHooks;
@@ -72,18 +69,18 @@ typedef struct _GdkDisplayDeviceHooks GdkDisplayDeviceHooks;
struct _GdkDisplayPointerHooks
{
void (*get_pointer) (GdkDisplay *display,
- GdkScreen **screen,
- gint *x,
- gint *y,
- GdkModifierType *mask);
+ GdkScreen **screen,
+ gint *x,
+ gint *y,
+ GdkModifierType *mask);
GdkWindow* (*window_get_pointer) (GdkDisplay *display,
- GdkWindow *window,
- gint *x,
- gint *y,
- GdkModifierType *mask);
+ GdkWindow *window,
+ gint *x,
+ gint *y,
+ GdkModifierType *mask);
GdkWindow* (*window_at_pointer) (GdkDisplay *display,
- gint *win_x,
- gint *win_y);
+ gint *win_x,
+ gint *win_y);
};
/**
@@ -131,14 +128,14 @@ G_CONST_RETURN gchar * gdk_display_get_name (GdkDisplay *display);
gint gdk_display_get_n_screens (GdkDisplay *display);
GdkScreen * gdk_display_get_screen (GdkDisplay *display,
- gint screen_num);
+ gint screen_num);
GdkScreen * gdk_display_get_default_screen (GdkDisplay *display);
#ifndef GDK_MULTIDEVICE_SAFE
void gdk_display_pointer_ungrab (GdkDisplay *display,
- guint32 time_);
+ guint32 time_);
void gdk_display_keyboard_ungrab (GdkDisplay *display,
- guint32 time_);
+ guint32 time_);
gboolean gdk_display_pointer_is_grabbed (GdkDisplay *display);
#endif /* GDK_MULTIDEVICE_SAFE */
@@ -148,7 +145,7 @@ void gdk_display_beep (GdkDisplay *display);
void gdk_display_sync (GdkDisplay *display);
void gdk_display_flush (GdkDisplay *display);
-void gdk_display_close (GdkDisplay *display);
+void gdk_display_close (GdkDisplay *display);
gboolean gdk_display_is_closed (GdkDisplay *display);
#ifndef GDK_DISABLE_DEPRECATED
@@ -162,31 +159,31 @@ void gdk_display_put_event (GdkDisplay *display,
gboolean gdk_display_has_pending (GdkDisplay *display);
void gdk_display_add_client_message_filter (GdkDisplay *display,
- GdkAtom message_type,
- GdkFilterFunc func,
- gpointer data);
+ GdkAtom message_type,
+ GdkFilterFunc func,
+ gpointer data);
void gdk_display_set_double_click_time (GdkDisplay *display,
- guint msec);
+ guint msec);
void gdk_display_set_double_click_distance (GdkDisplay *display,
- guint distance);
+ guint distance);
GdkDisplay *gdk_display_get_default (void);
#ifndef GDK_MULTIDEVICE_SAFE
void gdk_display_get_pointer (GdkDisplay *display,
- GdkScreen **screen,
- gint *x,
- gint *y,
- GdkModifierType *mask);
+ GdkScreen **screen,
+ gint *x,
+ gint *y,
+ GdkModifierType *mask);
GdkWindow * gdk_display_get_window_at_pointer (GdkDisplay *display,
- gint *win_x,
- gint *win_y);
+ gint *win_x,
+ gint *win_y);
void gdk_display_warp_pointer (GdkDisplay *display,
- GdkScreen *screen,
- gint x,
- gint y);
+ GdkScreen *screen,
+ gint x,
+ gint y);
#endif /* GDK_MULTIDEVICE_SAFE */
void gdk_display_get_device_state (GdkDisplay *display,
@@ -202,7 +199,7 @@ GdkWindow * gdk_display_get_window_at_device_position (GdkDisplay
#ifndef GDK_MULTIDEVICE_SAFE
GdkDisplayPointerHooks *gdk_display_set_pointer_hooks (GdkDisplay *display,
- const GdkDisplayPointerHooks *new_hooks);
+ const GdkDisplayPointerHooks *new_hooks);
#endif /* GDK_MULTIDEVICE_SAFE */
GdkDisplayDeviceHooks *gdk_display_set_device_hooks (GdkDisplay *display,
@@ -214,21 +211,21 @@ gboolean gdk_display_supports_cursor_alpha (GdkDisplay *display);
gboolean gdk_display_supports_cursor_color (GdkDisplay *display);
guint gdk_display_get_default_cursor_size (GdkDisplay *display);
void gdk_display_get_maximal_cursor_size (GdkDisplay *display,
- guint *width,
- guint *height);
+ guint *width,
+ guint *height);
GdkWindow *gdk_display_get_default_group (GdkDisplay *display);
gboolean gdk_display_supports_selection_notification (GdkDisplay *display);
gboolean gdk_display_request_selection_notification (GdkDisplay *display,
- GdkAtom selection);
+ GdkAtom selection);
gboolean gdk_display_supports_clipboard_persistence (GdkDisplay *display);
void gdk_display_store_clipboard (GdkDisplay *display,
- GdkWindow *clipboard_window,
- guint32 time_,
- const GdkAtom *targets,
- gint n_targets);
+ GdkWindow *clipboard_window,
+ guint32 time_,
+ const GdkAtom *targets,
+ gint n_targets);
gboolean gdk_display_supports_shapes (GdkDisplay *display);
gboolean gdk_display_supports_input_shapes (GdkDisplay *display);
@@ -242,4 +239,4 @@ GdkAppLaunchContext *gdk_display_get_app_launch_context (GdkDisplay *display);
G_END_DECLS
-#endif /* __GDK_DISPLAY_H__ */
+#endif /* __GDK_DISPLAY_H__ */
diff --git a/gdk/gdkdisplaymanager.h b/gdk/gdkdisplaymanager.h
index dccca92..4c0e02c 100644
--- a/gdk/gdkdisplaymanager.h
+++ b/gdk/gdkdisplaymanager.h
@@ -39,14 +39,10 @@ G_BEGIN_DECLS
#define GDK_TYPE_DISPLAY_MANAGER (gdk_display_manager_get_type ())
#define GDK_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManager))
-#define GDK_DISPLAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManagerClass))
#define GDK_IS_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY_MANAGER))
-#define GDK_IS_DISPLAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY_MANAGER))
-#define GDK_DISPLAY_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManagerClass))
-typedef struct _GdkDisplayManagerClass GdkDisplayManagerClass;
-GType gdk_display_manager_get_type (void) G_GNUC_CONST;
+GType gdk_display_manager_get_type (void) G_GNUC_CONST;
GdkDisplayManager *gdk_display_manager_get (void);
GdkDisplay * gdk_display_manager_get_default_display (GdkDisplayManager *manager);
diff --git a/gdk/gdkdisplaymanagerprivate.h b/gdk/gdkdisplaymanagerprivate.h
index a1d19ec..6c1df3e 100644
--- a/gdk/gdkdisplaymanagerprivate.h
+++ b/gdk/gdkdisplaymanagerprivate.h
@@ -24,6 +24,12 @@
G_BEGIN_DECLS
+#define GDK_DISPLAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManagerClass))
+#define GDK_IS_DISPLAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY_MANAGER))
+#define GDK_DISPLAY_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManagerClass))
+
+typedef struct _GdkDisplayManagerClass GdkDisplayManagerClass;
+
struct _GdkDisplayManager
{
GObject parent_instance;
diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 29ab846..2662eee 100644
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -26,6 +26,11 @@
G_BEGIN_DECLS
+#define GDK_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY, GdkDisplayClass))
+#define GDK_IS_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY))
+#define GDK_DISPLAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY, GdkDisplayClass))
+
+
typedef struct _GdkDisplayClass GdkDisplayClass;
/* Tracks information about the keyboard grab on this display */
diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index 76e7a29..06c5f31 100644
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -36,11 +36,9 @@
G_BEGIN_DECLS
-/* Object that holds information about a drag in progress.
- * this is used on both source and destination sides.
- */
-typedef struct _GdkDragContext GdkDragContext;
-typedef struct _GdkDragContextClass GdkDragContextClass;
+#define GDK_TYPE_DRAG_CONTEXT (gdk_drag_context_get_type ())
+#define GDK_DRAG_CONTEXT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAG_CONTEXT, GdkDragContext))
+#define GDK_IS_DRAG_CONTEXT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAG_CONTEXT))
/**
* GdkDragAction:
@@ -93,14 +91,6 @@ typedef enum
} GdkDragProtocol;
-#define GDK_TYPE_DRAG_CONTEXT (gdk_drag_context_get_type ())
-#define GDK_DRAG_CONTEXT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAG_CONTEXT, GdkDragContext))
-#define GDK_DRAG_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
-#define GDK_IS_DRAG_CONTEXT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAG_CONTEXT))
-#define GDK_IS_DRAG_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAG_CONTEXT))
-#define GDK_DRAG_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
-
-
GType gdk_drag_context_get_type (void) G_GNUC_CONST;
void gdk_drag_context_set_device (GdkDragContext *context,
@@ -119,14 +109,14 @@ GdkDragProtocol gdk_drag_context_get_protocol (GdkDragContext *context)
/* Destination side */
void gdk_drag_status (GdkDragContext *context,
- GdkDragAction action,
- guint32 time_);
+ GdkDragAction action,
+ guint32 time_);
void gdk_drop_reply (GdkDragContext *context,
- gboolean accepted,
- guint32 time_);
+ gboolean accepted,
+ guint32 time_);
void gdk_drop_finish (GdkDragContext *context,
- gboolean success,
- guint32 time_);
+ gboolean success,
+ guint32 time_);
GdkAtom gdk_drag_get_selection (GdkDragContext *context);
/* Source side */
@@ -139,29 +129,29 @@ GdkDragContext * gdk_drag_begin_for_device (GdkWindow *window,
GList *targets);
GdkNativeWindow gdk_drag_get_protocol_for_display (GdkDisplay *display,
- GdkNativeWindow xid,
- GdkDragProtocol *protocol);
+ GdkNativeWindow xid,
+ GdkDragProtocol *protocol);
void gdk_drag_find_window_for_screen (GdkDragContext *context,
- GdkWindow *drag_window,
- GdkScreen *screen,
- gint x_root,
- gint y_root,
- GdkWindow **dest_window,
- GdkDragProtocol *protocol);
+ GdkWindow *drag_window,
+ GdkScreen *screen,
+ gint x_root,
+ gint y_root,
+ GdkWindow **dest_window,
+ GdkDragProtocol *protocol);
gboolean gdk_drag_motion (GdkDragContext *context,
- GdkWindow *dest_window,
- GdkDragProtocol protocol,
- gint x_root,
- gint y_root,
- GdkDragAction suggested_action,
- GdkDragAction possible_actions,
- guint32 time_);
+ GdkWindow *dest_window,
+ GdkDragProtocol protocol,
+ gint x_root,
+ gint y_root,
+ GdkDragAction suggested_action,
+ GdkDragAction possible_actions,
+ guint32 time_);
void gdk_drag_drop (GdkDragContext *context,
- guint32 time_);
+ guint32 time_);
void gdk_drag_abort (GdkDragContext *context,
- guint32 time_);
+ guint32 time_);
gboolean gdk_drag_drop_succeeded (GdkDragContext *context);
G_END_DECLS
diff --git a/gdk/gdkdndprivate.h b/gdk/gdkdndprivate.h
index ca82bdc..618f0cc 100644
--- a/gdk/gdkdndprivate.h
+++ b/gdk/gdkdndprivate.h
@@ -24,6 +24,14 @@
G_BEGIN_DECLS
+
+#define GDK_DRAG_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
+#define GDK_IS_DRAG_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAG_CONTEXT))
+#define GDK_DRAG_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
+
+typedef struct _GdkDragContextClass GdkDragContextClass;
+
+
struct _GdkDragContextClass {
GObjectClass parent_class;
diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h
index 229cf80..346fe40 100644
--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@@ -65,12 +65,7 @@ struct _GdkKeymapKey
#define GDK_TYPE_KEYMAP (gdk_keymap_get_type ())
#define GDK_KEYMAP(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_KEYMAP, GdkKeymap))
-#define GDK_KEYMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_KEYMAP, GdkKeymapClass))
#define GDK_IS_KEYMAP(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_KEYMAP))
-#define GDK_IS_KEYMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_KEYMAP))
-#define GDK_KEYMAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_KEYMAP, GdkKeymapClass))
-
-typedef struct _GdkKeymapClass GdkKeymapClass;
/**
* GdkKeymap:
diff --git a/gdk/gdkkeysprivate.h b/gdk/gdkkeysprivate.h
index 7e02e56..c0f1f0e 100644
--- a/gdk/gdkkeysprivate.h
+++ b/gdk/gdkkeysprivate.h
@@ -24,6 +24,12 @@
G_BEGIN_DECLS
+#define GDK_KEYMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_KEYMAP, GdkKeymapClass))
+#define GDK_IS_KEYMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_KEYMAP))
+#define GDK_KEYMAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_KEYMAP, GdkKeymapClass))
+
+typedef struct _GdkKeymapClass GdkKeymapClass;
+
struct _GdkKeymapClass
{
GObjectClass parent_class;
diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index 9898e70..dadb966 100644
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -1,7 +1,7 @@
/*
* gdkscreen.h
- *
- * Copyright 2001 Sun Microsystems Inc.
+ *
+ * Copyright 2001 Sun Microsystems Inc.
*
* Erwann Chenede <erwann chenede sun com>
*
@@ -34,19 +34,16 @@
G_BEGIN_DECLS
-typedef struct _GdkScreenClass GdkScreenClass;
-
#define GDK_TYPE_SCREEN (gdk_screen_get_type ())
#define GDK_SCREEN(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_SCREEN, GdkScreen))
-#define GDK_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_SCREEN, GdkScreenClass))
#define GDK_IS_SCREEN(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_SCREEN))
-#define GDK_IS_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_SCREEN))
-#define GDK_SCREEN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_SCREEN, GdkScreenClass))
+
GType gdk_screen_get_type (void) G_GNUC_CONST;
+
GdkVisual * gdk_screen_get_system_visual (GdkScreen *screen);
GdkVisual * gdk_screen_get_rgba_visual (GdkScreen *screen);
-gboolean gdk_screen_is_composited (GdkScreen *screen);
+gboolean gdk_screen_is_composited (GdkScreen *screen);
GdkWindow * gdk_screen_get_root_window (GdkScreen *screen);
GdkDisplay * gdk_screen_get_display (GdkScreen *screen);
@@ -63,13 +60,13 @@ gchar * gdk_screen_make_display_name (GdkScreen *screen);
gint gdk_screen_get_n_monitors (GdkScreen *screen);
gint gdk_screen_get_primary_monitor (GdkScreen *screen);
void gdk_screen_get_monitor_geometry (GdkScreen *screen,
- gint monitor_num,
- GdkRectangle *dest);
+ gint monitor_num,
+ GdkRectangle *dest);
gint gdk_screen_get_monitor_at_point (GdkScreen *screen,
- gint x,
- gint y);
+ gint x,
+ gint y);
gint gdk_screen_get_monitor_at_window (GdkScreen *screen,
- GdkWindow *window);
+ GdkWindow *window);
gint gdk_screen_get_monitor_width_mm (GdkScreen *screen,
gint monitor_num);
gint gdk_screen_get_monitor_height_mm (GdkScreen *screen,
@@ -78,20 +75,20 @@ gchar * gdk_screen_get_monitor_plug_name (GdkScreen *screen,
gint monitor_num);
void gdk_screen_broadcast_client_message (GdkScreen *screen,
- GdkEvent *event);
+ GdkEvent *event);
GdkScreen *gdk_screen_get_default (void);
gboolean gdk_screen_get_setting (GdkScreen *screen,
- const gchar *name,
- GValue *value);
+ const gchar *name,
+ GValue *value);
void gdk_screen_set_font_options (GdkScreen *screen,
- const cairo_font_options_t *options);
+ const cairo_font_options_t *options);
const cairo_font_options_t *gdk_screen_get_font_options (GdkScreen *screen);
void gdk_screen_set_resolution (GdkScreen *screen,
- gdouble dpi);
+ gdouble dpi);
gdouble gdk_screen_get_resolution (GdkScreen *screen);
GdkWindow *gdk_screen_get_active_window (GdkScreen *screen);
diff --git a/gdk/gdkscreenprivate.h b/gdk/gdkscreenprivate.h
index eb87949..630b112 100644
--- a/gdk/gdkscreenprivate.h
+++ b/gdk/gdkscreenprivate.h
@@ -25,6 +25,12 @@
G_BEGIN_DECLS
+#define GDK_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_SCREEN, GdkScreenClass))
+#define GDK_IS_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_SCREEN))
+#define GDK_SCREEN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_SCREEN, GdkScreenClass))
+
+typedef struct _GdkScreenClass GdkScreenClass;
+
struct _GdkScreen
{
GObject parent_instance;
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 7cd9f6c..d655ff9 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -8,7 +8,7 @@
*
* 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
+ * 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
@@ -69,7 +69,7 @@ G_BEGIN_DECLS
/* Type definitions for the basic structures.
*/
-typedef struct _GdkPoint GdkPoint;
+typedef struct _GdkPoint GdkPoint;
/**
* GdkRectangle:
@@ -77,7 +77,7 @@ typedef struct _GdkPoint GdkPoint;
* Defines the position and size of a rectangle. It is identical to
* #cairo_rectangle_int_t.
*/
-typedef cairo_rectangle_int_t GdkRectangle;
+typedef cairo_rectangle_int_t GdkRectangle;
/**
* GdkAtom:
@@ -131,15 +131,17 @@ typedef gpointer GdkNativeWindow;
#else
typedef guint32 GdkNativeWindow;
#endif
-
-/* Forward declarations of commonly used types
- */
+
+/* Forward declarations of commonly used types */
typedef struct _GdkColor GdkColor;
typedef struct _GdkRGBA GdkRGBA;
typedef struct _GdkCursor GdkCursor;
typedef struct _GdkVisual GdkVisual;
+typedef struct _GdkDevice GdkDevice;
+typedef struct _GdkDragContext GdkDragContext;
typedef struct _GdkDisplayManager GdkDisplayManager;
+typedef struct _GdkDeviceManager GdkDeviceManager;
typedef struct _GdkDisplay GdkDisplay;
typedef struct _GdkScreen GdkScreen;
typedef struct _GdkWindow GdkWindow;
@@ -208,13 +210,13 @@ typedef enum
typedef enum
{
GDK_SHIFT_MASK = 1 << 0,
- GDK_LOCK_MASK = 1 << 1,
+ GDK_LOCK_MASK = 1 << 1,
GDK_CONTROL_MASK = 1 << 2,
- GDK_MOD1_MASK = 1 << 3,
- GDK_MOD2_MASK = 1 << 4,
- GDK_MOD3_MASK = 1 << 5,
- GDK_MOD4_MASK = 1 << 6,
- GDK_MOD5_MASK = 1 << 7,
+ GDK_MOD1_MASK = 1 << 3,
+ GDK_MOD2_MASK = 1 << 4,
+ GDK_MOD3_MASK = 1 << 5,
+ GDK_MOD4_MASK = 1 << 6,
+ GDK_MOD5_MASK = 1 << 7,
GDK_BUTTON1_MASK = 1 << 8,
GDK_BUTTON2_MASK = 1 << 9,
GDK_BUTTON3_MASK = 1 << 10,
@@ -236,11 +238,11 @@ typedef enum
typedef enum
{
- GDK_OK = 0,
- GDK_ERROR = -1,
+ GDK_OK = 0,
+ GDK_ERROR = -1,
GDK_ERROR_PARAM = -2,
GDK_ERROR_FILE = -3,
- GDK_ERROR_MEM = -4
+ GDK_ERROR_MEM = -4
} GdkStatus;
/**
diff --git a/gdk/gdkvisual.h b/gdk/gdkvisual.h
index bee6426..1d21bcf 100644
--- a/gdk/gdkvisual.h
+++ b/gdk/gdkvisual.h
@@ -37,12 +37,7 @@ G_BEGIN_DECLS
#define GDK_TYPE_VISUAL (gdk_visual_get_type ())
#define GDK_VISUAL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_VISUAL, GdkVisual))
-#define GDK_VISUAL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_VISUAL, GdkVisualClass))
#define GDK_IS_VISUAL(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_VISUAL))
-#define GDK_IS_VISUAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_VISUAL))
-#define GDK_VISUAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_VISUAL, GdkVisualClass))
-
-typedef struct _GdkVisualClass GdkVisualClass;
/**
* GdkVisualType:
@@ -88,19 +83,19 @@ typedef enum
GType gdk_visual_get_type (void) G_GNUC_CONST;
#ifndef GDK_MULTIHEAD_SAFE
-gint gdk_visual_get_best_depth (void);
-GdkVisualType gdk_visual_get_best_type (void);
-GdkVisual* gdk_visual_get_system (void);
-GdkVisual* gdk_visual_get_best (void);
-GdkVisual* gdk_visual_get_best_with_depth (gint depth);
+gint gdk_visual_get_best_depth (void);
+GdkVisualType gdk_visual_get_best_type (void);
+GdkVisual* gdk_visual_get_system (void);
+GdkVisual* gdk_visual_get_best (void);
+GdkVisual* gdk_visual_get_best_with_depth (gint depth);
GdkVisual* gdk_visual_get_best_with_type (GdkVisualType visual_type);
-GdkVisual* gdk_visual_get_best_with_both (gint depth,
- GdkVisualType visual_type);
+GdkVisual* gdk_visual_get_best_with_both (gint depth,
+ GdkVisualType visual_type);
-void gdk_query_depths (gint **depths,
- gint *count);
+void gdk_query_depths (gint **depths,
+ gint *count);
void gdk_query_visual_types (GdkVisualType **visual_types,
- gint *count);
+ gint *count);
GList* gdk_list_visuals (void);
#endif
diff --git a/gdk/gdkvisualprivate.h b/gdk/gdkvisualprivate.h
index 05e4da8..8099ec2 100644
--- a/gdk/gdkvisualprivate.h
+++ b/gdk/gdkvisualprivate.h
@@ -24,6 +24,12 @@
G_BEGIN_DECLS
+#define GDK_VISUAL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_VISUAL, GdkVisualClass))
+#define GDK_IS_VISUAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_VISUAL))
+#define GDK_VISUAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_VISUAL, GdkVisualClass))
+
+typedef struct _GdkVisualClass GdkVisualClass;
+
struct _GdkVisual
{
GObject parent_instance;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
