Stop building the unused native widgets (these were removed from the win32

build awhile back).  Also remove unused code relating to these
widgets.  r=blizzard.


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

mozilla/widget/src/gtk/Makefile.in

@@ -34,7 +34,6 @@ CPPSRCS		= \
 		nsButton.cpp \
 		nsCheckButton.cpp \
 		nsClipboard.cpp \
-		nsComboBox.cpp \
 		nsDragService.cpp \
 		nsFileWidget.cpp \
 		nsFontRetrieverService.cpp \
@@ -42,12 +41,9 @@ CPPSRCS		= \
 		nsGtkEventHandler.cpp \
 		nsGtkUtils.cpp \
 		nsLabel.cpp \
-		nsListBox.cpp \
 		nsLookAndFeel.cpp \
-		nsRadioButton.cpp \
 		nsScrollbar.cpp \
 		nsSound.cpp \
-		nsTextAreaWidget.cpp \
 		nsTextHelper.cpp \
 		nsTextWidget.cpp \
 		nsToolkit.cpp \

mozilla/widget/src/gtk/nsGtkEventHandler.cpp

@@ -27,9 +27,6 @@
 #include "nsScrollbar.h"
 #include "nsIFileWidget.h"
 #include "nsGUIEvent.h"
-#include "nsIMenu.h"
-#include "nsIMenuItem.h"
-#include "nsIMenuListener.h"
 
 #include "nsTextWidget.h"
 #include "nsGtkIMEHelper.h"
@@ -463,90 +460,6 @@ gint handle_expose_event(GtkWidget *w, GdkEventExpose *event, gpointer p)
   return PR_TRUE;
 }
 
