dabo Commit
Revision 4440
Date: 2008-08-22 12:58:12 -0700 (Fri, 22 Aug 2008)
Author: Nate
Trac: http://svn.dabodev.com/trac/dabo/changeset/4440

Changed:
U   trunk/dabo/dEvents.py

Log:
Updated dEvents to include the name change.  Also, redid the PageChanged and 
PageChanging events to catch attribute errors if DPageFrame isn't imported.

Diff:
Modified: trunk/dabo/dEvents.py
===================================================================
--- trunk/dabo/dEvents.py       2008-08-22 19:47:03 UTC (rev 4439)
+++ trunk/dabo/dEvents.py       2008-08-22 19:58:12 UTC (rev 4440)
@@ -5,7 +5,6 @@
 import dabo.ui as ui
 from dabo.dLocalize import _
 
-
 class dEvent(dObject):
        """ Base class for Dabo events.
 
@@ -454,30 +453,38 @@
 class PageChanged(dEvent):
        """Occurs when a page in a pageframe-like control changes"""
        def appliesToClass(eventClass, objectClass):
-               return issubclass(objectClass, (dabo.ui.dPageFrame, 
dabo.ui.dPageList,
-                               dabo.ui.dPageSelect, dabo.ui.dPageFrameNoTabs, 
dabo.ui.dAdvancedPageFrame))
+               try:
+                       return issubclass(objectClass, (dabo.ui.dPageFrame, 
dabo.ui.dPageList,
+                                       dabo.ui.dPageSelect, 
dabo.ui.dPageFrameNoTabs, dabo.ui.DPageFrame))
+               except AttributeError:
+                       return issubclass(objectClass, (dabo.ui.dPageFrame, 
dabo.ui.dPageList,
+                                       dabo.ui.dPageSelect, 
dabo.ui.dPageFrameNoTabs))
        appliesToClass = classmethod(appliesToClass)
 
 
 class PageChanging(dEvent):
        """Occurs when the current page in a pageframe-like control is about to 
change"""
        def appliesToClass(eventClass, objectClass):
-               return issubclass(objectClass, (dabo.ui.dPageFrame, 
dabo.ui.dPageList,
-                               dabo.ui.dPageSelect, dabo.ui.dPageFrameNoTabs, 
dabo.ui.dAdvancedPageFrame))
+               try:
+                       return issubclass(objectClass, (dabo.ui.dPageFrame, 
dabo.ui.dPageList,
+                                       dabo.ui.dPageSelect, 
dabo.ui.dPageFrameNoTabs, dabo.ui.DPageFrame))
+               except AttributeError:
+                       return issubclass(objectClass, (dabo.ui.dPageFrame, 
dabo.ui.dPageList,
+                                       dabo.ui.dPageSelect, 
dabo.ui.dPageFrameNoTabs))
        appliesToClass = classmethod(appliesToClass)
 
 
 class PageClosed(dEvent):
        """Occurs when a page in a dPageFrame control is closed"""
        def appliesToClass(eventClass, objectClass):
-               return issubclass(objectClass, dabo.ui.dAdvancedPageFrame)
+               return issubclass(objectClass, dabo.ui.DPageFrame)
        appliesToClass = classmethod(appliesToClass)
 
 
 class PageClosing(dEvent):
        """Occurs when a page in a dPageFrame control is about to close"""
        def appliesToClass(eventClass, objectClass):
-               return issubclass(objectClass, dabo.ui.dAdvancedPageFrame)
+               return issubclass(objectClass, dabo.ui.DPageFrame)
        appliesToClass = classmethod(appliesToClass)
 
 




_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message: http://leafe.com/archives/byMID/[EMAIL PROTECTED]

Reply via email to