]> git.saurik.com Git - wxWidgets.git/commitdiff
wxPython tab cleaning
authorDavid Surovell <davids@osafoundation.org>
Sun, 29 Jan 2006 17:35:47 +0000 (17:35 +0000)
committerDavid Surovell <davids@osafoundation.org>
Sun, 29 Jan 2006 17:35:47 +0000 (17:35 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/config.py
wxPython/distrib/create_setup.h.py
wxPython/distrib/make_installer_inno4.py
wxPython/wx/lib/floatcanvas/FloatCanvas.py
wxPython/wx/lib/plot.py
wxPython/wx/tools/XRCed/tree.py

index 1f6d7242abdec833e2f033729c3511c72fcc8563..09a8e0e3fef26146686b19950fa18026035cdee6 100644 (file)
@@ -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
index 983b9cf9648b093e6b7e69ea7927700b24bfa88f..9c322e4d3d546513e1cca453e7a509f8aa9b0a4d 100755 (executable)
@@ -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:
index 1078b3331c1cf9c0f91fae52072e52adc6b8c9ac..ab82ae7e75e63b7423ea640a50d2f5c36cccb2da 100755 (executable)
@@ -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()
index 40122348b2da4f8aee9fca8d3bcf87fd5a210390..5a9b74186c2fb63b1cda56b3a5334ddf125a59da 100644 (file)
@@ -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
 
index e1d02016b62c0845100a9820e7aa31ab69363e89..af4a4d0e598ecaf97018017920206e0d6ed6c228 100644 (file)
@@ -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)
index 597c56a345daa76461518f16db3831bc2530dfe0..77a86720debe77db0921b804d712bc614c07cf48 100644 (file)
@@ -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