First Checked In.

git-svn-id: svn://10.0.0.236/trunk@12449 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/widget/src/mac/nsMenu.cpp

@@ -0,0 +1,244 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsMenu.h"
+#include "nsIMenu.h"
+#include "nsIMenuBar.h"
+
+#include "nsString.h"
+#include "nsStringUtil.h"
+
+//#include <Xm/CascadeBG.h>
+//#include <Xm/SeparatoG.h>
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kMenuIID, NS_IMENU_IID);
+NS_IMPL_ISUPPORTS(nsMenu, kMenuIID)
+
+//-------------------------------------------------------------------------
+//
+// nsMenu constructor
+//
+//-------------------------------------------------------------------------
+nsMenu::nsMenu() : nsIMenu()
+{
+  NS_INIT_REFCNT();
+  mNumMenuItems  = 0;
+  //mMenu          = nsnull;
+  mMenuParent    = nsnull;
+  mMenuBarParent = nsnull;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsMenu destructor
+//
+//-------------------------------------------------------------------------
+nsMenu::~nsMenu()
+{
+  NS_IF_RELEASE(mMenuBarParent);
+  NS_IF_RELEASE(mMenuParent);
+}
+
+#ifdef MOTIF
+//-------------------------------------------------------------------------
+//
+// Create the proper widget
+//
+//-------------------------------------------------------------------------
+void nsMenu::Create(Widget aParent, const nsString &aLabel)
+{
+  if (NULL == aParent) {
+    return;
+  }
+  mLabel = aLabel;
+
+  char * labelStr = mLabel.ToNewCString();
+
+  char wName[512];
+
+  sprintf(wName, "__pulldown_%s", labelStr);
+  mMenu = XmCreatePulldownMenu(aParent, wName, NULL, 0);
+
+  Widget casBtn;
+  XmString str;
+
+  str = XmStringCreateLocalized(labelStr);
+  casBtn = XtVaCreateManagedWidget(labelStr,
+                                   xmCascadeButtonGadgetClass, aParent,
+                                   XmNsubMenuId, mMenu,
+                                   XmNlabelString, str,
+                                   NULL);
+  XmStringFree(str);
+
+
+  delete[] labelStr;
+}
+
+
+//-------------------------------------------------------------------------
+Widget nsMenu::GetNativeParent()
+{
+
+  void * voidData; 
+  if (nsnull != mMenuParent) {
+    mMenuParent->GetNativeData(voidData);
+  } else if (nsnull != mMenuBarParent) {
+    mMenuBarParent->GetNativeData(voidData);
+  } else {
+    return NULL;
+  }
+  return (Widget)voidData;
+
+}
+
+#endif
+
+//-------------------------------------------------------------------------
+//
+// Create the proper widget
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::Create(nsIMenuBar *aParent, const nsString &aLabel)
+{
+  mMenuBarParent = aParent;
+  NS_ADDREF(mMenuBarParent);
+
+  //Create(GetNativeParent(), aLabel);
+
+
+  aParent->AddMenu(this);
+    
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::Create(nsIMenu *aParent, const nsString &aLabel)
+{
+  mMenuParent = aParent;
+  NS_ADDREF(mMenuParent);
+
+  //Create(GetNativeParent(), aLabel);
+  aParent->AddMenu(this);
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::GetParent(nsISupports*& aParent)
+{
+
+  aParent = nsnull;
+  if (nsnull != mMenuParent) {
+    return mMenuParent->QueryInterface(kISupportsIID,(void**)&aParent);
+  } else if (nsnull != mMenuBarParent) {
+    return mMenuBarParent->QueryInterface(kISupportsIID,(void**)&aParent);
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::GetLabel(nsString &aText)
+{
+  aText = mLabel;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::AddItem(const nsString &aText)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::AddItem(nsIMenuItem * aMenuItem)
+{
+  // XXX add aMenuItem to internal data structor list
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::AddMenu(nsIMenu * aMenu)
+{
+
+  // XXX add aMenu to internal data structor list
+
+  return NS_OK;
+
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::AddSeparator() 
+{
+
+  //Widget widget = XtVaCreateManagedWidget("__sep", xmSeparatorGadgetClass, mMenu, NULL);
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::GetItemCount(PRUint32 &aCount)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::GetItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::InsertItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::InsertItemAt(const PRUint32 aCount, const nsString & aMenuItemName)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::InsertSeparator(const PRUint32 aCount)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::RemoveItem(const PRUint32 aCount)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::RemoveAll()
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenu::GetNativeData(void *& aData)
+{
+  //aData = (void *)mMenu;
+  return NS_OK;
+}
+

mozilla/widget/src/mac/nsMenu.h

@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsMenu_h__
+#define nsMenu_h__
+
+#include "nsIMenu.h"
+
+class nsIMenuBar;
+
+/**
+ * Native Motif Menu wrapper
+ */
+
+class nsMenu : public nsIMenu
+{
+
+public:
+  nsMenu();
+  virtual ~nsMenu();
+
+  NS_DECL_ISUPPORTS
+  
+  NS_IMETHOD Create(nsIMenuBar * aParent, const nsString &aLabel);
+  NS_IMETHOD Create(nsIMenu * aParent, const nsString &aLabel);
+
+  // nsIMenu Methods
+  NS_IMETHOD GetParent(nsISupports *&aParent);
+  NS_IMETHOD GetLabel(nsString &aText);
+  NS_IMETHOD AddItem(const nsString &aText);
+  NS_IMETHOD AddItem(nsIMenuItem * aMenuItem);
+  NS_IMETHOD AddMenu(nsIMenu * aMenu);
+  NS_IMETHOD AddSeparator();
+  NS_IMETHOD GetItemCount(PRUint32 &aCount);
+  NS_IMETHOD GetItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem);
+  NS_IMETHOD InsertItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem);
+  NS_IMETHOD InsertItemAt(const PRUint32 aCount, const nsString & aMenuItemName);
+  NS_IMETHOD InsertSeparator(const PRUint32 aCount);
+  NS_IMETHOD RemoveItem(const PRUint32 aCount);
+  NS_IMETHOD RemoveAll();
+  NS_IMETHOD GetNativeData(void*& aData);
+
+protected:
+  //void   Create(Widget aParent, const nsString &aLabel);
+ //Widget GetNativeParent();
+
+  nsString     mLabel;
+  PRUint32     mNumMenuItems;
+  //Widget       mMenu;
+
+  nsIMenu    * mMenuParent;
+  nsIMenuBar * mMenuBarParent;
+
+};
+
+#endif // nsMenu_h__

mozilla/widget/src/mac/nsMenuBar.cpp

@@ -0,0 +1,129 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsMenuBar.h"
+#include "nsIMenu.h"
+#include "nsIWidget.h"
+
+#include "nsString.h"
+#include "nsStringUtil.h"
+
+static NS_DEFINE_IID(kMenuBarIID, NS_IMENUBAR_IID);
+NS_IMPL_ISUPPORTS(nsMenuBar, kMenuBarIID)
+
+
+//-------------------------------------------------------------------------
+//
+// nsMenuBar constructor
+//
+//-------------------------------------------------------------------------
+nsMenuBar::nsMenuBar() : nsIMenuBar()
+{
+  NS_INIT_REFCNT();
+  mNumMenus = 0;
+  //mMenu     = nsnull;
+  mParent   = nsnull;
+  mIsMenuBarAdded = PR_FALSE;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsMenuBar destructor
+//
+//-------------------------------------------------------------------------
+nsMenuBar::~nsMenuBar()
+{
+  NS_IF_RELEASE(mParent);
+}
+
+//-------------------------------------------------------------------------
+//
+// Create the proper widget
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuBar::Create(nsIWidget *aParent)
+{
+  mParent = aParent;
+  NS_ADDREF(mParent);
+
+  //Widget parentWidget = (Widget)mParent->GetNativeData(NS_NATIVE_WIDGET);
+
+  //Widget mainWindow = XtParent(parentWidget);
+
+  //mMenu = XmCreateMenuBar(mainWindow, "menubar", nsnull, 0);
+  //XtManageChild(mMenu);
+
+  return NS_OK;
+
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuBar::GetParent(nsIWidget *&aParent)
+{
+
+  aParent = mParent;
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuBar::AddMenu(nsIMenu * aMenu)
+{
+
+  // XXX add to internal data structure
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuBar::GetMenuCount(PRUint32 &aCount)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuBar::GetMenuAt(const PRUint32 aCount, nsIMenu *& aMenu)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuBar::InsertMenuAt(const PRUint32 aCount, nsIMenu *& aMenu)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuBar::RemoveMenu(const PRUint32 aCount)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuBar::RemoveAll()
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuBar::GetNativeData(void *& aData)
+{
+  //aData = (void *)mMenu;
+  return NS_OK;
+}
+

mozilla/widget/src/mac/nsMenuBar.h

@@ -0,0 +1,62 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsMenuBar_h__
+#define nsMenuBar_h__
+
+#include "nsIMenuBar.h"
+
+class nsIWidget;
+
+/**
+ * Native Motif MenuBar wrapper
+ */
+
+class nsMenuBar : public nsIMenuBar
+{
+
+public:
+  nsMenuBar();
+  virtual ~nsMenuBar();
+
+  NS_DECL_ISUPPORTS
+
+  
+  NS_IMETHOD Create(nsIWidget * aParent);
+
+  // nsIMenuBar Methods
+  NS_IMETHOD GetParent(nsIWidget *&aParent);
+  NS_IMETHOD AddMenu(nsIMenu * aMenu);
+  NS_IMETHOD GetMenuCount(PRUint32 &aCount);
+  NS_IMETHOD GetMenuAt(const PRUint32 aCount, nsIMenu *& aMenu);
+  NS_IMETHOD InsertMenuAt(const PRUint32 aCount, nsIMenu *& aMenu);
+  NS_IMETHOD RemoveMenu(const PRUint32 aCount);
+  NS_IMETHOD RemoveAll();
+  NS_IMETHOD GetNativeData(void*& aData);
+
+protected:
+  PRUint32    mNumMenus;
+  //Widget      mMenu;
+  nsIWidget * mParent;
+
+  PRBool      mIsMenuBarAdded;
+
+};
+
+#endif // nsMenuBar_h__
+

mozilla/widget/src/mac/nsMenuItem.cpp

@@ -0,0 +1,225 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsMenuItem.h"
+#include "nsIMenu.h"
+#include "nsIMenuBar.h"
+#include "nsIWidget.h"
+
+#include "nsStringUtil.h"
+
+#include "nsIPopUpMenu.h"
+
+static NS_DEFINE_IID(kIMenuIID,     NS_IMENU_IID);
+static NS_DEFINE_IID(kIMenuBarIID,  NS_IMENUBAR_IID);
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kIPopUpMenuIID, NS_IPOPUPMENU_IID);
+static NS_DEFINE_IID(kIMenuItemIID, NS_IMENUITEM_IID);
+NS_IMPL_ISUPPORTS(nsMenuItem, kIMenuItemIID)
+
+
+//-------------------------------------------------------------------------
+//
+// nsMenuItem constructor
+//
+//-------------------------------------------------------------------------
+nsMenuItem::nsMenuItem() : nsIMenuItem()
+{
+  NS_INIT_REFCNT();
+  //mMenu        = nsnull;
+  mMenuParent  = nsnull;
+  mPopUpParent = nsnull;
+  mTarget      = nsnull;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsMenuItem destructor
+//
+//-------------------------------------------------------------------------
+nsMenuItem::~nsMenuItem()
+{
+  NS_IF_RELEASE(mMenuParent);
+  NS_IF_RELEASE(mPopUpParent);
+  NS_IF_RELEASE(mTarget);
+}
+
+#ifdef NOTNOW
+//-------------------------------------------------------------------------
+void nsMenuItem::Create(nsIWidget      *aMBParent, 
+                        Widget          aParent, 
+                        const nsString &aLabel, 
+                        PRUint32        aCommand)
+{
+  mTarget  = aMBParent;
+  mCommand = aCommand;
+  mLabel   = aLabel;
+
+  if (NULL == aParent || nsnull == aMBParent) {
+    return;
+  }
+
+  mTarget = aMBParent;
+  char * nameStr = mLabel.ToNewCString();
+
+  Widget parentMenuHandle = GetNativeParent();
+
+  mMenu = XtVaCreateManagedWidget(nameStr, xmCascadeButtonGadgetClass,
+                                          parentMenuHandle,
+                                          NULL);
+
+  XtAddCallback(mMenu, XmNactivateCallback, nsXtWidget_Menu_Callback, 
+                (nsIMenuItem *)this);
+
+  delete[] nameStr;
+
+}
+//-------------------------------------------------------------------------
+Widget nsMenuItem::GetNativeParent()
+{
+
+  void * voidData;
+  if (nsnull != mMenuParent) {
+    mMenuParent->GetNativeData(voidData);
+  } else if (nsnull != mPopUpParent) {
+    mPopUpParent->GetNativeData(voidData);
+  } else {
+    return NULL;
+  }
+  return (Widget)voidData;
+
+}
+
+#endif
+
+//-------------------------------------------------------------------------
+nsIWidget * nsMenuItem::GetMenuBarParent(nsISupports * aParent)
+{
+  nsIWidget    * widget  = nsnull; // MenuBar's Parent
+  nsIMenu      * menu    = nsnull;
+  nsIMenuBar   * menuBar = nsnull;
+  nsIPopUpMenu * popup   = nsnull;
+  nsISupports  * parent  = aParent;
+
+/*
+  while (1) {
+    if (NS_OK == parent->QueryInterface(kIMenuIID,(void**)&menu)) {
+      NS_RELEASE(parent);
+      if (NS_OK != menu->GetParent(parent)) {
+        NS_RELEASE(menu);
+        return nsnull;
+      }
+      NS_RELEASE(menu);
+
+    } else if (NS_OK == parent->QueryInterface(kIPopUpMenuIID,(void**)&popup)) {
+      if (NS_OK != popup->GetParent(widget)) {
+        widget =  nsnull;
+      } 
+      NS_RELEASE(parent);
+      NS_RELEASE(popup);
+      return widget;
+
+    } else if (NS_OK == parent->QueryInterface(kIMenuBarIID,(void**)&menuBar)) {
+      if (NS_OK != menuBar->GetParent(widget)) {
+        widget =  nsnull;
+      } 
+      NS_RELEASE(parent);
+      NS_RELEASE(menuBar);
+      return widget;
+    } else {
+      NS_RELEASE(parent);
+      return nsnull;
+    }
+  }
+  */
+  return nsnull;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuItem::Create(nsIMenu        *aParent, 
+                             const nsString &aLabel, 
+                             PRUint32       aCommand)
+                            
+{
+  if (nsnull == aParent) {
+    return NS_ERROR_FAILURE;
+  }
+
+  mMenuParent = aParent;
+  NS_ADDREF(mMenuParent);
+
+  nsIWidget   * widget  = nsnull; // MenuBar's Parent
+  nsISupports * sups;
+  if (NS_OK == aParent->QueryInterface(kISupportsIID,(void**)&sups)) {
+    widget = GetMenuBarParent(sups);
+    NS_RELEASE(sups);
+  }
+
+ // Create(widget, GetNativeParent(), aLabel, aCommand);
+  aParent->AddItem(this);
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuItem::Create(nsIPopUpMenu   *aParent, 
+                             const nsString &aLabel,  
+                             PRUint32        aCommand)
+{
+  mPopUpParent = aParent;
+  NS_ADDREF(mPopUpParent);
+
+  nsIWidget * widget = nsnull;
+  /*if (NS_OK != aParent->GetParent(widget)) {
+    widget = nsnull;
+  }*/
+
+  //Create(widget, GetNativeParent(), aLabel, aCommand);
+  aParent->AddItem(this);
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuItem::GetLabel(nsString &aText)
+{
+  aText = mLabel;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuItem::GetCommand(PRUint32 & aCommand)
+{
+  aCommand = mCommand;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuItem::GetTarget(nsIWidget *& aTarget)
+{
+  aTarget = mTarget;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsMenuItem::GetNativeData(void *& aData)
+{
+  //aData = (void *)mMenu;
+  return NS_OK;
+}
+

mozilla/widget/src/mac/nsMenuItem.h

@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsMenuItem_h__
+#define nsMenuItem_h__
+
+
+#include "nsIMenuItem.h"
+#include "nsString.h"
+
+class nsIMenu;
+class nsIPopUpMenu;
+class nsIWidget;
+
+/**
+ * Native Motif MenuItem wrapper
+ */
+
+class nsMenuItem : public nsIMenuItem
+{
+
+public:
+  nsMenuItem();
+  virtual ~nsMenuItem();
+
+  // nsISupports
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD Create(nsIMenu        *aParent, 
+                    const nsString &aLabel,  
+                    PRUint32        aCommand);
+
+  NS_IMETHOD Create(nsIPopUpMenu   *aParent, 
+                    const nsString &aLabel, 
+                    PRUint32        aCommand) ;
+
+  // nsIMenuBar Methods
+  NS_IMETHOD GetLabel(nsString &aText);
+  NS_IMETHOD GetCommand(PRUint32 & aCommand);
+  NS_IMETHOD GetTarget(nsIWidget *& aTarget);
+  NS_IMETHOD GetNativeData(void*& aData);
+
+
+protected:
+  //void Create(nsIWidget * aMBParent, Widget aParent,
+              //const nsString &aLabel, PRUint32 aCommand);
+  nsIWidget * GetMenuBarParent(nsISupports * aParentSupports);
+  //Widget GetNativeParent();
+
+  nsString   mLabel;
+  PRUint32   mCommand;
+
+  nsIMenu      * mMenuParent;
+  nsIPopUpMenu * mPopUpParent;
+  nsIWidget    * mTarget;
+
+  //Widget mMenu; // native cascade widget
+
+};
+
+#endif // nsMenuItem_h__