tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-22 21:34:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

[BUG_FIXED] centralize updateStatusBar() and dynamicCheckMenuAndTB() under NPPM_INTERNAL_DOCSWITCHIN message.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@37 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2007-09-18 18:07:26 +00:00
parent 4e26d3b469
commit b9ff195fcb
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PowerEditor/src/Notepad_plus.cpp
View File

@ -460,7 +460,7 @@ bool Notepad_plus::doOpen(const char *fileName, bool isReadOnly)
// Then replace the caret to the begining // Then replace the caret to the begining
_pEditView->execute(SCI_GOTOPOS, 0); _pEditView->execute(SCI_GOTOPOS, 0);
dynamicCheckMenuAndTB(); //dynamicCheckMenuAndTB();
_lastRecentFileList.remove(longFileName); _lastRecentFileList.remove(longFileName);
if (_pTrayIco) if (_pTrayIco)
{ {
@ -1856,6 +1856,8 @@ BOOL Notepad_plus::notify(SCNotification *notification)
case SCN_UPDATEUI: case SCN_UPDATEUI:
braceMatch(); braceMatch();
// To update the line and the col status
updateStatusBar(); updateStatusBar();
break; break;
@ -4077,8 +4079,8 @@ bool Notepad_plus::fileClose()
PathRemoveFileSpec(fullPath); PathRemoveFileSpec(fullPath);
setWorkingDir(fullPath); setWorkingDir(fullPath);
updateStatusBar(); //updateStatusBar();
dynamicCheckMenuAndTB(); //dynamicCheckMenuAndTB();
checkDocState(); checkDocState();
_linkTriggered = true; _linkTriggered = true;
@ -4394,8 +4396,8 @@ int Notepad_plus::switchEditViewTo(int gid)
checkDocState(); checkDocState();
setTitleWith(_pEditView->getCurrentTitle()); setTitleWith(_pEditView->getCurrentTitle());
setLangStatus(_pEditView->getCurrentDocType()); setLangStatus(_pEditView->getCurrentDocType());
updateStatusBar(); //updateStatusBar();
dynamicCheckMenuAndTB(); //dynamicCheckMenuAndTB();
return oldView; return oldView;
} }
@ -5668,7 +5670,7 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
checkMenuItem(IDM_VIEW_USER_DLG, uddShow); checkMenuItem(IDM_VIEW_USER_DLG, uddShow);
_toolBar.setCheck(IDM_VIEW_USER_DLG, uddShow); _toolBar.setCheck(IDM_VIEW_USER_DLG, uddShow);
dynamicCheckMenuAndTB(); //dynamicCheckMenuAndTB();
_mainEditView.defineDocType(L_TXT); _mainEditView.defineDocType(L_TXT);
HMENU hMenu = ::GetSubMenu(::GetMenu(_hSelf), MENUINDEX_FILE); HMENU hMenu = ::GetSubMenu(::GetMenu(_hSelf), MENUINDEX_FILE);
@ -6608,6 +6610,8 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
case NPPM_INTERNAL_DOCSWITCHIN : case NPPM_INTERNAL_DOCSWITCHIN :
{ {
_hideLinesMarks.empty(); _hideLinesMarks.empty();
dynamicCheckMenuAndTB();
updateStatusBar();
return TRUE; return TRUE;
} }

4
PowerEditor/src/Notepad_plus.h
View File

@ -522,8 +522,8 @@ private:
void fileNew(){ void fileNew(){
setTitleWith(_pDocTab->newDoc(NULL)); setTitleWith(_pDocTab->newDoc(NULL));
updateStatusBar(); //updateStatusBar();
dynamicCheckMenuAndTB(); //dynamicCheckMenuAndTB();
checkDocState(); checkDocState();
setLangStatus(_pEditView->getCurrentDocType()); setLangStatus(_pEditView->getCurrentDocType());
setWorkingDir(NULL); setWorkingDir(NULL);