Modified Files: gtkclist.c gtkclist.h gtkctree.c gtkctree.h gtknotebook.c

[~andy/gtk] / gtk / gtkwindow.h

diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 5c90caf6a1a18b111cf65e901bca5217e85e5aa9..33dea2e7534caa7b5b84b7198abc8e9c5f557da4 100644 (file)
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -21,14 +21,13 @@
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkaccelerator.h>
+#include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkbin.h>
 #include <gtk/gtkenums.h>
 #include <gtk/gtkwidget.h>
 
 #ifdef __cplusplus
 extern "C" {
-#pragma }
 #endif /* __cplusplus */
 
 
@@ -50,30 +49,24 @@ struct _GtkWindow
   gchar *wmclass_name;
   gchar *wmclass_class;
   GtkWindowType type;
-  GList *accelerator_tables;
 
   GtkWidget *focus_widget;
   GtkWidget *default_widget;
 
   gushort resize_count;
-  guint need_resize : 1;
   guint allow_shrink : 1;
   guint allow_grow : 1;
   guint auto_shrink : 1;
   guint handling_resize : 1;
   guint position : 2;
   guint use_uposition : 1;
+  guint modal : 1;
 };
 
 struct _GtkWindowClass
 {
   GtkBinClass parent_class;
 
-  gint (* move_resize) (GtkWindow *window,
-                       gint      *x,
-                       gint      *y,
-                       gint       width,
-                       gint       height);
   void (* set_focus)   (GtkWindow *window,
                        GtkWidget *focus);
 };
@@ -94,15 +87,18 @@ void       gtk_window_set_policy               (GtkWindow           *window,
                                                gint                 allow_shrink,
                                                gint                 allow_grow,
                                                gint                 auto_shrink);
-void       gtk_window_add_accelerator_table    (GtkWindow           *window,
-                                               GtkAcceleratorTable *table);
-void       gtk_window_remove_accelerator_table (GtkWindow           *window,
-                                               GtkAcceleratorTable *table);
+void       gtk_window_add_accel_group          (GtkWindow           *window,
+                                               GtkAccelGroup       *accel_group);
+void       gtk_window_remove_accel_group       (GtkWindow           *window,
+                                               GtkAccelGroup       *accel_group);
 void       gtk_window_position                 (GtkWindow           *window,
                                                GtkWindowPosition    position);
 gint      gtk_window_activate_focus           (GtkWindow           *window);
 gint      gtk_window_activate_default         (GtkWindow           *window);
 
+/* If window is set modal, input will be grabbed when show and released when hide */
+void       gtk_window_set_modal                (GtkWindow           *window,
+                                                gboolean modal);
 
 #ifdef __cplusplus
 }