@@ -883,8 +883,8 @@ OSVERSIONINFO VersionInformation;
883
883
884
884
pMainFrame->SendMessage (WM_COMMAND, ID_WORLDS_WORLD1, 0 );
885
885
886
- if (firsttime && !bWine)
887
- App.WinHelp (ID_GETTING_STARTED + HID_BASE_COMMAND);
886
+ if (firsttime && !bWine && HelpAvailable ( false ) )
887
+ App.HelpHelper (ID_GETTING_STARTED + HID_BASE_COMMAND);
888
888
889
889
App.ShowTipAtStartup ();
890
890
@@ -1300,7 +1300,7 @@ void CMUSHclientApp::OnFileNew()
1300
1300
1301
1301
void CMUSHclientApp::OnHelpGettingstarted ()
1302
1302
{
1303
- App.WinHelp (ID_GETTING_STARTED + HID_BASE_COMMAND);
1303
+ App.HelpHelper (ID_GETTING_STARTED + HID_BASE_COMMAND);
1304
1304
}
1305
1305
1306
1306
bool GetSelection (CEdit * pEdit, CString & strSelection)
@@ -2194,3 +2194,36 @@ void CMUSHclientApp::WorkOutFixedFont ()
2194
2194
2195
2195
2196
2196
} // end of CMUSHclientApp::WorkOutFixedFont
2197
+
2198
+
2199
+ // Winhelp not available in Windows 10, nor any alternative
2200
+ bool CMUSHclientApp::HelpAvailable (bool showWarning)
2201
+ {
2202
+ if (os_version.dwPlatformId == VER_PLATFORM_WIN32_NT && os_version.dwMajorVersion >= 10 )
2203
+ {
2204
+ if (showWarning)
2205
+ TMessageBox (" Supplied help file is not compatible with Windows 10 and above.\r\n\r\n "
2206
+ " Suggest you install the plugin \" MUSHclient_Help\" for browsing the help file, "
2207
+ " and then type \" mchelp <subject>\" ."
2208
+ " \r\n\r\n Or, view the online help at: http://mushclient.com/scripts/doc.php" , MB_ICONINFORMATION);
2209
+ return false ;
2210
+ }
2211
+
2212
+
2213
+ return true ;
2214
+ }
2215
+
2216
+ // show help if we can
2217
+ void CMUSHclientApp::HelpHelper (DWORD dwData, UINT nCmd)
2218
+ {
2219
+
2220
+ if (!HelpAvailable (true ))
2221
+ return ;
2222
+
2223
+ // show help normally
2224
+ if (dwData == 0 )
2225
+ OnHelp ();
2226
+ else
2227
+ App.WinHelp (dwData, nCmd);
2228
+
2229
+ } // end of CMUSHclientApp::HelpHelper
0 commit comments