m_* headers moved to ExternalAPI folder

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

12 files changed, 10 insertions, 58 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_clc.h b/plugins/Clist_modern/src/hdr/modern_clc.h
index f5fb9b2222..6301cc1f9d 100644
--- a/plugins/Clist_modern/src/hdr/modern_clc.h
+++ b/plugins/Clist_modern/src/hdr/modern_clc.h
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef _CLC_H_

 #define _CLC_H_

 #include "modern_image_array.h"

-#include "../m_api/m_xpTheme.h"

+#include "m_xpTheme.h"

 

 #include "modern_defsettings.h"

 #include "modern_clist.h"

diff --git a/plugins/Clist_modern/src/hdr/modern_statusbar.h b/plugins/Clist_modern/src/hdr/modern_statusbar.h
index 2339ed2c51..2ac385b6d4 100644
--- a/plugins/Clist_modern/src/hdr/modern_statusbar.h
+++ b/plugins/Clist_modern/src/hdr/modern_statusbar.h
@@ -4,7 +4,7 @@
 #define modern_statusbar_h__

 

 #include "modern_commonprototypes.h"

-#include "../m_api/m_xpTheme.h"

+#include "m_xpTheme.h"

 

 int ModernDrawStatusBar(HWND hwnd, HDC hDC);

 int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC);

diff --git a/plugins/Clist_modern/src/m_api/m_skinbutton.h b/plugins/Clist_modern/src/m_api/m_skinbutton.h
deleted file mode 100644
index 1ca5c38e6d..0000000000
--- a/plugins/Clist_modern/src/m_api/m_skinbutton.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "m_button.h"

-

-#define MBM_UPDATETRANSPARENTFLAG	WM_USER+52

-#define MBM_SETICOLIBHANDLE			WM_USER+53

-#define MBM_REFRESHICOLIBICON		WM_USER+54

-

-#define BUTTONSETID				WM_USER+55

-#define BUTTONDRAWINPARENT		WM_USER+56

-#define BUTTONSETMARGINS		WM_USER+57

-

-#define SBF_ALIGN_TL_RIGHT   1

-#define SBF_ALIGN_TL_HCENTER 2

-#define SBF_ALIGN_TL_BOTTOM  4

-#define SBF_ALIGN_TL_VCENTER 8

-

-#define SBF_ALIGN_BR_RIGHT   16

-#define SBF_ALIGN_BR_HCENTER 32

-#define SBF_ALIGN_BR_BOTTOM  64

-#define SBF_ALIGN_BR_VCENTER 128

-

-#define SBF_CALL_ON_PRESS    256

-

-// Params for draw flag at Repos function

-#define SBRF_DO_NOT_DRAW      0

-#define SBRF_DO_REDRAW_ALL    1

-#define SBRF_DO_ALT_DRAW      2

-#define SBRF_REDRAW           ( SBRF_DO_REDRAW_ALL|SBRF_DO_ALT_DRAW )

-

-#define BUTTONNEEDREDRAW		1256
\ No newline at end of file
diff --git a/plugins/Clist_modern/src/m_api/m_xpTheme.h b/plugins/Clist_modern/src/m_api/m_xpTheme.h
deleted file mode 100644
index 90925470f4..0000000000
--- a/plugins/Clist_modern/src/m_api/m_xpTheme.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Wrapper for XP theme */

-typedef void * XPTHANDLE;

-typedef HANDLE HTHEME;

-

-XPTHANDLE	xpt_AddThemeHandle(HWND hwnd, LPCWSTR className);

-void		xpt_FreeThemeHandle(XPTHANDLE xptHandle);

-void		xpt_FreeThemeForWindow(HWND hwnd);

-BOOL		xpt_IsValidHandle(XPTHANDLE xptHandle);

-HRESULT		xpt_DrawThemeBackground(XPTHANDLE xptHandle, HDC hdc, int type, int state, const RECT * sizeRect, const RECT * clipRect);

-HRESULT		xpt_DrawThemeParentBackground(HWND hWnd, HDC hdc, const RECT * sizeRect);

-HRESULT		xpt_DrawThemeText(XPTHANDLE xptHandle, HDC hdc, int type, int state, LPCTSTR lpStr, int len, DWORD flag1, DWORD flag2, const RECT * textRect);

-BOOL		xpt_IsThemeBackgroundPartiallyTransparent(XPTHANDLE xptHandle, int type,  int state);

-HRESULT		xpt_DrawTheme(XPTHANDLE xptHandle, HWND hwnd, HDC hdc, int type, int state, const RECT *sizeRect, const RECT * clipRect);

-BOOL		xpt_IsThemed(XPTHANDLE xptHandle);

-BOOL		xpt_EnableThemeDialogTexture(HWND hwnd, DWORD flags);

