diff options
Diffstat (limited to 'win32/ScintillaWin.cxx')
| -rw-r--r-- | win32/ScintillaWin.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 17443a744..d0ea62a31 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -569,7 +569,7 @@ void ScintillaWin::DropRenderTarget() { #endif HWND ScintillaWin::MainHWND() { - return reinterpret_cast<HWND>(wMain.GetID()); + return static_cast<HWND>(wMain.GetID()); } bool ScintillaWin::DragThreshold(Point ptStart, Point ptNow) { @@ -1211,7 +1211,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam switch (iMessage) { case WM_CREATE: - ctrlID = ::GetDlgCtrlID(reinterpret_cast<HWND>(wMain.GetID())); + ctrlID = ::GetDlgCtrlID(static_cast<HWND>(wMain.GetID())); // Get Intellimouse scroll line parameters GetIntelliMouseParameters(); ::RegisterDragDrop(MainHWND(), reinterpret_cast<IDropTarget *>(&dt)); @@ -1257,7 +1257,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam case WM_MOUSEWHEEL: // if autocomplete list active then send mousewheel message to it if (ac.Active()) { - HWND hWnd = reinterpret_cast<HWND>(ac.lb->GetID()); + HWND hWnd = static_cast<HWND>(ac.lb->GetID()); ::SendMessage(hWnd, iMessage, wParam, lParam); break; } @@ -1496,7 +1496,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam case WM_KILLFOCUS: { HWND wOther = reinterpret_cast<HWND>(wParam); HWND wThis = MainHWND(); - HWND wCT = reinterpret_cast<HWND>(ct.wCallTip.GetID()); + HWND wCT = static_cast<HWND>(ct.wCallTip.GetID()); if (!wParam || !(::IsChild(wThis, wOther) || (wOther == wCT))) { SetFocusState(false); @@ -1937,11 +1937,11 @@ void ScintillaWin::NotifyFocus(bool focus) { } void ScintillaWin::SetCtrlID(int identifier) { - ::SetWindowID(reinterpret_cast<HWND>(wMain.GetID()), identifier); + ::SetWindowID(static_cast<HWND>(wMain.GetID()), identifier); } int ScintillaWin::GetCtrlID() { - return ::GetDlgCtrlID(reinterpret_cast<HWND>(wMain.GetID())); + return ::GetDlgCtrlID(static_cast<HWND>(wMain.GetID())); } void ScintillaWin::NotifyParent(SCNotification scn) { @@ -2270,7 +2270,7 @@ void ScintillaWin::CreateCallTipWindow(PRectangle) { } void ScintillaWin::AddToPopUp(const char *label, int cmd, bool enabled) { - HMENU hmenuPopup = reinterpret_cast<HMENU>(popup.GetID()); + HMENU hmenuPopup = static_cast<HMENU>(popup.GetID()); if (!label[0]) ::AppendMenuA(hmenuPopup, MF_SEPARATOR, 0, ""); else if (enabled) @@ -3238,7 +3238,7 @@ BOOL ScintillaWin::DestroySystemCaret() { LRESULT PASCAL ScintillaWin::CTWndProc( HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) { // Find C++ object associated with window. - ScintillaWin *sciThis = reinterpret_cast<ScintillaWin *>(PointerFromWindow(hWnd)); + ScintillaWin *sciThis = static_cast<ScintillaWin *>(PointerFromWindow(hWnd)); try { // ctp will be zero if WM_CREATE not seen yet if (sciThis == 0) { @@ -3358,7 +3358,7 @@ LRESULT PASCAL ScintillaWin::SWndProc( //Platform::DebugPrintf("S W:%x M:%x WP:%x L:%x\n", hWnd, iMessage, wParam, lParam); // Find C++ object associated with window. - ScintillaWin *sci = reinterpret_cast<ScintillaWin *>(PointerFromWindow(hWnd)); + ScintillaWin *sci = static_cast<ScintillaWin *>(PointerFromWindow(hWnd)); // sci will be zero if WM_CREATE not seen yet if (sci == 0) { try { @@ -3390,7 +3390,7 @@ LRESULT PASCAL ScintillaWin::SWndProc( // Must be called once only. int Scintilla_RegisterClasses(void *hInstance) { Platform_Initialise(hInstance); - bool result = ScintillaWin::Register(reinterpret_cast<HINSTANCE>(hInstance)); + bool result = ScintillaWin::Register(static_cast<HINSTANCE>(hInstance)); #ifdef SCI_LEXER Scintilla_LinkLexers(); #endif |