[Thuban-commits] r2877 - in trunk/thuban: . Thuban/UI

[scm-commit@wald.intevation.org]

Author: dpinte
Date: 2009-05-18 17:14:01 +0200 (Mon, 18 May 2009)
New Revision: 2877

Modified:
   trunk/thuban/ChangeLog
   trunk/thuban/Thuban/UI/colordialog.py
   trunk/thuban/Thuban/UI/dock.py
   trunk/thuban/Thuban/UI/projdialog.py
Log:
2009-05-18 Didrik Pinte <dpinte at dipole-consulting.com>

  * Thuban/UI/colordialog.py : update wxpython lib to wx (will not work with 2.4)
  * Thuban/UI/dock.py : removed deprecated call to SetSashBorder
  * Thuban/UI/projdialog.py : fix a utf problem when calling pyprojection

Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog	2009-05-18 14:18:55 UTC (rev 2876)
+++ trunk/thuban/ChangeLog	2009-05-18 15:14:01 UTC (rev 2877)
@@ -1,3 +1,9 @@
+2009-05-18 Didrik Pinte <dpinte at dipole-consulting.com>
+
+  * Thuban/UI/colordialog.py : update wxpython lib to wx (will not work with 2.4)
+  * Thuban/UI/dock.py : removed deprecated call to SetSashBorder
+  * Thuban/UI/projdialog.py : fix a utf problem when calling pyprojection
+  
 2009-05-18 Didrik Pinte <dpinte at dipole-consultin.com>
 
   * Thuban/UI/application.py : removed unneeded hardcoded load of extensions

Modified: trunk/thuban/Thuban/UI/colordialog.py
===================================================================
--- trunk/thuban/Thuban/UI/colordialog.py	2009-05-18 14:18:55 UTC (rev 2876)
+++ trunk/thuban/Thuban/UI/colordialog.py	2009-05-18 15:14:01 UTC (rev 2877)
@@ -22,7 +22,7 @@
 # It was not available with the very first versions of wxWindows 2.4
 # (I don't know the exact version though)
 try:
-    from wxPython.lib.colourchooser import wxPyColourChooser
+    from wx.lib.colourchooser import wxPyColourChooser
     _wxPyColourChooser = True
     wx.InitAllImageHandlers() # should be somewhere at Thuban startup?
 except:

Modified: trunk/thuban/Thuban/UI/dock.py
===================================================================
--- trunk/thuban/Thuban/UI/dock.py	2009-05-18 14:18:55 UTC (rev 2876)
+++ trunk/thuban/Thuban/UI/dock.py	2009-05-18 15:14:01 UTC (rev 2877)
@@ -467,8 +467,7 @@
         sash.SetOrientation(orient)
         sash.SetAlignment(align)
         sash.SetSashVisible(DockFrame.layout2oppSash[align], True)
-        sash.SetSashBorder(DockFrame.layout2oppSash[align], True)
-
+        
         win = DockableWindow(self, id, name, title, sash, orient)
 
         self.__RegisterDock(name, win)

Modified: trunk/thuban/Thuban/UI/projdialog.py
===================================================================
--- trunk/thuban/Thuban/UI/projdialog.py	2009-05-18 14:18:55 UTC (rev 2876)
+++ trunk/thuban/Thuban/UI/projdialog.py	2009-05-18 15:14:01 UTC (rev 2877)
@@ -575,8 +575,11 @@
         # self.curProjPanel should always contain the most relevant data
         # for a projection
         if self.curProjPanel is not None:
+            # remove internal_from_wxstring call in profit of a str call
+            # Projection parameters must be str (otherwise swig does not treat them as is)
+            # this is kind of "works for me". I did not took time to investigate the real issue with internal_from_wxstring
             parameters = \
-                map(internal_from_wxstring,self.curProjPanel.GetParameters())
+                map(str,self.curProjPanel.GetParameters())
             if parameters is not None:
                 return Projection(parameters, self.projname.GetValue())