primeret/prime
0
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2026-07-12 18:18:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert override removal

Browse Source 
Former-commit-id: b6ddfcfc35
This commit is contained in:
Luke Street
2023-02-06 12:01:01 -05:00
parent 03f6f75516
commit 9b99045882
148 changed files with 1030 additions and 1023 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/GuiSys/CGuiCompoundWidget.hpp
+3 -3
View File
@@ -5,10 +5,10 @@
class CGuiCompoundWidget : public CGuiWidget {
public:
FourCC GetWidgetTypeID() const { return -1; }
FourCC GetWidgetTypeID() const override { return -1; }
void OnVisible();
void OnActivate();
void OnVisible() override;
void OnActivate() override;
virtual CGuiWidget* GetWorkerWidget(int id) const;
private:
};
include/GuiSys/CGuiGroup.hpp
+3 -3
View File
@@ -5,13 +5,13 @@
class CGuiGroup : public CGuiCompoundWidget {
public:
FourCC GetWidgetTypeID() const { return 'GRUP'; }
FourCC GetWidgetTypeID() const override { return 'GRUP'; }
void SelectWorkerWidget(int workerId, bool setActive, bool setVisible);
CGuiWidget* GetSelectedWidget();
const CGuiWidget* GetSelectedWidget() const;
bool AddWorkerWidget(CGuiWidget* worker);
void OnActivate();
bool AddWorkerWidget(CGuiWidget* worker) override;
void OnActivate() override;
private:
uint xb8_workerCount;
include/GuiSys/CGuiModel.hpp
+4 -4
View File
@@ -14,10 +14,10 @@ public:
bool flag);
const TLockedToken< CModel >& GetModel() const { return xb8_model; }
bool GetIsFinishedLoadingWidgetSpecific() const;
void Touch() const;
void Draw(const CGuiWidgetDrawParms& parms) const;
// bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const;
bool GetIsFinishedLoadingWidgetSpecific() const override;
void Touch() const override;
void Draw(const CGuiWidgetDrawParms& parms) const override;
// bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const override;
private:
TLockedToken< CModel > xb8_model;
include/GuiSys/CGuiPane.hpp
+1 -1
View File
@@ -7,7 +7,7 @@ class CGuiPane : public CGuiWidget {
public:
CGuiPane(const CGuiWidgetParms& parms, const CVector2f& dim, const CVector3f& scaleCenter);
void Draw(const CGuiWidgetDrawParms& parms) const;
void Draw(const CGuiWidgetDrawParms& parms) const override;
virtual void ScaleDimensions(const CVector3f& scale);
virtual void SetDimensions(const CVector2f& dim, bool initVBO);
virtual CVector2f GetDimensions() const;
include/GuiSys/CGuiTextPane.hpp
+6 -6
View File
@@ -19,12 +19,12 @@ public:
CGuiTextSupport& TextSupport() { return xd4_textSupport; }
const CGuiTextSupport& GetTextSupport() const { return xd4_textSupport; }
void Update(float dt);
bool GetIsFinishedLoadingWidgetSpecific() const;
void SetDimensions(const CVector2f& dim, bool initVBO);
void ScaleDimensions(const CVector3f& scale);
void Draw(const CGuiWidgetDrawParms& parms) const;
// bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const;
void Update(float dt) override;
bool GetIsFinishedLoadingWidgetSpecific() const override;
void SetDimensions(const CVector2f& dim, bool initVBO) override;
void ScaleDimensions(const CVector3f& scale) override;
void Draw(const CGuiWidgetDrawParms& parms) const override;
// bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const override;
private:
CGuiTextSupport xd4_textSupport;