Bug 801989 part.6 Set InputContext::mNativeIMEContext on OS/2 r=daveryeo

This commit is contained in:
Masayuki Nakano 2012-10-27 08:35:21 +09:00
parent 215e6ec2e2
commit 287893b4f5
2 changed files with 13 additions and 4 deletions

View File

@ -2619,6 +2619,18 @@ bool nsWindow::OnImeRequest(MPARAM mp1, MPARAM mp2)
return rc;
}
NS_IMETHODIMP_(InputContext) nsWindow::GetInputContext()
{
HIMI himi;
if (sIm32Mod && spfnImGetInstance(mWnd, &himi)) {
mInputContext.mNativeIMEContext = static_cast<void*>(himi);
}
if (!mInputContext.mNativeIMEContext) {
mInputContext.mNativeIMEContext = this;
}
return mInputContext;
}
//-----------------------------------------------------------------------------
// Key handler. Specs for the various text messages are really confused;
// see other platforms for best results of how things are supposed to work.

View File

@ -183,10 +183,7 @@ public:
{
mInputContext = aInputContext;
}
NS_IMETHOD_(InputContext) GetInputContext()
{
return mInputContext;
}
NS_IMETHOD_(InputContext) GetInputContext();
// nsWindow
static void ReleaseGlobals();