fix for bug #34094: turned on USE_TLS_FOR_TOOLKIT, so only 1 per thread will be used, changed nsAppShell::Create(int* argc, char ** argv) to use NS_GetCurrentToolkit(). This is a total blocker for Mac. r=sfraser
git-svn-id: svn://10.0.0.236/trunk@64798 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -77,9 +77,13 @@ NS_IMETHODIMP nsAppShell::SetDispatchListener(nsDispatchListener* aDispatchListe
|
||||
|
||||
NS_IMETHODIMP nsAppShell::Create(int* argc, char ** argv)
|
||||
{
|
||||
mToolKit = auto_ptr<nsToolkit>( new nsToolkit() );
|
||||
nsresult rv;
|
||||
rv = NS_GetCurrentToolkit(getter_AddRefs(mToolkit));
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
mMacSink = auto_ptr<nsMacMessageSink>( new nsMacMessageSink() );
|
||||
mMacPump = auto_ptr<nsMacMessagePump>( new nsMacMessagePump(mToolKit.get(), mMacSink.get()) );
|
||||
nsIToolkit* toolkit = mToolkit.get();
|
||||
mMacPump = auto_ptr<nsMacMessagePump>( new nsMacMessagePump(static_cast<nsToolkit*>(toolkit), mMacSink.get()) );
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user