mirror of
				https://github.com/notepad-plus-plus/notepad-plus-plus.git
				synced 2025-10-31 11:34:05 +01:00 
			
		
		
		
	[BUG_FIXED] (Author: Andreas Jonsson) Minor fixes.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1072 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
		
							parent
							
								
									9cabe6eacf
								
							
						
					
					
						commit
						f80a49148e
					
				| @ -557,7 +557,7 @@ generic_string PathRemoveFileSpec(generic_string & 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("")) // "" + ""
 | ||||
| 	{ | ||||
|  | ||||
| @ -177,7 +177,7 @@ private: | ||||
| #endif | ||||
| 
 | ||||
| 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); | ||||
| 
 | ||||
| #endif //M30_IDE_COMMUN_H
 | ||||
|  | ||||
| @ -40,7 +40,7 @@ void Notepad_plus::macroPlayback(Macro macro) | ||||
| { | ||||
| 	_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()) | ||||
| 			step->PlayBack(this->_pPublicInterface, _pEditView); | ||||
|  | ||||
| @ -331,7 +331,7 @@ void FindReplaceDlg::fillComboHistory(int id, const vector<generic_string> & str | ||||
| 	bool isUnicode = false; | ||||
| 	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); | ||||
| 	} | ||||
|  | ||||
| @ -711,7 +711,7 @@ void WordStyleDlg::setVisualFromStyleList() | ||||
|     //--Warning text
 | ||||
|     //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]; | ||||
| 
 | ||||
| 	str[0] = '\0'; | ||||
|  | ||||
| @ -40,7 +40,7 @@ void TreeView::init(HINSTANCE hInst, HWND parent, int treeViewID) | ||||
|                             WC_TREEVIEW, | ||||
|                             TEXT("Tree View"), | ||||
|                             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, | ||||
|                             _hParent,  | ||||
|                             NULL,  | ||||
|  | ||||
| @ -112,7 +112,7 @@ void StaticDialog::create(int dialogID, bool isRTL, bool msgDestParent) | ||||
| 	{ | ||||
| 		DWORD err = ::GetLastError(); | ||||
| 		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); | ||||
| 		return; | ||||
| 	} | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user