Fix #150738, Tomislav Jonjic.

Sat Aug 21 23:29:54 2004  Matthias Clasen  <maclas@gmx.de>

	Fix #150738, Tomislav Jonjic.

	* gtk/gtktoolitem.h (GTK_IS_TOOL_ITEM_CLASS):
	* gtk/gtktoolbutton.h (GTK_IS_TOOL_BUTTON_CLASS):
	* gtk/gtktoggleaction.h (GTK_IS_TOGGLE_ACTION_CLASS):
	* gtk/gtkseparatortoolitem.h (GTK_IS_SEPARATOR_TOOL_ITEM_CLASS):
	* gtk/gtkradiotoolbutton.h (GTK_IS_RADIO_TOOL_BUTTON_CLASS):
	* gtk/gtkradioaction.h (GTK_IS_RADIO_ACTION_CLASS):
	* gtk/gtkuimanager.h (GTK_IS_UI_MANAGER_CLASS):
	* gtk/gtkaction.h (GTK_IS_ACTION_CLASS): Fix macro definitions.

13 files changed, 73 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index c5690536ec..641abdd8b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Sat Aug 21 23:29:54 2004  Matthias Clasen  <maclas@gmx.de>
+
+	Fix #150738, Tomislav Jonjic.
+	
+	* gtk/gtktoolitem.h (GTK_IS_TOOL_ITEM_CLASS): 
+	* gtk/gtktoolbutton.h (GTK_IS_TOOL_BUTTON_CLASS): 
+	* gtk/gtktoggleaction.h (GTK_IS_TOGGLE_ACTION_CLASS): 
+	* gtk/gtkseparatortoolitem.h (GTK_IS_SEPARATOR_TOOL_ITEM_CLASS): 
+	* gtk/gtkradiotoolbutton.h (GTK_IS_RADIO_TOOL_BUTTON_CLASS): 
+	* gtk/gtkradioaction.h (GTK_IS_RADIO_ACTION_CLASS): 
+	* gtk/gtkuimanager.h (GTK_IS_UI_MANAGER_CLASS): 
+	* gtk/gtkaction.h (GTK_IS_ACTION_CLASS): Fix macro definitions.
+
 Wed Aug 18 17:25:26 2004  Manish Singh  <yosh@gimp.org>
 
 	* demos/testpixbuf-save.c
@@ -8,9 +21,9 @@ Wed Aug 18 17:25:26 2004  Manish Singh  <yosh@gimp.org>
 
 Wed Aug 18 16:18:00 2004  Manish Singh  <yosh@gimp.org>
 
-        * gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height
-        from fixed_height before we do anything, so it always has a valid
-        value.
+	* gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height
+	from fixed_height before we do anything, so it always has a valid
+	value.
 
 	* gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Fix call
 	to gtk_tree_model_get (missing "," in param list).
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c5690536ec..641abdd8b1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+Sat Aug 21 23:29:54 2004  Matthias Clasen  <maclas@gmx.de>
+
+	Fix #150738, Tomislav Jonjic.
+	
+	* gtk/gtktoolitem.h (GTK_IS_TOOL_ITEM_CLASS): 
+	* gtk/gtktoolbutton.h (GTK_IS_TOOL_BUTTON_CLASS): 
+	* gtk/gtktoggleaction.h (GTK_IS_TOGGLE_ACTION_CLASS): 
+	* gtk/gtkseparatortoolitem.h (GTK_IS_SEPARATOR_TOOL_ITEM_CLASS): 
+	* gtk/gtkradiotoolbutton.h (GTK_IS_RADIO_TOOL_BUTTON_CLASS): 
+	* gtk/gtkradioaction.h (GTK_IS_RADIO_ACTION_CLASS): 
+	* gtk/gtkuimanager.h (GTK_IS_UI_MANAGER_CLASS): 
+	* gtk/gtkaction.h (GTK_IS_ACTION_CLASS): Fix macro definitions.
+
 Wed Aug 18 17:25:26 2004  Manish Singh  <yosh@gimp.org>
 
 	* demos/testpixbuf-save.c
@@ -8,9 +21,9 @@ Wed Aug 18 17:25:26 2004  Manish Singh  <yosh@gimp.org>
 
 Wed Aug 18 16:18:00 2004  Manish Singh  <yosh@gimp.org>
 
