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

[BUG_FIXED] (Author: Andreas Jonsson) Minor fixes.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1072 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2013-07-07 21:33:19 +00:00
parent 9cabe6eacf
commit f80a49148e
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/MISC/Common/Common.cpp
View File

@ -557,7 +557,7 @@ generic_string PathRemoveFileSpec(generic_string & path)
return path; return path;
} }
generic_string PathAppend(generic_string &strDest, const generic_string str2append) generic_string PathAppend(generic_string &strDest, const generic_string & str2append)
{ {
if (strDest == TEXT("") && str2append == TEXT("")) // "" + "" if (strDest == TEXT("") && str2append == TEXT("")) // "" + ""
{ {

2
PowerEditor/src/MISC/Common/Common.h
View File

@ -177,7 +177,7 @@ private:
#endif #endif
generic_string PathRemoveFileSpec(generic_string & path); generic_string PathRemoveFileSpec(generic_string & path);
generic_string PathAppend(generic_string &strDest, const generic_string str2append); generic_string PathAppend(generic_string &strDest, const generic_string & str2append);
COLORREF getCtrlBkColor(HWND hWnd); COLORREF getCtrlBkColor(HWND hWnd);
#endif //M30_IDE_COMMUN_H #endif //M30_IDE_COMMUN_H

2
PowerEditor/src/NppCommands.cpp
View File

@ -40,7 +40,7 @@ void Notepad_plus::macroPlayback(Macro macro)
{ {
_pEditView->execute(SCI_BEGINUNDOACTION); _pEditView->execute(SCI_BEGINUNDOACTION);
for (Macro::iterator step = macro.begin(); step != macro.end(); step++) for (Macro::iterator step = macro.begin(); step != macro.end(); ++step)
{ {
if (step->isPlayable()) if (step->isPlayable())
step->PlayBack(this->_pPublicInterface, _pEditView); step->PlayBack(this->_pPublicInterface, _pEditView);

2
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -331,7 +331,7 @@ void FindReplaceDlg::fillComboHistory(int id, const vector<generic_string> & str
bool isUnicode = false; bool isUnicode = false;
HWND hCombo = ::GetDlgItem(_hSelf, id); HWND hCombo = ::GetDlgItem(_hSelf, id);
for (vector<generic_string>::const_reverse_iterator i = strings.rbegin() ; i != strings.rend(); i++) for (vector<generic_string>::const_reverse_iterator i = strings.rbegin() ; i != strings.rend(); ++i)
{ {
addText2Combo(i->c_str(), hCombo, isUnicode); addText2Combo(i->c_str(), hCombo, isUnicode);
} }

2
PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp
View File

@ -711,7 +711,7 @@ void WordStyleDlg::setVisualFromStyleList()
//--Warning text //--Warning text
//bool showWarning = ((_currentLexerIndex == 0) && (style._styleID == STYLE_DEFAULT));//?SW_SHOW:SW_HIDE; //bool showWarning = ((_currentLexerIndex == 0) && (style._styleID == STYLE_DEFAULT));//?SW_SHOW:SW_HIDE;
COLORREF c = c = RGB(0x00, 0x00, 0xFF); COLORREF c = RGB(0x00, 0x00, 0xFF);
TCHAR str[256]; TCHAR str[256];
str[0] = '\0'; str[0] = '\0';

2
PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp
View File

@ -40,7 +40,7 @@ void TreeView::init(HINSTANCE hInst, HWND parent, int treeViewID)
WC_TREEVIEW, WC_TREEVIEW,
TEXT("Tree View"), TEXT("Tree View"),
WS_CHILD | WS_BORDER | WS_HSCROLL | WS_TABSTOP | TVS_LINESATROOT | TVS_HASLINES | WS_CHILD | WS_BORDER | WS_HSCROLL | WS_TABSTOP | TVS_LINESATROOT | TVS_HASLINES |
TVS_HASBUTTONS | TVS_HASBUTTONS | TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_INFOTIP, TVS_HASBUTTONS | TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_INFOTIP,
0, 0, 0, 0, 0, 0, 0, 0,
_hParent, _hParent,
NULL, NULL,

2
PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp
View File

@ -112,7 +112,7 @@ void StaticDialog::create(int dialogID, bool isRTL, bool msgDestParent)
{ {
DWORD err = ::GetLastError(); DWORD err = ::GetLastError();
char errMsg[256]; char errMsg[256];
sprintf(errMsg, "CreateDialogParam() return NULL.\rGetLastError() == %d", err); sprintf(errMsg, "CreateDialogParam() return NULL.\rGetLastError() == %u", err);
::MessageBoxA(NULL, errMsg, "In StaticDialog::create()", MB_OK); ::MessageBoxA(NULL, errMsg, "In StaticDialog::create()", MB_OK);
return; return;
} }