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 bdfbfc0af8f9833559d0430950d0d14e5669b930..0bab7e6ae37f65fe9cb855a2dc9355a8bebc01d8 100644 (file)
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
@@ -32,9 +32,7 @@
 #define __GTK_BUTTON_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkbin.h>
-#include <gtk/gtkenums.h>
 #include <gtk/gtkimage.h>
 
 
@@ -47,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 GSEAL (constructed : 1);
-  guint GSEAL (in_button : 1);
-  guint GSEAL (button_down : 1);
-  guint GSEAL (relief : 2);
-  guint GSEAL (use_underline : 1);
-  guint GSEAL (use_stock : 1);
-  guint GSEAL (depressed : 1);
-  guint GSEAL (depress_on_activate : 1);
-  guint GSEAL (focus_on_click : 1);
+  GtkButtonPrivate *priv;
 };
 
 struct _GtkButtonClass
@@ -95,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);
@@ -129,10 +119,14 @@ void                  gtk_button_set_image_position (GtkButton      *button,
                                                     GtkPositionType position);
 GtkPositionType       gtk_button_get_image_position (GtkButton      *button);
 
+GdkWindow*            gtk_button_get_event_window   (GtkButton      *button);
+
 void _gtk_button_set_depressed             (GtkButton          *button,
                                            gboolean            depressed);
 void _gtk_button_paint                     (GtkButton          *button,
-                                           const GdkRectangle *area,
+                                            cairo_t            *cr,
+                                            int                 width,
+                                            int                 height,
                                            GtkStateType        state_type,
                                            GtkShadowType       shadow_type,
                                            const gchar        *main_detail,