summaryrefslogtreecommitdiff
path: root/redo/window_windows.c
diff options
context:
space:
mode:
authorPietro Gagliardi <[email protected]>2014-07-18 00:22:21 -0400
committerPietro Gagliardi <[email protected]>2014-07-18 00:22:21 -0400
commitd2f09a02225281fbd30fe068f228ca0f3fd26471 (patch)
treefe0148572c6336dd74b2113b3a4fcdc34b3fe4ae /redo/window_windows.c
parent7c6fa3b2fd773a31d4c0f8899b96c1f25a669ec1 (diff)
Fixed all the remaining compiler errors. C conversion works!
Diffstat (limited to 'redo/window_windows.c')
-rw-r--r--redo/window_windows.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/redo/window_windows.c b/redo/window_windows.c
index 5b45840..02eaddd 100644
--- a/redo/window_windows.c
+++ b/redo/window_windows.c
@@ -4,7 +4,7 @@
#define windowclass L"gouiwindow"
-static LRESULT CALLBACK windowWinProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static LRESULT CALLBACK windowWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
void *data;
RECT r;
@@ -23,10 +23,10 @@ static LRESULT CALLBACK windowWinProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA
switch (uMsg) {
case WM_COMMAND:
- return forwardCommand(hwnd, msg, wParam, lParam)
+ return forwardCommand(hwnd, uMsg, wParam, lParam);
case WM_SIZE:
if (GetClientRect(hwnd, &r) == 0)
- xparent("error getting client rect for Window in WM_SIZE", GetLastError());
+ xpanic("error getting client rect for Window in WM_SIZE", GetLastError());
windowResize(data, &r);
return 0;
case WM_CLOSE:
@@ -67,9 +67,9 @@ HWND newWindow(LPCWSTR title, int width, int height, void *data)
WS_OVERLAPPEDWINDOW,
CW_USEDEFAULT, CW_USEDEFAULT,
width, height,
- NULL, NULL, hInstance, w);
+ NULL, NULL, hInstance, data);
if (hwnd == NULL)
- xpanic("Window creation failed", GetLastError();
+ xpanic("Window creation failed", GetLastError());
return hwnd;
}