standardizing CLUIFrames file names

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

19 files changed, 105 insertions, 82 deletions

diff --git a/plugins/Clist_modern/clist_modern_10.vcxproj b/plugins/Clist_modern/clist_modern_10.vcxproj
index 9bf3882097..e1c21fa43a 100644
--- a/plugins/Clist_modern/clist_modern_10.vcxproj
+++ b/plugins/Clist_modern/clist_modern_10.vcxproj
@@ -191,6 +191,15 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <ClCompile Include="src\CLUIFrames\cluiframes.cpp">

+      <PrecompiledHeaderFile>../hdr/modern_commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\CLUIFrames\framesmenu.cpp">

+      <PrecompiledHeaderFile>../hdr/modern_commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\CLUIFrames\groupmenu.cpp">

+      <PrecompiledHeaderFile>../hdr/modern_commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

     <ClCompile Include="src\init.cpp" />

     <ClCompile Include="src\modern_aniavatars.cpp" />

     <ClCompile Include="src\modern_awaymsg.cpp" />

@@ -209,18 +218,15 @@
     <ClCompile Include="src\modern_clistsettings.cpp" />

     <ClCompile Include="src\modern_clisttray.cpp" />

     <ClCompile Include="src\modern_clui.cpp" />

-    <ClCompile Include="src\modern_cluiframes.cpp" />

     <ClCompile Include="src\modern_cluiservices.cpp" />

     <ClCompile Include="src\modern_commonheaders.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\modern_contact.cpp" />

     <ClCompile Include="src\modern_docking.cpp" />

-    <ClCompile Include="src\modern_framesmenu.cpp" />

     <ClCompile Include="src\modern_gdiplus.cpp" />

     <ClCompile Include="src\modern_gettextasync.cpp" />

     <ClCompile Include="src\modern_global.cpp" />

-    <ClCompile Include="src\modern_groupmenu.cpp" />

     <ClCompile Include="src\modern_image_array.cpp" />

     <ClCompile Include="src\modern_keyboard.cpp" />

     <ClCompile Include="src\modern_log.cpp" />

@@ -244,13 +250,13 @@
     <ClCompile Include="src\modern_xptheme.cpp" />

   </ItemGroup>

   <ItemGroup>

+    <ClInclude Include="src\CLUIFrames\cluiframes.h" />

     <ClInclude Include="src\hdr\modern_cache_funcs.h" />

     <ClInclude Include="src\hdr\modern_callproc.h" />

     <ClInclude Include="src\hdr\modern_clc.h" />

     <ClInclude Include="src\hdr\modern_clcpaint.h" />

     <ClInclude Include="src\hdr\modern_clist.h" />

     <ClInclude Include="src\hdr\modern_clui.h" />

-    <ClInclude Include="src\hdr\modern_cluiframes.h" />

     <ClInclude Include="src\hdr\modern_commonheaders.h" />

     <ClInclude Include="src\hdr\modern_commonprototypes.h" />

     <ClInclude Include="src\hdr\modern_defsettings.h" />

diff --git a/plugins/Clist_modern/clist_modern_10.vcxproj.filters b/plugins/Clist_modern/clist_modern_10.vcxproj.filters
index 7b6f796a3c..203bcf0f48 100644
--- a/plugins/Clist_modern/clist_modern_10.vcxproj.filters
+++ b/plugins/Clist_modern/clist_modern_10.vcxproj.filters
@@ -13,6 +13,9 @@
       <UniqueIdentifier>{160168fd-2f10-425e-bd83-f37565fffc2c}</UniqueIdentifier>

       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

     </Filter>

+    <Filter Include="Source Files\CLUIFrames">

+      <UniqueIdentifier>{826d2dcb-6f27-428e-a2bf-4825dc88ce32}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\init.cpp">

@@ -69,9 +72,6 @@
     <ClCompile Include="src\modern_clui.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\modern_cluiframes.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\modern_cluiservices.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -84,9 +84,6 @@
     <ClCompile Include="src\modern_docking.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\modern_framesmenu.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\modern_gdiplus.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -96,9 +93,6 @@
     <ClCompile Include="src\modern_global.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\modern_groupmenu.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\modern_image_array.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -162,6 +156,15 @@
     <ClCompile Include="src\modern_utils.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="src\CLUIFrames\cluiframes.cpp">

