fixes to get building and linking

widget/src/gtk/nsPopUpMenu.cpp

@@ -0,0 +1,163 @@
+/* -*- 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 "nsPopUpMenu.h"
+#include "nsIPopUpMenu.h"
+#include "nsIMenu.h"
+#include "nsIWidget.h"
+
+#include "nsString.h"
+#include "nsStringUtil.h"
+
+static NS_DEFINE_IID(kPopUpMenuIID, NS_IPOPUPMENU_IID);
+NS_IMPL_ISUPPORTS(nsPopUpMenu, kPopUpMenuIID)
+
+//-------------------------------------------------------------------------
+//
+// nsPopUpMenu constructor
+//
+//-------------------------------------------------------------------------
+nsPopUpMenu::nsPopUpMenu() : nsIPopUpMenu()
+{
+  NS_INIT_REFCNT();
+  mNumMenuItems = 0;
+  mParent       = nsnull;
+  mMenu         = nsnull;
+}
+
+//-------------------------------------------------------------------------
+//
+// nsPopUpMenu destructor
+//
+//-------------------------------------------------------------------------
+nsPopUpMenu::~nsPopUpMenu()
+{
+  NS_IF_RELEASE(mParent);
+}
+
+
+
+//-------------------------------------------------------------------------
+//
+// Create the proper widget
+//
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::Create(nsIWidget *aParent)
+{
+
+  mParent = aParent;
+  NS_ADDREF(mParent);
+
+  GtkWidget *parentWidget = (GtkWidget *) mParent->GetNativeData(NS_NATIVE_WINDOW);
+  /*mMenu = XmCreatePopupMenu(parentWidget, "_popup", NULL, 0); */
+  return NS_OK;
+}
+
+
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::AddItem(const nsString &aText)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::AddItem(nsIMenuItem * aMenuItem)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::AddMenu(nsIMenu * aMenu)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::AddSeparator() 
+{
+#if 0
+  Widget widget = XtVaCreateManagedWidget("__sep", xmSeparatorGadgetClass,
+                                          mMenu,
+                                          NULL);
+#endif
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::GetItemCount(PRUint32 &aCount)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::GetItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::InsertItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::InsertItemAt(const PRUint32 aCount, const nsString & aMenuItemName)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::InsertSeparator(const PRUint32 aCount)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::RemoveItem(const PRUint32 aCount)
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::RemoveAll()
+{
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::ShowMenu(PRInt32 aX, PRInt32 aY)
+{
+
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::GetNativeData(void *& aData)
+{
+  aData = (void *)mMenu;
+  return NS_OK;
+}
+
+//-------------------------------------------------------------------------
+NS_METHOD nsPopUpMenu::GetParent(nsIWidget *& aParent)
+{
+  aParent = mParent;
+  return NS_OK;
+}
+
+

widget/src/gtk/nsPopUpMenu.h

@@ -0,0 +1,67 @@
+/* -*- 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 nsPopUpMenu_h__
+#define nsPopUpMenu_h__
+
+#include "nsIPopUpMenu.h"
+
+#include <gtk/gtk.h>
+
+class nsIWidget;
+
+/**
+ * Native Motif PopUp wrapper
+ */
+
+class nsPopUpMenu : public nsIPopUpMenu
+{
+
+public:
+  nsPopUpMenu();
+  virtual ~nsPopUpMenu();
+
+  NS_DECL_ISUPPORTS
+  
+  NS_IMETHOD Create(nsIWidget * aParent);
+
+  // nsIPopUpMenu Methods
+  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 ShowMenu(PRInt32 aX, PRInt32 aY);
+  NS_IMETHOD GetNativeData(void*& aData);
+  NS_IMETHOD GetParent(nsIWidget*& aParent);
+
+protected:
+
+  PRUint32    mNumMenuItems;
+  nsIWidget  *mParent;
+  GtkWidget  *mMenu;
+};
+
+#endif // nsPopUpMenu_h__
+

widget/src/gtk/nsToolkit.cpp

@@ -82,12 +82,12 @@ NS_METHOD nsToolkit::Init(PRThread *aThread)
   return NS_OK;
 }
 
-void nsToolkit::SetSharedGC(GdkGC aGC)
+void nsToolkit::SetSharedGC(GdkGC *aGC)
 {
   mSharedGC = aGC;
 }
 
-GdkGC nsToolkit::GetSharedGC()
+GdkGC *nsToolkit::GetSharedGC()
 {
   return (mSharedGC);
 }