From 7422df1f123a57a511f78ae7de5e09909fc8da29 Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Wed, 8 Jul 2009 17:26:30 -0700
Subject: [PATCH] Bug 502509 - Mousewheel scrolling not working with Windows
 CE. r=vladimir

---
 widget/src/windows/nsWindow.cpp | 10 +++++-----
 widget/src/windows/nsWindow.h   |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 052c561ad468..eee74c58072f 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -3685,7 +3685,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
   *aRetValue = 0;
   nsPaletteInfo palInfo;
 
-#if !defined (WINCE)
+#if !defined (WINCE_WINDOWS_MOBILE)
   static PRBool getWheelInfo = PR_TRUE;
 #endif
 
@@ -4317,7 +4317,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
     break;
 
     case WM_SETTINGCHANGE:
-#if !defined (WINCE)
+#if !defined (WINCE_WINDOWS_MOBILE)
       getWheelInfo = PR_TRUE;
 #endif
       OnSettingsChange(wParam, lParam);
@@ -4409,7 +4409,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
     break;
 #endif
 
-#if !defined(WINCE)
+#if !defined (WINCE_WINDOWS_MOBILE)
   case WM_MOUSEWHEEL:
   case WM_MOUSEHWHEEL:
     {
@@ -4873,7 +4873,7 @@ PRBool nsWindow::OnGesture(WPARAM wParam, LPARAM lParam)
  * within the message case block. If returning true result should be returned
  * immediately (no more processing).
  */
-#if !defined(WINCE) // implemented in nsWindowCE
+#if !defined (WINCE_WINDOWS_MOBILE)
 PRBool nsWindow::OnMouseWheel(UINT msg, WPARAM wParam, LPARAM lParam, PRBool& getWheelInfo, PRBool& result, LRESULT *aRetValue)
 {
   // Handle both flavors of mouse wheel events.
@@ -5063,7 +5063,7 @@ PRBool nsWindow::OnMouseWheel(UINT msg, WPARAM wParam, LPARAM lParam, PRBool& ge
   
   return PR_FALSE; // break;
 } 
-#endif // !defined(WINCE)
+#endif // !defined(WINCE_WINDOWS_MOBILE)
 
 static PRBool
 StringCaseInsensitiveEquals(const PRUnichar* aChars1, const PRUint32 aNumChars1,
diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h
index 56f6a2449bc3..9d2215bf8d3e 100644
--- a/widget/src/windows/nsWindow.h
+++ b/widget/src/windows/nsWindow.h
@@ -321,10 +321,12 @@ protected:
 #if defined(CAIRO_HAS_DDRAW_SURFACE)
   PRBool                  OnPaintImageDDraw16();
 #endif // defined(CAIRO_HAS_DDRAW_SURFACE)
-#if !defined(WINCE)
+#if !defined(WINCE_WINDOWS_MOBILE)
   PRBool                  OnMouseWheel(UINT msg, WPARAM wParam, LPARAM lParam, 
                                        PRBool& result, PRBool& getWheelInfo,
                                        LRESULT *aRetValue);
+#endif // !defined(WINCE_WINDOWS_MOBILE)
+#if !defined(WINCE)
   void                    OnWindowPosChanging(LPWINDOWPOS& info);
 #endif // !defined(WINCE)