+      <Filter>Source Files\CLUIFrames</Filter>

+    </ClCompile>

+    <ClCompile Include="src\CLUIFrames\framesmenu.cpp">

+      <Filter>Source Files\CLUIFrames</Filter>

+    </ClCompile>

+    <ClCompile Include="src\CLUIFrames\groupmenu.cpp">

+      <Filter>Source Files\CLUIFrames</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\hdr\modern_commonheaders.h">

@@ -197,9 +200,6 @@
     <ClInclude Include="src\hdr\modern_clui.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\hdr\modern_cluiframes.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\hdr\modern_commonprototypes.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -254,6 +254,9 @@
     <ClInclude Include="src\Version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\CLUIFrames\cluiframes.h">

+      <Filter>Source Files\CLUIFrames</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\version.rc">

diff --git a/plugins/Clist_modern/clist_modern_11.vcxproj b/plugins/Clist_modern/clist_modern_11.vcxproj
index 813c95327c..b4f1ef26df 100644
--- a/plugins/Clist_modern/clist_modern_11.vcxproj
+++ b/plugins/Clist_modern/clist_modern_11.vcxproj
@@ -194,6 +194,15 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <ClCompile Include="src\CLUIFrames\cluiframes.cpp">

+      <PrecompiledHeaderFile>../hdr/modern_commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\CLUIFrames\framesmenu.cpp">

+      <PrecompiledHeaderFile>../hdr/modern_commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\CLUIFrames\groupmenu.cpp">

+      <PrecompiledHeaderFile>../hdr/modern_commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

     <ClCompile Include="src\init.cpp" />

     <ClCompile Include="src\modern_aniavatars.cpp" />

     <ClCompile Include="src\modern_awaymsg.cpp" />

@@ -212,18 +221,15 @@
     <ClCompile Include="src\modern_clistsettings.cpp" />

     <ClCompile Include="src\modern_clisttray.cpp" />

     <ClCompile Include="src\modern_clui.cpp" />

-    <ClCompile Include="src\modern_cluiframes.cpp" />

     <ClCompile Include="src\modern_cluiservices.cpp" />

     <ClCompile Include="src\modern_commonheaders.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\modern_contact.cpp" />

     <ClCompile Include="src\modern_docking.cpp" />

-    <ClCompile Include="src\modern_framesmenu.cpp" />

     <ClCompile Include="src\modern_gdiplus.cpp" />

     <ClCompile Include="src\modern_gettextasync.cpp" />

     <ClCompile Include="src\modern_global.cpp" />

-    <ClCompile Include="src\modern_groupmenu.cpp" />

     <ClCompile Include="src\modern_image_array.cpp" />

     <ClCompile Include="src\modern_keyboard.cpp" />

     <ClCompile Include="src\modern_log.cpp" />

@@ -247,13 +253,13 @@
     <ClCompile Include="src\modern_xptheme.cpp" />

   </ItemGroup>

   <ItemGroup>

+    <ClInclude Include="src\CLUIFrames\cluiframes.h" />

     <ClInclude Include="src\hdr\modern_cache_funcs.h" />

     <ClInclude Include="src\hdr\modern_callproc.h" />

     <ClInclude Include="src\hdr\modern_clc.h" />

     <ClInclude Include="src\hdr\modern_clcpaint.h" />

     <ClInclude Include="src\hdr\modern_clist.h" />

     <ClInclude Include="src\hdr\modern_clui.h" />

-    <ClInclude Include="src\hdr\modern_cluiframes.h" />

     <ClInclude Include="src\hdr\modern_commonheaders.h" />

     <ClInclude Include="src\hdr\modern_commonprototypes.h" />

     <ClInclude Include="src\hdr\modern_defsettings.h" />

diff --git a/plugins/Clist_modern/clist_modern_11.vcxproj.filters b/plugins/Clist_modern/clist_modern_11.vcxproj.filters
index 7b6f796a3c..203bcf0f48 100644
--- a/plugins/Clist_modern/clist_modern_11.vcxproj.filters
+++ b/plugins/Clist_modern/clist_modern_11.vcxproj.filters
@@ -13,6 +13,9 @@
       <UniqueIdentifier>{160168fd-2f10-425e-bd83-f37565fffc2c}</UniqueIdentifier>

       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

     </Filter>

+    <Filter Include="Source Files\CLUIFrames">