-        * gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height
-        from fixed_height before we do anything, so it always has a valid
-        value.
+	* gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height
+	from fixed_height before we do anything, so it always has a valid
+	value.
 
 	* gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Fix call
 	to gtk_tree_model_get (missing "," in param list).
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c5690536ec..641abdd8b1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+Sat Aug 21 23:29:54 2004  Matthias Clasen  <maclas@gmx.de>
+
+	Fix #150738, Tomislav Jonjic.
+	
+	* gtk/gtktoolitem.h (GTK_IS_TOOL_ITEM_CLASS): 
+	* gtk/gtktoolbutton.h (GTK_IS_TOOL_BUTTON_CLASS): 
+	* gtk/gtktoggleaction.h (GTK_IS_TOGGLE_ACTION_CLASS): 
+	* gtk/gtkseparatortoolitem.h (GTK_IS_SEPARATOR_TOOL_ITEM_CLASS): 
+	* gtk/gtkradiotoolbutton.h (GTK_IS_RADIO_TOOL_BUTTON_CLASS): 
+	* gtk/gtkradioaction.h (GTK_IS_RADIO_ACTION_CLASS): 
+	* gtk/gtkuimanager.h (GTK_IS_UI_MANAGER_CLASS): 
+	* gtk/gtkaction.h (GTK_IS_ACTION_CLASS): Fix macro definitions.
+
 Wed Aug 18 17:25:26 2004  Manish Singh  <yosh@gimp.org>
 
 	* demos/testpixbuf-save.c
@@ -8,9 +21,9 @@ Wed Aug 18 17:25:26 2004  Manish Singh  <yosh@gimp.org>
 
 Wed Aug 18 16:18:00 2004  Manish Singh  <yosh@gimp.org>
 
-        * gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height
-        from fixed_height before we do anything, so it always has a valid
-        value.
+	* gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height
+	from fixed_height before we do anything, so it always has a valid
+	value.
 
 	* gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Fix call
 	to gtk_tree_model_get (missing "," in param list).
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c5690536ec..641abdd8b1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+Sat Aug 21 23:29:54 2004  Matthias Clasen  <maclas@gmx.de>
+
+	Fix #150738, Tomislav Jonjic.
+	
+	* gtk/gtktoolitem.h (GTK_IS_TOOL_ITEM_CLASS): 
+	* gtk/gtktoolbutton.h (GTK_IS_TOOL_BUTTON_CLASS): 
+	* gtk/gtktoggleaction.h (GTK_IS_TOGGLE_ACTION_CLASS): 
+	* gtk/gtkseparatortoolitem.h (GTK_IS_SEPARATOR_TOOL_ITEM_CLASS): 
+	* gtk/gtkradiotoolbutton.h (GTK_IS_RADIO_TOOL_BUTTON_CLASS): 
+	* gtk/gtkradioaction.h (GTK_IS_RADIO_ACTION_CLASS): 
+	* gtk/gtkuimanager.h (GTK_IS_UI_MANAGER_CLASS): 
+	* gtk/gtkaction.h (GTK_IS_ACTION_CLASS): Fix macro definitions.
+
 Wed Aug 18 17:25:26 2004  Manish Singh  <yosh@gimp.org>
 
 	* demos/testpixbuf-save.c
@@ -8,9 +21,9 @@ Wed Aug 18 17:25:26 2004  Manish Singh  <yosh@gimp.org>
 
 Wed Aug 18 16:18:00 2004  Manish Singh  <yosh@gimp.org>
 
-        * gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height
-        from fixed_height before we do anything, so it always has a valid
-        value.
+	* gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height
+	from fixed_height before we do anything, so it always has a valid
+	value.
 
 	* gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Fix call
 	to gtk_tree_model_get (missing "," in param list).
diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 33ae055a5e..6449748608 100644
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -39,7 +39,7 @@ G_BEGIN_DECLS
 #define GTK_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACTION, GtkAction))
 #define GTK_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACTION, GtkActionClass))
 #define GTK_IS_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACTION))
-#define GTK_IS_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_ACTION))
+#define GTK_IS_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACTION))
 #define GTK_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_ACTION, GtkActionClass))
 
 typedef struct _GtkAction      GtkAction;
diff --git a/gtk/gtkradioaction.h b/gtk/gtkradioaction.h
index b1de074c5d..9dd7d0cfc4 100644
--- a/gtk/gtkradioaction.h
+++ b/gtk/gtkradioaction.h
@@ -38,7 +38,7 @@ G_BEGIN_DECLS
 #define GTK_RADIO_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_ACTION, GtkRadioAction))
 #define GTK_RADIO_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_ACTION, GtkRadioActionClass))
 #define GTK_IS_RADIO_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_ACTION))
-#define GTK_IS_RADIO_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_RADIO_ACTION))
+#define GTK_IS_RADIO_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_ACTION))
 #define GTK_RADIO_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_RADIO_ACTION, GtkRadioActionClass))
 
 typedef struct _GtkRadioAction        GtkRadioAction;
diff --git a/gtk/gtkradiotoolbutton.h b/gtk/gtkradiotoolbutton.h
index 6ee1608930..febdcf777a 100644
--- a/gtk/gtkradiotoolbutton.h
+++ b/gtk/gtkradiotoolbutton.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 #define GTK_RADIO_TOOL_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_TOOL_BUTTON, GtkRadioToolButton))
 #define GTK_RADIO_TOOL_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_TOOL_BUTTON, GtkRadioToolButtonClass))
 #define GTK_IS_RADIO_TOOL_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_TOOL_BUTTON))
