Trim trailing white spaces on empty lines.

[geeqie.git] / src / ui_misc.c

diff --git a/src/ui_misc.c b/src/ui_misc.c
index 22f5fd3..461e1ee 100644 (file)
--- a/src/ui_misc.c
+++ b/src/ui_misc.c
@@ -543,24 +543,11 @@ GtkWidget *pref_spin_new_int(GtkWidget *parent_box, const gchar *text, const gch
                             G_CALLBACK(pref_spin_int_cb), value_var);
 }
 
-#if 0
-void pref_spin_set_blocking(GtkWidget *spin, gdouble value, gpointer block_data)
-{
-       g_signal_handlers_block_matched(G_OBJECT(spin), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, block_data);
-       gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), value);
-       g_signal_handlers_unblock_matched(G_OBJECT(spin), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, block_data);
-}
-#endif
-
 static void pref_link_sensitivity_cb(GtkWidget *watch, GtkStateType prev_state, gpointer data)
 {
        GtkWidget *widget = data;
 
-#if GTK_CHECK_VERSION(2,20,0)
        gtk_widget_set_sensitive(widget, gtk_widget_is_sensitive(watch));
-#else
-       gtk_widget_set_sensitive(widget, GTK_WIDGET_IS_SENSITIVE(watch));
-#endif
 }
 
 void pref_link_sensitivity(GtkWidget *widget, GtkWidget *watch)
@@ -662,25 +649,6 @@ GtkWidget *pref_table_button(GtkWidget *table, gint column, gint row,
        return button;
 }
 
-#if 0
-static GtkWidget *pref_table_checkbox(GtkWidget *table, gint column, gint row,
-                                     const gchar *text, gint active,
-                                     GCallback func, gpointer data)
-{
-       GtkWidget *button;
-
-       button = gtk_check_button_new_with_label(text);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
-       if (func) g_signal_connect(G_OBJECT(button), "clicked", func, data);
-
-       gtk_table_attach(GTK_TABLE(table), button, column, column + 1, row, row + 1,
-                        GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-       gtk_widget_show(button);
-
-       return button;
-}
-#endif
-
 GtkWidget *pref_table_spin(GtkWidget *table, gint column, gint row,
                           const gchar *text, const gchar *suffix,
                           gdouble min, gdouble max, gdouble step, gint digits,
@@ -741,24 +709,10 @@ GtkWidget *pref_table_spin_new_int(GtkWidget *table, gint column, gint row,
 }
 
 
-#if ! GTK_CHECK_VERSION(2,12,0)
-
-static void pref_toolbar_destroy_cb(GtkWidget *widget, gpointer data)
-{
-       GtkTooltips *tips = data;
-
-       g_object_unref(G_OBJECT(tips));
-}
-
-#endif
-
 GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style)
 {
        GtkWidget *tbar;
-#if ! GTK_CHECK_VERSION(2,12,0)
-       GtkTooltips *tips;
-#endif
-       
+
        tbar = gtk_toolbar_new();
        gtk_toolbar_set_style(GTK_TOOLBAR(tbar), style);
 
@@ -767,27 +721,6 @@ GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style)
                gtk_box_pack_start(GTK_BOX(parent_box), tbar, FALSE, FALSE, 0);
                gtk_widget_show(tbar);
                }
-
-#if ! GTK_CHECK_VERSION(2,12,0)
-       tips = gtk_tooltips_new();
-
-       /* take ownership of tooltips */
-#  ifdef GTK_OBJECT_FLOATING
-       /* GTK+ < 2.10 */
-       g_object_ref(G_OBJECT(tips));
-       gtk_object_sink(GTK_OBJECT(tips));
-#  else
-       /* GTK+ >= 2.10 */
-       g_object_ref_sink(G_OBJECT(tips));
-#  endif
-
-       g_object_set_data(G_OBJECT(tbar), "tooltips", tips);
-       g_signal_connect(G_OBJECT(tbar), "destroy",
-                        G_CALLBACK(pref_toolbar_destroy_cb), tips);
-
-       gtk_tooltips_enable(tips);
-#endif
-
        return tbar;
 }
 