+      <UniqueIdentifier>{826d2dcb-6f27-428e-a2bf-4825dc88ce32}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\init.cpp">

@@ -69,9 +72,6 @@
     <ClCompile Include="src\modern_clui.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\modern_cluiframes.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\modern_cluiservices.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -84,9 +84,6 @@
     <ClCompile Include="src\modern_docking.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\modern_framesmenu.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\modern_gdiplus.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -96,9 +93,6 @@
     <ClCompile Include="src\modern_global.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\modern_groupmenu.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\modern_image_array.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -162,6 +156,15 @@
     <ClCompile Include="src\modern_utils.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="src\CLUIFrames\cluiframes.cpp">

+      <Filter>Source Files\CLUIFrames</Filter>

+    </ClCompile>

+    <ClCompile Include="src\CLUIFrames\framesmenu.cpp">

+      <Filter>Source Files\CLUIFrames</Filter>

+    </ClCompile>

+    <ClCompile Include="src\CLUIFrames\groupmenu.cpp">

+      <Filter>Source Files\CLUIFrames</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\hdr\modern_commonheaders.h">

@@ -197,9 +200,6 @@
     <ClInclude Include="src\hdr\modern_clui.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\hdr\modern_cluiframes.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\hdr\modern_commonprototypes.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -254,6 +254,9 @@
     <ClInclude Include="src\Version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\CLUIFrames\cluiframes.h">

+      <Filter>Source Files\CLUIFrames</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\version.rc">

diff --git a/plugins/Clist_modern/clist_modern_12.vcxproj b/plugins/Clist_modern/clist_modern_12.vcxproj
index c415da2985..52d6405c04 100644
--- a/plugins/Clist_modern/clist_modern_12.vcxproj
+++ b/plugins/Clist_modern/clist_modern_12.vcxproj
@@ -194,6 +194,15 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <ClCompile Include="src\CLUIFrames\cluiframes.cpp">

+      <PrecompiledHeaderFile>../hdr/modern_commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\CLUIFrames\framesmenu.cpp">

+      <PrecompiledHeaderFile>../hdr/modern_commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\CLUIFrames\groupmenu.cpp">

+      <PrecompiledHeaderFile>../hdr/modern_commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

     <ClCompile Include="src\init.cpp" />

     <ClCompile Include="src\modern_aniavatars.cpp" />

     <ClCompile Include="src\modern_awaymsg.cpp" />

@@ -212,18 +221,15 @@
     <ClCompile Include="src\modern_clistsettings.cpp" />

     <ClCompile Include="src\modern_clisttray.cpp" />

     <ClCompile Include="src\modern_clui.cpp" />

-    <ClCompile Include="src\modern_cluiframes.cpp" />

     <ClCompile Include="src\modern_cluiservices.cpp" />

     <ClCompile Include="src\modern_commonheaders.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="src\modern_contact.cpp" />

     <ClCompile Include="src\modern_docking.cpp" />

-    <ClCompile Include="src\modern_framesmenu.cpp" />

     <ClCompile Include="src\modern_gdiplus.cpp" />

     <ClCompile Include="src\modern_gettextasync.cpp" />

     <ClCompile Include="src\modern_global.cpp" />

-    <ClCompile Include="src\modern_groupmenu.cpp" />

     <ClCompile Include="src\modern_image_array.cpp" />

     <ClCompile Include="src\modern_keyboard.cpp" />

     <ClCompile Include="src\modern_log.cpp" />

@@ -247,13 +253,13 @@
     <ClCompile Include="src\modern_xptheme.cpp" />

   </ItemGroup>

   <ItemGroup>

+    <ClInclude Include="src\CLUIFrames\cluiframes.h" />

     <ClInclude Include="src\hdr\modern_cache_funcs.h" />

     <ClInclude Include="src\hdr\modern_callproc.h" />

     <ClInclude Include="src\hdr\modern_clc.h" />

     <ClInclude Include="src\hdr\modern_clcpaint.h" />

     <ClInclude Include="src\hdr\modern_clist.h" />

     <ClInclude Include="src\hdr\modern_clui.h" />

-    <ClInclude Include="src\hdr\modern_cluiframes.h" />

     <ClInclude Include="src\hdr\modern_commonheaders.h" />

     <ClInclude Include="src\hdr\modern_commonprototypes.h" />

     <ClInclude Include="src\hdr\modern_defsettings.h" />

