Minor fixes to various Motif files, mostly cosmetic changes, elimination of some unnecessary headers, and elimination of some deadwood. NOT PART OF BUILD.

widget/src/motif/nsFileWidget.h

@@ -19,8 +19,7 @@
 #ifndef nsFileWidget_h__
 #define nsFileWidget_h__
 
-#include "nsToolkit.h"
-#include "nsIWidget.h"
+//#include "nsIWidget.h"
 #include "nsIFileWidget.h"
 #include "nsWindow.h"
 

widget/src/motif/nsMenu.cpp

@@ -34,7 +34,6 @@
 #include <Xm/CascadeBG.h>
 #include <Xm/SeparatoG.h>
 #include <Xm/RowColumn.h>
-#include <Xm/PushB.h>
 
 static NS_DEFINE_CID(kMenuCID,             NS_MENU_CID);
 static NS_DEFINE_CID(kMenuItemCID,         NS_MENUITEM_CID);
@@ -100,8 +99,8 @@ nsMenu::~nsMenu()
   NS_IF_RELEASE(mListener);
   // Free our menu items
   RemoveAll();
-//  gtk_widget_destroy(mMenu);
-//  mMenu = nsnull;
+  XtDestroyWidget(mMenu);
+  mMenu = nsnull;
 }
 
 //-------------------------------------------------------------------------

widget/src/motif/nsMenuBar.cpp

@@ -16,6 +16,8 @@
  * Reserved.
  */
 
+#include <Xm/RowColumn.h>
+
 #include "nsMenuBar.h"
 #include "nsMenuItem.h"
 #include "nsIComponentManager.h"
@@ -29,10 +31,6 @@
 #include "nsCOMPtr.h"
 #include "nsWidgetsCID.h"
 
-//#include "nsStringUtil.h"
-
-#include <Xm/RowColumn.h>
-
 static NS_DEFINE_CID(kMenuBarCID, NS_MENUBAR_CID);
 static NS_DEFINE_CID(kMenuCID, NS_MENU_CID);
   
@@ -51,16 +49,19 @@ nsresult nsMenuBar::QueryInterface(REFNSIID aIID, void** aInstancePtr)
     NS_ADDREF_THIS();
     return NS_OK;
   }
