Skip to content

Commit 9620f8e

Browse files
committed
Address inconsistent override warning in CImageGUISkin
1 parent d25d4f3 commit 9620f8e

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

gframe/CGUISkinSystem/CImageGUISkin.h

+11-11
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class CImageGUISkin final : public IGUISkin {
4949
//! returns default color
5050
s32 getSize(EGUI_DEFAULT_SIZE size) const override;
5151

52-
//! Returns a default text.
52+
//! Returns a default text.
5353
const wchar_t* getDefaultText(EGUI_DEFAULT_TEXT text) const override;
5454

5555
//! Sets a default text.
@@ -76,20 +76,20 @@ class CImageGUISkin final : public IGUISkin {
7676

7777
virtual void draw3DButtonPaneStandard(IGUIElement* element,
7878
const core::rect<s32>& rect,
79-
const core::rect<s32>* clip = 0);
79+
const core::rect<s32>* clip = 0) override;
8080

8181
virtual void draw3DButtonPaneDisabled(IGUIElement* element,
8282
const core::rect<s32>& rect,
8383
const core::rect<s32>* clip = 0);
8484

8585
virtual void draw3DButtonPanePressed(IGUIElement* element,
8686
const core::rect<s32>& rect,
87-
const core::rect<s32>* clip = 0);
87+
const core::rect<s32>* clip = 0) override;
8888

8989
virtual void draw3DSunkenPane(IGUIElement* element,
9090
video::SColor bgcolor, bool flat, bool fillBackGround,
9191
const core::rect<s32>& rect,
92-
const core::rect<s32>* clip = 0);
92+
const core::rect<s32>* clip = 0) override;
9393
/* Updates for irrlicht 1.7 by Mamnarock
9494
virtual core::rect<s32> draw3DWindowBackground(IGUIElement* element,
9595
bool drawTitleBar, video::SColor titleBarColor,
@@ -100,25 +100,25 @@ class CImageGUISkin final : public IGUISkin {
100100
bool drawTitleBar, video::SColor titleBarColor,
101101
const core::rect<s32>& rect,
102102
const core::rect<s32>* clip = 0,
103-
core::rect<s32>* checkClientArea = 0);
103+
core::rect<s32>* checkClientArea = 0) override;
104104

105105
virtual void draw3DMenuPane(IGUIElement* element,
106106
const core::rect<s32>& rect,
107-
const core::rect<s32>* clip = 0);
107+
const core::rect<s32>* clip = 0) override;
108108

109109
virtual void draw3DToolBar(IGUIElement* element,
110110
const core::rect<s32>& rect,
111-
const core::rect<s32>* clip = 0);
111+
const core::rect<s32>* clip = 0) override;
112112

113113
virtual void draw3DTabButton(IGUIElement* element, bool active,
114-
const core::rect<s32>& rect, const core::rect<s32>* clip = 0, EGUI_ALIGNMENT alignment = EGUIA_UPPERLEFT);
114+
const core::rect<s32>& rect, const core::rect<s32>* clip = 0, EGUI_ALIGNMENT alignment = EGUIA_UPPERLEFT) override;
115115

116116
virtual void draw3DTabBody(IGUIElement* element, bool border, bool background,
117-
const core::rect<s32>& rect, const core::rect<s32>* clip = 0, s32 tabHeight = -1, gui::EGUI_ALIGNMENT alignment = EGUIA_UPPERLEFT);
117+
const core::rect<s32>& rect, const core::rect<s32>* clip = 0, s32 tabHeight = -1, gui::EGUI_ALIGNMENT alignment = EGUIA_UPPERLEFT) override;
118118

119119
virtual void drawIcon(IGUIElement* element, EGUI_DEFAULT_ICON icon,
120120
const core::vector2di position, u32 starttime = 0, u32 currenttime = 0,
121-
bool loop = false, const core::rect<s32>* clip = 0);
121+
bool loop = false, const core::rect<s32>* clip = 0) override;
122122
// Madoc - I had to add some things
123123

124124
// Exposes config so we can get the progress bar colors
@@ -129,7 +129,7 @@ class CImageGUISkin final : public IGUISkin {
129129
f32 filledRatio, video::SColor fillColor, video::SColor emptyColor);
130130

131131
virtual void draw2DRectangle(IGUIElement* element, const video::SColor &color,
132-
const core::rect<s32>& pos, const core::rect<s32>* clip = 0);
132+
const core::rect<s32>& pos, const core::rect<s32>* clip = 0) override;
133133
void setProperty(core::stringw key, core::stringw value);
134134
core::stringw getProperty(core::stringw key);
135135
void setCustomColor(ygo::skin::CustomSkinElements key, video::SColor value);

0 commit comments

Comments
 (0)