diff --git a/plugins/Clist_modern/clist_modern_12.vcxproj.filters b/plugins/Clist_modern/clist_modern_12.vcxproj.filters
index 7b6f796a3c..203bcf0f48 100644
--- a/plugins/Clist_modern/clist_modern_12.vcxproj.filters
+++ b/plugins/Clist_modern/clist_modern_12.vcxproj.filters
@@ -13,6 +13,9 @@
       <UniqueIdentifier>{160168fd-2f10-425e-bd83-f37565fffc2c}</UniqueIdentifier>

       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

     </Filter>

+    <Filter Include="Source Files\CLUIFrames">

+      <UniqueIdentifier>{826d2dcb-6f27-428e-a2bf-4825dc88ce32}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\init.cpp">

@@ -69,9 +72,6 @@
     <ClCompile Include="src\modern_clui.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\modern_cluiframes.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\modern_cluiservices.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -84,9 +84,6 @@
     <ClCompile Include="src\modern_docking.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\modern_framesmenu.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\modern_gdiplus.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -96,9 +93,6 @@
     <ClCompile Include="src\modern_global.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\modern_groupmenu.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\modern_image_array.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -162,6 +156,15 @@
     <ClCompile Include="src\modern_utils.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="src\CLUIFrames\cluiframes.cpp">

+      <Filter>Source Files\CLUIFrames</Filter>

+    </ClCompile>

+    <ClCompile Include="src\CLUIFrames\framesmenu.cpp">

+      <Filter>Source Files\CLUIFrames</Filter>

+    </ClCompile>

+    <ClCompile Include="src\CLUIFrames\groupmenu.cpp">

+      <Filter>Source Files\CLUIFrames</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\hdr\modern_commonheaders.h">

@@ -197,9 +200,6 @@
     <ClInclude Include="src\hdr\modern_clui.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\hdr\modern_cluiframes.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\hdr\modern_commonprototypes.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -254,6 +254,9 @@
     <ClInclude Include="src\Version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\CLUIFrames\cluiframes.h">

+      <Filter>Source Files\CLUIFrames</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\version.rc">

diff --git a/plugins/Clist_modern/src/modern_cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
index 68d10d9549..f30b090a19 100644
--- a/plugins/Clist_modern/src/modern_cluiframes.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
@@ -20,16 +20,15 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "hdr/modern_commonheaders.h"

-#include "m_api/m_skin_eng.h"

-#include "hdr/modern_cluiframes.h"

-#include "hdr/modern_commonprototypes.h"

-#include "hdr/modern_sync.h"

+#include "../hdr/modern_commonheaders.h"

+#include "../m_api/m_skin_eng.h"

+#include "../hdr/modern_commonprototypes.h"

+#include "../hdr/modern_sync.h"

 

 

 // ALL THIS MODULE FUNCTION SHOULD BE EXECUTED FROM MAIN THREAD

 

-#include "hdr/modern_static_cluiframes_service.h" // contain services initialization and proxiation

+#include "../hdr/modern_static_cluiframes_service.h" // contain services initialization and proxiation

 

 

 static const int UNCOLLAPSED_FRAME_SIZE		 = 0;

diff --git a/plugins/Clist_modern/src/hdr/modern_cluiframes.h b/plugins/Clist_modern/src/CLUIFrames/cluiframes.h
index 75bf89a8bd..75bf89a8bd 100644
--- a/plugins/Clist_modern/src/hdr/modern_cluiframes.h
+++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.h
diff --git a/plugins/Clist_modern/src/modern_framesmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp
index cdd132569d..8473c9403b 100644
--- a/plugins/Clist_modern/src/modern_framesmenu.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp
@@ -1,5 +1,5 @@
-#include "hdr/modern_commonheaders.h"

-#include "hdr/modern_commonprototypes.h"

+#include "../hdr/modern_commonheaders.h"

+#include "../hdr/modern_commonprototypes.h"

 

 //========================== Frames

 HANDLE hFrameMenuObject;

diff --git a/plugins/Clist_modern/src/modern_groupmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
index 4f0741b5c9..0b47bc71da 100644
--- a/plugins/Clist_modern/src/modern_groupmenu.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
@@ -20,10 +20,10 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "hdr/modern_commonheaders.h"

