diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-12-13 18:16:35 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-12-13 18:16:35 +0000 |
| commit | 1eb65726f44324bc688843c9948beae0e8a16f05 (patch) | |
| tree | 31e6722b2e5da1c97425c0231854ff7d10e94ed3 /plugins/TabSRMM/src/commonheaders.h | |
| parent | 5ab4a9381e75d2d6ea04ed5d55ef7d6dd343fa8c (diff) | |
fix for info panel's tooltip
git-svn-id: http://svn.miranda-ng.org/main/trunk@11371 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src/commonheaders.h')
| -rw-r--r-- | plugins/TabSRMM/src/commonheaders.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/plugins/TabSRMM/src/commonheaders.h b/plugins/TabSRMM/src/commonheaders.h index 9992d5608c..0223d3d28c 100644 --- a/plugins/TabSRMM/src/commonheaders.h +++ b/plugins/TabSRMM/src/commonheaders.h @@ -38,14 +38,16 @@ #include <shellapi.h>
#include <uxtheme.h>
#include <tom.h>
-#include <time.h>
#include <shlwapi.h>
#include <shlobj.h>
-#include <assert.h>
-#include <mbstring.h>
#include <richedit.h>
#include <richole.h>
-#include <string>
+
+#include <assert.h>
+#include <time.h>
+#include <mbstring.h>
+#include <malloc.h>
+#include <locale.h>
#include <msapi\vsstyle.h>
#include <m_avatars.h>
@@ -222,12 +224,7 @@ enum DWMWINDOWATTRIBUTE #undef _USE_32BIT_TIME_T
#endif
-/*
-* tchar-like std::string
-*/
-typedef std::basic_string<TCHAR> tstring;
-
-extern NEN_OPTIONS nen_options;
+extern NEN_OPTIONS nen_options;
extern HINSTANCE g_hInst;
extern CSkinItem SkinItems[];
extern TContainerData *pFirstContainer, *pLastActiveContainer;
|