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

Fixing Mach-O part of bug 159016, IME with Flash 6

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@129833 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterlubczynski%netscape.com 2002-09-17 22:50:47 +00:00
parent 7444fd6673
commit 0417f35e97
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/modules/plugin/base/src/Makefile.in
View File

@ -103,6 +103,10 @@ EXTRA_DSO_LDOPTS = \
$(MOZ_UNICHARUTIL_LIBS) \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_PLUGIN

9
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@ -176,8 +176,13 @@
#if defined(XP_MAC) && TARGET_CARBON
#include "nsIClassicPluginFactory.h"
#endif
#if defined(XP_MAC) || defined (XP_MACOSX)
#if TARGET_CARBON
#include <TextServices.h> // for ::UseInputWindow()
#endif
#endif
// this is the name of the directory which will be created
// to cache temporary files.
@ -4608,7 +4613,8 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
}
}
#if defined(XP_MAC) && TARGET_CARBON
#if defined(XP_MAC) || defined (XP_MACOSX)
#if TARGET_CARBON
/* Flash 6.0 r50 and older on Mac has a bug which calls ::UseInputWindow(NULL, true)
which turn off all our inline IME. Turn it back after the plugin
initializtion and hope that future versions will be fixed. See bug 159016
@ -4620,6 +4626,7 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
::UseInputWindow(NULL, false);
}
}
#endif
#endif
if (plugin != nsnull)