mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Updates to support latest raptor changes

This commit is contained in:
spider%netscape.com 1998-09-30 19:22:29 +00:00
Родитель 620875cfdf
Коммит 66406b6d6d
47 изменённых файлов: 323 добавлений и 323 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
calendar/modules/shell/inc/nsCalendarContainer.h
Просмотреть файл

@ -21,7 +21,7 @@
#include <stdio.h>
#include "nsICalendarContainer.h"
#include "nsIMenuBar.h"
#include "nsIXPFCMenuBar.h"
#include "nsString.h"
#include "nsICalendarShell.h"
#include "nsICalendarWidget.h"
@ -52,7 +52,7 @@ public:
NS_IMETHOD SetTitle(const nsString& aTitle) ;
NS_IMETHOD GetTitle(nsString& aResult) ;
NS_IMETHOD SetMenuBar(nsIMenuBar * aMenuBar) ;
NS_IMETHOD SetMenuBar(nsIXPFCMenuBar * aMenuBar) ;
NS_IMETHOD UpdateMenuBar();
NS_IMETHOD_(nsICalendarWidget *) GetDocumentWidget();
@ -69,8 +69,8 @@ public:
NS_IMETHOD SetApplicationShell(nsIApplicationShell* aShell);
NS_IMETHOD GetApplicationShell(nsIApplicationShell*& aResult);
NS_IMETHOD SetToolbarManager(nsIToolbarManager * aToolbarManager);
NS_IMETHOD_(nsIToolbarManager *) GetToolbarManager();
NS_IMETHOD SetToolbarManager(nsIXPFCToolbarManager * aToolbarManager);
NS_IMETHOD_(nsIXPFCToolbarManager *) GetToolbarManager();
NS_IMETHOD AddToolbar(nsIXPFCToolbar * aToolbar);
NS_IMETHOD RemoveToolbar(nsIXPFCToolbar * aToolbar);
NS_IMETHOD UpdateToolbars();
@ -88,7 +88,7 @@ public:
private:
nsIMenuManager * mMenuManager;
nsIToolbarManager * mToolbarManager;
nsIXPFCToolbarManager * mToolbarManager;
nsICalendarWidget * mCalendarWidget;
nsIXPFCCanvas * mRootCanvas;
nsICalToolkit * mToolkit;

6
calendar/modules/shell/inc/nsCalendarShell.h
Просмотреть файл

@ -79,9 +79,9 @@ public:
NS_IMETHOD_(NSCalendar *) GetNSCalendar() ;
// nsIAppShell interfaces
virtual void Create(int* argc, char ** argv) ;
virtual void SetDispatchListener(nsDispatchListener* aDispatchListener) ;
virtual void Exit();
NS_IMETHOD Create(int* argc, char ** argv) ;
NS_IMETHOD SetDispatchListener(nsDispatchListener* aDispatchListener) ;
NS_IMETHOD Exit();
virtual nsresult Run();
virtual void* GetNativeData(PRUint32 aDataType) ;

2
calendar/modules/shell/public/nsICalendarWidget.h
Просмотреть файл

@ -21,7 +21,7 @@
#include "nsIContentViewer.h"
#include "nsIParser.h"
#include "nsIXPFCCanvas.h"
#include "nsIMenuBar.h"
#include "nsIXPFCMenuBar.h"
class nsIPostData;
class nsICalendarShell;

12
calendar/modules/shell/src/nsCalendarContainer.cpp
Просмотреть файл

@ -263,7 +263,7 @@ nsresult nsCalendarContainer::Init(nsIWidget * aParent,
}
nsresult nsCalendarContainer::SetMenuBar(nsIMenuBar * aMenuBar)
nsresult nsCalendarContainer::SetMenuBar(nsIXPFCMenuBar * aMenuBar)
{
mMenuManager->SetMenuBar(aMenuBar);
@ -291,7 +291,7 @@ nsIMenuManager * nsCalendarContainer::GetMenuManager()
}
nsresult nsCalendarContainer::SetToolbarManager(nsIToolbarManager * aToolbarManager)
nsresult nsCalendarContainer::SetToolbarManager(nsIXPFCToolbarManager * aToolbarManager)
{
mToolbarManager = aToolbarManager;
@ -301,7 +301,7 @@ nsresult nsCalendarContainer::SetToolbarManager(nsIToolbarManager * aToolbarMana
}
nsIToolbarManager * nsCalendarContainer::GetToolbarManager()
nsIXPFCToolbarManager * nsCalendarContainer::GetToolbarManager()
{
return (mToolbarManager);
}
@ -393,11 +393,11 @@ nsresult nsCalendarContainer::ShowDialog(nsIXPFCDialog * aDialog)
nsresult nsCalendarContainer::UpdateMenuBar()
{
static NS_DEFINE_IID(kCIMenuContainerIID, NS_IMENUCONTAINER_IID);
static NS_DEFINE_IID(kCIXPFCMenuContainerIID, NS_IXPFCMENUCONTAINER_IID);
nsIMenuContainer * container = nsnull;
nsIXPFCMenuContainer * container = nsnull;
nsresult res = mMenuManager->GetMenuBar()->QueryInterface(kCIMenuContainerIID,(void**)&container);
nsresult res = mMenuManager->GetMenuBar()->QueryInterface(kCIXPFCMenuContainerIID,(void**)&container);
if (res == NS_OK)
{

12
calendar/modules/shell/src/nsCalendarShell.cpp
Просмотреть файл

@ -698,17 +698,17 @@ NSCalendar * nsCalendarShell::GetNSCalendar()
}
void nsCalendarShell::Create(int* argc, char ** argv)
nsresult nsCalendarShell::Create(int* argc, char ** argv)
{
return;
return NS_OK;
}
void nsCalendarShell::Exit()
nsresult nsCalendarShell::Exit()
{
NS_IF_RELEASE(mDocumentContainer);
NLS_Terminate();
return;
return NS_OK;
}
nsresult nsCalendarShell::Run()
@ -717,9 +717,9 @@ nsresult nsCalendarShell::Run()
return NS_OK;
}
void nsCalendarShell::SetDispatchListener(nsDispatchListener* aDispatchListener)
nsresult nsCalendarShell::SetDispatchListener(nsDispatchListener* aDispatchListener)
{
return ;
return NS_OK;
}
void* nsCalendarShell::GetNativeData(PRUint32 aDataType)
{

6
calendar/modules/test/inc/nsTrexTestShell.h
Просмотреть файл

@ -58,9 +58,9 @@ public:
NS_IMETHOD Init();
// nsIAppShell interfaces
virtual void Create(int* argc, char ** argv) ;
virtual void SetDispatchListener(nsDispatchListener* aDispatchListener) ;
virtual void Exit();
NS_IMETHOD Create(int* argc, char ** argv) ;
NS_IMETHOD SetDispatchListener(nsDispatchListener* aDispatchListener) ;
NS_IMETHOD Exit();
virtual nsresult Run();
virtual void* GetNativeData(PRUint32 aDataType) ;

12
calendar/modules/test/src/nsTrexTestShell.cpp
Просмотреть файл

@ -283,13 +283,13 @@ nsresult nsTrexTestShell::Init()
}
void nsTrexTestShell::Create(int* argc, char ** argv)
nsresult nsTrexTestShell::Create(int* argc, char ** argv)
{
return;
return NS_OK;
}
void nsTrexTestShell::Exit()
nsresult nsTrexTestShell::Exit()
{
return;
return NS_OK;
}
nsresult nsTrexTestShell::Run()
@ -298,9 +298,9 @@ nsresult nsTrexTestShell::Run()
return NS_OK;
}
void nsTrexTestShell::SetDispatchListener(nsDispatchListener* aDispatchListener)
nsresult nsTrexTestShell::SetDispatchListener(nsDispatchListener* aDispatchListener)
{
return ;
return NS_OK;
}
void* nsTrexTestShell::GetNativeData(PRUint32 aDataType)

2
calendar/modules/ui/core/inc/nscalstrings.h
Просмотреть файл

@ -50,7 +50,7 @@
#define CAL_STRING_PANEL "panel"
#define CAL_STRING_RESOURCE_UI_MENUBAR "resource://res/ui/menubar.ui"
#define CAL_STRING_RESOURCE_UI_TOOLBAR "resource://res/ui/toolbar.ui"
#define CAL_STRING_RESOURCE_UI_CALENDAR "resource://res/ui/julian.cal"
#define CAL_STRING_RESOURCE_UI_CALENDAR "resource://res/ui/trex.ui"
#define CAL_STRING_RULE "rule"
#define CAL_STRING_SECOND "second"
#define CAL_STRING_SETBACKGROUNDCOLOR "setbackgroundcolor"

