diff --git a/widget/public/nsIWidget.h b/widget/public/nsIWidget.h index 317832e9ef4a..6ed9abbde4aa 100644 --- a/widget/public/nsIWidget.h +++ b/widget/public/nsIWidget.h @@ -665,12 +665,6 @@ class nsIWidget : public nsISupports { */ NS_IMETHOD MakeFullScreen(PRBool aFullScreen) = 0; - /** - * Validate the widget. - * - */ - NS_IMETHOD Validate() = 0; - /** * Invalidate the widget and repaint it. * diff --git a/widget/src/cocoa/nsChildView.h b/widget/src/cocoa/nsChildView.h index f988aaa5282c..b28693e6b3b5 100644 --- a/widget/src/cocoa/nsChildView.h +++ b/widget/src/cocoa/nsChildView.h @@ -341,7 +341,6 @@ public: NS_IMETHOD Invalidate(PRBool aIsSynchronous); NS_IMETHOD Invalidate(const nsIntRect &aRect, PRBool aIsSynchronous); - NS_IMETHOD Validate(); virtual void* GetNativeData(PRUint32 aDataType); virtual nsresult ConfigureChildren(const nsTArray& aConfigurations); diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm index 9c242107310d..b7df13f4544e 100644 --- a/widget/src/cocoa/nsChildView.mm +++ b/widget/src/cocoa/nsChildView.mm @@ -1659,17 +1659,6 @@ NS_IMETHODIMP nsChildView::Invalidate(const nsIntRect &aRect, PRBool aIsSynchron NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT; } -// Validate the widget -NS_IMETHODIMP nsChildView::Validate() -{ - NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT; - - [mView setNeedsDisplay:NO]; - return NS_OK; - - NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT; -} - inline PRUint16 COLOR8TOCOLOR16(PRUint8 color8) { // return (color8 == 0xFF ? 0xFFFF : (color8 << 8)); diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp index b7ca40f9e756..026683ff1be7 100644 --- a/widget/src/gtk2/nsWindow.cpp +++ b/widget/src/gtk2/nsWindow.cpp @@ -1680,23 +1680,6 @@ nsWindow::SetCursor(imgIContainer* aCursor, return rv; } - -NS_IMETHODIMP -nsWindow::Validate() -{ - // Get the update for this window and, well, just drop it on the - // floor. - if (!mGdkWindow) - return NS_OK; - - GdkRegion *region = gdk_window_get_update_area(mGdkWindow); - - if (region) - gdk_region_destroy(region); - - return NS_OK; -} - NS_IMETHODIMP nsWindow::Invalidate(PRBool aIsSynchronous) { diff --git a/widget/src/gtk2/nsWindow.h b/widget/src/gtk2/nsWindow.h index 483bca34037c..d15b313b1f9f 100644 --- a/widget/src/gtk2/nsWindow.h +++ b/widget/src/gtk2/nsWindow.h @@ -181,7 +181,6 @@ public: NS_IMETHOD SetCursor(nsCursor aCursor); NS_IMETHOD SetCursor(imgIContainer* aCursor, PRUint32 aHotspotX, PRUint32 aHotspotY); - NS_IMETHOD Validate(); NS_IMETHOD Invalidate(PRBool aIsSynchronous); NS_IMETHOD Invalidate(const nsIntRect &aRect, PRBool aIsSynchronous); diff --git a/widget/src/qt/nsWindow.cpp b/widget/src/qt/nsWindow.cpp index 4ea612820193..71e14210f6c6 100644 --- a/widget/src/qt/nsWindow.cpp +++ b/widget/src/qt/nsWindow.cpp @@ -634,20 +634,6 @@ nsWindow::SetCursor(imgIContainer* aCursor, return rv; } - -NS_IMETHODIMP -nsWindow::Validate() -{ - // Get the update for this window and, well, just drop it on the - // floor. - if (!mWidget) - return NS_OK; - - qDebug("FIXME:>>>>>>Func:%s::%d\n", __PRETTY_FUNCTION__, __LINE__); - - return NS_OK; -} - NS_IMETHODIMP nsWindow::Invalidate(PRBool aIsSynchronous) { diff --git a/widget/src/qt/nsWindow.h b/widget/src/qt/nsWindow.h index d616b147467d..7aff34daddad 100644 --- a/widget/src/qt/nsWindow.h +++ b/widget/src/qt/nsWindow.h @@ -165,7 +165,6 @@ public: NS_IMETHOD GetHasTransparentBackground(PRBool& aTransparent); NS_IMETHOD HideWindowChrome(PRBool aShouldHide); NS_IMETHOD MakeFullScreen(PRBool aFullScreen); - NS_IMETHOD Validate(); NS_IMETHOD Invalidate(PRBool aIsSynchronous); NS_IMETHOD Invalidate(const nsIntRect &aRect, PRBool aIsSynchronous); diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index aec05b76f1e4..cb07e0c5f107 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -1999,20 +1999,12 @@ NS_IMETHODIMP nsWindow::HideWindowChrome(PRBool aShouldHide) /************************************************************** * - * SECTION: nsIWidget::Validate, nsIWidget::Invalidate + * SECTION: nsIWidget::Invalidate * - * Validate or invalidate an area of the client for painting. + * Invalidate an area of the client for painting. * **************************************************************/ -// Validate a visible area of a widget. -NS_METHOD nsWindow::Validate() -{ - if (mWnd) - VERIFY(::ValidateRect(mWnd, NULL)); - return NS_OK; -} - #ifdef WINCE_WINDOWS_MOBILE static inline void AddRECTToRegion(const RECT& aRect, nsIRegion* aRegion) { diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h index 1788164d4ae5..b4a56160c4d2 100644 --- a/widget/src/windows/nsWindow.h +++ b/widget/src/windows/nsWindow.h @@ -139,7 +139,6 @@ public: virtual nsresult ConfigureChildren(const nsTArray& aConfigurations); NS_IMETHOD MakeFullScreen(PRBool aFullScreen); NS_IMETHOD HideWindowChrome(PRBool aShouldHide); - NS_IMETHOD Validate(); NS_IMETHOD Invalidate(PRBool aIsSynchronous); NS_IMETHOD Invalidate(const nsIntRect & aRect, PRBool aIsSynchronous); NS_IMETHOD Update(); diff --git a/widget/src/xpwidgets/nsBaseWidget.cpp b/widget/src/xpwidgets/nsBaseWidget.cpp index 9d22a69298bb..1101f7ccc3af 100644 --- a/widget/src/xpwidgets/nsBaseWidget.cpp +++ b/widget/src/xpwidgets/nsBaseWidget.cpp @@ -214,11 +214,6 @@ NS_IMETHODIMP nsBaseWidget::CaptureMouse(PRBool aCapture) return NS_OK; } -NS_IMETHODIMP nsBaseWidget::Validate() -{ - return NS_OK; -} - //------------------------------------------------------------------------- // // Accessor functions to get/set the client data diff --git a/widget/src/xpwidgets/nsBaseWidget.h b/widget/src/xpwidgets/nsBaseWidget.h index 557d3a32abfa..b79137faed6d 100644 --- a/widget/src/xpwidgets/nsBaseWidget.h +++ b/widget/src/xpwidgets/nsBaseWidget.h @@ -74,7 +74,6 @@ public: // nsIWidget interface NS_IMETHOD CaptureMouse(PRBool aCapture); - NS_IMETHOD Validate(); NS_IMETHOD GetClientData(void*& aClientData); NS_IMETHOD SetClientData(void* aClientData); NS_IMETHOD Destroy();