Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates to support latest raptor changes

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@11582 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
spider%netscape.com
1998-09-30 19:22:29 +00:00
parent 261f3660bc
commit afe5d3fcb2
47 changed files with 323 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/xpfc/parser/inc/manifest.mn
View File

@@ -13,7 +13,7 @@ EXPORTS = \
nsXPFCXMLContentSink.h \
nsXPFCXMLDTD.h \
nsMenuManager.h \
nsToolbarManager.h \
nsXPFCToolbarManager.h \
$(NULL)
MODULE = xpfc

10
mozilla/xpfc/parser/inc/nsMenuManager.h
View File

@@ -32,10 +32,10 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHOD Init();
NS_IMETHOD SetMenuBar(nsIMenuBar * aMenuBar);
NS_IMETHOD_(nsIMenuBar *) GetMenuBar();
NS_IMETHOD AddMenuContainer(nsIMenuContainer * aMenuContainer) ;
NS_IMETHOD_(nsIMenuItem *) MenuItemFromID(PRUint32 aID) ;
NS_IMETHOD SetMenuBar(nsIXPFCMenuBar * aMenuBar);
NS_IMETHOD_(nsIXPFCMenuBar *) GetMenuBar();
NS_IMETHOD AddMenuContainer(nsIXPFCMenuContainer * aMenuContainer) ;
NS_IMETHOD_(nsIXPFCMenuItem *) MenuItemFromID(PRUint32 aID) ;
NS_IMETHOD_(PRUint32) GetID();
NS_IMETHOD_(nsIXPFCCommandReceiver*) GetDefaultReceiver() ;
NS_IMETHOD SetDefaultReceiver(nsIXPFCCommandReceiver* aReceiver) ;
@@ -44,7 +44,7 @@ protected:
~nsMenuManager();
private:
nsIMenuBar * mMenuBar;
nsIXPFCMenuBar * mMenuBar;
nsIVector * mMenuContainers;
PRUint32 mValidMenuID;
nsIXPFCCommandReceiver * mDefaultReceiver;

14
mozilla/xpfc/parser/inc/nsToolbarManager.h → mozilla/xpfc/parser/inc/nsXPFCToolbarManager.h
View File

@@ -16,18 +16,18 @@
* Reserved.
*/
#ifndef nsToolbarManager_h___
#define nsToolbarManager_h___
#ifndef nsXPFCToolbarManager_h___
#define nsXPFCToolbarManager_h___
#include "nsIToolbarManager.h"
#include "nsIXPFCToolbarManager.h"
#include "nsIVector.h"
#include "nsIIterator.h"
class nsToolbarManager : public nsIToolbarManager
class nsXPFCToolbarManager : public nsIXPFCToolbarManager
{
public:
nsToolbarManager();
nsXPFCToolbarManager();
NS_DECL_ISUPPORTS
@@ -35,11 +35,11 @@ public:
NS_IMETHOD AddToolbar(nsIXPFCToolbar * aToolbar);
protected:
~nsToolbarManager();
~nsXPFCToolbarManager();
private:
nsIVector * mToolbars;
};
#endif /* nsToolbarManager_h___ */
#endif /* nsXPFCToolbarManager_h___ */

2
mozilla/xpfc/parser/public/manifest.mn
View File

@@ -13,7 +13,7 @@ DEPTH = ../../..
EXPORTS = \
nsIXMLParserObject.h \
nsIMenuManager.h \
nsIToolbarManager.h \
nsIXPFCToolbarManager.h \
nsIXPFCXMLContentSink.h \
$(NULL)

12
mozilla/xpfc/parser/public/nsIMenuManager.h
View File

@@ -20,10 +20,10 @@
#define nsIMenuManager_h___
#include "nsISupports.h"
#include "nsIMenuContainer.h"
#include "nsIXPFCMenuContainer.h"
#include "nsIXPFCCommandReceiver.h"
class nsIMenuBar;
class nsIXPFCMenuBar;
//5e1180e0-30a9-11d2-9247-00805f8a7ab6
#define NS_IMENU_MANAGER_IID \
@@ -36,10 +36,10 @@ class nsIMenuManager : public nsISupports
public:
NS_IMETHOD Init() = 0 ;
NS_IMETHOD SetMenuBar(nsIMenuBar * aMenuBar) = 0;
NS_IMETHOD_(nsIMenuBar *) GetMenuBar() = 0;
NS_IMETHOD AddMenuContainer(nsIMenuContainer * aMenuContainer) = 0;
NS_IMETHOD_(nsIMenuItem *) MenuItemFromID(PRUint32 aID) = 0;
NS_IMETHOD SetMenuBar(nsIXPFCMenuBar * aMenuBar) = 0;
NS_IMETHOD_(nsIXPFCMenuBar *) GetMenuBar() = 0;
NS_IMETHOD AddMenuContainer(nsIXPFCMenuContainer * aMenuContainer) = 0;
NS_IMETHOD_(nsIXPFCMenuItem *) MenuItemFromID(PRUint32 aID) = 0;
NS_IMETHOD_(PRUint32) GetID() = 0;
NS_IMETHOD_(nsIXPFCCommandReceiver*) GetDefaultReceiver() = 0;
NS_IMETHOD SetDefaultReceiver(nsIXPFCCommandReceiver* aReceiver) = 0;

