Index: scripts/setup.iss =================================================================== diff -u -N -r825b849971df67fd02c922fefbd7e757d264f237 -r787ecfe9fd8f4f349d47b491ed507796f257595d --- scripts/setup.iss (.../setup.iss) (revision 825b849971df67fd02c922fefbd7e757d264f237) +++ scripts/setup.iss (.../setup.iss) (revision 787ecfe9fd8f4f349d47b491ed507796f257595d) @@ -45,6 +45,8 @@ Compression=lzma SolidCompression=true AppMutex=_Copy handler_ instance +ShowLanguageDialog=auto +AppID={9CF6A157-F0E8-4216-B229-C0CA8204BE2C} [Languages] Name: english; MessagesFile: compiler:Default.isl Index: src/ch/ch.cpp =================================================================== diff -u -N -r1beb1d8feacc2517287b975f27ad5f521fa1c954 -r787ecfe9fd8f4f349d47b491ed507796f257595d --- src/ch/ch.cpp (.../ch.cpp) (revision 1beb1d8feacc2517287b975f27ad5f521fa1c954) +++ src/ch/ch.cpp (.../ch.cpp) (revision 787ecfe9fd8f4f349d47b491ed507796f257595d) @@ -320,7 +320,7 @@ if(uiPropID == PP_PHELPDIR) { if(UpdateHelpPaths()) - HtmlHelp(HH_CLOSE_ALL, NULL); + HtmlHelp(NULL, HH_CLOSE_ALL); } } @@ -330,7 +330,7 @@ { // language has been changed - close the current help file if (UpdateHelpPaths()) - HtmlHelp(HH_CLOSE_ALL, NULL); + HtmlHelp(NULL, HH_CLOSE_ALL); } } @@ -359,7 +359,7 @@ return ::HtmlHelp(hwndCaller, pszPath, uCommand, dwData); } -void CCopyHandlerApp::HtmlHelp(UINT nCmd, DWORD_PTR dwData) +void CCopyHandlerApp::HtmlHelp(DWORD_PTR dwData, UINT nCmd) { switch (nCmd) { Index: src/ch/ch.h =================================================================== diff -u -N -r1beb1d8feacc2517287b975f27ad5f521fa1c954 -r787ecfe9fd8f4f349d47b491ed507796f257595d --- src/ch/ch.h (.../ch.h) (revision 1beb1d8feacc2517287b975f27ad5f521fa1c954) +++ src/ch/ch.h (.../ch.h) (revision 787ecfe9fd8f4f349d47b491ed507796f257595d) @@ -53,7 +53,7 @@ virtual BOOL InitInstance(); //}}AFX_VIRTUAL - virtual void HtmlHelp(UINT nCmd, DWORD_PTR dwData); + virtual void HtmlHelp(DWORD_PTR dwData, UINT nCmd); PCTSTR GetHelpPath() const { return m_pszHelpFilePath; }; Index: src/common/version.h =================================================================== diff -u -N -r9787e809be746cb97df828fcdce6fe69fe02939a -r787ecfe9fd8f4f349d47b491ed507796f257595d --- src/common/version.h (.../version.h) (revision 9787e809be746cb97df828fcdce6fe69fe02939a) +++ src/common/version.h (.../version.h) (revision 787ecfe9fd8f4f349d47b491ed507796f257595d) @@ -12,7 +12,7 @@ #define PRODUCT_VERSION3 105 #define PRODUCT_VERSION4 0 -#define PRODUCT_VERSION "1.30beta-svn105" +#define PRODUCT_VERSION "1.30beta-svn106" // Full product information (concatenation of the three above informations) #if SETUP_COMPILER != 1