comparison src/util.c @ 4635:42d53c416bb9

[gaim-migrate @ 4942] remove deprecated gtk calls, gtk2-ify log viewer, gtk2-ify jabber vcard dialog, and probably a cleanup or two I forgot about. committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Sun, 02 Mar 2003 19:21:36 +0000
parents 3196d9044a45
children 4938d12f6d48
comparison
equal deleted inserted replaced
4634:d19872836812 4635:42d53c416bb9
1124 */ 1124 */
1125 GtkWidget *image; 1125 GtkWidget *image;
1126 1126
1127 if (icon == NULL) 1127 if (icon == NULL)
1128 menuitem = gtk_menu_item_new_with_mnemonic(str); 1128 menuitem = gtk_menu_item_new_with_mnemonic(str);
1129 else 1129 else
1130 menuitem = gtk_image_menu_item_new_with_mnemonic(str); 1130 menuitem = gtk_image_menu_item_new_with_mnemonic(str);
1131 1131
1132 if (menu) 1132 if (menu)
1133 gtk_menu_append(GTK_MENU(menu), menuitem); 1133 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
1134 1134
1135 if (sf) 1135 if (sf)
1136 g_signal_connect(GTK_OBJECT(menuitem), "activate", sf, data); 1136 g_signal_connect(GTK_OBJECT(menuitem), "activate", sf, data);
1137 1137
1138 if (icon != NULL) { 1138 if (icon != NULL) {
1171 menuitem = gtk_menu_item_new_with_mnemonic(_(str)); 1171 menuitem = gtk_menu_item_new_with_mnemonic(_(str));
1172 else 1172 else
1173 menuitem = gtk_image_menu_item_new_with_mnemonic(_(str)); 1173 menuitem = gtk_image_menu_item_new_with_mnemonic(_(str));
1174 1174
1175 if (menu) 1175 if (menu)
1176 gtk_menu_append(GTK_MENU(menu), menuitem); 1176 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
1177 1177
1178 if (sf) 1178 if (sf)
1179 g_signal_connect(GTK_OBJECT(menuitem), "activate", sf, data); 1179 g_signal_connect(GTK_OBJECT(menuitem), "activate", sf, data);
1180 1180
1181 if (iconname != NULL) { 1181 if (iconname != NULL) {
1216 GdkPixmap *pm; 1216 GdkPixmap *pm;
1217 GdkBitmap *mask; 1217 GdkBitmap *mask;
1218 1218
1219 menuitem = gtk_menu_item_new(); 1219 menuitem = gtk_menu_item_new();
1220 if (menu) 1220 if (menu)
1221 gtk_menu_append(GTK_MENU(menu), menuitem); 1221 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
1222 if (sf) 1222 if (sf)
1223 /* passing 1 is necessary so if we sign off closing the account editor doesn't exit */ 1223 /* passing 1 is necessary so if we sign off closing the account editor doesn't exit */
1224 g_signal_connect(GTK_OBJECT(menuitem), "activate", sf, data); 1224 g_signal_connect(GTK_OBJECT(menuitem), "activate", sf, data);
1225 gtk_widget_show(menuitem); 1225 gtk_widget_show(menuitem);
1226 1226
1230 gtk_widget_show(hbox); 1230 gtk_widget_show(hbox);
1231 1231
1232 /* Create our pixmap and pack it */ 1232 /* Create our pixmap and pack it */
1233 gtk_widget_realize(menu->parent); 1233 gtk_widget_realize(menu->parent);
1234 pm = gdk_pixmap_create_from_xpm_d(menu->parent->window, &mask, NULL, xpm); 1234 pm = gdk_pixmap_create_from_xpm_d(menu->parent->window, &mask, NULL, xpm);
1235 pixmap = gtk_pixmap_new(pm, mask); 1235 pixmap = gtk_image_new_from_pixmap(pm, mask);
1236 gtk_widget_show(pixmap); 1236 gtk_widget_show(pixmap);
1237 gdk_pixmap_unref(pm); 1237 gdk_pixmap_unref(pm);
1238 gdk_bitmap_unref(mask); 1238 gdk_bitmap_unref(mask);
1239 gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE, 2); 1239 gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE, 2);
1240 1240
1262 GtkWidget *menuitem; 1262 GtkWidget *menuitem;
1263 GtkWidget *label; 1263 GtkWidget *label;
1264 1264
1265 menuitem = gtk_menu_item_new(); 1265 menuitem = gtk_menu_item_new();
1266 if (menu) 1266 if (menu)
1267 gtk_menu_append(GTK_MENU(menu), menuitem); 1267 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
1268 gtk_widget_show(menuitem); 1268 gtk_widget_show(menuitem);
1269 1269
1270 label = gtk_label_new(str); 1270 label = gtk_label_new(str);
1271 gtk_label_set_pattern(GTK_LABEL(label), "_"); 1271 gtk_label_set_pattern(GTK_LABEL(label), "_");
1272 gtk_container_add(GTK_CONTAINER(menuitem), label); 1272 gtk_container_add(GTK_CONTAINER(menuitem), label);