comparison: pidgin/gtkdialogs.c
pidgin/gtkdialogs.c
- branch
- cpw.qulogic.gtk3-required
- changeset 33138
- 7e7aeaa31dfe
- parent 32987
- cdf1e8c4203c
- parent 33132
- 24afd2b22579
- child 33141
- 2001ba1d6827
equal
deleted
inserted
replaced
| 32987:cdf1e8c4203c | 33138:7e7aeaa31dfe |
|---|---|
| 466 gtk_webview_append_html(GTK_WEBVIEW(webview), string->str); | 466 gtk_webview_append_html(GTK_WEBVIEW(webview), string->str); |
| 467 | 467 |
| 468 button = pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CLOSE, | 468 button = pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CLOSE, |
| 469 G_CALLBACK(destroy_win), win); | 469 G_CALLBACK(destroy_win), win); |
| 470 | 470 |
| 471 #if GTK_CHECK_VERSION(2,18,0) | |
| 472 gtk_widget_set_can_default(button, TRUE); | 471 gtk_widget_set_can_default(button, TRUE); |
| 473 #else | |
| 474 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); | |
| 475 #endif | |
| 476 gtk_widget_grab_default(button); | 472 gtk_widget_grab_default(button); |
| 477 | 473 |
| 478 gtk_widget_show_all(win); | 474 gtk_widget_show_all(win); |
| 479 gtk_window_present(GTK_WINDOW(win)); | 475 gtk_window_present(GTK_WINDOW(win)); |
| 480 | 476 |
| 976 gtk_dialog_set_default_response (GTK_DIALOG(window), GTK_RESPONSE_OK); | 972 gtk_dialog_set_default_response (GTK_DIALOG(window), GTK_RESPONSE_OK); |
| 977 g_signal_connect(G_OBJECT(window), "response", G_CALLBACK(gtk_widget_destroy), NULL); | 973 g_signal_connect(G_OBJECT(window), "response", G_CALLBACK(gtk_widget_destroy), NULL); |
| 978 | 974 |
| 979 gtk_container_set_border_width (GTK_CONTAINER(window), PIDGIN_HIG_BOX_SPACE); | 975 gtk_container_set_border_width (GTK_CONTAINER(window), PIDGIN_HIG_BOX_SPACE); |
| 980 gtk_window_set_resizable(GTK_WINDOW(window), FALSE); | 976 gtk_window_set_resizable(GTK_WINDOW(window), FALSE); |
| 981 #if !GTK_CHECK_VERSION(2,22,0) | 977 /* TODO: figure out how to set no separator in a dialog in GTK+ 3.0 */ |
| 982 gtk_dialog_set_has_separator(GTK_DIALOG(window), FALSE); | 978 /*gtk_dialog_set_has_separator(GTK_DIALOG(window), FALSE);*/ |
| 983 #endif | 979 gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(window))), |
| 984 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(window)->vbox), PIDGIN_HIG_BORDER); | 980 PIDGIN_HIG_BORDER); |
| 985 gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(window)->vbox), PIDGIN_HIG_BOX_SPACE); | 981 gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(window))), |
| 982 PIDGIN_HIG_BOX_SPACE); | |
| 986 | 983 |
| 987 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); | 984 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); |
| 988 gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox); | 985 gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(window))), hbox); |
| 989 img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_COOL, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); | 986 img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_COOL, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); |
| 990 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); | 987 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); |
| 991 | 988 |
| 992 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); | 989 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); |
| 993 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); | 990 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); |
