fix icc warnings about shadowed variables and mismatching printf format

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

View File

@@ -280,7 +280,10 @@ 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;
{
GtkWidget *vbox, *hbox, *image;
/* start the main vbox */ /* start the main vbox */
gtk_widget_push_composite_child (); gtk_widget_push_composite_child ();
@@ -332,6 +335,7 @@ void gtk_assert_dialog_init(GtkAssertDialog *dlg)
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);
} }
}
{ {
GtkWidget *hbox, *vbox, *button, *sw; GtkWidget *hbox, *vbox, *button, *sw;
@@ -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);