Bug 473687 - Remove widget WinCE support: Part C (Remove ENABLE_IME_MOUSE_HANDLING); r=dougt

This commit is contained in:
Ed Morley 2011-04-24 20:10:14 -07:00
parent e42de02222
commit 1af84c3e2a
2 changed files with 0 additions and 17 deletions

View File

@ -67,7 +67,6 @@ static nsIMM32Handler* gIMM32Handler = nsnull;
PRLogModuleInfo* gIMM32Log = nsnull;
#endif
#ifdef ENABLE_IME_MOUSE_HANDLING
static UINT sWM_MSIME_MOUSE = 0; // mouse message for MSIME 98/2000
//-------------------------------------------------------------------------
@ -86,8 +85,6 @@ static UINT sWM_MSIME_MOUSE = 0; // mouse message for MSIME 98/2000
#define IMEMOUSE_WUP 0x10 // wheel up
#define IMEMOUSE_WDOWN 0x20 // wheel down
#endif
PRPackedBool nsIMM32Handler::sIsStatusChanged = PR_FALSE;
PRPackedBool nsIMM32Handler::sIsIME = PR_TRUE;
PRPackedBool nsIMM32Handler::sIsIMEOpening = PR_FALSE;
@ -111,12 +108,9 @@ nsIMM32Handler::Initialize()
gIMM32Log = PR_NewLogModule("nsIMM32HandlerWidgets");
#endif
#ifdef ENABLE_IME_MOUSE_HANDLING
if (!sWM_MSIME_MOUSE) {
sWM_MSIME_MOUSE = ::RegisterWindowMessage(RWM_MOUSE);
}
#endif
InitKeyboardLayout(::GetKeyboardLayout(0));
}
@ -382,7 +376,6 @@ nsIMM32Handler::ProcessMessage(nsWindow* aWindow, UINT msg,
*aRetValue = 0;
switch (msg) {
#ifdef ENABLE_IME_MOUSE_HANDLING
case WM_LBUTTONDOWN:
case WM_MBUTTONDOWN:
case WM_RBUTTONDOWN: {
@ -398,7 +391,6 @@ nsIMM32Handler::ProcessMessage(nsWindow* aWindow, UINT msg,
aEatMessage = PR_FALSE;
return PR_TRUE;
}
#endif // ENABLE_IME_MOUSE_HANDLING
case WM_INPUTLANGCHANGE:
return ProcessInputLangChangeMessage(aWindow, wParam, lParam,
aRetValue, aEatMessage);
@ -2029,9 +2021,6 @@ nsIMM32Handler::ResolveIMECaretPos(nsIWidget* aReferenceWidget,
aOutRect.MoveBy(-aNewOriginWidget->WidgetToScreenOffset());
}
#ifdef ENABLE_IME_MOUSE_HANDLING
PRBool
nsIMM32Handler::OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction)
{
@ -2079,8 +2068,6 @@ nsIMM32Handler::OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction)
(LPARAM) IMEContext.get()) == 1;
}
#endif // ENABLE_IME_MOUSE_HANDLING
/* static */ PRBool
nsIMM32Handler::OnKeyDownEvent(nsWindow* aWindow, WPARAM wParam, LPARAM lParam,
PRBool &aEatMessage)

View File

@ -57,8 +57,6 @@ class nsIWidget;
class nsWindow;
struct nsIntRect;
#define ENABLE_IME_MOUSE_HANDLING 1
#define NS_WM_IMEFIRST WM_IME_SETCONTEXT
#define NS_WM_IMELAST WM_IME_KEYUP
@ -172,9 +170,7 @@ protected:
// The result of following On*Event methods means "The message was processed,
// don't process the message in the caller (nsWindow)".
#ifdef ENABLE_IME_MOUSE_HANDLING
PRBool OnMouseEvent(nsWindow* aWindow, LPARAM lParam, int aAction);
#endif // ENABLE_IME_MOUSE_HANDLING
static PRBool OnKeyDownEvent(nsWindow* aWindow, WPARAM wParam, LPARAM lParam,
PRBool &aEatMessage);