Bug 94627 - removing unused native listbox widget (plus some cleanup from already-removed native widgets). r=shaver, sr=blizzard.

webshell/tests/viewer/nsBrowserWindow.cpp

@@ -179,7 +179,6 @@ static NS_DEFINE_CID(kWebShellCID, NS_WEB_SHELL_CID);
 static NS_DEFINE_CID(kWindowCID, NS_WINDOW_CID);
 static NS_DEFINE_CID(kDialogCID, NS_DIALOG_CID);
 static NS_DEFINE_CID(kCheckButtonCID, NS_CHECKBUTTON_CID);
-static NS_DEFINE_CID(kRadioButtonCID, NS_RADIOBUTTON_CID);
 static NS_DEFINE_CID(kLabelCID, NS_LABEL_CID);
 
 static NS_DEFINE_IID(kIXPBaseWindowIID, NS_IXPBASE_WINDOW_IID);

webshell/tests/viewer/nsSetupRegistry.cpp

@@ -50,27 +50,12 @@
 #if defined(XP_OS2)
     #define WIDGET_DLL      "WDGTOS2"
     #define GFXWIN_DLL      "GFX_OS2"
-    #define VIEW_DLL        "NGVIEW"
-    #define WEB_DLL         "WEBSHELL"
-    #define DOM_DLL         "JSDOM"
-    #define CAPS_DLL        "CAPS"
 #elif defined(XP_PC)
     #define WIDGET_DLL "gkwidget.dll"
     #define GFXWIN_DLL "gkgfxwin.dll"
-    #define VIEW_DLL   "gkview.dll"
-    #define DOM_DLL    "jsdom.dll"
-    #define CAPS_DLL   "caps.dll"
 #elif defined(XP_MAC)
     #define WIDGET_DLL    "WIDGET_DLL"
     #define GFXWIN_DLL    "GFXWIN_DLL"
-    #define VIEW_DLL        "VIEW_DLL"
-    #define WEB_DLL            "WEB_DLL"
-    #define DOM_DLL        "DOM_DLL"
-    #define CAPS_DLL    "CAPS_DLL"
-#else
-    #define VIEW_DLL   "libgkview"MOZ_DLL_SUFFIX
-    #define DOM_DLL    "libjsdom"MOZ_DLL_SUFFIX
-    #define CAPS_DLL   "libcaps"MOZ_DLL_SUFFIX
 #endif
 
 // Class ID's
@@ -111,14 +96,6 @@ static NS_DEFINE_IID(kCTextFieldCID, NS_TEXTFIELD_CID);
 static NS_DEFINE_IID(kCCheckButtonCID, NS_CHECKBUTTON_CID);
 #endif
 
-// unneeded widgets
-#if 0
-static NS_DEFINE_IID(kCListBoxCID, NS_LISTBOX_CID);
-static NS_DEFINE_IID(kCRadioButtonCID, NS_RADIOBUTTON_CID);
-static NS_DEFINE_IID(kCComboBoxCID, NS_COMBOBOX_CID);
-static NS_DEFINE_IID(kCTextAreaCID, NS_TEXTAREA_CID);
-#endif
-
 // GFXWIN
 #if !defined(XP_UNIX) && !defined(XP_OS2) && !defined(XP_WIN)
 static NS_DEFINE_CID(kCRenderingContextCID, NS_RENDERING_CONTEXT_CID);
@@ -137,16 +114,6 @@ static NS_DEFINE_CID(kScreenManagerCID, NS_SCREENMANAGER_CID);
 static NS_DEFINE_CID(kPrintOptionsCID,NS_PRINTOPTIONS_CID);
 #endif
 
