Skip to content

Commit 1857da8

Browse files
starseekerstarseeker
committed
Update defines, remove ged header includes
1 parent cc23246 commit 1857da8

29 files changed

+167
-197
lines changed

‎src/mged/mged_impl.cpp

+17-17
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,25 @@ mged_state_create(void)
6363
s->s_edit = NULL;
6464

6565
// Register default callbacks
66-
mged_state_clbk_set(s, 0, ECMD_PRINT_STR, 0, GED_CLBK_DURING, mged_print_str, s);
67-
mged_state_clbk_set(s, 0, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING, mged_print_result, s);
68-
mged_state_clbk_set(s, 0, ECMD_EAXES_POS , 0, GED_CLBK_DURING, set_e_axes_pos, s);
69-
mged_state_clbk_set(s, 0, ECMD_REPLOT_EDITING_SOLID, 0, GED_CLBK_DURING, replot_editing_solid, s);
70-
mged_state_clbk_set(s, 0, ECMD_VIEW_UPDATE, 0, GED_CLBK_DURING, mged_view_update, s);
71-
mged_state_clbk_set(s, 0, ECMD_VIEW_SET_FLAG, 0, GED_CLBK_DURING, mged_view_set_flag, s);
72-
mged_state_clbk_set(s, 0, ECMD_MENU_SET, 0, GED_CLBK_DURING, mged_mmenu_set, s);
73-
mged_state_clbk_set(s, 0, ECMD_GET_FILENAME, 0, GED_CLBK_DURING, mged_get_filename, s);
66+
mged_state_clbk_set(s, 0, ECMD_PRINT_STR, 0, BU_CLBK_DURING, mged_print_str, s);
67+
mged_state_clbk_set(s, 0, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING, mged_print_result, s);
68+
mged_state_clbk_set(s, 0, ECMD_EAXES_POS , 0, BU_CLBK_DURING, set_e_axes_pos, s);
69+
mged_state_clbk_set(s, 0, ECMD_REPLOT_EDITING_SOLID, 0, BU_CLBK_DURING, replot_editing_solid, s);
70+
mged_state_clbk_set(s, 0, ECMD_VIEW_UPDATE, 0, BU_CLBK_DURING, mged_view_update, s);
71+
mged_state_clbk_set(s, 0, ECMD_VIEW_SET_FLAG, 0, BU_CLBK_DURING, mged_view_set_flag, s);
72+
mged_state_clbk_set(s, 0, ECMD_MENU_SET, 0, BU_CLBK_DURING, mged_mmenu_set, s);
73+
mged_state_clbk_set(s, 0, ECMD_GET_FILENAME, 0, BU_CLBK_DURING, mged_get_filename, s);
7474

7575
// Register primitive/ecmd specific callbacks
76-
mged_state_clbk_set(s, ID_ARB8, ECMD_ARB_SETUP_ROTFACE, 0, GED_CLBK_DURING, arb_setup_rotface_clbk, s);
77-
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_MODE, 0, GED_CLBK_DURING, ecmd_bot_mode_clbk, s);
78-
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_ORIENT, 0, GED_CLBK_DURING, ecmd_bot_orient_clbk, s);
79-
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_THICK, 0, GED_CLBK_DURING, ecmd_bot_thick_clbk, s);
80-
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_FLAGS, 0, GED_CLBK_DURING, ecmd_bot_flags_clbk, s);
81-
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_FMODE, 0, GED_CLBK_DURING, ecmd_bot_fmode_clbk, s);
82-
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_PICKT, 0, GED_CLBK_DURING, ecmd_bot_pickt_multihit_clbk, s);
83-
mged_state_clbk_set(s, ID_NMG, ECMD_NMG_EDEBUG, 0, GED_CLBK_DURING, ecmd_nmg_edebug_clbk, s);
84-
mged_state_clbk_set(s, ID_EXTRUDE, ECMD_EXTR_SKT_NAME, 0, GED_CLBK_DURING, ecmd_extrude_skt_name_clbk, s);
76+
mged_state_clbk_set(s, ID_ARB8, ECMD_ARB_SETUP_ROTFACE, 0, BU_CLBK_DURING, arb_setup_rotface_clbk, s);
77+
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_MODE, 0, BU_CLBK_DURING, ecmd_bot_mode_clbk, s);
78+
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_ORIENT, 0, BU_CLBK_DURING, ecmd_bot_orient_clbk, s);
79+
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_THICK, 0, BU_CLBK_DURING, ecmd_bot_thick_clbk, s);
80+
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_FLAGS, 0, BU_CLBK_DURING, ecmd_bot_flags_clbk, s);
81+
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_FMODE, 0, BU_CLBK_DURING, ecmd_bot_fmode_clbk, s);
82+
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_PICKT, 0, BU_CLBK_DURING, ecmd_bot_pickt_multihit_clbk, s);
83+
mged_state_clbk_set(s, ID_NMG, ECMD_NMG_EDEBUG, 0, BU_CLBK_DURING, ecmd_nmg_edebug_clbk, s);
84+
mged_state_clbk_set(s, ID_EXTRUDE, ECMD_EXTR_SKT_NAME, 0, BU_CLBK_DURING, ecmd_extrude_skt_name_clbk, s);
8585

