diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
| commit | 54d44a9bd04cfbed8426614fc69c027a46f41a14 (patch) | |
| tree | 34bdf65a6e8d5d6d4016154345d1d803ba0da379 /gtk/gtkplug.h | |
| parent | b3b22c31b997fb85b3319b392a1a69407703184c (diff) | |
| parent | 67194ed77b153eb5a7eb6c596f3c20e274b7787a (diff) | |
| download | gtk+-native-layout.tar.gz | |
Merge branch 'master' into native-layoutnative-layout
Conflicts:
gtk/gtkplug.c
gtk/gtkscrolledwindow.c
Diffstat (limited to 'gtk/gtkplug.h')
| -rw-r--r-- | gtk/gtkplug.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h index c96ca774fa..679c065463 100644 --- a/gtk/gtkplug.h +++ b/gtk/gtkplug.h @@ -45,20 +45,16 @@ G_BEGIN_DECLS #define GTK_PLUG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PLUG, GtkPlugClass)) -typedef struct _GtkPlug GtkPlug; -typedef struct _GtkPlugClass GtkPlugClass; +typedef struct _GtkPlug GtkPlug; +typedef struct _GtkPlugPrivate GtkPlugPrivate; +typedef struct _GtkPlugClass GtkPlugClass; struct _GtkPlug { GtkWindow window; - GdkWindow *GSEAL (socket_window); - GtkWidget *GSEAL (modality_window); - GtkWindowGroup *GSEAL (modality_group); - GHashTable *GSEAL (grabbed_keys); - - guint GSEAL (same_app) : 1; + GtkPlugPrivate *priv; }; struct _GtkPlugClass |