Bug 473687 - Remove widget WinCE support: Part D (Remove nsWindowGfx::OnSettingsChangeGfx & nsWindow::OnSettingsChange); r=dougt
authorEd Morley <bmo@edmorley.co.uk>
Sun, 24 Apr 2011 20:10:16 -0700
changeset 68499 d29e9cb9d0c940a6e897e66db6fb849dd887835b
parent 68498 d33506667f79adf5ab494eaabcca39efba276b74
child 68500 0eaee388eeadf2da8850c88f4bf3d31673fa255b
push id19662
push userzackw@panix.com
push dateMon, 25 Apr 2011 03:12:04 +0000
treeherdermozilla-central@d29e9cb9d0c9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdougt
bugs473687
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 473687 - Remove widget WinCE support: Part D (Remove nsWindowGfx::OnSettingsChangeGfx & nsWindow::OnSettingsChange); r=dougt
widget/src/windows/nsWindow.cpp
widget/src/windows/nsWindow.h
widget/src/windows/nsWindowGfx.cpp
widget/src/windows/nsWindowGfx.h
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -5208,17 +5208,16 @@ PRBool nsWindow::ProcessMessage(UINT msg
     {
       WINDOWPOS *wp = (LPWINDOWPOS)lParam;
       OnWindowPosChanged(wp, result);
     }
     break;
 
     case WM_SETTINGCHANGE:
       getWheelInfo = PR_TRUE;
-      OnSettingsChange(wParam, lParam);
       break;
 
     case WM_INPUTLANGCHANGEREQUEST:
       *aRetValue = TRUE;
       result = PR_FALSE;
       break;
 
     case WM_INPUTLANGCHANGE:
@@ -7283,23 +7282,16 @@ PRBool nsWindow::OnResize(nsIntRect &aWi
   return PR_FALSE;
 }
 
 PRBool nsWindow::OnHotKey(WPARAM wParam, LPARAM lParam)
 {
   return PR_TRUE;
 }
 
-void nsWindow::OnSettingsChange(WPARAM wParam, LPARAM lParam)
-{
-  if (mWindowType == eWindowType_dialog ||
-      mWindowType == eWindowType_toplevel )
-    nsWindowGfx::OnSettingsChangeGfx(wParam);
-}
-
 /* static */
 PRBool nsWindow::IsOurProcessWindow(HWND aHWND)
 {
   if (!aHWND) {
     return PR_FALSE;
   }
   DWORD processId = 0;
   ::GetWindowThreadProcessId(aHWND, &processId);
--- a/widget/src/windows/nsWindow.h
+++ b/widget/src/windows/nsWindow.h
@@ -404,17 +404,16 @@ protected:
                                     PRBool *aEventDispatched = nsnull);
   virtual PRBool          OnScroll(UINT aMsg, WPARAM aWParam, LPARAM aLParam);
   PRBool                  OnGesture(WPARAM wParam, LPARAM lParam);
 #if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
   PRBool                  OnTouch(WPARAM wParam, LPARAM lParam);
 #endif
   PRBool                  OnHotKey(WPARAM wParam, LPARAM lParam);
   BOOL                    OnInputLangChange(HKL aHKL);
-  void                    OnSettingsChange(WPARAM wParam, LPARAM lParam);
   PRBool                  OnPaint(HDC aDC, PRUint32 aNestingLevel);
   void                    OnWindowPosChanged(WINDOWPOS *wp, PRBool& aResult);
   PRBool                  OnMouseWheel(UINT msg, WPARAM wParam, LPARAM lParam, 
                                        PRBool& result, PRBool& getWheelInfo,
                                        LRESULT *aRetValue);
   void                    OnWindowPosChanging(LPWINDOWPOS& info);
 
   /**
--- a/widget/src/windows/nsWindowGfx.cpp
+++ b/widget/src/windows/nsWindowGfx.cpp
@@ -155,22 +155,16 @@ nsWindowGfx::ConvertHRGNToRegion(HRGN aR
  **
  ** BLOCK: nsWindow impl.
  **
  ** Paint related nsWindow methods.
  **
  **************************************************************
  **************************************************************/
 
-void nsWindowGfx::OnSettingsChangeGfx(WPARAM wParam)
-{
-  // Previously contained only an ifdef WINCE_WINDOWS_MOBILE
-  // TODO: Remove this and adjust references
-}
-
 // GetRegionToPaint returns the invalidated region that needs to be painted
 nsIntRegion nsWindow::GetRegionToPaint(PRBool aForceFullRepaint,
                                        PAINTSTRUCT ps, HDC aDC)
 {
   if (aForceFullRepaint) {
     RECT paintRect;
     ::GetClientRect(mWnd, &paintRect);
     return nsIntRegion(nsWindowGfx::ToIntRect(paintRect));
--- a/widget/src/windows/nsWindowGfx.h
+++ b/widget/src/windows/nsWindowGfx.h
@@ -54,17 +54,16 @@ class nsWindowGfx {
 public:
   static nsIntRect ToIntRect(const RECT& aRect)
   {
     return nsIntRect(aRect.left, aRect.top,
                      aRect.right - aRect.left, aRect.bottom - aRect.top);
   }
 
   static nsIntRegion ConvertHRGNToRegion(HRGN aRgn);
-  static void OnSettingsChangeGfx(WPARAM wParam);
 
   static nsresult CreateIcon(imgIContainer *aContainer, PRBool aIsCursor, PRUint32 aHotspotX, PRUint32 aHotspotY, HICON *aIcon);
 
 private:
   /**
    * Cursor helpers
    */
   static PRUint8*         Data32BitTo1Bit(PRUint8* aImageData, PRUint32 aWidth, PRUint32 aHeight);