X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbutton.h;h=c9fe63bcff0f73a9b3b47e5605016d25fa0735f3;hb=fd90de672b1ab9404cc508e39f02a21693bb7eac;hp=3f40d54d3bc33e9860dbce68ac92d559e321aa94;hpb=82c14f6f45f24f636d5c9fab848987df480390f4;p=~andy%2Fgtk

diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index 3f40d54d3..c9fe63bcf 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -31,27 +31,27 @@
 #include <gdk/gdk.h>
 #include <gtk/gtkbin.h>
 #include <gtk/gtkenums.h>
+#include <gtk/gtkimage.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_BUTTON                 (gtk_button_get_type ())
-#define GTK_BUTTON(obj)                 (GTK_CHECK_CAST ((obj), GTK_TYPE_BUTTON, GtkButton))
-#define GTK_BUTTON_CLASS(klass)         (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON, GtkButtonClass))
-#define GTK_IS_BUTTON(obj)              (GTK_CHECK_TYPE ((obj), GTK_TYPE_BUTTON))
-#define GTK_IS_BUTTON_CLASS(klass)      (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUTTON))
-#define GTK_BUTTON_GET_CLASS(obj)       (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_BUTTON, GtkButtonClass))
+#define GTK_BUTTON(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON, GtkButton))
+#define GTK_BUTTON_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON, GtkButtonClass))
+#define GTK_IS_BUTTON(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUTTON))
+#define GTK_IS_BUTTON_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUTTON))
+#define GTK_BUTTON_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BUTTON, GtkButtonClass))
 
-
-typedef struct _GtkButton       GtkButton;
-typedef struct _GtkButtonClass  GtkButtonClass;
+typedef struct _GtkButton        GtkButton;
+typedef struct _GtkButtonClass   GtkButtonClass;
 
 struct _GtkButton
 {
   GtkBin bin;
 
+  GdkWindow *event_window;
+
   gchar *label_text;
 
   guint activate_timeout;
@@ -63,6 +63,8 @@ struct _GtkButton
   guint use_underline : 1;
   guint use_stock : 1;
   guint depressed : 1;
+  guint depress_on_activate : 1;
+  guint focus_on_click : 1;
 };
 
 struct _GtkButtonClass
@@ -75,10 +77,16 @@ struct _GtkButtonClass
   void (* enter)    (GtkButton *button);
   void (* leave)    (GtkButton *button);
   void (* activate) (GtkButton *button);
+  
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-GtkType        gtk_button_get_type          (void) G_GNUC_CONST;
+GType          gtk_button_get_type          (void) G_GNUC_CONST;
 GtkWidget*     gtk_button_new               (void);
 GtkWidget*     gtk_button_new_with_label    (const gchar    *label);
 GtkWidget*     gtk_button_new_from_stock    (const gchar    *stock_id);
@@ -88,25 +96,44 @@ void           gtk_button_released          (GtkButton      *button);
 void           gtk_button_clicked           (GtkButton      *button);
 void           gtk_button_enter             (GtkButton      *button);
 void           gtk_button_leave             (GtkButton      *button);
-void           gtk_button_set_relief        (GtkButton      *button,
-					     GtkReliefStyle  newstyle);
-GtkReliefStyle gtk_button_get_relief        (GtkButton      *button);
-
-void                  gtk_button_set_label         (GtkButton   *button,
-						    const gchar *label);
-G_CONST_RETURN gchar *gtk_button_get_label         (GtkButton   *button);
-void                  gtk_button_set_use_underline (GtkButton   *button,
-						    gboolean     use_underline);
-gboolean              gtk_button_get_use_underline (GtkButton   *button);
-void                  gtk_button_set_use_stock     (GtkButton   *button,
-						    gboolean     use_stock);
-gboolean              gtk_button_get_use_stock     (GtkButton   *button);
-void                  _gtk_button_set_depressed    (GtkButton   *button,
-						    gboolean     depressed);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
+void                  gtk_button_set_relief         (GtkButton      *button,
+						     GtkReliefStyle  newstyle);
+GtkReliefStyle        gtk_button_get_relief         (GtkButton      *button);
+void                  gtk_button_set_label          (GtkButton      *button,
+						     const gchar    *label);
+G_CONST_RETURN gchar *gtk_button_get_label          (GtkButton      *button);
+void                  gtk_button_set_use_underline  (GtkButton      *button,
+						     gboolean        use_underline);
+gboolean              gtk_button_get_use_underline  (GtkButton      *button);
+void                  gtk_button_set_use_stock      (GtkButton      *button,
+						     gboolean        use_stock);
+gboolean              gtk_button_get_use_stock      (GtkButton      *button);
+void                  gtk_button_set_focus_on_click (GtkButton      *button,
+						     gboolean        focus_on_click);
+gboolean              gtk_button_get_focus_on_click (GtkButton      *button);
+void                  gtk_button_set_alignment      (GtkButton      *button,
+						     gfloat          xalign,
+						     gfloat          yalign);
+void                  gtk_button_get_alignment      (GtkButton      *button,
+						     gfloat         *xalign,
+						     gfloat         *yalign);
+void                  gtk_button_set_image          (GtkButton      *button,
+					             GtkWidget      *image);
+GtkWidget*            gtk_button_get_image          (GtkButton      *button);
+void                  gtk_button_set_image_position (GtkButton      *button,
+						     GtkPositionType position);
+GtkPositionType       gtk_button_get_image_position (GtkButton      *button);
+
+void _gtk_button_set_depressed             (GtkButton     *button,
+					    gboolean       depressed);
+void _gtk_button_paint                     (GtkButton     *button,
+					    GdkRectangle  *area,
+					    GtkStateType   state_type,
+					    GtkShadowType  shadow_type,
+					    const gchar   *main_detail,
+					    const gchar   *default_detail);
+
+G_END_DECLS
 
 #endif /* __GTK_BUTTON_H__ */