chiark / gitweb /
Use the proper button read api.
authorDaid <Daid303@gmail.com>
Wed, 3 Apr 2013 14:44:46 +0000 (16:44 +0200)
committerDaid <Daid303@gmail.com>
Wed, 3 Apr 2013 14:44:46 +0000 (16:44 +0200)
Cura/gui/sceneView.py
Cura/gui/util/openglGui.py
Cura/util/sliceEngine.py

index ea27dcdf71c209e710b47cd6a4f91ae50d65c86d..fcce88482f533771c4fe3e93cf7b15f53dfbc232 100644 (file)
@@ -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)
index f4fd3707e3aae322b198ceb56b9377fa93c6e6e4..9a945f027905e5aa2e3566330ba77899db235a85 100644 (file)
@@ -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)
index 725a2b606c99006bcd2c02a64bd34c5e7d7b44d2..84fab9a71bb3dadc87a8ae862a16c761d71480e3 100644 (file)
@@ -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'