diff --git a/mozilla/widget/src/mac/nsAppShell.cpp b/mozilla/widget/src/mac/nsAppShell.cpp index fbefb7015ff..504ff94daca 100644 --- a/mozilla/widget/src/mac/nsAppShell.cpp +++ b/mozilla/widget/src/mac/nsAppShell.cpp @@ -31,7 +31,6 @@ #include "nsIWidget.h" #include "nsMacMessageSink.h" #include "nsMacMessagePump.h" -#include "nsSelectionMgr.h" #include "nsToolKit.h" #include #include @@ -72,10 +71,6 @@ NS_IMETHODIMP nsAppShell::Create(int* argc, char ** argv) { mToolKit = auto_ptr( new nsToolkit() ); - // Create the selection manager - if (!mSelectionMgr) - NS_NewSelectionMgr(&mSelectionMgr); - mMacSink = new nsMacMessageSink(); mMacPump = auto_ptr( new nsMacMessagePump(mToolKit.get(), mMacSink) ); @@ -170,7 +165,6 @@ nsAppShell::nsAppShell() } mRefCnt = 0; mExitCalled = PR_FALSE; - mSelectionMgr = 0; mMacSink = 0; } @@ -181,7 +175,6 @@ nsAppShell::nsAppShell() //------------------------------------------------------------------------- nsAppShell::~nsAppShell() { - NS_IF_RELEASE(mSelectionMgr); } //------------------------------------------------------------------------- @@ -294,13 +287,3 @@ nsAppShell::DispatchNativeEvent(PRBool aRealEvent, void *aEvent) mMacPump->DispatchEvent(aRealEvent, (EventRecord *) aEvent); return NS_OK; } - -NS_METHOD -nsAppShell::GetSelectionMgr(nsISelectionMgr** aSelectionMgr) -{ - *aSelectionMgr = mSelectionMgr; - NS_IF_ADDREF(mSelectionMgr); - if (!mSelectionMgr) - return NS_ERROR_NOT_INITIALIZED; - return NS_OK; -} diff --git a/mozilla/widget/src/mac/nsAppShell.h b/mozilla/widget/src/mac/nsAppShell.h index b3344de9226..e547e9dcca5 100644 --- a/mozilla/widget/src/mac/nsAppShell.h +++ b/mozilla/widget/src/mac/nsAppShell.h @@ -41,7 +41,6 @@ class nsAppShell : public nsIAppShell { private: nsDispatchListener *mDispatchListener; // note: we don't own this, but it can be NULL - nsISelectionMgr *mSelectionMgr; auto_ptr mToolKit; auto_ptr mMacPump; nsMacMessageSink *mMacSink; //еее this will be COM, so use scc's COM_auto_ptr @@ -69,8 +68,6 @@ class nsAppShell : public nsIAppShell virtual void* GetNativeData(PRUint32 aDataType); - NS_IMETHOD GetSelectionMgr(nsISelectionMgr** aSelectionMgr); - NS_IMETHOD GetNativeEvent(PRBool &aRealEvent, void *&aEvent); NS_IMETHOD DispatchNativeEvent(PRBool aRealEvent, void *aEvent); NS_IMETHOD EventIsForModalWindow(PRBool aRealEvent, void *aEvent, nsIWidget *aWidget,