Merge pull request #338 from CIB/zenx2

Cleanup of zenx2's pull request

Core/Contents/Source/PolyWinCore.cpp

@@ -703,6 +703,12 @@ void Win32Core::checkEvents() {
 					case InputEvent::EVENT_MOUSEUP:
 							input->setMouseButtonState(event.mouseButton, false, getTicks());
 					break;
+					case InputEvent::EVENT_MOUSEWHEEL_UP:
+						input->mouseWheelUp(getTicks());
+					break;
+					case InputEvent::EVENT_MOUSEWHEEL_DOWN:
+						input->mouseWheelDown(getTicks());						
+					break;	
 					case InputEvent::EVENT_KEYDOWN:
 						if(!checkSpecialKeyEvents((event.keyCode))) {
 							input->setKeyState(event.keyCode, (char)event.unicodeChar, true, getTicks());

Modules/Contents/UI/Source/PolyUITextInput.cpp

@@ -129,6 +129,8 @@ UITextInput::UITextInput(bool multiLine, Number width, Number height) : UIElemen
 	
 	inputRect->addEventListener(this, InputEvent::EVENT_MOUSEDOWN);
 	inputRect->addEventListener(this, InputEvent::EVENT_MOUSEUP);	
+	inputRect->addEventListener(this, InputEvent::EVENT_MOUSEWHEEL_DOWN);
+	inputRect->addEventListener(this, InputEvent::EVENT_MOUSEWHEEL_UP);	
 	inputRect->addEventListener(this, InputEvent::EVENT_DOUBLECLICK);		
 	inputRect->addEventListener(this, InputEvent::EVENT_MOUSEMOVE);		
 	inputRect->addEventListener(this, InputEvent::EVENT_MOUSEOVER);
@@ -1112,7 +1114,8 @@ void UITextInput::Copy() {
 
 void UITextInput::Paste() {
 	saveUndoState();
-	insertText(CoreServices::getInstance()->getCore()->getClipboardString());
+	String clip = CoreServices::getInstance()->getCore()->getClipboardString().replace("\r\n", "\n");
+	insertText(clip);
 }
 
 void UITextInput::showLine(unsigned int lineNumber, bool top) {
@@ -1564,6 +1567,12 @@ void UITextInput::handleEvent(Event *event) {
 			case InputEvent::EVENT_MOUSEUP:
 				draggingSelection = false;
 			break;
+			case InputEvent::EVENT_MOUSEWHEEL_UP:
+				scrollContainer->onMouseWheelUp(0, 0);
+			break;
+			case InputEvent::EVENT_MOUSEWHEEL_DOWN:
+				scrollContainer->onMouseWheelDown(0, 0);
+			break;
 			case InputEvent::EVENT_DOUBLECLICK:
 				selectWordAtCaret();
 			break;