From d458827cc76d2c817456fa19ece19e4b584f7c75 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Tue, 28 Apr 2015 05:49:24 +0000 Subject: removed not used files git-svn-id: http://svn.miranda-ng.org/main/trunk@13217 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- .../Clist_modern/src/hdr/modern_commonheaders.h | 1 - .../src/hdr/modern_layered_window_engine.h | 51 ---------------------- plugins/Clist_modern/src/hdr/modern_log.h | 8 ---- plugins/Clist_modern/src/hdr/modern_tstring.h | 50 --------------------- 4 files changed, 110 deletions(-) delete mode 100644 plugins/Clist_modern/src/hdr/modern_layered_window_engine.h delete mode 100644 plugins/Clist_modern/src/hdr/modern_tstring.h (limited to 'plugins/Clist_modern/src') diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h index f0fecba5fe..ab4108520f 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h +++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h @@ -106,7 +106,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "modern_cache_funcs.h" #include "modern_log.h" #include "../resource.h" -#include "modern_layered_window_engine.h" #define DEFAULT_SKIN_FOLDER "Skins\\Modern contact list" extern TCHAR SkinsFolder[MAX_PATH]; diff --git a/plugins/Clist_modern/src/hdr/modern_layered_window_engine.h b/plugins/Clist_modern/src/hdr/modern_layered_window_engine.h deleted file mode 100644 index 0b9b3c685c..0000000000 --- a/plugins/Clist_modern/src/hdr/modern_layered_window_engine.h +++ /dev/null @@ -1,51 +0,0 @@ -#pragma once -#include "../m_api/m_skin_eng.h" - -// typedef int (/*__stdcall*/ *tPaintCallbackProc)(HWND hWnd, HDC hDC, RECT *rcPaint, HRGN rgnUpdate, DWORD dFlags, void * CallBackData); - -class CLayeredWindowEngine -{ -private: - /*class CLweInfo - { - HWND hWnd; - HRGN hInvalidRgn; - }; - */ - //typedef std::map WndInfos; - - enum { state_invalid, state_normal }; - - //WndInfos m_infos; - DWORD m_hValidatorThread; - CRITICAL_SECTION m_cs; - int m_state; - volatile bool m_invalid; - -public: - CLayeredWindowEngine(void); - ~CLayeredWindowEngine(void); - - void _init(); - void _deinit(); - - void lock() { EnterCriticalSection(&m_cs); } - void unlock() { LeaveCriticalSection(&m_cs); } - - int get_state(); - -public: - static void __cdecl LweValidatorProc(); - - void LweValidatorProcWorker(); - - void LweValidatorWorker(); - int LweInvalidateRect(HWND hWnd, const RECT *rect, BOOL bErase); - // int LweValidateWindowRect( HWND hWnd, RECT *rect ); - // int RegisterWindow( HWND hwnd, tPaintCallbackProc pPaintCallBackProc ); - -}; - -extern CLayeredWindowEngine _lwe; - -#define _InvalidateRect _lwe.LweInvalidateRect \ No newline at end of file diff --git a/plugins/Clist_modern/src/hdr/modern_log.h b/plugins/Clist_modern/src/hdr/modern_log.h index d6c3b01226..468dc5117d 100644 --- a/plugins/Clist_modern/src/hdr/modern_log.h +++ b/plugins/Clist_modern/src/hdr/modern_log.h @@ -6,21 +6,13 @@ #ifdef _DEBUG void Log(const char *file,int line,const char *fmt,...); -#define logg() Log(__FILE__,__LINE__,"") #define log0(s) Log(__FILE__,__LINE__,s) #define log1(s,a) Log(__FILE__,__LINE__,s,a) -#define log2(s,a,b) Log(__FILE__,__LINE__,s,a,b) -#define log3(s,a,b,c) Log(__FILE__,__LINE__,s,a,b,c) -#define log4(s,a,b,c,d) Log(__FILE__,__LINE__,s,a,b,c,d) #else -#define logg() #define log0(s) #define log1(s,a) -#define log2(s,a,b) -#define log3(s,a,b,c) -#define log4(s,a,b,c,d) #endif diff --git a/plugins/Clist_modern/src/hdr/modern_tstring.h b/plugins/Clist_modern/src/hdr/modern_tstring.h deleted file mode 100644 index 36d7e30ad3..0000000000 --- a/plugins/Clist_modern/src/hdr/modern_tstring.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef UNICODE //FIXME Build without UNICODE flag -#define _AtlGetConversionACP() CP_THREAD_ACP -#endif - -#include "MString.h" - -typedef CMStringA astring; -typedef CMStringW wstring; - -class mbstring : public astring -{ - // It is prohibited to initialize by char* outside, use L"xxx" -private: - mbstring(const char * pChar) : astring(pChar) {}; - mbstring& operator=(const char * pChar) { this->operator =(pChar); return *this; } - -public: - mbstring() : astring() {}; - mbstring(const mbstring& uStr) : astring(uStr) {}; - - - mbstring(const wstring& tStr) { *this = tStr.c_str(); } - mbstring& operator=(const wstring& tStr) { this->operator =(tStr.c_str()); return *this; } - - mbstring(const wchar_t * wChar); - mbstring& operator=(const astring& aStr); - mbstring& operator=(const wchar_t * wChar); - operator wstring(); - operator astring(); -}; - - -class tstring : public wstring -{ -public: - tstring() : wstring() {}; - tstring(const wchar_t * pwChar) : wstring(pwChar) {}; - - - tstring(const astring& aStr) { *this = aStr.c_str(); } - tstring(const mbstring& utfStr) { *this = utfStr; } - - tstring(const char * pChar); - tstring& operator=(const char * pChar); - tstring& operator=(const astring& aStr); - tstring& operator=(const mbstring& uStr); - operator astring(); - operator mbstring() { return mbstring(this->c_str()); } -}; - -- cgit v1.2.3