Fix some cases where signal connection IDs where being assigned to guint

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

diff --git a/gtk/gtkvbbox.h b/gtk/gtkvbbox.h
index 5b334b0ad1ca60f73b86813f711cb71e945636c2..b5dac7dd8f7efd788e34af17271fdc63911987ec 100644 (file)
--- a/gtk/gtkvbbox.h
+++ b/gtk/gtkvbbox.h
@@ -2,24 +2,33 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser 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.
+ * 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.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  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_VBUTTON_BOX_H__
 #define __GTK_VBUTTON_BOX_H__
 
 
-#include "gtkbbox.h"
+#include <gtk/gtkbbox.h>
 
 
 #ifdef __cplusplus
@@ -27,9 +36,12 @@ extern "C" {
 #endif /* __cplusplus */
 
 
-#define GTK_VBUTTON_BOX(obj)          GTK_CHECK_CAST (obj, gtk_vbutton_box_get_type (), GtkVButtonBox)
-#define GTK_VBUTTON_BOX_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_vbutton_box_get_type (), GtkVButtonBoxClass)
-#define GTK_IS_VBUTTON_BOX(obj)       GTK_CHECK_TYPE (obj, gtk_vbutton_box_get_type ())
+#define GTK_TYPE_VBUTTON_BOX            (gtk_vbutton_box_get_type ())
+#define GTK_VBUTTON_BOX(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBox))
+#define GTK_VBUTTON_BOX_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass))
+#define GTK_IS_VBUTTON_BOX(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_VBUTTON_BOX))
+#define GTK_IS_VBUTTON_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VBUTTON_BOX))
+#define GTK_VBUTTON_BOX_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass))
 
 
 typedef struct _GtkVButtonBox       GtkVButtonBox;
@@ -46,16 +58,18 @@ struct _GtkVButtonBoxClass
 };
 
 
-guint      gtk_vbutton_box_get_type (void);
+GtkType    gtk_vbutton_box_get_type (void) G_GNUC_CONST;
 GtkWidget *gtk_vbutton_box_new      (void);
 
 /* buttons can be added by gtk_container_add() */
 
+#ifndef GTK_DISABLE_DEPRECATED
 gint gtk_vbutton_box_get_spacing_default (void);
 void gtk_vbutton_box_set_spacing_default (gint spacing);
 
 GtkButtonBoxStyle gtk_vbutton_box_get_layout_default (void);
 void gtk_vbutton_box_set_layout_default (GtkButtonBoxStyle layout);
+#endif
 
 
 #ifdef __cplusplus