detabbed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/config.py b/wxPython/config.py
index ca538a222798c00062c724e66ca937bd76fb924e..597377354e8d2fa13746d354635d4250ea167f2d 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -40,7 +40,7 @@ VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 6
 VER_RELEASE      = 0
 VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
 VER_MINOR        = 6
 VER_RELEASE      = 0
 VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets

-VER_FLAGS        = "pre"     # release flags, such as prerelease num, unicode, etc.
+VER_FLAGS        = "pre"     # release flags, such as prerelease or RC num, etc.

 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"


@@ -668,7 +668,7 @@ if os.name == 'nt':
         WXDIR = '..'  # assumes in CVS tree
     WXPLAT = '__WXMSW__'
     GENDIR = 'msw'
         WXDIR = '..'  # assumes in CVS tree
     WXPLAT = '__WXMSW__'
     GENDIR = 'msw'

-           
+

     includes = ['include', 'src',
                 opj(WXDIR, 'lib', 'vc_dll', 'msw'  + libFlag()),
                 opj(WXDIR, 'include'),
     includes = ['include', 'src',
                 opj(WXDIR, 'lib', 'vc_dll', 'msw'  + libFlag()),
                 opj(WXDIR, 'include'),

diff --git a/wxPython/wx/lib/analogclock.py b/wxPython/wx/lib/analogclock.py
index 442dd0f0e465f80480632f463958f6fdb9df24ea..55525f24e07c5fe72edfe627afd5885f019e9e54 100644 (file)
--- a/wxPython/wx/lib/analogclock.py
+++ b/wxPython/wx/lib/analogclock.py
@@ -456,17 +456,17 @@ class AnalogClockWindow(wx.PyWindow):
         drawDC.DrawPolygon(points)
 
 
         drawDC.DrawPolygon(points)
 
 

-    def _pol2rect(self, r, w, deg=1):          # radian if deg=0; degree if deg=1
+    def _pol2rect(self, r, w, deg=1):           # radian if deg=0; degree if deg=1

         if deg:
         if deg:

-            w = math.pi * w / 180.0
+             w = math.pi * w / 180.0

         return r * math.cos(w), r * math.sin(w)
 
 
         return r * math.cos(w), r * math.sin(w)
 
 

-    def _rect2pol(self, x, y, deg=1):          # radian if deg=0; degree if deg=1
+    def _rect2pol(self, x, y, deg=1):           # radian if deg=0; degree if deg=1

         if deg:
         if deg:

-           return math.hypot(x, y), 180.0 * math.atan2(y, x) / math.pi
+            return math.hypot(x, y), 180.0 * math.atan2(y, x) / math.pi

         else:
         else:

-           return math.hypot(x, y), math.atan2(y, x)
+            return math.hypot(x, y), math.atan2(y, x)

 
 
     def _center2corner(self, x, y, tipo, drawDC=None):
 
 
     def _center2corner(self, x, y, tipo, drawDC=None):