Bug fix: Copy icon not displayed
[geeqie.git] / src / ui-misc.cc
index ff913d5..901364f 100644 (file)
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <config.h>
-#include "intl.h"
-
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
 #include "main.h"
 #include "ui-misc.h"
 
@@ -126,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);
@@ -260,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);
@@ -341,15 +338,15 @@ GtkWidget *pref_checkbox_new(GtkWidget *parent_box, const gchar *text, gboolean
        return real_pref_checkbox_new(parent_box, text, FALSE, active, func, data);
 }
 
-GtkWidget *pref_checkbox_new_mnemonic(GtkWidget *parent_box, const gchar *text, gboolean active,
-                                     GCallback func, gpointer data)
-{
-       return real_pref_checkbox_new(parent_box, text, TRUE, active, func, data);
-}
+//GtkWidget *pref_checkbox_new_mnemonic(GtkWidget *parent_box, const gchar *text, gboolean active,
+                                     //GCallback func, gpointer data)
+//{
+       //return real_pref_checkbox_new(parent_box, text, TRUE, active, func, data);
+//}
 
 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));
 }
@@ -368,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)));
 }
@@ -381,20 +378,20 @@ 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)
-{
-       g_signal_connect(G_OBJECT(button), "toggled",
-                        G_CALLBACK(pref_checkbox_link_sensitivity_swap_cb), widget);
+//void pref_checkbox_link_sensitivity_swap(GtkWidget *button, GtkWidget *widget)
+//{
+       //g_signal_connect(G_OBJECT(button), "toggled",
+                        //G_CALLBACK(pref_checkbox_link_sensitivity_swap_cb), widget);
 
-       pref_checkbox_link_sensitivity_swap_cb(button, widget);
-}
+       //pref_checkbox_link_sensitivity_swap_cb(button, widget);
+//}
 
 static GtkWidget *real_pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *sibling,
                                            const gchar *text, gboolean mnemonic_text, gboolean active,
@@ -437,39 +434,39 @@ GtkWidget *pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *sibling,
        return real_pref_radiobutton_new(parent_box, sibling, text, FALSE, active, func, data);
 }
 
-GtkWidget *pref_radiobutton_new_mnemonic(GtkWidget *parent_box, GtkWidget *sibling,
-                                        const gchar *text, gboolean active,
-                                        GCallback func, gpointer data)
-{
-       return real_pref_radiobutton_new(parent_box, sibling, text, TRUE, active, func, data);
-}
+//GtkWidget *pref_radiobutton_new_mnemonic(GtkWidget *parent_box, GtkWidget *sibling,
+                                        //const gchar *text, gboolean active,
+                                        //GCallback func, gpointer data)
+//{
+       //return real_pref_radiobutton_new(parent_box, sibling, text, TRUE, active, func, data);
+//}
 
 #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,
-                                   gboolean *result, gboolean value,
-                                   GCallback UNUSED(func), gpointer UNUSED(data))
-{
-       GtkWidget *button;
+//GtkWidget *pref_radiobutton_new_int(GtkWidget *parent_box, GtkWidget *sibling,
+                                   //const gchar *text, gboolean active,
+                                   //gboolean *result, gboolean value,
+                                   //GCallback UNUSED(func), gpointer UNUSED(data))
+//{
+       //GtkWidget *button;
 
-       button = pref_radiobutton_new(parent_box, sibling, text, active,
-                                     G_CALLBACK(pref_radiobutton_int_cb), result);
-       g_object_set_data(G_OBJECT(button), PREF_RADIO_VALUE_KEY, GINT_TO_POINTER(value));
-       if (active) *result = value;
+       //button = pref_radiobutton_new(parent_box, sibling, text, active,
+                                     //G_CALLBACK(pref_radiobutton_int_cb), result);
+       //g_object_set_data(G_OBJECT(button), PREF_RADIO_VALUE_KEY, GINT_TO_POINTER(value));
+       //if (active) *result = value;
 
-       return button;
-}
+       //return button;
+//}
 
 static GtkWidget *real_pref_spin_new(GtkWidget *parent_box, const gchar *text, const gchar *suffix,
                                     gboolean mnemonic_text,
@@ -527,18 +524,18 @@ GtkWidget *pref_spin_new(GtkWidget *parent_box, const gchar *text, const gchar *
                                  min, max, step, digits, value, func, data);
 }
 
