diff options
| author | George Hazan <ghazan@miranda.im> | 2017-03-27 00:35:25 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-03-27 00:35:25 +0300 |
| commit | 2d161955dabcb5a8a8b6069f94945ec7657805bf (patch) | |
| tree | 7d7e86e00f0f1f1e935f2e7bb869e5bc125fbc69 /src/mir_app | |
| parent | 42e20e76dd64d9f11d2f56dda7888476231dee44 (diff) | |
fixes #777 (scrollbars disappeared from tabSRMM)
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/mir_app.def | 3 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 3 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_base.cpp | 6 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_toolbar.cpp | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 0657e1546c..f7fa45ce1d 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -440,3 +440,6 @@ Chat_AddMenuItems @442 NONAME Chat_DestroyGCMenu @443 NONAME
Chat_CreateGCMenu @444 NONAME
Chat_DoEventHook @445 NONAME
+_stubLogProc@16 @446 NONAME
+_stubMessageProc@16 @447 NONAME
+_stubNicklistProc@16 @448 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 9a40194286..0d7fce7403 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -440,3 +440,6 @@ Chat_AddMenuItems @442 NONAME Chat_DestroyGCMenu @443 NONAME
Chat_CreateGCMenu @444 NONAME
Chat_DoEventHook @445 NONAME
+stubLogProc @446 NONAME
+stubMessageProc @447 NONAME
+stubNicklistProc @448 NONAME
diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index 8dbb2ad409..01b401f1f2 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -147,7 +147,7 @@ static LRESULT CALLBACK Srmm_ButtonSubclassProc(HWND hwnd, UINT msg, WPARAM wPar ///////////////////////////////////////////////////////////////////////////////////////// -static LRESULT CALLBACK stubLogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +EXTERN_C MIR_APP_DLL(LRESULT) CALLBACK stubLogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { CSrmmBaseDialog *pDlg = (CSrmmBaseDialog*)GetWindowLongPtr(GetParent(hwnd), GWLP_USERDATA); if (pDlg != nullptr) @@ -303,7 +303,7 @@ LRESULT CSrmmBaseDialog::WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) ///////////////////////////////////////////////////////////////////////////////////////// -static LRESULT CALLBACK stubMessageProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +EXTERN_C MIR_APP_DLL(LRESULT) CALLBACK stubMessageProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { CSrmmBaseDialog *pDlg = (CSrmmBaseDialog*)GetWindowLongPtr(GetParent(hwnd), GWLP_USERDATA); if (pDlg != nullptr) @@ -428,7 +428,7 @@ static void CALLBACK ChatTimerProc(HWND hwnd, UINT, UINT_PTR idEvent, DWORD) KillTimer(hwnd, idEvent); } -static LRESULT CALLBACK stubNicklistProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +EXTERN_C MIR_APP_DLL(LRESULT) CALLBACK stubNicklistProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { CSrmmBaseDialog *pDlg = (CSrmmBaseDialog*)GetWindowLongPtr(GetParent(hwnd), GWLP_USERDATA); if (pDlg != nullptr) diff --git a/src/mir_app/src/srmm_toolbar.cpp b/src/mir_app/src/srmm_toolbar.cpp index 9f598d3f8c..8517637822 100644 --- a/src/mir_app/src/srmm_toolbar.cpp +++ b/src/mir_app/src/srmm_toolbar.cpp @@ -731,7 +731,7 @@ public: void OnTreeItemChanged(void*) { - int iNewState = !m_toolBar.GetCheckState(m_toolBar.GetSelection()); + bool iNewState = !m_toolBar.GetCheckState(m_toolBar.GetSelection()); m_btnIM.Enable(iNewState); m_btnChat.Enable(iNewState); m_btnHidden.Enable(iNewState); |