diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2011-01-29 14:16:47 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-01-29 14:16:47 -0500 |
| commit | f783a75d61dbe7ae511bf65b6c3aafaffa8b4216 (patch) | |
| tree | 8e2bc06a6c0ae238cef571b60356388aec69ddda /gtk/gtksocket.h | |
| parent | 1641e71c9a0e05311073d1eb02bffa38b8dc4b22 (diff) | |
| download | gtk+-f783a75d61dbe7ae511bf65b6c3aafaffa8b4216.tar.gz | |
Add a gtkx.h header for X11-specific GTK+ api
This keeps us from pulling gdkx.h into gtk.h
https://bugzilla.gnome.org/show_bug.cgi?id=640902
Diffstat (limited to 'gtk/gtksocket.h')
| -rw-r--r-- | gtk/gtksocket.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h index c5be024abf..2415b142d9 100644 --- a/gtk/gtksocket.h +++ b/gtk/gtksocket.h @@ -23,19 +23,18 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only <gtk/gtk.h> can be included directly." +#if !defined (__GTKX_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtkx.h> can be included directly." #endif #ifndef __GTK_SOCKET_H__ #define __GTK_SOCKET_H__ -#include <gdk/gdk.h> +#include <gtk/gtk.h> #ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> -#include <gtk/gtkcontainer.h> G_BEGIN_DECLS @@ -72,14 +71,12 @@ struct _GtkSocketClass void (*_gtk_reserved4) (void); }; - -GType gtk_socket_get_type (void) G_GNUC_CONST; -GtkWidget* gtk_socket_new (void); - -void gtk_socket_add_id (GtkSocket *socket_, - Window window); -Window gtk_socket_get_id (GtkSocket *socket_); -GdkWindow* gtk_socket_get_plug_window (GtkSocket *socket_); +GType gtk_socket_get_type (void) G_GNUC_CONST; +GtkWidget *gtk_socket_new (void); +void gtk_socket_add_id (GtkSocket *socket_, + Window window); +Window gtk_socket_get_id (GtkSocket *socket_); +GdkWindow *gtk_socket_get_plug_window (GtkSocket *socket_); G_END_DECLS |