aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2005-03-01 10:09:14 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2005-03-01 10:09:14 +0000
commit9d1f3c573b52d3ae4932c5304e99f436835adce4 (patch)
treecc198b75aeb60b2b4ce510708a138b5ba0f883f0
parentd6e4a1d2be97b08699b91c4dbc5b758245ae1133 (diff)
gtkutils.[ch]: removed non-used code.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@136 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.ja4
-rw-r--r--src/gtkutils.c69
-rw-r--r--src/gtkutils.h8
4 files changed, 8 insertions, 77 deletions
diff --git a/ChangeLog b/ChangeLog
index 440cfde1..228195ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2005-03-01
+ * src/gtkutils.[ch]: removed non-used code.
+
+2005-03-01
+
* src/mimeview.[ch]: display action buttons when attached files are
selected.
Fixed the handling of key press and popup menu.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 2c32e96a..6016f2f9 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,9 @@
2005-03-01
+ * src/gtkutils.[ch]: 未使用のコードを削除。
+
+2005-03-01
+
* src/mimeview.[ch]: 添付ファイルを選択したときにアクションボタンを
表示。
キー押下とポップアップメニューの処理を修正。
diff --git a/src/gtkutils.c b/src/gtkutils.c
index fc990a28..1047d874 100644
--- a/src/gtkutils.c
+++ b/src/gtkutils.c
@@ -106,38 +106,6 @@ void gtkut_convert_int_to_gdk_color(gint rgbvalue, GdkColor *color)
color->blue = (int) (((gdouble) (rgbvalue & 0x0000ff) / 255.0) * 65535.0);
}
-void gtkut_button_set_create(GtkWidget **bbox,
- GtkWidget **button1, const gchar *label1,
- GtkWidget **button2, const gchar *label2,
- GtkWidget **button3, const gchar *label3)
-{
- g_return_if_fail(bbox != NULL);
- g_return_if_fail(button1 != NULL);
-
- *bbox = gtk_hbutton_box_new();
- gtk_button_box_set_layout(GTK_BUTTON_BOX(*bbox), GTK_BUTTONBOX_END);
- gtk_box_set_spacing(GTK_BOX(*bbox), 5);
-
- *button1 = gtk_button_new_with_label(label1);
- GTK_WIDGET_SET_FLAGS(*button1, GTK_CAN_DEFAULT);
- gtk_box_pack_start(GTK_BOX(*bbox), *button1, TRUE, TRUE, 0);
- gtk_widget_show(*button1);
-
- if (button2) {
- *button2 = gtk_button_new_with_label(label2);
- GTK_WIDGET_SET_FLAGS(*button2, GTK_CAN_DEFAULT);
- gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
- gtk_widget_show(*button2);
- }
-
- if (button3) {
- *button3 = gtk_button_new_with_label(label3);
- GTK_WIDGET_SET_FLAGS(*button3, GTK_CAN_DEFAULT);
- gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
- gtk_widget_show(*button3);
- }
-}
-
void gtkut_stock_button_set_create(GtkWidget **bbox,
GtkWidget **button1, const gchar *label1,
GtkWidget **button2, const gchar *label2,
@@ -468,45 +436,8 @@ void gtkut_editable_disable_im(GtkEditable *editable)
#endif
}
-/*
- * Walk through the widget tree and disclaim the selection from all currently
- * realized GtkEditable widgets.
- */
-static void gtkut_check_before_remove(GtkWidget *widget, gpointer unused)
-{
- g_return_if_fail(widget != NULL);
-
- if (!GTK_WIDGET_REALIZED(widget))
- return; /* all nested widgets must be unrealized too */
- if (GTK_IS_CONTAINER(widget))
- gtk_container_forall(GTK_CONTAINER(widget),
- gtkut_check_before_remove, NULL);
-#if 0
- if (GTK_IS_EDITABLE(widget))
- gtk_editable_claim_selection(GTK_EDITABLE(widget),
- FALSE, GDK_CURRENT_TIME);
-#endif
-}
-
-/*
- * Wrapper around gtk_container_remove to work around a bug in GtkText and
- * GtkEntry (in all GTK+ versions up to and including at least 1.2.10).
- *
- * The problem is that unrealizing a GtkText or GtkEntry widget which has the
- * active selection completely messes up selection handling, leading to
- * non-working selections and crashes. Removing a widget from its container
- * implies unrealizing it and all its child widgets; this triggers the bug if
- * the removed widget or any of its children is GtkText or GtkEntry. As a
- * workaround, this function walks through the widget subtree before removing
- * and disclaims the selection from all GtkEditable widgets found.
- *
- * A similar workaround may be needed for gtk_widget_reparent(); currently it
- * is not necessary because Sylpheed does not use gtk_widget_reparent() for
- * GtkEditable widgets or containers holding such widgets.
- */
void gtkut_container_remove(GtkContainer *container, GtkWidget *widget)
{
- gtkut_check_before_remove(widget, NULL);
gtk_container_remove(container, widget);
}
diff --git a/src/gtkutils.h b/src/gtkutils.h
index 0483be94..959864d6 100644
--- a/src/gtkutils.h
+++ b/src/gtkutils.h
@@ -89,14 +89,6 @@ void gtkut_widget_set_small_font_size (GtkWidget *widget);
void gtkut_convert_int_to_gdk_color (gint rgbvalue,
GdkColor *color);
-void gtkut_button_set_create (GtkWidget **bbox,
- GtkWidget **button1,
- const gchar *label1,
- GtkWidget **button2,
- const gchar *label2,
- GtkWidget **button3,
- const gchar *label3);
-
void gtkut_stock_button_set_create (GtkWidget **bbox,
GtkWidget **button1,
const gchar *label1,