@@ -830,18 +763,8 @@ GtkWidget *pref_toolbar_button(GtkWidget *toolbar,
 
        if (description)
                {
-
-#if GTK_CHECK_VERSION(2,12,0)
-
                gtk_widget_set_tooltip_text(item, description);
-                       
-#else
-               GtkTooltips *tips;
-
-               tips = g_object_get_data(G_OBJECT(toolbar), "tooltips");
-               gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(item), tips, description, NULL);
-#endif
-       }
+               }
 
        return item;
 }
@@ -899,11 +822,7 @@ static void date_selection_popup_hide(DateSelection *ds)
 {
        if (!ds->window) return;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gtk_widget_has_grab(ds->window))
-#else
-       if (GTK_WIDGET_HAS_GRAB(ds->window))
-#endif
                {
                gtk_grab_remove(ds->window);
                gdk_keyboard_ungrab(GDK_CURRENT_TIME);
@@ -967,14 +886,14 @@ static gboolean date_selection_popup_keypress_cb(GtkWidget *widget, GdkEventKey
 
        switch (event->keyval)
                {
-               case GDK_Return:
-               case GDK_KP_Enter:
-               case GDK_Tab:
-               case GDK_ISO_Left_Tab:
+               case GDK_KEY_Return:
+               case GDK_KEY_KP_Enter:
+               case GDK_KEY_Tab:
+               case GDK_KEY_ISO_Left_Tab:
                        date_selection_popup_sync(ds);
                        date_selection_popup_hide(ds);
                        break;
-               case GDK_Escape:
+               case GDK_KEY_Escape:
                        date_selection_popup_hide(ds);
                        break;
                default:
@@ -1034,7 +953,7 @@ static void date_selection_popup(DateSelection *ds)
 
        gtk_widget_get_allocation(ds->button, &button_allocation);
        gtk_widget_get_allocation(ds->window, &window_allocation);
-       
+
        x = wx + button_allocation.x + button_allocation.width - window_allocation.width;
        y = wy + button_allocation.y + button_allocation.height;
 
@@ -1338,11 +1257,7 @@ static gboolean sizer_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpoi
 
        if (bevent->button != MOUSE_BUTTON_LEFT) return FALSE;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gdk_pointer_is_grabbed() && gtk_widget_has_grab(sd->sizer))
-#else
-       if (gdk_pointer_is_grabbed() && GTK_WIDGET_HAS_GRAB(sd->sizer))
-#endif
                {
                gtk_grab_remove(sd->sizer);
                gdk_pointer_ungrab(bevent->time);
@@ -1381,12 +1296,24 @@ static gboolean sizer_leave_cb(GtkWidget *widget, GdkEventCrossing *event, gpoin
 
 static gboolean sizer_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
+#if GTK_CHECK_VERSION(3,0,0)
+       GtkAllocation allocation;
+
+       gtk_widget_get_allocation(widget, &allocation);
+
+       cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget));
+
+       gtk_render_handle (gtk_widget_get_style_context (widget),
+                          cr, allocation.x, allocation.y, allocation.width, allocation.height);
+       cairo_destroy(cr);
+#else
        SizerData *sd = data;
        GdkRectangle clip;
        GtkOrientation orientation;
        GtkStateType state;
        GtkAllocation allocation;
 
+       gtk_widget_get_allocation(widget, &allocation);
 
        if (sd->position & SIZER_POS_LEFT || sd->position & SIZER_POS_RIGHT)
                {
@@ -1406,14 +1333,6 @@ static gboolean sizer_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpoint
                state = gtk_widget_get_state(widget);
                }
 
-       gtk_widget_get_allocation(widget, &allocation);
-#if GTK_CHECK_VERSION(3,0,0)
-       cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget));
-
-       gtk_render_handle (gtk_widget_get_style_context (widget),
-                          cr, allocation.x, allocation.y, allocation.width, allocation.height);    
-       cairo_destroy(cr);
-#else
        gdk_region_get_clipbox(event->region, &clip);
 
        gtk_paint_handle(gtk_widget_get_style(widget), gtk_widget_get_window(widget), state,