Browse Source

[FIXED] Fix a typo.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@753 f5eea248-9336-0410-98b8-ebc06183d4e3
remotes/trunk
Don Ho 14 years ago
parent
commit
f4d6bf75fc
  1. 14
      PowerEditor/src/Notepad_plus.cpp
  2. 4
      PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp

14
PowerEditor/src/Notepad_plus.cpp

@ -4588,10 +4588,8 @@ void Notepad_plus::launchClipboardHistoryPanel()
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)_pClipboardHistoryPanel->getHSelf());
// define the default docking behaviour
data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB | DWS_ADDINFO;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
//data.pszAddInfo = _findAllResultStr;
data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB;
//data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is
@ -4616,10 +4614,8 @@ void Notepad_plus::launchAnsiCharPanel()
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)_pAnsiCharPanel->getHSelf());
// define the default docking behaviour
data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB | DWS_ADDINFO;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
//data.pszAddInfo = _findAllResultStr;
data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB/* | DWS_ADDINFO*/;
//data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is
@ -4628,8 +4624,6 @@ void Notepad_plus::launchAnsiCharPanel()
data.dlgID = IDM_EDIT_CHAR_PANEL;
::SendMessage(_pPublicInterface->getHSelf(), NPPM_DMMREGASDCKDLG, 0, (LPARAM)&data);
}
//::SendMessage(_pAnsiCharPanel->getHSelf(), WM_SIZE, 0, 0);
_pAnsiCharPanel->display();
}

4
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp

@ -852,7 +852,7 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
if ((lstrlen(directory) > 0) && (directory[lstrlen(directory)-1] != '\\'))
_options._directory += TEXT("\\");
generic_string msg = TEXT("Are you sure you want to replace all occurances in :\r");
generic_string msg = TEXT("Are you sure you want to replace all occurrences in :\r");
msg += _options._directory;
msg += TEXT("\rfor file type : ");
msg += _options._filters[0]?_options._filters:TEXT("*.*");
@ -1956,7 +1956,7 @@ void FindReplaceDlg::execSavedCommand(int cmd, int intValue, generic_string stri
}
case IDD_FINDINFILES_REPLACEINFILES :
{
generic_string msg = TEXT("Are you sure you want to replace all occurances in :\r");
generic_string msg = TEXT("Are you sure you want to replace all occurrences in :\r");
msg += _env->_directory;
msg += TEXT("\rfor file type : ");
msg += (_env->_filters[0])?_env->_filters:TEXT("*.*");

Loading…
Cancel
Save