diff --git a/darwin/area.m b/darwin/area.m index 40d719a5..b98aa429 100644 --- a/darwin/area.m +++ b/darwin/area.m @@ -130,7 +130,7 @@ struct uiArea { uiArea *a = self->libui_a; uiAreaMouseEvent me; NSPoint point; - uintmax_t buttonNumber; + int buttonNumber; NSUInteger pmb; unsigned int i, max; diff --git a/darwin/grid.m b/darwin/grid.m index 766b0f80..93f9e9fe 100644 --- a/darwin/grid.m +++ b/darwin/grid.m @@ -7,10 +7,10 @@ // maybe it's easier to do it regardless of align @interface gridChild : NSObject @property uiControl *c; -@property intmax_t left; -@property intmax_t top; -@property intmax_t xspan; -@property intmax_t yspan; +@property int left; +@property int top; +@property int xspan; +@property int yspan; @property int hexpand; @property uiAlign halign; @property int vexpand; @@ -25,8 +25,8 @@ uiGrid *g; NSMutableArray *children; int padded; - uintmax_t nhexpand; - uintmax_t nvexpand; + int nhexpand; + int nvexpand; NSMutableArray *edges; NSMutableArray *inBetweens; @@ -136,17 +136,17 @@ struct uiGrid { { gridChild *gc; CGFloat padding; - intmax_t xmin, ymin; - intmax_t xmax, ymax; - intmax_t xcount, ycount; + int xmin, ymin; + int xmax, ymax; + int xcount, ycount; BOOL first; int **gg; NSView ***gv; BOOL **gspan; - intmax_t x, y; + int x, y; int i; NSLayoutConstraint *c; - intmax_t firstx, firsty; + int firstx, firsty; BOOL *hexpand, *vexpand; BOOL doit; @@ -423,7 +423,7 @@ struct uiGrid { { NSLayoutPriority priority; BOOL update; - intmax_t oldn; + int oldn; uiControlSetParent(gc.c, uiControl(self->g)); uiDarwinControlSetSuperview(uiDarwinControl(gc.c), self); @@ -591,7 +591,7 @@ static void uiGridChildEdgeHuggingChanged(uiDarwinControl *c) uiDarwinControlDefaultHuggingPriority(uiGrid, view) uiDarwinControlDefaultSetHuggingPriority(uiGrid, view) -static gridChild *toChild(uiControl *c, intmax_t xspan, intmax_t yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) +static gridChild *toChild(uiControl *c, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) { gridChild *gc; @@ -612,7 +612,7 @@ static gridChild *toChild(uiControl *c, intmax_t xspan, intmax_t yspan, int hexp return gc; } -void uiGridAppend(uiGrid *g, uiControl *c, intmax_t left, intmax_t top, intmax_t xspan, intmax_t yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) +void uiGridAppend(uiGrid *g, uiControl *c, int left, int top, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) { gridChild *gc; @@ -626,7 +626,7 @@ void uiGridAppend(uiGrid *g, uiControl *c, intmax_t left, intmax_t top, intmax_t [g->view append:gc]; } -void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, intmax_t xspan, intmax_t yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) +void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) { gridChild *gc; diff --git a/ui.h b/ui.h index 153c5eea..7527ed11 100644 --- a/ui.h +++ b/ui.h @@ -545,10 +545,10 @@ struct uiAreaMouseEvent { double AreaWidth; double AreaHeight; - uintmax_t Down; - uintmax_t Up; + int Down; + int Up; - uintmax_t Count; + int Count; uiModifiers Modifiers; @@ -645,8 +645,8 @@ _UI_ENUM(uiAt) { typedef struct uiGrid uiGrid; #define uiGrid(this) ((uiGrid *) (this)) -_UI_EXTERN void uiGridAppend(uiGrid *g, uiControl *c, intmax_t left, intmax_t top, intmax_t xspan, intmax_t yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign); -_UI_EXTERN void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, intmax_t xspan, intmax_t yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign); +_UI_EXTERN void uiGridAppend(uiGrid *g, uiControl *c, int left, int top, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign); +_UI_EXTERN void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign); _UI_EXTERN int uiGridPadded(uiGrid *g); _UI_EXTERN void uiGridSetPadded(uiGrid *g, int padded); _UI_EXTERN uiGrid *uiNewGrid(void); diff --git a/unix/grid.c b/unix/grid.c index 3ed60ec5..6d9813b3 100644 --- a/unix/grid.c +++ b/unix/grid.c @@ -80,7 +80,7 @@ static GtkWidget *prepare(struct gridChild *gc, uiControl *c, int hexpand, uiAli return widget; } -void uiGridAppend(uiGrid *g, uiControl *c, intmax_t left, intmax_t top, intmax_t xspan, intmax_t yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) +void uiGridAppend(uiGrid *g, uiControl *c, int left, int top, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) { struct gridChild gc; GtkWidget *widget; @@ -94,7 +94,7 @@ void uiGridAppend(uiGrid *g, uiControl *c, intmax_t left, intmax_t top, intmax_t g_array_append_val(g->children, gc); } -void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, intmax_t xspan, intmax_t yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) +void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) { struct gridChild gc; GtkWidget *widget; diff --git a/windows/areaevents.cpp b/windows/areaevents.cpp index 386b49f8..0aa5bee9 100644 --- a/windows/areaevents.cpp +++ b/windows/areaevents.cpp @@ -73,10 +73,10 @@ static void capture(uiArea *a, BOOL capturing) logLastError(L"error releasing capture on drag"); } -static void areaMouseEvent(uiArea *a, uintmax_t down, uintmax_t up, WPARAM wParam, LPARAM lParam) +static void areaMouseEvent(uiArea *a, int down, int up, WPARAM wParam, LPARAM lParam) { uiAreaMouseEvent me; - uintmax_t button; + int button; POINT clientpt; RECT client; BOOL inClient; diff --git a/windows/grid.cpp b/windows/grid.cpp index a262045b..bcf89980 100644 --- a/windows/grid.cpp +++ b/windows/grid.cpp @@ -10,19 +10,19 @@ struct gridChild { uiControl *c; - intmax_t left; - intmax_t top; - intmax_t xspan; - intmax_t yspan; + int left; + int top; + int xspan; + int yspan; int hexpand; uiAlign halign; int vexpand; uiAlign valign; // have these here so they don't need to be reallocated each relayout - intmax_t finalx, finaly; - intmax_t finalwidth, finalheight; - intmax_t minwidth, minheight; + int finalx, finaly; + int finalwidth, finalheight; + int minwidth, minheight; }; struct uiGrid { @@ -32,8 +32,8 @@ struct uiGrid { std::map *indexof; int padded; - intmax_t xmin, ymin; - intmax_t xmax, ymax; + int xmin, ymin; + int xmax, ymax; }; #define xcount(g) ((g)->xmax - (g)->xmin) @@ -44,20 +44,20 @@ struct uiGrid { class gridLayoutData { size_t ycount; public: - intmax_t **gg; // topological map gg[y][x] = control index - intmax_t *colwidths; - intmax_t *rowheights; + int **gg; // topological map gg[y][x] = control index + int *colwidths; + int *rowheights; bool *hexpand; bool *vexpand; gridLayoutData(uiGrid *g) { size_t i; - intmax_t x, y; + int x, y; - this->gg = new intmax_t *[ycount(g)]; + this->gg = new int *[ycount(g)]; for (y = 0; y < ycount(g); y++) { - this->gg[y] = new intmax_t[xcount(g)]; + this->gg[y] = new int[xcount(g)]; for (x = 0; x < xcount(g); x++) this->gg[y][x] = -1; } @@ -71,10 +71,10 @@ public: this->gg[toyindex(g, y)][toxindex(g, x)] = i; } - this->colwidths = new intmax_t[xcount(g)]; - ZeroMemory(this->colwidths, xcount(g) * sizeof (intmax_t)); - this->rowheights = new intmax_t[ycount(g)]; - ZeroMemory(this->rowheights, ycount(g) * sizeof (intmax_t)); + this->colwidths = new int[xcount(g)]; + ZeroMemory(this->colwidths, xcount(g) * sizeof (int)); + this->rowheights = new int[ycount(g)]; + ZeroMemory(this->rowheights, ycount(g) * sizeof (int)); this->hexpand = new bool[xcount(g)]; ZeroMemory(this->hexpand, xcount(g) * sizeof (bool)); this->vexpand = new bool[ycount(g)]; @@ -112,14 +112,14 @@ static void gridPadding(uiGrid *g, int *xpadding, int *ypadding) static void gridRelayout(uiGrid *g) { RECT r; - intmax_t x, y, width, height; + int x, y, width, height; gridLayoutData *ld; int xpadding, ypadding; - intmax_t ix, iy; - intmax_t iwidth, iheight; + int ix, iy; + int iwidth, iheight; int i; struct gridChild *gc; - intmax_t nhexpand, nvexpand; + int nhexpand, nvexpand; if (g->children->size() == 0) return; // nothing to do @@ -229,7 +229,7 @@ static void gridRelayout(uiGrid *g) // 6) compute cell positions and sizes for (iy = 0; iy < ycount(g); iy++) { - intmax_t curx; + int curx; int prev; curx = 0; @@ -251,7 +251,7 @@ static void gridRelayout(uiGrid *g) } } for (ix = 0; ix < xcount(g); ix++) { - intmax_t cury; + int cury; int prev; cury = 0; @@ -357,16 +357,16 @@ static void uiGridSyncEnableState(uiWindowsControl *c, int enabled) uiWindowsControlDefaultSetParentHWND(uiGrid) -static void uiGridMinimumSize(uiWindowsControl *c, intmax_t *width, intmax_t *height) +static void uiGridMinimumSize(uiWindowsControl *c, int *width, int *height) { uiGrid *g = uiGrid(c); int xpadding, ypadding; gridLayoutData *ld; - intmax_t x, y; + int x, y; int i; struct gridChild *gc; - intmax_t minwid, minht; - intmax_t colwidth, rowheight; + int minwid, minht; + int colwidth, rowheight; *width = 0; *height = 0; @@ -429,7 +429,7 @@ static void gridArrangeChildren(uiGrid *g) HWND insertAfter; gridLayoutData *ld; bool *visited; - intmax_t x, y; + int x, y; int i; struct gridChild *gc; @@ -479,7 +479,7 @@ static void gridRecomputeMinMax(uiGrid *g) } } -static struct gridChild *toChild(uiControl *c, intmax_t xspan, intmax_t yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) +static struct gridChild *toChild(uiControl *c, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) { struct gridChild *gc; @@ -509,7 +509,7 @@ static void add(uiGrid *g, struct gridChild *gc) uiWindowsControlMinimumSizeChanged(uiWindowsControl(g)); } -void uiGridAppend(uiGrid *g, uiControl *c, intmax_t left, intmax_t top, intmax_t xspan, intmax_t yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) +void uiGridAppend(uiGrid *g, uiControl *c, int left, int top, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) { struct gridChild *gc; @@ -520,7 +520,7 @@ void uiGridAppend(uiGrid *g, uiControl *c, intmax_t left, intmax_t top, intmax_t } // TODO decide what happens if existing is NULL -void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, intmax_t xspan, intmax_t yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) +void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign) { struct gridChild *gc; struct gridChild *other;