From 2affdab8377f7bf700f6a7a594a4b52589c6adb5 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Mon, 13 Jun 2016 21:23:05 -0400
Subject: [PATCH] Removed intmax_t from the rest of the public API.

---
 ui_windows.h          | 9 ++++-----
 windows/control.cpp   | 4 ++--
 windows/text.cpp      | 2 +-
 windows/winpublic.cpp | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ui_windows.h b/ui_windows.h
index 81185f51..3ea511c9 100644
--- a/ui_windows.h
+++ b/ui_windows.h
@@ -22,8 +22,7 @@ struct uiWindowsControl {
 	BOOL visible;
 	void (*SyncEnableState)(uiWindowsControl *, int);
 	void (*SetParentHWND)(uiWindowsControl *, HWND);
-	// TODO consider changing these from intmax_t to int
-	void (*MinimumSize)(uiWindowsControl *, intmax_t *, intmax_t *);
+	void (*MinimumSize)(uiWindowsControl *, int *, int *);
 	void (*MinimumSizeChanged)(uiWindowsControl *);
 	void (*LayoutRect)(uiWindowsControl *c, RECT *r);
 	void (*AssignControlIDZOrder)(uiWindowsControl *, LONG_PTR *, HWND *);
@@ -32,7 +31,7 @@ struct uiWindowsControl {
 // TODO document
 _UI_EXTERN void uiWindowsControlSyncEnableState(uiWindowsControl *, int);
 _UI_EXTERN void uiWindowsControlSetParentHWND(uiWindowsControl *, HWND);
-_UI_EXTERN void uiWindowsControlMinimumSize(uiWindowsControl *, intmax_t *, intmax_t *);
+_UI_EXTERN void uiWindowsControlMinimumSize(uiWindowsControl *, int *, int *);
 _UI_EXTERN void uiWindowsControlMinimumSizeChanged(uiWindowsControl *);
 _UI_EXTERN void uiWindowsControlLayoutRect(uiWindowsControl *, RECT *);
 _UI_EXTERN void uiWindowsControlAssignControlIDZOrder(uiWindowsControl *, LONG_PTR *, HWND *);
@@ -201,11 +200,11 @@ _UI_EXTERN char *uiWindowsWindowText(HWND hwnd);
 _UI_EXTERN void uiWindowsSetWindowText(HWND hwnd, const char *text);
 
 // TODO document
-_UI_EXTERN intmax_t uiWindowsWindowTextWidth(HWND hwnd);
+_UI_EXTERN int uiWindowsWindowTextWidth(HWND hwnd);
 
 // TODO document
 // TODO point out this should only be used in a resize cycle
-_UI_EXTERN void uiWindowsEnsureMoveWindowDuringResize(HWND hwnd, intmax_t x, intmax_t y, intmax_t width, intmax_t height);
+_UI_EXTERN void uiWindowsEnsureMoveWindowDuringResize(HWND hwnd, int x, int y, int width, int height);
 
 // TODO document
 _UI_EXTERN void uiWindowsRegisterWM_COMMANDHandler(HWND hwnd, BOOL (*handler)(uiControl *, HWND, WORD, LRESULT *), uiControl *c);
diff --git a/windows/control.cpp b/windows/control.cpp
index 2afbbc27..d59132b9 100644
--- a/windows/control.cpp
+++ b/windows/control.cpp
@@ -11,7 +11,7 @@ void uiWindowsControlSetParentHWND(uiWindowsControl *c, HWND parent)
 	(*(c->SetParentHWND))(c, parent);
 }
 
-void uiWindowsControlMinimumSize(uiWindowsControl *c, intmax_t *width, intmax_t *height)
+void uiWindowsControlMinimumSize(uiWindowsControl *c, int *width, int *height)
 {
 	(*(c->MinimumSize))(c, width, height);
 }
@@ -87,7 +87,7 @@ void uiWindowsControlAssignSoleControlIDZOrder(uiWindowsControl *c)
 BOOL uiWindowsControlTooSmall(uiWindowsControl *c)
 {
 	RECT r;
-	intmax_t width, height;
+	int width, height;
 
 	uiWindowsControlLayoutRect(c, &r);
 	uiWindowsControlMinimumSize(c, &width, &height);
diff --git a/windows/text.cpp b/windows/text.cpp
index 4beeccd7..af79fb80 100644
--- a/windows/text.cpp
+++ b/windows/text.cpp
@@ -38,7 +38,7 @@ void uiFreeText(char *text)
 	uiFree(text);
 }
 
-intmax_t uiWindowsWindowTextWidth(HWND hwnd)
+int uiWindowsWindowTextWidth(HWND hwnd)
 {
 	LRESULT len;
 	WCHAR *text;
diff --git a/windows/winpublic.cpp b/windows/winpublic.cpp
index 1cc9129d..397a3b54 100644
--- a/windows/winpublic.cpp
+++ b/windows/winpublic.cpp
@@ -23,7 +23,7 @@ void uiWindowsEnsureAssignControlIDZOrder(HWND hwnd, LONG_PTR *controlID, HWND *
 	*insertAfter = hwnd;
 }
 
-void uiWindowsEnsureMoveWindowDuringResize(HWND hwnd, intmax_t x, intmax_t y, intmax_t width, intmax_t height)
+void uiWindowsEnsureMoveWindowDuringResize(HWND hwnd, int x, int y, int width, int height)
 {
 	RECT r;