-#define GTK_IS_RADIO_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_RADIO_TOOL_BUTTON))
+#define GTK_IS_RADIO_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_TOOL_BUTTON))
 #define GTK_RADIO_TOOL_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_RADIO_TOOL_BUTTON, GtkRadioToolButtonClass))
 
 typedef struct _GtkRadioToolButton      GtkRadioToolButton;
diff --git a/gtk/gtkseparatortoolitem.h b/gtk/gtkseparatortoolitem.h
index 7e637f1bd4..55e404be6f 100644
--- a/gtk/gtkseparatortoolitem.h
+++ b/gtk/gtkseparatortoolitem.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
 #define GTK_SEPARATOR_TOOL_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItem))
 #define GTK_SEPARATOR_TOOL_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItemClass))
 #define GTK_IS_SEPARATOR_TOOL_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM))
-#define GTK_IS_SEPARATOR_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM))
+#define GTK_IS_SEPARATOR_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEPARATOR_TOOL_ITEM))
 #define GTK_SEPARATOR_TOOL_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItemClass))
 
 typedef struct _GtkSeparatorToolItem        GtkSeparatorToolItem;
diff --git a/gtk/gtktoggleaction.h b/gtk/gtktoggleaction.h
index 03183bf531..2a2b260d16 100644
--- a/gtk/gtktoggleaction.h
+++ b/gtk/gtktoggleaction.h
@@ -38,7 +38,7 @@ G_BEGIN_DECLS
 #define GTK_TOGGLE_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_ACTION, GtkToggleAction))
 #define GTK_TOGGLE_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_ACTION, GtkToggleActionClass))
 #define GTK_IS_TOGGLE_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_ACTION))
-#define GTK_IS_TOGGLE_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TOGGLE_ACTION))
+#define GTK_IS_TOGGLE_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOGGLE_ACTION))
 #define GTK_TOGGLE_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOGGLE_ACTION, GtkToggleActionClass))
 
 typedef struct _GtkToggleAction        GtkToggleAction;
diff --git a/gtk/gtktoggletoolbutton.h b/gtk/gtktoggletoolbutton.h
index 3f4cfb1a74..1d747d5a16 100644
--- a/gtk/gtktoggletoolbutton.h
+++ b/gtk/gtktoggletoolbutton.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 #define GTK_TOGGLE_TOOL_BUTTON(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButton))
 #define GTK_TOGGLE_TOOL_BUTTON_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButtonClass))
 #define GTK_IS_TOGGLE_TOOL_BUTTON(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON))
-#define GTK_IS_TOGGLE_TOOL_BUTTON_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON))
+#define GTK_IS_TOGGLE_TOOL_BUTTON_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOGGLE_TOOL_BUTTON))
 #define GTK_TOGGLE_TOOL_BUTTON_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButtonClass))
 
 typedef struct _GtkToggleToolButton        GtkToggleToolButton;
diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h
index 153fc86f2e..d86d64f43a 100644
--- a/gtk/gtktoolbutton.h
+++ b/gtk/gtktoolbutton.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 #define GTK_TOOL_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOL_BUTTON, GtkToolButton))
 #define GTK_TOOL_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOL_BUTTON, GtkToolButtonClass))
 #define GTK_IS_TOOL_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOL_BUTTON))
-#define GTK_IS_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TOOL_BUTTON))
+#define GTK_IS_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOL_BUTTON))
 #define GTK_TOOL_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOOL_BUTTON, GtkToolButtonClass))
 
 typedef struct _GtkToolButton        GtkToolButton;
diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 49e0658ae6..f6d7950d12 100644
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 #define GTK_TOOL_ITEM(o)              (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_TOOL_ITEM, GtkToolItem))
 #define GTK_TOOL_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOL_ITEM, GtkToolItemClass))
 #define GTK_IS_TOOL_ITEM(o)           (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_TOOL_ITEM))
-#define GTK_IS_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((o), GTK_TYPE_TOOL_ITEM))
+#define GTK_IS_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOL_ITEM))
 #define GTK_TOOL_ITEM_GET_CLASS(o)    (G_TYPE_INSTANCE_GET_CLASS((o), GTK_TYPE_TOOL_ITEM, GtkToolItemClass))
 
 typedef struct _GtkToolItem        GtkToolItem;
diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h
index 027a582a30..13199c5a7e 100644
--- a/gtk/gtkuimanager.h
+++ b/gtk/gtkuimanager.h
@@ -44,7 +44,7 @@ G_BEGIN_DECLS
 #define GTK_UI_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_UI_MANAGER, GtkUIManager))
 #define GTK_UI_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_UI_MANAGER, GtkUIManagerClass))
 #define GTK_IS_UI_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_UI_MANAGER))
-#define GTK_IS_UI_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_UI_MANAGER))
+#define GTK_IS_UI_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_UI_MANAGER))
 #define GTK_UI_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_UI_MANAGER, GtkUIManagerClass))
 
 typedef struct _GtkUIManager      GtkUIManager;