aboutsummaryrefslogtreecommitdiff
path: root/gui/widgets
diff options
context:
space:
mode:
authorEugene Sandulenko2018-03-28 12:47:23 +0200
committerEugene Sandulenko2018-03-28 12:47:23 +0200
commitb0affe5bf2c7240afb8f16c9b9476a049941439f (patch)
treee0232e8cd29ef64531f4395c7f605a97e111598e /gui/widgets
parentea7f92bb218f3b00e89fc8a3361ed3e3069af789 (diff)
downloadscummvm-rg350-b0affe5bf2c7240afb8f16c9b9476a049941439f.tar.gz
scummvm-rg350-b0affe5bf2c7240afb8f16c9b9476a049941439f.tar.bz2
scummvm-rg350-b0affe5bf2c7240afb8f16c9b9476a049941439f.zip
GUI: Added override specifiers
Diffstat (limited to 'gui/widgets')
-rw-r--r--gui/widgets/popup.cpp8
-rw-r--r--gui/widgets/tab.h18
2 files changed, 13 insertions, 13 deletions
diff --git a/gui/widgets/popup.cpp b/gui/widgets/popup.cpp
index 40af769a34..65c9dea605 100644
--- a/gui/widgets/popup.cpp
+++ b/gui/widgets/popup.cpp
@@ -50,10 +50,10 @@ public:
void drawDialog(DrawLayer layerToDraw) override;
- void handleMouseUp(int x, int y, int button, int clickCount);
- void handleMouseWheel(int x, int y, int direction); // Scroll through entries with scroll wheel
- void handleMouseMoved(int x, int y, int button); // Redraw selections depending on mouse position
- void handleKeyDown(Common::KeyState state); // Scroll through entries with arrow keys etc.
+ void handleMouseUp(int x, int y, int button, int clickCount) override;
+ void handleMouseWheel(int x, int y, int direction) override; // Scroll through entries with scroll wheel
+ void handleMouseMoved(int x, int y, int button) override; // Redraw selections depending on mouse position
+ void handleKeyDown(Common::KeyState state) override; // Scroll through entries with arrow keys etc.
protected:
void drawMenuEntry(int entry, bool hilite);
diff --git a/gui/widgets/tab.h b/gui/widgets/tab.h
index bdd3e56b46..f85d30a9c6 100644
--- a/gui/widgets/tab.h
+++ b/gui/widgets/tab.h
@@ -101,15 +101,15 @@ public:
_tabs[tabID].title = title;
}
- virtual void handleMouseDown(int x, int y, int button, int clickCount);
- virtual bool handleKeyDown(Common::KeyState state);
- virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
+ virtual void handleMouseDown(int x, int y, int button, int clickCount) override;
+ virtual bool handleKeyDown(Common::KeyState state) override;
+ virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data) override;
virtual int getFirstVisible() const;
virtual void setFirstVisible(int tabID, bool adjustIfRoom = false);
- virtual bool containsWidget(Widget *) const;
+ virtual bool containsWidget(Widget *) const override;
- virtual void reflowLayout();
+ virtual void reflowLayout() override;
void draw() override;
void markAsDirty() override;
@@ -117,12 +117,12 @@ public:
protected:
// We overload getChildY to make sure child widgets are positioned correctly.
// Essentially this compensates for the space taken up by the tab title header.
- virtual int16 getChildY() const;
- virtual uint16 getHeight() const;
+ virtual int16 getChildY() const override;
+ virtual uint16 getHeight() const override;
- virtual void drawWidget();
+ virtual void drawWidget() override;
- virtual Widget *findWidget(int x, int y);
+ virtual Widget *findWidget(int x, int y) override;
virtual void adjustTabs(int value);