4
xpfc/chrome/inc/manifest.mn
Просмотреть файл

@ -13,8 +13,8 @@ EXPORTS = \
$(NULL)
PRIVATE_EXPORTS = \
nsMenuContainer.h \
nsMenuItem.h \
nsXPFCMenuContainer.h \
nsXPFCMenuItem.h \
nsXPFCToolbar.h \
$(NULL)

26
xpfc/chrome/inc/nsMenuContainer.h → xpfc/chrome/inc/nsXPFCMenuContainer.h
Просмотреть файл

@ -16,20 +16,20 @@
* Reserved.
*/
#ifndef __NS_MENU_CONTAINER
#define __NS_MENU_CONTAINER
#ifndef __NS_XPFCMENU_CONTAINER
#define __NS_XPFCMENU_CONTAINER
#include "nsIMenuContainer.h"
#include "nsIMenuBar.h"
#include "nsMenuItem.h"
#include "nsIXPFCMenuContainer.h"
#include "nsIXPFCMenuBar.h"
#include "nsXPFCMenuItem.h"
#include "nsIVector.h"
#include "nsIIterator.h"
#include "nsIXPFCCommandReceiver.h"
class nsMenuContainer : public nsIMenuContainer,
public nsIMenuBar,
class nsXPFCMenuContainer : public nsIXPFCMenuContainer,
public nsIXPFCMenuBar,
public nsIXPFCCommandReceiver,
public nsMenuItem
public nsXPFCMenuItem
{
public:
@ -38,8 +38,8 @@ public:
* Constructor and Destructor
*/
nsMenuContainer();
~nsMenuContainer();
nsXPFCMenuContainer();
~nsXPFCMenuContainer();
/**
* ISupports Interface
@ -52,16 +52,16 @@ public:
*/
NS_IMETHOD Init();
NS_IMETHOD AddMenuItem(nsIMenuItem * aMenuItem);
NS_IMETHOD AddMenuItem(nsIXPFCMenuItem * aMenuItem);
NS_IMETHOD_(void*) GetNativeHandle();
// nsIXMLParserObject methods
NS_IMETHOD SetParameter(nsString& aKey, nsString& aValue) ;
NS_IMETHOD AddChild(nsIMenuItem * aItem);
NS_IMETHOD AddChild(nsIXPFCMenuItem * aItem);
NS_IMETHOD Update() ;
NS_IMETHOD SetShellContainer(nsIShellInstance * aShellInstance,nsIWebViewerContainer * aWebViewerContainer) ;
NS_IMETHOD_(nsIMenuItem *) MenuItemFromID(PRUint32 aID) ;
NS_IMETHOD_(nsIXPFCMenuItem *) MenuItemFromID(PRUint32 aID) ;
NS_IMETHOD Action(nsIXPFCCommand * aCommand) ;
private:

18
xpfc/chrome/inc/nsMenuItem.h → xpfc/chrome/inc/nsXPFCMenuItem.h
Просмотреть файл

@ -16,14 +16,14 @@
* Reserved.
*/
#ifndef __NS_MENU_ITEM
#define __NS_MENU_ITEM
#ifndef __NS_XPFCMENU_ITEM
#define __NS_XPFCMENU_ITEM
#include "nsIMenuItem.h"
#include "nsIXPFCMenuItem.h"
#include "nsIXMLParserObject.h"
#include "nsIXPFCCommandReceiver.h"
class nsMenuItem : public nsIMenuItem,
class nsXPFCMenuItem : public nsIXPFCMenuItem,
public nsIXMLParserObject
{
@ -33,8 +33,8 @@ public:
* Constructor and Destructor
*/
nsMenuItem();
~nsMenuItem();
nsXPFCMenuItem();
~nsXPFCMenuItem();
/**
* ISupports Interface
@ -57,8 +57,8 @@ public:
NS_IMETHOD SetCommand(nsString& aLabel);
NS_IMETHOD_(nsString&) GetCommand();
NS_IMETHOD_(nsIMenuContainer *) GetParent();
NS_IMETHOD SetParent(nsIMenuContainer * aMenuContainer);
NS_IMETHOD_(nsIXPFCMenuContainer *) GetParent();
NS_IMETHOD SetParent(nsIXPFCMenuContainer * aMenuContainer);
NS_IMETHOD_(PRBool) IsSeparator() ;
@ -78,7 +78,7 @@ private:
nsString mName;
nsString mLabel;
nsString mCommand;
nsIMenuContainer * mParent;
nsIXPFCMenuContainer * mParent;
PRBool mSeparator;
nsAlignmentStyle mAlignmentStyle;
PRUint32 mID;

6
xpfc/chrome/public/manifest.mn
Просмотреть файл

@ -11,9 +11,9 @@ GDEPTH = ../../..
DEPTH = ../../../..
EXPORTS = \
nsIMenuBar.h \
nsIMenuContainer.h \
nsIMenuItem.h \
nsIXPFCMenuBar.h \
nsIXPFCMenuContainer.h \
nsIXPFCMenuItem.h \
nsIXPFCToolbar.h \
$(NULL)

18
xpfc/chrome/public/nsIMenuBar.h → xpfc/chrome/public/nsIXPFCMenuBar.h
Просмотреть файл

@ -16,29 +16,29 @@
* Reserved.
*/
#ifndef nsIMenuBar_h___
#define nsIMenuBar_h___
#ifndef nsIXPFCMenuBar_h___
#define nsIXPFCMenuBar_h___
#include "nsISupports.h"
#include "nsIShellInstance.h"
#include "nsIMenuItem.h"
#include "nsIMenuContainer.h"
#include "nsIXPFCMenuItem.h"
#include "nsIXPFCMenuContainer.h"
#include "nsIWebViewerContainer.h"
// 52fb95f0-2cbe-11d2-9246-00805f8a7ab6
#define NS_IMENUBAR_IID \
#define NS_IXPFCMENUBAR_IID \
{ 0x52fb95f0, 0x2cbe, 0x11d2, \
{0x92, 0x46, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6} }
class nsIMenuBar : public nsISupports
class nsIXPFCMenuBar : public nsISupports
{
public:
NS_IMETHOD SetShellContainer(nsIShellInstance * aShellInstance,
nsIWebViewerContainer * aWebViewerContainer) = 0 ;
NS_IMETHOD_(nsIMenuItem *) MenuItemFromID(PRUint32 aID) = 0;
nsIWebViewerContainer * aWebViewerContainer) = 0 ;
NS_IMETHOD_(nsIXPFCMenuItem *) MenuItemFromID(PRUint32 aID) = 0;
};
#endif /* nsIMenuBar_h___ */
#endif /* nsIXPFCMenuBar_h___ */

20
xpfc/chrome/public/nsIMenuContainer.h → xpfc/chrome/public/nsIXPFCMenuContainer.h
Просмотреть файл

@ -16,36 +16,36 @@
* Reserved.
*/
#ifndef nsIMenuContainer_h___
#define nsIMenuContainer_h___
#ifndef nsIXPFCMenuContainer_h___
#define nsIXPFCMenuContainer_h___
#include "nsISupports.h"
#include "nsIShellInstance.h"
#include "nsIMenuItem.h"
#include "nsIXPFCMenuItem.h"
// 0b396820-2f54-11d2-bede-00805f8a8dbd
#define NS_IMENUCONTAINER_IID \
#define NS_IXPFCMENUCONTAINER_IID \
{ 0x0b396820, 0x2f54, 0x11d2, \
{0xbe, 0xde, 0x00, 0x80, 0x5f, 0x8a, 0x8d, 0xbd} }
class nsIMenuContainer : public nsISupports
class nsIXPFCMenuContainer : public nsISupports
{
public:
/**
* Initialize the MenuContainer
* Initialize the XPFCMenuContainer
* @result The result of the initialization, NS_Ok if no errors
*/
NS_IMETHOD Init() = 0;
NS_IMETHOD AddMenuItem(nsIMenuItem * aMenuItem) = 0;
NS_IMETHOD AddMenuItem(nsIXPFCMenuItem * aMenuItem) = 0;
NS_IMETHOD_(void*) GetNativeHandle() = 0;
NS_IMETHOD AddChild(nsIMenuItem * aItem) = 0;
NS_IMETHOD AddChild(nsIXPFCMenuItem * aItem) = 0;
NS_IMETHOD Update() = 0;
NS_IMETHOD_(nsIMenuItem *) MenuItemFromID(PRUint32 aID) = 0;
NS_IMETHOD_(nsIXPFCMenuItem *) MenuItemFromID(PRUint32 aID) = 0;
};
#endif /* nsIMenuContainer_h___ */
#endif /* nsIXPFCMenuContainer_h___ */

18
xpfc/chrome/public/nsIMenuItem.h → xpfc/chrome/public/nsIXPFCMenuItem.h
Просмотреть файл

@ -16,19 +16,19 @@
* Reserved.
*/
#ifndef nsIMenuItem_h___
#define nsIMenuItem_h___
#ifndef nsIXPFCMenuItem_h___
#define nsIXPFCMenuItem_h___
#include "nsISupports.h"
#include "nsString.h"
#include "nsIXPFCCommandReceiver.h"
// 8a400b00-2cbe-11d2-9246-00805f8a7ab6
#define NS_IMENUITEM_IID \
#define NS_IXPFCMENUITEM_IID \
{ 0x8a400b00, 0x2cbe, 0x11d2, \
{0x92, 0x46, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6} }
class nsIMenuContainer;
class nsIXPFCMenuContainer;
enum nsAlignmentStyle
{
@ -38,13 +38,13 @@ enum nsAlignmentStyle
};
class nsIMenuItem : public nsISupports
class nsIXPFCMenuItem : public nsISupports
{
public:
/**
* Initialize the MenuBar
* Initialize the XPFCMenuBar
* @result The result of the initialization, NS_Ok if no errors
*/
NS_IMETHOD Init() = 0;
@ -58,8 +58,8 @@ public:
NS_IMETHOD SetCommand(nsString& aLabel) = 0;
NS_IMETHOD_(nsString&) GetCommand() = 0;
NS_IMETHOD_(nsIMenuContainer *) GetParent() = 0;
NS_IMETHOD SetParent(nsIMenuContainer * aMenuContainer) = 0;
NS_IMETHOD_(nsIXPFCMenuContainer *) GetParent() = 0;
NS_IMETHOD SetParent(nsIXPFCMenuContainer * aMenuContainer) = 0;
NS_IMETHOD_(PRBool) IsSeparator() = 0;
NS_IMETHOD_(nsAlignmentStyle) GetAlignmentStyle() = 0;
@ -76,5 +76,5 @@ public:
NS_IMETHOD SetEnabled(PRBool aEnable) = 0;
};
#endif /* nsIMenuItem_h___ */
#endif /* nsIXPFCMenuItem_h___ */

4
xpfc/chrome/src/manifest.mn
Просмотреть файл

@ -18,8 +18,8 @@ PRIVATE_EXPORTS = \
MODULE = xpfc
CPPSRCS = \
nsMenuContainer.cpp \
nsMenuItem.cpp \
nsXPFCMenuContainer.cpp \
nsXPFCMenuItem.cpp \
nsXPFCToolbar.cpp \
$(NULL)

62
xpfc/chrome/src/nsMenuContainer.cpp → xpfc/chrome/src/nsXPFCMenuContainer.cpp
Просмотреть файл

@ -17,7 +17,7 @@
*/
#include "nscore.h"
#include "nsMenuContainer.h"
#include "nsXPFCMenuContainer.h"
#include "nsIXMLParserObject.h"
#include "nspr.h"
#include "plstr.h"
@ -28,13 +28,13 @@
#include "nsIWebViewerContainer.h"
static NS_DEFINE_IID(kIXMLParserObjectIID, NS_IXML_PARSER_OBJECT_IID);
static NS_DEFINE_IID(kCIMenuContainerIID, NS_IMENUCONTAINER_IID);
static NS_DEFINE_IID(kCIMenuItemIID, NS_IMENUITEM_IID);
static NS_DEFINE_IID(kCIXPFCMenuContainerIID, NS_IXPFCMENUCONTAINER_IID);
static NS_DEFINE_IID(kCIXPFCMenuItemIID, NS_IXPFCMENUITEM_IID);
static NS_DEFINE_IID(kFileWidgetCID, NS_FILEWIDGET_CID);
static NS_DEFINE_IID(kIFileWidgetIID, NS_IFILEWIDGET_IID);
static NS_DEFINE_IID(kXPFCCommandReceiverIID, NS_IXPFC_COMMANDRECEIVER_IID);
nsMenuContainer::nsMenuContainer() : nsMenuItem()
nsXPFCMenuContainer::nsXPFCMenuContainer() : nsXPFCMenuItem()
{
NS_INIT_REFCNT();
mChildMenus = nsnull;
@ -42,24 +42,24 @@ nsMenuContainer::nsMenuContainer() : nsMenuItem()
mWebViewerContainer = nsnull;
}
nsMenuContainer::~nsMenuContainer()
nsXPFCMenuContainer::~nsXPFCMenuContainer()
{
}
NS_DEFINE_IID(kIMenuContainerIID, NS_IMENUCONTAINER_IID);
NS_DEFINE_IID(kIXPFCMenuContainerIID, NS_IXPFCMENUCONTAINER_IID);
NS_IMPL_ADDREF(nsMenuContainer)
NS_IMPL_RELEASE(nsMenuContainer)
NS_IMPL_ADDREF(nsXPFCMenuContainer)
NS_IMPL_RELEASE(nsXPFCMenuContainer)
nsresult nsMenuContainer::QueryInterface(REFNSIID aIID, void** aInstancePtr)
nsresult nsXPFCMenuContainer::QueryInterface(REFNSIID aIID, void** aInstancePtr)
{
if (NULL == aInstancePtr) {
return NS_ERROR_NULL_POINTER;
}
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kClassIID, kIMenuContainerIID);
static NS_DEFINE_IID(kIMenuBarIID, NS_IMENUBAR_IID);
static NS_DEFINE_IID(kClassIID, kIXPFCMenuContainerIID);
static NS_DEFINE_IID(kIXPFCMenuBarIID, NS_IXPFCMENUBAR_IID);
if (aIID.Equals(kClassIID)) {
*aInstancePtr = (void*) this;
@ -71,8 +71,8 @@ nsresult nsMenuContainer::QueryInterface(REFNSIID aIID, void** aInstancePtr)
AddRef();
return NS_OK;
}
if (aIID.Equals(kIMenuBarIID)) {
*aInstancePtr = (nsIMenuBar*) (this);
if (aIID.Equals(kIXPFCMenuBarIID)) {
*aInstancePtr = (nsIXPFCMenuBar*) (this);
AddRef();
return NS_OK;
}
@ -87,11 +87,11 @@ nsresult nsMenuContainer::QueryInterface(REFNSIID aIID, void** aInstancePtr)
return NS_OK;
}
return (nsMenuItem::QueryInterface(aIID,aInstancePtr));
return (nsXPFCMenuItem::QueryInterface(aIID,aInstancePtr));
}
nsresult nsMenuContainer::Init()
nsresult nsXPFCMenuContainer::Init()
{
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
nsresult res = nsRepository::CreateInstance(kCVectorCID,
@ -107,22 +107,22 @@ nsresult nsMenuContainer::Init()
return NS_OK;
}
void* nsMenuContainer::GetNativeHandle()
void* nsXPFCMenuContainer::GetNativeHandle()
{
return (nsnull);
}
nsresult nsMenuContainer :: SetParameter(nsString& aKey, nsString& aValue)
nsresult nsXPFCMenuContainer :: SetParameter(nsString& aKey, nsString& aValue)
{
return (nsMenuItem::SetParameter(aKey,aValue));
return (nsXPFCMenuItem::SetParameter(aKey,aValue));
}
nsresult nsMenuContainer :: AddMenuItem(nsIMenuItem * aMenuItem)
nsresult nsXPFCMenuContainer :: AddMenuItem(nsIXPFCMenuItem * aMenuItem)
{
return NS_OK;
}
nsresult nsMenuContainer :: AddChild(nsIMenuItem * aItem)
nsresult nsXPFCMenuContainer :: AddChild(nsIXPFCMenuItem * aItem)
{
mChildMenus->Append(aItem);
@ -132,12 +132,12 @@ nsresult nsMenuContainer :: AddChild(nsIMenuItem * aItem)
}
nsresult nsMenuContainer :: Update()
nsresult nsXPFCMenuContainer :: Update()
{
return NS_OK;
}
nsresult nsMenuContainer :: SetShellContainer(nsIShellInstance * aShellInstance,
nsresult nsXPFCMenuContainer :: SetShellContainer(nsIShellInstance * aShellInstance,
nsIWebViewerContainer * aWebViewerContainer)
{
mShellInstance = aShellInstance;
@ -152,13 +152,13 @@ nsresult nsMenuContainer :: SetShellContainer(nsIShellInstance * aShellInstance,
return (NS_OK);
}
nsIMenuItem * nsMenuContainer :: MenuItemFromID(PRUint32 aID)
nsIXPFCMenuItem * nsXPFCMenuContainer :: MenuItemFromID(PRUint32 aID)
{
nsresult res;
nsIIterator * iterator = nsnull;
nsIMenuItem * item = nsnull;
nsIMenuItem * child = nsnull;
nsIMenuContainer * container = nsnull;
nsIXPFCMenuItem * item = nsnull;
nsIXPFCMenuItem * child = nsnull;
nsIXPFCMenuContainer * container = nsnull;
PRBool bFoundItem = PR_FALSE;
res = mChildMenus->CreateIterator(&iterator);
@ -170,7 +170,7 @@ nsIMenuItem * nsMenuContainer :: MenuItemFromID(PRUint32 aID)
while(!(iterator->IsDone()))
{
item = (nsIMenuItem *) iterator->CurrentItem();
item = (nsIXPFCMenuItem *) iterator->CurrentItem();
if (item->GetMenuID() == aID)
{
@ -189,9 +189,9 @@ nsIMenuItem * nsMenuContainer :: MenuItemFromID(PRUint32 aID)
while(!(iterator->IsDone()))
{
child = (nsIMenuItem *) iterator->CurrentItem();
child = (nsIXPFCMenuItem *) iterator->CurrentItem();
res = child->QueryInterface(kCIMenuContainerIID, (void**)&container);
res = child->QueryInterface(kCIXPFCMenuContainerIID, (void**)&container);
if (NS_OK == res)
{
@ -214,7 +214,7 @@ nsIMenuItem * nsMenuContainer :: MenuItemFromID(PRUint32 aID)
return item;
}
nsresult nsMenuContainer :: Action(nsIXPFCCommand * aCommand)
nsresult nsXPFCMenuContainer :: Action(nsIXPFCCommand * aCommand)
{
/*
@ -243,7 +243,7 @@ nsresult nsMenuContainer :: Action(nsIXPFCCommand * aCommand)
return NS_OK;
}
nsresult nsMenuContainer::ProcessActionCommand(nsString& aAction)
nsresult nsXPFCMenuContainer::ProcessActionCommand(nsString& aAction)
{
/*
* Handle File Open...

54
xpfc/chrome/src/nsMenuItem.cpp → xpfc/chrome/src/nsXPFCMenuItem.cpp
Просмотреть файл

@ -17,7 +17,7 @@
*/
#include "nscore.h"
#include "nsMenuItem.h"
#include "nsXPFCMenuItem.h"
#include "nsIXMLParserObject.h"
#include "nsXPFCActionCommand.h"
#include "nsRepository.h"
@ -25,7 +25,7 @@
static NS_DEFINE_IID(kIXMLParserObjectIID, NS_IXML_PARSER_OBJECT_IID);
nsMenuItem::nsMenuItem()
nsXPFCMenuItem::nsXPFCMenuItem()
{
NS_INIT_REFCNT();
mName = "Item";
@ -39,23 +39,23 @@ nsMenuItem::nsMenuItem()
mEnabled = PR_TRUE;
}
nsMenuItem::~nsMenuItem()
nsXPFCMenuItem::~nsXPFCMenuItem()
{
}
NS_DEFINE_IID(kIMenuItemIID, NS_IMENUITEM_IID);
NS_DEFINE_IID(kIXPFCMenuItemIID, NS_IXPFCMENUITEM_IID);
NS_IMPL_ADDREF(nsMenuItem)
NS_IMPL_RELEASE(nsMenuItem)
NS_IMPL_ADDREF(nsXPFCMenuItem)
NS_IMPL_RELEASE(nsXPFCMenuItem)
nsresult nsMenuItem::QueryInterface(REFNSIID aIID, void** aInstancePtr)
nsresult nsXPFCMenuItem::QueryInterface(REFNSIID aIID, void** aInstancePtr)
{
if (NULL == aInstancePtr) {
return NS_ERROR_NULL_POINTER;
}
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kClassIID, kIMenuItemIID);
static NS_DEFINE_IID(kClassIID, kIXPFCMenuItemIID);
if (aIID.Equals(kClassIID)) {
*aInstancePtr = (void*) this;
@ -77,12 +77,12 @@ nsresult nsMenuItem::QueryInterface(REFNSIID aIID, void** aInstancePtr)
}
nsresult nsMenuItem::Init()
nsresult nsXPFCMenuItem::Init()
{
return NS_OK;
}
nsresult nsMenuItem :: SetParameter(nsString& aKey, nsString& aValue)
nsresult nsXPFCMenuItem :: SetParameter(nsString& aKey, nsString& aValue)
{
if (aKey == "name") {
@ -133,95 +133,95 @@ nsresult nsMenuItem :: SetParameter(nsString& aKey, nsString& aValue)
return NS_OK;
}
PRBool nsMenuItem::IsSeparator()
PRBool nsXPFCMenuItem::IsSeparator()
{
return (mSeparator);
}
nsAlignmentStyle nsMenuItem::GetAlignmentStyle()
nsAlignmentStyle nsXPFCMenuItem::GetAlignmentStyle()
{
return (mAlignmentStyle);
}
nsresult nsMenuItem::SetAlignmentStyle(nsAlignmentStyle aAlignmentStyle)
nsresult nsXPFCMenuItem::SetAlignmentStyle(nsAlignmentStyle aAlignmentStyle)
{
mAlignmentStyle = aAlignmentStyle;
return NS_OK;
}
PRBool nsMenuItem::GetEnabled()
PRBool nsXPFCMenuItem::GetEnabled()
{
return (mEnabled);
}
nsresult nsMenuItem::SetEnabled(PRBool aEnable)
nsresult nsXPFCMenuItem::SetEnabled(PRBool aEnable)
{
mEnabled = aEnable;
return NS_OK;
}
nsresult nsMenuItem :: SetName(nsString& aName)
nsresult nsXPFCMenuItem :: SetName(nsString& aName)
{
mName = aName;
return NS_OK;
}
nsString& nsMenuItem :: GetName()
nsString& nsXPFCMenuItem :: GetName()
{
return (mName);
}
nsresult nsMenuItem :: SetCommand(nsString& aCommand)
nsresult nsXPFCMenuItem :: SetCommand(nsString& aCommand)
{
mCommand = aCommand;
return NS_OK;
}
nsString& nsMenuItem :: GetCommand()
nsString& nsXPFCMenuItem :: GetCommand()
{
return (mCommand);
}
nsresult nsMenuItem :: SetLabel(nsString& aLabel)
nsresult nsXPFCMenuItem :: SetLabel(nsString& aLabel)
{
mLabel = aLabel;
return NS_OK;
}
nsString& nsMenuItem :: GetLabel()
nsString& nsXPFCMenuItem :: GetLabel()
{
return (mLabel);
}
nsIMenuContainer * nsMenuItem::GetParent()
nsIXPFCMenuContainer * nsXPFCMenuItem::GetParent()
{
return (mParent);
}
nsresult nsMenuItem::SetParent(nsIMenuContainer * aParent)
nsresult nsXPFCMenuItem::SetParent(nsIXPFCMenuContainer * aParent)
{
mParent = aParent;
return NS_OK;
}
nsresult nsMenuItem :: SetMenuID(PRUint32 aID)
nsresult nsXPFCMenuItem :: SetMenuID(PRUint32 aID)
{
mID = aID;
return NS_OK;
}
PRUint32 nsMenuItem :: GetMenuID()
PRUint32 nsXPFCMenuItem :: GetMenuID()
{
return (mID);
}
nsresult nsMenuItem::SetReceiver(nsIXPFCCommandReceiver * aReceiver)
nsresult nsXPFCMenuItem::SetReceiver(nsIXPFCCommandReceiver * aReceiver)
{
mReceiver = aReceiver;
return NS_OK;
}
nsresult nsMenuItem :: SendCommand()
nsresult nsXPFCMenuItem :: SendCommand()
{
if (mReceiver == nsnull)
return NS_OK;

2
xpfc/chrome/unix/inc/manifest.mn
Просмотреть файл

@ -13,7 +13,7 @@ EXPORTS = \
$(NULL)
PRIVATE_EXPORTS = \
nsMenuContainerUnix.h \
nsXPFCMenuContainerUnix.h \
$(NULL)
MODULE = xpfc

14
xpfc/chrome/unix/inc/nsMenuContainerUnix.h → xpfc/chrome/unix/inc/nsXPFCMenuContainerUnix.h
Просмотреть файл

@ -16,10 +16,10 @@
* Reserved.
*/
#ifndef __NS_MENU_CONTAINER_UNIX
#define __NS_MENU_CONTAINER_UNIX
#ifndef __NS_XPFCMENU_CONTAINER_UNIX
#define __NS_XPFCMENU_CONTAINER_UNIX
#include "nsMenuContainer.h"
#include "nsXPFCMenuContainer.h"
#include <Xm/Xm.h>
#include <Xm/CascadeBG.h>
@ -28,18 +28,18 @@
#include <Xm/RowColumn.h>
#include <Xm/CascadeBG.h>
class nsMenuContainerUnix : public nsMenuContainer
class nsXPFCMenuContainerUnix : public nsXPFCMenuContainer
{
public:
nsMenuContainerUnix();
nsXPFCMenuContainerUnix();
protected:
virtual ~nsMenuContainerUnix();
virtual ~nsXPFCMenuContainerUnix();
NS_IMETHOD SetShellInstance(nsIShellInstance * aShellInstance) ;
NS_IMETHOD AddMenuItem(nsIMenuItem * aMenuItem);
NS_IMETHOD AddMenuItem(nsIXPFCMenuItem * aMenuItem);
NS_IMETHOD_(void*) GetNativeHandle();
NS_IMETHOD Update() ;

2
xpfc/chrome/unix/src/manifest.mn
Просмотреть файл

@ -18,7 +18,7 @@ PRIVATE_EXPORTS = \
MODULE = xpfc
CPPSRCS = \
nsMenuContainerUnix.cpp \
nsXPFCMenuContainerUnix.cpp \
$(NULL)
REQUIRES = xpcom raptor netlib

18
xpfc/chrome/unix/src/nsMenuContainerUnix.cpp → xpfc/chrome/unix/src/nsXPFCMenuContainerUnix.cpp
Просмотреть файл

@ -17,7 +17,7 @@
*/
#include "nscore.h"
#include "nsMenuContainerUnix.h"
#include "nsXPFCMenuContainerUnix.h"
#include <Xm/Xm.h>
#include <Xm/CascadeBG.h>
@ -26,35 +26,35 @@
#include <Xm/RowColumn.h>
#include <Xm/CascadeBG.h>
static NS_DEFINE_IID(kCIMenuContainerIID, NS_IMENUCONTAINER_IID);
static NS_DEFINE_IID(kCIMenuItemIID, NS_IMENUITEM_IID);
static NS_DEFINE_IID(kCIXPFCMenuContainerIID, NS_IXPFCMENUCONTAINER_IID);
static NS_DEFINE_IID(kCIXPFCMenuItemIID, NS_IXPFCMENUITEM_IID);
nsMenuContainerUnix::nsMenuContainerUnix() : nsMenuContainer()
nsXPFCMenuContainerUnix::nsXPFCMenuContainerUnix() : nsXPFCMenuContainer()
{
mMenuBar = nsnull;
}
nsMenuContainerUnix::~nsMenuContainerUnix()
nsXPFCMenuContainerUnix::~nsXPFCMenuContainerUnix()
{
}
void* nsMenuContainerUnix::GetNativeHandle()
void* nsXPFCMenuContainerUnix::GetNativeHandle()
{
return nsnull;
}
nsresult nsMenuContainerUnix :: AddMenuItem(nsIMenuItem * aMenuItem)
nsresult nsXPFCMenuContainerUnix :: AddMenuItem(nsIXPFCMenuItem * aMenuItem)
{
return NS_OK;
}
nsresult nsMenuContainerUnix :: Update()
nsresult nsXPFCMenuContainerUnix :: Update()
{
return NS_OK;
}
nsresult nsMenuContainerUnix :: SetShellInstance(nsIShellInstance * aShellInstance)
nsresult nsXPFCMenuContainerUnix :: SetShellInstance(nsIShellInstance * aShellInstance)
{
nsIWidget * window = aShellInstance->GetApplicationWidget();

2
xpfc/chrome/windows/inc/manifest.mn
Просмотреть файл

@ -13,7 +13,7 @@ EXPORTS = \
$(NULL)
PRIVATE_EXPORTS = \
nsMenuContainerWin.h \
nsXPFCMenuContainerWin.h \
$(NULL)
MODULE = xpfc

14
xpfc/chrome/windows/inc/nsMenuContainerWin.h → xpfc/chrome/windows/inc/nsXPFCMenuContainerWin.h
Просмотреть файл

@ -16,24 +16,24 @@
* Reserved.
*/
#ifndef __NS_MENU_CONTAINER_WIN
#define __NS_MENU_CONTAINER_WIN
#ifndef __NS_XPFCMENU_CONTAINER_WIN
#define __NS_XPFCMENU_CONTAINER_WIN
#include "nsMenuContainer.h"
#include "nsXPFCMenuContainer.h"
#include "windows.h"
class nsMenuContainerWin : public nsMenuContainer
class nsXPFCMenuContainerWin : public nsXPFCMenuContainer
{
public:
nsMenuContainerWin();
nsXPFCMenuContainerWin();
protected:
virtual ~nsMenuContainerWin();
virtual ~nsXPFCMenuContainerWin();
NS_IMETHOD SetShellContainer(nsIShellInstance * aShellInstance,nsIWebViewerContainer * aWebViewerContainer) ;
NS_IMETHOD AddMenuItem(nsIMenuItem * aMenuItem);
NS_IMETHOD AddMenuItem(nsIXPFCMenuItem * aMenuItem);
NS_IMETHOD_(void*) GetNativeHandle();
NS_IMETHOD Update() ;

2
xpfc/chrome/windows/src/manifest.mn
Просмотреть файл

@ -18,7 +18,7 @@ PRIVATE_EXPORTS = \
MODULE = xpfc
CPPSRCS = \
nsMenuContainerWin.cpp \
nsXPFCMenuContainerWin.cpp \
$(NULL)
REQUIRES = xpcom raptor netlib

32
xpfc/chrome/windows/src/nsMenuContainerWin.cpp → xpfc/chrome/windows/src/nsXPFCMenuContainerWin.cpp
Просмотреть файл

@ -17,23 +17,23 @@
*/
#include "nscore.h"
#include "nsMenuContainerWin.h"
#include "nsXPFCMenuContainerWin.h"
#include "windows.h"
static NS_DEFINE_IID(kCIMenuContainerIID, NS_IMENUCONTAINER_IID);
static NS_DEFINE_IID(kCIMenuItemIID, NS_IMENUITEM_IID);
static NS_DEFINE_IID(kCIXPFCMenuContainerIID, NS_IXPFCMENUCONTAINER_IID);
static NS_DEFINE_IID(kCIXPFCMenuItemIID, NS_IXPFCMENUITEM_IID);
nsMenuContainerWin::nsMenuContainerWin() : nsMenuContainer()
nsXPFCMenuContainerWin::nsXPFCMenuContainerWin() : nsXPFCMenuContainer()
{
mHwnd = nsnull;
mMenu = nsnull;
}
nsMenuContainerWin::~nsMenuContainerWin()
nsXPFCMenuContainerWin::~nsXPFCMenuContainerWin()
{
}
void* nsMenuContainerWin::GetNativeHandle()
void* nsXPFCMenuContainerWin::GetNativeHandle()
{
if (mMenu != nsnull)
return ((void*)mMenu);
@ -45,7 +45,7 @@ void* nsMenuContainerWin::GetNativeHandle()
}
nsresult nsMenuContainerWin :: AddMenuItem(nsIMenuItem * aMenuItem)
nsresult nsXPFCMenuContainerWin :: AddMenuItem(nsIXPFCMenuItem * aMenuItem)
{
if (mMenu == nsnull)
mMenu = ::CreatePopupMenu();
@ -71,13 +71,13 @@ nsresult nsMenuContainerWin :: AddMenuItem(nsIMenuItem * aMenuItem)
}
nsresult nsMenuContainerWin :: Update()
nsresult nsXPFCMenuContainerWin :: Update()
{
nsresult res;
nsIIterator * iterator = nsnull;
nsIMenuItem * item;
nsIMenuContainer * container;
nsIXPFCMenuItem * item;
nsIXPFCMenuContainer * container;
res = mChildMenus->CreateIterator(&iterator);
@ -88,9 +88,9 @@ nsresult nsMenuContainerWin :: Update()
while(!(iterator->IsDone()))
{
item = (nsIMenuItem *) iterator->CurrentItem();
item = (nsIXPFCMenuItem *) iterator->CurrentItem();
res = item->QueryInterface(kCIMenuContainerIID, (void**)&container);
res = item->QueryInterface(kCIXPFCMenuContainerIID, (void**)&container);
if (NS_OK == res)
{
@ -119,9 +119,9 @@ nsresult nsMenuContainerWin :: Update()
if (GetParent() && GetParent()->GetNativeHandle())
{
nsIMenuItem * container_item = nsnull;
nsIXPFCMenuItem * container_item = nsnull;
res = GetParent()->QueryInterface(kCIMenuItemIID,(void**)&container_item);
res = GetParent()->QueryInterface(kCIXPFCMenuItemIID,(void**)&container_item);
if (res == NS_OK)
{
@ -147,7 +147,7 @@ nsresult nsMenuContainerWin :: Update()
return NS_OK;
}
nsresult nsMenuContainerWin :: SetShellContainer(nsIShellInstance * aShellInstance,
nsresult nsXPFCMenuContainerWin :: SetShellContainer(nsIShellInstance * aShellInstance,
nsIWebViewerContainer * aWebViewerContainer)
{
@ -155,5 +155,5 @@ nsresult nsMenuContainerWin :: SetShellContainer(nsIShellInstance * aShellInstan
mMenu = ::CreateMenu();
::SetMenu(mHwnd, mMenu);
return (nsMenuContainer::SetShellContainer(aShellInstance,aWebViewerContainer));
return (nsXPFCMenuContainer::SetShellContainer(aShellInstance,aWebViewerContainer));
}

8
xpfc/core/inc/nsxpfcCIID.h
Просмотреть файл

@ -83,7 +83,7 @@
{0x92, 0x48, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6} }
// 74222650-2d76-11d2-9246-00805f8a7ab6
#define NS_MENUBAR_CID \
#define NS_XPFCMENUBAR_CID \
{ 0x74222650, 0x2d76, 0x11d2, \
{0x92, 0x46, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6} }
@ -93,17 +93,17 @@
{0x92, 0x47, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6} }
// 782ae760-35fb-11d2-9248-00805f8a7ab6
#define NS_TOOLBAR_MANAGER_CID \
#define NS_XPFCTOOLBAR_MANAGER_CID \
{ 0x782ae760, 0x35fb, 0x11d2, \
{0x92, 0x48, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6} }
// 6c4e09a0-2f54-11d2-bede-00805f8a8dbd
#define NS_MENUCONTAINER_CID \
#define NS_XPFCMENUCONTAINER_CID \
{ 0x6c4e09a0, 0x2f54, 0x11d2, \
{0xbe, 0xde, 0x00, 0x80, 0x5f, 0x8a, 0x8d, 0xbd} }
// 7a01c6d0-2d76-11d2-9246-00805f8a7ab6
#define NS_MENUITEM_CID \
#define NS_XPFCMENUITEM_CID \
{ 0x7a01c6d0, 0x2d76, 0x11d2, \
{0x92, 0x46, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6} }

16
xpfc/core/inc/nsxpfcFactory.h
Просмотреть файл

@ -27,7 +27,7 @@
#include "nsxpfcCIID.h"
#include "nsShellInstance.h"
#include "nsIMenuBar.h"
#include "nsIXPFCMenuBar.h"
#include "nsXPFCToolbar.h"
#include "nsXPFCDialog.h"
#include "nsXPFCButton.h"
@ -35,12 +35,12 @@
#include "nsXPItem.h"
#include "nsXPFCTabWidget.h"
#include "nsXPFCTextWidget.h"
#include "nsMenuContainer.h"
#include "nsMenuItem.h"
#include "nsXPFCMenuContainer.h"
#include "nsXPFCMenuItem.h"
#include "nsXPFCXMLDTD.h"
#include "nsXPFCXMLContentSink.h"
#include "nsMenuManager.h"
#include "nsToolbarManager.h"
#include "nsXPFCToolbarManager.h"
#include "nsStreamManager.h"
#include "nsStreamObject.h"
#include "nsVector.h"
@ -63,9 +63,9 @@
#include "nsUser.h"
static NS_DEFINE_IID(kCShellInstance, NS_XPFC_SHELL_INSTANCE_CID);
static NS_DEFINE_IID(kCMenuItem, NS_MENUITEM_CID);
static NS_DEFINE_IID(kCMenuBar, NS_MENUBAR_CID);
static NS_DEFINE_IID(kCMenuContainer, NS_MENUCONTAINER_CID);
static NS_DEFINE_IID(kCXPFCMenuItem, NS_XPFCMENUITEM_CID);
static NS_DEFINE_IID(kCXPFCMenuBar, NS_XPFCMENUBAR_CID);
static NS_DEFINE_IID(kCXPFCMenuContainer, NS_XPFCMENUCONTAINER_CID);
static NS_DEFINE_IID(kCMenuManager, NS_MENU_MANAGER_CID);
static NS_DEFINE_IID(kCStreamManager, NS_STREAM_MANAGER_CID);
static NS_DEFINE_IID(kIStreamManager, NS_ISTREAM_MANAGER_IID);
@ -74,7 +74,7 @@ static NS_DEFINE_IID(kIStreamObject, NS_ISTREAM_OBJECT_IID);
static NS_DEFINE_IID(kCXPFCDTD, NS_IXPFCXML_DTD_IID);
static NS_DEFINE_IID(kCXPFCContentSink, NS_XPFCXMLCONTENTSINK_IID);
static NS_DEFINE_IID(kCXPFCToolbar, NS_XPFC_TOOLBAR_CID);
static NS_DEFINE_IID(kCToolbarManager, NS_TOOLBAR_MANAGER_CID);
static NS_DEFINE_IID(kCXPFCToolbarManager, NS_XPFCTOOLBAR_MANAGER_CID);
static NS_DEFINE_IID(kCXPFCDialog, NS_XPFC_DIALOG_CID);
static NS_DEFINE_IID(kCXPFCButton, NS_XPFC_BUTTON_CID);
static NS_DEFINE_IID(kCXPButton, NS_XP_BUTTON_CID);

12
xpfc/core/src/nsxpfcFactory.cpp
Просмотреть файл

@ -95,8 +95,8 @@ nsresult nsxpfcFactory::CreateInstance(nsISupports *aOuter,
} else if (mClassID.Equals(kCXPFolderCanvas)) {
nsXPFolderCanvas * canvas = (nsXPFolderCanvas *)new nsXPFolderCanvas(aOuter);
canvas->QueryInterface(kISupportsIID,(void **)&inst);
} else if (mClassID.Equals(kCMenuContainer)) {
inst = (nsISupports *)(nsIMenuContainer *)new nsMenuContainer();
} else if (mClassID.Equals(kCXPFCMenuContainer)) {
inst = (nsISupports *)(nsIXPFCMenuContainer *)new nsXPFCMenuContainer();
} else if (mClassID.Equals(kCXPFCToolbar)) {
inst = (nsISupports *)(nsIXPFCToolbar *)new nsXPFCToolbar(aOuter);
} else if (mClassID.Equals(kCXPFCDialog)) {
@ -115,14 +115,14 @@ nsresult nsxpfcFactory::CreateInstance(nsISupports *aOuter,
inst = (nsISupports *)(nsIXPFCTabWidget *)new nsXPFCTabWidget(aOuter);
} else if (mClassID.Equals(kCMenuManager)) {
inst = (nsISupports *)(nsIMenuManager *)new nsMenuManager();
} else if (mClassID.Equals(kCToolbarManager)) {
inst = (nsISupports *)(nsIToolbarManager *)new nsToolbarManager();
} else if (mClassID.Equals(kCXPFCToolbarManager)) {
inst = (nsISupports *)(nsIXPFCToolbarManager *)new nsXPFCToolbarManager();
} else if (mClassID.Equals(kCStreamManager)) {
inst = (nsISupports *)(nsIStreamManager *)new nsStreamManager();
} else if (mClassID.Equals(kCStreamObject)) {
inst = (nsISupports *)(nsIStreamObject *)new nsStreamObject();
} else if (mClassID.Equals(kCMenuItem)) {
inst = (nsISupports *)(nsIMenuItem *)new nsMenuItem();
} else if (mClassID.Equals(kCXPFCMenuItem)) {
inst = (nsISupports *)(nsIXPFCMenuItem *)new nsXPFCMenuItem();
} else if (mClassID.Equals(kCXPFCDTD)) {
inst = (nsISupports *)new nsXPFCXMLDTD();
} else if (mClassID.Equals(kCXPFCContentSink)) {

10
xpfc/core/unix/src/nsxpfcFactoryUnix.cpp
Просмотреть файл

@ -17,7 +17,7 @@
*/
#include "nsxpfcFactory.h"
#include "nsMenuContainerUnix.h"
#include "nsXPFCMenuContainerUnix.h"
class nsxpfcFactoryUnix : public nsxpfcFactory
{
@ -53,10 +53,10 @@ nsresult nsxpfcFactoryUnix::CreateInstance(nsISupports *aOuter,
nsISupports *inst = nsnull;
if (mClassID.Equals(kCMenuBar)) {
inst = (nsISupports *)(nsIMenuBar *)new nsMenuContainerUnix();
} else if (mClassID.Equals(kCMenuContainer)) {
inst = (nsISupports *)(nsIMenuContainer *)new nsMenuContainerUnix();
if (mClassID.Equals(kCXPFCMenuBar)) {
inst = (nsISupports *)(nsIXPFCMenuBar *)new nsXPFCMenuContainerUnix();
} else if (mClassID.Equals(kCXPFCMenuContainer)) {
inst = (nsISupports *)(nsIXPFCMenuContainer *)new nsXPFCMenuContainerUnix();
}
if (inst == NULL)

10
xpfc/core/windows/src/nsxpfcFactoryWin.cpp
Просмотреть файл

@ -17,7 +17,7 @@
*/
#include "nsxpfcFactory.h"
#include "nsMenuContainerWin.h"
#include "nsXPFCMenuContainerWin.h"
class nsxpfcFactoryWin : public nsxpfcFactory
{
@ -53,10 +53,10 @@ nsresult nsxpfcFactoryWin::CreateInstance(nsISupports *aOuter,
nsISupports *inst = nsnull;
if (mClassID.Equals(kCMenuBar)) {
inst = (nsISupports *)(nsIMenuBar *)new nsMenuContainerWin();
} else if (mClassID.Equals(kCMenuContainer)) {
inst = (nsISupports *)(nsIMenuContainer *)new nsMenuContainerWin();
if (mClassID.Equals(kCXPFCMenuBar)) {
inst = (nsISupports *)(nsIXPFCMenuBar *)new nsXPFCMenuContainerWin();
} else if (mClassID.Equals(kCXPFCMenuContainer)) {
inst = (nsISupports *)(nsIXPFCMenuContainer *)new nsXPFCMenuContainerWin();
}
if (inst == NULL)

2
xpfc/parser/inc/manifest.mn
Просмотреть файл

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

10
xpfc/parser/inc/nsMenuManager.h
Просмотреть файл

@ -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
xpfc/parser/inc/nsToolbarManager.h → xpfc/parser/inc/nsXPFCToolbarManager.h
Просмотреть файл

@ -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
xpfc/parser/public/manifest.mn
Просмотреть файл

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

12
xpfc/parser/public/nsIMenuManager.h
Просмотреть файл

@ -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
xpfc/parser/public/nsIToolbarManager.h → xpfc/parser/public/nsIXPFCToolbarManager.h
Просмотреть файл

@ -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
xpfc/parser/src/manifest.mn
Просмотреть файл

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

12
xpfc/parser/src/nsMenuManager.cpp
Просмотреть файл

@ -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
xpfc/parser/src/nsToolbarManager.cpp → xpfc/parser/src/nsXPFCToolbarManager.cpp
Просмотреть файл

@ -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
xpfc/parser/src/nsXPFCXMLContentSink.cpp
Просмотреть файл

@ -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);

6
xpfc/shell/inc/nsShellInstance.h
Просмотреть файл

@ -27,7 +27,7 @@
class nsIPref;
class nsIAppShell;
class nsIStreamManager;
class nsIToolbarManager;
class nsIXPFCToolbarManager;
class nsIDeviceContext;
@ -138,7 +138,7 @@ public:
NS_IMETHOD_(nsIStreamManager *) GetStreamManager();
NS_IMETHOD_(nsIToolbarManager *) GetToolbarManager();
NS_IMETHOD_(nsIXPFCToolbarManager *) GetToolbarManager();
NS_IMETHOD_(EVENT_CALLBACK) GetShellEventCallback() ;
@ -151,7 +151,7 @@ private:
nsIWidget * mApplicationWindow ;
nsIPref * mPref;
nsIStreamManager * mStreamManager;
nsIToolbarManager * mToolbarManager;
nsIXPFCToolbarManager * mToolbarManager;
nsIDeviceContext * mDeviceContext;
};

6
xpfc/shell/public/nsIShellInstance.h
Просмотреть файл

@ -29,7 +29,7 @@ class nsIApplicationShell;
class nsIPref;
class nsIAppShell;
class nsIStreamManager;
class nsIToolbarManager;
class nsIXPFCToolbarManager;
#define NS_IXPFC_SHELL_INSTANCE_IID \
{ 0xbf88e640, 0xdf99, 0x11d1, \
@ -129,9 +129,9 @@ public:
/**
* Get Toolbar Manager
* @result An nsIToolbarManager pointer
* @result An nsIXPFCToolbarManager pointer
*/
NS_IMETHOD_(nsIToolbarManager *) GetToolbarManager() = 0;
NS_IMETHOD_(nsIXPFCToolbarManager *) GetToolbarManager() = 0;
/**
* Launch an application

10
xpfc/shell/public/nsIWebViewerContainer.h
Просмотреть файл

@ -21,9 +21,9 @@
#include "nsIContentViewer.h"
#include "nsIParser.h"
#include "nsIMenuManager.h"
#include "nsIMenuBar.h"
#include "nsIXPFCMenuBar.h"
#include "nsIWebShell.h"
#include "nsIToolbarManager.h"
#include "nsIXPFCToolbarManager.h"
#include "nsIXPFCToolbar.h"
#include "nsIXPFCDialog.h"
#include "nsIApplicationShell.h"
@ -42,11 +42,11 @@ public:
NS_IMETHOD SetMenuManager(nsIMenuManager * aMenuManager) = 0;
NS_IMETHOD_(nsIMenuManager *) GetMenuManager() = 0;
NS_IMETHOD SetMenuBar(nsIMenuBar * aMenuBar) = 0;
NS_IMETHOD SetMenuBar(nsIXPFCMenuBar * aMenuBar) = 0;
NS_IMETHOD UpdateMenuBar() = 0;
NS_IMETHOD SetToolbarManager(nsIToolbarManager * aToolbarManager) = 0;
NS_IMETHOD_(nsIToolbarManager *) GetToolbarManager() = 0;
NS_IMETHOD SetToolbarManager(nsIXPFCToolbarManager * aToolbarManager) = 0;
NS_IMETHOD_(nsIXPFCToolbarManager *) GetToolbarManager() = 0;
NS_IMETHOD AddToolbar(nsIXPFCToolbar * aToolbar) = 0;
NS_IMETHOD RemoveToolbar(nsIXPFCToolbar * aToolbar) = 0;
NS_IMETHOD UpdateToolbars() = 0;

14
xpfc/shell/src/nsShellInstance.cpp
Просмотреть файл

@ -38,7 +38,7 @@
#include "nsIPref.h"
#include "nsStreamManager.h"
#include "nsToolbarManager.h"
#include "nsXPFCToolbarManager.h"
#include "nsIBrowserWindow.h"
#include "nsIWebShell.h"
@ -65,8 +65,8 @@ static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
static NS_DEFINE_IID(kCShellInstance, NS_XPFC_SHELL_INSTANCE_CID);
static NS_DEFINE_IID(kCStreamManager, NS_STREAM_MANAGER_CID);
static NS_DEFINE_IID(kIStreamManager, NS_ISTREAM_MANAGER_IID);
static NS_DEFINE_IID(kCToolbarManager, NS_TOOLBAR_MANAGER_CID);
static NS_DEFINE_IID(kIToolbarManager, NS_ITOOLBAR_MANAGER_IID);
static NS_DEFINE_IID(kCXPFCToolbarManager, NS_XPFCTOOLBAR_MANAGER_CID);
static NS_DEFINE_IID(kIXPFCToolbarManager, NS_IXPFCTOOLBAR_MANAGER_IID);
static NS_DEFINE_IID(kDeviceContextCID, NS_DEVICE_CONTEXT_CID);
static NS_DEFINE_IID(kDeviceContextIID, NS_IDEVICE_CONTEXT_IID);
@ -132,9 +132,9 @@ nsresult nsShellInstance::Init()
// Create a Toolbar Manager
res = nsRepository::CreateInstance(kCToolbarManager,
res = nsRepository::CreateInstance(kCXPFCToolbarManager,
NULL,
kIToolbarManager,
kIXPFCToolbarManager,
(void **) &mToolbarManager);
if (NS_OK != res)
return res;
@ -206,7 +206,7 @@ nsIStreamManager * nsShellInstance::GetStreamManager()
return (mStreamManager) ;
}
nsIToolbarManager * nsShellInstance::GetToolbarManager()
nsIXPFCToolbarManager * nsShellInstance::GetToolbarManager()
{
return (mToolbarManager) ;
}
@ -481,7 +481,7 @@ nsEventStatus PR_CALLBACK HandleEventApplication(nsGUIEvent *aEvent)
nsIMenuManager * menumgr = viewer->GetMenuManager();
nsIMenuItem * item = menumgr->MenuItemFromID(event->menuItem);
nsIXPFCMenuItem * item = menumgr->MenuItemFromID(event->menuItem);
item->SendCommand();

16
xpfc/shell/src/unix/main.cpp
Просмотреть файл

@ -45,9 +45,9 @@ static NS_DEFINE_IID(kCApplicationShellIID, NS_IAPPLICATIONSHELL_CID);
static NS_DEFINE_IID(kIShellInstanceIID, NS_IXPFC_SHELL_INSTANCE_IID);
static NS_DEFINE_IID(kCShellInstanceCID, NS_XPFC_SHELL_INSTANCE_CID);
static NS_DEFINE_IID(kCMenuBarCID, NS_MENUBAR_CID);
static NS_DEFINE_IID(kCMenuContainerCID, NS_MENUCONTAINER_CID);
static NS_DEFINE_IID(kCMenuItemCID, NS_MENUITEM_CID);
static NS_DEFINE_IID(kCXPFCMenuBarCID, NS_XPFCMENUBAR_CID);
static NS_DEFINE_IID(kCXPFCMenuContainerCID, NS_XPFCMENUCONTAINER_CID);
static NS_DEFINE_IID(kCXPFCMenuItemCID, NS_XPFCMENUITEM_CID);
static NS_DEFINE_IID(kCMenuManagerCID, NS_MENU_MANAGER_CID);
static NS_DEFINE_IID(kIAppShellIID, NS_IAPPSHELL_IID);
static NS_DEFINE_IID(kCXPFCToolbarCID, NS_XPFC_TOOLBAR_CID);
@ -58,7 +58,7 @@ static NS_DEFINE_IID(kCXPButtonCID, NS_XP_BUTTON_CID);
static NS_DEFINE_IID(kCXPItemCID, NS_XP_ITEM_CID);
static NS_DEFINE_IID(kCXPFCTextWidgetCID, NS_XPFC_TEXTWIDGET_CID);
static NS_DEFINE_IID(kCXPFCTabWidgetCID, NS_XPFC_TABWIDGET_CID);
static NS_DEFINE_IID(kCToolbarManagerCID, NS_TOOLBAR_MANAGER_CID);
static NS_DEFINE_IID(kCXPFCToolbarManagerCID, NS_XPFCTOOLBAR_MANAGER_CID);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
static NS_DEFINE_IID(kCVectorIteratorCID, NS_VECTOR_ITERATOR_CID);
static NS_DEFINE_IID(kCstackCID, NS_STACK_CID);
@ -89,16 +89,16 @@ void main(int argc, char **argv)
// Let get a ShellInstance for this Application instance
nsRepository::RegisterFactory(kCShellInstanceCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCMenuBarCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCMenuContainerCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCMenuItemCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCMenuBarCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCMenuContainerCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCMenuItemCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCMenuManagerCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCToolbarCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCDialogCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCButtonCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCTextWidgetCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCTabWidgetCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCToolbarManagerCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCToolbarManagerCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCStreamManagerCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCStreamObjectCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCVectorCID, XPFC_DLL, PR_FALSE, PR_FALSE);

16
xpfc/shell/src/windows/winmain.cpp
Просмотреть файл

@ -40,9 +40,9 @@ static NS_DEFINE_IID(kCApplicationShellIID, NS_IAPPLICATIONSHELL_CID);
static NS_DEFINE_IID(kIShellInstanceIID, NS_IXPFC_SHELL_INSTANCE_IID);
static NS_DEFINE_IID(kIAppShellIID, NS_IAPPSHELL_IID);
static NS_DEFINE_IID(kCShellInstanceCID, NS_XPFC_SHELL_INSTANCE_CID);
static NS_DEFINE_IID(kCMenuBarCID, NS_MENUBAR_CID);
static NS_DEFINE_IID(kCMenuContainerCID, NS_MENUCONTAINER_CID);
static NS_DEFINE_IID(kCMenuItemCID, NS_MENUITEM_CID);
static NS_DEFINE_IID(kCXPFCMenuBarCID, NS_XPFCMENUBAR_CID);
static NS_DEFINE_IID(kCXPFCMenuContainerCID, NS_XPFCMENUCONTAINER_CID);
static NS_DEFINE_IID(kCXPFCMenuItemCID, NS_XPFCMENUITEM_CID);
static NS_DEFINE_IID(kCMenuManagerCID, NS_MENU_MANAGER_CID);
@ -55,7 +55,7 @@ static NS_DEFINE_IID(kCXPItemCID, NS_XP_ITEM_CID);
static NS_DEFINE_IID(kCXPFCTextWidgetCID, NS_XPFC_TEXTWIDGET_CID);
static NS_DEFINE_IID(kCXPFCTabWidgetCID, NS_XPFC_TABWIDGET_CID);
static NS_DEFINE_IID(kCToolbarManagerCID, NS_TOOLBAR_MANAGER_CID);
static NS_DEFINE_IID(kCXPFCToolbarManagerCID, NS_XPFCTOOLBAR_MANAGER_CID);
static NS_DEFINE_IID(kCStreamManagerCID, NS_STREAM_MANAGER_CID);
static NS_DEFINE_IID(kCStreamObjectCID, NS_STREAM_OBJECT_CID);
static NS_DEFINE_IID(kCVectorCID, NS_VECTOR_CID);
@ -80,10 +80,10 @@ int PASCAL WinMain(HANDLE instance, HANDLE prevInstance, LPSTR cmdParam, int nCm
// Let get a ShellInstance for this Application instance
nsRepository::RegisterFactory(kCShellInstanceCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCMenuBarCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCMenuContainerCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCMenuBarCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCMenuContainerCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCMenuManagerCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCMenuItemCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCMenuItemCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCToolbarCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCDialogCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCUserCID, XPFC_DLL, PR_FALSE, PR_FALSE);
@ -92,7 +92,7 @@ int PASCAL WinMain(HANDLE instance, HANDLE prevInstance, LPSTR cmdParam, int nCm
nsRepository::RegisterFactory(kCXPItemCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCTextWidgetCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCTabWidgetCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCToolbarManagerCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCXPFCToolbarManagerCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCStreamManagerCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCStreamObjectCID, XPFC_DLL, PR_FALSE, PR_FALSE);
nsRepository::RegisterFactory(kCVectorCID, XPFC_DLL, PR_FALSE, PR_FALSE);