rm -rf intl breaks --disable-nls, put it back

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

diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index ec72c99f784fa56b01d2bde4810ee603ce2bd55d..b6d901a755ac5a3c7163a1ac9584fddb618f161e 100644 (file)
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -12,25 +12,28 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 #ifndef __GTK_BUTTON_H__
 #define __GTK_BUTTON_H__
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtkbin.h>
+#include <gtk/gtkenums.h>
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-
-#define GTK_BUTTON(obj)          GTK_CHECK_CAST (obj, gtk_button_get_type (), GtkButton)
-#define GTK_BUTTON_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_button_get_type (), GtkButtonClass)
-#define GTK_IS_BUTTON(obj)       GTK_CHECK_TYPE (obj, gtk_button_get_type ())
+#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))
 
 
 typedef struct _GtkButton       GtkButton;
@@ -38,34 +41,44 @@ typedef struct _GtkButtonClass  GtkButtonClass;
 
 struct _GtkButton
 {
-  GtkContainer container;
+  GtkBin bin;
 
-  GtkWidget *child;
+  GtkWidget *child /* deprecapted field,
+                   * use GTK_BIN (button)->child instead
+                   */;
 
   guint in_button : 1;
   guint button_down : 1;
+  guint relief : 2;
 };
 
 struct _GtkButtonClass
 {
-  GtkContainerClass parent_class;
-
-  void (* pressed)  (GtkButton *button);
-  void (* released) (GtkButton *button);
-  void (* clicked)  (GtkButton *button);
-  void (* enter)    (GtkButton *button);
-  void (* leave)    (GtkButton *button);
+  GtkBinClass        parent_class;
+  
+  void (* pressed)      (GtkButton *button);
+  void (* released)     (GtkButton *button);
+  void (* clicked)      (GtkButton *button);
+
+  /* these used to be enter and leave, but Digital decided they were more
+     important than us. They may have beaten us for now, but revenge is
+     a dish best served cold */
+  void (* enter_button) (GtkButton *button);
+  void (* leave_button) (GtkButton *button);
 };
 
 
-guint      gtk_button_get_type       (void);
-GtkWidget* gtk_button_new            (void);
-GtkWidget* gtk_button_new_with_label (const gchar *label);
-void       gtk_button_pressed        (GtkButton *button);
-void       gtk_button_released       (GtkButton *button);
-void       gtk_button_clicked        (GtkButton *button);
-void       gtk_button_enter          (GtkButton *button);
-void       gtk_button_leave          (GtkButton *button);
+GtkType        gtk_button_get_type       (void);
+GtkWidget*     gtk_button_new            (void);
+GtkWidget*     gtk_button_new_with_label (const gchar *label);
+void           gtk_button_pressed        (GtkButton *button);
+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);
 
 
 #ifdef __cplusplus