+
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtr = (void*) ((nsISupports*)(nsIMenuBar*) this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
-  if (aIID.Equals(kIMenuListenerIID)) {
+
+  if (aIID.Equals(nsIMenuListener::GetIID())) {
     *aInstancePtr = (void*) ((nsIMenuListener*)this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
+
   return NS_NOINTERFACE;
 }
 
@@ -76,7 +77,7 @@ nsMenuBar::nsMenuBar() : nsIMenuBar(), nsIMenuListener()
 {
   NS_INIT_REFCNT();
   mNumMenus = 0;
-  mMenu     = nsnull;
+  mMenuBar  = nsnull;
   mParent   = nsnull;
   mIsMenuBarAdded = PR_FALSE;
   mWebShell = nsnull;
@@ -103,8 +104,8 @@ NS_METHOD nsMenuBar::Create(nsIWidget *aParent)
   SetParent(aParent);
   Widget parentWidget = (Widget)mParent->GetNativeData(NS_NATIVE_WIDGET);
   Widget mainWindow = XtParent(parentWidget);
-  mMenu = XmCreateMenuBar(mainWindow, "menubar", nsnull, 0);
-  XtManageChild(mMenu);
+  mMenuBar = XmCreateMenuBar(mainWindow, "menubar", nsnull, 0);
+  XtManageChild(mMenuBar);
   return NS_OK;
 }
 
@@ -181,7 +182,7 @@ NS_METHOD nsMenuBar::RemoveAll()
 //-------------------------------------------------------------------------
 NS_METHOD nsMenuBar::GetNativeData(void *& aData)
 {
-  aData = (void *)mMenu;
+  aData = (void *)mMenuBar;
   return NS_OK;
 }
 

widget/src/motif/nsMenuBar.h

@@ -42,15 +42,15 @@ public:
   virtual ~nsMenuBar();
 
   // nsIMenuListener interface
+  nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent);
   nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
-  virtual nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent);
-  virtual nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent);
-  virtual nsEventStatus MenuConstruct(
+  nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuConstruct(
     const nsMenuEvent& aMenuEvent,
     nsIWidget        * aParentWindow,
     void             * menubarNode,
     void             * aWebShell);
-  virtual nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
+  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
 
   NS_DECL_ISUPPORTS
 
@@ -69,7 +69,7 @@ public:
   NS_IMETHOD Paint();
   NS_IMETHOD SetNativeData(void* aData);
 protected:
-  Widget      mMenu;
+  Widget      mMenuBar;
   nsIWidget * mParent;
   PRBool      mIsMenuBarAdded;
 

widget/src/motif/nsMenuItem.cpp

@@ -172,8 +172,7 @@ NS_METHOD nsMenuItem::GetLabel(nsString &aText)
 //-------------------------------------------------------------------------
 NS_METHOD nsMenuItem::SetLabel(nsString &aText)
 {
-   mLabel = aText;
-  
+  mLabel = aText;
   return NS_OK;
 }
 
@@ -221,6 +220,7 @@ nsEventStatus nsMenuItem::MenuItemSelected(const nsMenuEvent & aMenuEvent)
 
 nsEventStatus nsMenuItem::MenuSelected(const nsMenuEvent & aMenuEvent)
 {
+  printf("nsMenuItem::MenuSelected called\n");
   if(mXULCommandListener)
     return mXULCommandListener->MenuSelected(aMenuEvent);
 
@@ -229,6 +229,7 @@ nsEventStatus nsMenuItem::MenuSelected(const nsMenuEvent & aMenuEvent)
 
 nsEventStatus nsMenuItem::MenuDeselected(const nsMenuEvent & aMenuEvent)
 {
+  printf("nsMenuItem::MenuDeselected called\n");
   return nsEventStatus_eIgnore;
 }
 
@@ -237,11 +238,13 @@ nsEventStatus nsMenuItem::MenuConstruct(const nsMenuEvent &aMenuEvent,
                                         void *menuNode,
                                         void *aWebShell)
 {
+  printf("nsMenuItem::MenuConstruct called\n");
   return nsEventStatus_eIgnore;
 }
 
 nsEventStatus nsMenuItem::MenuDestruct(const nsMenuEvent & aMenuEvent)
 {
+  printf("nsMenuItem::MenuDestruct called\n");
   return nsEventStatus_eIgnore;
 }
 

widget/src/motif/nsRadioButton.cpp

@@ -16,16 +16,14 @@
  * Reserved.
  */
 
-#include "nsRadioButton.h"
-#include "nsColor.h"
-#include "nsGUIEvent.h"
-#include "nsString.h"
-#include "nsStringUtil.h"
-
-#include "nsXtEventHandler.h"
 #include <Xm/ToggleB.h>
 #include <Xm/RowColumn.h>
 
+#include "nsRadioButton.h"
+#include "nsString.h"
+
+#include "nsXtEventHandler.h"
+
 NS_IMPL_ADDREF(nsRadioButton)
 NS_IMPL_RELEASE(nsRadioButton)
 

widget/src/motif/nsScrollbar.cpp

@@ -16,12 +16,11 @@
  * Reserved.
  */
 
-#include "nsScrollbar.h"
-#include "nsToolkit.h"
-#include "nsGUIEvent.h"
-#include "nsUnitConversion.h"
 #include <Xm/ScrollBar.h>
 
+#include "nsScrollbar.h"
+#include "nsGUIEvent.h"
+
 #include "nsXtEventHandler.h"
 
 NS_IMPL_ADDREF(nsScrollbar)
@@ -59,7 +58,7 @@ NS_METHOD nsScrollbar::Create(nsNativeWidget aParent,
 
   int procDir = mOrientation == XmVERTICAL? XmMAX_ON_BOTTOM:XmMAX_ON_RIGHT;
 
-  mWidget = ::XtVaCreateManagedWidget("scrollbar",
+  mWidget = ::XtVaCreateManagedWidget("nsScrollbar",
                                     xmScrollBarWidgetClass,
                                     parentWidget,
                                     XmNorientation, mOrientation,
@@ -451,4 +450,3 @@ PRBool nsScrollbar::OnScroll(nsScrollbarEvent & aEvent, PRUint32 cPos)
     }
     return result;
 }
-

widget/src/motif/nsTextAreaWidget.cpp

@@ -16,15 +16,11 @@
  * Reserved.
  */
 
-#include "nsTextAreaWidget.h"
-#include "nsToolkit.h"
-#include "nsColor.h"
-#include "nsGUIEvent.h"
-#include "nsString.h"
-#include "nsXtEventHandler.h"
-
 #include <Xm/Text.h>
 
+#include "nsTextAreaWidget.h"
+#include "nsString.h"
+
 #define DBG 0
 
 NS_IMPL_ADDREF(nsTextAreaWidget)
@@ -137,20 +133,3 @@ nsresult nsTextAreaWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr
 
   return nsWindow::QueryInterface(aIID, aInstancePtr);
 }
-
-//-------------------------------------------------------------------------
-//
-// paint, resizes message - ignore
-//
-//-------------------------------------------------------------------------
-PRBool nsTextAreaWidget::OnPaint(nsPaintEvent & aEvent)
-{
-  return PR_FALSE;
-}
-
-
-//--------------------------------------------------------------
-PRBool nsTextAreaWidget::OnResize(nsSizeEvent &aEvent)
-{
-  return PR_FALSE;
-}

widget/src/motif/nsTextAreaWidget.h

@@ -19,7 +19,6 @@
 #ifndef nsTextAreaWidget_h__
 #define nsTextAreaWidget_h__
 
-#include "nsWindow.h"
 #include "nsTextHelper.h"
 #include "nsITextAreaWidget.h"
 
@@ -55,13 +54,8 @@ public:
               nsIToolkit *aToolkit = nsnull,
               nsWidgetInitData *aInitData = nsnull);
 
-
-  virtual PRBool  OnPaint(nsPaintEvent & aEvent);
-  virtual PRBool  OnResize(nsSizeEvent &aEvent);
-
 private:
   PRBool mMakeReadOnly;
-
 };
 
 #endif // nsTextAreaWidget_h__

