[Nvda-dev] commit r3510 - trunk/source/appModules

[NVDA Subversion]

Author: bzr
Date: Wed Feb  3 09:40:07 2010
New Revision: 3510

Log:
logonui app module:
	* Overlay the new behaviors.Dialog class instead of using __class__.
	* Restrict the check for the button that signals a pop-up message such that there must be no next object. Fixes the issue where the "Switch user" button in the secure logon dialog caused the dialog to spuriously read.


Modified:
   trunk/source/appModules/logonui.py

Modified: trunk/source/appModules/logonui.py
==============================================================================
--- trunk/source/appModules/logonui.py	(original)
+++ trunk/source/appModules/logonui.py	Wed Feb  3 09:40:07 2010
@@ -3,7 +3,8 @@
 import api
 import braille
 import controlTypes
-from NVDAObjects.IAccessible import IAccessible, Dialog
+from NVDAObjects.IAccessible import IAccessible
+from NVDAObjects.behaviors import Dialog
 import _default
 
 class LogonDialog(Dialog):
@@ -46,7 +47,7 @@
 			# Make sure the top level pane is always presented.
 			obj.isPresentableFocusAncestor = True
 			if obj.windowClassName=="AUTHUI.DLL: LogonUI Logon Window":
-				obj.__class__=LogonDialog
+				self.overlayCustomNVDAObjectClass(obj, LogonDialog, outerMost=True)
 			return
 
 		if obj.windowClassName == "Edit" and not obj.name:
@@ -57,7 +58,7 @@
 				return
 
 	def event_gainFocus(self,obj,nextHandler):
-		if obj.windowClassName=="DirectUIHWND" and obj.role==controlTypes.ROLE_BUTTON:
+		if obj.windowClassName=="DirectUIHWND" and obj.role==controlTypes.ROLE_BUTTON and not obj.next:
 			prev=obj.previous
 			if prev and prev.role==controlTypes.ROLE_STATICTEXT:
 				# This is for a popup message in the logon dialog.