[Commits] gtkcmclist.c 1.1.2.17 1.1.2.18 gtkcmctree.c 1.1.2.19 1.1.2.20 gtkcmoptionmenu.c 1.1.2.8 1.1.2.9 gtksctree.c 1.1.4.61 1.1.4.62 gtkutils.c 1.5.2.99 1.5.2.100 gtkutils.h 1.4.2.62 1.4.2.63 gtkvscrollbutton.c 1.5.2.22 1.5.2.23 inputdialog.c 1.2.2.44 1.2.2.45 pluginwindow.c 1.5.2.60 1.5.2.61 quicksearch.c 1.1.2.105 1.1.2.106 spell_entry.c 1.1.2.12 1.1.2.13
colin at claws-mail.org
colin at claws-mail.org
Sat Oct 22 19:09:06 CEST 2011
Update of /home/claws-mail/claws/src/gtk
In directory claws-mail:/tmp/cvs-serv32605/src/gtk
Modified Files:
Tag: gtk2
gtkcmclist.c gtkcmctree.c gtkcmoptionmenu.c gtksctree.c
gtkutils.c gtkutils.h gtkvscrollbutton.c inputdialog.c
pluginwindow.c quicksearch.c spell_entry.c
Log Message:
2011-10-22 [colin] 3.7.10cvs41
* src/account.c
* src/addr_compl.c
* src/addrgather.c
* src/compose.c
* src/editldap.c
* src/expldifdlg.c
* src/folderview.c
* src/grouplistdialog.c
* src/headerview.c
* src/importldif.c
* src/main.c
* src/mainwindow.c
* src/mimeview.c
* src/noticeview.c
* src/prefs_account.c
* src/prefs_actions.c
* src/prefs_ext_prog.c
* src/prefs_filtering.c
* src/prefs_folder_item.c
* src/prefs_image_viewer.c
* src/prefs_logging.c
* src/prefs_msg_colors.c
* src/prefs_other.c
* src/prefs_send.c
* src/prefs_spelling.c
* src/prefs_summaries.c
* src/prefs_template.c
* src/printing.c
* src/quote_fmt.c
* src/send_message.c
* src/statusbar.c
* src/summary_search.c
* src/summaryview.c
* src/wizard.c
* src/gtk/gtkcmclist.c
* src/gtk/gtkcmctree.c
* src/gtk/gtkcmoptionmenu.c
* src/gtk/gtksctree.c
* src/gtk/gtkutils.c
* src/gtk/gtkutils.h
* src/gtk/gtkvscrollbutton.c
* src/gtk/inputdialog.c
* src/gtk/pluginwindow.c
* src/gtk/quicksearch.c
* src/gtk/spell_entry.c
* src/plugins/bogofilter/bogofilter_gtk.c
* src/plugins/dillo_viewer/dillo_prefs.c
* src/plugins/pgpcore/prefs_gpg.c
* src/plugins/spamassassin/spamassassin_gtk.c
* src/plugins/trayicon/trayicon.c
* src/plugins/trayicon/trayicon_prefs.c
Remove all possible #if GTK_CHECK_VERSION() checks,
and make Claws build with GTK+2.16 (untested right
now), as the Gpg4Win project uses GTK+2.16 currently.
Index: spell_entry.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/spell_entry.c,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -d -r1.1.2.12 -r1.1.2.13
--- spell_entry.c 7 Oct 2011 09:40:16 -0000 1.1.2.12
+++ spell_entry.c 22 Oct 2011 17:09:04 -0000 1.1.2.13
@@ -450,7 +450,7 @@
layout = gtk_entry_get_layout(GTK_ENTRY(entry));
pango_layout_set_attributes(layout, entry->priv->attr_list);
- if (gtkut_widget_get_realized(GTK_WIDGET(entry))) {
+ if (gtk_widget_get_realized(GTK_WIDGET(entry))) {
rect.x = 0; rect.y = 0;
rect.width = GTK_WIDGET(entry)->allocation.width;
rect.height = GTK_WIDGET(entry)->allocation.height;
Index: gtkcmclist.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmclist.c,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -d -r1.1.2.17 -r1.1.2.18
--- gtkcmclist.c 7 Oct 2011 09:17:50 -0000 1.1.2.17
+++ gtkcmclist.c 22 Oct 2011 17:09:04 -0000 1.1.2.18
@@ -1029,7 +1029,7 @@
g_value_set_boolean(value, TRUE);
for (i = 0; i < clist->columns; i++)
if (clist->column[i].button &&
- !gtkut_widget_get_sensitive (clist->column[i].button))
+ !gtk_widget_get_sensitive (clist->column[i].button))
{
g_value_set_boolean(value, FALSE);
break;
@@ -1332,7 +1332,7 @@
clist->shadow_type = type;
- if (gtkut_widget_get_visible (GTK_WIDGET(clist)))
+ if (gtk_widget_get_visible (GTK_WIDGET(clist)))
gtk_widget_queue_resize (GTK_WIDGET (clist));
}
@@ -1455,7 +1455,7 @@
0, 0, 0, column_title_passive_func, 0);
gtkut_widget_set_can_focus (clist->column[column].button, TRUE);
- if (gtkut_widget_get_visible (GTK_WIDGET(clist)))
+ if (gtk_widget_get_visible (GTK_WIDGET(clist)))
gtk_widget_queue_draw (clist->column[column].button);
}
@@ -1491,7 +1491,7 @@
G_CALLBACK(column_title_passive_func), NULL);
gtkut_widget_set_can_focus (clist->column[column].button, FALSE);
- if (gtkut_widget_get_visible (GTK_WIDGET(clist)))
+ if (gtk_widget_get_visible (GTK_WIDGET(clist)))
gtk_widget_queue_draw (clist->column[column].button);
}
@@ -1577,7 +1577,7 @@
/* if this button didn't previously exist, then the
* column button positions have to be re-computed */
- if (gtkut_widget_get_visible (GTK_WIDGET(clist)) && new_button)
+ if (gtk_widget_get_visible (GTK_WIDGET(clist)) && new_button)
size_allocate_title_buttons (clist);
}
@@ -1631,7 +1631,7 @@
/* if this button didn't previously exist, then the
* column button positions have to be re-computed */
- if (gtkut_widget_get_visible (GTK_WIDGET(clist)) && new_button)
+ if (gtk_widget_get_visible (GTK_WIDGET(clist)) && new_button)
size_allocate_title_buttons (clist);
}
@@ -1752,7 +1752,7 @@
if (resizeable)
clist->column[column].auto_resize = FALSE;
- if (gtkut_widget_get_visible (GTK_WIDGET(clist)))
+ if (gtk_widget_get_visible (GTK_WIDGET(clist)))
size_allocate_title_buttons (clist);
}
@@ -1781,7 +1781,7 @@
}
}
- if (gtkut_widget_get_visible (GTK_WIDGET(clist)))
+ if (gtk_widget_get_visible (GTK_WIDGET(clist)))
size_allocate_title_buttons (clist);
}
@@ -2025,7 +2025,7 @@
gint last_button = 0;
gint i;
- if (!gtkut_widget_get_realized (GTK_WIDGET(clist)))
+ if (!gtk_widget_get_realized (GTK_WIDGET(clist)))
return;
button_allocation.x = clist->hoffset;
@@ -2232,7 +2232,7 @@
gtk_container_set_border_width(GTK_CONTAINER(button), 0);
gtk_widget_pop_composite_child ();
- if (gtkut_widget_get_realized (GTK_WIDGET(clist)) && clist->title_window)
+ if (gtk_widget_get_realized (GTK_WIDGET(clist)) && clist->title_window)
gtk_widget_set_parent_window (clist->column[column].button,
clist->title_window);
gtk_widget_set_parent (button, GTK_WIDGET (clist));
@@ -3299,7 +3299,7 @@
{
clist_row->foreground = *color;
clist_row->fg_set = TRUE;
- if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+ if (gtk_widget_get_realized (GTK_WIDGET(clist)))
gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (clist)),
&clist_row->foreground, TRUE, TRUE);
}
@@ -3328,7 +3328,7 @@
{
clist_row->background = *color;
clist_row->bg_set = TRUE;
- if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+ if (gtk_widget_get_realized (GTK_WIDGET(clist)))
gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (clist)),
&clist_row->background, TRUE, TRUE);
}
@@ -3374,7 +3374,7 @@
if (clist_row->cell[column].style)
{
- if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+ if (gtk_widget_get_realized (GTK_WIDGET(clist)))
gtk_style_detach (clist_row->cell[column].style);
g_object_unref (clist_row->cell[column].style);
}
@@ -3385,7 +3385,7 @@
{
g_object_ref (clist_row->cell[column].style);
- if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+ if (gtk_widget_get_realized (GTK_WIDGET(clist)))
clist_row->cell[column].style =
gtk_style_attach (clist_row->cell[column].style,
clist->clist_window);
@@ -3453,7 +3453,7 @@
if (clist_row->style)
{
- if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+ if (gtk_widget_get_realized (GTK_WIDGET(clist)))
gtk_style_detach (clist_row->style);
g_object_unref (clist_row->style);
}
@@ -3464,7 +3464,7 @@
{
g_object_ref (clist_row->style);
- if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+ if (gtk_widget_get_realized (GTK_WIDGET(clist)))
clist_row->style = gtk_style_attach (clist_row->style,
clist->clist_window);
}
@@ -3696,7 +3696,7 @@
static gboolean
clist_has_grab (GtkCMCList *clist)
{
- return (gtkut_widget_has_grab (GTK_WIDGET(clist)) &&
+ return (gtk_widget_has_grab (GTK_WIDGET(clist)) &&
gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (clist))));
}
@@ -4013,7 +4013,7 @@
GPOINTER_TO_INT (work->data), -1, NULL);
}
- if (gtkut_widget_has_focus(GTK_WIDGET(clist)) && clist->focus_row != clist->undo_anchor)
+ if (gtk_widget_has_focus(GTK_WIDGET(clist)) && clist->focus_row != clist->undo_anchor)
{
gtk_cmclist_draw_focus (GTK_WIDGET (clist));
clist->focus_row = clist->undo_anchor;
@@ -4355,7 +4355,7 @@
cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (clist))) &&
- gtkut_widget_has_focus (GTK_WIDGET(clist)))
+ gtk_widget_has_focus (GTK_WIDGET(clist)))
return;
GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
@@ -4705,13 +4705,13 @@
/* freeze the list */
clist->freeze_count++;
- if (gtkut_widget_get_mapped (widget))
+ if (gtk_widget_get_mapped (widget))
gtk_cmclist_unmap (widget);
gtkut_widget_set_mapped (widget, FALSE);
/* detach optional row/cell styles */
- if (gtkut_widget_get_realized (widget))
+ if (gtk_widget_get_realized (widget))
{
GtkCMCListRow *clist_row;
GList *list;
@@ -4775,7 +4775,7 @@
clist = GTK_CMCLIST (widget);
- if (!gtkut_widget_get_mapped (widget))
+ if (!gtk_widget_get_mapped (widget))
{
gtkut_widget_set_mapped (widget, TRUE);
@@ -4783,8 +4783,8 @@
for (i = 0; i < clist->columns; i++)
{
if (clist->column[i].button &&
- gtkut_widget_get_visible (clist->column[i].button) &&
- !gtkut_widget_get_mapped (clist->column[i].button))
+ gtk_widget_get_visible (clist->column[i].button) &&
+ !gtk_widget_get_mapped (clist->column[i].button))
gtk_widget_map (clist->column[i].button);
}
@@ -4814,7 +4814,7 @@
clist = GTK_CMCLIST (widget);
- if (gtkut_widget_get_mapped (widget))
+ if (gtk_widget_get_mapped (widget))
{
gtkut_widget_set_mapped (widget, FALSE);
@@ -4852,7 +4852,7 @@
/* unmap column buttons */
for (i = 0; i < clist->columns; i++)
if (clist->column[i].button &&
- gtkut_widget_get_mapped (clist->column[i].button))
+ gtk_widget_get_mapped (clist->column[i].button))
gtk_widget_unmap (clist->column[i].button);
/* freeze the list */
@@ -4874,7 +4874,7 @@
window = gtk_widget_get_window (widget);
style = gtk_widget_get_style (widget);
- if (gtkut_widget_is_drawable (widget))
+ if (gtk_widget_is_drawable (widget))
{
clist = GTK_CMCLIST (widget);
@@ -4933,7 +4933,7 @@
clist = GTK_CMCLIST (widget);
- if (gtkut_widget_get_realized (widget))
+ if (gtk_widget_get_realized (widget))
{
style = gtk_widget_get_style (widget);
gtk_style_set_background (style, gtk_widget_get_window (widget),
@@ -5029,7 +5029,7 @@
if (GTK_CMCLIST_ADD_MODE(clist))
{
GTK_CMCLIST_UNSET_FLAG (clist, CMCLIST_ADD_MODE);
- if (gtkut_widget_has_focus(widget))
+ if (gtk_widget_has_focus(widget))
{
gtk_cmclist_draw_focus (widget);
gdk_gc_set_line_attributes (clist->xor_gc, 1,
@@ -5046,7 +5046,7 @@
}
else if (row != clist->focus_row)
{
- if (gtkut_widget_has_focus(widget))
+ if (gtk_widget_has_focus(widget))
{
gtk_cmclist_draw_focus (widget);
clist->focus_row = row;
@@ -5057,7 +5057,7 @@
}
}
- if (!gtkut_widget_has_focus(widget))
+ if (!gtk_widget_has_focus(widget))
gtk_widget_grab_focus (widget);
if (button_actions & GTK_CMBUTTON_SELECTS)
@@ -5165,7 +5165,7 @@
g_signal_handlers_block_matched(G_OBJECT(clist), G_SIGNAL_MATCH_DATA,
0, 0, 0, 0, drag_data);
- if (!gtkut_widget_has_focus(widget))
+ if (!gtk_widget_has_focus(widget))
gtk_widget_grab_focus (widget);
clist->drag_pos = i;
@@ -5253,7 +5253,7 @@
{
case GTK_SELECTION_MULTIPLE:
if (!(event->state & GDK_SHIFT_MASK) ||
- !gtkut_widget_get_can_focus (widget) ||
+ !gtk_widget_get_can_focus (widget) ||
event->x < 0 || event->x >= clist->clist_window_width ||
event->y < 0 || event->y >= clist->clist_window_height)
GTK_CMCLIST_GET_CLASS (clist)->resync_selection
@@ -5379,13 +5379,8 @@
if (clist->htimer)
return FALSE;
-#if GTK_CHECK_VERSION(2,12,0)
clist->htimer = gdk_threads_add_timeout
(SCROLL_TIME, (GSourceFunc) horizontal_timeout, clist);
-#else
- clist->htimer = g_timeout_add
- (SCROLL_TIME, (GSourceFunc) horizontal_timeout, clist);
-#endif
value = gtk_adjustment_get_value (clist->hadjustment);
if (!((x < 0 && value == 0) ||
(x >= clist->clist_window_width &&
@@ -5415,13 +5410,8 @@
{
if (clist->vtimer)
return FALSE;
-#if GTK_CHECK_VERSION(2,12,0)
clist->vtimer = gdk_threads_add_timeout (SCROLL_TIME,
(GSourceFunc) vertical_timeout, clist);
-#else
- clist->vtimer = g_timeout_add (SCROLL_TIME,
- (GSourceFunc) vertical_timeout, clist);
-#endif
if (clist->drag_button &&
((y < 0 && clist->focus_row == 0) ||
(y >= clist->clist_window_height &&
@@ -5529,7 +5519,7 @@
gtk_widget_set_allocation (widget, allocation);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
- if (gtkut_widget_get_realized (widget))
+ if (gtk_widget_get_realized (widget))
{
gdk_window_move_resize (gtk_widget_get_window (widget),
allocation->x + border_width,
@@ -5563,7 +5553,7 @@
clist->clist_window_width = clist_allocation.width;
clist->clist_window_height = clist_allocation.height;
- if (gtkut_widget_get_realized (widget))
+ if (gtk_widget_get_realized (widget))
{
gdk_window_move_resize (clist->clist_window,
clist_allocation.x,
@@ -5577,7 +5567,7 @@
clist->column_title_area.y = style->ythickness;
clist->column_title_area.width = clist_allocation.width;
- if (gtkut_widget_get_realized (widget))
+ if (gtk_widget_get_realized (widget))
{
gdk_window_move_resize (clist->title_window,
clist->column_title_area.x,
@@ -5754,7 +5744,7 @@
cm_return_if_fail (clist != NULL);
/* bail now if we arn't drawable yet */
- if (!gtkut_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
+ if (!gtk_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
return;
widget = GTK_WIDGET (clist);
@@ -5986,7 +5976,7 @@
/* draw focus rectangle */
if (clist->focus_row == row &&
- gtkut_widget_get_can_focus (widget) && gtkut_widget_has_focus(widget))
+ gtk_widget_get_can_focus (widget) && gtk_widget_has_focus(widget))
{
if (!area)
gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
@@ -6018,7 +6008,7 @@
cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist->row_height == 0 ||
- !gtkut_widget_is_drawable (GTK_WIDGET(clist)))
+ !gtk_widget_is_drawable (GTK_WIDGET(clist)))
return;
if (area)
@@ -6253,7 +6243,7 @@
dy = value - clist->voffset;
clist->voffset = value;
- if (gtkut_widget_is_drawable (GTK_WIDGET(clist)))
+ if (gtk_widget_is_drawable (GTK_WIDGET(clist)))
{
gdk_window_scroll (clist->clist_window, 0, dy);
gdk_window_process_updates (clist->clist_window, FALSE);
@@ -6270,7 +6260,7 @@
/* The window to which widget->window is relative */
#define ALLOCATION_WINDOW(widget) \
- (!gtkut_widget_get_has_window (widget) ? \
+ (!gtk_widget_get_has_window (widget) ? \
gtk_widget_get_window (widget) : \
gdk_window_get_parent (gtk_widget_get_window(widget)))
@@ -6283,9 +6273,9 @@
gtk_widget_get_allocation (widget, &allocation);
- if (!gtkut_widget_get_realized (widget))
+ if (!gtk_widget_get_realized (widget))
{
- if (gtkut_widget_get_visible (widget))
+ if (gtk_widget_get_visible (widget))
{
GdkRectangle tmp_rectangle = allocation;
tmp_rectangle.x += scroll_data->dx;
@@ -6314,7 +6304,7 @@
{
ScrollData scroll_data;
- if (gtkut_widget_get_realized (widget))
+ if (gtk_widget_get_realized (widget))
scroll_data.window = ALLOCATION_WINDOW (widget);
else
scroll_data.window = NULL;
@@ -6349,7 +6339,7 @@
dx = -value - clist->hoffset;
- if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+ if (gtk_widget_get_realized (GTK_WIDGET(clist)))
gdk_window_scroll (clist->title_window, dx, 0);
/* adjust the column button's allocations */
@@ -6359,11 +6349,11 @@
clist->hoffset = -value;
- if (gtkut_widget_is_drawable (GTK_WIDGET(clist)))
+ if (gtk_widget_is_drawable (GTK_WIDGET(clist)))
{
GtkWidget *focus_child = gtk_container_get_focus_child (container);
- if (gtkut_widget_get_can_focus(GTK_WIDGET(clist)) &&
- gtkut_widget_has_focus(GTK_WIDGET(clist)) &&
+ if (gtk_widget_get_can_focus(GTK_WIDGET(clist)) &&
+ gtk_widget_has_focus(GTK_WIDGET(clist)) &&
!focus_child && GTK_CMCLIST_ADD_MODE(clist))
{
y = ROW_TOP_YPIXEL (clist, clist->focus_row);
@@ -6376,8 +6366,8 @@
gdk_window_scroll (clist->clist_window, dx, 0);
gdk_window_process_updates (clist->clist_window, FALSE);
- if (gtkut_widget_get_can_focus(GTK_WIDGET(clist)) &&
- gtkut_widget_has_focus(GTK_WIDGET(clist)) &&
+ if (gtk_widget_get_can_focus(GTK_WIDGET(clist)) &&
+ gtk_widget_has_focus(GTK_WIDGET(clist)) &&
!focus_child)
{
if (GTK_CMCLIST_ADD_MODE(clist))
@@ -6527,7 +6517,7 @@
(clist, clist_row, i, GTK_CMCELL_EMPTY, NULL, 0, NULL);
if (clist_row->cell[i].style)
{
- if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+ if (gtk_widget_get_realized (GTK_WIDGET(clist)))
gtk_style_detach (clist_row->cell[i].style);
g_object_unref (clist_row->cell[i].style);
}
@@ -6535,7 +6525,7 @@
if (clist_row->style)
{
- if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+ if (gtk_widget_get_realized (GTK_WIDGET(clist)))
gtk_style_detach (clist_row->style);
g_object_unref (clist_row->style);
}
@@ -6585,7 +6575,7 @@
GtkWidget *focus_child;
gboolean is_current_focus;
- if (!gtkut_widget_is_sensitive (widget))
+ if (!gtk_widget_is_sensitive (widget))
return FALSE;
focus_child = gtk_container_get_focus_child (GTK_CONTAINER (widget));
@@ -6667,7 +6657,7 @@
cm_return_if_fail (GTK_IS_CMCLIST (widget));
- if (!gtkut_widget_is_drawable (widget) || !gtkut_widget_get_can_focus (widget))
+ if (!gtk_widget_is_drawable (widget) || !gtk_widget_get_can_focus (widget))
return;
clist = GTK_CMCLIST (widget);
@@ -6724,7 +6714,7 @@
{
return TRUE;
}
- else if (gtkut_widget_get_can_focus (child))
+ else if (gtk_widget_get_can_focus (child))
{
gtk_widget_grab_focus (child);
return TRUE;
@@ -6831,7 +6821,7 @@
while (!return_val && j >= 0 && j < clist->columns)
{
if (clist->column[j].button &&
- gtkut_widget_get_visible (clist->column[j].button))
+ gtk_widget_get_visible (clist->column[j].button))
{
if (focus_column (clist, j, dir))
{
@@ -6851,7 +6841,7 @@
while (!return_val && j != i)
{
if (clist->column[j].button &&
- gtkut_widget_get_visible (clist->column[j].button))
+ gtk_widget_get_visible (clist->column[j].button))
{
if (focus_column (clist, j, dir))
{
@@ -7214,7 +7204,7 @@
{
GtkWidget *widget = GTK_WIDGET (clist);
- if (gtkut_widget_has_grab (widget))
+ if (gtk_widget_has_grab (widget))
{
GdkDisplay *display = gtk_widget_get_display (widget);
@@ -7922,7 +7912,7 @@
if (button < MAX_BUTTON)
{
if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (clist))) ||
- gtkut_widget_has_grab (GTK_WIDGET(clist)))
+ gtk_widget_has_grab (GTK_WIDGET(clist)))
{
remove_grab (clist);
clist->drag_button = 0;
Index: gtkcmctree.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmctree.c,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -d -r1.1.2.19 -r1.1.2.20
--- gtkcmctree.c 7 Oct 2011 09:17:51 -0000 1.1.2.19
+++ gtkcmctree.c 22 Oct 2011 17:09:04 -0000 1.1.2.20
@@ -896,7 +896,7 @@
ctree = GTK_CMCTREE (widget);
clist = GTK_CMCLIST (widget);
- if (gtkut_widget_get_realized (widget))
+ if (gtk_widget_get_realized (widget))
{
GtkCMCTreeNode *node;
GtkCMCTreeNode *child;
@@ -1764,7 +1764,7 @@
cm_return_if_fail (clist != NULL);
/* bail now if we arn't drawable yet */
- if (!gtkut_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
+ if (!gtk_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
return;
widget = GTK_WIDGET (clist);
@@ -2122,7 +2122,7 @@
/* draw focus rectangle */
if (clist->focus_row == row &&
- gtkut_widget_get_can_focus (widget) && gtkut_widget_has_focus (widget))
+ gtk_widget_get_can_focus (widget) && gtk_widget_has_focus (widget))
{
if (!area)
gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
@@ -2601,7 +2601,7 @@
clist = GTK_CMCLIST (ctree);
if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (ctree))) &&
- gtkut_widget_has_grab (GTK_WIDGET(ctree)))
+ gtk_widget_has_grab (GTK_WIDGET(ctree)))
return;
if (!(node =
@@ -3318,7 +3318,7 @@
(clist, &(ctree_row->row), i, GTK_CMCELL_EMPTY, NULL, 0, NULL);
if (ctree_row->row.cell[i].style)
{
- if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
gtk_style_detach (ctree_row->row.cell[i].style);
g_object_unref (ctree_row->row.cell[i].style);
}
@@ -3326,7 +3326,7 @@
if (ctree_row->row.style)
{
- if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
gtk_style_detach (ctree_row->row.style);
g_object_unref (ctree_row->row.style);
}
@@ -4819,7 +4819,7 @@
remove_grab (GtkCMCList *clist)
{
if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (clist))) &&
- gtkut_widget_has_grab (GTK_WIDGET(clist)))
+ gtk_widget_has_grab (GTK_WIDGET(clist)))
{
gtk_grab_remove (GTK_WIDGET (clist));
gdk_display_pointer_ungrab (gtk_widget_get_display (GTK_WIDGET (clist)),
@@ -5027,7 +5027,7 @@
if (GTK_CMCTREE_ROW (node)->row.cell[column].style)
{
- if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
gtk_style_detach (GTK_CMCTREE_ROW (node)->row.cell[column].style);
g_object_unref (GTK_CMCTREE_ROW (node)->row.cell[column].style);
}
@@ -5038,7 +5038,7 @@
{
g_object_ref (GTK_CMCTREE_ROW (node)->row.cell[column].style);
- if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
GTK_CMCTREE_ROW (node)->row.cell[column].style =
gtk_style_attach (GTK_CMCTREE_ROW (node)->row.cell[column].style,
clist->clist_window);
@@ -5099,7 +5099,7 @@
if (GTK_CMCTREE_ROW (node)->row.style)
{
- if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
gtk_style_detach (GTK_CMCTREE_ROW (node)->row.style);
g_object_unref (GTK_CMCTREE_ROW (node)->row.style);
}
@@ -5110,7 +5110,7 @@
{
g_object_ref (GTK_CMCTREE_ROW (node)->row.style);
- if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
GTK_CMCTREE_ROW (node)->row.style =
gtk_style_attach (GTK_CMCTREE_ROW (node)->row.style,
clist->clist_window);
@@ -5149,7 +5149,7 @@
{
GTK_CMCTREE_ROW (node)->row.foreground = *color;
GTK_CMCTREE_ROW (node)->row.fg_set = TRUE;
- if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (ctree)),
>K_CMCTREE_ROW (node)->row.foreground, TRUE, TRUE);
}
@@ -5171,7 +5171,7 @@
{
GTK_CMCTREE_ROW (node)->row.background = *color;
GTK_CMCTREE_ROW (node)->row.bg_set = TRUE;
- if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (ctree)),
>K_CMCTREE_ROW (node)->row.background, TRUE, TRUE);
}
@@ -5364,23 +5364,23 @@
clist->column[ctree->tree_column].width + 3);
}
- if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
{
switch (line_style)
{
case GTK_CMCTREE_LINES_SOLID:
- if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
gdk_gc_set_line_attributes (ctree->lines_gc, 1, GDK_LINE_SOLID,
GDK_CAP_BUTT, GDK_JOIN_MITER);
break;
case GTK_CMCTREE_LINES_DOTTED:
- if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
gdk_gc_set_line_attributes (ctree->lines_gc, 1,
GDK_LINE_ON_OFF_DASH, GDK_CAP_BUTT, GDK_JOIN_MITER);
gdk_gc_set_dashes (ctree->lines_gc, 0, "\1\1", 2);
break;
case GTK_CMCTREE_LINES_TABBED:
- if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
gdk_gc_set_line_attributes (ctree->lines_gc, 1, GDK_LINE_SOLID,
GDK_CAP_BUTT, GDK_JOIN_MITER);
break;
@@ -5445,7 +5445,7 @@
gtk_cmclist_set_column_width (clist, ctree->tree_column, new_width);
}
- if (gtkut_widget_is_drawable (GTK_WIDGET(clist)))
+ if (gtk_widget_is_drawable (GTK_WIDGET(clist)))
CLIST_REFRESH (clist);
}
@@ -5776,7 +5776,7 @@
if (GTK_CMCTREE_ROW (work->data)->row.selectable)
gtk_cmctree_unselect (ctree, GTK_CMCTREE_NODE (work->data));
- if (gtkut_widget_has_focus (GTK_WIDGET(clist)) &&
+ if (gtk_widget_has_focus (GTK_WIDGET(clist)) &&
clist->focus_row != clist->undo_anchor)
{
clist->focus_row = clist->undo_anchor;
Index: inputdialog.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/inputdialog.c,v
retrieving revision 1.2.2.44
retrieving revision 1.2.2.45
diff -u -d -r1.2.2.44 -r1.2.2.45
--- inputdialog.c 7 Oct 2011 09:17:51 -0000 1.2.2.44
+++ inputdialog.c 22 Oct 2011 17:09:04 -0000 1.2.2.45
@@ -85,7 +85,7 @@
gchar *input_dialog(const gchar *title, const gchar *message,
const gchar *default_string)
{
- if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+ if (dialog && gtk_widget_get_visible(dialog)) return NULL;
if (!dialog)
input_dialog_create(FALSE);
@@ -111,7 +111,7 @@
gchar *input_dialog_with_invisible(const gchar *title, const gchar *message,
const gchar *default_string)
{
- if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+ if (dialog && gtk_widget_get_visible(dialog)) return NULL;
if (!dialog)
input_dialog_create(TRUE);
@@ -137,7 +137,7 @@
const gchar *default_string, const gchar *checkbtn_label,
gboolean *checkbtn_state)
{
- if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+ if (dialog && gtk_widget_get_visible(dialog)) return NULL;
if (!dialog)
input_dialog_create(TRUE);
@@ -178,7 +178,7 @@
const gchar *default_string, GList *list,
gboolean *remember)
{
- if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+ if (dialog && gtk_widget_get_visible(dialog)) return NULL;
if (!dialog)
input_dialog_create(FALSE);
@@ -209,7 +209,7 @@
const gchar *checkbtn_label,
gboolean *checkbtn_state)
{
- if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+ if (dialog && gtk_widget_get_visible(dialog)) return NULL;
if (!dialog)
input_dialog_create(FALSE);
@@ -421,7 +421,7 @@
{
gchar *str;
- if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+ if (dialog && gtk_widget_get_visible(dialog)) return NULL;
if (!dialog)
input_dialog_create(FALSE);
Index: pluginwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/pluginwindow.c,v
retrieving revision 1.5.2.60
retrieving revision 1.5.2.61
diff -u -d -r1.5.2.60 -r1.5.2.61
--- pluginwindow.c 7 Oct 2011 09:17:51 -0000 1.5.2.60
+++ pluginwindow.c 22 Oct 2011 17:09:04 -0000 1.5.2.61
@@ -293,7 +293,6 @@
GtkWidget *vbox3;
GtkWidget *hbox_info;
static GdkGeometry geometry;
- CLAWS_TIP_DECL();
debug_print("Creating plugins window...\n");
Index: gtkutils.h
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtkutils.h,v
retrieving revision 1.4.2.62
retrieving revision 1.4.2.63
diff -u -d -r1.4.2.62 -r1.4.2.63
--- gtkutils.h 22 Oct 2011 15:48:06 -0000 1.4.2.62
+++ gtkutils.h 22 Oct 2011 17:09:04 -0000 1.4.2.63
@@ -152,18 +152,6 @@
void gtkut_widget_set_app_icon (GtkWidget *widget);
void gtkut_widget_set_composer_icon (GtkWidget *widget);
-gboolean gtkut_widget_get_app_paintable (GtkWidget *widget);
-gboolean gtkut_widget_get_can_focus (GtkWidget *widget);
-gboolean gtkut_widget_get_has_window (GtkWidget *widget);
-gboolean gtkut_widget_get_mapped (GtkWidget *widget);
-gboolean gtkut_widget_get_realized (GtkWidget *widget);
-gboolean gtkut_widget_get_sensitive (GtkWidget *widget);
-GtkStateType gtkut_widget_get_state (GtkWidget *widget);
-gboolean gtkut_widget_get_visible (GtkWidget *widget);
-gboolean gtkut_widget_has_grab (GtkWidget *widget);
-gboolean gtkut_widget_has_focus (GtkWidget *widget);
-gboolean gtkut_widget_is_drawable (GtkWidget *widget);
-gboolean gtkut_widget_is_sensitive (GtkWidget *widget);
void gtkut_widget_set_mapped (GtkWidget *widget, gboolean mapped);
void gtkut_widget_set_realized (GtkWidget *widget, gboolean realized);
void gtkut_widget_set_can_default (GtkWidget *widget, gboolean can_default);
@@ -229,8 +217,6 @@
gpointer data,
gboolean is_sock);
-#if GTK_CHECK_VERSION(2,12,0)
-#define CLAWS_TIP_DECL() {}
#define CLAWS_SET_TIP(widget,tip) { \
if (tip != NULL) \
gtk_widget_set_tooltip_text(GTK_WIDGET(widget), tip); \
@@ -238,15 +224,6 @@
gtk_widget_set_has_tooltip(GTK_WIDGET(widget), FALSE); \
}
-#else
-#define CLAWS_TIP_DECL() \
- GtkTooltips *tips = gtk_tooltips_new();
-
-#define CLAWS_SET_TIP(widget,tip) { \
- gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), widget, \
- tip, NULL); \
-}
-#endif
#if !GTK_CHECK_VERSION(2,22,0)
#define gdk_drag_context_get_selected_action(x) ((x)->action)
#define gdk_drag_context_get_actions(x) ((x)->actions)
@@ -256,9 +233,22 @@
#endif
#if !GTK_CHECK_VERSION(2,20,0)
#define gtk_widget_get_requisition(x,r) (*(r) = (x)->requisition)
+#define gtk_statusbar_get_message_area(x) ((x)->label)
+#define gtk_widget_get_realized(x) (GTK_WIDGET_REALIZED(x))
+#define gtk_widget_get_mapped(x) (GTK_WIDGET_MAPPED(x))
#endif
#if !GTK_CHECK_VERSION(2,18,0)
-#define gtk_widget_get_allocation(x,a) (*(a) = (x)->allocation)
-#define gtk_widget_get_state(x) ((x)->state)
+#define gtk_widget_has_focus(x) (GTK_WIDGET_HAS_FOCUS(x))
+#define gtk_widget_get_can_focus(x) (GTK_WIDGET_CAN_FOCUS(x))
+#define gtk_widget_has_grab(x) (GTK_WIDGET_HAS_GRAB(x))
+#define gtk_widget_get_visible(x) (GTK_WIDGET_VISIBLE(x))
+#define gtk_widget_get_realized(x) (GTK_WIDGET_REALIZED(x))
+#define gtk_widget_is_sensitive(x) (GTK_WIDGET_IS_SENSITIVE(x))
+#define gtk_widget_get_sensitive(x) (GTK_WIDGET_SENSITIVE(x))
+#define gtk_widget_is_drawable(x) (GTK_WIDGET_DRAWABLE(x))
+#define gtk_widget_get_state(x) (GTK_WIDGET_STATE(x))
+#define gtk_widget_get_mapped(x) (GTK_WIDGET_MAPPED(x))
+#define gtk_widget_get_has_window(x) (!(GTK_WIDGET_NO_WINDOW(x)))
+#define gtk_widget_get_app_paintable(x) (GTK_WIDGET_APP_PAINTABLE(x))
#endif
#endif /* __GTKUTILS_H__ */
Index: gtksctree.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtksctree.c,v
retrieving revision 1.1.4.61
retrieving revision 1.1.4.62
diff -u -d -r1.1.4.61 -r1.1.4.62
--- gtksctree.c 7 Oct 2011 09:08:57 -0000 1.1.4.61
+++ gtksctree.c 22 Oct 2011 17:09:04 -0000 1.1.4.62
@@ -887,7 +887,7 @@
}
/* bail now if we arn't drawable yet */
- if (!gtkut_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
+ if (!gtk_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
return;
ctree = GTK_CMCTREE (clist);
@@ -1256,7 +1256,7 @@
/* draw focus rectangle */
if (clist->focus_row == row &&
- gtkut_widget_get_can_focus (widget) && gtkut_widget_has_focus (widget))
+ gtk_widget_get_can_focus (widget) && gtk_widget_has_focus (widget))
{
if (!area)
gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
@@ -1287,7 +1287,7 @@
clist = GTK_CMCLIST (ctree);
if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (ctree))) &&
- gtkut_widget_has_grab (GTK_WIDGET(ctree)))
+ gtk_widget_has_grab (GTK_WIDGET(ctree)))
return;
if (!(node =
@@ -1647,7 +1647,7 @@
on_row = gtk_cmclist_get_selection_info (clist, event->x, event->y, &row, &col);
- if (on_row && !gtkut_widget_has_focus(widget))
+ if (on_row && !gtk_widget_has_focus(widget))
gtk_widget_grab_focus (widget);
if (gtk_sctree_is_hot_spot (GTK_SCTREE(sctree), event->x, event->y)) {
@@ -2842,7 +2842,7 @@
(clist, &(ctree_row->row), i, GTK_CMCELL_EMPTY, NULL, 0, NULL);
if (ctree_row->row.cell[i].style)
{
- if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
gtk_style_detach (ctree_row->row.cell[i].style);
g_object_unref (ctree_row->row.cell[i].style);
}
@@ -2850,7 +2850,7 @@
if (ctree_row->row.style)
{
- if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+ if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
gtk_style_detach (ctree_row->row.style);
g_object_unref (ctree_row->row.style);
}
Index: quicksearch.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/quicksearch.c,v
retrieving revision 1.1.2.105
retrieving revision 1.1.2.106
diff -u -d -r1.1.2.105 -r1.1.2.106
--- quicksearch.c 7 Oct 2011 09:40:16 -0000 1.1.2.105
+++ quicksearch.c 22 Oct 2011 17:09:04 -0000 1.1.2.106
@@ -695,7 +695,6 @@
GtkWidget *clear_search;
GtkWidget *search_condition_expression;
GtkWidget *menuitem;
- CLAWS_TIP_DECL();
GtkWidget *vbox;
quicksearch = quicksearch_new_nogui();
Index: gtkcmoptionmenu.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmoptionmenu.c,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- gtkcmoptionmenu.c 7 Oct 2011 09:17:51 -0000 1.1.2.8
+++ gtkcmoptionmenu.c 22 Oct 2011 17:09:04 -0000 1.1.2.9
@@ -436,7 +436,7 @@
gtk_cmoption_menu_get_props (option_menu, &props);
child = gtk_bin_get_child (GTK_BIN (option_menu));
- if (child && gtkut_widget_get_visible (child))
+ if (child && gtk_widget_get_visible (child))
{
gtk_widget_size_request (child, &child_requisition);
@@ -477,13 +477,13 @@
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
gtk_widget_set_allocation (widget, allocation);
- if (gtkut_widget_get_realized (widget))
+ if (gtk_widget_get_realized (widget))
gdk_window_move_resize (gtk_button_get_event_window (button),
allocation->x + border_width, allocation->y + border_width,
allocation->width - border_width * 2, allocation->height - border_width * 2);
child = gtk_bin_get_child (GTK_BIN (widget));
- if (child && gtkut_widget_get_visible (child))
+ if (child && gtk_widget_get_visible (child))
{
style = gtk_widget_get_style (widget);
gint xthickness = style->xthickness;
@@ -520,7 +520,7 @@
cm_return_if_fail (GTK_IS_CMOPTION_MENU (widget));
cm_return_if_fail (area != NULL);
- if (gtkut_widget_is_drawable (widget))
+ if (gtk_widget_is_drawable (widget))
{
gtk_widget_get_allocation (widget, &allocation);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
@@ -531,7 +531,7 @@
button_area.width = allocation.width - 2 * border_width;
button_area.height = allocation.height - 2 * border_width;
- if (!props.interior_focus && gtkut_widget_has_focus (widget))
+ if (!props.interior_focus && gtk_widget_has_focus (widget))
{
button_area.x += props.focus_width + props.focus_pad;
button_area.y += props.focus_width + props.focus_pad;
@@ -542,7 +542,7 @@
style = gtk_widget_get_style (widget);
window = gtk_widget_get_window (widget);
gtk_paint_box (style, window,
- gtkut_widget_get_state (widget), GTK_SHADOW_OUT,
+ gtk_widget_get_state (widget), GTK_SHADOW_OUT,
area, widget, "optionmenu",
button_area.x, button_area.y,
button_area.width, button_area.height);
@@ -556,13 +556,13 @@
style->xthickness;
gtk_paint_tab (style, window,
- gtkut_widget_get_state (widget), GTK_SHADOW_OUT,
+ gtk_widget_get_state (widget), GTK_SHADOW_OUT,
area, widget, "optionmenutab",
tab_x,
button_area.y + (button_area.height - props.indicator_size.height) / 2,
props.indicator_size.width, props.indicator_size.height);
- if (gtkut_widget_has_focus (widget))
+ if (gtk_widget_has_focus (widget))
{
if (props.interior_focus)
{
@@ -586,7 +586,7 @@
button_area.height += 2 * (props.focus_width + props.focus_pad);
}
- gtk_paint_focus (style, window, gtkut_widget_get_state (widget),
+ gtk_paint_focus (style, window, gtk_widget_get_state (widget),
area, widget, "button",
button_area.x,
button_area.y,
@@ -604,7 +604,7 @@
cm_return_val_if_fail (GTK_IS_CMOPTION_MENU (widget), FALSE);
cm_return_val_if_fail (event != NULL, FALSE);
- if (gtkut_widget_is_drawable (widget))
+ if (gtk_widget_is_drawable (widget))
{
gtk_cmoption_menu_paint (widget, &event->area);
@@ -739,7 +739,7 @@
while (children)
{
- if (gtkut_widget_get_sensitive (children->data))
+ if (gtk_widget_get_sensitive (children->data))
{
gtk_cmoption_menu_set_history (option_menu, index);
return;
@@ -760,8 +760,8 @@
{
GtkWidget *child = gtk_bin_get_child (GTK_BIN (option_menu));
- if (child && gtkut_widget_get_sensitive (child) != gtkut_widget_is_sensitive (widget))
- gtk_widget_set_sensitive (child, gtkut_widget_is_sensitive (widget));
+ if (child && gtk_widget_get_sensitive (child) != gtk_widget_is_sensitive (widget))
+ gtk_widget_set_sensitive (child, gtk_widget_is_sensitive (widget));
}
static void
@@ -803,7 +803,7 @@
child = gtk_bin_get_child (GTK_BIN (option_menu->menu_item));
if (child)
{
- if (!gtkut_widget_is_sensitive (option_menu->menu_item))
+ if (!gtk_widget_is_sensitive (option_menu->menu_item))
gtk_widget_set_sensitive (child, FALSE);
gtk_widget_reparent (child, GTK_WIDGET (option_menu));
}
@@ -818,7 +818,7 @@
gtk_widget_size_allocate (GTK_WIDGET (option_menu),
&allocation);
- if (gtkut_widget_is_drawable (GTK_WIDGET(option_menu)))
+ if (gtk_widget_is_drawable (GTK_WIDGET(option_menu)))
gtk_widget_queue_draw (GTK_WIDGET (option_menu));
}
@@ -879,7 +879,7 @@
child = children->data;
children = children->next;
- if (gtkut_widget_get_visible (child))
+ if (gtk_widget_get_visible (child))
{
GtkWidget *inner = gtk_bin_get_child (GTK_BIN (child));
@@ -948,7 +948,7 @@
if (active == child)
break;
- if (gtkut_widget_get_visible (child))
+ if (gtk_widget_get_visible (child))
{
gtk_widget_get_child_requisition (child, &requisition);
menu_ypos -= requisition.height;
@@ -1048,8 +1048,8 @@
l = g_list_nth (children, index);
item = GTK_MENU_ITEM (l->data);
- if (gtkut_widget_get_visible (GTK_WIDGET(item)) &&
- gtkut_widget_is_sensitive (GTK_WIDGET(item)))
+ if (gtk_widget_get_visible (GTK_WIDGET(item)) &&
+ gtk_widget_is_sensitive (GTK_WIDGET(item)))
{
gtk_cmoption_menu_set_history (option_menu, index);
gtk_menu_item_activate (GTK_MENU_ITEM (item));
Index: gtkutils.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtkutils.c,v
retrieving revision 1.5.2.99
retrieving revision 1.5.2.100
diff -u -d -r1.5.2.99 -r1.5.2.100
--- gtkutils.c 17 Oct 2011 08:59:47 -0000 1.5.2.99
+++ gtkutils.c 22 Oct 2011 17:09:04 -0000 1.5.2.100
@@ -655,7 +655,7 @@
void gtkut_widget_draw_now(GtkWidget *widget)
{
- if (widget && gtkut_widget_get_visible(widget) && gtkut_widget_is_drawable(widget))
+ if (widget && gtk_widget_get_visible(widget) && gtk_widget_is_drawable(widget))
gdk_window_process_updates(gtk_widget_get_window(widget), FALSE);
}
@@ -878,7 +878,7 @@
for (c = child_list; c != NULL; c = g_list_next(c)) {
if (c->data && GTK_IS_WIDGET(c->data)) {
- if (gtkut_widget_has_focus(GTK_WIDGET(c->data))) {
+ if (gtk_widget_has_focus(GTK_WIDGET(c->data))) {
result = GTK_WIDGET(c->data);
break;
}
@@ -1693,114 +1693,6 @@
return result;
}
-gboolean gtkut_widget_has_focus(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,18,0)
- return gtk_widget_has_focus(widget);
-#else
- return GTK_WIDGET_HAS_FOCUS(widget);
-#endif
-}
-
-gboolean gtkut_widget_get_can_focus(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,18,0)
- return gtk_widget_get_can_focus(widget);
-#else
- return GTK_WIDGET_CAN_FOCUS(widget);
-#endif
-}
-
-gboolean gtkut_widget_has_grab(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,18,0)
- return gtk_widget_has_grab(widget);
-#else
- return GTK_WIDGET_HAS_GRAB(widget);
-#endif
-}
-
-gboolean gtkut_widget_get_visible(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,18,0)
- return gtk_widget_get_visible(widget);
-#else
- return GTK_WIDGET_VISIBLE(widget);
-#endif
-}
-
-gboolean gtkut_widget_get_realized(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,19,0)
- return gtk_widget_get_realized(widget);
-#else
- return GTK_WIDGET_REALIZED(widget);
-#endif
-}
-
-gboolean gtkut_widget_is_sensitive(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,18,0)
- return gtk_widget_is_sensitive(widget);
-#else
- return GTK_WIDGET_IS_SENSITIVE(widget);
-#endif
-}
-
-gboolean gtkut_widget_get_sensitive(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,18,0)
- return gtk_widget_get_sensitive(widget);
-#else
- return GTK_WIDGET_SENSITIVE(widget);
-#endif
-}
-
-gboolean gtkut_widget_is_drawable(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,18,0)
- return gtk_widget_is_drawable(widget);
-#else
- return GTK_WIDGET_DRAWABLE(widget);
-#endif
-}
-
-GtkStateType gtkut_widget_get_state(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,18,0)
- return gtk_widget_get_state(widget);
-#else
- return GTK_WIDGET_STATE(widget);
-#endif
-}
-
-gboolean gtkut_widget_get_mapped(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,19,0)
- return gtk_widget_get_mapped(widget);
-#else
- return GTK_WIDGET_MAPPED(widget);
-#endif
-}
-
-gboolean gtkut_widget_get_has_window(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,18,0)
- return gtk_widget_get_has_window(widget);
-#else
- return GTK_WIDGET_NO_WINDOW(widget);
-#endif
-}
-
-gboolean gtkut_widget_get_app_paintable(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,18,0)
- return gtk_widget_get_app_paintable(widget);
-#else
- return GTK_WIDGET_APP_PAINTABLE(widget);
-#endif
-}
-
void gtkut_widget_set_mapped(GtkWidget *widget, gboolean mapped)
{
#if GTK_CHECK_VERSION(2,20,0)
Index: gtkvscrollbutton.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtkvscrollbutton.c,v
retrieving revision 1.5.2.22
retrieving revision 1.5.2.23
diff -u -d -r1.5.2.22 -r1.5.2.23
--- gtkvscrollbutton.c 7 Oct 2011 09:08:57 -0000 1.5.2.22
+++ gtkvscrollbutton.c 22 Oct 2011 17:09:04 -0000 1.5.2.23
@@ -253,7 +253,7 @@
GdkEventButton *event,
GtkVScrollbutton *scrollbutton)
{
- if (!gtkut_widget_has_focus(widget))
+ if (!gtk_widget_has_focus(widget))
gtk_widget_grab_focus(widget);
if (scrollbutton->button == 0) {
@@ -275,7 +275,7 @@
GdkEventButton *event,
GtkVScrollbutton *scrollbutton)
{
- if (!gtkut_widget_has_focus(widget))
+ if (!gtk_widget_has_focus(widget))
gtk_widget_grab_focus(widget);
if (scrollbutton->button == event->button) {
@@ -420,7 +420,7 @@
GtkVScrollbutton *scrollbutton)
{
gfloat value;
- if (!gtkut_widget_get_realized(GTK_WIDGET(scrollbutton))) return;
+ if (!gtk_widget_get_realized(GTK_WIDGET(scrollbutton))) return;
if (scrollbutton->button != 0) return; /* not while something is pressed */
value = gtk_adjustment_get_value(adjustment);
More information about the Commits
mailing list