Skip to content

Commit

Permalink
GUI: Added override specifiers
Browse files Browse the repository at this point in the history
  • Loading branch information
sev- committed Mar 28, 2018
1 parent ea7f92b commit b0affe5
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
14 changes: 7 additions & 7 deletions gui/Tooltip.h
Expand Up @@ -42,29 +42,29 @@ class Tooltip : public Dialog {

void drawDialog(DrawLayer layerToDraw) override;

virtual void receivedFocus(int x = -1, int y = -1) {}
virtual void receivedFocus(int x = -1, int y = -1) override {}
protected:
virtual void handleMouseDown(int x, int y, int button, int clickCount) {
virtual void handleMouseDown(int x, int y, int button, int clickCount) override {
close();
_parent->handleMouseDown(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount);
}
virtual void handleMouseUp(int x, int y, int button, int clickCount) {
virtual void handleMouseUp(int x, int y, int button, int clickCount) override {
close();
_parent->handleMouseUp(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount);
}
virtual void handleMouseWheel(int x, int y, int direction) {
virtual void handleMouseWheel(int x, int y, int direction) override {
close();
_parent->handleMouseWheel(x + (getAbsX() - _parent->getAbsX()), y + (getAbsX() - _parent->getAbsX()), direction);
}
virtual void handleKeyDown(Common::KeyState state) {
virtual void handleKeyDown(Common::KeyState state) override {
close();
_parent->handleKeyDown(state);
}
virtual void handleKeyUp(Common::KeyState state) {
virtual void handleKeyUp(Common::KeyState state) override {
close();
_parent->handleKeyUp(state);
}
virtual void handleMouseMoved(int x, int y, int button) {
virtual void handleMouseMoved(int x, int y, int button) override {
close();
}

Expand Down
14 changes: 7 additions & 7 deletions gui/console.h
Expand Up @@ -130,15 +130,15 @@ class ConsoleDialog : public Dialog {
public:
ConsoleDialog(float widthPercent, float heightPercent);

void open();
void close();
void open() override;
void close() override;
void drawDialog(DrawLayer layerToDraw) override;

void handleTickle();
void reflowLayout();
void handleMouseWheel(int x, int y, int direction);
void handleKeyDown(Common::KeyState state);
void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
void handleTickle() override;
void reflowLayout() override;
void handleMouseWheel(int x, int y, int direction) override;
void handleKeyDown(Common::KeyState state) override;
void handleCommand(CommandSender *sender, uint32 cmd, uint32 data) override;

int printFormat(int dummy, const char *format, ...) GCC_PRINTF(3, 4);
int vprintFormat(int dummy, const char *format, va_list argptr);
Expand Down
8 changes: 4 additions & 4 deletions gui/widgets/popup.cpp
Expand Up @@ -50,10 +50,10 @@ class PopUpDialog : public Dialog {

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);
Expand Down
18 changes: 9 additions & 9 deletions gui/widgets/tab.h
Expand Up @@ -101,28 +101,28 @@ class TabWidget : public Widget {
_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;

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);

Expand Down

0 comments on commit b0affe5

Please sign in to comment.