glom r1980 - in trunk: . glom/utility_widgets glom/utility_widgets/adddel/eggcolumnchooser

[murrayc svn gnome org]

Author: murrayc
Date: Thu Mar 12 15:08:51 2009
New Revision: 1980
URL: http://svn.gnome.org/viewvc/glom?rev=1980&view=rev

Log:
2009-03-12  Murray Cumming  <murrayc murrayc com>

* glom/utility_widgets/adddel/eggcolumnchooser/: Copy a newer version from 
libegg, which already fixed the use of deprecated GTK+ macros.
* glom/utility_widgets/flowtable.cc:
* glom/utility_widgets/flowtable.h: child_type_vfunc(): Use GType instead 
of deprecated GtkType.
This mostly fixes bug #575021 (Andrà Klapper).

Modified:
   trunk/ChangeLog
   trunk/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnchooserdialog.c
   trunk/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnchooserdialog.h
   trunk/glom/utility_widgets/flowtable.cc
   trunk/glom/utility_widgets/flowtable.h

Modified: trunk/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnchooserdialog.c
==============================================================================
--- trunk/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnchooserdialog.c	(original)
+++ trunk/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnchooserdialog.c	Thu Mar 12 15:08:51 2009
@@ -42,7 +42,7 @@
 GType
 egg_column_chooser_dialog_get_type (void)
 {
-	static GtkType object_type = 0;
+	static GType object_type = 0;
 
 	if (!object_type) {
 		static const GTypeInfo object_info = {

Modified: trunk/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnchooserdialog.h
==============================================================================
--- trunk/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnchooserdialog.h	(original)
+++ trunk/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnchooserdialog.h	Thu Mar 12 15:08:51 2009
@@ -31,11 +31,11 @@
 G_BEGIN_DECLS
 
 #define EGG_TYPE_COLUMN_CHOOSER_DIALOG (egg_column_chooser_dialog_get_type ())
-#define EGG_COLUMN_CHOOSER_DIALOG(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG, EggColumnChooserDialog))
-#define EGG_COLUMN_CHOOSER_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_COLUMN_CHOOSER_DIALOG, EggColumnChooserDialogClass))
-#define EGG_IS_COLUMN_CHOOSER_DIALOG(obj)      (GTK_CHECK_TYPE ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG))
-#define EGG_IS_COLUMN_CHOOSER_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG))
-#define EGG_COLUMN_CHOOSER_DIALOG_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG, GanttViewClass))
+#define EGG_COLUMN_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG, EggColumnChooserDialog))
+#define EGG_COLUMN_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_COLUMN_CHOOSER_DIALOG, EggColumnChooserDialogClass))
+#define EGG_IS_COLUMN_CHOOSER_DIALOG(obj)      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG))
+#define EGG_IS_COLUMN_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG))
+#define EGG_COLUMN_CHOOSER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG, GanttViewClass))
 
 typedef struct _EggColumnChooserDialog      EggColumnChooserDialog;
 typedef struct _EggColumnChooserDialogClass EggColumnChooserDialogClass;

Modified: trunk/glom/utility_widgets/flowtable.cc
==============================================================================
--- trunk/glom/utility_widgets/flowtable.cc	(original)
+++ trunk/glom/utility_widgets/flowtable.cc	Thu Mar 12 15:08:51 2009
@@ -934,7 +934,7 @@
   }
 }
 
-GtkType FlowTable::child_type_vfunc() const
+GType FlowTable::child_type_vfunc() const
 {
   //TODO: What is this for?
   if(!m_children.empty())

Modified: trunk/glom/utility_widgets/flowtable.h
==============================================================================
--- trunk/glom/utility_widgets/flowtable.h	(original)
+++ trunk/glom/utility_widgets/flowtable.h	Thu Mar 12 15:08:51 2009
@@ -82,7 +82,7 @@
   //Handle child widgets:
   virtual void on_size_request(Gtk::Requisition* requisition);
   virtual void on_size_allocate(Gtk::Allocation& allocation);
-  virtual GtkType child_type_vfunc() const;
+  virtual GType child_type_vfunc() const;
   virtual void on_add(Gtk::Widget* child);
   virtual void forall_vfunc(gboolean include_internals, GtkCallback callback, gpointer callback_data);
   virtual void on_remove(Gtk::Widget* child);