widget/src/motif/nsToolkit.cpp

@@ -17,16 +17,11 @@
  */
 
 #include "nsToolkit.h"
-#include "nsWindow.h"
-#include "nsGUIEvent.h"
-
-void RunPump(void* arg)
-{
-}
+#include <stdio.h>
 
 //-------------------------------------------------------------------------
 //
-// constructor
+// Error handler
 //
 //-------------------------------------------------------------------------
 int nsToolkitErrorHandler (Display * mydisplay, XErrorEvent * myerr) 

widget/src/motif/nsToolkit.h

@@ -20,9 +20,7 @@
 #define TOOLKIT_H
 
 #include "nsIToolkit.h"
-#include "X11/Xlib.h"
-
-struct MethodInfo;
+#include <X11/Xlib.h>
 
 /**
  * Wrapper around the thread running the message pump.
@@ -49,6 +47,4 @@ private:
 
 };
 
-
-
 #endif  // TOOLKIT_H

widget/src/motif/nsWindow.cpp

@@ -16,7 +16,18 @@
  * Reserved.
  */
 
+#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
+#include <X11/cursorfont.h>
+#include <Xm/Xm.h>
+#include <Xm/MainW.h>
+#include <Xm/Frame.h>
+#include <Xm/XmStrDefs.h>
+#include <Xm/DrawingA.h>
+#include <Xm/DialogS.h>
+
 #include "nsWindow.h"
