summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2016-12-19 17:32:21 +0300
committerGeorge Hazan <ghazan@miranda.im>2016-12-19 17:44:58 +0300
commit10126b8ab2d030c8789525edcc87ff1c7c5b3e54 (patch)
tree0e4294f0df6289145d870f0e55763d086d2cd6ef /src/core
parent877a445bdf3ac484e564bb1d62610eeb1329e991 (diff)
unused parameter removed
Diffstat (limited to 'src/core')
-rw-r--r--src/core/stdmsg/src/chat_window.cpp4
-rw-r--r--src/core/stdmsg/src/stdafx.h2
-rw-r--r--src/core/stdmsg/src/tabs.cpp17
3 files changed, 10 insertions, 13 deletions
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index febbeb7a60..cb0c685987 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -218,7 +218,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
if (g_Settings.bTabsEnable)
SendMessage(GetParent(GetParent(hwndDlg)), GC_SWITCHNEXTTAB, 0, 0);
else
- pci->ShowRoom(SM_GetNextWindow(dat->si), WINDOW_VISIBLE, TRUE);
+ pci->ShowRoom(SM_GetNextWindow(dat->si));
return TRUE;
}
@@ -226,7 +226,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
if (g_Settings.bTabsEnable)
SendMessage(GetParent(GetParent(hwndDlg)), GC_SWITCHPREVTAB, 0, 0);
else
- pci->ShowRoom(SM_GetPrevWindow(dat->si), WINDOW_VISIBLE, TRUE);
+ pci->ShowRoom(SM_GetPrevWindow(dat->si));
return TRUE;
}
diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h
index 7fb974d23c..e1658bf1f4 100644
--- a/src/core/stdmsg/src/stdafx.h
+++ b/src/core/stdmsg/src/stdafx.h
@@ -139,7 +139,7 @@ HICON LoadIconEx(const char *pszIcoLibName, bool big);
HANDLE GetIconHandle(const char *pszIcolibName);
// services.cpp
-void ShowRoom(SESSION_INFO *si, WPARAM wp, BOOL bSetForeground);
+void ShowRoom(SESSION_INFO *si);
// tools.cpp
int GetColorIndex(const char* pszModule, COLORREF cr);
diff --git a/src/core/stdmsg/src/tabs.cpp b/src/core/stdmsg/src/tabs.cpp
index 6eb59da245..32fa470e83 100644
--- a/src/core/stdmsg/src/tabs.cpp
+++ b/src/core/stdmsg/src/tabs.cpp
@@ -252,7 +252,7 @@ void CTabbedWindow::TabClicked()
SendMessage(m_hwnd, GC_FIXTABICONS, 0, (LPARAM)pDlg);
if (!s->hWnd) {
- pci->ShowRoom(s, WINDOW_VISIBLE, TRUE);
+ pci->ShowRoom(s);
SendMessage(m_hwnd, WM_MOUSEACTIVATE, 0, 0);
}
}
@@ -529,7 +529,7 @@ void UninitTabs()
/////////////////////////////////////////////////////////////////////////////////////////
-void ShowRoom(SESSION_INFO *si, WPARAM wp, BOOL)
+void ShowRoom(SESSION_INFO *si)
{
if (!si)
return;
@@ -559,14 +559,11 @@ void ShowRoom(SESSION_INFO *si, WPARAM wp, BOOL)
}
SetWindowLongPtr(si->hWnd, GWL_EXSTYLE, GetWindowLongPtr(si->hWnd, GWL_EXSTYLE) | WS_EX_APPWINDOW);
- if (!IsWindowVisible(si->hWnd) || wp == WINDOW_HIDDEN)
- SendMessage(si->hWnd, GC_CONTROL_MSG, wp, 0);
- else {
- if (IsIconic(si->hWnd))
- ShowWindow(si->hWnd, SW_NORMAL);
- ShowWindow(si->hWnd, SW_SHOW);
- SetForegroundWindow(si->hWnd);
- }
+
+ if (IsIconic(si->hWnd))
+ ShowWindow(si->hWnd, SW_NORMAL);
+ ShowWindow(si->hWnd, SW_SHOW);
+ SetForegroundWindow(si->hWnd);
SendMessage(si->hWnd, WM_MOUSEACTIVATE, 0, 0);
SetFocus(GetDlgItem(si->hWnd, IDC_MESSAGE));