]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkwidget.h
Switch style of stamp file usage.
[~andy/gtk] / gtk / gtkwidget.h
index bb4a6af33f5bf825f4b042280dd04c6a9f869f22..2176e71f060f7d0c35b8ef910dbebbc11e395889 100644 (file)
@@ -131,11 +131,12 @@ typedef enum
 #define GTK_WIDGET_SET_FLAGS(wid,flag)   G_STMT_START{ (GTK_WIDGET_FLAGS (wid) |= (flag)); }G_STMT_END
 #define GTK_WIDGET_UNSET_FLAGS(wid,flag)  G_STMT_START{ (GTK_WIDGET_FLAGS (wid) &= ~(flag)); }G_STMT_END
 
+#define GTK_TYPE_REQUISITION              (gtk_requisition_get_type ())
 
 /* forward declaration to avoid excessive includes (and concurrent includes)
  */
 typedef struct _GtkRequisition    GtkRequisition;
-typedef struct _GdkRectangle      GtkAllocation;
+typedef        GdkRectangle       GtkAllocation;
 typedef struct _GtkSelectionData   GtkSelectionData;
 typedef struct _GtkWidgetClass    GtkWidgetClass;
 typedef struct _GtkWidgetAuxInfo   GtkWidgetAuxInfo;
@@ -277,18 +278,6 @@ struct _GtkWidgetClass
   void (* child_notify)        (GtkWidget       *widget,
                                GParamSpec       *pspec);
   
-  /* accelerators */
-  void (* add_accelerator)     (GtkWidget      *widget,
-                               guint           accel_signal_id,
-                               GtkAccelGroup  *accel_group,
-                               guint           accel_key,
-                               GdkModifierType accel_mods,
-                               GtkAccelFlags   accel_flags);
-  void (* remove_accelerator)  (GtkWidget      *widget,
-                               GtkAccelGroup  *accel_group,
-                               guint           accel_key,
-                               GdkModifierType accel_mods);
-
   /* Mnemonics */
   gboolean (* mnemonic_activate) (GtkWidget    *widget,
                                  gboolean      group_cycling);
@@ -399,14 +388,14 @@ struct _GtkWidgetClass
                                    guint               time);
 
   /* Signals used only for keybindings */
-  void (* popup_menu)              (GtkWidget          *widget);
+  gboolean (* popup_menu)          (GtkWidget          *widget);
 
   /* If a widget has multiple tooltips/whatsthis, it should show the
    * one for the current focus location, or if that doesn't make
    * sense, should cycle through them showing each tip alongside
    * whatever piece of the widget it applies to.
    */
-  void (* show_help)               (GtkWidget          *widget,
+  gboolean (* show_help)           (GtkWidget          *widget,
                                     GtkWidgetHelpType   help_type);
   
   /* accessibility support 
@@ -414,10 +403,14 @@ struct _GtkWidgetClass
   AtkObject*   (* get_accessible)  (GtkWidget          *widget);
 
   /* Padding for future expansion */
-  GtkFunction pad1;
-  GtkFunction pad2;
-  GtkFunction pad3;
-  GtkFunction pad4;
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+  void (*_gtk_reserved5) (void);
+  void (*_gtk_reserved6) (void);
+  void (*_gtk_reserved7) (void);
+  void (*_gtk_reserved8) (void);
 };
 
 struct _GtkWidgetAuxInfo
@@ -494,22 +487,17 @@ void         gtk_widget_add_accelerator     (GtkWidget           *widget,
                                           const gchar         *accel_signal,
                                           GtkAccelGroup       *accel_group,
                                           guint                accel_key,
-                                          guint                accel_mods,
+                                          GdkModifierType      accel_mods,
                                           GtkAccelFlags        accel_flags);
