wxPython tab cleaning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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:
 | 
			
		||||
 
 | 
			
		||||
@@ -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()
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user