8686
return s;
8787
}

‎src/mged/primitives/edarb.c

+21-22
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "vmath.h"
3232
#include "rt/geom.h"
3333
#include "rt/arb_edit.h"
34-
#include "ged.h"
3534
#include "rt/db4.h"
3635

3736
#include "./edarb.h"
@@ -70,7 +69,7 @@ arb8_edge(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), void *
7069
bu_clbk_t f = NULL;
7170
void *d = NULL;
7271
int flag = 1;
73-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
72+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
7473
if (f)
7574
(*f)(0, NULL, d, &flag);
7675
}
@@ -114,7 +113,7 @@ arb7_edge(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), void *
114113
bu_clbk_t f = NULL;
115114
void *d = NULL;
116115
int flag = 1;
117-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
116+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
118117
if (f)
119118
(*f)(0, NULL, d, &flag);
120119
}
@@ -162,7 +161,7 @@ arb6_edge(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), void *
162161
bu_clbk_t f = NULL;
163162
void *d = NULL;
164163
int flag = 1;
165-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
164+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
166165
if (f)
167166
(*f)(0, NULL, d, &flag);
168167
}
@@ -204,7 +203,7 @@ arb5_edge(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), void *
204203
bu_clbk_t f = NULL;
205204
void *d = NULL;
206205
int flag = 1;
207-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
206+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
208207
if (f)
209208
(*f)(0, NULL, d, &flag);
210209
}
@@ -240,7 +239,7 @@ arb4_point(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), void
240239
bu_clbk_t f = NULL;
241240
void *d = NULL;
242241
int flag = 1;
243-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
242+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
244243
if (f)
245244
(*f)(0, NULL, d, &flag);
246245
}
@@ -271,7 +270,7 @@ arb8_mv_face(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), voi
271270
bu_clbk_t f = NULL;
272271
void *d = NULL;
273272
int flag = 1;
274-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
273+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
275274
if (f)
276275
(*f)(0, NULL, d, &flag);
277276
}
@@ -304,7 +303,7 @@ arb7_mv_face(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), voi
304303
bu_clbk_t f = NULL;
305304
void *d = NULL;
306305
int flag = 1;
307-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
306+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
308307
if (f)
309308
(*f)(0, NULL, d, &flag);
310309
}
@@ -333,7 +332,7 @@ arb6_mv_face(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), voi
333332
bu_clbk_t f = NULL;
334333
void *d = NULL;
335334
int flag = 1;
336-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
335+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
337336
if (f)
338337
(*f)(0, NULL, d, &flag);
339338
}
@@ -365,7 +364,7 @@ arb5_mv_face(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), voi
365364
bu_clbk_t f = NULL;
366365
void *d = NULL;
367366
int flag = 1;
368-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
367+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
369368
if (f)
370369
(*f)(0, NULL, d, &flag);
371370
}
@@ -397,7 +396,7 @@ arb4_mv_face(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), voi
397396
bu_clbk_t f = NULL;
398397
void *d = NULL;
399398
int flag = 1;
400-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
399+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
401400
if (f)
402401
(*f)(0, NULL, d, &flag);
403402
}
@@ -890,7 +889,7 @@ ecmd_arb_main_menu(struct rt_solid_edit *s)
890889
rt_solid_edit_set_edflag(s, RT_SOLID_EDIT_IDLE);
891890
bu_clbk_t f = NULL;
892891
void *d = NULL;
893-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, GED_CLBK_DURING);
892+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, BU_CLBK_DURING);
894893
if (!f)
895894
return;
896895
(*f)(0, NULL, d, cntrl_menu);
@@ -907,26 +906,26 @@ ecmd_arb_specific_menu(struct rt_solid_edit *s)
907906
rt_solid_edit_set_edflag(s, RT_SOLID_EDIT_IDLE);
908907
switch (s->edit_menu) {
909908
case MENU_ARB_MV_EDGE:
910-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, GED_CLBK_DURING);
909+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, BU_CLBK_DURING);
911910
if (!f)
912911
return BRLCAD_ERROR;
913912
(*f)(0, NULL, d, which_menu[arb_type-4]);
914913
return BRLCAD_OK;
915914
case MENU_ARB_MV_FACE:
916-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, GED_CLBK_DURING);
915+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, BU_CLBK_DURING);
917916
if (!f)
918917
return BRLCAD_ERROR;
919918
(*f)(0, NULL, d, which_menu[arb_type+1]);
920919
return BRLCAD_OK;
921920
case MENU_ARB_ROT_FACE:
922-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, GED_CLBK_DURING);
921+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, BU_CLBK_DURING);
923922
if (!f)
924923
return BRLCAD_ERROR;
925924
(*f)(0, NULL, d, which_menu[arb_type+6]);
926925
return BRLCAD_OK;
927926
default:
928927
bu_vls_printf(s->log_str, "Bad menu item.\n");
929-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
928+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
930929
if (f)
931930
(*f)(0, NULL, d, NULL);
932931
return BRLCAD_ERROR;
@@ -981,7 +980,7 @@ ecmd_arb_setup_rotface(struct rt_solid_edit *s)
981980
struct rt_arb_internal *arb = (struct rt_arb_internal *)s->es_int.idb_ptr;
982981
RT_ARB_CK_MAGIC(arb);
983982

