wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1118605 - Mark virtual overridden functions as MOZ_OVERRIDE in xpfe/appshell; r=bsmedberg

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-01-06 23:46:46 -05:00
parent 5e540ce6bf
commit 1def501577
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xpfe/appshell/nsAppShellWindowEnumerator.h
View File

@ -50,8 +50,8 @@ friend class nsWindowMediator;
public:
nsAppShellWindowEnumerator(const char16_t* aTypeString,
nsWindowMediator& inMediator);
NS_IMETHOD GetNext(nsISupports **retval) = 0;
NS_IMETHOD HasMoreElements(bool *retval);
NS_IMETHOD GetNext(nsISupports **retval) MOZ_OVERRIDE = 0;
NS_IMETHOD HasMoreElements(bool *retval) MOZ_OVERRIDE;
NS_DECL_ISUPPORTS

2
xpfe/appshell/nsWebShellWindow.cpp
View File

@ -450,7 +450,7 @@ public:
NS_DECL_THREADSAFE_ISUPPORTS
NS_IMETHOD Notify(nsITimer* aTimer)
NS_IMETHOD Notify(nsITimer* aTimer) MOZ_OVERRIDE
{
// Although this object participates in a refcount cycle (this -> mWindow
// -> mSPTimer -> this), mSPTimer is a one-shot timer and releases this

22
xpfe/appshell/nsWebShellWindow.h
View File

@ -47,20 +47,20 @@ public:
NS_DECL_NSIWEBPROGRESSLISTENER
// nsIBaseWindow
NS_IMETHOD Destroy();
NS_IMETHOD Destroy() MOZ_OVERRIDE;
// nsIWidgetListener
virtual nsIXULWindow* GetXULWindow() { return this; }
virtual nsIPresShell* GetPresShell();
virtual bool WindowMoved(nsIWidget* aWidget, int32_t x, int32_t y);
virtual bool WindowResized(nsIWidget* aWidget, int32_t aWidth, int32_t aHeight);
virtual bool RequestWindowClose(nsIWidget* aWidget);
virtual void SizeModeChanged(nsSizeMode sizeMode);
virtual void OSToolbarButtonPressed();
virtual nsIXULWindow* GetXULWindow() MOZ_OVERRIDE { return this; }
virtual nsIPresShell* GetPresShell() MOZ_OVERRIDE;
virtual bool WindowMoved(nsIWidget* aWidget, int32_t x, int32_t y) MOZ_OVERRIDE;
virtual bool WindowResized(nsIWidget* aWidget, int32_t aWidth, int32_t aHeight) MOZ_OVERRIDE;
virtual bool RequestWindowClose(nsIWidget* aWidget) MOZ_OVERRIDE;
virtual void SizeModeChanged(nsSizeMode sizeMode) MOZ_OVERRIDE;
virtual void OSToolbarButtonPressed() MOZ_OVERRIDE;
virtual bool ZLevelChanged(bool aImmediate, nsWindowZ *aPlacement,
nsIWidget* aRequestBelow, nsIWidget** aActualBelow);
virtual void WindowActivated();
virtual void WindowDeactivated();
nsIWidget* aRequestBelow, nsIWidget** aActualBelow) MOZ_OVERRIDE;
virtual void WindowActivated() MOZ_OVERRIDE;
virtual void WindowDeactivated() MOZ_OVERRIDE;
protected:
friend class mozilla::WebShellWindowTimerCallback;