GtkToggleButton: Make it able to be prelight and active at the same time.

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

diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index c9fe63bcff0f73a9b3b47e5605016d25fa0735f3..0bab7e6ae37f65fe9cb855a2dc9355a8bebc01d8 100644 (file)
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -21,16 +21,18 @@
  * 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/.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_BUTTON_H__
 #define __GTK_BUTTON_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkbin.h>
-#include <gtk/gtkenums.h>
 #include <gtk/gtkimage.h>
 
 
@@ -43,28 +45,16 @@ G_BEGIN_DECLS
 #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;
 
-  GdkWindow *event_window;
-
-  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;
-  guint depress_on_activate : 1;
-  guint focus_on_click : 1;
+  GtkButtonPrivate *priv;
 };
 
 struct _GtkButtonClass
@@ -91,11 +81,15 @@ 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);
+#ifndef GTK_DISABLE_DEPRECATED
 void           gtk_button_pressed           (GtkButton      *button);
 void           gtk_button_released          (GtkButton      *button);
+#endif
 void           gtk_button_clicked           (GtkButton      *button);
+#ifndef GTK_DISABLE_DEPRECATED
 void           gtk_button_enter             (GtkButton      *button);
 void           gtk_button_leave             (GtkButton      *button);
+#endif
 
 void                  gtk_button_set_relief         (GtkButton      *button,
                                                     GtkReliefStyle  newstyle);
@@ -125,14 +119,18 @@ 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);
+GdkWindow*            gtk_button_get_event_window   (GtkButton      *button);
+
+void _gtk_button_set_depressed             (GtkButton          *button,
+                                           gboolean            depressed);
+void _gtk_button_paint                     (GtkButton          *button,
+                                            cairo_t            *cr,
+                                            int                 width,
+                                            int                 height,
+                                           GtkStateType        state_type,
+                                           GtkShadowType       shadow_type,
+                                           const gchar        *main_detail,
+                                           const gchar        *default_detail);
 
 G_END_DECLS