-//==============================================================
-void menu_item_activate_handler(GtkWidget *w, gpointer p)
-{
-  // g_print("menu_item_activate_handler\n");
-
-  nsIMenuListener *menuListener = nsnull;
-  nsIMenuItem *menuItem = (nsIMenuItem *)p;
-  if (menuItem != nsnull) {
-    nsMenuEvent mevent;
-    mevent.message = NS_MENU_SELECTED;
-    mevent.eventStructType = NS_MENU_EVENT;
-    mevent.point.x = 0;
-    mevent.point.y = 0;
-    // mevent.widget = menuItem;
-    mevent.widget = nsnull;
-    menuItem->GetCommand(mevent.mCommand);
-
-    mevent.mMenuItem = menuItem;
-    mevent.time = PR_IntervalNow();
-
-    // FIXME - THIS SHOULD WORK.  FIX EVENTS FOR XP CODE!!!!! (pav)
-    //    nsEventStatus status;
-    //    mevent.widget->DispatchEvent((nsGUIEvent *)&mevent, status);
-
-    menuItem->QueryInterface(NS_GET_IID(nsIMenuListener), (void**)&menuListener);
-    if(menuListener) {
-      menuListener->MenuItemSelected(mevent);
-      NS_IF_RELEASE(menuListener);
-    }
-  }
-}
-
-//==============================================================
-void menu_map_handler(GtkWidget *w, gpointer p)
-{ 
-  nsIMenuListener *menuListener = nsnull;
-  nsIMenu *menu = (nsIMenu *)p;
-  if (menu != nsnull) {
-    nsMenuEvent mevent;
-    mevent.message = NS_MENU_SELECTED;
-    mevent.eventStructType = NS_MENU_EVENT;
-    mevent.point.x = 0;
-    mevent.point.y = 0;
-    mevent.widget = nsnull;
-
-    mevent.time = PR_IntervalNow();
-
-    menu->QueryInterface(NS_GET_IID(nsIMenuListener), (void**)&menuListener);
-
-    if(menuListener) {
-      menuListener->MenuConstruct(
-        mevent,
-      	nsnull,   //parent window
-        nsnull,   //menuNode
-        nsnull ); // webshell
-      NS_IF_RELEASE(menuListener);
-    }
-  }
-}
-
-//==============================================================
-void menu_unmap_handler(GtkWidget *w, gpointer p)
-{
-  nsIMenuListener *menuListener = nsnull;
-  nsIMenu *menu = (nsIMenu *)p;
-  if (menu != nsnull) {
-    nsMenuEvent mevent;
-    mevent.message = NS_MENU_SELECTED;
-    mevent.eventStructType = NS_MENU_EVENT;
-    mevent.point.x = 0;
-    mevent.point.y = 0;
-    mevent.widget = nsnull;
-
-    mevent.time = PR_IntervalNow();
-
-    menu->QueryInterface(NS_GET_IID(nsIMenuListener), (void**)&menuListener);
-    if(menuListener) {
-      menuListener->MenuDestruct(mevent);
-      NS_IF_RELEASE(menuListener);
-    }
-  }
-}
-
-
 //==============================================================
 void handle_scrollbar_value_changed(GtkAdjustment *adj, gpointer p)
 {
@@ -1091,30 +1004,3 @@ handle_superwin_paint(gint aX, gint aY,
   window->DoPaint(aX, aY, aWidth, aHeight, NULL);
 }
 
-//==============================================================
-gint nsGtkWidget_FSBCancel_Callback(GtkWidget *w, gpointer p)
-{
-#if 0
-  nsWindow *widgetWindow = (nsWindow*)gtk_object_get_user_data(GTK_OBJECT(w));
-  nsFileWidget * widgetWindow = (nsFileWidget *) p ;
-  if (p != nsnull) {
-    widgetWindow->OnCancel();
-  }
-#endif
-
-  return PR_FALSE;
-}
-
-//==============================================================
-gint nsGtkWidget_FSBOk_Callback(GtkWidget *w, gpointer p)
-{
-#if 0
-  nsWindow *widgetWindow = (nsWindow*)gtk_object_get_user_data(GTK_OBJECT(w));
-  nsFileWidget * widgetWindow = (nsFileWidget *) p;
-  if (p != nsnull) {
-    widgetWindow->OnOk();
-  }
-#endif
-
-  return PR_FALSE;
-}

mozilla/widget/src/gtk/nsGtkEventHandler.h

@@ -28,14 +28,11 @@
 #include "gdksuperwin.h"
 
 class nsIWidget;
-class nsIMenuItem;
-class nsIMenu;
 
 gint handle_configure_event(GtkWidget *w, GdkEventConfigure *conf, gpointer p);
 void handle_size_allocate(GtkWidget *w, GtkAllocation *alloc, gpointer p);
 gint handle_expose_event(GtkWidget *w, GdkEventExpose *event, gpointer p);
 
-
 gint handle_key_release_event_for_text(GtkObject *w, GdkEventKey* event, gpointer p);
 gint handle_key_press_event_for_text(GtkObject *w, GdkEventKey* event, gpointer p);
 
@@ -44,27 +41,8 @@ gint handle_key_press_event(GtkObject *w, GdkEventKey* event, gpointer p);
 
 void handle_scrollbar_value_changed(GtkAdjustment *adjustment, gpointer p);
 
-void menu_item_activate_handler(GtkWidget *w, gpointer p);
-
-void menu_map_handler(GtkWidget *w, gpointer p);
-void menu_unmap_handler(GtkWidget *w, gpointer p);
-
 //----------------------------------------------------
 
-gint nsGtkWidget_FSBCancel_Callback(GtkWidget *w, gpointer p);
-gint nsGtkWidget_FSBOk_Callback(GtkWidget *w, gpointer p);
-
-//----------------------------------------------------
-gint CheckButton_Toggle_Callback(GtkWidget *w, gpointer p);
-
-gint nsGtkWidget_RadioButton_ArmCallback(GtkWidget *w, gpointer p);
-gint nsGtkWidget_RadioButton_DisArmCallback(GtkWidget *w, gpointer p);
-
-gint nsGtkWidget_Text_Callback(GtkWidget *w, GdkEventKey* event, gpointer p);
-gint nsGtkWidget_Expose_Callback(GtkWidget *w, gpointer p);
-
-gint nsGtkWidget_Refresh_Callback(gpointer call_data);
-
 void handle_xlib_shell_event(GdkSuperWin *superwin, XEvent *event, gpointer p);
 void handle_xlib_bin_event(GdkSuperWin *superwin, XEvent *event, gpointer p);
 void handle_superwin_paint(gint aX, gint aY,

mozilla/widget/src/gtk/nsWidgetFactory.cpp

@@ -32,13 +32,9 @@
 #include "nsButton.h"
 #include "nsScrollbar.h"
 #include "nsCheckButton.h"
-#include "nsRadioButton.h"
 #include "nsTextWidget.h"
-#include "nsTextAreaWidget.h"
 #include "nsFileWidget.h"
 #include "nsFileSpecWithUIImpl.h"
-#include "nsListBox.h"
-#include "nsComboBox.h"
 #include "nsLookAndFeel.h"
 #include "nsLabel.h"
 #include "nsFontRetrieverService.h"
@@ -55,25 +51,14 @@ static NS_DEFINE_IID(kCWindow,        NS_WINDOW_CID);
 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(kCCombobox,      NS_COMBOBOX_CID);
 static NS_DEFINE_IID(kCFileOpen,      NS_FILEWIDGET_CID);
-static NS_DEFINE_IID(kCListbox,       NS_LISTBOX_CID);
-static NS_DEFINE_IID(kCRadioButton,   NS_RADIOBUTTON_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);
 static NS_DEFINE_IID(kCTextField,     NS_TEXTFIELD_CID);
 static NS_DEFINE_IID(kCAppShell,      NS_APPSHELL_CID);
 static NS_DEFINE_IID(kCToolkit,       NS_TOOLKIT_CID);
 static NS_DEFINE_IID(kCLookAndFeel,   NS_LOOKANDFEEL_CID);
 static NS_DEFINE_IID(kCLabel,         NS_LABEL_CID);
-#if 0
-static NS_DEFINE_IID(kCMenuBar,       NS_MENUBAR_CID);
-static NS_DEFINE_IID(kCMenu,          NS_MENU_CID);
-static NS_DEFINE_IID(kCMenuItem,      NS_MENUITEM_CID);
-static NS_DEFINE_IID(kCPopUpMenu,     NS_POPUPMENU_CID);
-static NS_DEFINE_IID(kCContextMenu,   NS_CONTEXTMENU_CID);
-#endif
 static NS_DEFINE_IID(kCFontRetrieverService,    NS_FONTRETRIEVERSERVICE_CID);
 
 // Drag & Drop, Clipboard
@@ -147,27 +132,15 @@ nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter,
     else if (mClassID.Equals(kCCheckButton)) {
         inst = (nsISupports*)(nsBaseWidget*)(nsWidget *)new nsCheckButton();
     }
-    else if (mClassID.Equals(kCCombobox)) {
-        inst = (nsISupports*)(nsBaseWidget*)(nsWidget *)new nsComboBox();
-    }
-    else if (mClassID.Equals(kCRadioButton)) {
-        inst = (nsISupports*)(nsBaseWidget*)(nsWidget *)new nsRadioButton();
-    }
     else if (mClassID.Equals(kCFileOpen)) {
         inst = (nsISupports*)new nsFileWidget();
     }
-    else if (mClassID.Equals(kCListbox)) {
-        inst = (nsISupports*)(nsBaseWidget*)(nsWidget *)new nsListBox();
-    }
     else if (mClassID.Equals(kCHorzScrollbar)) {
         inst = (nsISupports*)(nsBaseWidget*)(nsWidget *)new nsScrollbar(PR_FALSE);
     }
     else if (mClassID.Equals(kCVertScrollbar)) {
         inst = (nsISupports*)(nsBaseWidget*)(nsWidget *)new nsScrollbar(PR_TRUE);
     }
-    else if (mClassID.Equals(kCTextArea)) {
-        inst = (nsISupports*)(nsBaseWidget*)(nsWidget *)new nsTextAreaWidget();
-    }
     else if (mClassID.Equals(kCTextField)) {
         inst = (nsISupports*)(nsBaseWidget*)(nsWidget *)new nsTextWidget();
     }
@@ -183,25 +156,6 @@ nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter,
     else if (mClassID.Equals(kCLabel)) {
         inst = (nsISupports*)(nsBaseWidget*)(nsWidget *)new nsLabel();
     }
-#if 0
-    else if (mClassID.Equals(kCMenuBar)) {
-        inst = (nsISupports*)(nsIMenuBar *)new nsMenuBar();
-    }
-    else if (mClassID.Equals(kCMenu)) {
-        inst = (nsISupports*)(nsIMenu *)new nsMenu();
-    }
-    else if (mClassID.Equals(kCMenuItem)) {
-        inst = (nsISupports*)(nsIMenuItem *)new nsMenuItem();
-    }
-    else if (mClassID.Equals(kCPopUpMenu)) {
-        inst = (nsISupports*)new nsPopUpMenu();
-    }
-    /*
-    else if (mClassID.Equals(kCContextMenu)) {
-        inst = (nsISupports*)(nsIContextMenu*)new nsContextMenu();
-    }
-    */
-#endif
     else if (mClassID.Equals(kCSound)) {
     	nsISound* aSound = nsnull;
     	NS_NewSound(&aSound);