From 3417e5c57693f3669b6d6bbfc3f2b6a1ad53a568 Mon Sep 17 00:00:00 2001
From: Henrique Gemignani Passos Lima <henrique@gemignani.org>
Date: Thu, 19 Jan 2023 11:15:00 +0200
Subject: [PATCH] Fix building for host compiler

---
 include/GuiSys/CGuiCompoundWidget.hpp | 4 ++--
 include/GuiSys/CGuiGroup.hpp          | 2 +-
 include/GuiSys/CGuiModel.hpp          | 8 ++++----
 include/GuiSys/CGuiPane.hpp           | 2 +-
 include/GuiSys/CGuiTextPane.hpp       | 6 +++---
 src/Kyoto/Audio/DolphinCAudioSys.cpp  | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/GuiSys/CGuiCompoundWidget.hpp b/include/GuiSys/CGuiCompoundWidget.hpp
index 228d4af1..337baf74 100644
--- a/include/GuiSys/CGuiCompoundWidget.hpp
+++ b/include/GuiSys/CGuiCompoundWidget.hpp
@@ -7,8 +7,8 @@ class CGuiCompoundWidget : public CGuiWidget {
 public:
   FourCC GetWidgetTypeID() const override { return -1; }
 
-  void OnVisibleChange() override;
-  void OnActiveChange() override;
+  void OnVisible() override;
+  void OnActivate() override;
   virtual CGuiWidget* GetWorkerWidget(int id) const;
 private:
 };
diff --git a/include/GuiSys/CGuiGroup.hpp b/include/GuiSys/CGuiGroup.hpp
index e7aa6de0..f139874b 100644
--- a/include/GuiSys/CGuiGroup.hpp
+++ b/include/GuiSys/CGuiGroup.hpp
@@ -11,7 +11,7 @@ public:
   CGuiWidget* GetSelectedWidget();
   const CGuiWidget* GetSelectedWidget() const;
   bool AddWorkerWidget(CGuiWidget* worker) override;
-  void OnActiveChange() override;
+  void OnActivate() override;
 
 private:
   uint xb8_workerCount;
diff --git a/include/GuiSys/CGuiModel.hpp b/include/GuiSys/CGuiModel.hpp
index a2603ed1..710bebc0 100644
--- a/include/GuiSys/CGuiModel.hpp
+++ b/include/GuiSys/CGuiModel.hpp
@@ -14,10 +14,10 @@ public:
             bool flag);
 
   const TLockedToken< CModel >& GetModel() const { return xb8_model; }
-  bool GetIsFinishedLoadingWidgetSpecific() override;
-  void Touch() override;
-  void Draw(const CGuiWidgetDrawParms& parms) override;
-  bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const override;
+  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;
diff --git a/include/GuiSys/CGuiPane.hpp b/include/GuiSys/CGuiPane.hpp
index a043b1a3..529b849a 100644
--- a/include/GuiSys/CGuiPane.hpp
+++ b/include/GuiSys/CGuiPane.hpp
@@ -7,7 +7,7 @@ class CGuiPane : public CGuiWidget {
 public:
   CGuiPane(const CGuiWidgetParms& parms, const CVector2f& dim, const CVector3f& scaleCenter);
 
-  void Draw(const CGuiWidgetDrawParms& parms) override;
+  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;
diff --git a/include/GuiSys/CGuiTextPane.hpp b/include/GuiSys/CGuiTextPane.hpp
index 56018696..f16a1b02 100644
--- a/include/GuiSys/CGuiTextPane.hpp
+++ b/include/GuiSys/CGuiTextPane.hpp
@@ -20,11 +20,11 @@ public:
   CGuiTextSupport& TextSupport() { return xd4_textSupport; }
   const CGuiTextSupport& GetTextSupport() const { return xd4_textSupport; }
   void Update(float dt) override;
-  bool GetIsFinishedLoadingWidgetSpecific() override;
+  bool GetIsFinishedLoadingWidgetSpecific() const override;
   void SetDimensions(const CVector2f& dim, bool initVBO) override;
   void ScaleDimensions(const CVector3f& scale) override;
-  void Draw(const CGuiWidgetDrawParms& parms) override;
-  bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const override;
+  void Draw(const CGuiWidgetDrawParms& parms) const override;
+  // bool TestCursorHit(const CMatrix4f& vp, const CVector2f& point) const override;
 
 private:
   CGuiTextSupport xd4_textSupport;
diff --git a/src/Kyoto/Audio/DolphinCAudioSys.cpp b/src/Kyoto/Audio/DolphinCAudioSys.cpp
index dfee1980..d359d844 100644
--- a/src/Kyoto/Audio/DolphinCAudioSys.cpp
+++ b/src/Kyoto/Audio/DolphinCAudioSys.cpp
@@ -22,7 +22,7 @@ bool CAudioSys::mProLogic2 = true;
 
 const rstl::string CAudioSys::mpDefaultInvalidString(rstl::string_l("NULL"));
 
-void* DoMalloc(size_t len) { return new char[len]; }
+void* DoMalloc(u32 len) { return new char[len]; }
 
 void DoFree(void* ptr) {
   if (!ptr) {