diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-03-05 12:52:30 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-03-05 12:52:30 +0000 |
| commit | 3576b67db9fa0a3d8d5c1747cc3560504d31d125 (patch) | |
| tree | f6a6cb9916cbf1aab83bac572fec8822f6ad065e /plugins/HistoryStats/src/_globals.h | |
| parent | 73e6231455372205e912963083624aaa371bab0b (diff) | |
- adaptation for standard Windows ways of handling Unicode;
- obsoleted code removed;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@8407 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/HistoryStats/src/_globals.h')
| -rw-r--r-- | plugins/HistoryStats/src/_globals.h | 107 |
1 files changed, 74 insertions, 33 deletions
diff --git a/plugins/HistoryStats/src/_globals.h b/plugins/HistoryStats/src/_globals.h index 0b9e033a63..2eeb39fe3e 100644 --- a/plugins/HistoryStats/src/_globals.h +++ b/plugins/HistoryStats/src/_globals.h @@ -12,15 +12,18 @@ #pragma warning(disable:4267)
-#include "mu_common.h"
+#define _WIN32_WINDOWS 0x0500 // for WM_MOUSEWHEEL
+#define _WIN32_WINNT 0x0501 // for WM_THEMECHANGED
-#include "version.h"
+#include <windows.h>
+#include <commctrl.h>
+#include <Uxtheme.h>
+#include <vsstyle.h>
-/*
- * essential includes
- */
+#pragma comment(lib, "UxTheme.lib")
-#include <commctrl.h>
+#include <tchar.h>
+#include <stdio.h>
#include <cstdio>
#include <cassert>
@@ -30,6 +33,54 @@ #include <fstream>
#include <sstream>
+#define MIRANDA_VER 0x0A00
+
+#include <newpluginapi.h>
+
+#include <m_awaymsg.h> // not used
+#include <m_button.h> // not used
+#include <m_chat.h> // not used
+#include <m_clc.h>
+#include <m_clist.h>
+#include <m_clistint.h> // not used
+#include <m_clui.h> // not used
+#include <m_contacts.h>
+#include <m_database.h>
+#include <m_email.h> // not used
+#include <m_file.h> // not used
+#include <m_findadd.h> // not used
+#include <m_fontservice.h> // not used
+#include <m_genmenu.h> // not used
+#include <m_history.h> // not used
+#include <m_icolib.h>
+#include <m_idle.h> // not used
+#include <m_ignore.h> // not used
+#include <m_langpack.h>
+#include <m_message.h> // not used
+#include <m_netlib.h> // not used
+#include <m_options.h>
+#include <m_png.h>
+#include <m_popup.h> // not used
+#include <m_protocols.h>
+#include <m_protomod.h> // not used
+#include <m_protosvc.h>
+#include <m_skin.h>
+#include <m_system.h>
+#include <m_system_cpp.h> // not used
+#include <m_url.h> // not used
+#include <m_userinfo.h> // not used
+#include <m_utils.h>
+
+#include <m_addcontact.h> // not used, depends on m_protosvc.h
+#include <m_icq.h> // depends on m_protosvc.h
+
+#include <m_metacontacts.h>
+#include <m_historystats.h> // our own header
+
+#include "mu_common.h"
+
+#include "version.h"
+
/*
* some patterns and similar stuff we want to use everywhere
*/
@@ -52,43 +103,33 @@ namespace ext {
namespace w
{
- const mu_wide* const endl = muW("\n");
-
- typedef std::basic_string <mu_wide> string;
- typedef std::basic_ofstream<mu_wide> ofstream;
- typedef std::basic_ostream <mu_wide> ostream;
- typedef ext::basic_strfunc <mu_wide> strfunc;
- typedef ext::basic_format <mu_wide> format;
- typedef ext::basic_kformat <mu_wide> kformat;
+ const WCHAR* const endl = L"\n";
+
+ typedef std::basic_string <WCHAR> string;
+ typedef std::basic_ofstream<WCHAR> ofstream;
+ typedef std::basic_ostream <WCHAR> ostream;
+ typedef ext::basic_strfunc <WCHAR> strfunc;
+ typedef ext::basic_format <WCHAR> format;
+ typedef ext::basic_kformat <WCHAR> kformat;
}
namespace a
{
- const mu_ansi* const endl = muA("\n");
-
- typedef std::basic_string <mu_ansi> string;
- typedef std::basic_ofstream<mu_ansi> ofstream;
- typedef std::basic_ostream <mu_ansi> ostream;
- typedef ext::basic_strfunc <mu_ansi> strfunc;
- typedef ext::basic_format <mu_ansi> format;
- typedef ext::basic_kformat <mu_ansi> kformat;
+ const char* const endl = "\n";
+
+ typedef std::basic_string <char> string;
+ typedef std::basic_ofstream<char> ofstream;
+ typedef std::basic_ostream <char> ostream;
+ typedef ext::basic_strfunc <char> strfunc;
+ typedef ext::basic_format <char> format;
+ typedef ext::basic_kformat <char> kformat;
}
// choose the right T-style namespace for this compilation
- namespace t = MU_DO_BOTH(a, w);
+ namespace t = w;
// import T-style classes for easier access
using namespace t;
-
- // helper functions
- inline const mu_text* i18n(const mu_text* str) { return mu::langpack::translateString(str); }
}
-/*
- * translation stuff
- */
-
-#define I18N(x) x
-using ext::i18n;
-
#endif // HISTORYSTATS_GUARD__GLOABLS_H
|