diff --git a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h index dfc41edb6..281414ae7 100644 --- a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h +++ b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h @@ -96,7 +96,7 @@ enum winVer{WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV //return old unicodeMode #define NPPM_ACTIVATEDOC (NPPMSG + 28) - //void NPPM_ACTIVATEDOC(int index2Activate, int view) + //void NPPM_ACTIVATEDOC(int view, int index2Activate) #define NPPM_LAUNCHFINDINFILESDLG (NPPMSG + 29) //void NPPM_LAUNCHFINDINFILESDLG(char * dir2Search, char * filtre) diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index ff88c8326..922453eea 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -3994,7 +3994,8 @@ bool Notepad_plus::fileClose() //updateStatusBar(); //dynamicCheckMenuAndTB(); - //checkDocState(); + setLangStatus(_pEditView->getCurrentDocType()); + checkDocState(); _linkTriggered = true; return true; diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 6aead9a4c..9dd3f179a 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -375,6 +375,7 @@ BEGIN MENUITEM "8\tAlt+Shift+8", IDM_VIEW_UNFOLD_8 END MENUITEM "Unfold all\tAlt+Shift+0", IDM_VIEW_TOGGLE_UNFOLDALL + MENUITEM SEPARATOR MENUITEM "Hide lines", IDM_VIEW_HIDELINES MENUITEM SEPARATOR MENUITEM "Go to another view", IDM_VIEW_GOTO_ANOTHER_VIEW diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index 82b8683df..9ea1a1b42 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -24,7 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #define IDC_STATIC -1 #endif -IDD_PREFERENCE_BOX DIALOGEX 0, 0, 325, 206 +IDD_PREFERENCE_BOX DIALOGEX 0, 0, 345, 206 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE CAPTION "Preferences"