-void      gtk_widget_remove_accelerator  (GtkWidget           *widget,
-                                          GtkAccelGroup       *accel_group,
-                                          guint                accel_key,
-                                          guint                accel_mods);
-void      gtk_widget_remove_accelerators (GtkWidget           *widget,
-                                          const gchar         *accel_signal,
-                                          gboolean             visible_only);
-guint     gtk_widget_accelerator_signal  (GtkWidget           *widget,
+gboolean   gtk_widget_remove_accelerator  (GtkWidget           *widget,
                                           GtkAccelGroup       *accel_group,
                                           guint                accel_key,
-                                          guint                accel_mods);
-void      gtk_widget_lock_accelerators   (GtkWidget           *widget);
-void      gtk_widget_unlock_accelerators (GtkWidget           *widget);
-gboolean   gtk_widget_accelerators_locked (GtkWidget          *widget);
+                                          GdkModifierType      accel_mods);
+void       gtk_widget_set_accel_path      (GtkWidget           *widget,
+                                          const gchar         *accel_path,
+                                          GtkAccelGroup       *accel_group);
+const gchar* _gtk_widget_get_accel_path   (GtkWidget           *widget);
+GList*     gtk_widget_list_accel_closures (GtkWidget          *widget);
 gboolean   gtk_widget_mnemonic_activate   (GtkWidget           *widget,
                                           gboolean             group_cycling);
 gboolean   gtk_widget_event              (GtkWidget           *widget,
@@ -539,25 +527,27 @@ gboolean   gtk_widget_is_focus            (GtkWidget           *widget);
 void      gtk_widget_grab_focus          (GtkWidget           *widget);
 void      gtk_widget_grab_default        (GtkWidget           *widget);
 
-void      gtk_widget_set_name            (GtkWidget           *widget,
-                                          const gchar         *name);
-G_CONST_RETURN gchar* gtk_widget_get_name (GtkWidget          *widget);
-void      gtk_widget_set_state           (GtkWidget           *widget,
-                                          GtkStateType         state);
-void      gtk_widget_set_sensitive       (GtkWidget           *widget,
-                                          gboolean             sensitive);
-void      gtk_widget_set_app_paintable   (GtkWidget           *widget,
-                                          gboolean             app_paintable);
-void      gtk_widget_set_double_buffered (GtkWidget           *widget,
-                                          gboolean             double_buffered);
-void      gtk_widget_set_parent          (GtkWidget           *widget,
-                                          GtkWidget           *parent);
-void      gtk_widget_set_parent_window   (GtkWidget           *widget,
-                                          GdkWindow           *parent_window);
-void       gtk_widget_set_child_visible   (GtkWidget           *widget,
-                                          gboolean             is_visible);
-gboolean   gtk_widget_get_child_visible   (GtkWidget           *widget);
-     
+void                  gtk_widget_set_name               (GtkWidget    *widget,
+                                                        const gchar  *name);
+G_CONST_RETURN gchar* gtk_widget_get_name               (GtkWidget    *widget);
+void                  gtk_widget_set_state              (GtkWidget    *widget,
+                                                        GtkStateType  state);
+void                  gtk_widget_set_sensitive          (GtkWidget    *widget,
+                                                        gboolean      sensitive);
+void                  gtk_widget_set_app_paintable      (GtkWidget    *widget,
+                                                        gboolean      app_paintable);
+void                  gtk_widget_set_double_buffered    (GtkWidget    *widget,
+                                                        gboolean      double_buffered);
+void                  gtk_widget_set_redraw_on_allocate (GtkWidget    *widget,
+                                                        gboolean      redraw_on_allocate);
+void                  gtk_widget_set_parent             (GtkWidget    *widget,
+                                                        GtkWidget    *parent);
+void                  gtk_widget_set_parent_window      (GtkWidget    *widget,
+                                                        GdkWindow    *parent_window);
+void                  gtk_widget_set_child_visible      (GtkWidget    *widget,
+                                                        gboolean      is_visible);
+gboolean              gtk_widget_get_child_visible      (GtkWidget    *widget);
+
 GtkWidget *gtk_widget_get_parent          (GtkWidget           *widget);
 GdkWindow *gtk_widget_get_parent_window          (GtkWidget           *widget);
 gboolean   gtk_widget_child_focus         (GtkWidget           *widget,
@@ -576,9 +566,6 @@ void           gtk_widget_set_uposition       (GtkWidget           *widget,
 void      gtk_widget_set_usize           (GtkWidget           *widget,
                                           gint                 width,
                                           gint                 height);
-void       gtk_widget_get_usize           (GtkWidget           *widget,
-                                          gint                *width,
-                                          gint                *height);
 #endif
 
 void      gtk_widget_set_events          (GtkWidget           *widget,
@@ -624,6 +611,13 @@ void            gtk_widget_get_pointer     (GtkWidget      *widget,
 gboolean     gtk_widget_is_ancestor    (GtkWidget      *widget,
                                         GtkWidget      *ancestor);
 
+gboolean     gtk_widget_translate_coordinates (GtkWidget  *src_widget,
+                                              GtkWidget  *dest_widget,
+                                              gint        src_x,
+                                              gint        src_y,
+                                              gint       *dest_x,
+                                              gint       *dest_y);
+
 /* Hide widget and return TRUE.
  */
 gboolean     gtk_widget_hide_on_delete (GtkWidget      *widget);
@@ -707,7 +701,6 @@ void gtk_widget_style_get          (GtkWidget            *widget,
 
 /* Set certain default values to be used at widget creation time.
  */
-void        gtk_widget_set_default_style    (GtkStyle    *style);
 void        gtk_widget_set_default_colormap (GdkColormap *colormap);
 GtkStyle*    gtk_widget_get_default_style    (void);
 GdkColormap* gtk_widget_get_default_colormap (void);
@@ -745,8 +738,9 @@ void             gtk_widget_class_path         (GtkWidget *widget,
                                            gchar    **path,
                                            gchar    **path_reversed);
 
-GtkRequisition *gtk_requisition_copy (const GtkRequisition *requisition);
-void            gtk_requisition_free (GtkRequisition       *requisition);
+GType           gtk_requisition_get_type (void);
+GtkRequisition *gtk_requisition_copy     (const GtkRequisition *requisition);
+void            gtk_requisition_free     (GtkRequisition       *requisition);
 
 #if    defined (GTK_TRACE_OBJECTS) && defined (__GNUC__)
 #  define gtk_widget_ref gtk_object_ref
@@ -758,6 +752,8 @@ GtkWidgetAuxInfo *_gtk_widget_get_aux_info                (GtkWidget    *widget,
 void              _gtk_widget_propagate_hierarchy_changed (GtkWidget    *widget,
                                                           GtkWidget    *previous_toplevel);
 
+GdkColormap* _gtk_widget_peek_colormap (void);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */