+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.
+
2011-10-22 [colin] 3.7.10cvs40
* src/gtk/gtkutils.h
( cvs diff -u -r 1.42.2.55 -r 1.42.2.56 po/fr.po; cvs diff -u -r 1.9.2.51 -r 1.9.2.52 src/common/defs.h; ) > 3.7.10cvs38.patchset
( cvs diff -u -r 1.100.2.80 -r 1.100.2.81 AUTHORS; cvs diff -u -r 1.12.2.23 -r 1.12.2.24 src/ldif.c; cvs diff -u -r 1.1.2.74 -r 1.1.2.75 src/gtk/authors.h; ) > 3.7.10cvs39.patchset
( cvs diff -u -r 1.4.2.61 -r 1.4.2.62 src/gtk/gtkutils.h; cvs diff -u -r 1.654.2.4320 -r 1.654.2.4321 configure.ac; ) > 3.7.10cvs40.patchset
+( cvs diff -u -r 1.61.2.100 -r 1.61.2.101 src/account.c; cvs diff -u -r 1.27.2.57 -r 1.27.2.58 src/addr_compl.c; cvs diff -u -r 1.5.10.35 -r 1.5.10.36 src/addrgather.c; cvs diff -u -r 1.382.2.586 -r 1.382.2.587 src/compose.c; cvs diff -u -r 1.8.2.42 -r 1.8.2.43 src/editldap.c; cvs diff -u -r 1.1.4.34 -r 1.1.4.35 src/expldifdlg.c; cvs diff -u -r 1.207.2.222 -r 1.207.2.223 src/folderview.c; cvs diff -u -r 1.14.2.30 -r 1.14.2.31 src/grouplistdialog.c; cvs diff -u -r 1.8.2.33 -r 1.8.2.34 src/headerview.c; cvs diff -u -r 1.14.2.27 -r 1.14.2.28 src/importldif.c; cvs diff -u -r 1.115.2.242 -r 1.115.2.243 src/main.c; cvs diff -u -r 1.274.2.331 -r 1.274.2.332 src/mainwindow.c; cvs diff -u -r 1.83.2.173 -r 1.83.2.174 src/mimeview.c; cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/noticeview.c; cvs diff -u -r 1.105.2.169 -r 1.105.2.170 src/prefs_account.c; cvs diff -u -r 1.60.2.74 -r 1.60.2.75 src/prefs_actions.c; cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/prefs_ext_prog.c; cvs diff -u -r 1.59.2.83 -r 1.59.2.84 src/prefs_filtering.c; cvs diff -u -r 1.52.2.84 -r 1.52.2.85 src/prefs_folder_item.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_image_viewer.c; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_logging.c; cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/prefs_other.c; cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_send.c; cvs diff -u -r 1.5.2.42 -r 1.5.2.43 src/prefs_spelling.c; cvs diff -u -r 1.1.2.68 -r 1.1.2.69 src/prefs_summaries.c; cvs diff -u -r 1.12.2.76 -r 1.12.2.77 src/prefs_template.c; cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/printing.c; cvs diff -u -r 1.8.2.44 -r 1.8.2.45 src/quote_fmt.c; cvs diff -u -r 1.17.2.60 -r 1.17.2.61 src/send_message.c; cvs diff -u -r 1.5.2.30 -r 1.5.2.31 src/statusbar.c; cvs diff -u -r 1.15.2.67 -r 1.15.2.68 src/summary_search.c; cvs diff -u -r 1.395.2.432 -r 1.395.2.433 src/summaryview.c; cvs diff -u -r 1.1.2.85 -r 1.1.2.86 src/wizard.c; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/gtk/gtkcmclist.c; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/gtk/gtkcmctree.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/gtkcmoptionmenu.c; cvs diff -u -r 1.1.4.61 -r 1.1.4.62 src/gtk/gtksctree.c; cvs diff -u -r 1.5.2.99 -r 1.5.2.100 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.62 -r 1.4.2.63 src/gtk/gtkutils.h; cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.2.2.44 -r 1.2.2.45 src/gtk/inputdialog.c; cvs diff -u -r 1.5.2.60 -r 1.5.2.61 src/gtk/pluginwindow.c; cvs diff -u -r 1.1.2.105 -r 1.1.2.106 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/spell_entry.c; cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/plugins/dillo_viewer/dillo_prefs.c; cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/pgpcore/prefs_gpg.c; cvs diff -u -r 1.23.2.56 -r 1.23.2.57 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.14.2.78 -r 1.14.2.79 src/plugins/trayicon/trayicon.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/trayicon/trayicon_prefs.c; ) > 3.7.10cvs41.patchset
MICRO_VERSION=10
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=40
+EXTRA_VERSION=41
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
AM_CONDITIONAL(GTK3, true)
AM_CONDITIONAL(GTK2, false)
else
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18)
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16)
dnl --disable-deprecated switch for GTK2 purification
AC_ARG_ENABLE(deprecated, [ --disable-deprecated disable deprecated GTK functions. ],
{
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
- CLAWS_TIP_DECL();
renderer = gtk_cell_renderer_toggle_new();
g_object_set(renderer,
cm_return_val_if_fail(entry != NULL, FALSE);
- if (!gtkut_widget_has_focus(GTK_WIDGET(entry))) return FALSE;
+ if (!gtk_widget_has_focus(GTK_WIDGET(entry))) return FALSE;
/* get an address component from the cursor */
searchTerm = get_address_from_edit( entry, &cursor_pos );
GtkWidget *checkRecurse;
gint top;
gint i;
- CLAWS_TIP_DECL();
/* Container */
vbox = gtk_vbox_new(FALSE, 6);
GtkWidget *text;
GtkTextBuffer *buffer;
GtkClipboard *clipboard;
- CLAWS_TIP_DECL();
UndoMain *undostruct;
Compose *compose = (Compose *)data;
if (compose->focused_editable
#ifndef GENERIC_UMPC
- && gtkut_widget_has_focus(compose->focused_editable)
+ && gtk_widget_has_focus(compose->focused_editable)
#endif
)
entry_cut_clipboard(compose->focused_editable);
Compose *compose = (Compose *)data;
if (compose->focused_editable
#ifndef GENERIC_UMPC
- && gtkut_widget_has_focus(compose->focused_editable)
+ && gtk_widget_has_focus(compose->focused_editable)
#endif
)
entry_copy_clipboard(compose->focused_editable);
GtkTextBuffer *buffer;
BLOCK_WRAP();
if (compose->focused_editable &&
- gtkut_widget_has_focus(compose->focused_editable))
+ gtk_widget_has_focus(compose->focused_editable))
entry_paste_clipboard(compose, compose->focused_editable,
prefs_common.linewrap_pastes,
GDK_SELECTION_CLIPBOARD, NULL);
UNBLOCK_WRAP();
#ifdef USE_ENCHANT
- if (gtkut_widget_has_focus(compose->text) &&
+ if (gtk_widget_has_focus(compose->text) &&
compose->gtkaspell &&
compose->gtkaspell->check_while_typing)
gtkaspell_highlight_all(compose->gtkaspell);
gint wrap_quote = prefs_common.linewrap_quote;
if (compose->focused_editable
#ifndef GENERIC_UMPC
- && gtkut_widget_has_focus(compose->focused_editable)
+ && gtk_widget_has_focus(compose->focused_editable)
#endif
) {
/* let text_insert() (called directly or at a later time
BLOCK_WRAP();
if (compose->focused_editable
#ifndef GENERIC_UMPC
- && gtkut_widget_has_focus(compose->focused_editable)
+ && gtk_widget_has_focus(compose->focused_editable)
#endif
)
entry_paste_clipboard(compose, compose->focused_editable, FALSE,
UNBLOCK_WRAP();
#ifdef USE_ENCHANT
- if (gtkut_widget_has_focus(compose->text) &&
+ if (gtk_widget_has_focus(compose->text) &&
compose->gtkaspell &&
compose->gtkaspell->check_while_typing)
gtkaspell_highlight_all(compose->gtkaspell);
BLOCK_WRAP();
if (compose->focused_editable
#ifndef GENERIC_UMPC
- && gtkut_widget_has_focus(compose->focused_editable)
+ && gtk_widget_has_focus(compose->focused_editable)
#endif
)
entry_paste_clipboard(compose, compose->focused_editable, TRUE,
UNBLOCK_WRAP();
#ifdef USE_ENCHANT
- if (gtkut_widget_has_focus(compose->text) &&
+ if (gtk_widget_has_focus(compose->text) &&
compose->gtkaspell &&
compose->gtkaspell->check_while_typing)
gtkaspell_highlight_all(compose->gtkaspell);
Compose *compose = (Compose *)data;
if (compose->focused_editable
#ifndef GENERIC_UMPC
- && gtkut_widget_has_focus(compose->focused_editable)
+ && gtk_widget_has_focus(compose->focused_editable)
#endif
)
entry_allsel(compose->focused_editable);
{textview_delete_to_line_end}
};
- if (!gtkut_widget_has_focus(GTK_WIDGET(text))) return;
+ if (!gtk_widget_has_focus(GTK_WIDGET(text))) return;
if (action >= COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE &&
action <= COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END) {
if (!compose->gtkaspell)
return;
- if (gtkut_widget_has_focus(compose->subject_entry))
+ if (gtk_widget_has_focus(compose->subject_entry))
claws_spell_entry_check_all(
CLAWS_SPELL_ENTRY(compose->subject_entry));
else
return;
}
- if (gtkut_widget_has_focus(compose->subject_entry))
+ if (gtk_widget_has_focus(compose->subject_entry))
claws_spell_entry_check_backwards(
CLAWS_SPELL_ENTRY(compose->subject_entry));
else
return;
}
- if (gtkut_widget_has_focus(compose->subject_entry))
+ if (gtk_widget_has_focus(compose->subject_entry))
claws_spell_entry_check_forwards_go(
CLAWS_SPELL_ENTRY(compose->subject_entry));
else
GtkWidget *entry_baseDN;
GtkWidget *check_btn;
GtkWidget *lookdn_btn;
- CLAWS_TIP_DECL();
gint top;
vbox = gtk_vbox_new( FALSE, 8 );
GtkWidget *check_dynsearch;
GtkWidget *check_matchoption;
GtkWidget *reset_btn;
- CLAWS_TIP_DECL();
gint top;
vbox = gtk_vbox_new( FALSE, 8 );
GtkWidget *spinbtn_timeout;
GtkAdjustment *spinbtn_maxentry_adj;
GtkWidget *spinbtn_maxentry;
- CLAWS_TIP_DECL();
gint top;
vbox = gtk_vbox_new( FALSE, 8 );
GtkWidget *checkEMail;
GtkListStore *store;
GtkTreeIter iter;
- CLAWS_TIP_DECL();
gint top;
vbox = gtk_vbox_new(FALSE, 8);
gtk_cmctree_expand(ctree, row);
/* ungrab the mouse event */
- if (gtkut_widget_has_grab(GTK_WIDGET(ctree))) {
+ if (gtk_widget_has_grab(GTK_WIDGET(ctree))) {
gtk_grab_remove(GTK_WIDGET(ctree));
if (gdk_pointer_is_grabbed())
gdk_pointer_ungrab(GDK_CURRENT_TIME);
GNode *node;
FolderItem *item;
- if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+ if (dialog && gtk_widget_get_visible(dialog)) return NULL;
if (!dialog)
grouplist_dialog_create();
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;
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));
}
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);
}
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);
}
/* 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);
}
/* 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);
}
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);
}
}
}
- if (gtkut_widget_get_visible (GTK_WIDGET(clist)))
+ if (gtk_widget_get_visible (GTK_WIDGET(clist)))
size_allocate_title_buttons (clist);
}
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;
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));
{
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);
}
{
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);
}
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);
}
{
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);
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);
}
{
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);
}
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))));
}
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;
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);
/* 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;
clist = GTK_CMCLIST (widget);
- if (!gtkut_widget_get_mapped (widget))
+ if (!gtk_widget_get_mapped (widget))
{
gtkut_widget_set_mapped (widget, TRUE);
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);
}
clist = GTK_CMCLIST (widget);
- if (gtkut_widget_get_mapped (widget))
+ if (gtk_widget_get_mapped (widget))
{
gtkut_widget_set_mapped (widget, FALSE);
/* 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 */
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);
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),
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,
}
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;
}
}
- if (!gtkut_widget_has_focus(widget))
+ if (!gtk_widget_has_focus(widget))
gtk_widget_grab_focus (widget);
if (button_actions & GTK_CMBUTTON_SELECTS)
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;
{
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
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 &&
{
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 &&
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,
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,
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,
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);
/* 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,
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)
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);
/* 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)))
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;
{
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;
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 */
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);
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))
(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);
}
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);
}
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));
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);
{
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;
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))
{
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))
{
{
GtkWidget *widget = GTK_WIDGET (clist);
- if (gtkut_widget_has_grab (widget))
+ if (gtk_widget_has_grab (widget))
{
GdkDisplay *display = gtk_widget_get_display (widget);
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;
ctree = GTK_CMCTREE (widget);
clist = GTK_CMCLIST (widget);
- if (gtkut_widget_get_realized (widget))
+ if (gtk_widget_get_realized (widget))
{
GtkCMCTreeNode *node;
GtkCMCTreeNode *child;
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);
/* 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,
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 =
(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);
}
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);
}
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)),
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);
}
{
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);
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);
}
{
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);
{
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);
}
{
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);
}
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;
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);
}
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;
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);
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;
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));
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;
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);
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)
{
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,
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);
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;
{
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
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));
}
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));
}
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));
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;
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));
}
/* 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);
/* 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,
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 =
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)) {
(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);
}
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);
}
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);
}
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;
}
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)
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);
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); \
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)
#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__ */
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) {
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) {
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);
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);
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);
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);
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);
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);
{
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);
GtkWidget *vbox3;
GtkWidget *hbox_info;
static GdkGeometry geometry;
- CLAWS_TIP_DECL();
debug_print("Creating plugins window...\n");
GtkWidget *clear_search;
GtkWidget *search_condition_expression;
GtkWidget *menuitem;
- CLAWS_TIP_DECL();
GtkWidget *vbox;
quicksearch = quicksearch_new_nogui();
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;
!msginfo->extradata->xface ||
strlen(msginfo->extradata->xface) < 5) {
if (headerview->image &&
- gtkut_widget_get_visible(headerview->image)) {
+ gtk_widget_get_visible(headerview->image)) {
gtk_widget_hide(headerview->image);
gtk_widget_queue_resize(hbox);
}
return -1;
}
- if (!gtkut_widget_get_visible(headerview->hbox)) return -1;
+ if (!gtk_widget_get_visible(headerview->hbox)) return -1;
if (headerview->image) {
gtk_widget_destroy(headerview->image);
if (!msginfo->extradata || !msginfo->extradata->face) {
if (headerview->image &&
- gtkut_widget_get_visible(headerview->image)) {
+ gtk_widget_get_visible(headerview->image)) {
gtk_widget_hide(headerview->image);
gtk_widget_queue_resize(hbox);
}
return -1;
}
- if (!gtkut_widget_get_visible(headerview->hbox)) return -1;
+ if (!gtk_widget_get_visible(headerview->hbox)) return -1;
if (headerview->image) {
gtk_widget_destroy(headerview->image);
GError *error = NULL;
GdkPixbuf *picture = NULL;
- if (!gtkut_widget_get_visible(headerview->hbox)) return;
+ if (!gtk_widget_get_visible(headerview->hbox)) return;
if (headerview->image) {
picture = gtk_image_get_pixbuf(GTK_IMAGE(headerview->image));
GdkPixbuf *picture = NULL;
gint w, h;
- if (!gtkut_widget_get_visible(headerview->hbox)) return -1;
+ if (!gtk_widget_get_visible(headerview->hbox)) return -1;
if (headerview->image) {
gtk_widget_destroy(headerview->image);
gtk_widget_hide(headerview->tags_header_label);
gtk_widget_hide(headerview->tags_body_label);
- if (headerview->image && gtkut_widget_get_visible(headerview->image)) {
+ if (headerview->image && gtk_widget_get_visible(headerview->image)) {
gtk_widget_hide(headerview->image);
gtk_widget_queue_resize(headerview->hbox);
}
GtkWidget *entryFile;
GtkWidget *entryName;
GtkWidget *btnFile;
- CLAWS_TIP_DECL();
gint top;
vbox = gtk_vbox_new(FALSE, 8);
GtkWidget *checkSelect;
GtkWidget *btnModify;
GtkWidget *eventBox;
- CLAWS_TIP_DECL();
gint top;
gchar *titles[ FIELDS_N_COLS ];
gint r = 0;
GtkWidget *window = NULL;
GtkWidget *keep_backup_chk;
- CLAWS_TIP_DECL();
gboolean backup = TRUE;
keep_backup_chk = gtk_check_button_new_with_label (_("Keep old configuration"));
g_error(_("g_thread is not supported by glib.\n"));
}
- /* check that we're not on a too recent/old gtk+ */
-#if GTK_CHECK_VERSION(2, 9, 0)
- if (gtk_check_version(2, 9, 0) != NULL) {
- alertpanel_error(_("Claws Mail has been compiled with "
- "a more recent GTK+ library than is "
- "currently available. This will cause "
- "crashes. You need to upgrade GTK+ or "
- "recompile Claws Mail."));
-#ifdef G_OS_WIN32
- win32_close_log();
-#endif
- exit(1);
- }
-#else
- if (gtk_check_version(2, 9, 0) == NULL) {
- alertpanel_error(_("Claws Mail has been compiled with "
- "an older GTK+ library than is "
- "currently available. This will cause "
- "crashes. You need to recompile "
- "Claws Mail."));
-#ifdef G_OS_WIN32
- win32_close_log();
-#endif
- exit(1);
- }
-#endif
-
#ifdef G_OS_WIN32
CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_home_dir(), 1, win32_close_log(););
#else
if (keyval == GDK_KEY_BackSpace) {
const gchar *accel_path;
-#if GTK_CHECK_VERSION(2,14,0)
accel_path = gtk_menu_item_get_accel_path(item);
-#else
- accel_path = GTK_MENU_ITEM(item)->accel_path;
-#endif
keyval = 0; modifier = 0;
gtk_accel_map_change_entry (accel_path, keyval, modifier, TRUE);
}
GtkWidget *offline_pixmap;
GtkWidget *warning_icon;
GtkWidget *warning_btn;
- CLAWS_TIP_DECL();
#endif
GtkWidget *online_switch;
GtkWidget *offline_switch;
{
static gboolean first_start = TRUE;
- if (!gtkut_widget_get_visible(GTK_WIDGET(mainwin->window)))
+ if (!gtk_widget_get_visible(GTK_WIDGET(mainwin->window)))
main_window_show(mainwin);
if (prefs_common.mainwin_maximised)
MessageView *msgview = mainwin->messageview;
if (messageview_is_visible(msgview) &&
- (gtkut_widget_has_focus(msgview->mimeview->textview->text)))
+ (gtk_widget_has_focus(msgview->mimeview->textview->text)))
messageview_select_all(mainwin->messageview);
else
summary_select_all(mainwin->summaryview);
gchar *titles[N_MIMEVIEW_COLS];
gint i;
- CLAWS_TIP_DECL();
if (!hand_cursor)
hand_cursor = gdk_cursor_new(GDK_HAND2);
if (!partinfo) return;
/* ungrab the mouse event */
- if (gtkut_widget_has_grab(GTK_WIDGET(ctree))) {
+ if (gtk_widget_has_grab(GTK_WIDGET(ctree))) {
gtk_grab_remove(GTK_WIDGET(ctree));
if (gdk_pointer_is_grabbed())
gdk_pointer_ungrab(GDK_CURRENT_TIME);
content_type = procmime_get_content_type_str(mimeinfo->type,
mimeinfo->subtype);
-#if GTK_CHECK_VERSION(2,12,0)
tip = g_strconcat("<b>", _("Type:"), " </b>", content_type,
"\n<b>", _("Size:"), " </b>",
to_human_readable((goffset)mimeinfo->length), NULL);
-#else
- tip = g_strconcat(_("Type:"), " ", content_type,
- "\n", _("Size:"), " ",
- to_human_readable((goffset)mimeinfo->length), NULL);
-#endif
g_free(content_type);
if (desc && *desc) {
gchar *tmp = NULL;
} else {
tmp = g_strdup(desc);
}
-#if GTK_CHECK_VERSION(2,12,0)
tiptmp = g_strconcat(tip, "\n<b>",
prefs_common.attach_desc && mimeinfo->description ?
_("Description:") : _("Filename:"),
" </b>", tmp, NULL);
-#else
- tiptmp = g_strconcat(tip, "\n",
- prefs_common.attach_desc && mimeinfo->description ?
- _("Description:") : _("Filename:"),
- " ", tmp, NULL);
-#endif
g_free(tip);
tip = tiptmp;
g_free(tmp);
}
g_free(sigshort);
-#if GTK_CHECK_VERSION(2,12,0)
gtk_widget_set_tooltip_markup(button, tip);
-#else
- CLAWS_SET_TIP(button, tip);
-#endif
g_free(tip);
gtk_widget_show_all(button);
gtk_drag_source_set(button, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK,
GtkWidget *widget;
GtkWidget *widget2;
GtkWidget *evtbox;
- CLAWS_TIP_DECL();
debug_print("Creating notice view...\n");
noticeview = g_new0(NoticeView, 1);
GtkWidget *whitelist_ab_folder_combo;
GtkWidget *whitelist_ab_select_btn;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
GtkWidget *whitelist_ab_folder_combo;
GtkWidget *whitelist_ab_select_btn;
GtkWidget *hbox_whitelist, *spacer;
- CLAWS_TIP_DECL();
vbox = gtk_vbox_new(FALSE, 3);
gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
GtkWidget *spinbtn_store_passphrase;
GtkWidget *label_expire2;
GtkWidget *frame_passphrase;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
GtkListStore *store;
GtkCellRenderer *renderer;
GtkTreeIter iter;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
*close_allowed = FALSE;
focused_widget = gtk_window_get_focus(GTK_WINDOW(mainwin->window));
- if (gtkut_widget_get_visible(GTK_WIDGET(mainwin->window)))
+ if (gtk_widget_get_visible(GTK_WIDGET(mainwin->window)))
main_window_hide(mainwin);
}
}
MainWindow *mainwin = mainwindow_get_mainwindow();
if (trayicon_prefs.hide_when_iconified
- && gtkut_widget_get_visible(GTK_WIDGET(mainwin->window))
+ && gtk_widget_get_visible(GTK_WIDGET(mainwin->window))
&& !gtk_window_get_skip_taskbar_hint(GTK_WINDOW(mainwin->window))) {
focused_widget = gtk_window_get_focus(GTK_WINDOW(mainwin->window));
gtk_window_set_skip_taskbar_hint(GTK_WINDOW(mainwin->window), TRUE);
switch (event->button) {
case 1:
- if (gtkut_widget_get_visible(GTK_WIDGET(mainwin->window))) {
+ if (gtk_widget_get_visible(GTK_WIDGET(mainwin->window))) {
if ((gdk_window_get_state(gtk_widget_get_window(
GTK_WIDGET(mainwin->window)))&GDK_WINDOW_STATE_ICONIFIED)
|| mainwindow_is_obscured()) {
{
GtkActionGroup *action_group;
trayicon = gtk_status_icon_new();
-#if GTK_CHECK_VERSION(2,18,0)
gtk_status_icon_set_title(GTK_STATUS_ICON(trayicon), _("Claws Mail"));
-#endif
g_signal_connect(G_OBJECT(trayicon), "button-press-event",
G_CALLBACK(click_cb), NULL);
if (trayicon_prefs.hide_at_startup && claws_is_starting()) {
MainWindow *mainwin = mainwindow_get_mainwindow();
- if (gtkut_widget_get_visible(GTK_WIDGET(mainwin->window)))
+ if (gtk_widget_get_visible(GTK_WIDGET(mainwin->window)))
main_window_hide(mainwin);
main_set_show_at_startup(FALSE);
}
GtkWidget *hide_at_startup_checkbox;
GtkWidget *close_to_tray_checkbox;
GtkWidget *hide_when_iconified_checkbox;
- CLAWS_TIP_DECL();
vbox = gtk_vbox_new(FALSE, 3);
gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
GtkWidget *maxarticle_label;
GtkWidget *maxarticle_spinbtn;
GtkAdjustment *maxarticle_spinbtn_adj;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
GtkWidget *hbox;
GtkWidget *hbox_spc;
GtkWidget *label;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
GtkWidget *trash_folder_checkbtn;
GtkWidget *trash_folder_entry;
GtkWidget *imap_use_trash_checkbtn;
-
- CLAWS_TIP_DECL();
GtkSizeGroup *size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
#define PACK_HBOX(hbox) \
{ \
{
gboolean auth;
- if (!gtkut_widget_get_sensitive (GTK_WIDGET (button)))
+ if (!gtk_widget_get_sensitive (GTK_WIDGET (button)))
return;
auth = gtk_toggle_button_get_active (button);
gtk_widget_set_sensitive(basic_page.uid_label, auth);
GtkWidget *up_btn;
GtkWidget *down_btn;
static GdkGeometry geometry;
- CLAWS_TIP_DECL();
debug_print("Creating actions configuration window...\n");
GtkWidget *exteditor_entry;
GtkWidget *astextviewer_label;
GtkWidget *astextviewer_entry;
- CLAWS_TIP_DECL();
int i = 0;
gchar *tmp;
GtkWidget *bottom_btn;
GtkWidget *table;
static GdkGeometry geometry;
- CLAWS_TIP_DECL();
debug_print("Creating filtering configuration window...\n");
GtkWidget *enable_processing_when_opening_rec_checkbtn;
GtkWidget *newmailcheck_rec_checkbtn;
GtkWidget *offlinesync_rec_checkbtn;
- CLAWS_TIP_DECL();
page->item = item;
GtkWidget *resize_img;
GtkWidget *inline_img;
GtkWidget *print_imgs;
- CLAWS_TIP_DECL();
table = gtk_table_new(4, 1, FALSE);
gtk_widget_show(table);
GtkWidget *checkbtn_log_error;
GtkWidget *checkbtn_log_status;
GtkSizeGroup *log_size_group;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gint c;
gchar *tooltip_btn_text = NULL;
gchar *tooltip_entry_text = NULL;
- CLAWS_TIP_DECL();
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
GtkWidget *flush_metadata_safer_radiobtn;
gchar *shred_binary = NULL;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
GtkWidget *checkbtn_confirm_send_queued_messages;
GtkWidget *checkbtn_never_send_retrcpt;
GtkWidget *table;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
GtkWidget *misspelled_hbox;
GtkWidget *misspelled_colorbtn;
- CLAWS_TIP_DECL();
-
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
GtkWidget *button_edit_actions;
GtkWidget *radio_mark_as_read_on_select;
GtkWidget *radio_mark_as_read_on_new_win;
- CLAWS_TIP_DECL();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
GtkWidget *ok_btn;
static GdkGeometry geometry;
gint i;
- CLAWS_TIP_DECL();
debug_print("Creating templates configuration window...\n");
read_from_file = FALSE;
-#if GTK_CHECK_VERSION(2,14,0)
/* try reading the page setup from file */
page_setup_filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
PRINTING_PAGE_SETUP_STORAGE_FILE, NULL);
} else {
debug_print("Printing: Could not read page setup from key file\n");
}
-#else
- key_file_read = FALSE;
- keyfile = NULL;
- page_setup_filename = NULL;
-#endif
/* if reading from file did not work, or has not been tried (GTK+ < 2.14), use prefs */
if (!read_from_file) {
/* Config for printing */
gtk_print_operation_set_print_settings(op, settings);
gtk_print_operation_set_default_page_setup(op, page_setup);
-#if GTK_CHECK_VERSION(2, 18, 0)
/* enable Page Size and Orientation in the print dialog */
gtk_print_operation_set_embed_page_setup(op, TRUE);
-#endif
/* signals */
g_signal_connect(op, "begin_print", G_CALLBACK(renderer->cb_begin_print), print_data);
prefs_common.print_margin_right = (int) (100*gtk_page_setup_get_right_margin(page_setup,
PAGE_MARGIN_STORAGE_UNIT));
-#if GTK_CHECK_VERSION(2,14,0)
/* save to file */
keyfile = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
PRINTING_PAGE_SETUP_STORAGE_FILE, NULL);
debug_print("Printing: Could not store page setup in file `%s'\n", keyfile);
}
g_free(keyfile);
-#endif
}
static gboolean cb_preview(GtkPrintOperation *operation,
static GdkGeometry geometry;
GtkWidget *dialog = NULL;
GtkWidget *statusbar = gtk_hbox_new(2, FALSE);
- CLAWS_TIP_DECL();
debug_print("Creating internal print preview\n");
gtk_container_set_border_width (GTK_CONTAINER (vbox_format), 8);
if (override_from_format) {
- CLAWS_TIP_DECL();
-
hbox2_format = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox2_format);
gtk_box_pack_start (GTK_BOX (vbox_format), hbox2_format, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
if (override_from_format) {
- CLAWS_TIP_DECL();
-
hbox3 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox3);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
if (override_from_format) {
- CLAWS_TIP_DECL();
-
hbox3 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox3);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
(dialog->dialog, (total_len == 0) ? 0 : (gfloat)cur_len / (gfloat)total_len);
if (mainwin) {
- if (!gtkut_widget_get_visible(mainwin->progressbar))
+ if (!gtk_widget_get_visible(mainwin->progressbar))
gtk_widget_show(mainwin->progressbar);
gtk_progress_bar_set_fraction
(GTK_PROGRESS_BAR(mainwin->progressbar),
FALSE);
#endif
gtk_container_set_border_width(GTK_CONTAINER(statusbar), 1);
-#if GTK_CHECK_VERSION (2, 19, 1)
child = gtk_statusbar_get_message_area(GTK_STATUSBAR(statusbar));
-#else
- child = GTK_STATUSBAR(statusbar)->label;
-#endif
parent = gtk_widget_get_parent(child);
gtk_container_remove(GTK_CONTAINER(parent), g_object_ref(child));
hbox = gtk_hbox_new(FALSE, 0);
gtk_progress_bar_set_text(progressbar, buf);
gtk_progress_bar_set_fraction(progressbar,
(total == 0) ? 0 : (gfloat)done / (gfloat)total);
- if (!gtkut_widget_get_visible(GTK_WIDGET(progressbar)))
+ if (!gtk_widget_get_visible(GTK_WIDGET(progressbar)))
gtk_widget_show(GTK_WIDGET(progressbar));
} else if (total == 0) {
gtk_progress_bar_set_text(progressbar, "");
GtkWidget *close_btn;
GtkWidget *stop_btn;
gboolean is_searching = FALSE;
- CLAWS_TIP_DECL();
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "summary_search");
gtk_window_set_title(GTK_WINDOW (window), _("Search messages"));
GtkWidget *toggle_arrow;
GtkWidget *toggle_search;
QuickSearch *quicksearch;
- CLAWS_TIP_DECL();
debug_print("Creating summary view...\n");
summaryview = g_new0(SummaryView, 1);
goffset sel_size = 0, n_size = 0;
MsgInfo *msginfo;
gchar *name;
-#if GTK_CHECK_VERSION(2, 12, 0)
gchar *tooltip;
-#endif
if (!summaryview->folder_item) {
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), "");
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
-#if GTK_CHECK_VERSION(2, 12, 0)
tooltip = g_strdup_printf(_("<b>Message summary</b>\n"
"<b>New:</b> %d\n"
"<b>Unread:</b> %d\n"
gtk_widget_set_tooltip_markup(GTK_WIDGET(summaryview->statlabel_msgs),
tooltip);
g_free(tooltip);
-#endif
} else {
gchar *ssize, *tsize;
if (n_selected) {
gchar *from_text = NULL, *to_text = NULL, *tags_text = NULL;
gboolean should_swap = FALSE;
gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-#if GTK_CHECK_VERSION(2,12,0)
static const gchar *color_dim_rgb = NULL;
if (!color_dim_rgb)
color_dim_rgb = gdk_color_to_string(&summaryview->color_dim);
-#else
- static const gchar *color_dim_rgb = "#888888";
-#endif
text[col_pos[S_COL_FROM]] = "";
text[col_pos[S_COL_TO]] = "";
text[col_pos[S_COL_SUBJECT]]= "";
return TRUE;
}
-#if GTK_CHECK_VERSION(2,12,0) && !GENERIC_UMPC
+#if !GENERIC_UMPC
static gchar *summaryview_get_tooltip_text(SummaryView *summaryview, MsgInfo *info, gint column)
{
MsgFlags flags;
G_CALLBACK(summary_drag_motion_cb),
summaryview);
-#if GTK_CHECK_VERSION(2,12,0) && !GENERIC_UMPC
+#if !GENERIC_UMPC
g_object_set (G_OBJECT(ctree), "has-tooltip", TRUE, NULL);
g_signal_connect(G_OBJECT(ctree), "query-tooltip",
G_CALLBACK(tooltip_cb),
gchar *uri, *mount_path;
#endif
GtkWidget *hbox;
- CLAWS_TIP_DECL();
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
GtkWidget *smtp_cert_table;
#endif
gchar *text;
- CLAWS_TIP_DECL();
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
GtkTreeIter iter;
gchar *text;
gint index = 0;
- CLAWS_TIP_DECL();
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
projects / claws.git / commitdiff