test prog

2004-11-26  JP Rosevear  <jpr@novell.com>

	* test-info-label.c: test prog

	* e-url-entry.c: get image directly from icon factory

	* e-combo-button.c: ditto; convert to G_DEFINE_TYPE

	* e-activity-handler.c: convert to G_DEFINE_TYPE

	* e-task-widget.c: ditto

	* e-task-bar.c: ditto

	* e-multi-config-dialog.c: ditto

	* e-dropdown-button.c: ditto

	* e-cell-renderer-combo.c: ditto

	* e-cell-date-edit.c: ditto

	* e-calendar.c: ditto

	* e-calendar-item.c: ditto

	* Makefile.am: don't build the title bar, build an info label test
	program

svn path=/trunk/; revision=27999

1 files changed, 5 insertions, 14 deletions

diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c
index 5564f20ea6..12167e3185 100644
--- a/widgets/misc/e-cell-date-edit.c
+++ b/widgets/misc/e-cell-date-edit.c
@@ -40,7 +40,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <gal/util/e-util.h>
 #include <gal/e-table/e-table-item.h>
 #include <gal/e-table/e-cell-text.h>
 
@@ -51,8 +50,6 @@
 /* This depends on ECalendar which is why I didn't put it in gal. */
 #include "e-calendar.h"
 
-static void e_cell_date_edit_class_init		(GtkObjectClass	*object_class);
-static void e_cell_date_edit_init		(ECellDateEdit	*ecde);
 static void e_cell_date_edit_destroy		(GtkObject	*object);
 static void e_cell_date_edit_get_arg		(GtkObject	*o,
 						 GtkArg		*arg,
@@ -115,18 +112,14 @@ enum {
 	ARG_UPPER_HOUR
 };
 
-static ECellPopupClass *parent_class;
-
-
-E_MAKE_TYPE (e_cell_date_edit, "ECellDateEdit", ECellDateEdit,
-	     e_cell_date_edit_class_init, e_cell_date_edit_init,
-	     e_cell_popup_get_type());
+G_DEFINE_TYPE (ECellDateEdit, e_cell_date_edit, E_CELL_POPUP_TYPE);
 
 
 static void
-e_cell_date_edit_class_init		(GtkObjectClass	*object_class)
+e_cell_date_edit_class_init (ECellDateEditClass *ecdec)
 {
-	ECellPopupClass *ecpc = (ECellPopupClass *) object_class;
+	GtkObjectClass	*object_class = (GtkObjectClass *) ecdec;
+	ECellPopupClass	*ecpc = (ECellPopupClass *) ecdec;
 
 	gtk_object_add_arg_type ("ECellDateEdit::show_time",
 				 GTK_TYPE_BOOL, GTK_ARG_READWRITE,
@@ -155,8 +148,6 @@ e_cell_date_edit_class_init		(GtkObjectClass	*object_class)
 	object_class->set_arg = e_cell_date_edit_set_arg;
 
 	ecpc->popup = e_cell_date_edit_do_popup;
-
-	parent_class = g_type_class_ref(e_cell_popup_get_type ());
 }
 
 
@@ -310,7 +301,7 @@ e_cell_date_edit_destroy		(GtkObject *object)
 	gtk_widget_destroy (ecde->popup_window);
 	ecde->popup_window = NULL;
 
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
+	GTK_OBJECT_CLASS (e_cell_date_edit_parent_class)->destroy (object);
 }