# HG changeset patch # User Olaf Wintermann # Date 1757328232 -7200 # Node ID 08a2421957f114b0765eb955b5009fc8795c3c22 # Parent 41286f7f8433958bc8cf621d694fc44e8033d391 fix motif build diff -r 41286f7f8433 -r 08a2421957f1 ui/motif/Grid.c --- a/ui/motif/Grid.c Sun Sep 07 11:57:01 2025 +0200 +++ b/ui/motif/Grid.c Mon Sep 08 12:43:52 2025 +0200 @@ -299,31 +299,32 @@ WidgetClass gridClass = (WidgetClass)&gridClassRec; -void grid_class_initialize(Widget request, Widget new, ArgList args, Cardinal *num_args) { +void grid_class_initialize(void) { } void grid_initialize(Widget request, Widget new, ArgList args, Cardinal num_args) { - MyWidget mn = (MyWidget)new; + Grid mn = (Grid)new; mn->mywidget.max_col = 0; mn->mywidget.max_row = 0; } -void grid_realize(MyWidget w,XtValueMask *valueMask,XSetWindowAttributes *attributes) { - XtMakeResizeRequest((Widget)w, 400, 400, NULL, NULL); +void grid_realize(Widget w,XtValueMask *valueMask,XSetWindowAttributes *attributes) { + Grid grid = (Grid)w; + XtMakeResizeRequest(w, 400, 400, NULL, NULL); (coreClassRec.core_class.realize)((Widget)w, valueMask, attributes); - grid_place_children(w); + grid_place_children(grid); } -void grid_destroy(MyWidget widget) { +void grid_destroy(Grid widget) { } -void grid_resize(MyWidget widget) { +void grid_resize(Grid widget) { grid_place_children(widget); } -void grid_expose(MyWidget widget, XEvent *event, Region region) { +void grid_expose(Grid widget, XEvent *event, Region region) { } @@ -336,11 +337,11 @@ } -void grid_getfocus(MyWidget myw, XEvent *event, String *params, Cardinal *nparam) { +void grid_getfocus(Widget myw, XEvent *event, String *params, Cardinal *nparam) { } -void grid_loosefocus(MyWidget myw, XEvent *event, String *params, Cardinal *nparam) { +void grid_loosefocus(Widget myw, XEvent *event, String *params, Cardinal *nparam) { } @@ -358,7 +359,7 @@ widget->core.height = request->height; constraints->grid.pref_height = request->height; } - grid_place_children((MyWidget)XtParent(widget)); + grid_place_children((Grid)XtParent(widget)); return XtGeometryYes; } @@ -368,7 +369,7 @@ Boolean ConstraintSetValues(Widget old, Widget request, Widget neww, ArgList args, Cardinal *num_args) { GridConstraintRec *constraints = neww->core.constraints; - MyWidget grid = (MyWidget)XtParent(neww); + Grid grid = (Grid)XtParent(neww); if(constraints->grid.x > grid->mywidget.max_col) { grid->mywidget.max_col = constraints->grid.x; } @@ -387,7 +388,7 @@ { GridConstraintRec *constraints = neww->core.constraints; - MyWidget grid = (MyWidget)XtParent(neww); + Grid grid = (Grid)XtParent(neww); if(constraints->grid.x > grid->mywidget.max_col) { grid->mywidget.max_col = constraints->grid.x; } @@ -398,7 +399,7 @@ constraints->grid.pref_height = neww->core.height; } -void grid_place_children(MyWidget w) { +void grid_place_children(Grid w) { int ncols = w->mywidget.max_col+1; int nrows = w->mywidget.max_row+1; GridDef *cols = calloc(ncols, sizeof(GridDef)); diff -r 41286f7f8433 -r 08a2421957f1 ui/motif/Grid.h --- a/ui/motif/Grid.h Sun Sep 07 11:57:01 2025 +0200 +++ b/ui/motif/Grid.h Mon Sep 08 12:43:52 2025 +0200 @@ -125,23 +125,23 @@ GridContraintPart grid; } GridConstraintRec; -typedef GridRec* MyWidget; +typedef GridRec* Grid; extern WidgetClass gridClass; -void grid_class_initialize(); -void grid_initialize(); -void grid_realize(); -void grid_destroy(); -void grid_resize(); -void grid_expose(); -Boolean grid_set_values(); +void grid_class_initialize(void); +void grid_initialize(Widget request, Widget new, ArgList args, Cardinal num_args); +void grid_realize(Widget w,XtValueMask *valueMask,XSetWindowAttributes *attributes); +void grid_destroy(Grid widget); +void grid_resize(Grid widget); +void grid_expose(Grid widget, XEvent *event, Region region); +Boolean grid_set_values(Widget old, Widget request, Widget neww, ArgList args, Cardinal *num_args); Boolean grid_acceptfocus(Widget , Time*); -void grid_place_children(MyWidget w); +void grid_place_children(Grid w); -void grid_getfocus(); -void grid_loosefocus(); +void grid_getfocus(Widget myw, XEvent *event, String *params, Cardinal *nparam); +void grid_loosefocus(Widget myw, XEvent *event, String *params, Cardinal *nparam); void grid_constraint_init( Widget request,