summaryrefslogtreecommitdiff
path: root/plugins/QuickContacts/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-06-25 15:22:06 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-06-25 15:22:06 +0000
commit65e6aa9b5468f26485a236a46fcb18541e1acf1a (patch)
tree61654d2c6f18523580372656d3bda6d7b93be845 /plugins/QuickContacts/src
parent8501b9e4faa15257535e71b766f06f16b7971e39 (diff)
rest of genmenu api died
git-svn-id: http://svn.miranda-ng.org/main/trunk@14382 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/QuickContacts/src')
-rw-r--r--plugins/QuickContacts/src/commons.h1
-rw-r--r--plugins/QuickContacts/src/quickcontacts.cpp13
2 files changed, 6 insertions, 8 deletions
diff --git a/plugins/QuickContacts/src/commons.h b/plugins/QuickContacts/src/commons.h
index 98e8b0d5dd..e308aab019 100644
--- a/plugins/QuickContacts/src/commons.h
+++ b/plugins/QuickContacts/src/commons.h
@@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA.
#include <m_clist.h>
#include <m_message.h>
#include <m_userinfo.h>
+#include <m_genmenu.h>
#include <m_skin.h>
#include <m_langpack.h>
#include <m_database.h>
diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp
index 97cbccc467..9f52e186bd 100644
--- a/plugins/QuickContacts/src/quickcontacts.cpp
+++ b/plugins/QuickContacts/src/quickcontacts.cpp
@@ -999,9 +999,8 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
if(lpdis->CtlID != IDC_USERNAME)
{
if (lpdis->CtlType == ODT_MENU)
- return CallService(MS_CLIST_MENUDRAWITEM,wParam,lParam);
- else
- break;
+ return Menu_DrawItem(lpdis);
+ break;
}
// Handle combo
@@ -1094,12 +1093,10 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
LPMEASUREITEMSTRUCT lpmis = (LPMEASUREITEMSTRUCT)lParam;
// Handle contact menu
- if(lpmis->CtlID != IDC_USERNAME)
- {
+ if(lpmis->CtlID != IDC_USERNAME) {
if (lpmis->CtlType == ODT_MENU)
- return CallService(MS_CLIST_MENUMEASUREITEM,wParam,lParam);
- else
- break;
+ return Menu_MeasureItem(lpmis);
+ break;
}
// Handle combo