From: Daid <Daid303@gmail.com>
Date: Wed, 3 Apr 2013 14:44:46 +0000 (+0200)
Subject: Use the proper button read api.
X-Git-Tag: 13.05~127
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8e88de15cd488155d99f505cd055e88a87d4aba4;p=cura.git

Use the proper button read api.
---

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index ea27dcdf..fcce8848 100644
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -213,7 +213,7 @@ class SceneView(openglGui.glGuiPanel):
 		else:
 			self._mouseState = 'dragOrClick'
 		if self._mouseState == 'dragOrClick':
-			if e.Button == 1:
+			if e.GetButton() == 1:
 				if self._focusObj is not None:
 					self._selectObject(self._focusObj, False)
 					self.Refresh()
@@ -222,13 +222,13 @@ class SceneView(openglGui.glGuiPanel):
 		if e.LeftIsDown() or e.MiddleIsDown() or e.RightIsDown():
 			return
 		if self._mouseState == 'dragOrClick':
-			if e.Button == 1:
+			if e.GetButton() == 1:
 				if self._focusObj is not None:
 					self._selectObject(self._focusObj)
 				else:
 					self._selectedObj = None
 					self.Refresh()
-			if e.Button == 3 and self._selectedObj == self._focusObj:
+			if e.GetButton() == 3 and self._selectedObj == self._focusObj:
 				#menu = wx.Menu()
 				#menu.Append(-1, 'Test')
 				#self.PopupMenu(menu)
diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py
index f4fd3707..9a945f02 100644
--- a/Cura/gui/util/openglGui.py
+++ b/Cura/gui/util/openglGui.py
@@ -145,7 +145,7 @@ class glGuiPanel(glcanvas.GLCanvas):
 
 	def _OnGuiMouseDown(self,e):
 		self.SetFocus()
-		if self._container.OnMouseDown(e.GetX(), e.GetY(), e.Button):
+		if self._container.OnMouseDown(e.GetX(), e.GetY(), e.GetButton()):
 			self.Refresh()
 			return
 		self.OnMouseDown(e)
diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index 725a2b60..84fab9a7 100644
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -9,7 +9,7 @@ import traceback
 from Cura.util import profile
 
 def getEngineFilename():
-	if os.file.exists('C:/Software/Cura_SteamEngine/_bin/Release/Cura_SteamEngine.exe')
+	if os.path.exists('C:/Software/Cura_SteamEngine/_bin/Release/Cura_SteamEngine.exe'):
 		return 'C:/Software/Cura_SteamEngine/_bin/Release/Cura_SteamEngine.exe'
 	return 'SteamEngine'