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);
pref_checkbox_link_sensitivity_cb(button, widget);
}
-static void pref_checkbox_link_sensitivity_swap_cb(GtkWidget *button, gpointer data)
-{
- GtkWidget *widget = static_cast<GtkWidget *>(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)
//{
#define PREF_RADIO_VALUE_KEY "pref_radio_value"
-static void pref_radiobutton_int_cb(GtkWidget *widget, gpointer data)
-{
- gboolean *result = static_cast<gboolean *>(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,
}
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);
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);
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;
}
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;
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);