[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
This commit is contained in:
Don Ho 2010-09-23 22:21:04 +00:00
parent 8caa50ba55
commit 52a0e7971d
6 changed files with 15 additions and 14 deletions

View File

@ -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"

View File

@ -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);

View File

@ -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;
}

View File

@ -364,7 +364,7 @@ void FunctionCallTip::showCalltip()
bytesNeeded += 24; // /\00001 of 00003\/
}
const int maxLen = 1024;
const int maxLen = 2048;
if (bytesNeeded >= maxLen)
return;

View File

@ -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<TCHAR *>(lParameter);
//::MessageBoxA(NULL, (LPCSTR)(*reinterpret_cast<char *>(lParameter)), "A", MB_OK);
//::MessageBoxW(NULL, (LPCWSTR)(*reinterpret_cast<WCHAR *>(lParameter)), TEXT("W"), MB_OK);
{
char ch = *reinterpret_cast<char *>(lParameter);
TCHAR tch = ch;
sParameter = tch;
//printStr(sParameter.c_str());
MacroType = mtUseSParameter;
lParameter = 0;
break;
}
break;
default : // for all other messages, use lParameter "as is"
break;

Binary file not shown.