diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2015-10-10 00:31:50 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2015-10-10 00:31:50 (GMT) |
commit | 8afd8490dcb695c5e1ab7c55d2305e6af7c97212 (patch) | |
tree | 07dfcfd53a5ce5a92733b735edfb5cc72259cd7a /src/dialogs/shellcode.c | |
parent | 56549ed6632859db219d5434079ad94381293a0a (diff) |
Fixed all remaining gtk warnings about deprecated declarations.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@590 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/dialogs/shellcode.c')
-rw-r--r-- | src/dialogs/shellcode.c | 92 |
1 files changed, 35 insertions, 57 deletions
diff --git a/src/dialogs/shellcode.c b/src/dialogs/shellcode.c index eb727b0..36146d1 100644 --- a/src/dialogs/shellcode.c +++ b/src/dialogs/shellcode.c @@ -245,17 +245,14 @@ static void export_assistant_close(GtkAssistant *assistant, GObject *ref) static void register_bincode_panel(GtkAssistant *assistant) { - GtkWidget *alignment; /* Disposition sur le support */ GtkWidget *vbox; /* Support principal */ GtkWidget *scrolledwindow; /* Support avec défilement */ GtkWidget *textview; /* Zone de texte */ GtkWidget *label; /* Etiquette du bilan */ - alignment = qck_create_padded_alignment(8, 8, 8, 8); - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); + qck_set_margins(vbox, 8, 8, 8, 8); gtk_widget_show(vbox); - gtk_container_add(GTK_CONTAINER(alignment), vbox); /* Réception du code */ @@ -282,11 +279,11 @@ static void register_bincode_panel(GtkAssistant *assistant) /* Intégration */ - gtk_assistant_append_page(assistant, alignment); - gtk_assistant_set_page_title(assistant, alignment, _("Code")); - gtk_assistant_set_page_type(assistant, alignment, GTK_ASSISTANT_PAGE_INTRO); + gtk_assistant_append_page(assistant, vbox); + gtk_assistant_set_page_title(assistant, vbox, _("Code")); + gtk_assistant_set_page_type(assistant, vbox, GTK_ASSISTANT_PAGE_INTRO); - gtk_assistant_set_page_complete(assistant, alignment, TRUE); + gtk_assistant_set_page_complete(assistant, vbox, TRUE); } @@ -497,21 +494,13 @@ static void on_bincode_changed(GtkTextBuffer *textbuffer, GObject *ref) static void register_archi_panel(GtkAssistant *assistant) { - GtkWidget *alignment; /* Disposition sur le support */ GtkWidget *vbox; /* Support principal */ GtkWidget *label; /* Etiquette d'indication */ GtkWidget *combobox; /* Sélection du format */ - - - - - - alignment = qck_create_padded_alignment(8, 8, 8, 8); - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); + qck_set_margins(vbox, 8, 8, 8, 8); gtk_widget_show(vbox); - gtk_container_add(GTK_CONTAINER(alignment), vbox); /* Choix de l'architecture */ @@ -540,11 +529,11 @@ static void register_archi_panel(GtkAssistant *assistant) /* Intégration */ - gtk_assistant_append_page(assistant, alignment); - gtk_assistant_set_page_title(assistant, alignment, _("Architecture")); - gtk_assistant_set_page_type(assistant, alignment, GTK_ASSISTANT_PAGE_CONFIRM); + gtk_assistant_append_page(assistant, vbox); + gtk_assistant_set_page_title(assistant, vbox, _("Architecture")); + gtk_assistant_set_page_type(assistant, vbox, GTK_ASSISTANT_PAGE_CONFIRM); - gtk_assistant_set_page_complete(assistant, alignment, TRUE); + gtk_assistant_set_page_complete(assistant, vbox, TRUE); } @@ -576,7 +565,6 @@ static void register_archi_panel(GtkAssistant *assistant) static void register_output_panel(GtkAssistant *assistant) { - GtkWidget *alignment; /* Disposition sur le support */ GtkWidget *vbox; /* Support principal #1 */ GtkWidget *hbox; /* Support principal #2 */ GtkWidget *label; /* Etiquette d'indication */ @@ -586,11 +574,9 @@ static void register_output_panel(GtkAssistant *assistant) GLoadedBinary *binary; /* Binaire chargé à parcourir */ const char *filename; /* Chemin d'accès par défaut */ - alignment = qck_create_padded_alignment(8, 8, 8, 8); - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); + qck_set_margins(vbox, 8, 8, 8, 8); gtk_widget_show(vbox); - gtk_container_add(GTK_CONTAINER(alignment), vbox); /* Format de sortie */ @@ -625,11 +611,11 @@ static void register_output_panel(GtkAssistant *assistant) /* Intégration */ - gtk_assistant_append_page(assistant, alignment); - gtk_assistant_set_page_title(assistant, alignment, _("Output")); - gtk_assistant_set_page_type(assistant, alignment, GTK_ASSISTANT_PAGE_CONTENT); + gtk_assistant_append_page(assistant, vbox); + gtk_assistant_set_page_title(assistant, vbox, _("Output")); + gtk_assistant_set_page_type(assistant, vbox, GTK_ASSISTANT_PAGE_CONTENT); - gtk_assistant_set_page_complete(assistant, alignment, TRUE); + gtk_assistant_set_page_complete(assistant, vbox, TRUE); /* Choix par défaut */ /* @@ -736,70 +722,62 @@ static void on_filename_browsing_clicked(GtkButton *button, GObject *ref) static void register_content_panel(GtkAssistant *assistant) { - GtkWidget *alignment; /* Disposition sur le support */ GtkWidget *vbox; /* Support principal */ GtkWidget *frame; /* Support avec encadrement */ - GtkWidget *subalign; /* Disposition des options */ - - GtkWidget *vbox3; + GtkWidget *subvbox; /* Support secondaire */ GtkWidget *checkbutton; /* Coche pour une option */ - GtkWidget *vbox4; - - alignment = qck_create_padded_alignment(8, 8, 8, 8); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); + qck_set_margins(vbox, 8, 8, 8, 8); gtk_widget_show(vbox); - gtk_container_add(GTK_CONTAINER(alignment), vbox); /* Lignes à traiter */ - frame = qck_create_frame(_("<b>Lines to process</b>"), &subalign, 0, 0, 12, 0); - gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0); + subvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); + gtk_widget_show(subvbox); - vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); - gtk_widget_show(vbox3); - gtk_container_add(GTK_CONTAINER(subalign), vbox3); + frame = qck_create_frame(_("<b>Lines to process</b>"), subvbox, 0, 0, 12, 0); + gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0); checkbutton = qck_create_check_button(G_OBJECT(assistant), "prologue", _("Prologue"), NULL, NULL); - gtk_box_pack_start(GTK_BOX(vbox3), checkbutton, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(subvbox), checkbutton, FALSE, FALSE, 0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), TRUE); checkbutton = qck_create_check_button(G_OBJECT(assistant), "code", _("Code"), NULL, NULL); - gtk_box_pack_start(GTK_BOX(vbox3), checkbutton, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(subvbox), checkbutton, FALSE, FALSE, 0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), TRUE); checkbutton = qck_create_check_button(G_OBJECT(assistant), "comments", _("Comments"), NULL, NULL); - gtk_box_pack_start(GTK_BOX(vbox3), checkbutton, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(subvbox), checkbutton, FALSE, FALSE, 0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), TRUE); /* Eléments à afficher */ - frame = qck_create_frame(_("<b>Items to display</b>"), &subalign, 0, 0, 12, 0); - gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0); + subvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); + gtk_widget_show(subvbox); - vbox4 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); - gtk_widget_show(vbox4); - gtk_container_add(GTK_CONTAINER(subalign), vbox4); + frame = qck_create_frame(_("<b>Items to display</b>"), subvbox, 0, 0, 12, 0); + gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0); checkbutton = qck_create_check_button(G_OBJECT(assistant), "virtual_addr", _("Virtual address"), NULL, NULL); - gtk_box_pack_start(GTK_BOX(vbox4), checkbutton, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(subvbox), checkbutton, FALSE, FALSE, 0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), TRUE); checkbutton = qck_create_check_button(G_OBJECT(assistant), "binary_code", _("Binary code"), NULL, NULL); - gtk_box_pack_start(GTK_BOX(vbox4), checkbutton, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(subvbox), checkbutton, FALSE, FALSE, 0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), TRUE); checkbutton = qck_create_check_button(G_OBJECT(assistant), "assembly_code", _("Assembly code"), NULL, NULL); - gtk_box_pack_start(GTK_BOX(vbox4), checkbutton, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(subvbox), checkbutton, FALSE, FALSE, 0); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), TRUE); /* Intégration */ - gtk_assistant_append_page(assistant, alignment); - gtk_assistant_set_page_title(assistant, alignment, _("Exported content")); - gtk_assistant_set_page_type(assistant, alignment, GTK_ASSISTANT_PAGE_CONFIRM); + gtk_assistant_append_page(assistant, vbox); + gtk_assistant_set_page_title(assistant, vbox, _("Exported content")); + gtk_assistant_set_page_type(assistant, vbox, GTK_ASSISTANT_PAGE_CONFIRM); - gtk_assistant_set_page_complete(assistant, alignment, TRUE); + gtk_assistant_set_page_complete(assistant, vbox, TRUE); } |