10
mozilla/xpfc/parser/public/nsIToolbarManager.h → mozilla/xpfc/parser/public/nsIXPFCToolbarManager.h
View File

@@ -16,8 +16,8 @@
* Reserved.
*/
#ifndef nsIToolbarManager_h___
#define nsIToolbarManager_h___
#ifndef nsIXPFCToolbarManager_h___
#define nsIXPFCToolbarManager_h___
#include "nsISupports.h"
#include "nsIXPFCCommandReceiver.h"
@@ -25,11 +25,11 @@
class nsIXPFCToolbar;
//ba72e190-35f1-11d2-9248-00805f8a7ab6
#define NS_ITOOLBAR_MANAGER_IID \
#define NS_IXPFCTOOLBAR_MANAGER_IID \
{ 0xba72e190, 0x35f1, 0x11d2, \
{ 0x92, 0x48, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6 } }
class nsIToolbarManager : public nsISupports
class nsIXPFCToolbarManager : public nsISupports
{
public:
@@ -39,4 +39,4 @@ public:
};
#endif /* nsIToolbarManager_h___ */
#endif /* nsIXPFCToolbarManager_h___ */

2
mozilla/xpfc/parser/src/manifest.mn
View File

@@ -21,7 +21,7 @@ CPPSRCS = \
nsXPFCXMLContentSink.cpp \
nsXPFCXMLDTD.cpp \
nsMenuManager.cpp \
nsToolbarManager.cpp \
nsXPFCToolbarManager.cpp \
$(NULL)
REQUIRES = xpcom raptor netlib xpfc

12
mozilla/xpfc/parser/src/nsMenuManager.cpp
View File

