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/gtkplugprivate.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/gtkplugprivate.h')
| -rw-r--r-- | gtk/gtkplugprivate.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gtk/gtkplugprivate.h b/gtk/gtkplugprivate.h index 83dcaaf7ff..a9d1679c2f 100644 --- a/gtk/gtkplugprivate.h +++ b/gtk/gtkplugprivate.h @@ -26,6 +26,18 @@ #ifndef __GTK_PLUG_PRIVATE_H__ #define __GTK_PLUG_PRIVATE_H__ +struct _GtkPlugPrivate +{ + GtkWidget *modality_window; + GtkWindowGroup *modality_group; + + GdkWindow *socket_window; + + GHashTable *grabbed_keys; + + guint same_app : 1; +}; + /* In gtkplug.c: */ void _gtk_plug_send_delete_event (GtkWidget *widget); void _gtk_plug_add_all_grabbed_keys (GtkPlug *plug); |