Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[UPDATE] minor modification.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@625 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2010-03-17 23:37:58 +00:00
parent 2e54127036
commit 194882dd0b
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PowerEditor/src/Notepad_plus.cpp
View File

@ -63,7 +63,6 @@ Notepad_plus::Notepad_plus(): Window(), _mainWindowStatus(0), _pDocTab(NULL), _p
TiXmlDocument *toolIconsDocRoot = (NppParameters::getInstance())->getToolIcons(); TiXmlDocument *toolIconsDocRoot = (NppParameters::getInstance())->getToolIcons();
if (toolIconsDocRoot) if (toolIconsDocRoot)
{ {
_toolBar.initTheme(toolIconsDocRoot); _toolBar.initTheme(toolIconsDocRoot);

5
PowerEditor/src/Notepad_plus.h
View File

@ -115,10 +115,6 @@
#define MENU 0x01 #define MENU 0x01
#define TOOLBAR 0x02 #define TOOLBAR 0x02
namespace Translator {
}
#define URL_REG_EXPR "[A-Za-z]+://[A-Za-z0-9_\\-\\+~.:?&@=/%#,;\\{\\}\\(\\)\\[\\]\\|\\*\\!\\\\]+" #define URL_REG_EXPR "[A-Za-z]+://[A-Za-z0-9_\\-\\+~.:?&@=/%#,;\\{\\}\\(\\)\\[\\]\\|\\*\\!\\\\]+"
enum FileTransferMode { enum FileTransferMode {
@ -292,7 +288,6 @@ private:
AutoCompletion _autoCompleteSub; //each Scintilla has its own autoComplete AutoCompletion _autoCompleteSub; //each Scintilla has its own autoComplete
SmartHighlighter _smartHighlighter; SmartHighlighter _smartHighlighter;
//TiXmlNode *_toolIcons;
NativeLangSpeaker _nativeLangSpeaker; NativeLangSpeaker _nativeLangSpeaker;
DocTabView _mainDocTab; DocTabView _mainDocTab;
DocTabView _subDocTab; DocTabView _subDocTab;

15
PowerEditor/src/NppCommands.cpp
View File

@ -905,10 +905,12 @@ void Notepad_plus::command(int id)
case IDM_VIEW_SYNSCROLLV: case IDM_VIEW_SYNSCROLLV:
{ {
_syncInfo._isSynScollV = !_syncInfo._isSynScollV; bool isSynScollV = !_syncInfo._isSynScollV;
checkMenuItem(IDM_VIEW_SYNSCROLLV, _syncInfo._isSynScollV);
_toolBar.setCheck(IDM_VIEW_SYNSCROLLV, _syncInfo._isSynScollV); checkMenuItem(IDM_VIEW_SYNSCROLLV, isSynScollV);
_toolBar.setCheck(IDM_VIEW_SYNSCROLLV, isSynScollV);
_syncInfo._isSynScollV = isSynScollV;
if (_syncInfo._isSynScollV) if (_syncInfo._isSynScollV)
{ {
int mainCurrentLine = _mainEditView.execute(SCI_GETFIRSTVISIBLELINE); int mainCurrentLine = _mainEditView.execute(SCI_GETFIRSTVISIBLELINE);
@ -921,10 +923,11 @@ void Notepad_plus::command(int id)
case IDM_VIEW_SYNSCROLLH: case IDM_VIEW_SYNSCROLLH:
{ {
_syncInfo._isSynScollH = !_syncInfo._isSynScollH; bool isSynScollH = !_syncInfo._isSynScollH;
checkMenuItem(IDM_VIEW_SYNSCROLLH, _syncInfo._isSynScollH); checkMenuItem(IDM_VIEW_SYNSCROLLH, isSynScollH);
_toolBar.setCheck(IDM_VIEW_SYNSCROLLH, _syncInfo._isSynScollH); _toolBar.setCheck(IDM_VIEW_SYNSCROLLH, isSynScollH);
_syncInfo._isSynScollH = isSynScollH;
if (_syncInfo._isSynScollH) if (_syncInfo._isSynScollH)
{ {
int mxoffset = _mainEditView.execute(SCI_GETXOFFSET); int mxoffset = _mainEditView.execute(SCI_GETXOFFSET);