menu changes getting ready for dynamic menus

widget/public/nsIMenuListener.h

@@ -56,6 +56,8 @@ class nsIMenuListener : public nsISupports {
      */
     virtual nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent) = 0;
 
+    virtual nsEventStatus MenuConstruct(const nsMenuEvent & aMenuEvent) = 0;
+    virtual nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent) = 0;
 };
 
 #endif // nsIMenuListener_h__

widget/src/gtk/nsMenu.cpp

@@ -327,3 +327,20 @@ nsEventStatus nsMenu::MenuDeselected(const nsMenuEvent & aMenuEvent)
   return nsEventStatus_eIgnore;
 }
 
+//-------------------------------------------------------------------------
+nsEventStatus nsMenu::MenuConstruct(const nsMenuEvent & aMenuEvent)
+{
+  if (nsnull != mListener) {
+    mListener->MenuDeselected(aMenuEvent);
+  }
+  return nsEventStatus_eIgnore;
+}
+
+//-------------------------------------------------------------------------
+nsEventStatus nsMenu::MenuDestruct(const nsMenuEvent & aMenuEvent)
+{
+  if (nsnull != mListener) {
+    mListener->MenuDeselected(aMenuEvent);
+  }
+  return nsEventStatus_eIgnore;
+}

widget/src/gtk/nsMenu.h

@@ -42,6 +42,8 @@ public:
   // nsIMenuListener methods
   nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent); 
   nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent); 
+  nsEventStatus MenuConstruct(const nsMenuEvent & aMenuEvent); 
+  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent); 
   
   NS_IMETHOD Create(nsISupports * aParent, const nsString &aLabel);
 

widget/src/gtk/nsMenuBar.cpp

@@ -207,3 +207,12 @@ nsEventStatus nsMenuBar::MenuDeselected(const nsMenuEvent & aMenuEvent)
   return nsEventStatus_eIgnore;
 }
 
+nsEventStatus nsMenuBar::MenuConstruct(const nsMenuEvent & aMenuEvent)
+{
+  return nsEventStatus_eIgnore;
+}
+
+nsEventStatus nsMenuBar::MenuDestruct(const nsMenuEvent & aMenuEvent)
+{
+  return nsEventStatus_eIgnore;
+}

widget/src/gtk/nsMenuBar.h

@@ -39,6 +39,8 @@ public:
   // nsIMenuListener interface
   nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
   nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuConstruct(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
   
   NS_DECL_ISUPPORTS
 

widget/src/gtk/nsMenuItem.cpp

@@ -336,3 +336,14 @@ nsEventStatus nsMenuItem::MenuDeselected(const nsMenuEvent & aMenuEvent)
   return nsEventStatus_eIgnore;
 }
 
+nsEventStatus nsMenuItem::MenuConstruct(const nsMenuEvent & aMenuEvent)
+{
+  g_print("nsMenuItem::MenuConstruct\n");
+  return nsEventStatus_eIgnore;
+}
+
+nsEventStatus nsMenuItem::MenuDestruct(const nsMenuEvent & aMenuEvent)
+{
+  g_print("nsMenuItem::MenuDestruct\n");
+  return nsEventStatus_eIgnore;
+}

widget/src/gtk/nsMenuItem.h

@@ -68,7 +68,8 @@ public:
   // nsIMenuListener interface
   nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
   nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent);
-  
+  nsEventStatus MenuConstruct(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
  
 protected:
   void Create(nsIWidget * aMBParent, GtkWidget *aParent,

widget/src/mac/nsMenu.cpp

@@ -380,3 +380,14 @@ nsEventStatus nsMenu::MenuDeselected(const nsMenuEvent & aMenuEvent)
   return nsEventStatus_eIgnore;
 }
 
+//-------------------------------------------------------------------------
+nsEventStatus nsMenu::MenuConstruct(const nsMenuEvent & aMenuEvent)
+{
+  return nsEventStatus_eIgnore;
+}
+
+//-------------------------------------------------------------------------
+nsEventStatus nsMenu::MenuDestruct(const nsMenuEvent & aMenuEvent)
+{
+  return nsEventStatus_eIgnore;
+}

widget/src/mac/nsMenu.h

@@ -40,6 +40,8 @@ public:
   // nsIMenuListener methods
   nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent); 
   nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent); 
+  nsEventStatus MenuConstruct(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
   
   // nsIMenu Methods
   NS_IMETHOD Create(nsISupports * aParent, const nsString &aLabel);

widget/src/mac/nsMenuBar.cpp

@@ -95,6 +95,18 @@ nsEventStatus nsMenuBar::MenuDeselected(const nsMenuEvent & aMenuEvent)
   return nsEventStatus_eIgnore;
 }
 
+//-------------------------------------------------------------------------
+nsEventStatus nsMenuBar::MenuConstruct(const nsMenuEvent & aMenuEvent)
+{
+  return nsEventStatus_eIgnore;
+}
+
+//-------------------------------------------------------------------------
+nsEventStatus nsMenuBar::MenuDestruct(const nsMenuEvent & aMenuEvent)
+{
+  return nsEventStatus_eIgnore;
+}
+
 //-------------------------------------------------------------------------
 //
 // nsMenuBar constructor

widget/src/mac/nsMenuBar.h

@@ -38,6 +38,8 @@ public:
   // nsIMenuListener interface
   nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
   nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuConstruct(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
   
   nsMenuBar();
   virtual ~nsMenuBar();

widget/src/mac/nsMenuItem.cpp

@@ -350,3 +350,12 @@ nsEventStatus nsMenuItem::MenuDeselected(const nsMenuEvent & aMenuEvent)
   	return nsEventStatus_eIgnore;
 }
 
+nsEventStatus nsMenuItem::MenuConstruct(const nsMenuEvent & aMenuEvent)
+{
+  	return nsEventStatus_eIgnore;
+}
+
+nsEventStatus nsMenuItem::MenuDestruct(const nsMenuEvent & aMenuEvent)
+{
+  	return nsEventStatus_eIgnore;
+}

widget/src/mac/nsMenuItem.h

@@ -69,7 +69,8 @@ public:
   // nsIMenuListener interface
   nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
   nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent);
-  
+  nsEventStatus MenuConstruct(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
  
 protected:
   //void Create(nsIWidget * aMBParent, Widget aParent,

xpfe/appshell/src/nsXULCommand.cpp

@@ -212,3 +212,14 @@ nsEventStatus nsXULCommand::MenuDeselected(const nsMenuEvent & aMenuEvent)
   return nsEventStatus_eConsumeNoDefault;
 }
 
+nsEventStatus nsXULCommand::MenuConstruct(const nsMenuEvent & aMenuEvent)
+{
+  DoCommand();
+  return nsEventStatus_eConsumeNoDefault;
+}
+
+nsEventStatus nsXULCommand::MenuDestruct(const nsMenuEvent & aMenuEvent)
+{
+  DoCommand();
+  return nsEventStatus_eConsumeNoDefault;
+}

xpfe/appshell/src/nsXULCommand.h

@@ -59,7 +59,9 @@ public:
   // nsIMenuListener 
   virtual nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
   virtual nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent) ;
-
+  virtual nsEventStatus MenuConstruct(const nsMenuEvent & aMenuEvent);
+  virtual nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
+  
 protected:
   NS_IMETHOD ExecuteJavaScriptString(nsIWebShell* aWebShell, nsString& aJavaScript);