+#include "nsWidgetsCID.h"
 #include "nsIFontMetrics.h"
 #include "nsFont.h"
 #include "nsGUIEvent.h"
@@ -25,29 +36,12 @@
 #include "nsRect.h"
 #include "nsTransform2D.h"
 #include "nsGfxCIID.h"
-
 #include "nsXtEventHandler.h"
+#include "nsXtManageWidget.h"
 #include "nsAppShell.h"
 
-#include "X11/Xlib.h"
-#include "Xm/Xm.h"
-#include "Xm/MainW.h"
-#include "Xm/Frame.h"
-#include "Xm/XmStrDefs.h"
-#include "Xm/DrawingA.h"
-
-#include "X11/Intrinsic.h"
-#include "X11/cursorfont.h"
-
 #include "stdio.h"
 
-#include "Xm/DialogS.h"
-#include "Xm/RowColumn.h"
-#include "Xm/Form.h"
-#include "nsIEnumerator.h"
-
-#include "nsXtManageWidget.h"
-
 #define DBG 0
 
 Widget gFirstTopLevelWindow = 0; //XXX: REMOVE Kludge should not be needed.
@@ -1033,10 +1027,9 @@ NS_IMETHODIMP nsWindow::Update()
 // Return some native data according to aDataType
 //
 //-------------------------------------------------------------------------
-void* nsWindow::GetNativeData(PRUint32 aDataType)
+void *nsWindow::GetNativeData(PRUint32 aDataType)
 {
   switch(aDataType) {
-
     case NS_NATIVE_WINDOW:
       return (void*)XtWindow(mWidget);
     case NS_NATIVE_DISPLAY:

widget/src/motif/nsWindow.h

@@ -24,18 +24,6 @@
 
 #include <Xm/Xm.h>
 
-
-// #include "nsIWidget.h"
-// #include "nsIEnumerator.h"
-// #include "nsIAppShell.h"
-
-// #include "nsIMouseListener.h"
-// #include "nsIEventListener.h"
-// #include "nsString.h"
-
-
-// #include "nsXtManageWidget.h"
-
 class nsFont;
 
 #define NSRGB_2_COLOREF(color) \
@@ -59,11 +47,7 @@ public:
     NS_DECL_ISUPPORTS
 
     virtual void ConvertToDeviceCoordinates(nscoord &aX, nscoord &aY);
- 
 
-
-    NS_IMETHOD            PreCreateWidget(nsWidgetInitData *aWidgetInitData) { return NS_OK; }
-    // nsIWidget interface
     NS_IMETHOD            Create(nsIWidget *aParent,
                                      const nsRect &aRect,
                                      EVENT_CALLBACK aHandleEventFunction,

widget/src/motif/nsXtManageWidget.c

@@ -32,7 +32,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-/*#include "mozilla.h"*/
 #include "nsXtManageWidget.h"
 #include "nsXtManageWidgetP.h"
 
@@ -160,4 +159,3 @@ ChangeManaged(Widget w)
 {
 	return;
 }
-

widget/src/motif/nsXtManageWidgetP.h

@@ -15,13 +15,14 @@
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
+
 /* 
    nsXtManageWidgetP.h --- defines a subclass of XmScrolledWindow
  */
 
 
-#ifndef _nsXtManageWidth_H_
-#define _nsXtManageWidth_H_
+#ifndef _nsXtManageWidth_h_
+#define _nsXtManageWidth_h_
 
 #include "nsXtManageWidget.h"
 #include <Xm/ManagerP.h>
@@ -57,6 +58,4 @@ typedef struct _NewManageRec
     NewManagePart		newManage;
 } NewManageRec;
 
-#endif 
-
-
+#endif /* _nsXtManageWidth_h_ */