Move GET_PRIVATE macros from header to implementation.

Sun Oct 12 01:10:29 2003  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkalignment.[hc]:
	* gtk/gtkcombobox.[hc]:
	* gtk/gtkcomboboxentry.[hc]:
	* gtk/gtktreemodelfilter.[hc]: Move GET_PRIVATE macros
	from header to implementation.

12 files changed, 46 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 38fcd7b5fe..77462183c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Oct 12 01:10:29 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkalignment.[hc]: 
+	* gtk/gtkcombobox.[hc]: 
+	* gtk/gtkcomboboxentry.[hc]: 
+	* gtk/gtktreemodelfilter.[hc]: Move GET_PRIVATE macros
+	from header to implementation.
+
 Sun Oct 12 00:18:02 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* tests/testtreeview.c: 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 38fcd7b5fe..77462183c2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Sun Oct 12 01:10:29 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkalignment.[hc]: 
+	* gtk/gtkcombobox.[hc]: 
+	* gtk/gtkcomboboxentry.[hc]: 
+	* gtk/gtktreemodelfilter.[hc]: Move GET_PRIVATE macros
+	from header to implementation.
+
 Sun Oct 12 00:18:02 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* tests/testtreeview.c: 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 38fcd7b5fe..77462183c2 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Sun Oct 12 01:10:29 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkalignment.[hc]: 
+	* gtk/gtkcombobox.[hc]: 
+	* gtk/gtkcomboboxentry.[hc]: 
+	* gtk/gtktreemodelfilter.[hc]: Move GET_PRIVATE macros
+	from header to implementation.
+
 Sun Oct 12 00:18:02 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* tests/testtreeview.c: 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 38fcd7b5fe..77462183c2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Sun Oct 12 01:10:29 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkalignment.[hc]: 
+	* gtk/gtkcombobox.[hc]: 
+	* gtk/gtkcomboboxentry.[hc]: 
+	* gtk/gtktreemodelfilter.[hc]: Move GET_PRIVATE macros
+	from header to implementation.
+
 Sun Oct 12 00:18:02 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* tests/testtreeview.c: 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 38fcd7b5fe..77462183c2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Sun Oct 12 01:10:29 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkalignment.[hc]: 
+	* gtk/gtkcombobox.[hc]: 
+	* gtk/gtkcomboboxentry.[hc]: 
+	* gtk/gtktreemodelfilter.[hc]: Move GET_PRIVATE macros
+	from header to implementation.
+
 Sun Oct 12 00:18:02 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* tests/testtreeview.c: 
diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
index 8f45fa1214..6600c330d6 100644
--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.h
@@ -43,7 +43,6 @@ extern "C" {
 #define GTK_IS_ALIGNMENT(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ALIGNMENT))
 #define GTK_IS_ALIGNMENT_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ALIGNMENT))
 #define GTK_ALIGNMENT_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ALIGNMENT, GtkAlignmentClass))
-#define GTK_ALIGNMENT_GET_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ALIGNMENT, GtkAlignmentPrivate))
 
 
 typedef struct _GtkAlignment       GtkAlignment;
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 5527b32010..e685751e8b 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -63,6 +63,8 @@ struct _ComboCellInfo
   guint pack : 1;
 };
 
+#define GTK_COMBO_BOX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_COMBO_BOX, GtkComboBoxPrivate))
+
 struct _GtkComboBoxPrivate
 {
   GtkTreeModel *model;
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 17892b0401..bb9e0aa7c3 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -32,7 +32,6 @@ G_BEGIN_DECLS
 #define GTK_IS_COMBO_BOX(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO_BOX))
 #define GTK_IS_COMBO_BOX_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_COMBO_BOX))
 #define GTK_COMBO_BOX_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_COMBO_BOX, GtkComboBoxClass))
-#define GTK_COMBO_BOX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_COMBO_BOX, GtkComboBoxPrivate))
 
 typedef struct _GtkComboBox        GtkComboBox;
 typedef struct _GtkComboBoxClass   GtkComboBoxClass;
diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c
index 6ae4e2b0fc..35575c2be0 100644
--- a/gtk/gtkcomboboxentry.c
+++ b/gtk/gtkcomboboxentry.c
@@ -25,6 +25,8 @@
 
 #include "gtkintl.h"
 
+#define GTK_COMBO_BOX_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryPrivate))
+
 struct _GtkComboBoxEntryPrivate
 {
   GtkWidget *entry;
diff --git a/gtk/gtkcomboboxentry.h b/gtk/gtkcomboboxentry.h
index 8e4c0db4f1..85f88fe1cb 100644
--- a/gtk/gtkcomboboxentry.h
+++ b/gtk/gtkcomboboxentry.h
@@ -31,7 +31,6 @@ G_BEGIN_DECLS
 #define GTK_IS_COMBO_BOX_ENTRY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO_BOX_ENTRY))
 #define GTK_IS_COMBO_BOX_ENTRY_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_COMBO_BOX_ENTRY))
 #define GTK_COMBO_BOX_ENTRY_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryClass))
-#define GTK_COMBO_BOX_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryPrivate))
 
 typedef struct _GtkComboBoxEntry             GtkComboBoxEntry;
 typedef struct _GtkComboBoxEntryClass        GtkComboBoxEntryClass;
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 632d5b24d3..74e10588f9 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -55,6 +55,8 @@ struct _FilterLevel
   FilterLevel *parent_level;
 };
 
+#define GTK_TREE_MODEL_FILTER_GET_PRIVATE(obj)  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TREE_MODEL_FILTER, GtkTreeModelFilterPrivate))
+
 struct _GtkTreeModelFilterPrivate
 {
   gpointer root;
diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h
index 6445f0b72d..3dfd734f17 100644
--- a/gtk/gtktreemodelfilter.h
+++ b/gtk/gtktreemodelfilter.h
@@ -31,7 +31,6 @@ G_BEGIN_DECLS
 #define GTK_IS_TREE_MODEL_FILTER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_MODEL_FILTER))
 #define GTK_IS_TREE_MODEL_FILTER_CLASS(vtable)  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_TREE_MODEL_FILTER))
 #define GTK_TREE_MODEL_FILTER_GET_CLASS(inst)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_MODEL_FILTER, GtkTreeModelFilterClass))
-#define GTK_TREE_MODEL_FILTER_GET_PRIVATE(obj)  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TREE_MODEL_FILTER, GtkTreeModelFilterPrivate))
 
 typedef gboolean (* GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model,
                                                     GtkTreeIter  *iter,