X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbutton.h;h=d46f181eff4d0c3a23cc2616bfa91789fe789ee0;hb=fa4878979e0a72890ca577a210ccd7cf6291dbf0;hp=3f40d54d3bc33e9860dbce68ac92d559e321aa94;hpb=82c14f6f45f24f636d5c9fab848987df480390f4;p=~andy%2Fgtk
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index 3f40d54d3..d46f181ef 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -12,57 +12,47 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
/*
* Modified by the GTK+ Team and others 1997-2001. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_BUTTON_H__
#define __GTK_BUTTON_H__
-#include
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
-#include
+#include
-#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 _GtkButtonPrivate GtkButtonPrivate;
+typedef struct _GtkButtonClass GtkButtonClass;
struct _GtkButton
{
+ /*< private >*/
GtkBin bin;
- gchar *label_text;
-
- guint activate_timeout;
-
- guint constructed : 1;
- guint in_button : 1;
- guint button_down : 1;
- guint relief : 2;
- guint use_underline : 1;
- guint use_stock : 1;
- guint depressed : 1;
+ GtkButtonPrivate *priv;
};
struct _GtkButtonClass
@@ -75,38 +65,66 @@ 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);
GtkWidget* gtk_button_new_with_mnemonic (const gchar *label);
+void gtk_button_clicked (GtkButton *button);
+GDK_DEPRECATED
void gtk_button_pressed (GtkButton *button);
+GDK_DEPRECATED
void gtk_button_released (GtkButton *button);
-void gtk_button_clicked (GtkButton *button);
+GDK_DEPRECATED
void gtk_button_enter (GtkButton *button);
+GDK_DEPRECATED
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);
+const 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);
+GDK_AVAILABLE_IN_3_6
+void gtk_button_set_always_show_image (GtkButton *button,
+ gboolean always_show);
+GDK_AVAILABLE_IN_3_6
+gboolean gtk_button_get_always_show_image (GtkButton *button);
+
+GdkWindow* gtk_button_get_event_window (GtkButton *button);
+
+
+G_END_DECLS
#endif /* __GTK_BUTTON_H__ */