* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
/*
#include "gtktable.h"
#include "gtkvbox.h"
-typedef void (*GtkInputDialogSignal1) (GtkObject *object,
- int arg1,
- gpointer data);
+#include "gtkintl.h"
typedef struct {
gint index;
/* Forward declarations */
-static void gtk_input_dialog_marshal_signal1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
static void gtk_input_dialog_class_init (GtkInputDialogClass *klass);
static void gtk_input_dialog_init (GtkInputDialog *inputd);
static GdkDeviceInfo *gtk_input_dialog_get_device_info(guint32 deviceid);
static void gtk_input_dialog_set_device(GtkWidget *widget, gpointer data);
-static void gtk_input_dialog_destroy (GtkObject *object);
+static void gtk_input_dialog_finalize (GtkObject *object);
static void gtk_input_dialog_set_mapping_mode(GtkWidget *w,
gpointer data);
static void gtk_input_dialog_set_axis(GtkWidget *widget, gpointer data);
GdkDeviceInfo *info);
static GtkObjectClass *parent_class = NULL;
-static gint input_dialog_signals[LAST_SIGNAL] = { 0 };
-
-static void
-gtk_input_dialog_marshal_signal1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkInputDialogSignal1 rfunc;
-
- rfunc = (GtkInputDialogSignal1) func;
- (* rfunc) (object, GTK_VALUE_INT(args[0]), func_data);
-}
+static guint input_dialog_signals[LAST_SIGNAL] = { 0 };
static GdkDeviceInfo *
gtk_input_dialog_get_device_info(guint32 deviceid)
return NULL;
}
-guint
-gtk_input_dialog_get_type ()
+GtkType
+gtk_input_dialog_get_type (void)
{
- static guint input_dialog_type = 0;
+ static GtkType input_dialog_type = 0;
if (!input_dialog_type)
{
- GtkTypeInfo input_dialog_info =
+ static const GtkTypeInfo input_dialog_info =
{
"GtkInputDialog",
sizeof (GtkInputDialog),
sizeof (GtkInputDialogClass),
(GtkClassInitFunc) gtk_input_dialog_class_init,
(GtkObjectInitFunc) gtk_input_dialog_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL,
+ /* reserved_1 */ NULL,
+ /* reserved_2 */ NULL,
+ (GtkClassInitFunc) NULL,
};
- input_dialog_type = gtk_type_unique (gtk_dialog_get_type (),
+ input_dialog_type = gtk_type_unique (GTK_TYPE_DIALOG,
&input_dialog_info);
}
object_class = (GtkObjectClass*) klass;
- parent_class = gtk_type_class (gtk_dialog_get_type ());
+ parent_class = gtk_type_class (GTK_TYPE_DIALOG);
input_dialog_signals[ENABLE_DEVICE] =
gtk_signal_new ("enable_device",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkInputDialogClass, enable_device),
- gtk_input_dialog_marshal_signal1,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1, GTK_TYPE_INT);
input_dialog_signals[DISABLE_DEVICE] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkInputDialogClass, disable_device),
- gtk_input_dialog_marshal_signal1,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1, GTK_TYPE_INT);
gtk_object_class_add_signals (object_class, input_dialog_signals,
LAST_SIGNAL);
- object_class->destroy = gtk_input_dialog_destroy;
+ object_class->finalize = gtk_input_dialog_finalize;
klass->enable_device = NULL;
klass->disable_device = NULL;
}
/* shell and main vbox */
- gtk_window_set_title (GTK_WINDOW (inputd), "Input");
+ gtk_window_set_title (GTK_WINDOW (inputd), _("Input"));
vbox = gtk_vbox_new (FALSE, 4);
- gtk_container_border_width(GTK_CONTAINER (vbox), 5);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (inputd)->vbox), vbox, TRUE, TRUE, 0);
if (g_list_length(device_info) <= 1) /* only core device */
{
- label = gtk_label_new ("No input devices");
+ label = gtk_label_new (_("No input devices"));
gtk_container_add (GTK_CONTAINER (vbox), label);
gtk_widget_show (label);
gtk_object_set_user_data (GTK_OBJECT (menuitem), inputd);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
(GtkSignalFunc) gtk_input_dialog_set_device,
- (gpointer)((long)info->deviceid));
+ GUINT_TO_POINTER(info->deviceid));
}
}
util_box = gtk_hbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (vbox), util_box, FALSE, FALSE, 0);
- label = gtk_label_new("Device:");
+ label = gtk_label_new(_("Device:"));
gtk_box_pack_start (GTK_BOX (util_box), label, FALSE, FALSE, 2);
optionmenu = gtk_option_menu_new ();
mapping_menu = gtk_menu_new ();
- menuitem = gtk_menu_item_new_with_label("Disabled");
+ menuitem = gtk_menu_item_new_with_label(_("Disabled"));
gtk_menu_append(GTK_MENU(mapping_menu),menuitem);
gtk_object_set_user_data (GTK_OBJECT (menuitem), inputd);
gtk_widget_show(menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
(GtkSignalFunc) gtk_input_dialog_set_mapping_mode,
- (gpointer)((long)GDK_MODE_DISABLED));
+ GINT_TO_POINTER (GDK_MODE_DISABLED));
- menuitem = gtk_menu_item_new_with_label("Screen");
+ menuitem = gtk_menu_item_new_with_label(_("Screen"));
gtk_menu_append(GTK_MENU(mapping_menu),menuitem);
gtk_object_set_user_data (GTK_OBJECT (menuitem), inputd);
gtk_widget_show(menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
(GtkSignalFunc) gtk_input_dialog_set_mapping_mode,
- (gpointer)((long)GDK_MODE_SCREEN));
+ GINT_TO_POINTER (GDK_MODE_SCREEN));
- menuitem = gtk_menu_item_new_with_label("Window");
+ menuitem = gtk_menu_item_new_with_label(_("Window"));
gtk_menu_append(GTK_MENU(mapping_menu),menuitem);
gtk_object_set_user_data (GTK_OBJECT (menuitem), inputd);
gtk_widget_show(menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
(GtkSignalFunc) gtk_input_dialog_set_mapping_mode,
- (gpointer)((long)GDK_MODE_WINDOW));
+ GINT_TO_POINTER (GDK_MODE_WINDOW));
- label = gtk_label_new("Mode: ");
+ label = gtk_label_new(_("Mode: "));
gtk_box_pack_start (GTK_BOX (util_box), label, FALSE, FALSE, 2);
inputd->mode_optionmenu = gtk_option_menu_new ();
/* The axis listbox */
- label = gtk_label_new ("Axes");
+ label = gtk_label_new (_("Axes"));
inputd->axis_listbox = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(inputd->axis_listbox),
/* Keys listbox */
- label = gtk_label_new ("Keys");
+ label = gtk_label_new (_("Keys"));
inputd->keys_listbox = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_usize (inputd->keys_listbox, KEYS_LIST_WIDTH, KEYS_LIST_HEIGHT);
/* ...set_device expects to get input dialog from widget user data */
gtk_object_set_user_data (GTK_OBJECT (inputd), inputd);
- gtk_input_dialog_set_device(GTK_WIDGET(inputd), (gpointer)((long)
- ((GdkDeviceInfo *)device_info->data)->deviceid));
+ gtk_input_dialog_set_device(GTK_WIDGET(inputd),
+ GUINT_TO_POINTER (((GdkDeviceInfo *)device_info->data)->deviceid));
}
/* We create the save button in any case, so that clients can
connect to it, without paying attention to whether it exits */
- inputd->save_button = gtk_button_new_with_label ("Save");
+ inputd->save_button = gtk_button_new_with_label (_("Save"));
GTK_WIDGET_SET_FLAGS (inputd->save_button, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG(inputd)->action_area),
inputd->save_button, TRUE, TRUE, 0);
if (g_list_length(device_info) <= 1) /* only core device */
gtk_widget_set_sensitive(inputd->save_button, FALSE);
- inputd->close_button = gtk_button_new_with_label ("Close");
+ inputd->close_button = gtk_button_new_with_label (_("Close"));
GTK_WIDGET_SET_FLAGS (inputd->close_button, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG(inputd)->action_area),
inputd->close_button, TRUE, TRUE, 0);
{
GtkInputDialog *inputd;
- inputd = gtk_type_new (gtk_input_dialog_get_type ());
+ inputd = gtk_type_new (GTK_TYPE_INPUT_DIALOG);
return GTK_WIDGET (inputd);
}
static void
gtk_input_dialog_set_device(GtkWidget *widget, gpointer data)
{
- guint32 deviceid = (guint32)data;
+ guint32 deviceid = GPOINTER_TO_UINT(data);
GdkDeviceInfo *info;
GtkInputDialog *inputd = GTK_INPUT_DIALOG(
gtk_object_get_user_data(GTK_OBJECT(widget)));
inputd->current_device = deviceid;
- info = gtk_input_dialog_get_device_info((guint32)data);
+ info = gtk_input_dialog_get_device_info (deviceid);
gtk_input_dialog_fill_axes(inputd, info);
gtk_input_dialog_fill_keys(inputd, info);
}
static void
-gtk_input_dialog_destroy (GtkObject *object)
+gtk_input_dialog_finalize (GtkObject *object)
{
/* GtkInputDialog *inputd = GTK_INPUT_DIALOG (object); */
/* Clean up ? */
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ (* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
}
static void
gtk_object_get_user_data(GTK_OBJECT(w)));
GdkDeviceInfo *info = gtk_input_dialog_get_device_info (inputd->current_device);
GdkInputMode old_mode = info->mode;
- GdkInputMode mode = (GdkInputMode)data;
+ GdkInputMode mode = GPOINTER_TO_INT (data);
if (mode != old_mode)
{
static void
gtk_input_dialog_set_axis(GtkWidget *widget, gpointer data)
{
- GdkAxisUse use = (GdkAxisUse)data & 0xFFFF;
+ GdkAxisUse use = GPOINTER_TO_INT(data) & 0xFFFF;
GdkAxisUse old_use;
GdkAxisUse *new_axes;
GtkInputDialog *inputd = GTK_INPUT_DIALOG (gtk_object_get_user_data (GTK_OBJECT (widget)));
GdkDeviceInfo *info = gtk_input_dialog_get_device_info (inputd->current_device);
- gint axis = ((gint)data >> 16) - 1;
+ gint axis = (GPOINTER_TO_INT(data) >> 16) - 1;
gint old_axis;
int i;
static void
gtk_input_dialog_fill_axes(GtkInputDialog *inputd, GdkDeviceInfo *info)
{
- static char *axis_use_strings[GDK_AXIS_LAST] =
+ static const char *axis_use_strings[GDK_AXIS_LAST] =
{
"",
- "X",
- "Y",
- "Pressure",
- "X Tilt",
- "Y Tilt"
+ N_("X"),
+ N_("Y"),
+ N_("Pressure"),
+ N_("X Tilt"),
+ N_("Y Tilt")
};
int i,j;
gtk_widget_destroy (inputd->axis_list);
}
inputd->axis_list = gtk_table_new (GDK_AXIS_LAST, 2, 0);
- gtk_container_add (GTK_CONTAINER (inputd->axis_listbox), inputd->axis_list);
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (inputd->axis_listbox),
+ inputd->axis_list);
gtk_widget_show (inputd->axis_list);
gtk_widget_realize (inputd->axis_list);
gdk_window_set_background (inputd->axis_list->window,
- &inputd->axis_list->style->white);
+ &inputd->axis_list->style->base[GTK_STATE_NORMAL]);
for (i=GDK_AXIS_X;i<GDK_AXIS_LAST;i++)
{
/* create the label */
- label = gtk_label_new(axis_use_strings[i]);
+ label = gtk_label_new (_(axis_use_strings[i]));
gtk_table_attach (GTK_TABLE (inputd->axis_list), label, 0, 1, i, i+1,
0, 0, 2, 2);
GtkWidget *menu_item;
if (j == -1)
- menu_item = gtk_menu_item_new_with_label ("none");
+ menu_item = gtk_menu_item_new_with_label (_("none"));
else
{
sprintf (buffer,"%d",j+1);
gtk_object_set_user_data (GTK_OBJECT (menu_item), inputd);
gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
(GtkSignalFunc) gtk_input_dialog_set_axis,
- (gpointer) ((long) (0x10000 * (j + 1) + i)));
+ GINT_TO_POINTER (0x10000 * (j + 1) + i));
gtk_widget_show (menu_item);
gtk_menu_append (GTK_MENU (menu), menu_item);
}
static void
gtk_input_dialog_clear_key (GtkWidget *widget, GtkInputKeyInfo *key)
{
- gtk_entry_set_text (GTK_ENTRY(key->entry), "(disabled)");
+ gtk_entry_set_text (GTK_ENTRY(key->entry), _("(disabled)"));
gdk_input_set_key (key->inputd->current_device, key->index, 0, 0);
}
g_string_append (str, chars);
}
else
- g_string_append (str, "(unknown)");
+ g_string_append (str, _("(unknown)"));
gtk_entry_set_text (GTK_ENTRY(key->entry), str->str);
g_string_free (str, TRUE);
}
else
{
- gtk_entry_set_text (GTK_ENTRY(key->entry), "(disabled)");
+ gtk_entry_set_text (GTK_ENTRY(key->entry), _("(disabled)"));
}
}
GtkWidget *label;
GtkWidget *button;
- char buffer[16];
+ char buffer[32];
/* remove all the old items */
if (inputd->keys_list)
}
inputd->keys_list = gtk_table_new (info->num_keys, 3, FALSE);
- gtk_container_add (GTK_CONTAINER (inputd->keys_listbox), inputd->keys_list);
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (inputd->keys_listbox),
+ inputd->keys_list);
gtk_widget_show (inputd->keys_list);
gtk_widget_realize (inputd->keys_list);
gdk_window_set_background (inputd->keys_list->window,
- &inputd->keys_list->style->white);
+ &inputd->keys_list->style->base[GTK_STATE_NORMAL]);
for (i=0;i<info->num_keys;i++)
{
/* and clear button */
- button = gtk_button_new_with_label ("clear");
+ button = gtk_button_new_with_label (_("clear"));
gtk_table_attach (GTK_TABLE (inputd->keys_list), button, 2, 3, i, i+1,
0, 0, 2, 2);
gtk_widget_show (button);
projects / ~andy / gtk / blobdiff