-GtkWidget *pref_spin_new_mnemonic(GtkWidget *parent_box, const gchar *text, const gchar *suffix,
-                                 gdouble min, gdouble max, gdouble step, gint digits,
-                                 gdouble value,
-                                 GCallback func, gpointer data)
-{
-       return real_pref_spin_new(parent_box, text, suffix, TRUE,
-                                 min, max, step, digits, value, func, data);
-}
+//GtkWidget *pref_spin_new_mnemonic(GtkWidget *parent_box, const gchar *text, const gchar *suffix,
+                                 //gdouble min, gdouble max, gdouble step, gint digits,
+                                 //gdouble value,
+                                 //GCallback func, gpointer data)
+//{
+       //return real_pref_spin_new(parent_box, text, suffix, TRUE,
+                                 //min, max, step, digits, value, func, data);
+//}
 
 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));
 }
 
@@ -555,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));
 }
@@ -621,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);
 
@@ -636,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);
@@ -653,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;
@@ -699,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;
@@ -779,28 +776,28 @@ GtkWidget *pref_toolbar_button(GtkWidget *toolbar,
        return item;
 }
 
-void pref_toolbar_button_set_icon(GtkWidget *button, GtkWidget *widget, const gchar *stock_id)
-{
-       if (widget)
-               {
-               gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(button), widget);
-               }
-       else if (stock_id)
-               {
-               gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(button), stock_id);
-               }
-}
+//void pref_toolbar_button_set_icon(GtkWidget *button, GtkWidget *widget, const gchar *stock_id)
+//{
+       //if (widget)
+               //{
+               //gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(button), widget);
+               //}
+       //else if (stock_id)
+               //{
+               //gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(button), stock_id);
+               //}
+//}
 
