From 52a0e7971db98bcb58b0af833d478af957b0f2ed Mon Sep 17 00:00:00 2001 From: Don Ho Date: Thu, 23 Sep 2010 22:21:04 +0000 Subject: [PATCH] [BUG_FIXED] (Author : Vitaliy Dovgan) Fix macro record bug from ANSI document. [BUG_FIXED] Fix hidding/showing status bar bug. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@669 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/installer/nppSetup.nsi | 8 ++++---- PowerEditor/src/Notepad_plus.cpp | 2 +- PowerEditor/src/NppBigSwitch.cpp | 3 +-- .../src/ScitillaComponent/FunctionCallTip.cpp | 2 +- .../src/WinControls/shortcut/shortcut.cpp | 14 ++++++++------ PowerEditor/src/localizationString.h | Bin 7090 -> 7090 bytes 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 2d372cf28..2ab758309 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -644,14 +644,14 @@ SubSection "Plugins" Plugins SetOutPath "$INSTDIR\plugins" File "..\bin\plugins\SpellChecker.dll" SectionEnd - +/* Section "MIME Tools" MIMETools Delete "$INSTDIR\plugins\NppTools.dll" Delete "$INSTDIR\plugins\mimeTools.dll" SetOutPath "$INSTDIR\plugins" File "..\bin\plugins\mimeTools.dll" SectionEnd - +*/ Section "Npp FTP" NppFTP Delete "$INSTDIR\plugins\NppFTP.dll" SetOutPath "$INSTDIR\plugins" @@ -671,13 +671,13 @@ SubSection "Plugins" Plugins SetOutPath "$INSTDIR\plugins" File "..\bin\plugins\NppExport.dll" SectionEnd - +/* Section "Select 'N' Launch" SelectNLaunch Delete "$INSTDIR\plugins\SelectNLaunch.dll" SetOutPath "$INSTDIR\plugins" File "..\bin\plugins\SelectNLaunch.dll" SectionEnd - +*/ Section "Compare Plugin" ComparePlugin Delete "$INSTDIR\plugins\ComparePlugin.dll" SetOutPath "$INSTDIR\plugins" diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 9332ce7aa..18c6e0a6f 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -283,7 +283,7 @@ LRESULT Notepad_plus::init(HWND hwnd) //--Status Bar Section--// bool willBeShown = nppGUI._statusBarShow; _statusBar.init(_pPublicInterface->getHinst(), hwnd, 6); - _statusBar.setPartWidth(STATUSBAR_DOC_SIZE, 230); + _statusBar.setPartWidth(STATUSBAR_DOC_SIZE, 200); _statusBar.setPartWidth(STATUSBAR_CUR_POS, 230); _statusBar.setPartWidth(STATUSBAR_EOF_FORMAT, 110); _statusBar.setPartWidth(STATUSBAR_UNICODE_TYPE, 120); diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp index 7df04f396..7fccd0e50 100644 --- a/PowerEditor/src/NppBigSwitch.cpp +++ b/PowerEditor/src/NppBigSwitch.cpp @@ -1675,8 +1675,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa _pPublicInterface->getClientRect(rc); nppGUI._statusBarShow = show; - if(show) - _statusBar.display(nppGUI._statusBarShow); + _statusBar.display(nppGUI._statusBarShow); ::SendMessage(_pPublicInterface->getHSelf(), WM_SIZE, SIZE_RESTORED, MAKELONG(rc.bottom, rc.right)); return oldVal; } diff --git a/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp b/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp index 5ad753b6e..dcb110ff6 100644 --- a/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp +++ b/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp @@ -364,7 +364,7 @@ void FunctionCallTip::showCalltip() bytesNeeded += 24; // /\00001 of 00003\/ } - const int maxLen = 1024; + const int maxLen = 2048; if (bytesNeeded >= maxLen) return; diff --git a/PowerEditor/src/WinControls/shortcut/shortcut.cpp b/PowerEditor/src/WinControls/shortcut/shortcut.cpp index 22771dc62..f3d0f67d4 100644 --- a/PowerEditor/src/WinControls/shortcut/shortcut.cpp +++ b/PowerEditor/src/WinControls/shortcut/shortcut.cpp @@ -562,14 +562,16 @@ recordedMacroStep::recordedMacroStep(int iMessage, long wParam, long lParam) case IDREPLACEWITH: case IDD_FINDINFILES_DIR_COMBO: case IDD_FINDINFILES_FILTERS_COMBO: - sParameter = *reinterpret_cast(lParameter); - //::MessageBoxA(NULL, (LPCSTR)(*reinterpret_cast(lParameter)), "A", MB_OK); - //::MessageBoxW(NULL, (LPCWSTR)(*reinterpret_cast(lParameter)), TEXT("W"), MB_OK); - - //printStr(sParameter.c_str()); + { + char ch = *reinterpret_cast(lParameter); + TCHAR tch = ch; + sParameter = tch; + MacroType = mtUseSParameter; lParameter = 0; - break; + } + break; + default : // for all other messages, use lParameter "as is" break; diff --git a/PowerEditor/src/localizationString.h b/PowerEditor/src/localizationString.h index 2f53fac4c52c40e692542ea5fcce203b32f0baeb..369500435fe5fdc4b8e7b62c8e9a75eedfa5f05f 100644 GIT binary patch delta 13 UcmdmFzR7%ppEP6QWPj;o03?wFt^fc4 delta 13 UcmdmFzR7%ppERT6WPj;o03-1PjsO4v