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

api changes (bug 157097, r=cmanske, sr=sfraser)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@129377 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brade%netscape.com 2002-09-12 19:09:19 +00:00
parent 4d4e95222d
commit bcf7afd202
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/editor/composer/src/nsComposerController.cpp
View File

@ -86,11 +86,13 @@ NS_IMETHODIMP nsComposerController::Init(nsISupports *aCommandRefCon)
nsresult rv;
// get our ref to the singleton command manager
// This will create mCommandManager and register commands if not already done.
rv = GetComposerCommandManager(getter_AddRefs(mCommandManager));
if (NS_FAILED(rv)) return rv;
mCommandRefCon = aCommandRefCon; // no addref
// the following (7?) lines can be removed when the JS commands are stateless and in C++
mCommandManager = do_CreateInstance(NS_CONTROLLERCOMMANDMANAGER_CONTRACTID, &rv);
if (NS_FAILED(rv)) return rv;
@ -273,7 +275,7 @@ nsresult nsComposerController::GetComposerCommandManager(nsIControllerCommandMan
}
//GetCommandState
// GetCommandStateWithParams
/*
cmd_bold,cmd_italic,cmd_underline ->state commands
state_start : true,false
@ -281,16 +283,16 @@ state_end : true,false
state_all : true,false
state_mixed : true,false
*/
/* void getCommandState (in DOMString aCommandName, inout nsICommandParams aCommandParams); */
NS_IMETHODIMP nsComposerController::GetCommandState(const char *aCommand, nsICommandParams *aCommandParams)
/* void getCommandStateWithParams (in DOMString aCommandName, inout nsICommandParams aCommandParams); */
NS_IMETHODIMP nsComposerController::GetCommandStateWithParams(const char *aCommand, nsICommandParams *aCommandParams)
{
if (!mCommandRefCon || !mCommandManager)
return NS_ERROR_NOT_INITIALIZED;
return mCommandManager->GetCommandState(aCommand,aCommandParams,mCommandRefCon);
}
/* void doCommand (in DOMString aCommandName, in nsICommandParams aCommandParams); */
NS_IMETHODIMP nsComposerController::DoCommand(const char *aCommand, nsICommandParams *aCommandParams)
/* void doCommandWithParams (in DOMString aCommandName, in nsICommandParams aCommandParams); */
NS_IMETHODIMP nsComposerController::DoCommandWithParams(const char *aCommand, nsICommandParams *aCommandParams)
{
if (!mCommandRefCon || !mCommandManager)
return NS_ERROR_NOT_INITIALIZED;

20
mozilla/editor/libeditor/base/nsEditorCommands.cpp
View File

@ -96,7 +96,7 @@ nsUndoCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aPara
}
NS_IMETHODIMP
nsUndoCommand::GetCommandState(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
nsUndoCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
{
PRBool canUndo;
IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo);
@ -134,7 +134,7 @@ nsRedoCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aPara
}
NS_IMETHODIMP
nsRedoCommand::GetCommandState(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
nsRedoCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
{
PRBool canUndo;
IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo);
@ -170,7 +170,7 @@ nsCutCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aParam
}
NS_IMETHODIMP
nsCutCommand::GetCommandState(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
nsCutCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
{
PRBool canUndo;
IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo);
@ -215,7 +215,7 @@ nsCutOrDeleteCommand::DoCommandParams(const char *aCommandName, nsICommandParams
}
NS_IMETHODIMP
nsCutOrDeleteCommand::GetCommandState(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
nsCutOrDeleteCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
{
PRBool canUndo;
IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo);
@ -251,7 +251,7 @@ nsCopyCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aPara
}
NS_IMETHODIMP
nsCopyCommand::GetCommandState(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
nsCopyCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
{
PRBool canUndo;
IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo);
@ -295,7 +295,7 @@ nsCopyOrDeleteCommand::DoCommandParams(const char *aCommandName, nsICommandParam
}
NS_IMETHODIMP
nsCopyOrDeleteCommand::GetCommandState(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
nsCopyOrDeleteCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
{
PRBool canUndo;
IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo);
@ -341,7 +341,7 @@ nsPasteCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aPar
}
NS_IMETHODIMP
nsPasteCommand::GetCommandState(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
nsPasteCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
{
PRBool canUndo;
IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo);
@ -415,7 +415,7 @@ nsDeleteCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aPa
}
NS_IMETHODIMP
nsDeleteCommand::GetCommandState(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
nsDeleteCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
{
PRBool canUndo;
IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo);
@ -451,7 +451,7 @@ nsSelectAllCommand::DoCommandParams(const char *aCommandName, nsICommandParams *
}
NS_IMETHODIMP
nsSelectAllCommand::GetCommandState(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
nsSelectAllCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
{
PRBool canUndo;
IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo);
@ -577,7 +577,7 @@ nsSelectionMoveCommands::DoCommandParams(const char *aCommandName, nsICommandPar
}
NS_IMETHODIMP
nsSelectionMoveCommands::GetCommandState(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
nsSelectionMoveCommands::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon)
{
PRBool canUndo;
IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo);

2
mozilla/editor/libeditor/base/nsEditorCommands.h
View File

@ -68,7 +68,7 @@ public: \
NS_IMETHOD IsCommandEnabled(const char * aCommandName, nsISupports *aCommandRefCon, PRBool *_retval); \
NS_IMETHOD DoCommand(const char *aCommandName, nsISupports *aCommandRefCon); \
NS_IMETHOD DoCommandParams(const char *aCommandName,nsICommandParams *aParams, nsISupports *aCommandRefCon); \
NS_IMETHOD GetCommandState(const char *aCommandName,nsICommandParams *aParams, nsISupports *aCommandRefCon); \
NS_IMETHOD GetCommandStateParams(const char *aCommandName,nsICommandParams *aParams, nsISupports *aCommandRefCon); \
};

4
mozilla/editor/libeditor/base/nsEditorController.cpp
View File

@ -208,12 +208,12 @@ NS_IMETHODIMP nsEditorController::DoCommand(const char *aCommand)
return mCommandManager->DoCommand(aCommand, mCommandRefCon);
}
NS_IMETHODIMP nsEditorController::DoCommand(const char *aCommand, nsICommandParams *aParams)
NS_IMETHODIMP nsEditorController::DoCommandWithParams(const char *aCommand, nsICommandParams *aParams)
{
return mCommandManager->DoCommandParams(aCommand, aParams, mCommandRefCon);
}
NS_IMETHODIMP nsEditorController::GetCommandState(const char *aCommand, nsICommandParams *aParams)
NS_IMETHODIMP nsEditorController::GetCommandStateWithParams(const char *aCommand, nsICommandParams *aParams)
{
return mCommandManager->GetCommandState(aCommand, aParams, mCommandRefCon);
}