From 4a9e49eaf838d1b87a2c6696945f00f35c988397 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Sat, 23 Jun 2012 14:04:50 +0000
Subject: MenuItemEx: plusified

git-svn-id: http://svn.miranda-ng.org/main/trunk@556 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/MenuItemEx/main.cpp                  | 18 +++++-------------
 plugins/MenuItemEx/menuex_10.vcxproj         | 14 +++++++-------
 plugins/MenuItemEx/menuex_10.vcxproj.filters |  6 +++---
 3 files changed, 15 insertions(+), 23 deletions(-)

(limited to 'plugins/MenuItemEx')

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
diff --git a/plugins/MenuItemEx/menuex_10.vcxproj b/plugins/MenuItemEx/menuex_10.vcxproj
index 966d6e453b..610237f2a9 100644
--- a/plugins/MenuItemEx/menuex_10.vcxproj
+++ b/plugins/MenuItemEx/menuex_10.vcxproj
@@ -76,7 +76,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;UNICODE;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -98,7 +98,7 @@
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;UNICODE;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -123,7 +123,7 @@
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;UNICODE;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -151,7 +151,7 @@
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;UNICODE;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -171,9 +171,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="images.c" />
-    <ClCompile Include="main.c" />
-    <ClCompile Include="options.c" />
+    <ClCompile Include="images.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="options.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="menuex.h" />
diff --git a/plugins/MenuItemEx/menuex_10.vcxproj.filters b/plugins/MenuItemEx/menuex_10.vcxproj.filters
index 7d0db3342a..bd0660ac98 100644
--- a/plugins/MenuItemEx/menuex_10.vcxproj.filters
+++ b/plugins/MenuItemEx/menuex_10.vcxproj.filters
@@ -15,13 +15,13 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="images.c">
+    <ClCompile Include="images.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.c">
+    <ClCompile Include="main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.c">
+    <ClCompile Include="options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-- 
cgit v1.2.3