+#include "../hdr/modern_commonheaders.h"

 #include "m_clui.h"

-#include "hdr/modern_clist.h"

-#include "hdr/modern_clc.h"

+#include "../hdr/modern_clist.h"

+#include "../hdr/modern_clc.h"

 

 //////////////////////////////Group MENU/////////////////////////

 HANDLE hGroupMenuObject;

diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index 982f51d51f..b040850808 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -103,7 +103,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "modern_global_structure.h"

 #include "modern_clc.h"

 #include "modern_clist.h"

-#include "modern_cluiframes.h"

+#include "CLUIFrames/cluiframes.h"

 #include "modern_rowheight_funcs.h"

 #include "modern_cache_funcs.h"

 #include "modern_log.h"

diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
index 150bb33395..449bc44caf 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
@@ -9,7 +9,7 @@
 

 #include "modern_commonheaders.h"  //TO DO: Move contents of this file to commonheaders.h

 #include "modern_clist.h"

-#include "modern_cluiframes.h"

+#include "CLUIFrames/cluiframes.h"

 #include "modern_row.h"

 #include "modern_skinengine.h"

 #include "modern_skinselector.h"

diff --git a/plugins/Clist_modern/src/hdr/modern_skinengine.h b/plugins/Clist_modern/src/hdr/modern_skinengine.h
index 7ada5601b3..7811be127c 100644
--- a/plugins/Clist_modern/src/hdr/modern_skinengine.h
+++ b/plugins/Clist_modern/src/hdr/modern_skinengine.h
@@ -138,7 +138,7 @@ private:
 

 

 int ske_UnloadSkin(SKINOBJECTSLIST * Skin);

-int ske_AddDescriptorToSkinObjectList (LPSKINOBJECTDESCRIPTOR lpDescr, SKINOBJECTSLIST* Skin);

+int ske_AddDescriptorToSkinObjectList (SKINOBJECTDESCRIPTOR *lpDescr, SKINOBJECTSLIST* Skin);

 INT_PTR ske_Service_DrawGlyph(WPARAM wParam,LPARAM lParam);

 

 

diff --git a/plugins/Clist_modern/src/hdr/modern_skinselector.h b/plugins/Clist_modern/src/hdr/modern_skinselector.h
index 7c6226c5e5..f443663420 100644
--- a/plugins/Clist_modern/src/hdr/modern_skinselector.h
+++ b/plugins/Clist_modern/src/hdr/modern_skinselector.h
@@ -64,23 +64,23 @@ struct LISTMODERNMASK
 };

 

 /// PROTOTYPES

-int AddModernMaskToList(MODERNMASK *mm,  LISTMODERNMASK * mmTemplateList);

-int AddStrModernMaskToList(DWORD maskID, char * szStr, char * objectName,  LISTMODERNMASK * mmTemplateList, void * pObjectList);

-int SortMaskList(LISTMODERNMASK * mmList);

+int AddModernMaskToList(MODERNMASK *mm, LISTMODERNMASK *mmTemplateList);

+int AddStrModernMaskToList(DWORD maskID, char *szStr, char *objectName, LISTMODERNMASK *mmTemplateList, void *pObjectList);

+int SortMaskList(LISTMODERNMASK *mmList);

 

-int DeleteMaskByItID(DWORD mID,LISTMODERNMASK * mmTemplateList);

-int ClearMaskList(LISTMODERNMASK * mmTemplateList);

-int ExchangeMasksByID(DWORD mID1, DWORD mID2, LISTMODERNMASK * mmTemplateList);

+int DeleteMaskByItID(DWORD mID,LISTMODERNMASK *mmTemplateList);

+int ClearMaskList(LISTMODERNMASK *mmTemplateList);

+int ExchangeMasksByID(DWORD mID1, DWORD mID2, LISTMODERNMASK *mmTemplateList);

 

-int ParseToModernMask(MODERNMASK *mm, char * szText);

+int ParseToModernMask(MODERNMASK *mm, char *szText);

 BOOL CompareModernMask(MODERNMASK *mmValue,MODERNMASK *mmTemplate);

 BOOL CompareStrWithModernMask(char * szValue,MODERNMASK *mmTemplate);

 MODERNMASK * FindMaskByStr(char * szValue,LISTMODERNMASK * mmTemplateList);

 DWORD mod_CalcHash(const char * a);

