diff options
| -rw-r--r-- | widgets/misc/e-canvas-vbox.c | 6 | ||||
| -rw-r--r-- | widgets/misc/e-gui-utils.c | 46 | ||||
| -rw-r--r-- | widgets/misc/e-gui-utils.h | 1 |
3 files changed, 3 insertions, 50 deletions
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c index 2d389a83e6..dd08665fa2 100644 --- a/widgets/misc/e-canvas-vbox.c +++ b/widgets/misc/e-canvas-vbox.c @@ -24,9 +24,9 @@ #include <gnome.h> #include <math.h> #include "e-canvas-vbox.h" -#include <e-util/e-canvas-utils.h> -#include <e-util/e-canvas.h> -#include <e-util/e-util.h> +#include "e-canvas-utils.h" +#include "e-canvas.h" +#include "util/e-util.h" static void e_canvas_vbox_init (ECanvasVbox *CanvasVbox); static void e_canvas_vbox_class_init (ECanvasVboxClass *klass); diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c index 2e31eb101b..cde82d9f78 100644 --- a/widgets/misc/e-gui-utils.c +++ b/widgets/misc/e-gui-utils.c @@ -65,52 +65,6 @@ e_popup_menu (GtkMenu *menu, GdkEventButton *event) gtk_menu_popup (menu, NULL, NULL, 0, NULL, event->button, event->time); } -GtkWidget *e_create_image_widget(gchar *name, - gchar *string1, gchar *string2, - gint int1, gint int2) -{ - char *filename; - GdkPixbuf *pixbuf; - double width, height; - GtkWidget *canvas, *alignment; - if (string1) { - if (*string1 == '/') - filename = g_strdup(string1); - else - filename = g_concat_dir_and_file(EVOLUTION_IMAGES, string1); - pixbuf = gdk_pixbuf_new_from_file(filename); - width = gdk_pixbuf_get_width(pixbuf); - height = gdk_pixbuf_get_height(pixbuf); - - canvas = gnome_canvas_new_aa(); - GTK_OBJECT_UNSET_FLAGS(GTK_WIDGET(canvas), GTK_CAN_FOCUS); - gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(canvas)), - gnome_canvas_pixbuf_get_type(), - - "pixbuf", pixbuf, - NULL); - - alignment = gtk_widget_new(gtk_alignment_get_type(), - "child", canvas, - "xalign", (double) 0, - "yalign", (double) 0, - "xscale", (double) 0, - "yscale", (double) 0, - NULL); - - gtk_widget_set_usize(canvas, width, height); - - gdk_pixbuf_unref(pixbuf); - - gtk_widget_show(canvas); - gtk_widget_show(alignment); - g_free(filename); - - return alignment; - } else - return NULL; -} - typedef struct { GtkCallback callback; gpointer closure; diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h index 1d47a7b514..a5a5eb994f 100644 --- a/widgets/misc/e-gui-utils.h +++ b/widgets/misc/e-gui-utils.h @@ -9,7 +9,6 @@ void e_popup_menu (GtkMenu *menu, GdkEventButton *event); void e_auto_kill_popup_menu_on_hide (GtkMenu *menu); void e_notice (GtkWindow *window, const char *type, const char *format, ...); -GtkWidget *e_create_image_widget (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2); void e_container_foreach_leaf (GtkContainer *container, GtkCallback callback, gpointer closure); |