Backing out my changes
git-svn-id: svn://10.0.0.236/trunk@21877 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -28,13 +28,8 @@
|
||||
#include "nsAppShell.h"
|
||||
#include "nsIAppShell.h"
|
||||
|
||||
#undef USE_SELECTION_MGR // toggle this when nsSelectionMgr.cpp is added to the Mac build
|
||||
|
||||
#include "nsMacMessageSink.h"
|
||||
#include "nsMacMessagePump.h"
|
||||
#ifdef USE_SELECTION_MGR
|
||||
#include "nsSelectionMgr.h"
|
||||
#endif /* USE_SELECTION_MGR */
|
||||
#include "nsToolKit.h"
|
||||
#include <Quickdraw.h>
|
||||
#include <Fonts.h>
|
||||
@@ -74,13 +69,6 @@ NS_IMETHODIMP nsAppShell::SetDispatchListener(nsDispatchListener* aDispatchListe
|
||||
NS_IMETHODIMP nsAppShell::Create(int* argc, char ** argv)
|
||||
{
|
||||
mToolKit = auto_ptr<nsToolkit>( new nsToolkit() );
|
||||
|
||||
#ifdef USE_SELECTION_MGR
|
||||
// Create the selection manager
|
||||
if (!mSelectionMgr)
|
||||
NS_NewSelectionMgr(&mSelectionMgr);
|
||||
#endif /* USE_SELECTION_MGR */
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@@ -144,7 +132,6 @@ nsAppShell::nsAppShell()
|
||||
}
|
||||
mRefCnt = 0;
|
||||
mExitCalled = PR_FALSE;
|
||||
mSelectionMgr = 0;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
@@ -154,9 +141,6 @@ nsAppShell::nsAppShell()
|
||||
//-------------------------------------------------------------------------
|
||||
nsAppShell::~nsAppShell()
|
||||
{
|
||||
#ifdef USE_SELECTION_MGR
|
||||
NS_IF_RELEASE(mSelectionMgr);
|
||||
#endif /* USE_SELECTION_MGR */
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
@@ -187,18 +171,3 @@ nsresult nsAppShell::DispatchNativeEvent(void * aEvent)
|
||||
{
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
NS_METHOD
|
||||
nsAppShell::GetSelectionMgr(nsISelectionMgr** aSelectionMgr)
|
||||
{
|
||||
#ifdef USE_SELECTION_MGR
|
||||
*aSelectionMgr = mSelectionMgr;
|
||||
NS_IF_ADDREF(mSelectionMgr);
|
||||
if (!mSelectionMgr)
|
||||
return NS_ERROR_NOT_INITIALIZED;
|
||||
return NS_OK;
|
||||
#else /* USE_SELECTION_MGR */
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
#endif /* USE_SELECTION_MGR */
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user