-char * ModernMaskToString(MODERNMASK *mm, char * buf, UINT bufsize);

-int RegisterObjectByParce(char * ObjectName, char * Params);

-SKINOBJECTDESCRIPTOR *  skin_FindObjectByRequest(char * szValue,LISTMODERNMASK * mmTemplateList);

-SKINOBJECTDESCRIPTOR *  skin_FindObjectByMask (MODERNMASK *mm,LISTMODERNMASK * mmTemplateList);

+char * ModernMaskToString(MODERNMASK *mm, char *buf, UINT bufsize);

+int RegisterObjectByParce(char * ObjectName, char *Params);

+SKINOBJECTDESCRIPTOR* skin_FindObjectByRequest(char *szValue,LISTMODERNMASK *mmTemplateList);

+SKINOBJECTDESCRIPTOR* skin_FindObjectByMask (MODERNMASK *mm,LISTMODERNMASK *mmTemplateList);

 TCHAR * GetParamNT(char * string, TCHAR * buf, int buflen, BYTE paramN, char Delim, BOOL SkipSpaces);

 int SkinDrawGlyphMask(HDC hdc, RECT *rcSize, RECT *rcClip, MODERNMASK *ModernMask);

 #endif

diff --git a/plugins/Clist_modern/src/hdr/modern_sync.h b/plugins/Clist_modern/src/hdr/modern_sync.h
index 1f583f79f2..afa11a1002 100644
--- a/plugins/Clist_modern/src/hdr/modern_sync.h
+++ b/plugins/Clist_modern/src/hdr/modern_sync.h
@@ -1,8 +1,6 @@
 #ifndef modern_sync_h__

 #define modern_sync_h__

 

-#include "hdr/modern_commonheaders.h"

-

 typedef INT_PTR (*PSYNCCALLBACKPROC)(WPARAM,LPARAM);

 

 int SyncCall(void * vproc, int count, ... );

diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index baf47c4d9c..0f41e16dcf 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "hdr/modern_commonheaders.h"

 #include "m_clui.h"

 #include "hdr/modern_clist.h"

-#include "./hdr/modern_cluiframes.h"

 #include "hdr/modern_commonprototypes.h"

 #include "hdr/modern_clcpaint.h"

 

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index ea52ee2b54..bc530e87e0 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -1586,11 +1586,11 @@ int CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam)
 	return 0;

 }

 

-BOOL CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect,BOOL bErase )

+BOOL CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect, BOOL bErase)

 {

 	if ( CLUI_IsInMainWindow(hWnd) && g_CluiData.fLayered) {

-		if ( IsWindowVisible(hWnd))

-			return SkinInvalidateFrame( hWnd, lpRect );

+		if (IsWindowVisible(hWnd))

+			return SkinInvalidateFrame(hWnd, lpRect);

 

 		g_flag_bFullRepaint = 1;

 		return 0;

@@ -2003,7 +2003,7 @@ LRESULT CLUI::OnPaint(UINT msg, WPARAM wParam, LPARAM lParam)
 	{

 		if (IsWindowVisible(m_hWnd)) {

 			if (g_CluiData.fLayered)

-				SkinInvalidateFrame(m_hWnd,NULL);

+				SkinInvalidateFrame(m_hWnd, NULL);

 			else {

 				RECT w = {0};

 				RECT w2 = {0};

diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp
index 9bef1bb2b5..1154dd2e3f 100644
--- a/plugins/Clist_modern/src/modern_skinengine.cpp
+++ b/plugins/Clist_modern/src/modern_skinengine.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_png.h>

 #include "m_api/m_skin_eng.h"

 #include "hdr/modern_skinselector.h"

-#include "hdr/modern_cluiframes.h"

+#include "CLUIFrames/cluiframes.h"

 

 #define _EFFECTENUM_FULL_H

 #include "hdr/modern_effectenum.h"

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 928b8a0d59..47ad286f06 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -26,7 +26,7 @@ $Id: viewmodes.c 2998 2006-06-01 07:11:52Z nightwish2004 $
 */

 

 #include "hdr/modern_commonheaders.h"

-#include "hdr/modern_cluiframes.h"

+#include "CLUIFrames/cluiframes.h"

 #include "m_api/m_skinbutton.h"

 

 #define TIMERID_VIEWMODEEXPIRE 100