-// VIEW
-static NS_DEFINE_IID(kCViewManagerCID, NS_VIEW_MANAGER_CID);
-static NS_DEFINE_IID(kCViewCID, NS_VIEW_CID);
-static NS_DEFINE_IID(kCScrollingViewCID, NS_SCROLLING_VIEW_CID);
-static NS_DEFINE_IID(kCScrollPortViewCID, NS_SCROLL_PORT_VIEW_CID);
-
-// DOM
-static NS_DEFINE_IID(kCDOMScriptObjectFactory, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
-static NS_DEFINE_IID(kCScriptNameSetRegistry, NS_SCRIPT_NAMESET_REGISTRY_CID);
-
 extern "C" void
 NS_SetupRegistry()
 {
@@ -211,15 +178,6 @@ NS_SetupRegistry()
   nsComponentManager::RegisterComponentLib(kCMenuItemCID,      NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
 #endif
 
-  // UNNEEDED WIDGETS
-#if 0
-  nsComponentManager::RegisterComponentLib(kCComboBoxCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
-  nsComponentManager::RegisterComponentLib(kCContextMenuCID,   NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
-  nsComponentManager::RegisterComponentLib(kCListBoxCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
-  nsComponentManager::RegisterComponentLib(kCRadioButtonCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
-  nsComponentManager::RegisterComponentLib(kCTextAreaCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
-#endif
-
   // GFXWIN
 #if !defined(XP_UNIX) && !defined(XP_OS2) && !defined(XP_WIN)
   nsComponentManager::RegisterComponentLib(kCRenderingContextCID, "Rendering Context", "@mozilla.org/gfx/renderingcontext;1", GFXWIN_DLL, PR_FALSE, PR_FALSE);
@@ -238,13 +196,4 @@ NS_SetupRegistry()
   nsComponentManager::RegisterComponentLib(kPrintOptionsCID, "PrintOptions", "@mozilla.org/gfx/printoptions;1", GFXWIN_DLL, PR_FALSE, PR_FALSE);
 #endif
 
-  // VIEW
-  nsComponentManager::RegisterComponentLib(kCViewManagerCID, NULL, NULL, VIEW_DLL, PR_FALSE, PR_FALSE);
-  nsComponentManager::RegisterComponentLib(kCViewCID, NULL, NULL, VIEW_DLL, PR_FALSE, PR_FALSE);
-  nsComponentManager::RegisterComponentLib(kCScrollingViewCID, NULL, NULL, VIEW_DLL, PR_FALSE, PR_FALSE);
-  nsComponentManager::RegisterComponentLib(kCScrollPortViewCID, NULL, NULL, VIEW_DLL, PR_FALSE, PR_FALSE);
-
-  // DOM
-  nsComponentManager::RegisterComponentLib(kCDOMScriptObjectFactory, NULL, NULL, DOM_DLL, PR_FALSE, PR_FALSE);
-  nsComponentManager::RegisterComponentLib(kCScriptNameSetRegistry, NULL, NULL, DOM_DLL, PR_FALSE, PR_FALSE);
 }

widget/public/MANIFEST

@@ -7,10 +7,8 @@ nsIWidget.h
 nsIKBStateControl.h
 nsIButton.h
 nsICheckButton.h
-nsIListWidget.h
 nsITextWidget.h
 nsITextAreaWidget.h
-nsIListBox.h
 nsIScrollbar.h
 nsGUIEvent.h
 nsEvent.h

widget/public/Makefile.in

@@ -43,10 +43,8 @@ EXPORTS		= \
 		nsIKBStateControl.h \
 		nsIButton.h \
 		nsICheckButton.h \
-		nsIListWidget.h \
 		nsITextWidget.h \
 		nsITextAreaWidget.h \
-		nsIListBox.h \
 		nsIScrollbar.h \
 		nsGUIEvent.h \
 		nsEvent.h \

widget/public/nsWidgetsCID.h

@@ -48,11 +48,6 @@
 { 0x2d96b3d3, 0xc051, 0x11d1, \
     {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
 
-/* 2d96b3d4-c051-11d1-a827-0040959a28c9 */
-#define NS_COMBOBOX_CID \
-{ 0x2d96b3d4, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
 /* 2d96b3d5-c051-11d1-a827-0040959a28c9 */
 #define NS_FILEWIDGET_CID \
 { 0x2d96b3d5, 0xc051, 0x11d1, \
@@ -63,16 +58,6 @@
 { 0xbd57cee8, 0x1dd1, 0x11b2, \
     {0x9f, 0xe7, 0x95, 0xcf, 0x47, 0x09, 0xae, 0xa3} }
 
-/* 2d96b3d6-c051-11d1-a827-0040959a28c9 */
-#define NS_LISTBOX_CID \
-{ 0x2d96b3d6, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
-/* 2d96b3d7-c051-11d1-a827-0040959a28c9 */
-#define NS_RADIOBUTTON_CID \
-{ 0x2d96b3d7, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
 /* 2d96b3d9-c051-11d1-a827-0040959a28c9 */
 #define NS_HORZSCROLLBAR_CID \
 { 0x2d96b3d9, 0xc051, 0x11d1, \
@@ -140,11 +125,6 @@
 { 0x7f045771, 0x4beb, 0x11d2, \
   { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
 
-// {1677DAE1-04E2-11d3-B35C-00A0CC3C1CDE}
-#define NS_CONTEXTMENU_CID      \
-{ 0x1677dae1, 0x4e2, 0x11d3, \
-  { 0xb3, 0x5c, 0x0, 0xa0, 0xcc, 0x3c, 0x1c, 0xde } }
-
 //f58c2550-4a7c-11d2-bee2-00805f8a8dbd
 #define NS_IMAGEBUTTON_CID      \
  { 0xf58c2550, 0x4a7c, 0x11d2, \

widget/src/beos/Makefile.in

@@ -43,7 +43,6 @@ CPPSRCS		= \
 		nsFontRetrieverService.cpp \
 		nsFontSizeIterator.cpp \
 		nsLabel.cpp \
-		nsListBox.cpp \
 		nsLookAndFeel.cpp \
 		nsObject.cpp \
 		nsPopUpMenu.cpp \

widget/src/beos/nsWidgetFactory.cpp

@@ -37,7 +37,6 @@
 #include "nsTextAreaWidget.h"
 #include "nsFilePicker.h"
 #include "nsFileWidget.h"
-#include "nsListBox.h"
 #include "nsLookAndFeel.h"
 #include "nsLabel.h"
 #include "nsFontRetrieverService.h"
@@ -60,7 +59,6 @@ static NS_DEFINE_IID(kCButton,        NS_BUTTON_CID);
 static NS_DEFINE_IID(kCCheckButton,   NS_CHECKBUTTON_CID);
 static NS_DEFINE_IID(kCFileOpen,      NS_FILEWIDGET_CID);
 static NS_DEFINE_IID(kCFilePicker,    NS_FILEPICKER_CID);
-static NS_DEFINE_IID(kCListbox,       NS_LISTBOX_CID);
 static NS_DEFINE_IID(kCHorzScrollbar, NS_HORZSCROLLBAR_CID);
 static NS_DEFINE_IID(kCVertScrollbar, NS_VERTSCROLLBAR_CID);
 static NS_DEFINE_IID(kCTextArea,      NS_TEXTAREA_CID);
@@ -180,9 +178,6 @@ nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter,
     else if (mClassID.Equals(kCFilePicker)) {
         inst = (nsISupports*)(nsBaseFilePicker*)new nsFilePicker();
     }
-    else if (mClassID.Equals(kCListbox)) {
-        inst = (nsISupports*)(nsWindow *)new nsListBox();
-    }
     else if (mClassID.Equals(kCHorzScrollbar)) {
         inst = (nsISupports*)(nsWindow *)new nsScrollbar(PR_FALSE);
     }

widget/src/build/nsWidgetSupport.cpp

@@ -29,7 +29,6 @@
 #include "nsIButton.h"
 #include "nsIEventListener.h"
 #include "nsILabel.h"
-#include "nsIListBox.h"
 #include "nsIListWidget.h"
 #include "nsILookAndFeel.h"
 #include "nsIMouseListener.h"
@@ -218,36 +217,6 @@ NS_CreateScrollBar(nsISupports* aParent,
   return NS_OK;
 }
 
-NS_WIDGET nsresult 
-NS_CreateListBox(nsISupports* aParent, 
-									nsIListBox* aWidget, 
-									const nsRect& aRect, 
-                  EVENT_CALLBACK aHandleEventFunction,
-                  const nsFont* aFont)
-{
-	nsIWidget* parent = nsnull;
-	if (aParent != nsnull)
-    aParent->QueryInterface(kIWidgetIID,(void**)&parent);
-
-  nsIWidget* 	widget = nsnull;
-	if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) {
-	  widget->Create(parent, aRect, aHandleEventFunction, NULL);
-	  widget->Show(PR_TRUE);
-    if (aFont != nsnull)
-	  	widget->SetFont(*aFont);
-    NS_IF_RELEASE(widget);
-	}
-  else
-  {
-    NS_ERROR("Called QueryInterface on a non kIWidgetIID supported object");
-  }
-
-	if (aParent)
-	  NS_IF_RELEASE(parent);
-
-  return NS_OK;
-}
-
 extern NS_WIDGET nsresult 
 NS_ShowWidget(nsISupports* aWidget, PRBool aShow)
 {

widget/src/mac/nsWidgetFactory.cpp

@@ -63,7 +63,6 @@
 
 #if USE_NATIVE_VERSION
 # include "nsTextAreaWidget.h"
-# include "nsListBox.h"
 # include "nsCheckButton.h"
 #endif
 
@@ -89,7 +88,6 @@ static NS_DEFINE_CID(kCButton,        NS_BUTTON_CID);
 static NS_DEFINE_CID(kCCheckButton,   NS_CHECKBUTTON_CID);
 static NS_DEFINE_CID(kCFilePicker,    NS_FILEPICKER_CID);
 static NS_DEFINE_CID(kCFileOpen,      NS_FILEWIDGET_CID);
-static NS_DEFINE_CID(kCListbox,       NS_LISTBOX_CID);
 static NS_DEFINE_CID(kCHorzScrollbar, NS_HORZSCROLLBAR_CID);
 static NS_DEFINE_CID(kCVertScrollbar, NS_VERTSCROLLBAR_CID);
 static NS_DEFINE_CID(kCTextArea,      NS_TEXTAREA_CID);
@@ -210,9 +208,6 @@ nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter,
     else if (mClassID.Equals(kCCheckButton)) {
         inst = (nsISupports*)(nsBaseWidget*)(nsWindow*)new nsCheckButton();
     }
-    else if (mClassID.Equals(kCListbox)) {
-       inst = (nsISupports*)(nsBaseWidget*)(nsWindow*)new nsListBox();
-    }
     else if (mClassID.Equals(kCTextArea)) {
         inst = (nsISupports*)(nsBaseWidget*)(nsWindow*)new nsTextAreaWidget();
     }

widget/src/motif/Makefile.in

@@ -39,7 +39,6 @@ CPPSRCS		= \
 		nsCheckButton.cpp \
 		nsFileWidget.cpp \
 		nsLabel.cpp \
-		nsListBox.cpp \
 		nsLookAndFeel.cpp \
 		nsMenu.cpp \
 		nsMenuBar.cpp \

widget/src/motif/nsWidgetFactory.cpp

@@ -36,7 +36,6 @@
 #include "nsTextWidget.h"
 #include "nsTextAreaWidget.h"
 #include "nsFileWidget.h"
-#include "nsListBox.h"
 #include "nsLookAndFeel.h"
 #include "nsLabel.h"
 // #include "nsFontRetrieverService.h"
@@ -61,7 +60,6 @@ static NS_DEFINE_IID(kCChild,         NS_CHILD_CID);
 static NS_DEFINE_IID(kCButton,        NS_BUTTON_CID);
 static NS_DEFINE_IID(kCCheckButton,   NS_CHECKBUTTON_CID);
 static NS_DEFINE_IID(kCFileOpen,      NS_FILEWIDGET_CID);
-static NS_DEFINE_IID(kCListbox,       NS_LISTBOX_CID);
 static NS_DEFINE_IID(kCHorzScrollbar, NS_HORZSCROLLBAR_CID);
 static NS_DEFINE_IID(kCVertScrollbar, NS_VERTSCROLLBAR_CID);
 static NS_DEFINE_IID(kCTextArea,      NS_TEXTAREA_CID);
@@ -179,9 +177,6 @@ nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter,
     else if (mClassID.Equals(kCFileOpen)) {
         inst = (nsISupports*)(nsIWidget *)new nsFileWidget();
     }
-    else if (mClassID.Equals(kCListbox)) {
-        inst = (nsISupports*)(nsIWidget *)new nsListBox();
-    }
     else if (mClassID.Equals(kCHorzScrollbar)) {
         inst = (nsISupports*)(nsIWidget *)new nsScrollbar(PR_FALSE);
     }

widget/src/qt/.cvsignore

@@ -3,7 +3,6 @@ moc_nsQApplication.cpp
 moc_nsLabel.cpp
 moc_nsScrollbar.cpp
 moc_nsButton.cpp
-moc_nsListBox.cpp
 moc_nsTextAreaWidget.cpp
 moc_nsCheckButton.cpp
 moc_nsTextWidget.cpp

widget/src/xlib/Makefile.in

@@ -45,7 +45,6 @@ CPPSRCS		= \
 		nsFileWidget.cpp \
 		nsKeyCode.cpp \
 		nsLabel.cpp \
-		nsListBox.cpp \
 		nsLookAndFeel.cpp \
 		nsMenu.cpp \
 		nsMenuBar.cpp \

xpfe/appshell/src/nsWebShellWindow.cpp

@@ -137,7 +137,6 @@ static NS_DEFINE_CID(kAppShellCID,         NS_APPSHELL_CID);
 static NS_DEFINE_CID(kMenuBarCID,          NS_MENUBAR_CID);
 static NS_DEFINE_CID(kMenuCID,             NS_MENU_CID);
 static NS_DEFINE_CID(kMenuItemCID,         NS_MENUITEM_CID);
-static NS_DEFINE_CID(kContextMenuCID,      NS_CONTEXTMENU_CID);
 
 static NS_DEFINE_CID(kPrefCID,             NS_PREF_CID);
 static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);