From e7490ce49b113f4d1877de8f5ee4b40b183fbabf Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Mon, 25 Aug 2014 23:35:20 -0400 Subject: [PATCH] Added link to info in dialog_windows.c; removed TODOs in area_window.c and basicctrls_windows.c that I decided were fine as they were; more TODOs otherwise. --- redo/area_windows.c | 6 +++--- redo/basicctrls_windows.c | 2 +- redo/dialog_windows.c | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/redo/area_windows.c b/redo/area_windows.c index 9fc56ba..4793138 100644 --- a/redo/area_windows.c +++ b/redo/area_windows.c @@ -374,21 +374,21 @@ static LRESULT CALLBACK areaWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM areaMouseEvent(hwnd, data, 1, TRUE, heldButtons, lParam); return 0; case WM_MBUTTONDOWN: - SetFocus(hwnd); // TODO correct? + SetFocus(hwnd); areaMouseEvent(hwnd, data, 2, FALSE, heldButtons, lParam); return 0; case WM_MBUTTONUP: areaMouseEvent(hwnd, data, 2, TRUE, heldButtons, lParam); return 0; case WM_RBUTTONDOWN: - SetFocus(hwnd); // TODO correct? + SetFocus(hwnd); areaMouseEvent(hwnd, data, 3, FALSE, heldButtons, lParam); return 0; case WM_RBUTTONUP: areaMouseEvent(hwnd, data, 3, TRUE, heldButtons, lParam); return 0; case WM_XBUTTONDOWN: - SetFocus(hwnd); // TODO correct? + SetFocus(hwnd); // values start at 1; we want them to start at 4 which = (DWORD) GET_XBUTTON_WPARAM(wParam) + 3; heldButtons = (uintptr_t) GET_KEYSTATE_WPARAM(wParam); diff --git a/redo/basicctrls_windows.c b/redo/basicctrls_windows.c index 4c5a129..7481522 100644 --- a/redo/basicctrls_windows.c +++ b/redo/basicctrls_windows.c @@ -111,7 +111,7 @@ void textfieldSetAndShowInvalidBalloonTip(HWND hwnd, WCHAR *text) ZeroMemory(&ti, sizeof (EDITBALLOONTIP)); ti.cbStruct = sizeof (EDITBALLOONTIP); - ti.pszTitle = L"Invalid Input"; // TODO verify + ti.pszTitle = L"Invalid Input"; // TODO this is necessary for the icon to show up; figure out some language-neutral thing ti.pszText = text; ti.ttiIcon = TTI_ERROR; if (SendMessageW(hwnd, EM_SHOWBALLOONTIP, 0, (LPARAM) (&ti)) == FALSE) diff --git a/redo/dialog_windows.c b/redo/dialog_windows.c index b9d6c23..ad48cd5 100644 --- a/redo/dialog_windows.c +++ b/redo/dialog_windows.c @@ -8,6 +8,7 @@ static LRESULT CALLBACK dialogSubProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA switch (uMsg) { case WM_COMMAND: // we must re-enable other windows in the right order (see http://blogs.msdn.com/b/oldnewthing/archive/2004/02/27/81155.aspx) + // see http://stackoverflow.com/questions/25494914/is-there-something-like-cdn-filecancel-analogous-to-cdn-fileok-for-getting-when if (HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDCANCEL) SendMessageW(msgwin, msgEndModal, 0, 0); break; // let the dialog handle it now