fix win32 compiler errors (can't do (nsnull != foop) where foop is a nsCOMPtr, which is fine by me) and fix command hookup code to actually work for multiple toolbars. I dunno what I was smoking with the last checkin.

xpfe/appshell/src/nsWebShellWindow.cpp

@@ -422,10 +422,10 @@ void nsWebShellWindow::LoadCommands(nsIWebShell * aWebShell, nsIDOMDocument * aD
   // load up commands
   int endCount = 0;
   nsCOMPtr<nsIDOMNode> parentCmd ( dont_AddRef(FindNamedDOMNode(nsAutoString("commands"), window, endCount, 1)) );
-  if (nsnull != parentCmd) {
+  if ( parentCmd ) {
     nsCOMPtr<nsIDOMNode> node;
     parentCmd->GetFirstChild(getter_AddRefs(node));
-    while (nsnull != node) {
+    while ( node ) {
       nsString value;
       nsString nodeType;
       nsString name;
@@ -455,15 +455,14 @@ void nsWebShellWindow::LoadCommands(nsIWebShell * aWebShell, nsIDOMDocument * aD
   }
 
   // Now install the commands onto the Toolbar GUI Nodes for each toolbar in the toolbox
-  PRUint32 count = 1;
+  int count = 1;
-  nsCOMPtr<nsIDOMNode> toolbar;
+  endCount = 0;
-  do {
+  nsCOMPtr<nsIDOMNode> toolbar ( dont_AddRef(FindNamedDOMNode(nsAutoString("toolbar"), window, endCount, count)) ); 
-	  toolbar = dont_AddRef(FindNamedDOMNode(nsAutoString("toolbar"), window, endCount, count)); 
+  while ( toolbar ) {
-	  if (nsnull != toolbar) {
     nsAutoString cmdAtom("cmd");
     nsCOMPtr<nsIDOMNode> node;
     toolbar->GetFirstChild(getter_AddRefs(node));
-	    while (nsnull != node) {
+    while ( node ) {
       nsAutoString value;
       nsString nodeCmd;
       nsCOMPtr<nsIDOMElement> element ( node );
@@ -502,11 +501,12 @@ void nsWebShellWindow::LoadCommands(nsIWebShell * aWebShell, nsIDOMDocument * aD
       oldNode->GetNextSibling(getter_AddRefs(node));
     }
 
-	  }
+	// find the next toolbar
-	  
+    endCount = 0;
+    toolbar = dont_AddRef(FindNamedDOMNode(nsAutoString("toolbar"), window, endCount, count)); 
     ++count;
 	  
-  } while ( toolbar ) ;
+  } // for each toolbar
   
   /*PRInt32 i, n = mCommands.Count();
   for (i = 0; i < n; i++) {
@@ -529,7 +529,7 @@ void nsWebShellWindow::LoadMenus(nsIDOMDocument * aDOMDoc, nsIWidget * aParentWi
   nsresult rv;
   int endCount = 0;
   nsCOMPtr<nsIDOMNode> menubarNode ( dont_AddRef(FindNamedDOMNode(nsAutoString("menubar"), window, endCount, 1)) );
-  if (nsnull != menubarNode) {
+  if (menubarNode) {
     nsIMenuBar * pnsMenuBar = nsnull;
     rv = nsRepository::CreateInstance(kMenuBarCID, nsnull, kIMenuBarIID,
             (void**)&pnsMenuBar);