From c3697d205537e4578e2b6f66eb38afa5b1e3e16f Mon Sep 17 00:00:00 2001 From: Christian Grasser Date: Wed, 27 May 2015 22:59:46 +0200 Subject: [PATCH] Cleanup usage of remaining Pre-Unicode interface usage of SetWindowLongPtrW, SetWindowLongPtrA -> SetWindowLongPtr; GetWindowLongPtrW -> GetWindowLongPtr --- PowerEditor/src/Parameters.h | 2 +- .../src/ScitillaComponent/ScintillaEditView.cpp | 16 +++------------- .../src/WinControls/DocumentMap/documentMap.cpp | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h index d63f31830..cb7273ed4 100644 --- a/PowerEditor/src/Parameters.h +++ b/PowerEditor/src/Parameters.h @@ -1422,7 +1422,7 @@ public: // if (percent == 255) then opacq void SetTransparent(HWND hwnd, int percent) { if (!_transparentFuncAddr) return; - ::SetWindowLongPtr(hwnd, GWL_EXSTYLE, ::GetWindowLongPtrW(hwnd, GWL_EXSTYLE) | 0x00080000); + ::SetWindowLongPtr(hwnd, GWL_EXSTYLE, ::GetWindowLongPtr(hwnd, GWL_EXSTYLE) | 0x00080000); if (percent > 255) percent = 255; if (percent < 0) diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp index b77f27ec5..f3c1c13b2 100644 --- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp @@ -255,19 +255,9 @@ void ScintillaEditView::init(HINSTANCE hInst, HWND hPere) _codepage = ::GetACP(); - //Use either Unicode or ANSI setwindowlong, depending on environment - if (::IsWindowUnicode(_hSelf)) - { - ::SetWindowLongPtrW(_hSelf, GWLP_USERDATA, reinterpret_cast(this)); - _callWindowProc = CallWindowProcW; - _scintillaDefaultProc = reinterpret_cast(::SetWindowLongPtrW(_hSelf, GWLP_WNDPROC, reinterpret_cast(scintillaStatic_Proc))); - } - else - { - ::SetWindowLongPtrA(_hSelf, GWLP_USERDATA, reinterpret_cast(this)); - _callWindowProc = CallWindowProcA; - _scintillaDefaultProc = reinterpret_cast(::SetWindowLongPtrA(_hSelf, GWLP_WNDPROC, reinterpret_cast(scintillaStatic_Proc))); - } + ::SetWindowLongPtr(_hSelf, GWLP_USERDATA, reinterpret_cast(this)); + _callWindowProc = CallWindowProcW; + _scintillaDefaultProc = reinterpret_cast(::SetWindowLongPtr(_hSelf, GWLP_WNDPROC, reinterpret_cast(scintillaStatic_Proc))); //Get the startup document and make a buffer for it so it can be accessed like a file attachDefaultDoc(); diff --git a/PowerEditor/src/WinControls/DocumentMap/documentMap.cpp b/PowerEditor/src/WinControls/DocumentMap/documentMap.cpp index 650d024f5..aa2c83fb5 100644 --- a/PowerEditor/src/WinControls/DocumentMap/documentMap.cpp +++ b/PowerEditor/src/WinControls/DocumentMap/documentMap.cpp @@ -440,7 +440,7 @@ BOOL CALLBACK ViewZoneDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara case WM_INITDIALOG : { _viewZoneCanvas = ::GetDlgItem(_hSelf, IDC_VIEWZONECANVAS); - ::SetWindowLongPtrW(_viewZoneCanvas, GWLP_USERDATA, reinterpret_cast(this)); + ::SetWindowLongPtr(_viewZoneCanvas, GWLP_USERDATA, reinterpret_cast(this)); _canvasDefaultProc = reinterpret_cast(::SetWindowLongPtr(_viewZoneCanvas, GWLP_WNDPROC, reinterpret_cast(canvasStaticProc))); return TRUE; }