Bug fix: Copy icon not displayed

[geeqie.git] / src / ui-misc.cc

diff --git a/src/ui-misc.cc b/src/ui-misc.cc
index b406919..901364f 100644 (file)
--- a/src/ui-misc.cc
+++ b/src/ui-misc.cc
@@ -119,7 +119,7 @@ GtkWidget *pref_group_parent(GtkWidget *child)
                {
                GtkWidget *group;
 
-               group = g_object_get_data(G_OBJECT(parent), "pref_group");
+               group = static_cast<GtkWidget *>(g_object_get_data(G_OBJECT(parent), "pref_group"));
                if (group && GTK_IS_WIDGET(group)) return group;
 
                parent = gtk_widget_get_parent(parent);
@@ -253,7 +253,11 @@ GtkWidget *pref_button_new(GtkWidget *parent_box, const gchar *stock_id,
 
                button = gtk_button_new();
 
-               if (stock_id) image = gtk_image_new_from_icon_name(stock_id, GTK_ICON_SIZE_BUTTON);
+               if (stock_id)
+                       {
+                       image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_BUTTON);
+                       }
+
                if (text)
                        {
                        label = gtk_label_new_with_mnemonic(text);
@@ -342,7 +346,7 @@ GtkWidget *pref_checkbox_new(GtkWidget *parent_box, const gchar *text, gboolean
 
 static void pref_checkbox_int_cb(GtkWidget *widget, gpointer data)
 {
-       gboolean *result = data;
+       gboolean *result = static_cast<gboolean *>(data);
 
        *result = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 }
@@ -361,7 +365,7 @@ GtkWidget *pref_checkbox_new_int(GtkWidget *parent_box, const gchar *text, gbool
 
 static void pref_checkbox_link_sensitivity_cb(GtkWidget *button, gpointer data)
 {
-       GtkWidget *widget = data;
+       GtkWidget *widget = static_cast<GtkWidget *>(data);
 
        gtk_widget_set_sensitive(widget, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
 }
@@ -374,12 +378,12 @@ void pref_checkbox_link_sensitivity(GtkWidget *button, GtkWidget *widget)
        pref_checkbox_link_sensitivity_cb(button, widget);
 }
 
-static void pref_checkbox_link_sensitivity_swap_cb(GtkWidget *button, gpointer data)
-{
-       GtkWidget *widget = data;
+//static void pref_checkbox_link_sensitivity_swap_cb(GtkWidget *button, gpointer data)
+//{
+       //GtkWidget *widget = static_cast<GtkWidget *>(data);
 
-       gtk_widget_set_sensitive(widget, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
-}
+       //gtk_widget_set_sensitive(widget, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
+//}
 
 //void pref_checkbox_link_sensitivity_swap(GtkWidget *button, GtkWidget *widget)
 //{
@@ -439,15 +443,15 @@ GtkWidget *pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *sibling,
 
 #define PREF_RADIO_VALUE_KEY "pref_radio_value"
 
-static void pref_radiobutton_int_cb(GtkWidget *widget, gpointer data)
-{
-       gboolean *result = data;
+//static void pref_radiobutton_int_cb(GtkWidget *widget, gpointer data)
+//{
+       //gboolean *result = static_cast<gboolean *>(data);
 
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
-               {
-               *result = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), PREF_RADIO_VALUE_KEY));
-               }
-}
+       //if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
+               //{
+               //*result = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), PREF_RADIO_VALUE_KEY));
+               //}
+//}
 
 //GtkWidget *pref_radiobutton_new_int(GtkWidget *parent_box, GtkWidget *sibling,
                                    //const gchar *text, gboolean active,
@@ -531,7 +535,7 @@ GtkWidget *pref_spin_new(GtkWidget *parent_box, const gchar *text, const gchar *
 
 static void pref_spin_int_cb(GtkWidget *widget, gpointer data)
 {
-       gint *var = data;
+       gint *var = static_cast<gint *>(data);
        *var = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
 }
 
@@ -548,7 +552,7 @@ GtkWidget *pref_spin_new_int(GtkWidget *parent_box, const gchar *text, const gch
 
 static void pref_link_sensitivity_cb(GtkWidget *watch, GtkStateType UNUSED(prev_state), gpointer data)
 {
-       GtkWidget *widget = data;
+       GtkWidget *widget = static_cast<GtkWidget *>(data);
 
        gtk_widget_set_sensitive(widget, gtk_widget_is_sensitive(watch));
 }
@@ -614,7 +618,7 @@ GtkWidget *pref_table_box(GtkWidget *table, gint column, gint row,
                }
 
        gtk_table_attach(GTK_TABLE(table), shell, column, column + 1, row, row + 1,
-                        GTK_EXPAND | GTK_FILL, 0, 0, 0);
+                        static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), static_cast<GtkAttachOptions>(0), 0, 0);
 
        gtk_widget_show(shell);
 
@@ -629,7 +633,7 @@ GtkWidget *pref_table_label(GtkWidget *table, gint column, gint row,
 
        align = gtk_alignment_new(alignment, 0.50, 0.0, 0.0);
        gtk_table_attach(GTK_TABLE(table), align, column, column + 1, row, row + 1,
-                        GTK_FILL, 0, 0, 0);
+                        GTK_FILL, static_cast<GtkAttachOptions>(0), 0, 0);
        gtk_widget_show(align);
        label = gtk_label_new(text);
        gtk_container_add(GTK_CONTAINER(align), label);
@@ -646,7 +650,7 @@ GtkWidget *pref_table_button(GtkWidget *table, gint column, gint row,
 
        button = pref_button_new(NULL, stock_id, text, hide_stock_text, func, data);
        gtk_table_attach(GTK_TABLE(table), button, column, column + 1, row, row + 1,
-                        GTK_FILL, 0, 0, 0);
+                        GTK_FILL, static_cast<GtkAttachOptions>(0), 0, 0);
        gtk_widget_show(button);
 
        return button;
@@ -692,7 +696,7 @@ GtkWidget *pref_table_spin(GtkWidget *table, gint column, gint row,
                }
 
        gtk_table_attach(GTK_TABLE(table), box, column, column + 1, row, row + 1,
-                        GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+                        static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), 0, 0);
        gtk_widget_show(box);
 
        return spin;
@@ -843,7 +847,7 @@ static void date_selection_popup_hide(DateSelection *ds)
 
 static gboolean date_selection_popup_release_cb(GtkWidget *UNUSED(widget), GdkEventButton *UNUSED(event), gpointer data)
 {
-       DateSelection *ds = data;
+       DateSelection *ds = static_cast<DateSelection *>(data);
 
        date_selection_popup_hide(ds);
        return TRUE;
@@ -851,7 +855,7 @@ static gboolean date_selection_popup_release_cb(GtkWidget *UNUSED(widget), GdkEv
 
 static gboolean date_selection_popup_press_cb(GtkWidget *UNUSED(widget), GdkEventButton *event, gpointer data)
 {
-       DateSelection *ds = data;
+       DateSelection *ds = static_cast<DateSelection *>(data);
        gint x, y;
        gint w, h;
        gint xr, yr;
@@ -885,7 +889,7 @@ static void date_selection_popup_sync(DateSelection *ds)
 
 static gboolean date_selection_popup_keypress_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
 {
-       DateSelection *ds = data;
+       DateSelection *ds = static_cast<DateSelection *>(data);
 
        switch (event->keyval)
                {
@@ -908,14 +912,14 @@ static gboolean date_selection_popup_keypress_cb(GtkWidget *UNUSED(widget), GdkE
 
 static void date_selection_day_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DateSelection *ds = data;
+       DateSelection *ds = static_cast<DateSelection *>(data);
 
        date_selection_popup_sync(ds);
 }
 
 static void date_selection_doubleclick_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DateSelection *ds = data;
+       DateSelection *ds = static_cast<DateSelection *>(data);
 
        date_selection_popup_hide(ds);
 }
@@ -972,7 +976,7 @@ static void date_selection_popup(DateSelection *ds)
 
        gtk_widget_grab_focus(ds->calendar);
        gdk_pointer_grab(gtk_widget_get_window(ds->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(ds->window), TRUE, GDK_CURRENT_TIME);
        gtk_grab_add(ds->window);
@@ -982,7 +986,7 @@ static void date_selection_popup(DateSelection *ds)
 
 static void date_selection_button_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DateSelection *ds = data;
+       DateSelection *ds = static_cast<DateSelection *>(data);
 
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ds->button)) == (!ds->window))
                {
@@ -992,7 +996,7 @@ static void date_selection_button_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void button_size_allocate_cb(GtkWidget *button, GtkAllocation *allocation, gpointer data)
 {
-       GtkWidget *spin = data;
+       GtkWidget *spin = static_cast<GtkWidget *>(data);
        GtkRequisition spin_requisition;
        gtk_widget_get_requisition(spin, &spin_requisition);
 
@@ -1020,7 +1024,7 @@ static void spin_increase(GtkWidget *spin, gint value)
 
 static void date_selection_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DateSelection *ds = data;
+       DateSelection *ds = static_cast<DateSelection *>(data);
 
        date_selection_popup_hide(ds);
 
@@ -1094,7 +1098,7 @@ void date_selection_set(GtkWidget *widget, gint day, gint month, gint year)
 {
        DateSelection *ds;
 
-       ds = g_object_get_data(G_OBJECT(widget), DATE_SELECION_KEY);
+       ds = static_cast<DateSelection *>(g_object_get_data(G_OBJECT(widget), DATE_SELECION_KEY));
        if (!ds) return;
 
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(ds->spin_d), (gdouble)day);
@@ -1107,7 +1111,7 @@ void date_selection_get(GtkWidget *widget, gint *day, gint *month, gint *year)
 {
        DateSelection *ds;
 
-       ds = g_object_get_data(G_OBJECT(widget), DATE_SELECION_KEY);
+       ds = static_cast<DateSelection *>(g_object_get_data(G_OBJECT(widget), DATE_SELECION_KEY));
        if (!ds) return;
 
        if (day) *day = gtk_spin_button_get_value(GTK_SPIN_BUTTON(ds->spin_d));
@@ -1165,7 +1169,7 @@ static GList *pref_list_find(const gchar *group, const gchar *token)
        work = history_list_get_by_key(group);
        while (work)
                {
-               const gchar *text = work->data;
+               const gchar *text = static_cast<const gchar *>(work->data);
 
                if (strncmp(text, token, l) == 0) return work;
 
@@ -1221,7 +1225,7 @@ static void pref_list_set(const gchar *group, const gchar *key, const gchar *mar
        work = pref_list_find(group, token);
        if (work)
                {
-               gchar *old_path = work->data;
+               gchar *old_path = static_cast<gchar *>(work->data);
 
                if (text)
                        {
@@ -1314,7 +1318,7 @@ gboolean pref_list_int_get(const gchar *group, const gchar *key, gint *result)
 
 void pref_color_button_set_cb(GtkWidget *widget, gpointer data)
 {
-       GdkColor *color = data;
+       GdkColor *color = static_cast<GdkColor *>(data);
 
        gtk_color_button_get_color(GTK_COLOR_BUTTON(widget), color);
 }
@@ -1419,7 +1423,7 @@ gchar *text_widget_text_pull_selected(GtkWidget *text_widget)
 
 gboolean defined_mouse_buttons(GtkWidget *UNUSED(widget), GdkEventButton *event, gpointer data)
 {
-       LayoutWindow *lw = data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        GtkAction *action;
        gboolean ret = FALSE;