diff --git a/widget/windows/JumpListItem.h b/widget/windows/JumpListItem.h index 19973ccc4330..c3d0733227ee 100644 --- a/widget/windows/JumpListItem.h +++ b/widget/windows/JumpListItem.h @@ -61,8 +61,8 @@ public: {} NS_DECL_ISUPPORTS_INHERITED - NS_IMETHOD GetType(int16_t *aType) { return JumpListItem::GetType(aType); } - NS_IMETHOD Equals(nsIJumpListItem *item, bool *_retval) { return JumpListItem::Equals(item, _retval); } + NS_IMETHOD GetType(int16_t *aType) override { return JumpListItem::GetType(aType); } + NS_IMETHOD Equals(nsIJumpListItem *item, bool *_retval) override { return JumpListItem::Equals(item, _retval); } static nsresult GetSeparator(RefPtr& aShellLink); }; @@ -77,8 +77,8 @@ public: {} NS_DECL_ISUPPORTS_INHERITED - NS_IMETHOD GetType(int16_t *aType) { return JumpListItem::GetType(aType); } - NS_IMETHOD Equals(nsIJumpListItem *item, bool *_retval); + NS_IMETHOD GetType(int16_t *aType) override { return JumpListItem::GetType(aType); } + NS_IMETHOD Equals(nsIJumpListItem *item, bool *_retval) override; NS_DECL_NSIJUMPLISTLINK static nsresult GetShellItem(nsCOMPtr& item, RefPtr& aShellItem); @@ -101,8 +101,8 @@ public: NS_DECL_CYCLE_COLLECTING_ISUPPORTS NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(JumpListShortcut, JumpListItem) - NS_IMETHOD GetType(int16_t *aType) { return JumpListItem::GetType(aType); } - NS_IMETHOD Equals(nsIJumpListItem *item, bool *_retval); + NS_IMETHOD GetType(int16_t *aType) override { return JumpListItem::GetType(aType); } + NS_IMETHOD Equals(nsIJumpListItem *item, bool *_retval) override; NS_DECL_NSIJUMPLISTSHORTCUT static nsresult GetShellLink(nsCOMPtr& item, diff --git a/widget/windows/TaskbarWindowPreview.h b/widget/windows/TaskbarWindowPreview.h index 2eba27d72f9d..d0719f739ae5 100644 --- a/widget/windows/TaskbarWindowPreview.h +++ b/widget/windows/TaskbarWindowPreview.h @@ -35,15 +35,15 @@ public: NS_DECL_NSITASKBAROVERLAYICONCONTROLLER NS_FORWARD_NSITASKBARPREVIEW(TaskbarPreview::) - virtual LRESULT WndProc(UINT nMsg, WPARAM wParam, LPARAM lParam); + virtual LRESULT WndProc(UINT nMsg, WPARAM wParam, LPARAM lParam) override; private: - virtual nsresult ShowActive(bool active); - virtual HWND &PreviewWindow(); + virtual nsresult ShowActive(bool active) override; + virtual HWND &PreviewWindow() override; - virtual nsresult UpdateTaskbarProperties(); - virtual nsresult Enable(); - virtual nsresult Disable(); - virtual void DetachFromNSWindow(); + virtual nsresult UpdateTaskbarProperties() override; + virtual nsresult Enable() override; + virtual nsresult Disable() override; + virtual void DetachFromNSWindow() override; nsresult UpdateButton(uint32_t index); nsresult UpdateButtons(); diff --git a/widget/windows/nsClipboard.h b/widget/windows/nsClipboard.h index 39456ce3e873..2083f247f6d7 100644 --- a/widget/windows/nsClipboard.h +++ b/widget/windows/nsClipboard.h @@ -35,8 +35,8 @@ public: // nsIClipboard NS_IMETHOD HasDataMatchingFlavors(const char** aFlavorList, uint32_t aLength, - int32_t aWhichClipboard, bool *_retval); - NS_IMETHOD EmptyClipboard(int32_t aWhichClipboard); + int32_t aWhichClipboard, bool *_retval) override; + NS_IMETHOD EmptyClipboard(int32_t aWhichClipboard) override; // Internal Native Routines static nsresult CreateNativeDataObject(nsITransferable * aTransferable, @@ -56,8 +56,8 @@ public: static UINT CF_HTML; protected: - NS_IMETHOD SetNativeClipboardData ( int32_t aWhichClipboard ); - NS_IMETHOD GetNativeClipboardData ( nsITransferable * aTransferable, int32_t aWhichClipboard ); + NS_IMETHOD SetNativeClipboardData ( int32_t aWhichClipboard ) override; + NS_IMETHOD GetNativeClipboardData ( nsITransferable * aTransferable, int32_t aWhichClipboard ) override; static bool IsInternetShortcut ( const nsAString& inFileName ) ; static bool FindURLFromLocalFile ( IDataObject* inDataObject, UINT inIndex, void** outData, uint32_t* outDataLen ) ; diff --git a/widget/windows/nsDeviceContextSpecWin.h b/widget/windows/nsDeviceContextSpecWin.h index 216c0e14b3cf..e0549bde56f0 100644 --- a/widget/windows/nsDeviceContextSpecWin.h +++ b/widget/windows/nsDeviceContextSpecWin.h @@ -23,16 +23,16 @@ public: NS_DECL_ISUPPORTS - NS_IMETHOD GetSurfaceForPrinter(gfxASurface **surface); + NS_IMETHOD GetSurfaceForPrinter(gfxASurface **surface) override; NS_IMETHOD BeginDocument(const nsAString& aTitle, char16_t* aPrintToFileName, int32_t aStartPage, - int32_t aEndPage) { return NS_OK; } - NS_IMETHOD EndDocument() { return NS_OK; } - NS_IMETHOD BeginPage() { return NS_OK; } - NS_IMETHOD EndPage() { return NS_OK; } + int32_t aEndPage) override { return NS_OK; } + NS_IMETHOD EndDocument() override { return NS_OK; } + NS_IMETHOD BeginPage() override { return NS_OK; } + NS_IMETHOD EndPage() override { return NS_OK; } - NS_IMETHOD Init(nsIWidget* aWidget, nsIPrintSettings* aPS, bool aIsPrintPreview); + NS_IMETHOD Init(nsIWidget* aWidget, nsIPrintSettings* aPS, bool aIsPrintPreview) override; void GetDriverName(wchar_t *&aDriverName) const { aDriverName = mDriverName; } void GetDeviceName(wchar_t *&aDeviceName) const { aDeviceName = mDeviceName; } diff --git a/widget/windows/nsIdleServiceWin.h b/widget/windows/nsIdleServiceWin.h index 3e0852607f62..c3fb1243fdc8 100644 --- a/widget/windows/nsIdleServiceWin.h +++ b/widget/windows/nsIdleServiceWin.h @@ -24,7 +24,7 @@ class nsIdleServiceWin : public nsIdleService public: NS_DECL_ISUPPORTS_INHERITED - bool PollIdleTime(uint32_t* aIdleTime); + bool PollIdleTime(uint32_t* aIdleTime) override; static already_AddRefed GetInstance() { @@ -40,7 +40,7 @@ public: protected: nsIdleServiceWin() { } virtual ~nsIdleServiceWin() { } - bool UsePollMode(); + bool UsePollMode() override; }; #endif // nsIdleServiceWin_h__ diff --git a/widget/windows/nsNativeThemeWin.h b/widget/windows/nsNativeThemeWin.h index 56ec44469eef..306c6764f642 100644 --- a/widget/windows/nsNativeThemeWin.h +++ b/widget/windows/nsNativeThemeWin.h @@ -31,44 +31,44 @@ public: nsIFrame* aFrame, uint8_t aWidgetType, const nsRect& aRect, - const nsRect& aDirtyRect); + const nsRect& aDirtyRect) override; NS_IMETHOD GetWidgetBorder(nsDeviceContext* aContext, nsIFrame* aFrame, uint8_t aWidgetType, - nsIntMargin* aResult); + nsIntMargin* aResult) override; virtual bool GetWidgetPadding(nsDeviceContext* aContext, nsIFrame* aFrame, uint8_t aWidgetType, - nsIntMargin* aResult); + nsIntMargin* aResult) override; virtual bool GetWidgetOverflow(nsDeviceContext* aContext, nsIFrame* aFrame, uint8_t aWidgetType, - nsRect* aOverflowRect); + nsRect* aOverflowRect) override; NS_IMETHOD GetMinimumWidgetSize(nsPresContext* aPresContext, nsIFrame* aFrame, uint8_t aWidgetType, mozilla::LayoutDeviceIntSize* aResult, - bool* aIsOverridable); + bool* aIsOverridable) override; - virtual Transparency GetWidgetTransparency(nsIFrame* aFrame, uint8_t aWidgetType); + virtual Transparency GetWidgetTransparency(nsIFrame* aFrame, uint8_t aWidgetType) override; NS_IMETHOD WidgetStateChanged(nsIFrame* aFrame, uint8_t aWidgetType, - nsIAtom* aAttribute, bool* aShouldRepaint); + nsIAtom* aAttribute, bool* aShouldRepaint) override; - NS_IMETHOD ThemeChanged(); + NS_IMETHOD ThemeChanged() override; bool ThemeSupportsWidget(nsPresContext* aPresContext, nsIFrame* aFrame, - uint8_t aWidgetType); + uint8_t aWidgetType) override; - bool WidgetIsContainer(uint8_t aWidgetType); + bool WidgetIsContainer(uint8_t aWidgetType) override; bool ThemeDrawsFocusForWidget(uint8_t aWidgetType) override; - bool ThemeNeedsComboboxDropmarker(); + bool ThemeNeedsComboboxDropmarker() override; virtual bool WidgetAppearanceDependsOnWindowFocus(uint8_t aWidgetType) override; diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h index 814461af89f3..6819c4c4392f 100644 --- a/widget/windows/nsWindow.h +++ b/widget/windows/nsWindow.h @@ -98,72 +98,72 @@ public: NS_IMETHOD Create(nsIWidget* aParent, nsNativeWidget aNativeParent, const LayoutDeviceIntRect& aRect, - nsWidgetInitData* aInitData = nullptr); - NS_IMETHOD Destroy(); - NS_IMETHOD SetParent(nsIWidget *aNewParent); - virtual nsIWidget* GetParent(void); - virtual float GetDPI(); - virtual double GetDefaultScaleInternal(); - NS_IMETHOD Show(bool bState); - virtual bool IsVisible() const; - NS_IMETHOD ConstrainPosition(bool aAllowSlop, int32_t *aX, int32_t *aY); - virtual void SetSizeConstraints(const SizeConstraints& aConstraints); - NS_IMETHOD Move(double aX, double aY); - NS_IMETHOD Resize(double aWidth, double aHeight, bool aRepaint); - NS_IMETHOD Resize(double aX, double aY, double aWidth, double aHeight, bool aRepaint); + nsWidgetInitData* aInitData = nullptr) override; + NS_IMETHOD Destroy() override; + NS_IMETHOD SetParent(nsIWidget *aNewParent) override; + virtual nsIWidget* GetParent(void) override; + virtual float GetDPI() override; + virtual double GetDefaultScaleInternal() override; + NS_IMETHOD Show(bool bState) override; + virtual bool IsVisible() const override; + NS_IMETHOD ConstrainPosition(bool aAllowSlop, int32_t *aX, int32_t *aY) override; + virtual void SetSizeConstraints(const SizeConstraints& aConstraints) override; + NS_IMETHOD Move(double aX, double aY) override; + NS_IMETHOD Resize(double aWidth, double aHeight, bool aRepaint) override; + NS_IMETHOD Resize(double aX, double aY, double aWidth, double aHeight, bool aRepaint) override; NS_IMETHOD BeginResizeDrag(mozilla::WidgetGUIEvent* aEvent, int32_t aHorizontal, - int32_t aVertical); - NS_IMETHOD PlaceBehind(nsTopLevelWidgetZPlacement aPlacement, nsIWidget *aWidget, bool aActivate); - NS_IMETHOD SetSizeMode(nsSizeMode aMode); - NS_IMETHOD Enable(bool aState); - virtual bool IsEnabled() const; - NS_IMETHOD SetFocus(bool aRaise); + int32_t aVertical) override; + NS_IMETHOD PlaceBehind(nsTopLevelWidgetZPlacement aPlacement, nsIWidget *aWidget, bool aActivate) override; + NS_IMETHOD SetSizeMode(nsSizeMode aMode) override; + NS_IMETHOD Enable(bool aState) override; + virtual bool IsEnabled() const override; + NS_IMETHOD SetFocus(bool aRaise) override; NS_IMETHOD GetBounds(LayoutDeviceIntRect& aRect) override; NS_IMETHOD GetScreenBounds(LayoutDeviceIntRect& aRect) override; NS_IMETHOD GetRestoredBounds(LayoutDeviceIntRect& aRect) override; NS_IMETHOD GetClientBounds(LayoutDeviceIntRect& aRect) override; virtual LayoutDeviceIntPoint GetClientOffset() override; - void SetBackgroundColor(const nscolor& aColor); + void SetBackgroundColor(const nscolor& aColor) override; NS_IMETHOD SetCursor(imgIContainer* aCursor, - uint32_t aHotspotX, uint32_t aHotspotY); - NS_IMETHOD SetCursor(nsCursor aCursor); - virtual nsresult ConfigureChildren(const nsTArray& aConfigurations); + uint32_t aHotspotX, uint32_t aHotspotY) override; + NS_IMETHOD SetCursor(nsCursor aCursor) override; + virtual nsresult ConfigureChildren(const nsTArray& aConfigurations) override; virtual bool PrepareForFullscreenTransition(nsISupports** aData) override; virtual void PerformFullscreenTransition(FullscreenTransitionStage aStage, uint16_t aDuration, nsISupports* aData, nsIRunnable* aCallback) override; - NS_IMETHOD MakeFullScreen(bool aFullScreen, nsIScreen* aScreen = nullptr); - NS_IMETHOD HideWindowChrome(bool aShouldHide); + NS_IMETHOD MakeFullScreen(bool aFullScreen, nsIScreen* aScreen = nullptr) override; + NS_IMETHOD HideWindowChrome(bool aShouldHide) override; NS_IMETHOD Invalidate(bool aEraseBackground = false, bool aUpdateNCArea = false, bool aIncludeChildren = false); NS_IMETHOD Invalidate(const LayoutDeviceIntRect& aRect); - virtual void* GetNativeData(uint32_t aDataType); + virtual void* GetNativeData(uint32_t aDataType) override; void SetNativeData(uint32_t aDataType, uintptr_t aVal) override; - virtual void FreeNativeData(void * data, uint32_t aDataType); - NS_IMETHOD SetTitle(const nsAString& aTitle); - NS_IMETHOD SetIcon(const nsAString& aIconSpec); - virtual LayoutDeviceIntPoint WidgetToScreenOffset(); + virtual void FreeNativeData(void * data, uint32_t aDataType) override; + NS_IMETHOD SetTitle(const nsAString& aTitle) override; + NS_IMETHOD SetIcon(const nsAString& aIconSpec) override; + virtual LayoutDeviceIntPoint WidgetToScreenOffset() override; virtual LayoutDeviceIntSize ClientToWindowSize(const LayoutDeviceIntSize& aClientSize) override; NS_IMETHOD DispatchEvent(mozilla::WidgetGUIEvent* aEvent, - nsEventStatus& aStatus); - NS_IMETHOD EnableDragDrop(bool aEnable); - NS_IMETHOD CaptureMouse(bool aCapture); + nsEventStatus& aStatus) override; + NS_IMETHOD EnableDragDrop(bool aEnable) override; + NS_IMETHOD CaptureMouse(bool aCapture) override; NS_IMETHOD CaptureRollupEvents(nsIRollupListener * aListener, - bool aDoCapture); - NS_IMETHOD GetAttention(int32_t aCycleCount); - virtual bool HasPendingInputEvent(); + bool aDoCapture) override; + NS_IMETHOD GetAttention(int32_t aCycleCount) override; + virtual bool HasPendingInputEvent() override; virtual LayerManager* GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr, LayersBackend aBackendHint = mozilla::layers::LayersBackend::LAYERS_NONE, LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT, - bool* aAllowRetaining = nullptr); + bool* aAllowRetaining = nullptr) override; NS_IMETHOD OnDefaultButtonLoaded(const LayoutDeviceIntRect& aButtonRect) override; NS_IMETHOD OverrideSystemMouseScrollSpeed(double aOriginalDeltaX, double aOriginalDeltaY, double& aOverriddenDeltaX, - double& aOverriddenDeltaY); + double& aOverriddenDeltaY) override; virtual nsresult SynthesizeNativeKeyEvent(int32_t aNativeKeyboardLayout, int32_t aNativeKeyCode, @@ -189,17 +189,17 @@ public: uint32_t aAdditionalFlags, nsIObserver* aObserver) override; NS_IMETHOD_(void) SetInputContext(const InputContext& aContext, - const InputContextAction& aAction); - NS_IMETHOD_(InputContext) GetInputContext(); + const InputContextAction& aAction) override; + NS_IMETHOD_(InputContext) GetInputContext() override; #ifdef MOZ_XUL - virtual void SetTransparencyMode(nsTransparencyMode aMode); - virtual nsTransparencyMode GetTransparencyMode(); - virtual void UpdateOpaqueRegion(const LayoutDeviceIntRegion& aOpaqueRegion); + virtual void SetTransparencyMode(nsTransparencyMode aMode) override; + virtual nsTransparencyMode GetTransparencyMode() override; + virtual void UpdateOpaqueRegion(const LayoutDeviceIntRegion& aOpaqueRegion) override; #endif // MOZ_XUL - virtual nsIMEUpdatePreference GetIMEUpdatePreference(); + virtual nsIMEUpdatePreference GetIMEUpdatePreference() override; NS_IMETHOD GetNonClientMargins(LayoutDeviceIntMargin& aMargins) override; NS_IMETHOD SetNonClientMargins(LayoutDeviceIntMargin& aMargins) override; - void SetDrawsInTitlebar(bool aState); + void SetDrawsInTitlebar(bool aState) override; already_AddRefed StartRemoteDrawing() override; virtual void EndRemoteDrawing() override; virtual void UpdateWindowDraggingRegion(const LayoutDeviceIntRegion& aRegion) override; @@ -282,7 +282,7 @@ public: } void SetTaskbarPreview(nsITaskbarWindowPreview *preview) { mTaskbarPreview = do_GetWeakReference(preview); } - NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent); + NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent) override; // Open file picker tracking void PickerOpen(); @@ -291,9 +291,9 @@ public: bool const DestroyCalled() { return mDestroyCalled; } bool IsPopup(); - virtual bool ShouldUseOffMainThreadCompositing(); + virtual bool ShouldUseOffMainThreadCompositing() override; - bool CaptureWidgetOnScreen(RefPtr aDT); + bool CaptureWidgetOnScreen(RefPtr aDT) override; const IMEContext& DefaultIMC() const { return mDefaultIMC; } @@ -391,7 +391,7 @@ protected: /** * Event handlers */ - virtual void OnDestroy(); + virtual void OnDestroy() override; virtual bool OnResize(nsIntRect &aWindowRect); bool OnGesture(WPARAM wParam, LPARAM lParam); bool OnTouch(WPARAM wParam, LPARAM lParam);