{GDK_CONTROL_MASK, 'R', N_("Rename")},
{GDK_CONTROL_MASK, 'D', N_("Move to Trash")},
{GDK_CONTROL_MASK, 'W', N_("Close window")},
- {0, GDK_KEY_Delete, N_("Remove")},
- {0, GDK_KEY_Return, N_("View")},
- {0, 'V', N_("View in new window")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Delete, N_("Remove")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Return, N_("View")},
+ {static_cast<GdkModifierType>(0), 'V', N_("View in new window")},
{GDK_CONTROL_MASK, 'A', N_("Select all")},
- {GDK_CONTROL_MASK + GDK_SHIFT_MASK, 'A', N_("Select none")},
+ {static_cast<GdkModifierType>(GDK_CONTROL_MASK + GDK_SHIFT_MASK), 'A', N_("Select none")},
{GDK_MOD1_MASK, 'R', N_("Rectangular selection")},
- {0, GDK_KEY_space, N_("Select single file")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_space, N_("Select single file")},
{GDK_CONTROL_MASK, GDK_KEY_space, N_("Toggle select image")},
{GDK_CONTROL_MASK, 'L', N_("Append from file selection")},
- {0, 'A', N_("Append from collection")},
- {0, 'S', N_("Save collection")},
+ {static_cast<GdkModifierType>(0), 'A', N_("Append from collection")},
+ {static_cast<GdkModifierType>(0), 'S', N_("Save collection")},
{GDK_CONTROL_MASK, 'S', N_("Save collection as")},
{GDK_CONTROL_MASK, 'T', N_("Show filename text")},
- {0, 'N', N_("Sort by name")},
- {0, 'D', N_("Sort by date")},
- {0, 'B', N_("Sort by size")},
- {0, 'P', N_("Sort by path")},
+ {static_cast<GdkModifierType>(0), 'N', N_("Sort by name")},
+ {static_cast<GdkModifierType>(0), 'D', N_("Sort by date")},
+ {static_cast<GdkModifierType>(0), 'B', N_("Sort by size")},
+ {static_cast<GdkModifierType>(0), 'P', N_("Sort by path")},
{GDK_SHIFT_MASK, 'P', N_("Print")},
- {0, 0, NULL}
+ {static_cast<GdkModifierType>(0), 0, NULL}
};
/*
if (iter) *iter = p;
- return g_list_nth_data(list, col);
+ return static_cast<CollectInfo *>(g_list_nth_data(list, col));
}
return NULL;
n = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), "column_number"));
if (iter) *iter = row;
- return g_list_nth_data(list, n);
+ return static_cast<CollectInfo *>(g_list_nth_data(list, n));
}
static guint collection_table_list_count(CollectTable *ct, gint64 *bytes)
static void collection_table_update_extras(CollectTable *ct, gboolean loading, gdouble value)
{
- gchar *text;
+ const gchar *text;
if (!ct->extra_label) return;
{
if (!info) return;
- collection_table_selection_set(ct, info, info->flag_mask | mask, iter);
+ collection_table_selection_set(ct, info, static_cast<SelectionType>(info->flag_mask | mask), iter);
}
static void collection_table_selection_remove(CollectTable *ct, CollectInfo *info, SelectionType mask, GtkTreeIter *iter)
{
if (!info) return;
- collection_table_selection_set(ct, info, info->flag_mask & ~mask, iter);
+ collection_table_selection_set(ct, info, static_cast<SelectionType>(info->flag_mask & ~mask), iter);
}
/*
*-------------------------------------------------------------------
while (work)
{
ct->selection = g_list_append(ct->selection, work->data);
- collection_table_selection_add(ct, work->data, SELECTION_SELECTED, NULL);
+ collection_table_selection_add(ct, static_cast<CollectInfo *>(work->data), SELECTION_SELECTED, NULL);
work = work->next;
}
work = ct->selection;
while (work)
{
- collection_table_selection_remove(ct, work->data, SELECTION_SELECTED, NULL);
+ collection_table_selection_remove(ct, static_cast<CollectInfo *>(work->data), SELECTION_SELECTED, NULL);
work = work->next;
}
work = g_list_find(ct->cd->list, start);
while (work)
{
- info = work->data;
+ info = static_cast<CollectInfo *>(work->data);
collection_table_select_util(ct, info, select);
if (work->data != end)
return;
}
- label = g_object_get_data(G_OBJECT(ct->tip_window), "tip_label");
+ label = static_cast<GtkWidget *>(g_object_get_data(G_OBJECT(ct->tip_window), "tip_label"));
gtk_label_set_text(GTK_LABEL(label), ct->show_text ? ct->tip_info->fd->path : ct->tip_info->fd->name);
}
}
static void collection_table_popup_edit_cb(GtkWidget *widget, gpointer data)
{
CollectTable *ct;
- const gchar *key = data;
+ const gchar *key = static_cast<const gchar *>(data);
- ct = submenu_item_get_data(widget);
+ ct = static_cast<CollectTable *>(submenu_item_get_data(widget));
if (!ct) return;
CollectTable *ct;
SortType type;
- ct = submenu_item_get_data(widget);
+ ct = static_cast<CollectTable *>(submenu_item_get_data(widget));
if (!ct) return;
{
CollectTable *ct;
- ct = submenu_item_get_data(widget);
+ ct = static_cast<CollectTable *>(submenu_item_get_data(widget));
if (!ct) return;
list = collection_table_selection_get_list(ct);
if (list)
{
- fd = list->data;
+ fd = static_cast<FileData *>(list->data);
if (fd)
{
layout_set_fd(lw, fd);
G_CALLBACK(collection_table_popup_delete_cb), ct);
menu_item_add_divider(menu);
- submenu = submenu_add_sort(NULL, G_CALLBACK(collection_table_popup_sort_cb), ct, FALSE, TRUE, FALSE, 0);
+ submenu = submenu_add_sort(NULL, G_CALLBACK(collection_table_popup_sort_cb), ct, FALSE, TRUE, FALSE, SORT_NONE);
menu_item_add_divider(submenu);
menu_item_add(submenu, _("Randomize"),
G_CALLBACK(collection_table_popup_randomize_cb), ct);
gtk_tree_model_get(store, &iter, CTABLE_COLUMN_POINTER, &list, -1);
n = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), "column_number"));
- info = g_list_nth_data(list, n);
+ info = static_cast<CollectInfo *>(g_list_nth_data(list, n));
if (info)
{
{
gint col;
- info = work->data;
+ info = static_cast<CollectInfo *>(work->data);
*after = TRUE;
if (collection_table_find_iter(ct, info, &iter, &col))
work = g_list_find(ct->cd->list, info);
if (work && work->next)
{
- info = work->next->data;
+ info = static_cast<CollectInfo *>(work->next->data);
}
else
{
GdkSeat *seat;
GdkDevice *device;
- if (!ct->drop_idle_id) return FALSE;
+ if (!ct->drop_idle_id) return G_SOURCE_REMOVE;
window = gtk_widget_get_window(ct->listview);
seat = gdk_display_get_default_seat(gdk_window_get_display(window));
}
ct->drop_idle_id = 0;
- return FALSE;
+ return G_SOURCE_REMOVE;
}
static gboolean collection_table_auto_scroll_notify_cb(GtkWidget *UNUSED(widget), gint UNUSED(x), gint UNUSED(y), gpointer data)
gtk_tree_view_column_set_fixed_width(column, thumb_width + (THUMB_BORDER_PADDING * 6));
list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
- cell = (list) ? list->data : NULL;
+ cell = static_cast<GtkCellRenderer *>((list) ? list->data : NULL);
g_list_free(list);
if (cell && GQV_IS_CELL_RENDERER_ICON(cell))
CollectInfo *info;
if (work)
{
- info = work->data;
+ info = static_cast<CollectInfo *>(work->data);
work = work->next;
c++;
}
{
CollectTable *ct = static_cast<CollectTable *>(data);
- if (!ct->sync_idle_id) return FALSE;
+ if (!ct->sync_idle_id) return G_SOURCE_REMOVE;
g_source_remove(ct->sync_idle_id);
ct->sync_idle_id = 0;
collection_table_sync(ct);
- return FALSE;
+ return G_SOURCE_REMOVE;
}
static void collection_table_sync_idle(CollectTable *ct)
*/
static GtkTargetEntry collection_drag_types[] = {
- { TARGET_APP_COLLECTION_MEMBER_STRING, 0, TARGET_APP_COLLECTION_MEMBER },
- { "text/uri-list", 0, TARGET_URI_LIST },
- { "text/plain", 0, TARGET_TEXT_PLAIN }
+ { const_cast<gchar *>(TARGET_APP_COLLECTION_MEMBER_STRING), 0, TARGET_APP_COLLECTION_MEMBER },
+ { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
+ { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
};
static gint n_collection_drag_types = 3;
static GtkTargetEntry collection_drop_types[] = {
- { TARGET_APP_COLLECTION_MEMBER_STRING, 0, TARGET_APP_COLLECTION_MEMBER },
- { "text/uri-list", 0, TARGET_URI_LIST }
+ { const_cast<gchar *>(TARGET_APP_COLLECTION_MEMBER_STRING), 0, TARGET_APP_COLLECTION_MEMBER },
+ { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST }
};
static gint n_collection_drop_types = 2;
static void collection_table_dnd_init(CollectTable *ct)
{
- gtk_drag_source_set(ct->listview, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+ gtk_drag_source_set(ct->listview, static_cast<GdkModifierType>(GDK_BUTTON1_MASK | GDK_BUTTON2_MASK),
collection_drag_types, n_collection_drag_types,
- GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
+ static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK));
g_signal_connect(G_OBJECT(ct->listview), "drag_data_get",
G_CALLBACK(collection_table_dnd_get), ct);
g_signal_connect(G_OBJECT(ct->listview), "drag_begin",
G_CALLBACK(collection_table_dnd_end), ct);
gtk_drag_dest_set(ct->listview,
- GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP,
+ static_cast<GtkDestDefaults>(GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP),
collection_drop_types, n_collection_drop_types,
- GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK);
+ static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK));
g_signal_connect(G_OBJECT(ct->listview), "drag_motion",
G_CALLBACK(collection_table_dnd_motion), ct);
g_signal_connect(G_OBJECT(ct->listview), "drag_leave",
*/
if (cd->number == COLLECT_TABLE_MAX_COLUMNS) return;
- info = g_list_nth_data(list, cd->number);
+ info = static_cast<CollectInfo *>(g_list_nth_data(list, cd->number));
style = gtk_widget_get_style(ct->listview);
if (info && (info->flag_mask & SELECTION_SELECTED) )
collection_table_dnd_init(ct);
gtk_widget_set_events(ct->listview, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK |
- GDK_BUTTON_PRESS_MASK | GDK_LEAVE_NOTIFY_MASK);
+ static_cast<GdkEventMask>(GDK_BUTTON_PRESS_MASK | GDK_LEAVE_NOTIFY_MASK));
g_signal_connect(G_OBJECT(ct->listview),"button_press_event",
G_CALLBACK(collection_table_press_cb), ct);
g_signal_connect(G_OBJECT(ct->listview),"button_release_event",
projects / geeqie.git / blobdiff