Bug 98420 - nsIFontRetrieverService, nsIFontNameIterator, and nsIFontSizeIterator are obsolete. Also, some cleanup to nsWidgetsCID.h. r=pavlov, sr=blizzard.
This commit is contained in:
bryner%netscape.com
Родитель
579d80646c
Коммит
4c9852276a
|
|
@ -75,7 +75,6 @@ static NS_DEFINE_CID(kCTransferableCID, NS_TRANSFERABLE_CID);
|
|||
static NS_DEFINE_IID(kDataFlavorCID, NS_DATAFLAVOR_CID);
|
||||
static NS_DEFINE_IID(kCHTMLFormatConverterCID, NS_HTMLFORMATCONVERTER_CID);
|
||||
static NS_DEFINE_IID(kCDragServiceCID, NS_DRAGSERVICE_CID);
|
||||
static NS_DEFINE_IID(kCFontRetrieverServiceCID, NS_FONTRETRIEVERSERVICE_CID);
|
||||
static NS_DEFINE_IID(kCTimerCID, NS_TIMER_CID);
|
||||
static NS_DEFINE_IID(kCTimerManagerCID, NS_TIMERMANAGER_CID);
|
||||
static NS_DEFINE_IID(kSoundCID, NS_SOUND_CID);
|
||||
|
|
@ -137,7 +136,6 @@ NS_SetupRegistry()
|
|||
nsComponentManager::RegisterComponentLib(kDataFlavorCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCHTMLFormatConverterCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCDragServiceCID, "Drag Service", "@mozilla.org/widget/dragservice;1", WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCFontRetrieverServiceCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kSoundCID, "Sound Services", "@mozilla.org/sound;1", WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCFilePickerCID, "FilePicker", "@mozilla.org/filepicker;1", WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
#ifdef XP_PC
|
||||
|
|
|
|||
|
|
@ -30,9 +30,6 @@ MODULE = widget
|
|||
XPIDL_MODULE = widget
|
||||
|
||||
EXPORTS = \
|
||||
nsIFontSizeIterator.h \
|
||||
nsIFontNameIterator.h \
|
||||
nsIFontRetrieverService.h \
|
||||
nsIMenuBar.h \
|
||||
nsIMenu.h \
|
||||
nsIMenuItem.h \
|
||||
|
|
@ -52,13 +49,6 @@ EXPORTS = \
|
|||
nsWidgetsCID.h \
|
||||
nsILookAndFeel.h \
|
||||
nsILabel.h \
|
||||
nsIMenuBar.h \
|
||||
nsIMenu.h \
|
||||
nsIMenuItem.h \
|
||||
nsIPopUpMenu.h \
|
||||
nsIFontNameIterator.h \
|
||||
nsIFontSizeIterator.h \
|
||||
nsIFontRetrieverService.h \
|
||||
nsIDragSessionGTK.h \
|
||||
nsIDragSessionXlib.h \
|
||||
nsIDragSessionMac.h \
|
||||
|
|
|
|||
|
|
@ -47,9 +47,6 @@ XPIDLSRCS = \
|
|||
$(NULL)
|
||||
|
||||
EXPORTS=\
|
||||
nsIFontSizeIterator.h \
|
||||
nsIFontNameIterator.h \
|
||||
nsIFontRetrieverService.h \
|
||||
nsIWidget.h \
|
||||
nsIKBStateControl.h \
|
||||
nsIButton.h \
|
||||
|
|
|
|||
|
|
@ -115,29 +115,11 @@
|
|||
{ 0x7f045771, 0x4beb, 0x11d2, \
|
||||
{ 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
|
||||
|
||||
//f58c2550-4a7c-11d2-bee2-00805f8a8dbd
|
||||
#define NS_IMAGEBUTTON_CID \
|
||||
{ 0xf58c2550, 0x4a7c, 0x11d2, \
|
||||
{0xbe, 0xe2, 0x00, 0x80, 0x5f, 0x8a, 0x8d, 0xbd} }
|
||||
|
||||
// {F6CD4F21-53AF-11d2-8DC4-00609703C14E}
|
||||
#define NS_POPUPMENU_CID \
|
||||
{ 0xf6cd4f21, 0x53af, 0x11d2, \
|
||||
{ 0x8d, 0xc4, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
|
||||
|
||||
#define NS_MENUBUTTON_CID \
|
||||
{ 0x67b8e261, 0x53c3, 0x11d2, \
|
||||
{ 0x8d, 0xc4, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
|
||||
|
||||
// {D3C3B8B2-55B5-11d2-9A2A-000000000000}
|
||||
#define NS_IMAGEBUTTONLISTENER_CID \
|
||||
{ 0xd3c3b8b2, 0x55b5, 0x11d2, \
|
||||
{ 0x9a, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
|
||||
|
||||
// {285EF9B2-094A-11d3-9A87-0050046CDA96}
|
||||
#define NS_FONTRETRIEVERSERVICE_CID \
|
||||
{ 0x285ef9b2, 0x94a, 0x11d3, { 0x9a, 0x87, 0x0, 0x50, 0x4, 0x6c, 0xda, 0x96 } }
|
||||
|
||||
// {6B6C423A-1DD2-11B2-8888-E540BB169DDD}
|
||||
#define NS_TIMER_CID \
|
||||
{ 0x6b6c423a, 0x1dd2, 0x11b2, \
|
||||
|
|
@ -175,13 +157,6 @@
|
|||
#define NS_HTMLFORMATCONVERTER_CID \
|
||||
{ 0x948a0023, 0xe3a7, 0x11d2, { 0x96, 0xcf, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } }
|
||||
|
||||
#define NS_DATAOBJ_CID \
|
||||
{ 0x1bba7640, 0xdf52, 0x11cf, { 0x82, 0x7b, 0, 0xa0, 0x24, 0x3a, 0xe5, 0x05 } }
|
||||
|
||||
// {E93E73B1-0197-11d3-96D4-0060B0FB9956}
|
||||
#define NS_FILELISTTRANSFERABLE_CID \
|
||||
{ 0xe93e73b1, 0x197, 0x11d3, { 0x96, 0xd4, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } }
|
||||
|
||||
//-----------------------------------------------------------
|
||||
//Other
|
||||
//-----------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -40,8 +40,6 @@ CPPSRCS = \
|
|||
nsClipboard.cpp \
|
||||
nsDragService.cpp \
|
||||
nsFilePicker.cpp \
|
||||
nsFontRetrieverService.cpp \
|
||||
nsFontSizeIterator.cpp \
|
||||
nsLabel.cpp \
|
||||
nsLookAndFeel.cpp \
|
||||
nsObject.cpp \
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
#include "nsFilePicker.h"
|
||||
#include "nsLookAndFeel.h"
|
||||
#include "nsLabel.h"
|
||||
#include "nsFontRetrieverService.h"
|
||||
#ifdef IBMBIDI
|
||||
#include "nsBidiKeyboard.h"
|
||||
#endif
|
||||
|
|
@ -63,10 +62,8 @@ 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);
|
||||
static NS_DEFINE_IID(kCFontRetrieverService, NS_FONTRETRIEVERSERVICE_CID);
|
||||
|
||||
// Drag & Drop, Clipboard
|
||||
static NS_DEFINE_IID(kCDataObj, NS_DATAOBJ_CID);
|
||||
static NS_DEFINE_IID(kCClipboard, NS_CLIPBOARD_CID);
|
||||
static NS_DEFINE_IID(kCClipboardHelper, NS_CLIPBOARDHELPER_CID);
|
||||
static NS_DEFINE_IID(kCTransferable, NS_TRANSFERABLE_CID);
|
||||
|
|
@ -207,9 +204,6 @@ nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter,
|
|||
else if (mClassID.Equals(kCHTMLFormatConverter)) {
|
||||
inst = (nsISupports*)new nsHTMLFormatConverter();
|
||||
}
|
||||
else if (mClassID.Equals(kCFontRetrieverService)) {
|
||||
inst = (nsISupports*)(nsIFontRetrieverService *) new nsFontRetrieverService();
|
||||
}
|
||||
else if (mClassID.Equals(kCDragService)) {
|
||||
inst = (nsISupports*) (nsIDragService *) new nsDragService();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
#include "nsWindow.h"
|
||||
#include "nsAppShell.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsFontRetrieverService.h"
|
||||
#include "nsSound.h"
|
||||
#include "nsITimer.h"
|
||||
|
||||
|
|
@ -66,7 +65,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
|
|||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboard)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontRetrieverService)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimer)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimerManager)
|
||||
#ifdef IBMBIDI
|
||||
|
|
@ -195,10 +193,6 @@ static nsModuleComponentInfo components[] =
|
|||
// "@mozilla.org/widget/dragservice/win;1",
|
||||
"@mozilla.org/widget/dragservice;1",
|
||||
nsDragServiceConstructor },
|
||||
{ "Font Retriever Service",
|
||||
NS_FONTRETRIEVERSERVICE_CID,
|
||||
"@mozilla.org/widget/fontretrieverservice/win;1",
|
||||
nsFontRetrieverServiceConstructor },
|
||||
{ "Timer",
|
||||
NS_TIMER_CID,
|
||||
"@mozilla.org/timer;1",
|
||||
|
|
|
|||
|
|
@ -39,8 +39,6 @@ CPPSRCS = \
|
|||
nsCheckButton.cpp \
|
||||
nsClipboard.cpp \
|
||||
nsDragService.cpp \
|
||||
nsFontRetrieverService.cpp \
|
||||
nsFontSizeIterator.cpp \
|
||||
nsGtkEventHandler.cpp \
|
||||
nsGtkUtils.cpp \
|
||||
nsKeyboardUtils.cpp \
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@
|
|||
#include "nsClipboard.h"
|
||||
#include "nsClipboardHelper.h"
|
||||
#include "nsHTMLFormatConverter.h"
|
||||
#include "nsFontRetrieverService.h"
|
||||
#include "nsDragService.h"
|
||||
#include "nsScrollbar.h"
|
||||
#include "nsSound.h"
|
||||
|
|
@ -62,7 +61,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
|
|||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboard)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontRetrieverService)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
|
||||
#ifdef IBMBIDI
|
||||
|
|
@ -196,10 +194,6 @@ static nsModuleComponentInfo components[] =
|
|||
NS_HTMLFORMATCONVERTER_CID,
|
||||
"@mozilla.org/widget/htmlformatconverter/gtk;1",
|
||||
nsHTMLFormatConverterConstructor },
|
||||
{ "Gtk Font Retriever Service",
|
||||
NS_FONTRETRIEVERSERVICE_CID,
|
||||
"@mozilla.org/widget/fontretrieverservice/gtk;1",
|
||||
nsFontRetrieverServiceConstructor },
|
||||
{ "Gtk Drag Service",
|
||||
NS_DRAGSERVICE_CID,
|
||||
// "@mozilla.org/widget/dragservice/gtk;1",
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
#include "nsTextWidget.h"
|
||||
#include "nsLookAndFeel.h"
|
||||
#include "nsLabel.h"
|
||||
// #include "nsFontRetrieverService.h"
|
||||
|
||||
// Drag & Drop, Clipboard
|
||||
// #include "nsClipboard.h"
|
||||
|
|
@ -64,10 +63,8 @@ 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);
|
||||
static NS_DEFINE_IID(kCFontRetrieverService, NS_FONTRETRIEVERSERVICE_CID);
|
||||
|
||||
// Drag & Drop, Clipboard
|
||||
static NS_DEFINE_IID(kCDataObj, NS_DATAOBJ_CID);
|
||||
static NS_DEFINE_IID(kCClipboard, NS_CLIPBOARD_CID);
|
||||
static NS_DEFINE_IID(kCClipboardHelper, NS_CLIPBOARDHELPER_CID);
|
||||
static NS_DEFINE_IID(kCTransferable, NS_TRANSFERABLE_CID);
|
||||
|
|
@ -208,9 +205,6 @@ nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter,
|
|||
inst = (nsISupports*)(nsIBidiKeyboard*) new nsBidiKeyboard();
|
||||
}
|
||||
#endif // IBMBIDI
|
||||
// else if (mClassID.Equals(kCFontRetrieverService)) {
|
||||
// inst = (nsISupports*)(nsIFontRetrieverService *) new nsFontRetrieverService();
|
||||
// }
|
||||
#if 0
|
||||
else if (mClassID.Equals(kCDragService)) {
|
||||
inst = (nsISupports*)new nsDragService();
|
||||
|
|
|
|||
|
|
@ -46,8 +46,6 @@ CPPSRCS = \
|
|||
nsDirPicker.cpp \
|
||||
nsFSTree.cpp \
|
||||
nsFilePicker.cpp \
|
||||
nsFontRetrieverService.cpp \
|
||||
nsFontSizeIterator.cpp \
|
||||
nsFrameWindow.cpp \
|
||||
nsLookAndFeel.cpp \
|
||||
nsModule.cpp \
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@
|
|||
// * atom management
|
||||
// * printing bits & pieces (though not really any more)
|
||||
|
||||
#include "nsIFontRetrieverService.h"
|
||||
#include "nsDragService.h"
|
||||
#include "nsAppShell.h"
|
||||
|
||||
|
|
@ -97,8 +96,6 @@ void nsWidgetModuleData::Init( nsIAppShell *aPrimaevalAppShell)
|
|||
DosQueryDBCSEnv( CCHMAXPATH, &cc, buffer);
|
||||
bIsDBCS = buffer[0] || buffer[1];
|
||||
|
||||
fontService = nsnull;
|
||||
|
||||
// XXXX KNOCKED OUT UNTIL nsDragService.cpp builds again
|
||||
// dragService = new nsDragService;
|
||||
// NS_ADDREF(dragService);
|
||||
|
|
@ -124,8 +121,6 @@ nsWidgetModuleData::~nsWidgetModuleData()
|
|||
|
||||
NS_IF_RELEASE(dragService);
|
||||
|
||||
NS_IF_RELEASE(fontService);
|
||||
|
||||
PRInt32 cAtoms = atoms.Count();
|
||||
HATOMTBL systbl = WinQuerySystemAtomTable();
|
||||
for( PRInt32 i = 0; i < cAtoms; i++)
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
#define _H_NSMODULE
|
||||
|
||||
#include "nsISupports.h"
|
||||
#include "nsIFontRetrieverService.h"
|
||||
#include "nsDragService.h"
|
||||
#include "nsWidgetDefs.h"
|
||||
|
||||
|
|
@ -58,7 +57,6 @@ class nsWidgetModuleData : public nsISupports
|
|||
BOOL bIsDBCS; // true if system is dbcs
|
||||
|
||||
// xptoolkit services we look after, & the primaeval appshell too.
|
||||
nsIFontRetrieverService *fontService;
|
||||
nsDragService *dragService;
|
||||
nsIAppShell *appshell;
|
||||
|
||||
|
|
@ -111,4 +109,4 @@ class nsWidgetModuleData : public nsISupports
|
|||
nsVoidArray atoms;
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -120,7 +120,6 @@ static nsUconvInfo gUconvInfo[15 /* eCharSet_COUNT from nsFontMetricsOS2.cpp */
|
|||
{ "JOHAB", 1361, NULL }
|
||||
};
|
||||
|
||||
class nsIFontRetrieverService;
|
||||
class nsDragService;
|
||||
class nsIAppShell;
|
||||
|
||||
|
|
|
|||
|
|
@ -51,8 +51,6 @@
|
|||
#include "nsDragService.h"
|
||||
#include "nsILocalFile.h"
|
||||
#include "nsFilePicker.h"
|
||||
#include "nsFontRetrieverService.h"
|
||||
#include "nsFontSizeIterator.h"
|
||||
#include "nsLookAndFeel.h"
|
||||
#include "nsScrollbar.h"
|
||||
#include "nsSound.h"
|
||||
|
|
@ -77,7 +75,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsCanvas)
|
|||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboard)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePicker)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontRetrieverService)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFrameWindow)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLookAndFeel)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
|
||||
|
|
@ -260,10 +257,6 @@ static nsModuleComponentInfo components[] =
|
|||
NS_FILEPICKER_CID,
|
||||
"@mozilla.org/filepicker;1",
|
||||
nsFilePickerConstructor },
|
||||
{ "OS/2 Font Retriever Service",
|
||||
NS_FONTRETRIEVERSERVICE_CID,
|
||||
"@mozilla.org/widget/fontretrieverservice/os2;1",
|
||||
nsFontRetrieverServiceConstructor },
|
||||
{ "OS/2 Look And Feel",
|
||||
NS_LOOKANDFEEL_CID,
|
||||
"@mozilla.org/widget/lookandfeel/os2;1",
|
||||
|
|
|
|||
|
|
@ -31,8 +31,6 @@ CPPSRCS = \
|
|||
Accessible.cpp \
|
||||
SimpleDOMNode.cpp \
|
||||
!endif
|
||||
nsFontRetrieverService.cpp \
|
||||
nsFontSizeIterator.cpp \
|
||||
nsNativeDragTarget.cpp \
|
||||
nsNativeDragSource.cpp \
|
||||
nsDragService.cpp \
|
||||
|
|
@ -58,8 +56,6 @@ OBJS = \
|
|||
.\$(OBJDIR)\Accessible.obj \
|
||||
.\$(OBJDIR)\SimpleDOMNode.obj \
|
||||
!endif
|
||||
.\$(OBJDIR)\nsFontRetrieverService.obj \
|
||||
.\$(OBJDIR)\nsFontSizeIterator.obj \
|
||||
.\$(OBJDIR)\nsNativeDragTarget.obj \
|
||||
.\$(OBJDIR)\nsNativeDragSource.obj \
|
||||
.\$(OBJDIR)\nsDragService.obj \
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
#include "nsClipboard.h"
|
||||
#include "nsClipboardHelper.h"
|
||||
#include "nsHTMLFormatConverter.h"
|
||||
//#include "nsFontRetrieverService.h"
|
||||
#include "nsDragService.h"
|
||||
#include "nsScrollBar.h"
|
||||
#include "nsSound.h"
|
||||
|
|
@ -62,7 +61,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
|
|||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboard)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
|
||||
//NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontRetrieverService)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
|
||||
#ifdef IBMBIDI
|
||||
|
|
@ -195,10 +193,6 @@ static nsModuleComponentInfo components[] =
|
|||
NS_HTMLFORMATCONVERTER_CID,
|
||||
"@mozilla.org/widget/htmlformatconverter/xlib;1",
|
||||
nsHTMLFormatConverterConstructor },
|
||||
//{ "Xlib Font Retriever Service",
|
||||
//NS_FONTRETRIEVERSERVICE_CID,
|
||||
//"@mozilla.org/widget/fontretrieverservice/xlib;1",
|
||||
//nsFontRetrieverServiceConstructor },
|
||||
{ "Xlib Drag Service",
|
||||
NS_DRAGSERVICE_CID,
|
||||
// "@mozilla.org/widget/dragservice/xlib;1",
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче