mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 23:54:35 +00:00
virtuals removed
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
This commit is contained in:
parent
88a43f3137
commit
efbe5e90f5
255 changed files with 2164 additions and 2164 deletions
|
|
@ -48,7 +48,7 @@ protected:
|
|||
GuiPopupTextListCtrlEx *mTextList;
|
||||
public:
|
||||
GuiPopUpBackgroundCtrlEx(GuiPopUpMenuCtrlEx *ctrl, GuiPopupTextListCtrlEx* textList);
|
||||
void onMouseDown(const GuiEvent &event);
|
||||
void onMouseDown(const GuiEvent &event) override;
|
||||
};
|
||||
|
||||
class GuiPopupTextListCtrlEx : public GuiTextListCtrl
|
||||
|
|
@ -66,13 +66,13 @@ class GuiPopupTextListCtrlEx : public GuiTextListCtrl
|
|||
GuiPopupTextListCtrlEx(GuiPopUpMenuCtrlEx *ctrl);
|
||||
|
||||
// GuiArrayCtrl overload:
|
||||
void onCellSelected(Point2I cell);
|
||||
void onCellSelected(Point2I cell) override;
|
||||
|
||||
// GuiControl overloads:
|
||||
bool onKeyDown(const GuiEvent &event);
|
||||
void onMouseUp(const GuiEvent &event);
|
||||
void onMouseMove(const GuiEvent &event);
|
||||
void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);
|
||||
bool onKeyDown(const GuiEvent &event) override;
|
||||
void onMouseUp(const GuiEvent &event) override;
|
||||
void onMouseMove(const GuiEvent &event) override;
|
||||
void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override;
|
||||
};
|
||||
|
||||
class GuiPopUpMenuCtrlEx : public GuiTextCtrl
|
||||
|
|
@ -150,10 +150,10 @@ class GuiPopUpMenuCtrlEx : public GuiTextCtrl
|
|||
GuiPopUpMenuCtrlEx(void);
|
||||
~GuiPopUpMenuCtrlEx();
|
||||
GuiScrollCtrl::Region mScrollDir;
|
||||
virtual bool onWake(); // Added
|
||||
virtual void onRemove();
|
||||
virtual bool onAdd();
|
||||
virtual void onSleep();
|
||||
bool onWake() override; // Added
|
||||
void onRemove() override;
|
||||
bool onAdd() override;
|
||||
void onSleep() override;
|
||||
void setBitmap(const char *name); // Added
|
||||
void sort();
|
||||
void sortID(); // Added
|
||||
|
|
@ -163,18 +163,18 @@ class GuiPopUpMenuCtrlEx : public GuiTextCtrl
|
|||
addEntry(buf, -2, 0);
|
||||
}
|
||||
void addScheme(U32 id, ColorI fontColor, ColorI fontColorHL, ColorI fontColorSEL);
|
||||
void onRender(Point2I offset, const RectI &updateRect);
|
||||
void onAction();
|
||||
void onRender(Point2I offset, const RectI &updateRect) override;
|
||||
void onAction() override;
|
||||
virtual void closePopUp();
|
||||
void clear();
|
||||
void clear() override;
|
||||
void clearEntry( S32 entry ); // Added
|
||||
void onMouseDown(const GuiEvent &event);
|
||||
void onMouseUp(const GuiEvent &event);
|
||||
void onMouseEnter(const GuiEvent &event); // Added
|
||||
void onMouseLeave(const GuiEvent &); // Added
|
||||
void onMouseDown(const GuiEvent &event) override;
|
||||
void onMouseUp(const GuiEvent &event) override;
|
||||
void onMouseEnter(const GuiEvent &event) override; // Added
|
||||
void onMouseLeave(const GuiEvent &) override; // Added
|
||||
void setupAutoScroll(const GuiEvent &event);
|
||||
void autoScroll();
|
||||
bool onKeyDown(const GuiEvent &event);
|
||||
bool onKeyDown(const GuiEvent &event) override;
|
||||
void reverseTextList();
|
||||
bool getFontColor(ColorI &fontColor, S32 id, bool selected, bool mouseOver);
|
||||
bool getColoredBox(ColorI &boxColor, S32 id); // Added
|
||||
|
|
@ -183,7 +183,7 @@ class GuiPopUpMenuCtrlEx : public GuiTextCtrl
|
|||
void setSelected(S32 id, bool bNotifyScript = true);
|
||||
void setFirstSelected(bool bNotifyScript = true); // Added
|
||||
void setNoneSelected(); // Added
|
||||
const char *getScriptValue();
|
||||
const char *getScriptValue() override;
|
||||
const char *getTextById(S32 id);
|
||||
S32 findText( const char* text );
|
||||
S32 getNumEntries() { return( mEntries.size() ); }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue