upd. gtk_paint_focus.

2001-12-10  Michael Meeks  <michael@ximian.com>

	* gal/e-text/e-text.c (e_text_draw): upd.
	gtk_paint_focus.

	* *.[ch]: update for atom changes.

[ based on Chris Phelps' work ]

	* *.[ch]: switch get_type returns to GtkType

	* gal/widgets/e-canvas.c (emit_event):
	comment out nastiness & add warning.

	* gal/widgets/e-canvas-utils.c
	(show_area_timeout): remove unneccessary
	GTK_OBJECT_DESTROYED

	* gal/widgets/e-canvas-vbox.c
	(e_canvas_vbox_remove_item): ditto.

	* gal/e-text/e-text.c (tooltip_event): use
	text->model not GTK_OBJECT_DESTROYED.
	(e_text_event): ditto.

2001-12-10 Chris Phelps <chicane@reninet.com>

	* configure.in: upate version.

	* kill all gnome-defs includes.

svn path=/branches/gal-2/; revision=14949

31 files changed, 35 insertions, 84 deletions

diff --git a/e-util/e-i18n.h b/e-util/e-i18n.h
index a2d2bf4417..7a0ab94905 100644
--- a/e-util/e-i18n.h
+++ b/e-util/e-i18n.h
@@ -15,7 +15,6 @@
 #define __E_I18N_H__
 
 #include <glib.h>
-#include "libgnome/gnome-defs.h"
 
 G_BEGIN_DECLS
 
diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h
index 7f86e8ae6d..21a642c9a8 100644
--- a/e-util/e-sorter-array.h
+++ b/e-util/e-sorter-array.h
@@ -5,7 +5,6 @@
 #include <gtk/gtkobject.h>
 #include <gal/util/e-sorter.h>
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
 
 G_BEGIN_DECLS
 
diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h
index d28963fc25..3bc6e42178 100644
--- a/e-util/e-xml-utils.h
+++ b/e-util/e-xml-utils.h
@@ -23,7 +23,6 @@
 #ifndef __E_XML_UTILS__
 #define __E_XML_UTILS__
 
-#include <libgnome/gnome-defs.h>
 #include <glib.h>
 #include <libxml/tree.h>
 
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index 185caa1c9e..ae35f5bfb2 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -21,8 +21,8 @@
 
 #include <config.h>
 #include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
 #include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include "gal-define-views-dialog.h"
 #include "gal-define-views-model.h"
 #include "gal-view-new-dialog.h"
@@ -233,8 +233,8 @@ gal_define_views_dialog_init (GalDefineViewsDialog *dialog)
 	gtk_widget_unref(widget);
 
 	gnome_dialog_append_buttons(GNOME_DIALOG(dialog),
-				    GNOME_STOCK_BUTTON_OK,
-				    GNOME_STOCK_BUTTON_CANCEL,
+				    GTK_STOCK_OK,
+				    GTK_STOCK_CANCEL,
 				    NULL);
 
 	gdvd_connect_signal(dialog, "button-new",    "clicked", GTK_SIGNAL_FUNC(gdvd_button_new_callback));
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index 550bb2b4ba..e95727b729 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -14,7 +14,6 @@
 #include <string.h>
 #include <gtk/gtksignal.h>
 #include <libxml/parser.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include <gal/util/e-util.h>
 #include <gal/util/e-xml-utils.h>
@@ -155,7 +154,7 @@ gal_view_collection_init (GalViewCollection *collection)
  * gal_view_collection_get_type:
  *
  */
-guint
+GtkType
 gal_view_collection_get_type (void)
 {
 	static guint type = 0;
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index 39a4350380..af129c7a2d 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
+#include <gtk/gtk.h>
 #include "gal-view-new-dialog.h"
 #include "gal-define-views-model.h"
 #include <gal/widgets/e-unicode.h>
@@ -105,8 +105,8 @@ gal_view_new_dialog_init (GalViewNewDialog *dialog)
 	gtk_widget_unref(widget);
 
 	gnome_dialog_append_buttons(GNOME_DIALOG(dialog),
-				    GNOME_STOCK_BUTTON_OK,
-				    GNOME_STOCK_BUTTON_CANCEL,
+				    GTK_STOCK_OK,
+				    GTK_STOCK_CANCEL,
 				    NULL);
 
 	gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, TRUE, FALSE);
diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c
index 14d44f7bb2..41b0b593e1 100644
--- a/widgets/misc/e-canvas-utils.c
+++ b/widgets/misc/e-canvas-utils.c
@@ -142,8 +142,7 @@ show_area_timeout (gpointer data)
 {
 	DoubsAndCanvas *dac = data;
 
-	if (!GTK_OBJECT_DESTROYED(dac->canvas))
-		e_canvas_show_area(dac->canvas, dac->x1, dac->y1, dac->x2, dac->y2);
+	e_canvas_show_area(dac->canvas, dac->x1, dac->y1, dac->x2, dac->y2);
 	gtk_object_unref(GTK_OBJECT(dac->canvas));
 	g_free(dac);
 	return FALSE;
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index e937af3f35..1ff5a2bbb9 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -251,8 +251,7 @@ e_canvas_vbox_realize (GnomeCanvasItem *item)
 static void
 e_canvas_vbox_remove_item (GnomeCanvasItem *item, ECanvasVbox *vbox)
 {
-	if (!GTK_OBJECT_DESTROYED (vbox))
-		vbox->items = g_list_remove(vbox->items, item);
+	vbox->items = g_list_remove(vbox->items, item);
 }
 
 static void
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 8afe4b10e9..9c07f22cb6 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -279,8 +279,11 @@ emit_event (GnomeCanvas *canvas, GdkEvent *event)
 					 &ev,
 					 &finished);
 
+#warning FIXME - needs thought
+#if 0
 		if (GTK_OBJECT_DESTROYED (item))
 			finished = TRUE;
+#endif
 
 		parent = item->parent;
 		gtk_object_unref (GTK_OBJECT (item));
@@ -412,11 +415,11 @@ pick_current_item (GnomeCanvas *canvas, GdkEvent *event)
 		/* these fields don't have the same offsets in both types of events */
 
 		if (canvas->pick_event.type == GDK_ENTER_NOTIFY) {
-			x = canvas->pick_event.crossing.x + DISPLAY_X1 (canvas) - canvas->zoom_xofs;
-			y = canvas->pick_event.crossing.y + DISPLAY_Y1 (canvas) - canvas->zoom_yofs;
+			x = canvas->pick_event.crossing.x + canvas->scroll_x1 - canvas->zoom_xofs;
+			y = canvas->pick_event.crossing.y + canvas->scroll_y1 - canvas->zoom_yofs;
 		} else {
-			x = canvas->pick_event.motion.x + DISPLAY_X1 (canvas) - canvas->zoom_xofs;
-			y = canvas->pick_event.motion.y + DISPLAY_Y1 (canvas) - canvas->zoom_yofs;
+			x = canvas->pick_event.motion.x + canvas->scroll_x1 - canvas->zoom_xofs;
+			y = canvas->pick_event.motion.y + canvas->scroll_y1 - canvas->zoom_yofs;
 		}
 
 		/* canvas pixel coords */
diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h
index 868445b914..b29b15c558 100644
--- a/widgets/misc/e-cursors.h
+++ b/widgets/misc/e-cursors.h
@@ -2,7 +2,6 @@
 #define GNOME_APP_LIB_CURSORS_H
 
 #include <gdk/gdk.h>
-#include <libgnome/gnome-defs.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
index bd8df7191c..e3f00beaeb 100644
--- a/widgets/misc/e-gui-utils.c
+++ b/widgets/misc/e-gui-utils.c
@@ -15,7 +15,6 @@
 #include <gtk/gtkentry.h>
 #include <gtk/gtksignal.h>
 #include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 
@@ -28,7 +27,7 @@ e_notice (GtkWindow *window, const char *type, const char *format, ...)
 
 	va_start (args, format);
 	str = g_strdup_vprintf (format, args);
-	dialog = gnome_message_box_new (str, type, GNOME_STOCK_BUTTON_OK, NULL);
+	dialog = gnome_message_box_new (str, type, GTK_STOCK_OK, NULL);
 	va_end (args);
 	g_free (str);
 	
diff --git a/widgets/misc/e-hsv-utils.h b/widgets/misc/e-hsv-utils.h
index 252e04e3a4..7706678e88 100644
--- a/widgets/misc/e-hsv-utils.h
+++ b/widgets/misc/e-hsv-utils.h
@@ -2,7 +2,6 @@
 #ifndef _E_HSV_UTILS_H_
 #define _E_HSV_UTILS_H_
 
-#include <libgnome/gnome-defs.h>
 #include <gdk/gdk.h>
 
 G_BEGIN_DECLS
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index 243a3eb2bb..555c4ddf13 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -14,8 +14,6 @@ nnn *
 #include <gtk/gtkimage.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkimagemenuitem.h>
-#include <libgnomeui/gtkpixmapmenuitem.h>
-#include <libgnomeui/gnome-stock.h>
 
 #include "e-popup-menu.h"
 #include "e-gui-utils.h"
@@ -63,44 +61,6 @@ make_item (GtkMenu *menu, const char *name, const char *pixname)
 		gtk_image_new_from_stock (pixname, GTK_ICON_SIZE_MENU));
 
 	gtk_widget_show_all (GTK_WIDGET (item));
-
-#warning Horribly hacked ?
-#if 0	
-		GtkWidget *pixmap = gnome_stock_pixmap_widget (item, pixname);
-
-		gtk_widget_show (pixmap);
-		gtk_pixmap_menu_item_set_pixmap (
-			GTK_PIXMAP_MENU_ITEM (item), pixmap);
-
-	/*
-	 * Ugh.  This needs to go into Gtk+
-	 */
-	label = gtk_accel_label_new ("");
-	label_accel = gtk_label_parse_uline (GTK_LABEL (label), name);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_widget_show (label);
-	
-	item = pixname ? gtk_pixmap_menu_item_new () : gtk_menu_item_new ();
-	gtk_container_add (GTK_CONTAINER (item), label);
-	
-	if (label_accel != GDK_VoidSymbol){
-		gtk_widget_add_accelerator (
-			item,
-			"activate_item",
-			gtk_menu_get_accel_group (GTK_MENU (menu)),
-			label_accel, 0,
-			GTK_ACCEL_LOCKED);
-	}
-
-	if (pixname){
-		GtkWidget *pixmap = gnome_stock_pixmap_widget (item, pixname);
-
-		gtk_widget_show (pixmap);
-		gtk_pixmap_menu_item_set_pixmap (
-			GTK_PIXMAP_MENU_ITEM (item), pixmap);
-	}
-#endif
-
 	return item;
 }
 
diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h
index c75a53ed9a..03c039b713 100644
--- a/widgets/misc/e-popup-menu.h
+++ b/widgets/misc/e-popup-menu.h
@@ -4,7 +4,6 @@
 
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index fc16e9b178..708fe40cb0 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -89,7 +89,7 @@ e_printable_class_init (GtkObjectClass *object_class)
 }
 
 
-guint
+GtkType
 e_printable_get_type (void)
 {
   static guint type = 0;
diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c
index a21c927a71..4f3e4b60b0 100644
--- a/widgets/misc/e-reflow-model.c
+++ b/widgets/misc/e-reflow-model.c
@@ -179,7 +179,7 @@ e_reflow_model_class_init (GtkObjectClass *object_class)
 }
 
 
-guint
+GtkType
 e_reflow_model_get_type (void)
 {
 	static guint type = 0;
diff --git a/widgets/misc/e-unicode.h b/widgets/misc/e-unicode.h
index 8ce15ab83f..af9c5c2538 100644
--- a/widgets/misc/e-unicode.h
+++ b/widgets/misc/e-unicode.h
@@ -17,7 +17,6 @@
 #include <gtk/gtkentry.h>
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
 #include <libxml/tree.h>
 #include <iconv.h>
 
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index 7c74eb477c..34e4adcd69 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -203,7 +203,7 @@ e_cell_pixbuf_class_init (GtkObjectClass *object_class)
     parent_class = gtk_type_class (E_CELL_TYPE);
 }
 
-guint
+GtkType
 e_cell_pixbuf_get_type (void)
 {
     static guint type = 0;
diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c
index 79da97402e..b695140eb4 100644
--- a/widgets/table/e-table-config-field.c
+++ b/widgets/table/e-table-config-field.c
@@ -9,6 +9,8 @@
  */
 #include <config.h>
 #include <stdlib.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 #include "gal/util/e-util.h"
 #include "e-table-config-field.h"
 
diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h
index 1ad7e5126b..d27f2ba576 100644
--- a/widgets/table/e-table-config.h
+++ b/widgets/table/e-table-config.h
@@ -2,7 +2,6 @@
 #ifndef _E_TABLE_CONFIG_H_
 #define _E_TABLE_CONFIG_H_
 
-#include <libgnome/gnome-defs.h>
 #include <gal/e-table/e-table-sort-info.h>
 #include <gal/e-table/e-table-specification.h>
 #include <gal/widgets/gtk-combo-text.h>
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index 802160ef35..e3be34a979 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -22,7 +22,6 @@
 
 #include <config.h>
 #include "e-table-field-chooser-dialog.h"
-#include <libgnomeui/gnome-stock.h>
 #include "gal/util/e-i18n.h"
 
 static void e_table_field_chooser_dialog_init		(ETableFieldChooserDialog		 *card);
@@ -104,7 +103,7 @@ e_table_field_chooser_dialog_init (ETableFieldChooserDialog *e_table_field_choos
 	e_table_field_chooser_dialog->header = NULL;
 
 	gnome_dialog_append_buttons(GNOME_DIALOG(e_table_field_chooser_dialog),
-				    GNOME_STOCK_BUTTON_CLOSE,
+				    GTK_STOCK_CLOSE,
 				    NULL);
 
 	gtk_window_set_policy(GTK_WINDOW(e_table_field_chooser_dialog), FALSE, TRUE, FALSE);
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 32ec3f3110..1d372e5031 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -22,6 +22,8 @@
 
 #include <config.h>
 #include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 #include "e-table-field-chooser.h"
 #include "e-table-field-chooser-item.h"
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 59b89e1538..53f43f7e94 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -555,7 +555,7 @@ ethi_drag_motion (GtkObject *canvas, GdkDragContext *context,
 
 	gdk_drag_status (context, 0, time);
 
-	droptype = gdk_atom_name (GPOINTER_TO_INT (context->targets->data));
+	droptype = gdk_atom_name (context->targets->data);
 	headertype = g_strdup_printf ("%s-%s", TARGET_ETABLE_COL_TYPE,
 				      ethi->dnd_code);
 
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 2477c87b6c..6b245df761 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -821,9 +821,10 @@ static gboolean
 eti_idle_maybe_show_cursor_cb (gpointer data)
 {
 	ETableItem *eti = data;
-	if (!GTK_OBJECT_DESTROYED (eti)) {
+
+	if (eti->selection)
 		eti_maybe_show_cursor (eti, 0);
-	}
+
 	gtk_object_unref (GTK_OBJECT (eti));
 	return FALSE;
 }
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index 71b0c83bcb..3b7d96d71d 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -336,7 +336,7 @@ e_table_model_class_init (GtkObjectClass *object_class)
 }
 
 
-guint
+GtkType
 e_table_model_get_type (void)
 {
 	static guint type = 0;
diff --git a/widgets/text/e-completion-match.h b/widgets/text/e-completion-match.h
index d8fa29e558..f917c3790b 100644
--- a/widgets/text/e-completion-match.h
+++ b/widgets/text/e-completion-match.h
@@ -29,7 +29,6 @@
 #define __E_COMPLETION_MATCH_H__
 
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/widgets/text/e-completion-view.h b/widgets/text/e-completion-view.h
index 95299ed4f9..e81ee2740b 100644
--- a/widgets/text/e-completion-view.h
+++ b/widgets/text/e-completion-view.h
@@ -29,7 +29,6 @@
 #ifndef E_COMPLETION_VIEW_H
 #define E_COMPLETION_VIEW_H
 
-#include <libgnome/gnome-defs.h>
 #include <gtk/gtk.h>
 #include <gal/e-table/e-table.h>
 #include "e-completion.h"
diff --git a/widgets/text/e-completion.h b/widgets/text/e-completion.h
index b36f258842..9cdf7f3c92 100644
--- a/widgets/text/e-completion.h
+++ b/widgets/text/e-completion.h
@@ -28,7 +28,6 @@
 #ifndef E_COMPLETION_H
 #define E_COMPLETION_H
 
-#include <libgnome/gnome-defs.h>
 #include <gtk/gtkobject.h>
 #include "e-completion-match.h"
 
diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h
index 1c18ded9d1..c28923d90a 100644
--- a/widgets/text/e-text-model.h
+++ b/widgets/text/e-text-model.h
@@ -22,7 +22,6 @@
 
 #include <glib.h>
 #include <gtk/gtkobject.h>
-#include <libgnome/gnome-defs.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index adc267bad3..c8e42a3a59 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -2038,7 +2038,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 				 * thiswidth + 2 or thiswidth + 1.
 				 */
 				gtk_paint_focus (widget->style, drawable, 
-						 NULL, widget, "entry",
+						 GTK_STATE_NORMAL, NULL, widget, "entry",
 						 thisx, thisy, thiswidth - 1, thisheight - 1);
 			}
 		}
@@ -2714,9 +2714,10 @@ static gboolean
 tooltip_event(GtkWidget *tooltip, GdkEvent *event, EText *text)
 {
 	gint ret_val = FALSE;
-	if (GTK_OBJECT_DESTROYED (text)) {
+
+	if (!text->model)
 		return FALSE;
-	}
+
 	switch (event->type) {
 	case GDK_LEAVE_NOTIFY:
 		e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(text)->canvas));
@@ -2992,7 +2993,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
 
 	gint return_val = 0;
 
-	if (GTK_OBJECT_DESTROYED (item))
+	if (!text->model)
 		return FALSE;
 
 	e_tep_event.type = event->type;
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index 48e690f5c8..5a12236afe 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -21,7 +21,6 @@
 #define E_TEXT_H
 
 #include <gtk/gtkobject.h>
-#include <gtk/gtkpacker.h>
 
 #include <gal/widgets/e-font.h>
 #include <gal/util/e-text-event-processor.h>