jan: thuban/Thuban/UI classifier.py,1.64,1.65

[cvs@intevation.de]

Author: jan

Update of /thubanrepository/thuban/Thuban/UI
In directory doto:/tmp/cvs-serv26843

Modified Files:
	classifier.py 
Log Message:
(SelectPropertiesDialog.__GetColor): Now calls the abstract ColorDialog
instead of wxColourDialog.  This also removed the dependency to Color
class conversion from this function.


Index: classifier.py
===================================================================
RCS file: /thubanrepository/thuban/Thuban/UI/classifier.py,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- classifier.py	1 Aug 2003 14:27:57 -0000	1.64
+++ classifier.py	7 May 2004 20:20:43 -0000	1.65
@@ -33,6 +33,7 @@
 from Thuban.Model.data import SHAPETYPE_ARC, SHAPETYPE_POLYGON, SHAPETYPE_POINT
 
 from Thuban.UI.classgen import ClassGenDialog
+from Thuban.UI.colordialog import ColorDialog
 
 from dialogs import NonModalNonParentDialog
 from messages import MAP_REPLACED
@@ -1285,13 +1286,12 @@
         self.previewWin.Refresh()
 
     def __GetColor(self, cur):
-        dialog = wxColourDialog(self)
-        if cur is not Transparent:
-            dialog.GetColourData().SetColour(Color2wxColour(cur))
+        dialog = ColorDialog(self)
+        dialog.SetColor(cur)
 
         ret = None
         if dialog.ShowModal() == wxID_OK:
-            ret = wxColour2Color(dialog.GetColourData().GetColour())
+            ret = dialog.GetColor()
 
         dialog.Destroy()