removed not used headers

added version info

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

1 files changed, 192 insertions, 173 deletions

diff --git a/plugins/TabSRMM/src/commonheaders.h b/plugins/TabSRMM/src/commonheaders.h
index 83ccf13448..ab646524f8 100644
--- a/plugins/TabSRMM/src/commonheaders.h
+++ b/plugins/TabSRMM/src/commonheaders.h
@@ -26,8 +26,6 @@
  *

  * (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors

  *

- * $Id: commonheaders.h 13596 2011-04-15 19:07:23Z george.hazan $

- *

  * global include file, used to build the precompiled header.

  *

  */

@@ -36,15 +34,6 @@
 #ifndef __COMMONHEADERS_H

 #define __COMMONHEADERS_H

 

-#define _UNICODE 1

-

-//#define __LOGDEBUG_	1								// log some stuff to %profile_dir%/tabsrmm_debug.log

-//#define __FEAT_DEPRECATED_DYNAMICSWITCHLOGVIEWER 1

-

-//#define __USE_EX_HANDLERS 1

-

-// #define __DELAYED_FOR_3_1 1							// features not going into 3.0.x and will be completed later

-

 #if !defined __DELAYED_FOR_3_1

 	#define __FEAT_EXP_AUTOSPLITTER 1

 #endif

@@ -54,64 +43,146 @@
 #define _WIN32_IE 0x0501

 #define WIN32_LEAN_AND_MEAN

 

-#define MIRANDA_VER 0x0A00

-

-#include <m_stdhdr.h>

-

 #include <windows.h>

-#include <commctrl.h>

 #include <commdlg.h>

 #include <shellapi.h>

 #include <uxtheme.h>

-#include <vsstyle.h>

+#include <tom.h>

+#include <time.h>

+#include <shlwapi.h>

+#include <shlobj.h>

+#include <vector>

+#include <assert.h>

+#include <mbstring.h>

+#include <richedit.h>

+#include <richole.h>

+#include <string>

+

+#include <msapi\vsstyle.h>

+#include <m_avatars.h>

+#include <m_message.h>

+#include <win2k.h>

+#include <newpluginapi.h>

+#include <m_imgsrvc.h>

+#include <m_database.h>

+#include <m_langpack.h>

+#include <m_button.h>

+#include <m_protosvc.h>

+#include <m_skin.h>

+#include <m_contacts.h>

+#include <m_icolib.h>

+#include <m_clc.h>

+#include <m_clui.h>

+#include <m_userinfo.h>

+#include <m_history.h>

+#include <m_addcontact.h>

+#include <m_file.h>

+#include <m_fontservice.h>

+#include <m_acc.h>

+#include <m_chat.h>

+#include <m_protomod.h>

+#include <m_hotkeys.h>

+#include <m_genmenu.h>

+#include <m_popup.h>

+#include <m_timezones.h>

+#include <m_modernopt.h>

+

+#include <m_ieview.h>

+#include <m_popup2.h>

+#include <m_metacontacts.h>

+#include <m_fingerprint.h>

+#include <m_nudge.h>

+#include <m_folders.h>

+#include <m_msg_buttonsbar.h>

+#include <m_flash.h>

+#include <m_mathmodule.h>

+#include <m_historyevents.h>

+#include <m_smileyadd.h>

 

 #define TSAPI __stdcall

 #define FASTCALL __fastcall

 

-	/*

-	 * text shadow types (DrawThemeTextEx() / Vista+ uxtheme)

-	 */

-	#define TST_NONE			0

-	#define TST_SINGLE			1

-	#define TST_CONTINUOUS		2

+typedef HANDLE HTHUMBNAIL;

+typedef HTHUMBNAIL* PHTHUMBNAIL;

+

+typedef struct _DWM_BLURBEHIND

+{

+	DWORD dwFlags;

+	BOOL fEnable;

+	HRGN hRgnBlur;

+	BOOL fTransitionOnMaximized;

+} DWM_BLURBEHIND, *PDWM_BLURBEHIND;

+

+typedef struct _DWM_THUMBNAIL_PROPERTIES

+{

+	DWORD dwFlags;

+	RECT rcDestination;

+	RECT rcSource;

+	BYTE opacity;

+	BOOL fVisible;

+	BOOL fSourceClientAreaOnly;

+} DWM_THUMBNAIL_PROPERTIES, *PDWM_THUMBNAIL_PROPERTIES;

+

+#include "m_cln_skinedit.h"

+

+#include "resource.h"

+#include "version.h"

+#include "buttonbar.h"

+#include "msgs.h"

+#include "msgdlgutils.h"

+#include "typingnotify.h"

+#include "generic_msghandlers.h"

+#include "nen.h"

+#include "functions.h"

+#include "chat/chat.h"

+#include "contactcache.h"

+#include "translator.h"

+#include "themes.h"

+#include "globals.h"

+#include "mim.h"

+#include "sendqueue.h"

+#include "taskbar.h"

+#include "controls.h"

+#include "infopanel.h"

+#include "sidebar.h"

+#include "utils.h"

+#include "sendlater.h"

+#include "ImageDataObject.h"

+#include "chat/muchighlight.h"

+

+

+/*

+* text shadow types (DrawThemeTextEx() / Vista+ uxtheme)

+*/

+#define TST_NONE			0

+#define TST_SINGLE			1

+#define TST_CONTINUOUS		2

+

+enum DWMWINDOWATTRIBUTE

+{

+    DWMWA_NCRENDERING_ENABLED = 1,      // [get] Is non-client rendering enabled/disabled

+    DWMWA_NCRENDERING_POLICY,           // [set] Non-client rendering policy

+    DWMWA_TRANSITIONS_FORCEDISABLED,    // [set] Potentially enable/forcibly disable transitions

+    DWMWA_ALLOW_NCPAINT,                // [set] Allow contents rendered in the non-client area to be visible on the DWM-drawn frame.

+    DWMWA_CAPTION_BUTTON_BOUNDS,        // [get] Bounds of the caption button area in window-relative space.

+    DWMWA_NONCLIENT_RTL_LAYOUT,         // [set] Is non-client content RTL mirrored

+    DWMWA_FORCE_ICONIC_REPRESENTATION,  // [set] Force this window to display iconic thumbnails.

+    DWMWA_FLIP3D_POLICY,                // [set] Designates how Flip3D will treat the window.

+    DWMWA_EXTENDED_FRAME_BOUNDS,        // [get] Gets the extended frame bounds rectangle in screen space

+    DWMWA_HAS_ICONIC_BITMAP,            // [set] Indicates an available bitmap when there is no better thumbnail representation.

+    DWMWA_DISALLOW_PEEK,                // [set] Don't invoke Peek on the window.

+    DWMWA_EXCLUDED_FROM_PEEK,           // [set] LivePreview exclusion information

+    DWMWA_LAST

+};

+

+#define DWM_TNP_RECTDESTINATION	0x00000001

+#define DWM_TNP_RECTSOURCE 0x00000002

+#define DWM_TNP_OPACITY	0x00000004

+#define DWM_TNP_VISIBLE	0x00000008

+#define DWM_TNP_SOURCECLIENTAREAONLY 0x00000010

+

+#define DWM_SIT_DISPLAYFRAME    0x00000001  // Display a window frame around the provided bitmap

 

-	typedef struct _DWM_THUMBNAIL_PROPERTIES

-	{

-		DWORD dwFlags;

-		RECT rcDestination;

-		RECT rcSource;

-		BYTE opacity;

-		BOOL fVisible;

-		BOOL fSourceClientAreaOnly;

-	} DWM_THUMBNAIL_PROPERTIES, *PDWM_THUMBNAIL_PROPERTIES;

-

-	enum DWMWINDOWATTRIBUTE

-	{

-	    DWMWA_NCRENDERING_ENABLED = 1,      // [get] Is non-client rendering enabled/disabled

-	    DWMWA_NCRENDERING_POLICY,           // [set] Non-client rendering policy

-	    DWMWA_TRANSITIONS_FORCEDISABLED,    // [set] Potentially enable/forcibly disable transitions

-	    DWMWA_ALLOW_NCPAINT,                // [set] Allow contents rendered in the non-client area to be visible on the DWM-drawn frame.

-	    DWMWA_CAPTION_BUTTON_BOUNDS,        // [get] Bounds of the caption button area in window-relative space.

-	    DWMWA_NONCLIENT_RTL_LAYOUT,         // [set] Is non-client content RTL mirrored

-	    DWMWA_FORCE_ICONIC_REPRESENTATION,  // [set] Force this window to display iconic thumbnails.

-	    DWMWA_FLIP3D_POLICY,                // [set] Designates how Flip3D will treat the window.

-	    DWMWA_EXTENDED_FRAME_BOUNDS,        // [get] Gets the extended frame bounds rectangle in screen space

-	    DWMWA_HAS_ICONIC_BITMAP,            // [set] Indicates an available bitmap when there is no better thumbnail representation.

-	    DWMWA_DISALLOW_PEEK,                // [set] Don't invoke Peek on the window.

-	    DWMWA_EXCLUDED_FROM_PEEK,           // [set] LivePreview exclusion information

-	    DWMWA_LAST

-	};

-

-	#define DWM_TNP_RECTDESTINATION	0x00000001

-	#define DWM_TNP_RECTSOURCE 0x00000002

-	#define DWM_TNP_OPACITY	0x00000004

-	#define DWM_TNP_VISIBLE	0x00000008

-	#define DWM_TNP_SOURCECLIENTAREAONLY 0x00000010

-

-	#define DWM_SIT_DISPLAYFRAME    0x00000001  // Display a window frame around the provided bitmap

-

-	typedef HANDLE HTHUMBNAIL;

-	typedef HTHUMBNAIL* PHTHUMBNAIL;

 

 #ifndef BPPF_ERASE

 	typedef enum _BP_BUFFERFORMAT

@@ -136,15 +207,8 @@
 	#define BPPF_NONCLIENT           4

 #endif

 

-	typedef struct _DWM_BLURBEHIND

-	{

-		DWORD dwFlags;

-		BOOL fEnable;

-		HRGN hRgnBlur;

-		BOOL fTransitionOnMaximized;

-	} DWM_BLURBEHIND, *PDWM_BLURBEHIND;

 

-	#define DWM_BB_ENABLE 1

+#define DWM_BB_ENABLE 1

 

 #ifndef LOCALE_SISO3166CTRYNAME2

 	#define LOCALE_SISO3166CTRYNAME2      0x00000068   // 3 character ISO country name, eg "USA Vista+

@@ -161,95 +225,10 @@
 	#define WM_DWMSENDICONICLIVEPREVIEWBITMAP   0x0326

 #endif

 

-#include <stdio.h>

-#include <time.h>

-#include <stddef.h>

-#include <process.h>

-#include <shlwapi.h>

-#include <shlobj.h>

-#include <richedit.h>

-#include <limits.h>

-#include <ctype.h>

-#include <string>

-#include <vector>

-#include <assert.h>

-

-#include "include/resource.h"

 

 /* State of icon with such flag will not be saved, and you must set it manually */

 #define MBF_OWNERSTATE        0x04

 

-#include  <win2k.h>

-#include  <newpluginapi.h>

-#include  <m_imgsrvc.h>

-#include  <m_system.h>

-#include  <m_system_cpp.h>

-#include  <m_database.h>

-#include  <m_langpack.h>

-#include  <m_button.h>

-#include  <m_clist.h>

-#include  <m_options.h>

-#include  <m_protosvc.h>

-#include  <m_utils.h>

-#include  <m_skin.h>

-#include  <m_contacts.h>

-#include  <m_icolib.h>

-#include  <m_clc.h>

-#include  <m_clui.h>

-#include  <m_userinfo.h>

-#include  <m_history.h>

-#include  <m_addcontact.h>

-#include  <m_file.h>

-#include  <m_fontservice.h>

-#include  <m_acc.h>

-#include  <m_chat.h>

-#include  <m_protomod.h>

-#include  <m_hotkeys.h>

-#include  <m_genmenu.h>

-#include  <m_popup.h>

-#include  <m_timezones.h>

-

-#define safe_sizeof(a) (unsigned int)((sizeof((a)) / sizeof((a)[0])))

-

-#include "include/version.h"

-#include "m_ieview.h"

-#include "m_popup2.h"

-#include "m_metacontacts.h"

-#include "m_fingerprint.h"

-#include "m_nudge.h"

-#include "m_folders.h"

-#include "m_msg_buttonsbar.h"

-#include "m_flash.h"

-#include "m_spellchecker.h"

-#include "m_mathmodule.h"

-#include "m_historyevents.h"

-#include "m_smileyadd.h"

-

-#include "include/m_cln_skinedit.h"

-#include "include/buttonbar.h"

-#include "include/msgs.h"

-#include "include/msgdlgutils.h"

-#include "include/typingnotify.h"

-#include "include/generic_msghandlers.h"

-#include "include/nen.h"

-extern 	NEN_OPTIONS	nen_options;

-#include "include/functions.h"

-#include "chat/chat.h"

-

-#include "include/contactcache.h"

-#include "include/translator.h"

-#include "include/themes.h"

-#include "include/globals.h"

-#include "include/mim.h"

-#include "include/sendqueue.h"

-#include "include/taskbar.h"

-#include "include/controls.h"

-#include "include/infopanel.h"

-#include "include/sidebar.h"

-#include "include/utils.h"

-#include "include/sendlater.h"

-

-#include "chat/muchighlight.h"

 

 #if !defined(_WIN64) && !defined(_USE_32BIT_TIME_T)

 	#define _USE_32BIT_TIME_T

@@ -257,32 +236,72 @@ extern 	NEN_OPTIONS	nen_options;
 	#undef _USE_32BIT_TIME_T

 #endif

 

-#if defined(__GNUWIN32__)

-	#define wEffects wReserved

-#endif

-

-#if defined(__GNUG__)

-#define __except(x) if (x)

-#define __try

-#define __finally

-

-EXCEPTION_POINTERS* GetExceptionInformation()

-{

-	EXCEPTION_POINTERS e;

-	return(&e);

-}

-#endif

-

 /*

- * tchar-like std::string

- */

-

+* tchar-like std::string

+*/

 typedef std::basic_string<TCHAR> tstring;

 

-extern	HINSTANCE g_hInst;

+extern NEN_OPTIONS	nen_options;

+extern HINSTANCE g_hInst;

 extern CSkinItem SkinItems[];

 extern TContainerData *pFirstContainer, *pLastActiveContainer;

 extern HANDLE hTypingNotify;

+extern SESSION_INFO *m_WndList;

+extern ButtonSet g_ButtonSet;

+extern int status_icon_list_size;

+extern TStatusBarIconNode *status_icon_list;

+extern HANDLE g_hEvent;

+extern RECT rcLastStatusBarClick;

+extern PLUGININFOEX pluginInfo;

+extern HICON hIcons[];

+extern TTemplateSet RTL_Active, LTR_Active;

+extern LOGFONTA logfonts[MSGDLGFONTCOUNT + 2];

+extern COLORREF fontcolors[MSGDLGFONTCOUNT + 2];

+extern HINSTANCE hinstance;

+extern BOOL g_bIMGtagButton;

+extern HIMAGELIST g_himlOptions;

+extern HANDLE hHookToolBarLoadedEvt;

+extern struct TLogIcon msgLogIcons[NR_LOGICONS * 3];

+extern const TCHAR *pszIDCSAVE_save, *pszIDCSAVE_close;

+extern char *TemplateNames[];

+extern HANDLE hUserPrefsWindowList;

+extern struct TCpTable cpTable[];

+extern HANDLE hJoinMenuItem, hLeaveMenuItem;

+extern FONTINFO	aFonts[OPTIONS_FONTCOUNT];

+extern TCHAR *pszActiveWndID;

+extern char *pszActiveWndModule;

+extern CRITICAL_SECTION cs;

+extern HBRUSH hListBkgBrush;

+extern HMODULE g_hIconDLL;

+extern HMENU g_hMenu;

+extern HANDLE hBuildMenuEvent;

+extern HANDLE hSendEvent;

+

+extern int 	LoadSendRecvMessageModule(void);

+extern int 	SplitmsgShutdown(void);

+extern void LogErrorMessage(HWND hwndDlg, struct TWindowData *dat, int i, TCHAR *szMsg);

+extern int  Chat_Load(), Chat_Unload();

+extern void FreeLogFonts();

+extern INT_PTR CALLBACK DlgProcSetupStatusModes(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+extern HIMAGELIST CreateStateImageList();

+extern INT_PTR SendMessageCommand(WPARAM wParam, LPARAM lParam);

+extern INT_PTR SendMessageCommand_W(WPARAM wParam, LPARAM lParam);

+extern void ReleaseRichEditOle(IRichEditOle *ole);

+extern void ImageDataInsertBitmap(IRichEditOle *ole, HBITMAP hBm);

+extern int CacheIconToBMP(struct TLogIcon *theIcon, HICON hIcon, COLORREF backgroundColor, int sizeX, int sizeY);

+extern void DeleteCachedIcon(struct TLogIcon *theIcon);

+extern INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+extern INT_PTR CALLBACK DlgProcTabConfig(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+extern INT_PTR CALLBACK DlgProcTemplateEditor(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+extern INT_PTR CALLBACK DlgProcToolBar(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

+extern INT_PTR CALLBACK PlusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

+extern INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

+extern INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

+extern INT_PTR CALLBACK DlgProcOptions3(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

+extern INT_PTR CALLBACK DlgProcUserPrefsFrame(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+extern int TSAPI TBStateConvert2Flat(int state);

+extern int TSAPI RBStateConvert2Flat(int state);

+extern void TSAPI FillTabBackground(const HDC hdc, int iStateId, const TWindowData* dat, RECT* rc);

 

 #define IS_EXTKEY(a) (a & (1 << 24))