summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2020-08-02 15:13:34 +0300
committerGeorge Hazan <ghazan@miranda.im>2020-08-02 15:13:34 +0300
commit46d2305c53d3c43fed39870a32f7cf598db5de8d (patch)
tree742c4372186483dd8ca4604da95a21297d467856
parentc0f3f15af0ea4149f7e572158831aa0c675ea3df (diff)
tabSRMM: obsolete hidden setting removed
-rw-r--r--plugins/TabSRMM/src/functions.h1
-rw-r--r--plugins/TabSRMM/src/msgdialog.cpp16
-rw-r--r--plugins/TabSRMM/src/msgdlgother.cpp19
3 files changed, 1 insertions, 35 deletions
diff --git a/plugins/TabSRMM/src/functions.h b/plugins/TabSRMM/src/functions.h
index 397799465f..443efccce1 100644
--- a/plugins/TabSRMM/src/functions.h
+++ b/plugins/TabSRMM/src/functions.h
@@ -79,7 +79,6 @@ HMENU TSAPI BuildContainerMenu();
int TSAPI MessageWindowOpened(MCONTACT hContact, CMsgDialog *pDlg);
-LRESULT CALLBACK IEViewSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
LRESULT CALLBACK HPPKFSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
/*
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 89391560dd..bdc3c45ca9 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -73,19 +73,6 @@ static void _clrMsgFilter(MSGFILTER *m)
/////////////////////////////////////////////////////////////////////////////////////////
// sublassing procedure for the h++ based message log viewer
-LRESULT CALLBACK IEViewSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
- CMsgDialog *mwdat = (CMsgDialog*)GetWindowLongPtr(GetParent(hwnd), GWLP_USERDATA);
-
- switch (msg) {
- case WM_NCCALCSIZE:
- return CSkin::NcCalcRichEditFrame(hwnd, mwdat, ID_EXTBKHISTORY, msg, wParam, lParam, IEViewSubclassProc);
- case WM_NCPAINT:
- return CSkin::DrawRichEditFrame(hwnd, mwdat, ID_EXTBKHISTORY, msg, wParam, lParam, IEViewSubclassProc);
- }
- return mir_callNextSubclass(hwnd, IEViewSubclassProc, msg, wParam, lParam);
-}
-
LRESULT CALLBACK HPPKFSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
CMsgDialog *mwdat = (CMsgDialog*)GetWindowLongPtr(GetParent(hwnd), GWLP_USERDATA);
@@ -2801,8 +2788,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
Resize();
PostMessage(m_hwnd, DM_UPDATEPICLAYOUT, 0, 0);
- if (m_iLogMode != WANT_IEVIEW_LOG)
- SetFocus(m_message.GetHwnd());
+ SetFocus(m_message.GetHwnd());
if (m_pContainer->m_flags.m_bSideBar)
m_pContainer->m_pSideBar->moveButtons();
}
diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index 4eefe4db8c..a349dfcedf 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -2330,25 +2330,6 @@ void CMsgDialog::UpdateWindowState(UINT msg)
m_bDeferredScroll = false;
DM_ScrollToBottom(0, 1);
}
-
- if (m_iLogMode == WANT_IEVIEW_LOG) {
- HWND hwndLog = m_pLog->GetHwnd();
-
- RECT rcRTF;
- GetWindowRect(hwndLog, &rcRTF);
- rcRTF.left += 20;
- rcRTF.top += 20;
-
- POINT pt;
- pt.x = rcRTF.left;
- pt.y = rcRTF.top;
-
- if (M.GetByte("subclassIEView", 0)) {
- mir_subclassWindow(hwndLog, IEViewSubclassProc);
- SetWindowPos(hwndLog, nullptr, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_DRAWFRAME);
- RedrawWindow(hwndLog, nullptr, nullptr, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW);
- }
- }
}
DM_SetDBButtonStates();