dabo Commit
Revision 2726
Date: 2007-01-19 13:38:35 -0800 (Fri, 19 Jan 2007)
Author: Paul

Changed:
U   branches/stable/dabo/ui/uiwx/dMenu.py
U   trunk/dabo/ui/uiwx/dMenu.py

Log:
Removed the unneeded RemoveItem_28() method.


Diff:
Modified: branches/stable/dabo/ui/uiwx/dMenu.py
===================================================================
--- branches/stable/dabo/ui/uiwx/dMenu.py       2007-01-19 21:10:11 UTC (rev 
2725)
+++ branches/stable/dabo/ui/uiwx/dMenu.py       2007-01-19 21:38:35 UTC (rev 
2726)
@@ -215,14 +215,6 @@
                return item
                
                
-       def RemoveItem_28(self, item):
-               # Needed to keep dPemMixin mixed-in in wxPython 2.8
-               val = wx.Menu.RemoveItem(self, item)
-               item.this.own(val.this.own())
-               val.this.disown()
-               return item
-       
-
        def remove(self, index, release=True):
                """Removes the item at the specified index from the menu.
 
@@ -236,7 +228,10 @@
                        del self._daboChildren[id_]
 
                if wx.VERSION[0] == 2 and wx.VERSION[1] >= 7:
-                       item = self.RemoveItem_28(item)
+                       # Needed to keep dPemMixin mixed-in in wxPython 2.8
+                       val = wx.Menu.RemoveItem(self, item)
+                       item.this.own(val.this.own())
+                       val.this.disown()
                else:
                        self.RemoveItem(item)
 

Modified: trunk/dabo/ui/uiwx/dMenu.py
===================================================================
--- trunk/dabo/ui/uiwx/dMenu.py 2007-01-19 21:10:11 UTC (rev 2725)
+++ trunk/dabo/ui/uiwx/dMenu.py 2007-01-19 21:38:35 UTC (rev 2726)
@@ -233,14 +233,6 @@
                return item
                
                
-       def RemoveItem_28(self, item):
-               # Needed to keep dPemMixin mixed-in in wxPython 2.8
-               val = wx.Menu.RemoveItem(self, item)
-               item.this.own(val.this.own())
-               val.this.disown()
-               return item
-       
-
        def remove(self, index, release=True):
                """Removes the item at the specified index from the menu.
 
@@ -254,7 +246,10 @@
                        del self._daboChildren[id_]
 
                if wx.VERSION[0] == 2 and wx.VERSION[1] >= 7:
-                       item = self.RemoveItem_28(item)
+                       # Needed to keep dPemMixin mixed-in in wxPython 2.8
+                       val = wx.Menu.RemoveItem(self, item)
+                       item.this.own(val.this.own())
+                       val.this.disown()
                else:
                        self.RemoveItem(item)
 




_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev

Reply via email to