From: David Surovell Date: Sun, 29 Jan 2006 17:35:47 +0000 (+0000) Subject: wxPython tab cleaning X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2458faeb60f3d66a1fa462924eb3af59104a6cfc wxPython tab cleaning git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/config.py b/wxPython/config.py index 1f6d7242ab..09a8e0e3fe 100644 --- a/wxPython/config.py +++ b/wxPython/config.py @@ -155,12 +155,12 @@ WX_CONFIG = None # Usually you shouldn't need to touch this, but you can set SYS_WX_CONFIG = None # When installing an in tree build, setup.py uses wx-config # for two different purposes. First, to determine the prefix - # where files will be installed, and secondly, to initialise - # build_options.py with the correct options for it. - # WX_CONFIG is used for the first task. SYS_WX_CONFIG may - # be set independently, to the value that should appear in - # build_options.py, if it is different to that. The default - # is to use the value of WX_CONFIG. + # where files will be installed, and secondly, to initialise + # build_options.py with the correct options for it. + # WX_CONFIG is used for the first task. SYS_WX_CONFIG may + # be set independently, to the value that should appear in + # build_options.py, if it is different to that. The default + # is to use the value of WX_CONFIG. WXPORT = 'gtk2' # On Linux/Unix there are several ports of wxWidgets available. # Setting this value lets you select which will be used for diff --git a/wxPython/distrib/create_setup.h.py b/wxPython/distrib/create_setup.h.py index 983b9cf964..9c322e4d3d 100755 --- a/wxPython/distrib/create_setup.h.py +++ b/wxPython/distrib/create_setup.h.py @@ -3,26 +3,26 @@ import sys, os, string, shutil, re #TODO: copy .make files to build/msw # update setup_h defines to match official wxPython settings -defines = { - 'wxDIALOG_UNIT_COMPATIBILITY' :'0', - 'wxUSE_DEBUG_CONTEXT' :'0', - 'wxUSE_MEMORY_TRACING' :'0', - 'wxUSE_DIALUP_MANAGER' :'0', - 'wxUSE_GLCANVAS' :'1', - 'wxUSE_POSTSCRIPT' :'1', - 'wxUSE_AFM_FOR_POSTSCRIPT' :'0', - 'wxUSE_DISPLAY' :'1', - 'wxUSE_DEBUGREPORT' :'0' - } +defines = { + 'wxDIALOG_UNIT_COMPATIBILITY' :'0', + 'wxUSE_DEBUG_CONTEXT' :'0', + 'wxUSE_MEMORY_TRACING' :'0', + 'wxUSE_DIALUP_MANAGER' :'0', + 'wxUSE_GLCANVAS' :'1', + 'wxUSE_POSTSCRIPT' :'1', + 'wxUSE_AFM_FOR_POSTSCRIPT' :'0', + 'wxUSE_DISPLAY' :'1', + 'wxUSE_DEBUGREPORT' :'0' +} uni_defines = { - 'wxUSE_UNICODE' :'1', - 'wxUSE_UNICODE_MSLU' :'1' + 'wxUSE_UNICODE' :'1', + 'wxUSE_UNICODE_MSLU' :'1' } debug_defines = { - 'wxUSE_DEBUG_CONTEXT' :'1', - 'wxUSE_MEMORY_TRACING' :'1', + 'wxUSE_DEBUG_CONTEXT' :'1', + 'wxUSE_MEMORY_TRACING' :'1', } if "UNICODE=1" in sys.argv: diff --git a/wxPython/distrib/make_installer_inno4.py b/wxPython/distrib/make_installer_inno4.py index 1078b3331c..ab82ae7e75 100755 --- a/wxPython/distrib/make_installer_inno4.py +++ b/wxPython/distrib/make_installer_inno4.py @@ -621,7 +621,7 @@ def main(): ISSFILE = "__wxPython.iss" ISSDEMOFILE = "__wxPythonDemo.iss" IFSFILE = "__wxPython.ifs" - IFSFILEREF = "CodeFile = " + IFSFILE + IFSFILEREF = "CodeFile = " + IFSFILE IFSFILEREF = "" UNINSTALL_BATCH = get_batch_files() PKGDIR = open('src/wx.pth').read() diff --git a/wxPython/wx/lib/floatcanvas/FloatCanvas.py b/wxPython/wx/lib/floatcanvas/FloatCanvas.py index 40122348b2..5a9b74186c 100644 --- a/wxPython/wx/lib/floatcanvas/FloatCanvas.py +++ b/wxPython/wx/lib/floatcanvas/FloatCanvas.py @@ -2135,7 +2135,7 @@ class FloatCanvas(wx.Panel): pass def LeftUpEvent(self,event): - if self.HasCapture(): + if self.HasCapture(): self.ReleaseMouse() if self.GUIMode: if self.GUIMode == "ZoomIn": @@ -2598,7 +2598,7 @@ class FloatCanvas(wx.Panel): self.BoundingBox = None self.ViewPortCenter= array( (0,0), Float) self.TransformVector = array( (1,-1), Float) - self.MapProjectionVector = array( (1,1), Float) + self.MapProjectionVector = array( (1,1), Float) self.Scale = 1 self.BoundingBoxDirty = False diff --git a/wxPython/wx/lib/plot.py b/wxPython/wx/lib/plot.py index e1d02016b6..af4a4d0e59 100644 --- a/wxPython/wx/lib/plot.py +++ b/wxPython/wx/lib/plot.py @@ -688,7 +688,7 @@ class PlotCanvas(wx.Window): def ScrollUp(self, units): """Move view up number of axis units.""" self.last_PointLabel = None #reset pointLabel - if self.last_draw is not None: + if self.last_draw is not None: graphics, xAxis, yAxis= self.last_draw yAxis= (yAxis[0]+units, yAxis[1]+units) self.Draw(graphics,xAxis,yAxis) diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py index 597c56a345..77a86720de 100644 --- a/wxPython/wx/tools/XRCed/tree.py +++ b/wxPython/wx/tools/XRCed/tree.py @@ -441,7 +441,7 @@ class XML_Tree(wxTreeCtrl): EVT_TREE_ITEM_COLLAPSED(self, self.GetId(), self.OnItemExpandedCollapsed) self.selection = None - self.selectionChanging = False + self.selectionChanging = False self.needUpdate = False self.pendingHighLight = None self.ctrl = self.shift = False @@ -683,10 +683,10 @@ class XML_Tree(wxTreeCtrl): def OnSelChanged(self, evt): if self.selectionChanging: return - self.selectionChanging = True + self.selectionChanging = True self.UnselectAll() self.SelectItem(evt.GetItem()) - self.selectionChanging = False + self.selectionChanging = False def ChangeSelection(self, item): # Apply changes