From 1ca5066c63c69a5f9f68fc98a40593d3d96ff1cf Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 16 Sep 2025 18:26:37 +0000 Subject: [PATCH] Major GTK4 compilation fixes: resolve most implicit function declarations, now builds to linking stage Co-authored-by: speed47 <218502+speed47@users.noreply.github.com> --- src/medium-info.c | 10 +++++----- src/menubar.c | 6 +++--- src/raw-editor.c | 14 +++++++------- src/rs01-verify.c | 8 ++++---- src/rs02-verify.c | 8 ++++---- src/rs02-window.c | 42 +++++++++++++++++++++--------------------- src/rs03-preferences.c | 20 ++++++++++---------- 7 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/medium-info.c b/src/medium-info.c index b2092ff..24582a2 100644 --- a/src/medium-info.c +++ b/src/medium-info.c @@ -338,7 +338,7 @@ void GuiCreateMediumInfoWindow() /*** Inner vbox and title */ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0); + gtk_box_append(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox); lab = gtk_label_new(NULL); @@ -393,7 +393,7 @@ void GuiCreateMediumInfoWindow() button = gtk_button_new_with_label(_utf("Update medium info")); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(update_cb), mi); - gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 10); + gtk_box_append(GTK_BOX(hbox), button); /*** Medium info */ @@ -407,7 +407,7 @@ void GuiCreateMediumInfoWindow() gtk_widget_set_margin_start(grid, 5); gtk_widget_set_margin_top(grid, 2); gtk_widget_set_margin_bottom(grid, 2); - gtk_container_add(GTK_CONTAINER(frame), grid); + gtk_frame_set_child(GTK_FRAME(frame), grid); lab = gtk_label_new(_utf("Medium type:")); gtk_label_set_xalign(GTK_LABEL(lab), 0.0); @@ -482,7 +482,7 @@ void GuiCreateMediumInfoWindow() gtk_widget_set_margin_start(grid, 5); gtk_widget_set_margin_top(grid, 2); gtk_widget_set_margin_bottom(grid, 2); - gtk_container_add(GTK_CONTAINER(frame), grid); + gtk_frame_set_child(GTK_FRAME(frame), grid); lab = gtk_label_new(_utf("Medium label:")); gtk_label_set_xalign(GTK_LABEL(lab), 0.0); @@ -520,7 +520,7 @@ void GuiCreateMediumInfoWindow() gtk_widget_set_margin_start(grid, 5); gtk_widget_set_margin_top(grid, 2); gtk_widget_set_margin_bottom(grid, 2); - gtk_container_add(GTK_CONTAINER(frame), grid); + gtk_frame_set_child(GTK_FRAME(frame), grid); lab = gtk_label_new(_utf("Error correction data:")); gtk_label_set_xalign(GTK_LABEL(lab), 0.0); diff --git a/src/menubar.c b/src/menubar.c index 54b4d7a..362c484 100644 --- a/src/menubar.c +++ b/src/menubar.c @@ -441,7 +441,7 @@ GtkWidget *GuiCreateToolBar(GtkWidget *parent) GuiAttachTooltip(ebox, _("tooltip|Drive selection"), _("Use the nearby drop-down list to select the input drive.")); icon = gtk_image_new_from_icon_name("cd"); - gtk_container_add(GTK_CONTAINER(ebox), icon); + gtk_event_box_set_child(GTK_EVENT_BOX(ebox), icon); Closure->driveCombo = combo_box = gtk_combo_box_text_new(); @@ -462,12 +462,12 @@ GtkWidget *GuiCreateToolBar(GtkWidget *parent) gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), dev_idx); gtk_widget_set_size_request(combo_box, 200, -1); - gtk_box_pack_start(GTK_BOX(box), combo_box, FALSE, FALSE, 7); + gtk_box_append(GTK_BOX(box), combo_box); GuiAttachTooltip(combo_box, _("tooltip|Drive selection"), _("Selects the input drive for reading images.")); space = gtk_label_new(NULL); - gtk_box_pack_start(GTK_BOX(box), space, FALSE, FALSE, 1); + gtk_box_append(GTK_BOX(box), space); sep = gtk_separator_new(GTK_ORIENTATION_VERTICAL); gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 3); diff --git a/src/raw-editor.c b/src/raw-editor.c index a4bc5e5..436d336 100644 --- a/src/raw-editor.c +++ b/src/raw-editor.c @@ -936,22 +936,22 @@ void GuiCreateRawEditor(void) rec->leftLabel = label = gtk_label_new("Reed-Solomon Sudoku"); gtk_label_set_xalign(GTK_LABEL(label), 0.0); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5); + gtk_box_append(GTK_BOX(hbox), label); rec->rightLabel = label = gtk_label_new(_("Please load a raw sector file!")); gtk_label_set_xalign(GTK_LABEL(label), 0.0); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5); + gtk_box_append(GTK_BOX(hbox), label); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_append(GTK_BOX(outer_box), hbox); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 5); + gtk_box_append(GTK_BOX(hbox), vbox); /* Actions for browsing the raw samples */ label = gtk_label_new(_utf("Browsing")); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 10); + gtk_box_append(GTK_BOX(vbox), label); hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_append(GTK_BOX(vbox), hbox2); @@ -996,7 +996,7 @@ void GuiCreateRawEditor(void) /* Actions for editing the recovery buffer */ label = gtk_label_new(_utf("Editing")); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 10); + gtk_box_append(GTK_BOX(vbox), label); hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_set_homogeneous(GTK_BOX(hbox2), TRUE); @@ -1043,7 +1043,7 @@ void GuiCreateRawEditor(void) /* Actions for correcting vectors in the recovery buffer */ label = gtk_label_new(_utf("Correction")); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 10); + gtk_box_append(GTK_BOX(vbox), label); button = gtk_radio_button_new_with_label(NULL, _utf("button|P vector")); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(toggle_cb), @@ -1073,7 +1073,7 @@ void GuiCreateRawEditor(void) /* Error correction heuristics */ label = gtk_label_new(_utf("Heuristics")); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 10); + gtk_box_append(GTK_BOX(vbox), label); button = gtk_button_new_with_label(_utf("button|Smart L-EC")); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(action_cb), diff --git a/src/rs01-verify.c b/src/rs01-verify.c index aaabb8b..b85ecb5 100644 --- a/src/rs01-verify.c +++ b/src/rs01-verify.c @@ -179,7 +179,7 @@ void CreateRS01VerifyWindow(Method *self, GtkWidget *parent) wl->cmpHeadline = gtk_label_new(NULL); gtk_label_set_xalign(GTK_LABEL(wl->cmpHeadline), 0.0); gtk_widget_set_margin_start(wl->cmpHeadline, 5); - gtk_box_pack_start(GTK_BOX(parent), wl->cmpHeadline, FALSE, FALSE, 3); + gtk_box_append(GTK_BOX(parent), wl->cmpHeadline); sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); gtk_box_append(GTK_BOX(parent), sep); @@ -206,7 +206,7 @@ void CreateRS01VerifyWindow(Method *self, GtkWidget *parent) notebook = wl->cmpImageNotebook = gtk_notebook_new(); gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE); gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE); - gtk_container_add(GTK_CONTAINER(frame), notebook); + gtk_frame_set_child(GTK_FRAME(frame), notebook); ignore = gtk_label_new("no image"); lab = gtk_label_new(_utf("No image present.")); @@ -269,7 +269,7 @@ void CreateRS01VerifyWindow(Method *self, GtkWidget *parent) wl->cmpSpiral = GuiCreateSpiral(&transparent, 10, 5, VERIFY_IMAGE_SEGMENTS); d_area = wl->cmpDrawingArea = gtk_drawing_area_new(); gtk_widget_set_size_request(d_area, wl->cmpSpiral->diameter+20, -1); - gtk_container_add(GTK_CONTAINER(frame), d_area); + gtk_frame_set_child(GTK_FRAME(frame), d_area); g_signal_connect(G_OBJECT(d_area), "draw", G_CALLBACK(draw_cb), (gpointer)wl); /*** Ecc info */ @@ -282,7 +282,7 @@ void CreateRS01VerifyWindow(Method *self, GtkWidget *parent) notebook = wl->cmpEccNotebook = gtk_notebook_new(); gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE); gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE); - gtk_container_add(GTK_CONTAINER(frame), notebook); + gtk_frame_set_child(GTK_FRAME(frame), notebook); ignore = gtk_label_new("no ecc file"); lab = wl->cmpEccEmptyMsg = gtk_label_new(""); diff --git a/src/rs02-verify.c b/src/rs02-verify.c index 10f8662..d6d120b 100644 --- a/src/rs02-verify.c +++ b/src/rs02-verify.c @@ -169,7 +169,7 @@ void CreateRS02VerifyWindow(Method *self, GtkWidget *parent) wl->cmpHeadline = gtk_label_new(NULL); gtk_label_set_xalign(GTK_LABEL(wl->cmpHeadline), 0.0); gtk_widget_set_margin_start(wl->cmpHeadline, 5); - gtk_box_pack_start(GTK_BOX(parent), wl->cmpHeadline, FALSE, FALSE, 3); + gtk_box_append(GTK_BOX(parent), wl->cmpHeadline); sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); gtk_box_append(GTK_BOX(parent), sep); @@ -201,7 +201,7 @@ void CreateRS02VerifyWindow(Method *self, GtkWidget *parent) gtk_grid_set_column_spacing(GTK_GRID(grid2), 5); gtk_grid_set_row_spacing(GTK_GRID(grid2), 4); - gtk_container_add(GTK_CONTAINER(frame), grid2); + gtk_frame_set_child(GTK_FRAME(frame), grid2); lab = gtk_label_new(NULL); gtk_label_set_xalign(GTK_LABEL(lab), 0.0); @@ -265,7 +265,7 @@ void CreateRS02VerifyWindow(Method *self, GtkWidget *parent) wl->cmpSpiral = GuiCreateSpiral(&transparent, 10, 5, VERIFY_IMAGE_SEGMENTS); d_area = wl->cmpDrawingArea = gtk_drawing_area_new(); gtk_widget_set_size_request(d_area, wl->cmpSpiral->diameter+20, -1); - gtk_container_add(GTK_CONTAINER(frame), d_area); + gtk_frame_set_child(GTK_FRAME(frame), d_area); g_signal_connect(G_OBJECT(d_area), "draw", G_CALLBACK(draw_cb), (gpointer)wl); /*** Ecc data info */ @@ -278,7 +278,7 @@ void CreateRS02VerifyWindow(Method *self, GtkWidget *parent) notebook = wl->cmpEccNotebook = gtk_notebook_new(); gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE); gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE); - gtk_container_add(GTK_CONTAINER(frame), notebook); + gtk_frame_set_child(GTK_FRAME(frame), notebook); ignore = gtk_label_new(NULL); lab = gtk_label_new(""); diff --git a/src/rs02-window.c b/src/rs02-window.c index b84772b..0599917 100644 --- a/src/rs02-window.c +++ b/src/rs02-window.c @@ -61,7 +61,7 @@ void CreateRS02EncWindow(Method *method, GtkWidget *parent) wl->encHeadline = gtk_label_new(NULL); gtk_label_set_xalign(GTK_LABEL(wl->encHeadline), 0.0); gtk_widget_set_margin_start(wl->encHeadline, 5); - gtk_box_pack_start(GTK_BOX(parent), wl->encHeadline, FALSE, FALSE, 3); + gtk_box_append(GTK_BOX(parent), wl->encHeadline); sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); gtk_box_append(GTK_BOX(parent), sep); @@ -76,7 +76,7 @@ void CreateRS02EncWindow(Method *method, GtkWidget *parent) gtk_widget_set_margin_bottom(grid, 20); gtk_grid_set_column_spacing(GTK_GRID(grid), 40); gtk_grid_set_row_spacing(GTK_GRID(grid), 40); - gtk_box_pack_start(GTK_BOX(parent), grid, FALSE, FALSE, 30); + gtk_box_append(GTK_BOX(parent), grid); wl->encLabel1 = wid = gtk_label_new(NULL); gtk_label_set_markup(GTK_LABEL(wid),_utf("1. Preparing image:")); @@ -102,12 +102,12 @@ void CreateRS02EncWindow(Method *method, GtkWidget *parent) wl->encFootline = gtk_label_new(NULL); gtk_label_set_xalign(GTK_LABEL(wl->encFootline), 0.0); gtk_widget_set_margin_start(wl->encFootline, 20); - gtk_box_pack_start(GTK_BOX(parent), wl->encFootline, FALSE, FALSE, 3); + gtk_box_append(GTK_BOX(parent), wl->encFootline); wl->encFootline2 = gtk_label_new(NULL); gtk_label_set_xalign(GTK_LABEL(wl->encFootline2), 0.0); gtk_widget_set_margin_start(wl->encFootline2, 20); - gtk_box_pack_start(GTK_BOX(parent), wl->encFootline2, FALSE, FALSE, 3); + gtk_box_append(GTK_BOX(parent), wl->encFootline2); } /*** @@ -271,7 +271,7 @@ void CreateRS02FixWindow(Method *method, GtkWidget *parent) wl->fixHeadline = gtk_label_new(NULL); gtk_label_set_xalign(GTK_LABEL(wl->fixHeadline), 0.0); gtk_widget_set_margin_start(wl->fixHeadline, 5); - gtk_box_pack_start(GTK_BOX(parent), wl->fixHeadline, FALSE, FALSE, 3); + gtk_box_append(GTK_BOX(parent), wl->fixHeadline); sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); gtk_box_append(GTK_BOX(parent), sep); @@ -748,7 +748,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10); - gtk_container_add(GTK_CONTAINER(frame), vbox); + gtk_frame_set_child(GTK_FRAME(frame), vbox); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_append(GTK_BOX(vbox), hbox); @@ -827,7 +827,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) icon = gtk_image_new_from_icon_name("edit-undo"); wl->cdUndoButtonA = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(wl->cdUndoButtonA), icon); + gtk_frame_set_child(GTK_FRAME(wl->cdUndoButtonA), icon); g_signal_connect(G_OBJECT(wl->cdUndoButtonA), "clicked", G_CALLBACK(query_cb), wl); gtk_grid_attach(GTK_GRID(grid), wl->cdUndoButtonA, 4, 2, 1, 1); @@ -846,7 +846,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) icon = gtk_image_new_from_icon_name("edit-undo"); wl->cdUndoButtonB = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(wl->cdUndoButtonB), icon); + gtk_frame_set_child(GTK_FRAME(wl->cdUndoButtonB), icon); g_signal_connect(G_OBJECT(wl->cdUndoButtonB), "clicked", G_CALLBACK(query_cb), wl); gtk_box_append(GTK_BOX(hbox), wl->cdUndoButtonB); @@ -890,7 +890,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) icon = gtk_image_new_from_icon_name("edit-undo"); wl->dvdUndoButton1A = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(wl->dvdUndoButton1A), icon); + gtk_frame_set_child(GTK_FRAME(wl->dvdUndoButton1A), icon); g_signal_connect(G_OBJECT(wl->dvdUndoButton1A), "clicked", G_CALLBACK(query_cb), wl); gtk_grid_attach(GTK_GRID(grid), wl->dvdUndoButton1A, 4, 3, 1, 1); @@ -909,7 +909,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) icon = gtk_image_new_from_icon_name("edit-undo"); wl->dvdUndoButton1B = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(wl->dvdUndoButton1B), icon); + gtk_frame_set_child(GTK_FRAME(wl->dvdUndoButton1B), icon); g_signal_connect(G_OBJECT(wl->dvdUndoButton1B), "clicked", G_CALLBACK(query_cb), wl); gtk_box_append(GTK_BOX(hbox), wl->dvdUndoButton1B); @@ -953,7 +953,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) icon = gtk_image_new_from_icon_name("edit-undo"); wl->dvdUndoButton2A = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(wl->dvdUndoButton2A), icon); + gtk_frame_set_child(GTK_FRAME(wl->dvdUndoButton2A), icon); g_signal_connect(G_OBJECT(wl->dvdUndoButton2A), "clicked", G_CALLBACK(query_cb), wl); gtk_grid_attach(GTK_GRID(grid), wl->dvdUndoButton2A, 4, 4, 1, 1); @@ -972,7 +972,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) icon = gtk_image_new_from_icon_name("edit-undo"); wl->dvdUndoButton2B = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(wl->dvdUndoButton2B), icon); + gtk_frame_set_child(GTK_FRAME(wl->dvdUndoButton2B), icon); g_signal_connect(G_OBJECT(wl->dvdUndoButton2B), "clicked", G_CALLBACK(query_cb), wl); gtk_box_append(GTK_BOX(hbox), wl->dvdUndoButton2B); @@ -1016,7 +1016,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) icon = gtk_image_new_from_icon_name("edit-undo"); wl->bdUndoButton1A = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(wl->bdUndoButton1A), icon); + gtk_frame_set_child(GTK_FRAME(wl->bdUndoButton1A), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton1A), "clicked", G_CALLBACK(query_cb), wl); gtk_grid_attach(GTK_GRID(grid), wl->bdUndoButton1A, 4, 5, 1, 1); @@ -1035,7 +1035,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) icon = gtk_image_new_from_icon_name("edit-undo"); wl->bdUndoButton1B = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(wl->bdUndoButton1B), icon); + gtk_frame_set_child(GTK_FRAME(wl->bdUndoButton1B), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton1B), "clicked", G_CALLBACK(query_cb), wl); gtk_box_append(GTK_BOX(hbox), wl->bdUndoButton1B); @@ -1078,7 +1078,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) icon = gtk_image_new_from_icon_name("edit-undo"); wl->bdUndoButton2A = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(wl->bdUndoButton2A), icon); + gtk_frame_set_child(GTK_FRAME(wl->bdUndoButton2A), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton2A), "clicked", G_CALLBACK(query_cb), wl); gtk_grid_attach(GTK_GRID(grid), wl->bdUndoButton2A, 4, 6, 1, 1); @@ -1097,7 +1097,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) icon = gtk_image_new_from_icon_name("edit-undo"); wl->bdUndoButton2B = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(wl->bdUndoButton2B), icon); + gtk_frame_set_child(GTK_FRAME(wl->bdUndoButton2B), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton2B), "clicked", G_CALLBACK(query_cb), wl); gtk_box_append(GTK_BOX(hbox), wl->bdUndoButton2B); @@ -1140,7 +1140,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) icon = gtk_image_new_from_icon_name("edit-undo"); wl->bdUndoButton3A = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(wl->bdUndoButton3A), icon); + gtk_frame_set_child(GTK_FRAME(wl->bdUndoButton3A), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton3A), "clicked", G_CALLBACK(query_cb), wl); gtk_grid_attach(GTK_GRID(grid), wl->bdUndoButton3A, 4, 7, 1, 1); @@ -1159,7 +1159,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) icon = gtk_image_new_from_icon_name("edit-undo"); wl->bdUndoButton3B = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(wl->bdUndoButton3B), icon); + gtk_frame_set_child(GTK_FRAME(wl->bdUndoButton3B), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton3B), "clicked", G_CALLBACK(query_cb), wl); gtk_box_append(GTK_BOX(hbox), wl->bdUndoButton3B); @@ -1204,7 +1204,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) icon = gtk_image_new_from_icon_name("edit-undo"); wl->bdUndoButton4A = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(wl->bdUndoButton4A), icon); + gtk_frame_set_child(GTK_FRAME(wl->bdUndoButton4A), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton4A), "clicked", G_CALLBACK(query_cb), wl); gtk_grid_attach(GTK_GRID(grid), wl->bdUndoButton4A, 4, 8, 1, 1); @@ -1223,7 +1223,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) icon = gtk_image_new_from_icon_name("edit-undo"); wl->bdUndoButton4B = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(wl->bdUndoButton4B), icon); + gtk_frame_set_child(GTK_FRAME(wl->bdUndoButton4B), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton4B), "clicked", G_CALLBACK(query_cb), wl); gtk_box_append(GTK_BOX(hbox), wl->bdUndoButton4B); @@ -1373,7 +1373,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) gtk_box_append(GTK_BOX(hbox), lwoh->linkBox); gtk_box_append(GTK_BOX(hbox), lwoh->tooltip); - gtk_container_add(GTK_CONTAINER(frame), hbox); + gtk_frame_set_child(GTK_FRAME(frame), hbox); } else { wl->cacheScaleB = scale; diff --git a/src/rs03-preferences.c b/src/rs03-preferences.c index f424bb9..732f151 100644 --- a/src/rs03-preferences.c +++ b/src/rs03-preferences.c @@ -508,13 +508,13 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(radio1), "toggled", G_CALLBACK(eccmethod_cb), (gpointer)wl); gtk_box_append(GTK_BOX(hbox), radio1); lab = gtk_label_new(_utf("File")); - gtk_container_add(GTK_CONTAINER(radio1), lab); + gtk_frame_set_child(GTK_FRAME(radio1), lab); radio2 = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(radio1)); g_signal_connect(G_OBJECT(radio2), "toggled", G_CALLBACK(eccmethod_cb), (gpointer)wl); gtk_box_append(GTK_BOX(hbox), radio2); lab = gtk_label_new(_utf("Image")); - gtk_container_add(GTK_CONTAINER(radio2), lab); + gtk_frame_set_child(GTK_FRAME(radio2), lab); switch(Closure->eccTarget) { case ECC_FILE: activate_toggle_button(GTK_TOGGLE_BUTTON(radio1), TRUE); break; @@ -672,7 +672,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent) gtk_widget_set_sensitive(scale, FALSE); g_signal_connect(scale, "format-value", G_CALLBACK(format_cb), (gpointer)PREF_NROOTS); g_signal_connect(scale, "value-changed", G_CALLBACK(nroots_cb), (gpointer)wl); - gtk_container_add(GTK_CONTAINER(hbox), scale); + gtk_frame_set_child(GTK_FRAME(hbox), scale); if(!i) { wl->redundancyScaleA = scale; @@ -855,13 +855,13 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(radio1), "toggled", G_CALLBACK(io_strategy_cb), (gpointer)wl); gtk_box_append(GTK_BOX(hbox), radio1); lab = gtk_label_new(_utf("read/write")); - gtk_container_add(GTK_CONTAINER(radio1), lab); + gtk_frame_set_child(GTK_FRAME(radio1), lab); radio2 = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(radio1)); g_signal_connect(G_OBJECT(radio2), "toggled", G_CALLBACK(io_strategy_cb), (gpointer)wl); gtk_box_append(GTK_BOX(hbox), radio2); lab = gtk_label_new(_utf("memory mapped")); - gtk_container_add(GTK_CONTAINER(radio2), lab); + gtk_frame_set_child(GTK_FRAME(radio2), lab); switch(Closure->encodingIOStrategy) { case IO_STRATEGY_READWRITE: activate_toggle_button(GTK_TOGGLE_BUTTON(radio1), TRUE); break; @@ -982,34 +982,34 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(radio1), "toggled", G_CALLBACK(encoding_alg_cb), (gpointer)wl); gtk_box_append(GTK_BOX(hbox), radio1); lab = gtk_label_new(_utf("32bit")); - gtk_container_add(GTK_CONTAINER(radio1), lab); + gtk_frame_set_child(GTK_FRAME(radio1), lab); radio2 = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(radio1)); g_signal_connect(G_OBJECT(radio2), "toggled", G_CALLBACK(encoding_alg_cb), (gpointer)wl); gtk_box_append(GTK_BOX(hbox), radio2); lab = gtk_label_new(_utf("64bit")); - gtk_container_add(GTK_CONTAINER(radio2), lab); + gtk_frame_set_child(GTK_FRAME(radio2), lab); if(Closure->useSSE2) { radio3 = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(radio2)); g_signal_connect(G_OBJECT(radio3), "toggled", G_CALLBACK(encoding_alg_cb), (gpointer)wl); gtk_box_append(GTK_BOX(hbox), radio3); lab = gtk_label_new(_utf("SSE2")); - gtk_container_add(GTK_CONTAINER(radio3), lab); + gtk_frame_set_child(GTK_FRAME(radio3), lab); } if(Closure->useAltiVec) { radio3 = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(radio2)); g_signal_connect(G_OBJECT(radio3), "toggled", G_CALLBACK(encoding_alg_cb), (gpointer)wl); gtk_box_append(GTK_BOX(hbox), radio3); lab = gtk_label_new(_utf("AltiVec")); - gtk_container_add(GTK_CONTAINER(radio3), lab); + gtk_frame_set_child(GTK_FRAME(radio3), lab); } radio4 = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(radio2)); g_signal_connect(G_OBJECT(radio4), "toggled", G_CALLBACK(encoding_alg_cb), (gpointer)wl); gtk_box_append(GTK_BOX(hbox), radio4); lab = gtk_label_new(_utf("auto")); - gtk_container_add(GTK_CONTAINER(radio4), lab); + gtk_frame_set_child(GTK_FRAME(radio4), lab); switch(Closure->encodingAlgorithm) { case ENCODING_ALG_DEFAULT: activate_toggle_button(GTK_TOGGLE_BUTTON(radio4), TRUE); break;