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

[scm-commit@wald.intevation.org]

Author: dpinte
Date: 2006-10-03 11:34:51 +0200 (Tue, 03 Oct 2006)
New Revision: 2709

Modified:
   trunk/thuban/ChangeLog
   trunk/thuban/Thuban/UI/classgen.py
   trunk/thuban/Thuban/UI/selection.py
   trunk/thuban/Thuban/UI/view.py
Log:
2006-09-28 Didrik Pinte <dpinte at itae.be>

       * Thuban/UI/classgen.py: bugfix due to wx2.6 update

       * Thuban/UI/view.py: removed non needed declaration

       * Thuban/UI/selection.py : typo correction



Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog	2006-09-24 20:01:23 UTC (rev 2708)
+++ trunk/thuban/ChangeLog	2006-10-03 09:34:51 UTC (rev 2709)
@@ -1,3 +1,11 @@
+2006-09-28 Didrik Pinte <dpinte at itae.be>
+
+	* Thuban/UI/classgen.py: bugfix due to wx2.6 update
+
+	* Thuban/UI/view.py: removed non needed declaration
+
+	* Thuban/UI/selection.py : typo correction
+
 2006-09-24 Bernhard Reiter <bernhard at intevation.de>
 
 	* Thuban/Model/proj.py(_do_we_have_to_work_around_broken_proj): 

Modified: trunk/thuban/Thuban/UI/classgen.py
===================================================================
--- trunk/thuban/Thuban/UI/classgen.py	2006-09-24 20:01:23 UTC (rev 2708)
+++ trunk/thuban/Thuban/UI/classgen.py	2006-10-03 09:34:51 UTC (rev 2709)
@@ -191,8 +191,8 @@
 
         self.Bind(wx.EVT_CHOICE, self._OnGenTypeSelect, id=ID_CLASSGEN_GENCOMBO)
         self.Bind(wx.EVT_CHOICE, self._OnPropTypeSelect, id=ID_CLASSGEN_PROPCOMBO)
-        self.Bind(wx.EVT_BUTTON, self.OnOK, self, id=wx.ID_OK)
-        self.Bind(wx.EVT_BUTTON, self.OnCancel, self, id=wx.ID_CANCEL)
+        self.Bind(wx.EVT_BUTTON, self.OnOK, self.genButton)
+        self.Bind(wx.EVT_BUTTON, self.OnCancel, self.cancelButton)
 
         self.__DoOnGenTypeSelect()
 

Modified: trunk/thuban/Thuban/UI/selection.py
===================================================================
--- trunk/thuban/Thuban/UI/selection.py	2006-09-24 20:01:23 UTC (rev 2708)
+++ trunk/thuban/Thuban/UI/selection.py	2006-10-03 09:34:51 UTC (rev 2709)
@@ -53,7 +53,7 @@
     def issue_messages(self, issue_layer, issue_shape):
         """Internal: Issue SHAPES_SELECTED and LAYER_SELECTED messages
 
-        If the issue_layer argument is true, ussue a LAYER_SELECTED
+        If the issue_layer argument is true, issue a LAYER_SELECTED
         message. If issue_shape is true issue a SHAPES_SELECTED message.
         """
         if issue_layer:

Modified: trunk/thuban/Thuban/UI/view.py
===================================================================
--- trunk/thuban/Thuban/UI/view.py	2006-09-24 20:01:23 UTC (rev 2708)
+++ trunk/thuban/Thuban/UI/view.py	2006-10-03 09:34:51 UTC (rev 2709)
@@ -434,7 +434,6 @@
         determine the shape at the position, run the label dialog and
         unless the user cancels the dialog, add a label.
         """
-        label_layer = self.map.LabelLayer()
         layer, shape_index = self.find_shape_at(x, y, select_labels = 1)
         if layer is None and shape_index is not None:
             ViewPort.LabelShapeAt(self, x, y)
@@ -443,3 +442,5 @@
                                                 layer.ShapeStore().Table(),
                                                 shape_index)
             ViewPort.LabelShapeAt(self, x, y, text)
+
+