[Thuban-commits] r2778 - in trunk/thuban: . Extensions/umn_mapserver

[scm-commit@wald.intevation.org]

Author: dpinte
Date: 2007-06-27 10:12:24 +0200 (Wed, 27 Jun 2007)
New Revision: 2778

Modified:
   trunk/thuban/ChangeLog
   trunk/thuban/Extensions/umn_mapserver/mf_import.py
Log:
2007-06-27  Didrik Pinte <dpinte at itae.be>

        umn_mapserver extension bug fixing due to the wx 2.6 migration

        * Extensions/umn_mapserver/mf_import.py: import corrections



Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog	2007-06-23 00:17:16 UTC (rev 2777)
+++ trunk/thuban/ChangeLog	2007-06-27 08:12:24 UTC (rev 2778)
@@ -1,3 +1,9 @@
+2007-06-27  Didrik Pinte <dpinte at itae.be>
+
+	umn_mapserver extension bug fixing due to the wx 2.6 migration
+
+	* Extensions/umn_mapserver/mf_import.py: import corrections
+
 2007-06-23  Bernhard Reiter <bernhard at intevation.de>
 	
 	* thuban.py: Added the __name__="__main__" trick so you can

Modified: trunk/thuban/Extensions/umn_mapserver/mf_import.py
===================================================================
--- trunk/thuban/Extensions/umn_mapserver/mf_import.py	2007-06-23 00:17:16 UTC (rev 2777)
+++ trunk/thuban/Extensions/umn_mapserver/mf_import.py	2007-06-27 08:12:24 UTC (rev 2778)
@@ -28,9 +28,9 @@
 from mapscript import mapObj
 
 from wx import FileDialog, \
-                        OPEN, OVERWRITE_PROMPT, ID_OK
+                        OPEN, OVERWRITE_PROMPT, ID_OK, ID_CANCEL
 
-from Python.lib.dialogs import MultipleChoiceDialog
+from wx.lib.dialogs import MultipleChoiceDialog
 
 # use _() already now for all strings that may later be translated
 from Thuban import _
@@ -47,7 +47,7 @@
 from Thuban.Model.proj import Projection
 
 # needed to add the new menu
-from Thuban.UI.mainwindow import main_menu, ID_CANCEL
+from Thuban.UI.mainwindow import main_menu
 
 from Thuban.Model.classification import ClassGroupSingleton, \
                                         ClassGroupRange, \