From cea91e858f4f291f5d81c0f11452871dae2b7af5 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 1 Aug 2015 19:19:53 +0000 Subject: tipper_ym: common project git-svn-id: http://svn.miranda-ng.org/main/trunk@14788 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TipperYM/src/bitmap_func.cpp | 2 +- plugins/TipperYM/src/common.h | 88 ----------------------------------- plugins/TipperYM/src/message_pump.cpp | 2 +- plugins/TipperYM/src/mir_smileys.cpp | 2 +- plugins/TipperYM/src/options.cpp | 2 +- plugins/TipperYM/src/popwin.cpp | 2 +- plugins/TipperYM/src/preset_items.cpp | 2 +- plugins/TipperYM/src/skin_parser.cpp | 2 +- plugins/TipperYM/src/stdafx.cpp | 18 ------- plugins/TipperYM/src/stdafx.cxx | 18 +++++++ plugins/TipperYM/src/stdafx.h | 86 ++++++++++++++++++++++++++++++++++ plugins/TipperYM/src/str_utils.cpp | 2 +- plugins/TipperYM/src/subst.cpp | 2 +- plugins/TipperYM/src/tipper.cpp | 2 +- plugins/TipperYM/src/translations.cpp | 2 +- 15 files changed, 115 insertions(+), 117 deletions(-) delete mode 100644 plugins/TipperYM/src/common.h delete mode 100644 plugins/TipperYM/src/stdafx.cpp create mode 100644 plugins/TipperYM/src/stdafx.cxx create mode 100644 plugins/TipperYM/src/stdafx.h (limited to 'plugins/TipperYM/src') diff --git a/plugins/TipperYM/src/bitmap_func.cpp b/plugins/TipperYM/src/bitmap_func.cpp index d6ac2631f2..41235c0f07 100644 --- a/plugins/TipperYM/src/bitmap_func.cpp +++ b/plugins/TipperYM/src/bitmap_func.cpp @@ -18,7 +18,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" TOOLTIPSKIN skin = {0}; diff --git a/plugins/TipperYM/src/common.h b/plugins/TipperYM/src/common.h deleted file mode 100644 index f63d290ee7..0000000000 --- a/plugins/TipperYM/src/common.h +++ /dev/null @@ -1,88 +0,0 @@ -/* -Copyright (C) 2006-2007 Scott Ellis -Copyright (C) 2007-2011 Jan Holub - -This is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -This is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with this file; see the file license.txt. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. -*/ - -#define _CRT_SECURE_NO_WARNINGS - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -// Windows Header Files: -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "resource.h" -#include "version.h" -#include "message_pump.h" -#include "mir_smileys.h" -#include "popwin.h" -#include "skin_parser.h" -#include "bitmap_func.h" -#include "options.h" -#include "str_utils.h" -#include "subst.h" -#include "preset_items.h" -#include "translations.h" - -#define MODULE "Tipper" -#define MODULE_ITEMS "Tipper_Items" -#define DEFAULT_SKIN_FOLDER "Skins\\Tipper" - -extern HMODULE hInst; - -extern HFONT hFontTitle, hFontLabels, hFontValues, hFontTrayTitle; -extern COLORREF colTitle, colLabels, colBg, colValues; - -extern int iCodePage; - -extern FI_INTERFACE *fii; - -extern TOOLTIPSKIN skin; -extern TCHAR SKIN_FOLDER[256]; - -extern int ReloadFont(WPARAM wParam, LPARAM lParam); diff --git a/plugins/TipperYM/src/message_pump.cpp b/plugins/TipperYM/src/message_pump.cpp index 8b5a0b1b6b..07fd28ea3e 100644 --- a/plugins/TipperYM/src/message_pump.cpp +++ b/plugins/TipperYM/src/message_pump.cpp @@ -18,7 +18,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" HMODULE hDwmapiDll = 0; HRESULT (WINAPI *MyDwmEnableBlurBehindWindow)(HWND hWnd, DWM_BLURBEHIND *pBlurBehind) = 0; diff --git a/plugins/TipperYM/src/mir_smileys.cpp b/plugins/TipperYM/src/mir_smileys.cpp index a6ac7e8cd9..19b963e0de 100644 --- a/plugins/TipperYM/src/mir_smileys.cpp +++ b/plugins/TipperYM/src/mir_smileys.cpp @@ -18,7 +18,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" int InitTipperSmileys() { diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp index 175a8f261e..7dd3896f19 100644 --- a/plugins/TipperYM/src/options.cpp +++ b/plugins/TipperYM/src/options.cpp @@ -18,7 +18,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" OPTIONS opt; ICONSTATE exIcons[EXICONS_COUNT]; diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp index 6032b3e7c2..4c0fd2000a 100644 --- a/plugins/TipperYM/src/popwin.cpp +++ b/plugins/TipperYM/src/popwin.cpp @@ -18,7 +18,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" __inline void AddRow(PopupWindowData *pwd, TCHAR *swzLabel, TCHAR *swzValue, char *szProto, bool bParseSmileys, bool bNewline, bool bLineAbove, bool bIsTitle = false, HICON hIcon = NULL) { diff --git a/plugins/TipperYM/src/preset_items.cpp b/plugins/TipperYM/src/preset_items.cpp index d6b14e8f38..e079ebbf05 100644 --- a/plugins/TipperYM/src/preset_items.cpp +++ b/plugins/TipperYM/src/preset_items.cpp @@ -18,7 +18,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" PRESETITEM presetItems[] = { diff --git a/plugins/TipperYM/src/skin_parser.cpp b/plugins/TipperYM/src/skin_parser.cpp index fc93fe0b79..7921a184fd 100644 --- a/plugins/TipperYM/src/skin_parser.cpp +++ b/plugins/TipperYM/src/skin_parser.cpp @@ -18,7 +18,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" int RefreshSkinList(HWND hwndDlg) { diff --git a/plugins/TipperYM/src/stdafx.cpp b/plugins/TipperYM/src/stdafx.cpp deleted file mode 100644 index c5fe5abaad..0000000000 --- a/plugins/TipperYM/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "common.h" \ No newline at end of file diff --git a/plugins/TipperYM/src/stdafx.cxx b/plugins/TipperYM/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/TipperYM/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "stdafx.h" \ No newline at end of file diff --git a/plugins/TipperYM/src/stdafx.h b/plugins/TipperYM/src/stdafx.h new file mode 100644 index 0000000000..d2758550ad --- /dev/null +++ b/plugins/TipperYM/src/stdafx.h @@ -0,0 +1,86 @@ +/* +Copyright (C) 2006-2007 Scott Ellis +Copyright (C) 2007-2011 Jan Holub + +This is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +This is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with this file; see the file license.txt. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. +*/ + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +// Windows Header Files: +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "resource.h" +#include "version.h" +#include "message_pump.h" +#include "mir_smileys.h" +#include "popwin.h" +#include "skin_parser.h" +#include "bitmap_func.h" +#include "options.h" +#include "str_utils.h" +#include "subst.h" +#include "preset_items.h" +#include "translations.h" + +#define MODULE "Tipper" +#define MODULE_ITEMS "Tipper_Items" +#define DEFAULT_SKIN_FOLDER "Skins\\Tipper" + +extern HMODULE hInst; + +extern HFONT hFontTitle, hFontLabels, hFontValues, hFontTrayTitle; +extern COLORREF colTitle, colLabels, colBg, colValues; + +extern int iCodePage; + +extern FI_INTERFACE *fii; + +extern TOOLTIPSKIN skin; +extern TCHAR SKIN_FOLDER[256]; + +extern int ReloadFont(WPARAM wParam, LPARAM lParam); diff --git a/plugins/TipperYM/src/str_utils.cpp b/plugins/TipperYM/src/str_utils.cpp index b6b605c7de..63ccd39165 100644 --- a/plugins/TipperYM/src/str_utils.cpp +++ b/plugins/TipperYM/src/str_utils.cpp @@ -18,7 +18,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" int iCodePage = CP_ACP; diff --git a/plugins/TipperYM/src/subst.cpp b/plugins/TipperYM/src/subst.cpp index 65c642dd64..f149ba63e5 100644 --- a/plugins/TipperYM/src/subst.cpp +++ b/plugins/TipperYM/src/subst.cpp @@ -18,7 +18,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" bool DBGetContactSettingAsString(MCONTACT hContact, const char *szModuleName, const char *szSettingName, TCHAR *buff, int bufflen) { diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp index 4a60c6bc94..1b5bfa2547 100644 --- a/plugins/TipperYM/src/tipper.cpp +++ b/plugins/TipperYM/src/tipper.cpp @@ -18,7 +18,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" HMODULE hInst; diff --git a/plugins/TipperYM/src/translations.cpp b/plugins/TipperYM/src/translations.cpp index d888abc7a0..aee33a5dc8 100644 --- a/plugins/TipperYM/src/translations.cpp +++ b/plugins/TipperYM/src/translations.cpp @@ -18,7 +18,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "common.h" +#include "stdafx.h" int iTransFuncsCount = 0; DBVTranslation *translations = 0; -- cgit v1.2.3