folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IBM1130: Allow 32bit and 64bit build of GUI (Jim Fehlinger)

Browse source 
as discussed in #465
This commit is contained in:
Mark Pizzolato 2017-05-21 21:59:51 -07:00
parent c4c8043215
commit 73a058a904
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Ibm1130/ibm1130_gui.c
View file

@ -565,7 +565,7 @@ LRESULT CALLBACK ButtonProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
int i; int i;
i = GetWindowLong(hWnd, GWL_ID); i = GetWindowLongPtr(hWnd, GWLP_ID);
if (! btn[i].pushable) { if (! btn[i].pushable) {
if (uMsg == WM_LBUTTONDOWN || uMsg == WM_LBUTTONUP || uMsg == WM_LBUTTONDBLCLK) if (uMsg == WM_LBUTTONDOWN || uMsg == WM_LBUTTONUP || uMsg == WM_LBUTTONDBLCLK)
@ -699,7 +699,7 @@ void PaintButton (LPDRAWITEMSTRUCT dis)
/* ------------------------------------------------------------------------ /* ------------------------------------------------------------------------
* ------------------------------------------------------------------------ */ * ------------------------------------------------------------------------ */
HWND CreateSubclassedButton (HWND hwParent, int i) HWND CreateSubclassedButton (HWND hwParent, UINT_PTR i)
{ {
HWND hBtn; HWND hBtn;
int x, y; int x, y;
@ -715,7 +715,7 @@ HWND CreateSubclassedButton (HWND hwParent, int i)
btn[i].hBtn = hBtn; btn[i].hBtn = hBtn;
if (oldButtonProc == NULL) if (oldButtonProc == NULL)
oldButtonProc = (WNDPROC) GetWindowLong(hBtn, GWL_WNDPROC); oldButtonProc = (WNDPROC) GetWindowLongPtr(hBtn, GWLP_WNDPROC);
btn[i].hbrLit = CreateSolidBrush(btn[i].clr); btn[i].hbrLit = CreateSolidBrush(btn[i].clr);
@ -728,7 +728,7 @@ HWND CreateSubclassedButton (HWND hwParent, int i)
EnableWindow(hBtn, FALSE); EnableWindow(hBtn, FALSE);
} }
SetWindowLong(hBtn, GWL_WNDPROC, (LONG) ButtonProc); SetWindowLongPtr(hBtn, GWLP_WNDPROC, (UINT_PTR) ButtonProc);
return hBtn; return hBtn;
} }
@ -1338,7 +1338,7 @@ LRESULT CALLBACK ConsoleWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPa
break; break;
case WM_CTLCOLORBTN: case WM_CTLCOLORBTN:
i = GetWindowLong((HWND) lParam, GWL_ID); i = GetWindowLongPtr((HWND) lParam, GWLP_ID);
if (BETWEEN(i, 0, NBUTTONS-1)) if (BETWEEN(i, 0, NBUTTONS-1))
return (LRESULT) (power && IsWindowEnabled((HWND) lParam) ? btn[i].hbrLit : btn[i].hbrDark); return (LRESULT) (power && IsWindowEnabled((HWND) lParam) ? btn[i].hbrLit : btn[i].hbrDark);