Use the correct screen for getting the height. (Fix from Stephen Browne,

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

diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 7753d02dd61822990a0cd6779e79140ac1c3856e..60d43b3d46e492a5f6131b1d6031534eaa210ab2 100644 (file)
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -40,11 +40,11 @@ extern "C" {
 
 
 #define GTK_TYPE_WINDOW                        (gtk_window_get_type ())
-#define GTK_WINDOW(obj)                        (GTK_CHECK_CAST ((obj), GTK_TYPE_WINDOW, GtkWindow))
-#define GTK_WINDOW_CLASS(klass)                (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW, GtkWindowClass))
-#define GTK_IS_WINDOW(obj)             (GTK_CHECK_TYPE ((obj), GTK_TYPE_WINDOW))
-#define GTK_IS_WINDOW_CLASS(klass)     (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WINDOW))
-#define GTK_WINDOW_GET_CLASS(obj)       (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_WINDOW, GtkWindowClass))
+#define GTK_WINDOW(obj)                        (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WINDOW, GtkWindow))
+#define GTK_WINDOW_CLASS(klass)                (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW, GtkWindowClass))
+#define GTK_IS_WINDOW(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WINDOW))
+#define GTK_IS_WINDOW_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WINDOW))
+#define GTK_WINDOW_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WINDOW, GtkWindowClass))
 
 
 typedef struct _GtkWindow             GtkWindow;
@@ -82,7 +82,7 @@ struct _GtkWindow
   guint need_default_position : 1;
   guint need_default_size : 1;
   guint position : 3;
-  GtkWindowType type : 4;
+  guint type : 4; /* GtkWindowType */ 
   guint has_user_ref_count : 1;
   guint has_focus : 1;
 
@@ -97,15 +97,21 @@ struct _GtkWindow
   guint maximize_initially : 1;
   guint decorated : 1;
   
-  GdkWindowTypeHint type_hint : 3;
-  GdkGravity gravity : 5;
+  guint type_hint : 3; /* GdkWindowTypeHint */ 
+  guint gravity : 5; /* GdkGravity */
+
+  guint is_active : 1;
+  guint has_toplevel_focus : 1;
   
   guint frame_left;
   guint frame_top;
   guint frame_right;
   guint frame_bottom;
+
+  guint keys_changed_handler;
   
   GdkModifierType mnemonic_modifier;
+  GdkScreen      *screen;
 };
 
 struct _GtkWindowClass
@@ -114,7 +120,7 @@ struct _GtkWindowClass
 
   void     (* set_focus)   (GtkWindow *window,
                            GtkWidget *focus);
-  gboolean (* frame_event) (GtkWidget *widget,
+  gboolean (* frame_event) (GtkWindow *window,
                            GdkEvent  *event);
 
   /* G_SIGNAL_ACTION signals for keybindings */
@@ -122,7 +128,15 @@ struct _GtkWindowClass
   void     (* activate_focus)          (GtkWindow       *window);
   void     (* activate_default)        (GtkWindow       *window);
   void     (* move_focus)              (GtkWindow       *window,
-                                        GtkDirectionType direction);  
+                                        GtkDirectionType direction);
+  
+  void    (*keys_changed)             (GtkWindow       *window);
+  
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 #define GTK_TYPE_WINDOW_GROUP             (gtk_window_group_get_type ())
@@ -142,9 +156,15 @@ struct _GtkWindowGroup
 struct _GtkWindowGroupClass
 {
   GObjectClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
-GtkType    gtk_window_get_type                 (void) G_GNUC_CONST;
+GType      gtk_window_get_type                 (void) G_GNUC_CONST;
 GtkWidget* gtk_window_new                      (GtkWindowType        type);
 void       gtk_window_set_title                (GtkWindow           *window,
                                                const gchar         *title);
@@ -162,6 +182,11 @@ void       gtk_window_remove_accel_group       (GtkWindow           *window,
 void       gtk_window_set_position             (GtkWindow           *window,
                                                GtkWindowPosition    position);
 gboolean   gtk_window_activate_focus          (GtkWindow           *window);
+void       gtk_window_set_focus                (GtkWindow           *window,
+                                               GtkWidget           *focus);
+GtkWidget *gtk_window_get_focus                (GtkWindow           *window);
+void       gtk_window_set_default              (GtkWindow           *window,
+                                               GtkWidget           *default_widget);
 gboolean   gtk_window_activate_default        (GtkWindow           *window);
 
 void       gtk_window_set_transient_for        (GtkWindow           *window, 
@@ -170,6 +195,12 @@ GtkWindow *gtk_window_get_transient_for        (GtkWindow           *window);
 void       gtk_window_set_type_hint            (GtkWindow           *window, 
                                                GdkWindowTypeHint    hint);
 GdkWindowTypeHint gtk_window_get_type_hint     (GtkWindow           *window);
+void       gtk_window_set_skip_taskbar_hint    (GtkWindow           *window,
+                                                gboolean             setting);
+gboolean   gtk_window_get_skip_taskbar_hint    (GtkWindow           *window);
+void       gtk_window_set_skip_pager_hint      (GtkWindow           *window,
+                                                gboolean             setting);
+gboolean   gtk_window_get_skip_pager_hint      (GtkWindow           *window);
 void       gtk_window_set_destroy_with_parent  (GtkWindow           *window,
                                                 gboolean             setting);
 gboolean   gtk_window_get_destroy_with_parent  (GtkWindow           *window);
@@ -188,6 +219,10 @@ void       gtk_window_set_geometry_hints       (GtkWindow           *window,
                                                GdkGeometry         *geometry,
                                                GdkWindowHints       geom_mask);
 
+void      gtk_window_set_screen               (GtkWindow           *window,
+                                               GdkScreen           *screen);
+GdkScreen* gtk_window_get_screen              (GtkWindow           *window);
+
 /* gtk_window_set_has_frame () must be called before realizing the window_*/
 void       gtk_window_set_has_frame            (GtkWindow *window, 
                                                gboolean   setting);
@@ -206,6 +241,22 @@ void       gtk_window_set_decorated            (GtkWindow *window,
                                                 gboolean   setting);
 gboolean   gtk_window_get_decorated            (GtkWindow *window);
 
+void       gtk_window_set_icon_list                (GtkWindow  *window,
+                                                    GList      *list);
+GList*     gtk_window_get_icon_list                (GtkWindow  *window);
+void       gtk_window_set_icon                     (GtkWindow  *window,
+                                                    GdkPixbuf  *icon);
+gboolean   gtk_window_set_icon_from_file           (GtkWindow   *window,
+                                                   const gchar *filename,
+                                                   GError     **err);
+GdkPixbuf* gtk_window_get_icon                     (GtkWindow  *window);
+void       gtk_window_set_default_icon_list        (GList      *list);
+GList*     gtk_window_get_default_icon_list        (void);
+gboolean   gtk_window_set_default_icon_from_file   (const gchar *filename,
+                                                   GError     **err);
+
+void       gtk_window_set_auto_startup_notification (gboolean setting);
+
 /* If window is set modal, input will be grabbed when show and released when hide */
 void       gtk_window_set_modal      (GtkWindow *window,
                                      gboolean   modal);
@@ -232,6 +283,8 @@ void     gtk_window_stick         (GtkWindow *window);
 void     gtk_window_unstick       (GtkWindow *window);
 void     gtk_window_maximize      (GtkWindow *window);
 void     gtk_window_unmaximize    (GtkWindow *window);
+void     gtk_window_fullscreen    (GtkWindow *window);
+void     gtk_window_unfullscreen  (GtkWindow *window);
 
 void gtk_window_begin_resize_drag (GtkWindow     *window,
                                    GdkWindowEdge  edge,
@@ -250,7 +303,8 @@ void       gtk_window_set_policy               (GtkWindow           *window,
                                                gint                 allow_shrink,
                                                gint                 allow_grow,
                                                gint                 auto_shrink);
-#endif
+#define        gtk_window_position                     gtk_window_set_position
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* Set initial default size of the window (does not constrain user
  * resize operations)
@@ -271,8 +325,8 @@ void     gtk_window_move             (GtkWindow   *window,
                                       gint         x,
                                       gint         y);
 void     gtk_window_get_position     (GtkWindow   *window,
-                                      gint        *x,
-                                      gint        *y);
+                                      gint        *root_x,
+                                      gint        *root_y);
 gboolean gtk_window_parse_geometry   (GtkWindow   *window,
                                       const gchar *geometry);
 
@@ -281,7 +335,7 @@ void     gtk_window_reshow_with_initial_size (GtkWindow *window);
 
 /* Window groups
  */
-GType            gtk_window_group_get_type      (void) G_GNUC_CONST;;
+GType            gtk_window_group_get_type      (void) G_GNUC_CONST;
 
 GtkWindowGroup * gtk_window_group_new           (void);
 void             gtk_window_group_add_window    (GtkWindowGroup     *window_group,
@@ -290,10 +344,8 @@ void             gtk_window_group_remove_window (GtkWindowGroup     *window_grou
                                                 GtkWindow          *window);
 
 /* --- internal functions --- */
-void            gtk_window_set_focus           (GtkWindow *window,
+void            _gtk_window_internal_set_focus (GtkWindow *window,
                                                GtkWidget *focus);
-void            gtk_window_set_default         (GtkWindow *window,
-                                               GtkWidget *defaultw);
 void            gtk_window_remove_embedded_xid (GtkWindow *window,
                                                guint      xid);
 void            gtk_window_add_embedded_xid    (GtkWindow *window,
@@ -307,6 +359,31 @@ void            _gtk_window_constrain_size     (GtkWindow *window,
                                                gint      *new_width,
                                                gint      *new_height);
 GtkWindowGroup *_gtk_window_get_group          (GtkWindow *window);
+gboolean        _gtk_window_activate_key       (GtkWindow   *window,
+                                               GdkEventKey *event);
+
+void            _gtk_window_set_has_toplevel_focus (GtkWindow *window,
+                                                   gboolean   has_toplevel_focus);
+void            _gtk_window_unset_focus_and_default (GtkWindow *window,
+                                                    GtkWidget *widget);
+
+void            _gtk_window_set_is_active          (GtkWindow *window,
+                                                   gboolean   is_active);
+
+typedef void (*GtkWindowKeysForeachFunc) (GtkWindow      *window,
+                                         guint           keyval,
+                                         GdkModifierType modifiers,
+                                         gboolean        is_mnemonic,
+                                         gpointer        data);
+
+void _gtk_window_keys_foreach (GtkWindow               *window,
+                              GtkWindowKeysForeachFunc func,
+                              gpointer                 func_data);
+
+/* --- internal (GtkAcceleratable) --- */
+gboolean       _gtk_window_query_nonaccels     (GtkWindow      *window,
+                                                guint           accel_key,
+                                                GdkModifierType accel_mods);
 
 #ifdef __cplusplus
 }