project fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@7661 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

6 files changed, 98 insertions, 14 deletions

diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp
index 430fc2cfd9..2b5b9dacd9 100644
--- a/src/core/stdchat/src/options.cpp
+++ b/src/core/stdchat/src/options.cpp
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "resource.h"

 #include "chat.h"

 

-#include <m_fontservice.h>

-

 struct branch_t

 {

 	const TCHAR* szDescr;

diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp
index 6987e6b20c..0ad24af67e 100644
--- a/src/core/stdchat/src/window.cpp
+++ b/src/core/stdchat/src/window.cpp
@@ -1095,7 +1095,7 @@ static int RestoreWindowPosition(HWND hwnd, HANDLE hContact, char * szModule, ch
 	return 1;

 }

 

-int GetTextPixelSize( TCHAR* pszText, HFONT hFont, BOOL bWidth)

+int GetTextPixelSize(TCHAR* pszText, HFONT hFont, BOOL bWidth)

 {

 	if (!pszText || !hFont)

 		return 0;

@@ -1202,8 +1202,8 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
 			// LoadGlobalSettings(); !!!!!!!!!!!!!!!!!!!!!!

 			InitButtons(hwndDlg, si);

 

-			HICON hIcon = si->wStatus==ID_STATUS_ONLINE?pci->MM_FindModule(si->pszModule)->hOnlineIcon:pci->MM_FindModule(si->pszModule)->hOfflineIcon;

 			// stupid hack to make icons show. I dunno why this is needed currently

+			HICON hIcon = si->wStatus == ID_STATUS_ONLINE ? pci->MM_FindModule(si->pszModule)->hOnlineIcon : pci->MM_FindModule(si->pszModule)->hOfflineIcon;

 			if (!hIcon) {

 				pci->MM_IconsChanged();

 				hIcon = (si->wStatus == ID_STATUS_ONLINE) ? pci->MM_FindModule(si->pszModule)->hOnlineIcon : pci->MM_FindModule(si->pszModule)->hOfflineIcon;

diff --git a/src/miranda32_10.vcxproj b/src/miranda32_10.vcxproj
index dd742ec9ec..29ba77d0b1 100644
--- a/src/miranda32_10.vcxproj
+++ b/src/miranda32_10.vcxproj
@@ -74,7 +74,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\include;..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

@@ -113,7 +113,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\include;..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

@@ -150,7 +150,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\include;..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>false</StringPooling>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -183,7 +183,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\include;..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>false</StringPooling>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -256,6 +256,7 @@
     <ClInclude Include="core\commonheaders.h" />

     <ClInclude Include="core\miranda.h" />

     <ClInclude Include="core\stdplug.h" />

+    <ClInclude Include="modules\chat\chat.h" />

     <ClInclude Include="modules\database\database.h" />

     <ClInclude Include="modules\database\profilemanager.h" />

     <ClInclude Include="modules\extraicons\ExtraIcon.h" />

@@ -287,6 +288,24 @@
     <ClCompile Include="modules\button\button.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

+    <ClCompile Include="modules\chat\chat_opts.cpp">

+      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="modules\chat\chat_svc.cpp">

+      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="modules\chat\clist.cpp">

+      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="modules\chat\log.cpp">

+      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="modules\chat\manager.cpp">

+      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="modules\chat\tools.cpp">

+      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

     <ClCompile Include="modules\clist\contacts.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

@@ -452,7 +471,7 @@
     <ClCompile Include="modules\utils\colourpicker.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

-    <ClCompile Include="modules\utils\enterstring.cpp" >

+    <ClCompile Include="modules\utils\enterstring.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

     <ClCompile Include="modules\utils\hyperlink.cpp">

diff --git a/src/miranda32_10.vcxproj.filters b/src/miranda32_10.vcxproj.filters
index 4ef4ea036f..46268a1b98 100644
--- a/src/miranda32_10.vcxproj.filters
+++ b/src/miranda32_10.vcxproj.filters
@@ -73,6 +73,9 @@
     <Filter Include="Modules\srmm">

       <UniqueIdentifier>{3da88f1b-9c87-43dc-a7a1-140d8dc6eefc}</UniqueIdentifier>

     </Filter>

+    <Filter Include="Modules\chat">

+      <UniqueIdentifier>{7ff3d1b7-90ae-4c3d-bd0d-ab8941b8aa7b}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\include\m_addcontact.h">

@@ -252,6 +255,9 @@
     <ClInclude Include="..\include\m_extraicons.h">

       <Filter>Modules\extraicons</Filter>

     </ClInclude>

+    <ClInclude Include="modules\chat\chat.h">

+      <Filter>Modules\chat</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="core\commonheaders.cpp">

@@ -557,6 +563,24 @@
     <ClCompile Include="modules\utils\enterstring.cpp">

       <Filter>Modules\utils</Filter>

     </ClCompile>

+    <ClCompile Include="modules\chat\chat_opts.cpp">

+      <Filter>Modules\chat</Filter>

+    </ClCompile>

+    <ClCompile Include="modules\chat\chat_svc.cpp">

+      <Filter>Modules\chat</Filter>

+    </ClCompile>

+    <ClCompile Include="modules\chat\clist.cpp">

+      <Filter>Modules\chat</Filter>

+    </ClCompile>

+    <ClCompile Include="modules\chat\log.cpp">

+      <Filter>Modules\chat</Filter>

+    </ClCompile>

+    <ClCompile Include="modules\chat\manager.cpp">

+      <Filter>Modules\chat</Filter>

+    </ClCompile>

+    <ClCompile Include="modules\chat\tools.cpp">

+      <Filter>Modules\chat</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="resource.rc">

diff --git a/src/miranda32_11.vcxproj b/src/miranda32_11.vcxproj
index 4eed34ef0c..5600fe3684 100644
--- a/src/miranda32_11.vcxproj
+++ b/src/miranda32_11.vcxproj
@@ -78,7 +78,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\include;..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

@@ -116,7 +116,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\include;..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

@@ -152,7 +152,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\include;..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>false</StringPooling>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -186,7 +186,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\include;..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>false</StringPooling>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -259,6 +259,7 @@
     <ClInclude Include="core\commonheaders.h" />

     <ClInclude Include="core\miranda.h" />

     <ClInclude Include="core\stdplug.h" />

+    <ClInclude Include="modules\chat\chat.h" />

     <ClInclude Include="modules\database\database.h" />

     <ClInclude Include="modules\database\profilemanager.h" />

     <ClInclude Include="modules\extraicons\ExtraIcon.h" />

@@ -290,6 +291,24 @@
     <ClCompile Include="modules\button\button.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

+    <ClCompile Include="modules\chat\chat_opts.cpp">

+      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="modules\chat\chat_svc.cpp">

+      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="modules\chat\clist.cpp">

+      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="modules\chat\log.cpp">

+      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="modules\chat\manager.cpp">

+      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="modules\chat\tools.cpp">

+      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

     <ClCompile Include="modules\clist\contacts.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

@@ -455,7 +474,7 @@
     <ClCompile Include="modules\utils\colourpicker.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

-    <ClCompile Include="modules\utils\enterstring.cpp" >

+    <ClCompile Include="modules\utils\enterstring.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

     <ClCompile Include="modules\utils\hyperlink.cpp">

diff --git a/src/miranda32_11.vcxproj.filters b/src/miranda32_11.vcxproj.filters
index 4cc2fe9de8..e1cb7d3501 100644
--- a/src/miranda32_11.vcxproj.filters
+++ b/src/miranda32_11.vcxproj.filters
@@ -73,6 +73,9 @@
     <Filter Include="Modules\srmm">

       <UniqueIdentifier>{b3f78380-76da-4a82-a0e2-1a14b173dac1}</UniqueIdentifier>

     </Filter>

+    <Filter Include="Modules\chat">

+      <UniqueIdentifier>{dbc919bd-4481-4065-8401-6d2f89dcc648}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\include\m_addcontact.h">

@@ -252,6 +255,9 @@
     <ClInclude Include="..\include\m_extraicons.h">

       <Filter>Modules\extraicons</Filter>

     </ClInclude>

+    <ClInclude Include="modules\chat\chat.h">

+      <Filter>Modules\chat</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="core\commonheaders.cpp">

@@ -557,6 +563,24 @@
     <ClCompile Include="modules\utils\enterstring.cpp">

       <Filter>Modules\utils</Filter>

     </ClCompile>

+    <ClCompile Include="modules\chat\chat_opts.cpp">

+      <Filter>Modules\chat</Filter>

+    </ClCompile>

+    <ClCompile Include="modules\chat\chat_svc.cpp">

+      <Filter>Modules\chat</Filter>

+    </ClCompile>

+    <ClCompile Include="modules\chat\clist.cpp">

+      <Filter>Modules\chat</Filter>

+    </ClCompile>

+    <ClCompile Include="modules\chat\log.cpp">

+      <Filter>Modules\chat</Filter>

+    </ClCompile>

+    <ClCompile Include="modules\chat\manager.cpp">

+      <Filter>Modules\chat</Filter>

+    </ClCompile>

+    <ClCompile Include="modules\chat\tools.cpp">

+      <Filter>Modules\chat</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="resource.rc">