From: Robin Dunn Date: Fri, 25 Mar 2005 20:16:27 +0000 (+0000) Subject: A little cleanup X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8bd882eec15a39338157023d8b684bb464e774bd A little cleanup git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/demo/MouseGestures.py b/wxPython/demo/MouseGestures.py index 0374a0b336..d4af849020 100644 --- a/wxPython/demo/MouseGestures.py +++ b/wxPython/demo/MouseGestures.py @@ -1,6 +1,5 @@ #******************* #By Daniel Pozmanter -#Under the GPL, etc, etc. #Thanks to Robin Dunn for taking the time to show me how to do this #via the mailing list. @@ -9,7 +8,7 @@ #This is a hacked version of DragAndDrop.py from the wxPython demo 2.5.2.8 -import wx, wx.stc, wx.lib.dialogs +import wx, wx.lib.dialogs from wx.lib.gestures import MouseGestures #ToDo: @@ -32,7 +31,8 @@ class TestPanel(wx.Panel): #Mouse Gestures: - self.mg = MouseGestures(self, Auto=True) + self.mg = MouseGestures(self, Auto=True, + MouseButton=wx.MOUSE_BTN_RIGHT) self.mg.SetGesturesVisible(True) @@ -62,8 +62,6 @@ class TestPanel(wx.Panel): text.SetSize(wx.Size(w,h+1)) text.SetForegroundColour(wx.BLUE) - self.SetBackgroundColour(wx.WHITE) - #Sizer: outsideSizer = wx.BoxSizer(wx.VERTICAL) @@ -134,7 +132,8 @@ class TestPanel(wx.Panel): def OnChangeMouseButton(self, event): choices = [wx.MOUSE_BTN_LEFT, wx.MOUSE_BTN_MIDDLE, wx.MOUSE_BTN_RIGHT] schoices = ['Left', 'Middle', 'Right'] - d = wx.SingleChoiceDialog(self, "Set Mouse Button To", "Change Mouse Button", schoices, wx.OK|wx.CANCEL) + d = wx.SingleChoiceDialog(self, "Set Mouse Button To", "Change Mouse Button", schoices, + wx.CHOICEDLG_STYLE|wx.OK|wx.CANCEL) d.SetSize(wx.Size(250, 200)) answer = d.ShowModal() i = d.GetSelection() diff --git a/wxPython/wx/lib/dialogs.py b/wxPython/wx/lib/dialogs.py index 395d36dde8..0800864987 100644 --- a/wxPython/wx/lib/dialogs.py +++ b/wxPython/wx/lib/dialogs.py @@ -83,7 +83,6 @@ class MultipleChoiceDialog(wx.Dialog): self.SetSizer(dlgsizer) - self.SetAutoLayout(1) self.lst = lst self.Layout() diff --git a/wxPython/wx/lib/gestures.py b/wxPython/wx/lib/gestures.py index 0ab9d149ce..eaf47ace9f 100644 --- a/wxPython/wx/lib/gestures.py +++ b/wxPython/wx/lib/gestures.py @@ -7,57 +7,58 @@ #Released under the terms of the wxWindows License. -#This is a class to add Mouse Gestures to a program. -#It can be used in two ways: -# -#1. Automatic: -# Automatically runs mouse gestures. -# You need to set the gestures, and their associated actions, -# as well as the Mouse Button/Modifiers to use. -# -#2. Manual: -# Same as above, but you do not need to set the mouse button/modifiers. -# You can launch this from events as you wish. -# -#An example is provided in the demo. -#The parent window is where the mouse events will be recorded. -#(So if you want to record them in a pop up window, use manual mode, -#and set the pop up as the parent). -# -#Start() starts recording mouse movement. -#End() stops the recording, compiles all the gestures into a list, -#and looks through the registered gestures to find a match. -#The first matchs associated action is then run. +""" +This is a class to add Mouse Gestures to a program. +It can be used in two ways: -#The marginoferror is how much to forgive when calculating movement: -#If the margin is 25, then movement less than 25 pixels will not be detected. +1. Automatic: + Automatically runs mouse gestures. + You need to set the gestures, and their associated actions, + as well as the Mouse Button/Modifiers to use. -#Recognized: L, R, U, D, 1, 3, 7, 9 +2. Manual: + Same as above, but you do not need to set the mouse button/modifiers. + You can launch this from events as you wish. -#Styles: Manual (Automatic By Default), DisplayNumbersForDiagonals (Off By Default). -#Not Yet Implemented +An example is provided in the demo. +The parent window is where the mouse events will be recorded. +(So if you want to record them in a pop up window, use manual mode, +and set the pop up as the parent). -#The criteria for a direction is as follows: -#x in a row. (Where x is the WobbleTolerance). -#So if the WobbleTolerance is 9 -# 'URUUUUUUUUUUUUUUURUURUUUU1' is Up. +Start() starts recording mouse movement. +End() stops the recording, compiles all the gestures into a list, +and looks through the registered gestures to find a match. +The first matchs associated action is then run. -#The higher this number, the less sensitive this class is. -#So the more likely something like 1L will translate to 1. +The marginoferror is how much to forgive when calculating movement: +If the margin is 25, then movement less than 25 pixels will not be detected. -#This is good, since the mouse does tend to wobble somewhat, -#and a higher number allows for this. +Recognized: L, R, U, D, 1, 3, 7, 9 -#To change this, use SetWobbleTolerance +Styles: Manual (Automatic By Default), DisplayNumbersForDiagonals (Off By Default). +Not Yet Implemented -#Also, to help with recognition of a diagonal versus -#a vey messy straight line, if the greater absolute value -#is not greater than twice the lesser, only the grater value -#is counted. +The criteria for a direction is as follows: +x in a row. (Where x is the WobbleTolerance). +So if the WobbleTolerance is 9 + 'URUUUUUUUUUUUUUUURUURUUUU1' is Up. +The higher this number, the less sensitive this class is. +So the more likely something like 1L will translate to 1. -#In automatic mode, EVT_MOUSE_EVENTS is used. -#This allows the user to change the mouse button/modifiers at runtime. +This is good, since the mouse does tend to wobble somewhat, +and a higher number allows for this. + +To change this, use SetWobbleTolerance + +Also, to help with recognition of a diagonal versus +a vey messy straight line, if the greater absolute value +is not greater than twice the lesser, only the grater value +is counted. + +In automatic mode, EVT_MOUSE_EVENTS is used. +This allows the user to change the mouse button/modifiers at runtime. +""" ########################################### @@ -306,4 +307,4 @@ class MouseGestures: self.rawgesture = '' self.lastposition = (-1, -1) if self.showgesture: - self.parent.Refresh() \ No newline at end of file + self.parent.Refresh()