Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix icc warnings about shadowed variables and mismatching printf format

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-09-21 11:27:13 +00:00
parent d494512913
commit 31c6672c66
1 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/gtk/assertdlg_gtk.c
View File

@@ -280,57 +280,61 @@ void gtk_assert_dialog_class_init(GtkAssertDialogClass *klass)
void gtk_assert_dialog_init(GtkAssertDialog *dlg) void gtk_assert_dialog_init(GtkAssertDialog *dlg)
{ {
GtkWidget *vbox, *hbox, *image, *continuebtn; GtkWidget *continuebtn;
/* start the main vbox */
gtk_widget_push_composite_child ();
vbox = gtk_vbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER(vbox), 8);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 5);
/* add the icon+message hbox */
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
/* icon */
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start (GTK_BOX(hbox), image, FALSE, FALSE, 12);
{ {
GtkWidget *vbox2, *info; GtkWidget *vbox, *hbox, *image;
/* message */ /* start the main vbox */
vbox2 = gtk_vbox_new (FALSE, 0); gtk_widget_push_composite_child ();
gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0); vbox = gtk_vbox_new (FALSE, 8);
info = gtk_label_new ("An assertion failed!"); gtk_container_set_border_width (GTK_CONTAINER(vbox), 8);
gtk_box_pack_start (GTK_BOX(vbox2), info, TRUE, TRUE, 8); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 5);
/* assert message */
dlg->message = gtk_label_new (NULL);
gtk_label_set_selectable (GTK_LABEL (dlg->message), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (dlg->message), TRUE);
gtk_label_set_justify (GTK_LABEL (dlg->message), GTK_JUSTIFY_LEFT);
gtk_widget_set_size_request (GTK_WIDGET(dlg->message), 450, -1);
gtk_box_pack_end (GTK_BOX(vbox2), GTK_WIDGET(dlg->message), TRUE, TRUE, 8); /* add the icon+message hbox */
} hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
/* add the expander */ /* icon */
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start (GTK_BOX(hbox), image, FALSE, FALSE, 12);
{
GtkWidget *vbox2, *info;
/* message */
vbox2 = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
info = gtk_label_new ("An assertion failed!");
gtk_box_pack_start (GTK_BOX(vbox2), info, TRUE, TRUE, 8);
/* assert message */
dlg->message = gtk_label_new (NULL);
gtk_label_set_selectable (GTK_LABEL (dlg->message), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (dlg->message), TRUE);
gtk_label_set_justify (GTK_LABEL (dlg->message), GTK_JUSTIFY_LEFT);
gtk_widget_set_size_request (GTK_WIDGET(dlg->message), 450, -1);
gtk_box_pack_end (GTK_BOX(vbox2), GTK_WIDGET(dlg->message), TRUE, TRUE, 8);
}
/* add the expander */
#if GTK_CHECK_VERSION(2,4,0) #if GTK_CHECK_VERSION(2,4,0)
if (!gtk_check_version (2, 4, 0)) if (!gtk_check_version (2, 4, 0))
{ {
dlg->expander = gtk_expander_new_with_mnemonic ("Back_trace:"); dlg->expander = gtk_expander_new_with_mnemonic ("Back_trace:");
gtk_box_pack_start (GTK_BOX(vbox), dlg->expander, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX(vbox), dlg->expander, TRUE, TRUE, 0);
g_signal_connect (GTK_EXPANDER(dlg->expander), "activate", g_signal_connect (GTK_EXPANDER(dlg->expander), "activate",
G_CALLBACK(gtk_assert_dialog_expander_callback), dlg); G_CALLBACK(gtk_assert_dialog_expander_callback), dlg);
} }
else else
#endif #endif
{ {
/* if GtkExpander is unavailable, then use a static frame instead */ /* if GtkExpander is unavailable, then use a static frame instead */
dlg->expander = gtk_frame_new ("Back_trace:"); dlg->expander = gtk_frame_new ("Back_trace:");
gtk_box_pack_start (GTK_BOX(vbox), dlg->expander, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX(vbox), dlg->expander, TRUE, TRUE, 0);
}
} }
{ {
@@ -441,7 +445,7 @@ gchar *gtk_assert_dialog_get_backtrace (GtkAssertDialog *dlg)
LINE_NUMBER_COLIDX, &linenum, LINE_NUMBER_COLIDX, &linenum,
-1); -1);
g_string_append_printf (string, "[%d] %s(%s)", g_string_append_printf (string, "[%u] %s(%s)",
count, function, arguments); count, function, arguments);
if (sourcefile[0] != '\0') if (sourcefile[0] != '\0')
g_string_append_printf (string, " %s", sourcefile); g_string_append_printf (string, " %s", sourcefile);
@@ -509,7 +513,7 @@ void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg,
linenum = g_string_new(""); linenum = g_string_new("");
if ( line_number != 0 ) if ( line_number != 0 )
g_string_printf (linenum, "%d", line_number); g_string_printf (linenum, "%u", line_number);
/* add data to the list store */ /* add data to the list store */
gtk_list_store_append (GTK_LIST_STORE(model), &iter); gtk_list_store_append (GTK_LIST_STORE(model), &iter);