Index: src/ch/ch.h =================================================================== diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -rcdf6a22ddf857f56ce2e27e26d8cd6f0b8034b2e --- src/ch/ch.h (.../ch.h) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/ch/ch.h (.../ch.h) (revision cdf6a22ddf857f56ce2e27e26d8cd6f0b8034b2e) @@ -34,7 +34,9 @@ #include "CfgProperties.h" //#include "LogFile.h" -#include +#include "../libicpf/log.h" +#include "../libicpf/cfg.h" +#include "../libicpf/cfg_ini.h" using namespace std; @@ -65,18 +67,19 @@ friend int MsgBox(UINT uiID, UINT nType=MB_OK, UINT nIDHelp=0); friend CCopyHandlerApp* GetApp(); friend CResourceManager* GetResManager(); - friend CConfigManager* GetConfig(); + friend icpf::config* GetConfig(); // friend CLogFile* GetLog(); - void OnConfigNotify(UINT uiType, LPARAM lParam); + void OnConfigNotify(uint_t uiPropID); void OnResManNotify(UINT uiType, LPARAM lParam); protected: bool UpdateHelpPaths(); - HWND HHelp(HWND hwndCaller, LPCSTR pszFile, UINT uCommand, DWORD dwData); + HWND HHelp(HWND hwndCaller, LPCTSTR pszFile, UINT uCommand, DWORD dwData); public: CResourceManager m_resManager; - CConfigManager m_cfgManager; +// CConfigManager m_cfgManager; + icpf::config m_cfgSettings; icpf::log_file m_lfLog; CWnd *m_pMainWindow; @@ -87,6 +90,7 @@ // Implementation HANDLE m_hMapObject; TCHAR m_szHelpPath[_MAX_PATH]; // full file path to the help file + CString m_strCrashInfo; // crash info text //{{AFX_MSG(CCopyHandlerApp) //}}AFX_MSG