Bug 162917 (carried over from bugscape 19001) - initial focus problems with sheets. Patch by sfraser, r=sdagley, sr=bryner.

widget/src/mac/nsMacEventHandler.cpp

@@ -1344,10 +1344,14 @@ if (KeyDown(0x39))	// press [caps lock] to start the profile
 		PRBool active;
 		mTopLevelWidget->IsActive(&active);
 		nsWindow*	focusedWidget = mTopLevelWidget;
-	  if(!active) {
+		if (!active) {
 		  gEventDispatchHandler.SetActivated(focusedWidget);
 		  mTopLevelWidget->SetIsActive(PR_TRUE);
 		}
+		else if (!gEventDispatchHandler.GetActive()) {
+		  NS_ASSERTION(0, "We think we're active, but there is no active widget!");
+		  gEventDispatchHandler.SetActivated(focusedWidget);
+		}
 		
 		// Twiddle menu bars
 		nsIMenuBar* menuBar = focusedWidget->GetMenuBar();