comparison: pidgin/gtkutils.c
pidgin/gtkutils.c
- changeset 26821
- ad2ea323d0f2
- parent 26820
- 76f90ca8f6f2
- child 26846
- d5546da39e44
equal
deleted
inserted
replaced
| 26820:76f90ca8f6f2 | 26821:ad2ea323d0f2 |
|---|---|
| 356 pidgin_set_accessible_label (menuitem, label); | 356 pidgin_set_accessible_label (menuitem, label); |
| 357 return menuitem; | 357 return menuitem; |
| 358 } | 358 } |
| 359 | 359 |
| 360 GtkWidget *pidgin_new_check_item(GtkWidget *menu, const char *str, | 360 GtkWidget *pidgin_new_check_item(GtkWidget *menu, const char *str, |
| 361 GtkSignalFunc sf, gpointer data, gboolean checked) | 361 GCallback cb, gpointer data, gboolean checked) |
| 362 { | 362 { |
| 363 GtkWidget *menuitem; | 363 GtkWidget *menuitem; |
| 364 menuitem = gtk_check_menu_item_new_with_mnemonic(str); | 364 menuitem = gtk_check_menu_item_new_with_mnemonic(str); |
| 365 | 365 |
| 366 if (menu) | 366 if (menu) |
| 367 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); | 367 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); |
| 368 | 368 |
| 369 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), checked); | 369 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), checked); |
| 370 | 370 |
| 371 if (sf) | 371 if (cb) |
| 372 g_signal_connect(G_OBJECT(menuitem), "activate", sf, data); | 372 g_signal_connect(G_OBJECT(menuitem), "activate", cb, data); |
| 373 | 373 |
| 374 gtk_widget_show_all(menuitem); | 374 gtk_widget_show_all(menuitem); |
| 375 | 375 |
| 376 return menuitem; | 376 return menuitem; |
| 377 } | 377 } |
| 437 | 437 |
| 438 return button; | 438 return button; |
| 439 } | 439 } |
| 440 | 440 |
| 441 | 441 |
| 442 GtkWidget *pidgin_new_item_from_stock(GtkWidget *menu, const char *str, const char *icon, GtkSignalFunc sf, gpointer data, guint accel_key, guint accel_mods, char *mod) | 442 GtkWidget *pidgin_new_item_from_stock(GtkWidget *menu, const char *str, const char *icon, GCallback cb, gpointer data, guint accel_key, guint accel_mods, char *mod) |
| 443 { | 443 { |
| 444 GtkWidget *menuitem; | 444 GtkWidget *menuitem; |
| 445 /* | 445 /* |
| 446 GtkWidget *hbox; | 446 GtkWidget *hbox; |
| 447 GtkWidget *label; | 447 GtkWidget *label; |
| 454 menuitem = gtk_image_menu_item_new_with_mnemonic(str); | 454 menuitem = gtk_image_menu_item_new_with_mnemonic(str); |
| 455 | 455 |
| 456 if (menu) | 456 if (menu) |
| 457 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); | 457 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); |
| 458 | 458 |
| 459 if (sf) | 459 if (cb) |
| 460 g_signal_connect(G_OBJECT(menuitem), "activate", sf, data); | 460 g_signal_connect(G_OBJECT(menuitem), "activate", cb, data); |
| 461 | 461 |
| 462 if (icon != NULL) { | 462 if (icon != NULL) { |
| 463 image = gtk_image_new_from_stock(icon, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); | 463 image = gtk_image_new_from_stock(icon, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); |
| 464 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image); | 464 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image); |
| 465 } | 465 } |
