From: daid <daid303@gmail.com>
Date: Thu, 19 Sep 2013 12:48:53 +0000 (+0200)
Subject: Merge fix.
X-Git-Tag: 13.10~69
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f7e459de8d2228f389a6c2e02f35f776a3f09251;p=cura.git

Merge fix.
---

f7e459de8d2228f389a6c2e02f35f776a3f09251
diff --cc Cura/gui/printWindow.py
index 5d03f43b,0591649f..13a1b6cb
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@@ -528,11 -528,10 +528,12 @@@ class printWindow(wx.Frame)
  		self.machineCom.setFeedrateModifier('SUPPORT', self.supportSpeedSelect.GetValue() / 100.0)
  
  	def AddTermLog(self, line):
 +		if len(self.termLog.GetValue()) > 10000:
 +			self.termLog.SetValue(self.termLog.GetValue()[-10000:])
+ 		self.termLog.SetInsertionPointEnd()
  		self.termLog.AppendText(unicode(line, 'utf-8', 'replace'))
- 		l = len(self.termLog.GetValue())
- 		self.termLog.SetCaret(wx.Caret(self.termLog, (l, l)))
+ 		#l = self.termLog.GetLastPosition()     # if needed (windows? mac?)
+ 		#self.termLog.ShowPosition(l)
  
  	def OnTermEnterLine(self, e):
  		line = self.termInput.GetValue()