Documentation: Use G_SOURCE_CONTINUE and G_SOURCE_REMOVE

[geeqie.git] / src / ui-tree-edit.cc

diff --git a/src/ui-tree-edit.cc b/src/ui-tree-edit.cc
index 11384ec..2895ebf 100644 (file)
--- a/src/ui-tree-edit.cc
+++ b/src/ui-tree-edit.cc
@@ -63,7 +63,7 @@ static void tree_edit_do(TreeEditData *ted)
 
 static gboolean tree_edit_click_end_cb(GtkWidget *UNUSED(widget), GdkEventButton *UNUSED(event), gpointer data)
 {
-       TreeEditData *ted = data;
+       TreeEditData *ted = static_cast<TreeEditData *>(data);
 
        tree_edit_do(ted);
        tree_edit_close(ted);
@@ -73,7 +73,7 @@ static gboolean tree_edit_click_end_cb(GtkWidget *UNUSED(widget), GdkEventButton
 
 static gboolean tree_edit_click_cb(GtkWidget *UNUSED(widget), GdkEventButton *event, gpointer data)
 {
-       TreeEditData *ted = data;
+       TreeEditData *ted = static_cast<TreeEditData *>(data);
        GdkWindow *window = gtk_widget_get_window(ted->window);
 
        gint x, y;
@@ -100,7 +100,7 @@ static gboolean tree_edit_click_cb(GtkWidget *UNUSED(widget), GdkEventButton *ev
 
 static gboolean tree_edit_key_press_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
 {
-       TreeEditData *ted = data;
+       TreeEditData *ted = static_cast<TreeEditData *>(data);
 
        switch (event->keyval)
                {
@@ -130,7 +130,7 @@ static gboolean tree_edit_key_press_cb(GtkWidget *UNUSED(widget), GdkEventKey *e
 
 static gboolean tree_edit_by_path_idle_cb(gpointer data)
 {
-       TreeEditData *ted = data;
+       TreeEditData *ted = static_cast<TreeEditData *>(data);
        GdkRectangle rect;
        gint x, y, w, h;        /* geometry of cell within tree */
        gint wx, wy;            /* geometry of tree from root window */
@@ -169,11 +169,11 @@ static gboolean tree_edit_by_path_idle_cb(gpointer data)
        gtk_widget_grab_focus(ted->entry);
        gtk_grab_add(ted->window);
        gdk_pointer_grab(gtk_widget_get_window(ted->window), TRUE,
-                        GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK,
+                        static_cast<GdkEventMask>(GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK),
                         NULL, NULL, GDK_CURRENT_TIME);
        gdk_keyboard_grab(gtk_widget_get_window(ted->window), TRUE, GDK_CURRENT_TIME);
 
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 gboolean tree_edit_by_path(GtkTreeView *tree, GtkTreePath *tpath, gint column, const gchar *text,
@@ -195,7 +195,7 @@ gboolean tree_edit_by_path(GtkTreeView *tree, GtkTreePath *tpath, gint column, c
        work = list;
        while (work && !cell)
                {
-               cell = work->data;
+               cell = static_cast<GtkCellRenderer *>(work->data);
                if (!GTK_IS_CELL_RENDERER_TEXT(cell))
                        {
                        cell = NULL;
@@ -293,7 +293,7 @@ gboolean tree_view_get_cell_origin(GtkTreeView *widget, GtkTreePath *tpath, gint
                work = renderers;
                while (work && !cell)
                        {
-                       cell = work->data;
+                       cell = static_cast<GtkCellRenderer *>(work->data);
                        work = work->next;
                        if (!GTK_IS_CELL_RENDERER_TEXT(cell)) cell = NULL;
                        }
@@ -545,7 +545,7 @@ void widget_auto_scroll_stop(GtkWidget *widget)
 {
        AutoScrollData *sd;
 
-       sd = g_object_get_data(G_OBJECT(widget), "autoscroll");
+       sd = static_cast<AutoScrollData *>(g_object_get_data(G_OBJECT(widget), "autoscroll"));
        if (!sd) return;
        g_object_set_data(G_OBJECT(widget), "autoscroll", NULL);
 
@@ -555,7 +555,7 @@ void widget_auto_scroll_stop(GtkWidget *widget)
 
 static gboolean widget_auto_scroll_cb(gpointer data)
 {
-       AutoScrollData *sd = data;
+       AutoScrollData *sd = static_cast<AutoScrollData *>(data);
        GdkWindow *window;
        gint x, y;
        gint w, h;