Skip to content

Commit 9a13433

Browse files
mithromithro
authored
Merge pull request #1514 from mithro/gtk-warning-fix
vpr: Fixing the usage of deprecated GTK methods in drawing code.
2 parents cd51c6b + 304f548 commit 9a13433

File tree

1 file changed

+42
-42
lines changed

1 file changed

+42
-42
lines changed

‎vpr/src/draw/draw_debug.cpp

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ void draw_debug_window() {
4444
GtkWidget* mainGrid = gtk_grid_new();
4545
gtk_widget_set_margin_top(mainGrid, 30);
4646
gtk_widget_set_margin_bottom(mainGrid, 30);
47-
gtk_widget_set_margin_left(mainGrid, 30);
48-
gtk_widget_set_margin_right(mainGrid, 20);
47+
gtk_widget_set_margin_start(mainGrid, 30);
48+
gtk_widget_set_margin_end(mainGrid, 20);
4949

5050
//create all labels
5151
GtkWidget* placerOpts = gtk_label_new(NULL);
@@ -61,43 +61,43 @@ void draw_debug_window() {
6161
gtk_widget_set_margin_top(bplist, 30);
6262
GtkWidget* movesLabel = gtk_label_new("Number of moves to proceed");
6363
gtk_widget_set_halign(movesLabel, GTK_ALIGN_END);
64-
gtk_widget_set_margin_right(movesLabel, 8);
64+
gtk_widget_set_margin_end(movesLabel, 8);
6565
GtkWidget* tempsLabel = gtk_label_new("Temperatures to proceed:");
6666
gtk_widget_set_halign(tempsLabel, GTK_ALIGN_END);
67-
gtk_widget_set_margin_right(tempsLabel, 8);
67+
gtk_widget_set_margin_end(tempsLabel, 8);
6868
GtkWidget* blockLabel = gtk_label_new("Stop at from_block");
6969
gtk_widget_set_halign(blockLabel, GTK_ALIGN_END);
70-
gtk_widget_set_margin_right(blockLabel, 8);
70+
gtk_widget_set_margin_end(blockLabel, 8);
7171
GtkWidget* iterLabel = gtk_label_new("Stop at router iteration");
7272
gtk_widget_set_halign(iterLabel, GTK_ALIGN_END);
73-
gtk_widget_set_margin_right(iterLabel, 8);
73+
gtk_widget_set_margin_end(iterLabel, 8);
7474
GtkWidget* netLabel = gtk_label_new("Stop at route_net_id");
7575
gtk_widget_set_halign(netLabel, GTK_ALIGN_END);
76-
gtk_widget_set_margin_right(netLabel, 8);
76+
gtk_widget_set_margin_end(netLabel, 8);
7777
GtkWidget* star = gtk_label_new("*for handling multiple breakpoints at once using an expression can be more accurate");
7878
gtk_widget_set_margin_top(star, 15);
7979

8080
//create all buttons
8181
GtkWidget* setM = gtk_button_new_with_label("Set");
8282
gtk_widget_set_halign(setM, GTK_ALIGN_START);
8383
gtk_widget_set_margin_bottom(setM, 10);
84-
gtk_widget_set_margin_left(setM, 10);
84+
gtk_widget_set_margin_start(setM, 10);
8585
GtkWidget* setT = gtk_button_new_with_label("Set");
8686
gtk_widget_set_halign(setT, GTK_ALIGN_START);
8787
gtk_widget_set_margin_bottom(setT, 10);
88-
gtk_widget_set_margin_left(setT, 10);
88+
gtk_widget_set_margin_start(setT, 10);
8989
GtkWidget* setB = gtk_button_new_with_label("Set");
9090
gtk_widget_set_halign(setB, GTK_ALIGN_START);
91-
gtk_widget_set_margin_left(setB, 10);
91+
gtk_widget_set_margin_start(setB, 10);
9292
GtkWidget* setI = gtk_button_new_with_label("Set");
9393
gtk_widget_set_halign(setI, GTK_ALIGN_START);
94-
gtk_widget_set_margin_left(setI, 10);
94+
gtk_widget_set_margin_start(setI, 10);
9595
GtkWidget* setN = gtk_button_new_with_label("Set");
9696
gtk_widget_set_halign(setN, GTK_ALIGN_START);
97-
gtk_widget_set_margin_left(setN, 10);
97+
gtk_widget_set_margin_start(setN, 10);
9898
GtkWidget* advanced = gtk_button_new_with_label("Advanced");
99-
gtk_widget_set_margin_left(advanced, 60);
100-
gtk_widget_set_margin_right(advanced, 10);
99+
gtk_widget_set_margin_start(advanced, 60);
100+
gtk_widget_set_margin_end(advanced, 10);
101101
gtk_widget_set_margin_top(advanced, 20);
102102

103103
//create all entries
@@ -215,15 +215,15 @@ void advanced_button_callback() {
215215
gtk_widget_set_halign(expander, GTK_ALIGN_START);
216216

217217
//set margins
218-
gtk_widget_set_margin_left(instructions, 30);
219-
gtk_widget_set_margin_right(instructions, 30);
218+
gtk_widget_set_margin_start(instructions, 30);
219+
gtk_widget_set_margin_end(instructions, 30);
220220
gtk_widget_set_margin_top(instructions, 30);
221221
gtk_widget_set_margin_bottom(instructions, 30);
222222
gtk_widget_set_margin_bottom(expression_here, 5);
223-
gtk_widget_set_margin_left(entry, 30);
224-
gtk_widget_set_margin_right(set, 30);
225-
gtk_widget_set_margin_left(set, 40);
226-
gtk_widget_set_margin_left(expander, 10);
223+
gtk_widget_set_margin_start(entry, 30);
224+
gtk_widget_set_margin_end(set, 30);
225+
gtk_widget_set_margin_start(set, 40);
226+
gtk_widget_set_margin_start(expander, 10);
227227
gtk_widget_set_margin_top(expander, 20);
228228

229229
//grid settings
@@ -268,7 +268,7 @@ void refresh_bpList() {
268268
if (draw_state->list_of_breakpoints[i].active)
269269
gtk_toggle_button_set_active((GtkToggleButton*)checkbox, TRUE);
270270
gtk_grid_attach((GtkGrid*)draw_debug_glob_vars.bpGrid, checkbox, 1, i, 1, 1);
271-
gtk_widget_set_margin_left(checkbox, 290 - draw_debug_glob_vars.bp_labels[i].size());
271+
gtk_widget_set_margin_start(checkbox, 290 - draw_debug_glob_vars.bp_labels[i].size());
272272
gtk_widget_set_halign(checkbox, GTK_ALIGN_END);
273273
gtk_widget_set_valign(checkbox, GTK_ALIGN_CENTER);
274274

@@ -282,7 +282,7 @@ void refresh_bpList() {
282282
gtk_grid_attach((GtkGrid*)draw_debug_glob_vars.bpGrid, deleteButton, 2, i, 1, 1);
283283
gtk_widget_set_halign(deleteButton, GTK_ALIGN_END);
284284
gtk_widget_set_valign(deleteButton, GTK_ALIGN_CENTER);
285-
gtk_widget_set_margin_left(deleteButton, 10);
285+
gtk_widget_set_margin_start(deleteButton, 10);
286286

287287
gtk_widget_show_all(draw_debug_glob_vars.bpGrid);
288288
}
@@ -303,7 +303,7 @@ void add_to_bpList(std::string bpDescription) {
303303
gtk_widget_set_name(checkbox, c.c_str());
304304
gtk_toggle_button_set_active((GtkToggleButton*)checkbox, TRUE);
305305
gtk_grid_attach((GtkGrid*)draw_debug_glob_vars.bpGrid, checkbox, 1, draw_debug_glob_vars.bpList_row, 1, 1);
306-
gtk_widget_set_margin_left(checkbox, 290 - bpDescription.size());
306+
gtk_widget_set_margin_start(checkbox, 290 - bpDescription.size());
307307
gtk_widget_set_halign(checkbox, GTK_ALIGN_END);
308308
gtk_widget_set_valign(checkbox, GTK_ALIGN_CENTER);
309309

@@ -317,7 +317,7 @@ void add_to_bpList(std::string bpDescription) {
317317
gtk_grid_attach((GtkGrid*)draw_debug_glob_vars.bpGrid, deleteButton, 2, draw_debug_glob_vars.bpList_row, 1, 1);
318318
gtk_widget_set_halign(deleteButton, GTK_ALIGN_END);
319319
gtk_widget_set_valign(deleteButton, GTK_ALIGN_CENTER);
320-
gtk_widget_set_margin_left(deleteButton, 10);
320+
gtk_widget_set_margin_start(deleteButton, 10);
321321

322322
gtk_widget_show_all(draw_debug_glob_vars.bpGrid);
323323
}
@@ -441,17 +441,17 @@ void invalid_breakpoint_entry_window(std::string error) {
441441

442442
//label settings
443443
GtkWidget* label = gtk_label_new(error.c_str());
444-
gtk_widget_set_margin_left(label, 30);
445-
gtk_widget_set_margin_right(label, 30);
444+
gtk_widget_set_margin_start(label, 30);
445+
gtk_widget_set_margin_end(label, 30);
446446
gtk_widget_set_margin_top(label, 30);
447447
gtk_widget_set_margin_bottom(label, 30);
448448
gtk_grid_attach((GtkGrid*)grid, label, 0, 0, 1, 1);
449449

450450
//button settings
451451
GtkWidget* button = gtk_button_new_with_label("OK");
452452
gtk_widget_set_margin_bottom(button, 30);
453-
gtk_widget_set_margin_right(button, 30);
454-
gtk_widget_set_margin_left(button, 30);
453+
gtk_widget_set_margin_end(button, 30);
454+
gtk_widget_set_margin_start(button, 30);
455455
gtk_grid_attach((GtkGrid*)grid, button, 0, 1, 1, 1);
456456
g_signal_connect(button, "clicked", G_CALLBACK(ok_close_window), window);
457457

@@ -472,59 +472,59 @@ void breakpoint_info_window(std::string bpDescription, BreakpointState draw_brea
472472

473473
//label settings
474474
GtkWidget* label = gtk_label_new(bpDescription.c_str());
475-
gtk_widget_set_margin_left(label, 30);
476-
gtk_widget_set_margin_right(label, 30);
475+
gtk_widget_set_margin_start(label, 30);
476+
gtk_widget_set_margin_end(label, 30);
477477
gtk_widget_set_margin_top(label, 30);
478478
gtk_widget_set_margin_bottom(label, 30);
479479
gtk_grid_attach((GtkGrid*)grid, label, 0, 0, 1, 1);
480480

481481
GtkWidget* curr_info = gtk_label_new(NULL);
482482
gtk_label_set_markup((GtkLabel*)curr_info, "<b>Current Information</b>");
483-
gtk_widget_set_margin_left(curr_info, 30);
484-
gtk_widget_set_margin_right(curr_info, 30);
483+
gtk_widget_set_margin_start(curr_info, 30);
484+
gtk_widget_set_margin_end(curr_info, 30);
485485
gtk_widget_set_margin_bottom(curr_info, 15);
486486
gtk_grid_attach((GtkGrid*)grid, curr_info, 0, 1, 1, 1);
487487

488488
//info grid
489489
GtkWidget* info_grid = gtk_grid_new();
490-
gtk_widget_set_margin_left(info_grid, 30);
491-
gtk_widget_set_margin_right(info_grid, 30);
490+
gtk_widget_set_margin_start(info_grid, 30);
491+
gtk_widget_set_margin_end(info_grid, 30);
492492
gtk_widget_set_margin_bottom(info_grid, 20);
493493

494494
//images
495495
GtkWidget* m = gtk_image_new_from_file("src/draw/m.png");
496496
GtkWidget* t = gtk_image_new_from_file("src/draw/t.png");
497497
GtkWidget* r = gtk_image_new_from_file("src/draw/r.png");
498498
GtkWidget* n = gtk_image_new_from_file("src/draw/n.png");
499-
gtk_widget_set_margin_left(n, 18);
499+
gtk_widget_set_margin_start(n, 18);
500500
GtkWidget* i = gtk_image_new_from_file("src/draw/i.png");
501-
gtk_widget_set_margin_left(i, 16);
501+
gtk_widget_set_margin_start(i, 16);
502502
GtkWidget* b = gtk_image_new_from_file("src/draw/b.png");
503-
gtk_widget_set_margin_left(b, 18);
503+
gtk_widget_set_margin_start(b, 18);
504504

505505
//info grid labels
506506
std::string move_num = "move_num: " + std::to_string(draw_breakpoint_state.move_num);
507507
GtkWidget* move_info = gtk_label_new(move_num.c_str());
508-
gtk_widget_set_margin_left(move_info, 5);
508+
gtk_widget_set_margin_start(move_info, 5);
509509
gtk_widget_set_halign(move_info, GTK_ALIGN_START);
510510
std::string temp_count = "temp_count: " + std::to_string(draw_breakpoint_state.temp_count);
511511
GtkWidget* temp_info = gtk_label_new(temp_count.c_str());
512-
gtk_widget_set_margin_left(temp_info, 5);
512+
gtk_widget_set_margin_start(temp_info, 5);
513513
gtk_widget_set_halign(temp_info, GTK_ALIGN_START);
514514
std::string in_blocks_affected = "in_blocks_affected: " + std::to_string(get_bp_state_globals()->get_glob_breakpoint_state()->block_affected);
515515
GtkWidget* ba_info = gtk_label_new(in_blocks_affected.c_str());
516516
gtk_widget_set_halign(ba_info, GTK_ALIGN_START);
517517
std::string block_id = "from_block: " + std::to_string(draw_breakpoint_state.from_block);
518518
GtkWidget* block_info = gtk_label_new(block_id.c_str());
519-
gtk_widget_set_margin_left(block_info, 5);
519+
gtk_widget_set_margin_start(block_info, 5);
520520
gtk_widget_set_halign(block_info, GTK_ALIGN_START);
521521
std::string router_iter = "router_iter: " + std::to_string(draw_breakpoint_state.router_iter);
522522
GtkWidget* ri_info = gtk_label_new(router_iter.c_str());
523-
gtk_widget_set_margin_left(ri_info, 5);
523+
gtk_widget_set_margin_start(ri_info, 5);
524524
gtk_widget_set_halign(ri_info, GTK_ALIGN_START);
525525
std::string net_id = "rouet_net_id: " + std::to_string(draw_breakpoint_state.route_net_id);
526526
GtkWidget* net_info = gtk_label_new(net_id.c_str());
527-
gtk_widget_set_margin_left(net_info, 5);
527+
gtk_widget_set_margin_start(net_info, 5);
528528
gtk_widget_set_halign(net_info, GTK_ALIGN_START);
529529

530530
//attach to grid

0 commit comments

Comments
 (0)