-

-// next will be called only from one place

-void		XPThemesUnloadModule();

-void		xpt_OnWM_THEMECHANGED();

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 3c4750bb19..ed66adfadf 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "hdr/modern_commonheaders.h"

 

-#include "m_api/m_skinbutton.h"

+#include "m_skinbutton.h"

 #include "hdr/modern_skinengine.h"

 #include "hdr/modern_statusbar.h"

 

diff --git a/plugins/Clist_modern/src/modern_docking.cpp b/plugins/Clist_modern/src/modern_docking.cpp
index b2c4e0f083..837bcfc797 100644
--- a/plugins/Clist_modern/src/modern_docking.cpp
+++ b/plugins/Clist_modern/src/modern_docking.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "hdr/modern_commonheaders.h"

 #include "hdr/modern_clist.h"

 #include "m_skin_eng.h"

-#include "m_api/m_skinbutton.h"

+#include "m_skinbutton.h"

 #include "hdr/modern_commonprototypes.h"

 #include "hdr/modern_sync.h"

 

diff --git a/plugins/Clist_modern/src/modern_skinbutton.cpp b/plugins/Clist_modern/src/modern_skinbutton.cpp
index d843175566..f9ba51083c 100644
--- a/plugins/Clist_modern/src/modern_skinbutton.cpp
+++ b/plugins/Clist_modern/src/modern_skinbutton.cpp
@@ -29,7 +29,7 @@ This file contains code related to new modern free positioned skinned buttons
 #include "hdr/modern_commonheaders.h"
 #include "hdr/modern_skinengine.h"
 #include "hdr/modern_clcpaint.h"
-#include "m_api/m_skinbutton.h"
+#include "m_skinbutton.h"
 
 #define MODERNSKINBUTTONCLASS "MirandaModernSkinButtonClass"
 BOOL ModernSkinButtonModuleIsLoaded = FALSE;
diff --git a/plugins/Clist_modern/src/modern_skinselector.cpp b/plugins/Clist_modern/src/modern_skinselector.cpp
index 7264c6d359..7d62758208 100644
--- a/plugins/Clist_modern/src/modern_skinselector.cpp
+++ b/plugins/Clist_modern/src/modern_skinselector.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "hdr/modern_skinselector.h"

 #include "hdr/modern_skinengine.h"

 #include "m_skin_eng.h"

-#include "m_api/m_skinbutton.h"

+#include "m_skinbutton.h"

 #include "hdr/modern_commonprototypes.h"

 

 /// IMPLEMENTATIONS

diff --git a/plugins/Clist_modern/src/modern_tbbutton.cpp b/plugins/Clist_modern/src/modern_tbbutton.cpp
index a7b30af19f..d5c6843322 100644
--- a/plugins/Clist_modern/src/modern_tbbutton.cpp
+++ b/plugins/Clist_modern/src/modern_tbbutton.cpp
@@ -1,6 +1,6 @@
 #include "hdr/modern_commonheaders.h"

 #include "hdr/modern_commonprototypes.h"

-#include "m_api/m_skinbutton.h"

+#include "m_skinbutton.h"

 #include "hdr/modern_clcpaint.h"

 

 #include <m_button_int.h>

diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp
index 6db6d801dc..07195a35f2 100644
--- a/plugins/Clist_modern/src/modern_toolbar.cpp
+++ b/plugins/Clist_modern/src/modern_toolbar.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "hdr/modern_commonheaders.h"

 #include "hdr/modern_commonprototypes.h"

-#include "./m_api/m_skinbutton.h"

+#include "m_skinbutton.h"

 #include <m_toptoolbar.h>

 #include "hdr/modern_sync.h"

 

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index cbaf820fd8..57ae8d4969 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -29,7 +29,7 @@ $Id: viewmodes.c 2998 2006-06-01 07:11:52Z nightwish2004 $
 

 #include "hdr/modern_commonheaders.h"

 #include "CLUIFrames/cluiframes.h"

-#include "m_api/m_skinbutton.h"

+#include "m_skinbutton.h"

 

 #define TIMERID_VIEWMODEEXPIRE 100

 

diff --git a/plugins/Clist_modern/src/modern_xptheme.cpp b/plugins/Clist_modern/src/modern_xptheme.cpp
index ac8cecae7c..1d8fd910f5 100644
--- a/plugins/Clist_modern/src/modern_xptheme.cpp
+++ b/plugins/Clist_modern/src/modern_xptheme.cpp
@@ -1,6 +1,6 @@
 #include "hdr/modern_commonheaders.h"

 #include "hdr/modern_commonprototypes.h"

-#include "m_api/m_xpTheme.h"

+#include "m_xpTheme.h"

 

 

 //statical