Index: Copy Handler/COPY HANDLER.cpp =================================================================== diff -u -r3e1186252ab31f63d86d86c4b0ff593cfffbefde -r9b4010bc607fb69b676fddefa2e876396d00732d --- Copy Handler/COPY HANDLER.cpp (.../COPY HANDLER.cpp) (revision 3e1186252ab31f63d86d86c4b0ff593cfffbefde) +++ Copy Handler/COPY HANDLER.cpp (.../COPY HANDLER.cpp) (revision 9b4010bc607fb69b676fddefa2e876396d00732d) @@ -23,11 +23,14 @@ #include "CfgProperties.h" #include "MainWnd.h" -#include "..\common\CHPluginCore.h" #include "..\common\ipcstructs.h" #ifdef _DEBUG #define new DEBUG_NEW +#endif + +#ifdef _DEBUG +#define new DEBUG_NEW #undef THIS_FILE static char THIS_FILE[] = __FILE__; #endif @@ -114,7 +117,8 @@ return (LRESULT)TRUE; } -CCopyHandlerApp::CCopyHandlerApp() +CCopyHandlerApp::CCopyHandlerApp() : + m_lfLog(true) { m_pMainWindow=NULL; m_szHelpPath[0]=_T('\0'); @@ -139,7 +143,6 @@ } } - CCopyHandlerApp* GetApp() { return &theApp; @@ -154,11 +157,11 @@ { return &theApp.m_cfgManager; } - +/* CLogFile* GetLog() { return &theApp.m_lfLog; -} +}*/ int MsgBox(UINT uiID, UINT nType, UINT nIDHelp) { @@ -200,12 +203,6 @@ if (g_pscsShared == NULL) return FALSE; -#ifdef _AFXDLL - Enable3dControls(); // Call this when using MFC in a shared DLL -#else - Enable3dControlsStatic(); // Call this when linking to MFC statically -#endif - // load configuration m_cfgManager.SetCallback((PFNNOTIFYCALLBACK)MainRouter); TCHAR szPath[_MAX_PATH]; @@ -238,11 +235,14 @@ // initialize log file m_cfgManager.GetStringValue(PP_LOGPATH, szPath, _MAX_PATH); - m_lfLog.EnableLogging(m_cfgManager.GetBoolValue(PP_LOGENABLELOGGING)); + m_lfLog.init(ExpandPath(szPath), m_cfgManager.GetIntValue(PP_LOGMAXLIMIT), LT_DEBUG, false, false); + + // TODO: remove unused properties from configuration +/* m_lfLog.EnableLogging(m_cfgManager.GetBoolValue(PP_LOGENABLELOGGING)); m_lfLog.SetPreciseLimiting(m_cfgManager.GetBoolValue(PP_LOGPRECISELIMITING)); m_lfLog.SetSizeLimit(m_cfgManager.GetBoolValue(PP_LOGLIMITATION), m_cfgManager.GetIntValue(PP_LOGMAXLIMIT)); m_lfLog.SetTruncateBufferSize(m_cfgManager.GetIntValue(PP_LOGTRUNCBUFFERSIZE)); - m_lfLog.Init(ExpandPath(szPath), GetResManager()); + m_lfLog.Init(ExpandPath(szPath), GetResManager());*/ #ifndef _DEBUG // for easier writing the program - doesn't collide with std CH // set "run with system" registry settings