From 2840393bf5378c012577c4764dc4cbd162f85d4e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 8 Jun 2012 21:02:06 +0000 Subject: GetWindowLong -> GetWindowLongPtr git-svn-id: http://svn.miranda-ng.org/main/trunk@364 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SmileyAdd/dlgboxsubclass.cpp | 2 +- plugins/SmileyAdd/richcall.cpp | 2 +- plugins/SmileyAdd/smileyroutines.cpp | 4 ++-- plugins/SmileyAdd/smltool.cpp | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/SmileyAdd') diff --git a/plugins/SmileyAdd/dlgboxsubclass.cpp b/plugins/SmileyAdd/dlgboxsubclass.cpp index 1e00bb2cf6..1cec51ce5a 100644 --- a/plugins/SmileyAdd/dlgboxsubclass.cpp +++ b/plugins/SmileyAdd/dlgboxsubclass.cpp @@ -139,7 +139,7 @@ public: GetWindowRect(LButton, &rect); pt.y = rect.top; - if ((GetWindowLong(LButton, GWL_STYLE) & WS_VISIBLE) != 0) + if ((GetWindowLongPtr(LButton, GWL_STYLE) & WS_VISIBLE) != 0) pt.x = rect.left - 28; else pt.x = rect.left; diff --git a/plugins/SmileyAdd/richcall.cpp b/plugins/SmileyAdd/richcall.cpp index 72830400a5..d9b9123c48 100644 --- a/plugins/SmileyAdd/richcall.cpp +++ b/plugins/SmileyAdd/richcall.cpp @@ -397,7 +397,7 @@ bool SetRichCallback(HWND hwnd, HANDLE hContact, bool subany, bool subnew) rdt->hwnd = hwnd; rdt->hContact = hContact; - rdt->inputarea = (GetWindowLong(hwnd, GWL_STYLE) & ES_READONLY) == 0; + rdt->inputarea = (GetWindowLongPtr(hwnd, GWL_STYLE) & ES_READONLY) == 0; rdt->dontReplace = false; rdt->tipActive = -1; rdt->wpOrigWndProc = NULL; diff --git a/plugins/SmileyAdd/smileyroutines.cpp b/plugins/SmileyAdd/smileyroutines.cpp index 10a2e5468e..c5e6e46d8a 100644 --- a/plugins/SmileyAdd/smileyroutines.cpp +++ b/plugins/SmileyAdd/smileyroutines.cpp @@ -293,7 +293,7 @@ void ReplaceSmileys(HWND hwnd, SmileyPackType* smp, SmileyPackCType* smcp, const SetRichCallback(hwnd, NULL, false, true); - bool rdo = (GetWindowLong(hwnd, GWL_STYLE) & ES_READONLY) != 0; + bool rdo = (GetWindowLongPtr(hwnd, GWL_STYLE) & ES_READONLY) != 0; if (rdo) SendMessage(hwnd, EM_SETREADONLY, FALSE, 0); ITextSelection* TextSelection; @@ -565,7 +565,7 @@ void ReplaceSmileysWithText(HWND hwnd, CHARRANGE& sel, bool keepFrozen) long cnt; TextDocument->Freeze(&cnt); - bool rdo = (GetWindowLong(hwnd, GWL_STYLE) & ES_READONLY) != 0; + bool rdo = (GetWindowLongPtr(hwnd, GWL_STYLE) & ES_READONLY) != 0; if (rdo) SendMessage(hwnd, EM_SETREADONLY, FALSE, 0); CHARRANGE oldSel; diff --git a/plugins/SmileyAdd/smltool.cpp b/plugins/SmileyAdd/smltool.cpp index 79030076c8..31695a516a 100644 --- a/plugins/SmileyAdd/smltool.cpp +++ b/plugins/SmileyAdd/smltool.cpp @@ -486,12 +486,12 @@ void SmileyToolWindowType::InitDialog(LPARAM lParam) si.nPos = 0; SetScrollInfo(m_hwndDialog, SB_VERT, &si, TRUE); - if (GetWindowLong(m_hwndDialog, GWL_STYLE) & WS_VSCROLL) + if (GetWindowLongPtr(m_hwndDialog, GWL_STYLE) & WS_VSCROLL) width += GetSystemMetrics(SM_CXVSCROLL); RECT rc = { 0, 0, width, heightn }; - AdjustWindowRectEx(&rc, GetWindowLong(m_hwndDialog, GWL_STYLE), - FALSE, GetWindowLong(m_hwndDialog, GWL_EXSTYLE)); + AdjustWindowRectEx(&rc, GetWindowLongPtr(m_hwndDialog, GWL_STYLE), + FALSE, GetWindowLongPtr(m_hwndDialog, GWL_EXSTYLE)); width = rc.right - rc.left; height = rc.bottom - rc.top; -- cgit v1.2.3