/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2003 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 2001-2004 Hiroyuki Yamamoto & The Sylpheed Claws Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "defs.h"
#include <glib.h>
-#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include <gtk/gtkwidget.h>
-#include <gtk/gtkpixmap.h>
+#include <gtk/gtkimage.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkcheckmenuitem.h>
#include <gtk/gtklabel.h>
{ LCCF_ALL, { 0, 0x66 << 8, 0x33 << 8, 0x33 << 8 }, NULL, NULL }
};
+#define LABEL_COLOR_WIDTH 28
+#define LABEL_COLOR_HEIGHT 16
+
#define LABEL_COLORS_ELEMS (sizeof label_colors / sizeof label_colors[0])
#define G_RETURN_VAL_IF_INVALID_COLOR(color, val) \
gdk_gc_set_foreground(gc, &color);
gdk_draw_rectangle(drawable, gc,
- TRUE, 0, 0, widget->allocation.width,
- widget->allocation.height);
+ TRUE, 0, 0, widget->allocation.width - 1,
+ widget->allocation.height - 1);
gdk_draw_rectangle(drawable, widget->style->black_gc,
- FALSE, 0, 0, widget->allocation.width,
- widget->allocation.height);
+ FALSE, 0, 0, widget->allocation.width - 1,
+ widget->allocation.height - 1);
gdk_gc_unref(gc);
GtkWidget *widget;
widget = gtk_drawing_area_new();
- gtk_drawing_area_size(GTK_DRAWING_AREA(widget), 16, 16);
+ gtk_widget_set_size_request(widget, LABEL_COLOR_WIDTH - 2,
+ LABEL_COLOR_HEIGHT - 4);
#define CL(x) (((gulong) (x) >> (gulong) 8) & 0xFFUL)
#define CR(r, g, b) ((CL(r) << (gulong) 16) | \
(CL(g) << (gulong) 8) | \
(CL(b)))
- gtk_signal_connect(GTK_OBJECT(widget), "expose_event",
- GTK_SIGNAL_FUNC
+ g_signal_connect(G_OBJECT(widget), "expose_event",
+ G_CALLBACK
(colorlabel_drawing_area_expose_event_cb),
- GINT_TO_POINTER
+ GINT_TO_POINTER
((gint)CR(color.red, color.green, color.blue)));
return widget;
G_RETURN_VAL_IF_INVALID_COLOR(color_index, NULL);
- item = gtk_check_menu_item_new();
+ item = gtk_check_menu_item_new();
colorlabel_recreate(color_index);
gtk_container_add(GTK_CONTAINER(align), label_colors[color_index].widget);
gtk_widget_show(label_colors[color_index].widget);
- gtk_widget_set_usize(align, 16, 16);
+ gtk_widget_set_size_request(align, LABEL_COLOR_WIDTH,
+ LABEL_COLOR_HEIGHT);
gtk_box_pack_start(GTK_BOX(hbox), align, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 4);
/* create the menu items. each item has its color code attached */
menu = gtk_menu_new();
- gtk_object_set_data(GTK_OBJECT(menu), "label_color_menu", menu);
+ g_object_set_data(G_OBJECT(menu), "label_color_menu", menu);
item = gtk_menu_item_new_with_label(_("None"));
- gtk_menu_append(GTK_MENU(menu), item);
- gtk_object_set_data(GTK_OBJECT(item), "color", GUINT_TO_POINTER(0));
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ g_object_set_data(G_OBJECT(item), "color", GUINT_TO_POINTER(0));
gtk_widget_show(item);
-
+
/* and the color items */
for (i = 0; i < LABEL_COLORS_ELEMS; i++) {
GtkWidget *widget = colorlabel_create_color_widget(label_colors[i].color);
item = gtk_menu_item_new();
- gtk_object_set_data(GTK_OBJECT(item), "color", GUINT_TO_POINTER(i + 1));
+ g_object_set_data(G_OBJECT(item), "color", GUINT_TO_POINTER(i + 1));
label = gtk_label_new(label_colors[i].label);
gtk_container_add(GTK_CONTAINER(align), widget);
gtk_widget_show(widget);
- gtk_widget_set_usize(align, 16, 16);
+ gtk_widget_set_size_request(align, LABEL_COLOR_WIDTH,
+ LABEL_COLOR_HEIGHT);
gtk_box_pack_start(GTK_BOX(hbox), align, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 4);
- gtk_menu_append(GTK_MENU(menu), item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
gtk_widget_show(item);
}
guint colorlabel_get_color_menu_active_item(GtkWidget *menu)
{
GtkWidget *menuitem;
- guint color;
+ guint color;
- g_return_val_if_fail
- (gtk_object_get_data(GTK_OBJECT(menu), "label_color_menu"), 0);
menuitem = gtk_menu_get_active(GTK_MENU(menu));
color = GPOINTER_TO_UINT
- (gtk_object_get_data(GTK_OBJECT(menuitem), "color"));
+ (g_object_get_data(G_OBJECT(menuitem), "color"));
return color;
}
-
-