-GtkWidget *pref_toolbar_spacer(GtkWidget *toolbar)
-{
-       GtkWidget *item;
+//GtkWidget *pref_toolbar_spacer(GtkWidget *toolbar)
+//{
+       //GtkWidget *item;
 
-       item = GTK_WIDGET(gtk_separator_tool_item_new());
-       gtk_container_add(GTK_CONTAINER(toolbar), item);
-       gtk_widget_show(item);
+       //item = GTK_WIDGET(gtk_separator_tool_item_new());
+       //gtk_container_add(GTK_CONTAINER(toolbar), item);
+       //gtk_widget_show(item);
 
-       return item;
-}
+       //return item;
+//}
 
 
 /*
@@ -850,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;
@@ -858,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;
@@ -892,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)
                {
@@ -915,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);
 }
@@ -979,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);
@@ -989,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))
                {
@@ -999,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);
 
@@ -1027,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);
 
@@ -1101,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);
@@ -1114,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));
@@ -1132,325 +1129,25 @@ void date_selection_time_set(GtkWidget *widget, time_t t)
        date_selection_set(widget, lt->tm_mday, lt->tm_mon + 1, lt->tm_year + 1900);
 }
 
-time_t date_selection_time_get(GtkWidget *widget)
-{
-       struct tm lt;
-       gint day = 0;
-       gint month = 0;
-       gint year = 0;
-
-       date_selection_get(widget, &day, &month ,&year);
-
-       lt.tm_sec = 0;
-       lt.tm_min = 0;
-       lt.tm_hour = 0;
-       lt.tm_mday = day;
-       lt.tm_mon = month - 1;
-       lt.tm_year = year - 1900;
-       lt.tm_isdst = 0;
-
-       return mktime(&lt);
-}
+//time_t date_selection_time_get(GtkWidget *widget)
+//{
+       //struct tm lt;
+       //gint day = 0;
+       //gint month = 0;
+       //gint year = 0;
 
+       //date_selection_get(widget, &day, &month ,&year);
 
-/*
- *-----------------------------------------------------------------------------
- * Sizer, without using a GtkPaned
- *-----------------------------------------------------------------------------
- */
-
-#define SIZER_DATA_KEY "sizer_data"
-
-typedef struct _SizerData SizerData;
-struct _SizerData
-{
-       GtkWidget *sizer;
-       GtkWidget *parent;
-       GtkWidget *bounding_widget;
-       SizerPositionType position;
-
-       gint hsize_min;
-       gint hsize_max;
-       gint vsize_min;
-       gint vsize_max;
-
-       gboolean in_drag;
-       gint press_x;
-       gint press_y;
-       gint press_width;
-       gint press_height;
-
-       gboolean handle_prelit;
-};
-
-
-static gint sizer_default_handle_size(void)
-{
-       gint handle_size = 5;
-       GtkWidget *paned;
-       GtkStyle *style;
-
-       paned = gtk_hpaned_new();
-
-       style = gtk_rc_get_style(paned);
-       gtk_widget_set_style(paned, style);
-       gtk_widget_style_get(paned, "handle_size", &handle_size, NULL);
-
-       gtk_widget_destroy(paned);
-
-       return handle_size;
-}
-
-static gboolean sizer_motion_cb(GtkWidget *UNUSED(widget), GdkEventMotion *event, gpointer data)
-{
-       SizerData *sd = data;
-       gint x, y;
-       gint w, h;
-       GtkAllocation parent_allocation;
-
-       if (!sd->in_drag) return FALSE;
-
-       x = sd->press_x - event->x_root;
-       y = sd->press_y - event->y_root;
-
-       w = sd->press_width;
-       h = sd->press_height;
-
-       if (sd->position & SIZER_POS_LEFT)
-               {
-               w += x;
-               }
-       else if (sd->position & SIZER_POS_RIGHT)
-               {
-               w -= x;
-               }
-
-       if (sd->position & SIZER_POS_TOP)
-               {
-               h += y;
-               }
-       else if (sd->position & SIZER_POS_BOTTOM)
-               {
-               h -= y;
-               }
-
-       if (sd->hsize_min >= 0) w = MAX(w, sd->hsize_min);
-       if (sd->vsize_min >= 0) h = MAX(h, sd->vsize_min);
-
-       if (sd->bounding_widget)
-               {
-               GtkAllocation sizer_allocation;
-               GtkAllocation bounding_allocation;
-               gtk_widget_get_allocation(sd->sizer, &sizer_allocation);
-               gtk_widget_get_allocation(sd->bounding_widget, &bounding_allocation);
-               w = CLAMP(w, sizer_allocation.width, bounding_allocation.width);
-               h = CLAMP(h, sizer_allocation.height, bounding_allocation.height);
-               }
-       else
-               {
-               GtkAllocation sizer_allocation;
-               gtk_widget_get_allocation(sd->sizer, &sizer_allocation);
-               if (w < sizer_allocation.width) w = sizer_allocation.width;
-               if (h < sizer_allocation.height) h = sizer_allocation.height;
-               }
-
-       if (sd->hsize_max >= 0) w = MIN(w, sd->hsize_max);
-       if (sd->vsize_max >= 0) h = MIN(h, sd->vsize_max);
-
-       gtk_widget_get_allocation(sd->parent, &parent_allocation);
-       if (w == parent_allocation.width) w = -1;
-       if (h == parent_allocation.height) h = -1;
-
-       if (w > 0 || h > 0) gtk_widget_set_size_request(sd->parent, w, h);
-
-       return TRUE;
-}
-
-static gboolean sizer_press_cb(GtkWidget *UNUSED(widget), GdkEventButton *bevent, gpointer data)
-{
-       SizerData *sd = data;
-       GtkAllocation parent_allocation;
-
-       if (bevent->button != MOUSE_BUTTON_LEFT) return FALSE;
-
-       sd->in_drag = TRUE;
-       sd->press_x = bevent->x_root;
-       sd->press_y = bevent->y_root;
-
-       gtk_widget_get_allocation(sd->parent, &parent_allocation);
-       sd->press_width = parent_allocation.width;
-       sd->press_height = parent_allocation.height;
-
-       gdk_pointer_grab(gtk_widget_get_window(sd->sizer), FALSE,
-                        GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
-                        NULL, NULL, bevent->time);
-       gtk_grab_add(sd->sizer);
-
-       return TRUE;
-}
-
-static gboolean sizer_release_cb(GtkWidget *UNUSED(widget), GdkEventButton *bevent, gpointer data)
-{
-       SizerData *sd = data;
-
-       if (bevent->button != MOUSE_BUTTON_LEFT) return FALSE;
-
-       if (gdk_pointer_is_grabbed() && gtk_widget_has_grab(sd->sizer))
-               {
-               gtk_grab_remove(sd->sizer);
-               gdk_pointer_ungrab(bevent->time);
-               }
-
-       sd->in_drag = FALSE;
-
-       return TRUE;
-}
-
-static void sizer_set_prelight(SizerData *sd, gboolean prelit)
-{
-       GtkAllocation sizer_allocation;
-       gtk_widget_get_allocation(sd->sizer, &sizer_allocation);
-
-       sd->handle_prelit = prelit;
-       gtk_widget_queue_draw_area(sd->sizer, 0, 0,
-                                  sizer_allocation.width, sizer_allocation.height);
-}
-
-static gboolean sizer_enter_cb(GtkWidget *UNUSED(widget), GdkEventCrossing *UNUSED(event), gpointer data)
-{
-       SizerData *sd = data;
-
-       sizer_set_prelight(sd, TRUE);
-       return TRUE;
-}
-
-static gboolean sizer_leave_cb(GtkWidget *UNUSED(widget), GdkEventCrossing *UNUSED(event), gpointer data)
-{
-       SizerData *sd = data;
-
-       sizer_set_prelight(sd, FALSE);
-       return TRUE;
-}
-
-static gboolean sizer_expose_cb(GtkWidget *widget, GdkEventExpose *UNUSED(event), gpointer UNUSED(data))
-{
-       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);
-
-       return TRUE;
-}
-
-static void sizer_realize_cb(GtkWidget *widget, gpointer data)
-{
-       SizerData *sd = data;
-       GdkCursorType n;
-
-       n = 0;
-       if (sd->position & SIZER_POS_TOP || sd->position & SIZER_POS_BOTTOM)
-               {
-               n = GDK_SB_V_DOUBLE_ARROW;
-               }
-       if (sd->position & SIZER_POS_LEFT || sd->position & SIZER_POS_RIGHT)
-               {
-               n = (n != 0) ? GDK_FLEUR : GDK_SB_H_DOUBLE_ARROW;
-               }
-
-       if (n != 0 && gtk_widget_get_window(widget))
-               {
-               GdkCursor *cursor;
-               cursor = gdk_cursor_new(n);
-               gdk_window_set_cursor(gtk_widget_get_window(widget), cursor);
-               g_object_unref(G_OBJECT(cursor));
-               }
-}
-
-static void sizer_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
-{
-       SizerData *sd = data;
-
-       g_free(sd);
-}
-
-GtkWidget *sizer_new(GtkWidget *parent, GtkWidget *bounding_widget,
-                    SizerPositionType position)
-{
-       SizerData *sd;
-       gint handle_size;
-
-       sd = g_new0(SizerData, 1);
-
-       sd->sizer = gtk_event_box_new();
-       sd->parent = parent;
-       sd->bounding_widget = bounding_widget;
-       sd->position = position;
-       sd->hsize_min = -1;
-       sd->hsize_max = -1;
-       sd->vsize_min = -1;
-       sd->vsize_max = -1;
-
-       sd->in_drag = FALSE;
-       sd->handle_prelit = FALSE;
-
-       g_signal_connect(G_OBJECT(sd->sizer), "destroy",
-                        G_CALLBACK(sizer_destroy_cb), sd);
-
-       g_signal_connect(G_OBJECT(sd->sizer), "motion_notify_event",
-                        G_CALLBACK(sizer_motion_cb), sd);
-       g_signal_connect(G_OBJECT(sd->sizer), "button_press_event",
-                        G_CALLBACK(sizer_press_cb), sd);
-       g_signal_connect(G_OBJECT(sd->sizer), "button_release_event",
-                        G_CALLBACK(sizer_release_cb), sd);
-
-       g_signal_connect(G_OBJECT(sd->sizer), "enter_notify_event",
-                        G_CALLBACK(sizer_enter_cb), sd);
-       g_signal_connect(G_OBJECT(sd->sizer), "leave_notify_event",
-                        G_CALLBACK(sizer_leave_cb), sd);
-
-       gtk_widget_set_events(sd->sizer, GDK_POINTER_MOTION_MASK |
-                                        GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK |
-                                        GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
-
-       g_signal_connect(sd->sizer, "realize",
-                        G_CALLBACK(sizer_realize_cb), sd);
-       g_signal_connect(sd->sizer, "expose_event",
-                        G_CALLBACK(sizer_expose_cb), sd);
-
-       handle_size = sizer_default_handle_size();
-
-       gtk_widget_set_size_request(sd->sizer, handle_size, handle_size);
-#if 0
-       /* use this if you add a shadow border to the handle */
-       gtk_widget_set_size_request(sd->sizer, handle_size + sd->sizer->style->xthickness * 2,
-                                              handle_size + sd->sizer->style->ythickness * 2);
-#endif
-
-       g_object_set_data(G_OBJECT(sd->sizer), SIZER_DATA_KEY,sd);
-
-       return sd->sizer;
-}
-
-void sizer_set_limits(GtkWidget *sizer,
-                     gint hsize_min, gint hsize_max,
-                     gint vsize_min, gint vsize_max)
-{
-       SizerData *sd;
-
-       sd = g_object_get_data(G_OBJECT(sizer), SIZER_DATA_KEY);
-       if (!sd) return;
-
-       sd->hsize_min = hsize_min;
-       sd->hsize_max = hsize_max;
-       sd->vsize_min = vsize_min;
-       sd->vsize_max = vsize_max;
-}
+       //lt.tm_sec = 0;
+       //lt.tm_min = 0;
+       //lt.tm_hour = 0;
+       //lt.tm_mday = day;
+       //lt.tm_mon = month - 1;
+       //lt.tm_year = year - 1900;
+       //lt.tm_isdst = 0;
 
+       //return mktime(&lt);
+//}
 
 /*
  *-----------------------------------------------------------------------------
@@ -1472,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;
 
@@ -1528,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)
                        {
@@ -1580,48 +1277,48 @@ gboolean pref_list_int_get(const gchar *group, const gchar *key, gint *result)
        return FALSE;
 }
 
-void pref_list_double_set(const gchar *group, const gchar *key, gdouble value)
-{
-       gchar text[G_ASCII_DTOSTR_BUF_SIZE];
+//void pref_list_double_set(const gchar *group, const gchar *key, gdouble value)
+//{
+       //gchar text[G_ASCII_DTOSTR_BUF_SIZE];
 
-       g_ascii_dtostr(text, sizeof(text), value);
-       pref_list_set(group, key, PREF_LIST_MARKER_DOUBLE, text);
-}
+       //g_ascii_dtostr(text, sizeof(text), value);
+       //pref_list_set(group, key, PREF_LIST_MARKER_DOUBLE, text);
+//}
 
-gboolean pref_list_double_get(const gchar *group, const gchar *key, gdouble *result)
-{
-       const gchar *text;
+//gboolean pref_list_double_get(const gchar *group, const gchar *key, gdouble *result)
+//{
+       //const gchar *text;
 
-       if (!group || !key)
-               {
-               *result = 0;
-               return FALSE;
-               }
+       //if (!group || !key)
+               //{
+               //*result = 0;
+               //return FALSE;
+               //}
 
-       if (pref_list_get(group, key, PREF_LIST_MARKER_DOUBLE, &text) && text)
-               {
-               *result = g_ascii_strtod(text, NULL);
-               return TRUE;
-               }
+       //if (pref_list_get(group, key, PREF_LIST_MARKER_DOUBLE, &text) && text)
+               //{
+               //*result = g_ascii_strtod(text, NULL);
+               //return TRUE;
+               //}
 
-       *result = 0;
-       return FALSE;
-}
+       //*result = 0;
+       //return FALSE;
+//}
 
-void pref_list_string_set(const gchar *group, const gchar *key, const gchar *value)
-{
-       pref_list_set(group, key, PREF_LIST_MARKER_STRING, value);
-}
+//void pref_list_string_set(const gchar *group, const gchar *key, const gchar *value)
+//{
+       //pref_list_set(group, key, PREF_LIST_MARKER_STRING, value);
+//}
 
-gboolean pref_list_string_get(const gchar *group, const gchar *key, const gchar **result)
-{
-       return pref_list_get(group, key, PREF_LIST_MARKER_STRING, result);
-}
+//gboolean pref_list_string_get(const gchar *group, const gchar *key, const gchar **result)
+//{
+       //return pref_list_get(group, key, PREF_LIST_MARKER_STRING, 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);
 }
@@ -1726,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;