diff options
| author | nyamatongwe <devnull@localhost> | 2003-03-30 00:50:50 +0000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2003-03-30 00:50:50 +0000 |
| commit | c2f15028c0f81693e2f71eb60d813219c76d9e67 (patch) | |
| tree | 75a4748d6307755960f8b69c4bf001ebfae06669 | |
| parent | 406bd9a091ee6363369ad4cb2a1e6c4ab240b318 (diff) | |
| download | scintilla-mirror-c2f15028c0f81693e2f71eb60d813219c76d9e67.tar.gz | |
Make IDC_HAND visible with old build environments.
Avoid calling ::IsChild when wParam 0 to avoid BoundsChecker warning.
| -rw-r--r-- | win32/PlatWin.cxx | 4 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 2d51b4023..ffa9b81ef 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -23,6 +23,10 @@ #include "UniConversion.h" #include "XPM.h" +#ifndef IDC_HAND +#define IDC_HAND MAKEINTRESOURCE(32649) +#endif + // Take care of 32/64 bit pointers #ifdef GetWindowLongPtr static void *PointerFromWindow(HWND hWnd) { diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index c8a47c11b..9307373e3 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -669,7 +669,8 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam return DLGC_HASSETSEL | DLGC_WANTALLKEYS; case WM_KILLFOCUS: - if (!IsChild(reinterpret_cast<HWND>(wMain.GetID()), + if (!wParam || + !::IsChild(reinterpret_cast<HWND>(wMain.GetID()), reinterpret_cast<HWND>(wParam))) { SetFocusState(false); } |