@@ -19,7 +19,7 @@
#include "nsMenuManager.h"
#include "nsxpfcCIID.h"
#include "nsxpfcutil.h"
#include "nsIMenuBar.h"
#include "nsIXPFCMenuBar.h"
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kCMenuManagerCID, NS_MENU_MANAGER_CID);
@@ -67,14 +67,14 @@ nsresult nsMenuManager :: Init()
return NS_OK ;
}
nsresult nsMenuManager :: SetMenuBar(nsIMenuBar * aMenuBar)
nsresult nsMenuManager :: SetMenuBar(nsIXPFCMenuBar * aMenuBar)
{
mMenuBar = aMenuBar;
NS_ADDREF(mMenuBar);
return NS_OK ;
}
nsIMenuBar * nsMenuManager :: GetMenuBar()
nsIXPFCMenuBar * nsMenuManager :: GetMenuBar()
{
return (mMenuBar) ;
}
@@ -90,15 +90,15 @@ nsresult nsMenuManager :: SetDefaultReceiver(nsIXPFCCommandReceiver * aReceiver)
return (NS_OK) ;
}
nsresult nsMenuManager::AddMenuContainer(nsIMenuContainer * aMenuContainer)
nsresult nsMenuManager::AddMenuContainer(nsIXPFCMenuContainer * aMenuContainer)
{
mMenuContainers->Append(aMenuContainer);
return NS_OK;
}
nsIMenuItem * nsMenuManager::MenuItemFromID(PRUint32 aID)
nsIXPFCMenuItem * nsMenuManager::MenuItemFromID(PRUint32 aID)
{
nsIMenuItem * item = nsnull;
nsIXPFCMenuItem * item = nsnull;
if (mMenuBar)
item = mMenuBar->MenuItemFromID(aID);

20
mozilla/xpfc/parser/src/nsToolbarManager.cpp → mozilla/xpfc/parser/src/nsXPFCToolbarManager.cpp
View File

@@ -16,22 +16,22 @@
* Reserved.
*/
#include "nsToolbarManager.h"
#include "nsXPFCToolbarManager.h"
#include "nsxpfcCIID.h"
#include "nsxpfcutil.h"
#include "nsIXPFCToolbar.h"
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kCToolbarManagerCID, NS_TOOLBAR_MANAGER_CID);
static NS_DEFINE_IID(kIToolbarManagerIID, NS_ITOOLBAR_MANAGER_IID);
static NS_DEFINE_IID(kCXPFCToolbarManagerCID, NS_XPFCTOOLBAR_MANAGER_CID);
static NS_DEFINE_IID(kIXPFCToolbarManagerIID, NS_IXPFCTOOLBAR_MANAGER_IID);
nsToolbarManager :: nsToolbarManager()
nsXPFCToolbarManager :: nsXPFCToolbarManager()
{
NS_INIT_REFCNT();
mToolbars = nsnull;
}
nsToolbarManager :: ~nsToolbarManager()
nsXPFCToolbarManager :: ~nsXPFCToolbarManager()
{
if (mToolbars != nsnull)
{
@@ -41,11 +41,11 @@ nsToolbarManager :: ~nsToolbarManager()
}
NS_IMPL_QUERY_INTERFACE(nsToolbarManager, kIToolbarManagerIID)
NS_IMPL_ADDREF(nsToolbarManager)
NS_IMPL_RELEASE(nsToolbarManager)
NS_IMPL_QUERY_INTERFACE(nsXPFCToolbarManager, kIXPFCToolbarManagerIID)
NS_IMPL_ADDREF(nsXPFCToolbarManager)
NS_IMPL_RELEASE(nsXPFCToolbarManager)
nsresult nsToolbarManager :: Init()
nsresult nsXPFCToolbarManager :: Init()
{
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
@@ -61,7 +61,7 @@ nsresult nsToolbarManager :: Init()
return NS_OK ;
}
nsresult nsToolbarManager :: AddToolbar(nsIXPFCToolbar * aToolbar)
nsresult nsXPFCToolbarManager :: AddToolbar(nsIXPFCToolbar * aToolbar)
{
mToolbars->Append(aToolbar);
return NS_OK ;

60
mozilla/xpfc/parser/src/nsXPFCXMLContentSink.cpp
View File

@@ -21,9 +21,9 @@
#include "nsxpfcCIID.h"
#include "nsIXMLParserObject.h"
#include "nsXPFCXMLContentSink.h"
#include "nsIMenuBar.h"
#include "nsIMenuItem.h"
#include "nsIMenuContainer.h"
#include "nsIXPFCMenuBar.h"
#include "nsIXPFCMenuItem.h"
#include "nsIXPFCMenuContainer.h"
#include "nsIXPFCCanvas.h"
#include "nsIButton.h"
#include "nsITextWidget.h"
@@ -36,12 +36,12 @@ static NS_DEFINE_IID(kIContentSinkIID, NS_ICONTENT_SINK_IID);
static NS_DEFINE_IID(kClassIID, NS_XPFCXMLCONTENTSINK_IID);
static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID);
static NS_DEFINE_IID(kIXMLParserObjectIID, NS_IXML_PARSER_OBJECT_IID);
static NS_DEFINE_IID(kCMenuBarCID, NS_MENUBAR_CID);
static NS_DEFINE_IID(kCMenuItemCID, NS_MENUITEM_CID);
static NS_DEFINE_IID(kCMenuContainerCID, NS_MENUCONTAINER_CID);
static NS_DEFINE_IID(kCIMenuBarIID, NS_IMENUBAR_IID);
static NS_DEFINE_IID(kCIMenuItemIID, NS_IMENUITEM_IID);
static NS_DEFINE_IID(kCIMenuContainerIID, NS_IMENUCONTAINER_IID);
static NS_DEFINE_IID(kCXPFCMenuBarCID, NS_XPFCMENUBAR_CID);
static NS_DEFINE_IID(kCXPFCMenuItemCID, NS_XPFCMENUITEM_CID);
static NS_DEFINE_IID(kCXPFCMenuContainerCID, NS_XPFCMENUCONTAINER_CID);
static NS_DEFINE_IID(kCIXPFCMenuBarIID, NS_IXPFCMENUBAR_IID);
static NS_DEFINE_IID(kCIXPFCMenuItemIID, NS_IXPFCMENUITEM_IID);
static NS_DEFINE_IID(kCIXPFCMenuContainerIID, NS_IXPFCMENUCONTAINER_IID);
static NS_DEFINE_IID(kCXPFCToolbarCID, NS_XPFC_TOOLBAR_CID);
static NS_DEFINE_IID(kCIXPFCToolbarIID, NS_IXPFC_TOOLBAR_IID);
static NS_DEFINE_IID(kCXPFCDialogCID, NS_XPFC_DIALOG_CID);
@@ -262,8 +262,8 @@ NS_IMETHODIMP nsXPFCXMLContentSink::OpenContainer(const nsIParserNode& aNode)
if (eXPFCXMLTag_menubar == tag)
{
nsIMenuBar * menubar;
res = object->QueryInterface(kCIMenuBarIID,(void**)&menubar);
nsIXPFCMenuBar * menubar;
res = object->QueryInterface(kCIXPFCMenuBarIID,(void**)&menubar);
if (NS_OK == res)
{
@@ -532,12 +532,12 @@ NS_IMETHODIMP nsXPFCXMLContentSink::DidBuildModel(PRInt32 aQualityLevel)
* item->object is the parent container
* item->container is the name of the target child container
*
* There should be a nsIMenuContainer in the free list with this
* There should be a nsIXPFCMenuContainer in the free list with this
* name. Let's find it, make it the child, and remove from free list
*/
nsIIterator * iterator2 ;
nsIMenuContainer * menu_container;
nsIXPFCMenuContainer * menu_container;
nsString child;
nsresult res = mOrphanMenuList->CreateIterator(&iterator2);
@@ -549,12 +549,12 @@ NS_IMETHODIMP nsXPFCXMLContentSink::DidBuildModel(PRInt32 aQualityLevel)
while(!(iterator2->IsDone()))
{
menu_container = (nsIMenuContainer *) iterator2->CurrentItem();
menu_container = (nsIXPFCMenuContainer *) iterator2->CurrentItem();
nsIMenuItem * container_item = nsnull;
nsIXPFCMenuItem * container_item = nsnull;
res = menu_container->QueryInterface(kCIMenuItemIID,(void**)&container_item);
res = menu_container->QueryInterface(kCIXPFCMenuItemIID,(void**)&container_item);
if (res == NS_OK)
{
@@ -567,12 +567,12 @@ NS_IMETHODIMP nsXPFCXMLContentSink::DidBuildModel(PRInt32 aQualityLevel)
* Set as child
*/
nsIMenuContainer * parent = nsnull;
res = item->object->QueryInterface(kCIMenuContainerIID, (void**)&parent);
nsIXPFCMenuContainer * parent = nsnull;
res = item->object->QueryInterface(kCIXPFCMenuContainerIID, (void**)&parent);
if (res == NS_OK)
{
parent->AddChild((nsIMenuItem *)container_item);
parent->AddChild((nsIXPFCMenuItem *)container_item);
}
mOrphanMenuList->Remove(child);
@@ -629,15 +629,15 @@ NS_IMETHODIMP nsXPFCXMLContentSink::CIDFromTag(eXPFCXMLTags tag, nsCID &aClass)
switch(tag)
{
case eXPFCXMLTag_menuitem:
aClass = kCMenuItemCID;
aClass = kCXPFCMenuItemCID;
break;
case eXPFCXMLTag_menucontainer:
aClass = kCMenuContainerCID;
aClass = kCXPFCMenuContainerCID;
break;
case eXPFCXMLTag_menubar:
aClass = kCMenuBarCID;
aClass = kCXPFCMenuBarCID;
break;
case eXPFCXMLTag_toolbar:
@@ -795,12 +795,12 @@ NS_IMETHODIMP nsXPFCXMLContentSink::AddToHierarchy(nsIXMLParserObject& aObject,
} else if (mState == XPFC_PARSING_STATE_MENUBAR)
{
nsIMenuContainer * container = nsnull;
nsIMenuContainer * parent = nsnull;
nsIXPFCMenuContainer * container = nsnull;
nsIXPFCMenuContainer * parent = nsnull;
nsresult res = aObject.QueryInterface(kCIMenuContainerIID,(void**)&container);
nsresult res = aObject.QueryInterface(kCIXPFCMenuContainerIID,(void**)&container);
parent = (nsIMenuContainer *) mXPFCStack->Top();
parent = (nsIXPFCMenuContainer *) mXPFCStack->Top();
if (NS_OK != res)
{
@@ -808,9 +808,9 @@ NS_IMETHODIMP nsXPFCXMLContentSink::AddToHierarchy(nsIXMLParserObject& aObject,
/*
* Must be a menu item. Add as child to top of stack
*/
nsIMenuItem * item = nsnull;
nsIXPFCMenuItem * item = nsnull;
aObject.QueryInterface(kCIMenuItemIID,(void**)&item);
aObject.QueryInterface(kCIXPFCMenuItemIID,(void**)&item);
parent->AddChild(item);
@@ -825,9 +825,9 @@ NS_IMETHODIMP nsXPFCXMLContentSink::AddToHierarchy(nsIXMLParserObject& aObject,
if (res == NS_OK && parent != nsnull)
{
nsIMenuItem * item = nsnull;
nsIXPFCMenuItem * item = nsnull;
nsresult res = aObject.QueryInterface(kCIMenuItemIID,(void**)&item);
nsresult res = aObject.QueryInterface(kCIXPFCMenuItemIID,(void**)&item);
parent->AddChild(item);