diff --git a/Src/ClassicExplorer/dllmain.cpp b/Src/ClassicExplorer/dllmain.cpp index 9e7a5eb..d841361 100644 --- a/Src/ClassicExplorer/dllmain.cpp +++ b/Src/ClassicExplorer/dllmain.cpp @@ -48,11 +48,6 @@ static int g_LoadDialogs[]= 0 }; -const wchar_t *GetDocRelativePath( void ) -{ - return DOC_PATH; -} - struct FindChild { const wchar_t *className; diff --git a/Src/ClassicExplorer/stdafx.h b/Src/ClassicExplorer/stdafx.h index b6226ae..dc12004 100644 --- a/Src/ClassicExplorer/stdafx.h +++ b/Src/ClassicExplorer/stdafx.h @@ -26,10 +26,4 @@ using namespace ATL; #include #include -#ifdef BUILD_SETUP -#define DOC_PATH L"" -#else -#define DOC_PATH L"..\\..\\Docs\\Help\\" -#endif - #include "StringUtils.h" diff --git a/Src/ClassicIE/ClassicIEDLL/dllmain.cpp b/Src/ClassicIE/ClassicIEDLL/dllmain.cpp index 5efa436..e412d20 100644 --- a/Src/ClassicIE/ClassicIEDLL/dllmain.cpp +++ b/Src/ClassicIE/ClassicIEDLL/dllmain.cpp @@ -33,11 +33,6 @@ static int g_LoadDialogs[]= 0 }; -const wchar_t *GetDocRelativePath( void ) -{ - return DOC_PATH; -} - static void NewVersionCallback( VersionData &data ) { wchar_t path[_MAX_PATH]; diff --git a/Src/ClassicIE/ClassicIEDLL/stdafx.h b/Src/ClassicIE/ClassicIEDLL/stdafx.h index 2a270ef..2fb5411 100644 --- a/Src/ClassicIE/ClassicIEDLL/stdafx.h +++ b/Src/ClassicIE/ClassicIEDLL/stdafx.h @@ -24,10 +24,4 @@ using namespace ATL; -#ifdef BUILD_SETUP -#define DOC_PATH L"" -#else -#define DOC_PATH L"..\\..\\Docs\\Help\\" -#endif - #include "StringUtils.h" diff --git a/Src/Lib/Settings.cpp b/Src/Lib/Settings.cpp index 07e4dd9..54b3e27 100644 --- a/Src/Lib/Settings.cpp +++ b/Src/Lib/Settings.cpp @@ -18,12 +18,6 @@ #include #include -#ifdef BUILD_SETUP -#define DOC_PATH L"" -#else -#define DOC_PATH L"..\\..\\Docs\\Help\\" -#endif - /////////////////////////////////////////////////////////////////////////////// // Read/Write lock for accessing the settings. Can't be acquired recursively. Only the main UI thread (the one displaying the settings UI) @@ -2185,7 +2179,7 @@ bool HasHelp( void ) GetModuleFileName(_AtlBaseModule.GetResourceInstance(),path,_countof(path)); *PathFindFileName(path)=0; wchar_t topic[_MAX_PATH]; - Sprintf(topic,_countof(topic),L"%s%sOpenShell.chm",path,GetDocRelativePath()); + Sprintf(topic,_countof(topic),L"%sOpenShell.chm",path); return (GetFileAttributes(topic)!=INVALID_FILE_ATTRIBUTES); } @@ -2195,7 +2189,7 @@ void ShowHelp( void ) GetModuleFileName(_AtlBaseModule.GetResourceInstance(),path,_countof(path)); *PathFindFileName(path)=0; wchar_t topic[_MAX_PATH]; - Sprintf(topic,_countof(topic),L"%s%sOpenShell.chm::/%s.html",path,GetDocRelativePath(),PathFindFileName(g_SettingsManager.GetRegPath())); + Sprintf(topic,_countof(topic),L"%sOpenShell.chm::/%s.html",path,PathFindFileName(g_SettingsManager.GetRegPath())); HtmlHelp(GetDesktopWindow(),topic,HH_DISPLAY_TOPIC,NULL); } diff --git a/Src/Lib/Settings.h b/Src/Lib/Settings.h index fd945e2..01b8f42 100644 --- a/Src/Lib/Settings.h +++ b/Src/Lib/Settings.h @@ -136,7 +136,6 @@ void SelectSettingsTab( int tab, bool bAdvanced, const CSetting *pSelect ); void UpdateSettings( void ); // implemented by the user void UpgradeSettings( bool bShared ); // implemented by the user (called when converting 3.0 settings to 4.0) void ClosingSettings( HWND hWnd, int flags, int command ); // implemented by the user -const wchar_t *GetDocRelativePath( void ); // implemented by the user void SettingChangedCallback( const CSetting *pSetting ); // implemented by the user bool IsSettingsMessage( MSG *msg ); bool ImportSettingsXml( const wchar_t *fname ); diff --git a/Src/Setup/Utility/SaveLogFile.cpp b/Src/Setup/Utility/SaveLogFile.cpp index 00b6cdb..4149e65 100644 --- a/Src/Setup/Utility/SaveLogFile.cpp +++ b/Src/Setup/Utility/SaveLogFile.cpp @@ -53,11 +53,6 @@ void UpdateSettings( void ) { } -const wchar_t *GetDocRelativePath( void ) -{ - return NULL; -} - /////////////////////////////////////////////////////////////////////////////// static const wchar_t *g_Tabs=L"\t\t\t\t\t\t\t\t\t\t"; diff --git a/Src/StartMenu/StartMenuDLL/dllmain.cpp b/Src/StartMenu/StartMenuDLL/dllmain.cpp index 51ccdec..89f40af 100644 --- a/Src/StartMenu/StartMenuDLL/dllmain.cpp +++ b/Src/StartMenu/StartMenuDLL/dllmain.cpp @@ -45,11 +45,6 @@ static int g_LoadDialogs[]= 0 }; -const wchar_t *GetDocRelativePath( void ) -{ - return DOC_PATH; -} - static HANDLE g_DllInitThread; static DWORD CALLBACK DllInitThread( void* ) diff --git a/Src/StartMenu/StartMenuDLL/stdafx.h b/Src/StartMenu/StartMenuDLL/stdafx.h index 3c575a5..30cf4c9 100644 --- a/Src/StartMenu/StartMenuDLL/stdafx.h +++ b/Src/StartMenu/StartMenuDLL/stdafx.h @@ -22,12 +22,6 @@ #include #include -#ifdef BUILD_SETUP -#define DOC_PATH L"" -#else -#define DOC_PATH L"..\\..\\Docs\\Help\\" -#endif - #include "StringUtils.h" #include "TrackResources.h" #include "Assert.h" diff --git a/Src/StartMenu/StartMenuHelper/dllmain.cpp b/Src/StartMenu/StartMenuHelper/dllmain.cpp index 599e4a5..ebecaa1 100644 --- a/Src/StartMenu/StartMenuHelper/dllmain.cpp +++ b/Src/StartMenu/StartMenuHelper/dllmain.cpp @@ -37,11 +37,6 @@ void SettingChangedCallback( const CSetting *pSetting ) { } -const wchar_t *GetDocRelativePath( void ) -{ - return L""; -} - CSetting g_Settings[]={ {L"MenuStyleGroup",CSetting::TYPE_GROUP}, {L"MenuStyle",CSetting::TYPE_INT,0,0,2}, diff --git a/Src/Update/Update.cpp b/Src/Update/Update.cpp index c6c5226..5a64b41 100644 --- a/Src/Update/Update.cpp +++ b/Src/Update/Update.cpp @@ -44,11 +44,6 @@ void UpdateSettings( void ) UpdateSetting(L"Language",language,false); } -const wchar_t *GetDocRelativePath( void ) -{ - return NULL; -} - static int g_LoadDialogs[]= { IDD_UPDATE,0x04000000,