diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2012-06-23 14:04:50 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2012-06-23 14:04:50 +0000 |
| commit | 4a9e49eaf838d1b87a2c6696945f00f35c988397 (patch) | |
| tree | d7e468508c4a393d170206ed3ba2ca4e21433682 /plugins/MenuItemEx/main.cpp | |
| parent | 08bc5d634d544fe8572749dd7d340c6916c56fd2 (diff) | |
MenuItemEx:
plusified
git-svn-id: http://svn.miranda-ng.org/main/trunk@556 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MenuItemEx/main.cpp')
| -rw-r--r-- | plugins/MenuItemEx/main.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/plugins/MenuItemEx/main.cpp b/plugins/MenuItemEx/main.cpp index 9088aaf6c5..9ae83d10d3 100644 --- a/plugins/MenuItemEx/main.cpp +++ b/plugins/MenuItemEx/main.cpp @@ -332,7 +332,6 @@ BOOL isMetaContact(HANDLE hContact) { return FALSE;
}
-
HANDLE getDefaultContact(HANDLE hContact) {
if(bMetaContacts) {
@@ -341,7 +340,6 @@ HANDLE getDefaultContact(HANDLE hContact) { return 0;
}
-
HANDLE getMostOnline(HANDLE hContact) {
if(bMetaContacts) {
@@ -350,7 +348,6 @@ HANDLE getMostOnline(HANDLE hContact) { return 0;
}
-
void GetID(HANDLE hContact,LPSTR szProto,LPSTR szID)
{
DBVARIANT dbv_uniqueid;
@@ -926,7 +923,7 @@ static HANDLE AddSubmenuItem(HANDLE hRoot, TCHAR* name, HICON icon, DWORD flag, {
CLISTMENUITEM mi = { 0 };
mi.cbSize = sizeof(mi);
- mi.hParentMenu = hRoot;
+ mi.hParentMenu = (HGENMENU)hRoot;
mi.pszPopupName = (char*)hRoot; // for Miranda 0.7
mi.popupPosition = param;
mi.position = pos;
@@ -1357,17 +1354,12 @@ static int PluginInit(WPARAM wparam,LPARAM lparam) return 0;
}
-__declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfoEx;
}
-
-__declspec(dllexport) MUUID* MirandaPluginInterfaces(void) {
- return interfaces;
-}
-
-__declspec(dllexport)int Load(PLUGINLINK *link)
+extern "C" __declspec(dllexport) int Load(PLUGINLINK *link)
{
pluginLink = link;
mir_getMMI( &mmi );
@@ -1376,7 +1368,7 @@ __declspec(dllexport)int Load(PLUGINLINK *link) return 0;
}
-__declspec(dllexport)int Unload(void)
+extern "C" __declspec(dllexport) int Unload(void)
{
int i;
for (i = 0; i < SIZEOF(hHooks); i++)
@@ -1399,4 +1391,4 @@ BOOL WINAPI DllMain(HINSTANCE hinst,DWORD fdwReason,LPVOID lpvReserved) {
hinstance = hinst;
return 1;
-}
+}
\ No newline at end of file |