take frame offest into account when trying to calculate the animation

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

diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h
index 22bbd497d1106ecb4d36e4814423143b118ec636..e46f98ca8ae485e154ff9c08ecf5ec47e638d34f 100644 (file)
--- a/gtk/gtkbbox.h
+++ b/gtk/gtkbbox.h
@@ -16,10 +16,18 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-1999.  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/. 
+ */
+
 #ifndef __GTK_BUTTON_BOX_H__
 #define __GTK_BUTTON_BOX_H__
 
-#include "gtkbox.h"
+#include <gtk/gtkbox.h>
 
 
 #ifdef __cplusplus
@@ -27,21 +35,16 @@ extern "C" {
 #endif /* __cplusplus */
   
 
-#define GTK_BUTTON_BOX(obj)          GTK_CHECK_CAST (obj, gtk_button_box_get_type (), GtkButtonBox)
-#define GTK_BUTTON_BOX_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_button_box_get_type (), GtkButtonBoxClass)
-#define GTK_IS_BUTTON_BOX(obj)       GTK_CHECK_TYPE (obj, gtk_button_box_get_type ())
+#define GTK_TYPE_BUTTON_BOX             (gtk_button_box_get_type ())
+#define GTK_BUTTON_BOX(obj)             (GTK_CHECK_CAST ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBox))
+#define GTK_BUTTON_BOX_CLASS(klass)     (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON_BOX, GtkButtonBoxClass))
+#define GTK_IS_BUTTON_BOX(obj)          (GTK_CHECK_TYPE ((obj), GTK_TYPE_BUTTON_BOX))
+#define GTK_IS_BUTTON_BOX_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUTTON_BOX))
+#define GTK_BUTTON_BOX_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBoxClass))
   
 
 #define GTK_BUTTONBOX_DEFAULT -1
  
-typedef enum {
-  GTK_BUTTONBOX_DEFAULT_STYLE,
-  GTK_BUTTONBOX_SPREAD,
-  GTK_BUTTONBOX_EDGE,
-  GTK_BUTTONBOX_START,
-  GTK_BUTTONBOX_END
-} GtkButtonBoxStyle;
-
 typedef struct _GtkButtonBox       GtkButtonBox;
 typedef struct _GtkButtonBoxClass  GtkButtonBoxClass;
 
@@ -62,7 +65,7 @@ struct _GtkButtonBoxClass
 };
 
 
-guint gtk_button_box_get_type (void);
+GtkType gtk_button_box_get_type (void);
 
 void gtk_button_box_get_child_size_default (gint *min_width, gint *min_height);
 void gtk_button_box_get_child_ipadding_default (gint *ipad_x, gint *ipad_y);