984-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_ARB_SETUP_ROTFACE, 0, GED_CLBK_DURING);
983+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_ARB_SETUP_ROTFACE, 0, BU_CLBK_DURING);
985984
if (f)
986985
fixv = (*f)(0, NULL, d, s);
987986

@@ -995,13 +994,13 @@ ecmd_arb_setup_rotface(struct rt_solid_edit *s)
995994
/* draw arrow, etc. */
996995
int vs_flag = 1;
997996
f = NULL; d = NULL;
998-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_VIEW_SET_FLAG, 0, GED_CLBK_DURING);
997+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_VIEW_SET_FLAG, 0, BU_CLBK_DURING);
999998
if (f)
1000999
(*f)(0, NULL, d, &vs_flag);
10011000

10021001
/* eaxes */
10031002
int e_flag = 1;
1004-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
1003+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
10051004
if (f)
10061005
(*f)(0, NULL, d, &e_flag);
10071006
}
@@ -1078,7 +1077,7 @@ ecmd_arb_rotate_face(struct rt_solid_edit *s)
10781077
} else {
10791078
bu_vls_printf(s->log_str, "Must be < rot fb | xdeg ydeg zdeg >\n");
10801079
f = NULL; d = NULL;
1081-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
1080+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
10821081
if (f)
10831082
(*f)(0, NULL, d, NULL);
10841083
return BRLCAD_ERROR;
@@ -1118,7 +1117,7 @@ ecmd_arb_rotate_face(struct rt_solid_edit *s)
11181117

11191118
/* no need to calc_planes again */
11201119
f = NULL; d = NULL;
1121-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_REPLOT_EDITING_SOLID, 0, GED_CLBK_DURING);
1120+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_REPLOT_EDITING_SOLID, 0, BU_CLBK_DURING);
11221121
if (f)
11231122
(*f)(0, NULL, d, NULL);
11241123

@@ -1308,7 +1307,7 @@ rt_solid_edit_arb_edit_xy(
13081307
break;
13091308
default:
13101309
bu_vls_printf(s->log_str, "%s: XY edit undefined in solid edit mode %d\n", EDOBJ[ip->idb_type].ft_label, edflag);
1311-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
1310+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
13121311
if (f)
13131312
(*f)(0, NULL, d, NULL);
13141313
return BRLCAD_ERROR;

‎src/mged/primitives/edars.c

+12-13
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "raytrace.h"
3232
#include "rt/geom.h"
3333
#include "wdb.h"
34-
#include "ged/defines.h"
3534

3635
#include "./edfunctab.h"
3736

@@ -301,7 +300,7 @@ ecmd_ars_pick(struct rt_solid_edit *s)
301300
}
302301
} else if (s->e_inpara && s->e_inpara != 3) {
303302
bu_vls_printf(s->log_str, "x y z coordinates required for 'pick point'\n");
304-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
303+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
305304
if (f)
306305
(*f)(0, NULL, d, NULL);
307306
return;
@@ -319,7 +318,7 @@ ecmd_ars_pick(struct rt_solid_edit *s)
319318

320319
bu_vls_printf(&tmp_vls, "Selected point #%d from curve #%d (%f %f %f)\n", a->es_ars_col, a->es_ars_crv, V3ARGS(selected_pt));
321320
bu_vls_printf(s->log_str, "%s", bu_vls_cstr(&tmp_vls));
322-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
321+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
323322
if (f)
324323
(*f)(0, NULL, d, NULL);
325324
bu_vls_free(&tmp_vls);
@@ -349,7 +348,7 @@ ecmd_ars_next_pt(struct rt_solid_edit *s)
349348

350349
bu_vls_printf(&tmp_vls, "Selected point #%d from curve #%d (%f %f %f)\n", a->es_ars_col, a->es_ars_crv, V3ARGS(selected_pt));
351350
bu_vls_printf(s->log_str, "%s", bu_vls_cstr(&tmp_vls));
352-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
351+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
353352
if (f)
354353
(*f)(0, NULL, d, NULL);
355354
bu_vls_free(&tmp_vls);
@@ -380,7 +379,7 @@ ecmd_ars_prev_pt(struct rt_solid_edit *s)
380379

381380
bu_vls_printf(&tmp_vls, "Selected point #%d from curve #%d (%f %f %f)\n", a->es_ars_col, a->es_ars_crv, V3ARGS(selected_pt));
382381
bu_vls_printf(s->log_str, "%s", bu_vls_cstr(&tmp_vls));
383-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
382+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
384383
if (f)
385384
(*f)(0, NULL, d, NULL);
386385
bu_vls_free(&tmp_vls);
@@ -411,7 +410,7 @@ ecmd_ars_next_crv(struct rt_solid_edit *s)
411410

412411
bu_vls_printf(&tmp_vls, "Selected point #%d from curve #%d (%f %f %f)\n", a->es_ars_col, a->es_ars_crv, V3ARGS(selected_pt));
413412
bu_vls_printf(s->log_str, "%s", bu_vls_cstr(&tmp_vls));
414-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
413+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
415414
if (f)
416415
(*f)(0, NULL, d, NULL);
417416
bu_vls_free(&tmp_vls);
@@ -442,7 +441,7 @@ ecmd_ars_prev_crv(struct rt_solid_edit *s)
442441

443442
bu_vls_printf(&tmp_vls, "Selected point #%d from curve #%d (%f %f %f)\n", a->es_ars_col, a->es_ars_crv, V3ARGS(selected_pt));
444443
bu_vls_printf(s->log_str, "%s", bu_vls_cstr(&tmp_vls));
445-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
444+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
446445
if (f)
447446
(*f)(0, NULL, d, NULL);
448447
bu_vls_free(&tmp_vls);
@@ -691,7 +690,7 @@ ecmd_ars_move_col(struct rt_solid_edit *s)
691690
}
692691
} else if (s->e_inpara && s->e_inpara != 3) {
693692
bu_vls_printf(s->log_str, "x y z coordinates required for point movement\n");
694-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
693+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
695694
if (f)
696695
(*f)(0, NULL, d, NULL);
697696
return;
@@ -755,7 +754,7 @@ ecmd_ars_move_crv(struct rt_solid_edit *s)
755754
}
756755
} else if (s->e_inpara && s->e_inpara != 3) {
757756
bu_vls_printf(s->log_str, "x y z coordinates required for point movement\n");
758-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
757+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
759758
if (f)
760759
(*f)(0, NULL, d, NULL);
761760
return;
@@ -818,7 +817,7 @@ ecmd_ars_move_pt(struct rt_solid_edit *s)
818817
}
819818
} else if (s->e_inpara && s->e_inpara != 3) {
820819
bu_vls_printf(s->log_str, "x y z coordinates required for point movement\n");
821-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
820+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
822821
if (f)
823822
(*f)(0, NULL, d, NULL);
824823
return;
@@ -854,15 +853,15 @@ rt_solid_edit_ars_edit(struct rt_solid_edit *s, int edflag)
854853
s->solid_edit_translate = 0;
855854
s->solid_edit_scale = 0;
856855
s->solid_edit_pick = 1;
857-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, GED_CLBK_DURING);
856+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, BU_CLBK_DURING);
858857
if (!f)
859858
return 0;
860859
(*f)(0, NULL, d, ars_pick_menu);
861860
break;
862861
case ECMD_ARS_EDIT_MENU:
863862
/* put up main ARS edit menu */
864863
rt_solid_edit_set_edflag(s, RT_SOLID_EDIT_IDLE);
865-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, GED_CLBK_DURING);
864+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, BU_CLBK_DURING);
866865
if (!f)
867866
return 0;
868867
(*f)(0, NULL, d, ars_menu);
@@ -943,7 +942,7 @@ rt_solid_edit_ars_edit_xy(
943942
break;
944943
default:
945944
bu_vls_printf(s->log_str, "%s: XY edit undefined in solid edit mode %d\n", EDOBJ[ip->idb_type].ft_label, edflag);
946-
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
945+
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
947946
if (f)
948947
(*f)(0, NULL, d, NULL);
949948
return BRLCAD_ERROR;

0 commit comments

Comments
 (0)