diff --git a/GpApp/House.h b/GpApp/House.h index 51a39c7..679dc75 100644 --- a/GpApp/House.h +++ b/GpApp/House.h @@ -5,7 +5,7 @@ //============================================================================ -#include "PLMacTypes.h" +#include "PLCore.h" extern Str32 thisHouseName; diff --git a/PortabilityLayer/DialogManager.cpp b/PortabilityLayer/DialogManager.cpp index 7a2b924..b870e43 100644 --- a/PortabilityLayer/DialogManager.cpp +++ b/PortabilityLayer/DialogManager.cpp @@ -7,14 +7,12 @@ #include "PLArrayView.h" #include "PLBigEndian.h" #include "PLButtonWidget.h" -#include "PLCheckboxWidget.h" #include "PLDialogs.h" #include "PLEditboxWidget.h" #include "PLIconWidget.h" #include "PLImageWidget.h" #include "PLInvisibleWidget.h" #include "PLLabelWidget.h" -#include "PLRadioButtonWidget.h" #include "PLPasStr.h" #include "PLStandardColors.h" #include "PLSysCalls.h" diff --git a/PortabilityLayer/PLCheckboxWidget.h b/PortabilityLayer/PLCheckboxWidget.h deleted file mode 100644 index 14b1d6d..0000000 --- a/PortabilityLayer/PLCheckboxWidget.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include "PascalStr.h" -#include "PLWidgets.h" - -namespace PortabilityLayer -{ - class CheckboxWidget final : public WidgetSpec - { - public: - CheckboxWidget(const WidgetBasicState &state); - ~CheckboxWidget(); - - bool Init(const WidgetBasicState &state, const void *additionalData) override; - - void DrawControl(DrawSurface *surface) override; - void SetString(const PLPasStr &str) override; - PLPasStr GetString() const override; - - void OnStateChanged() override; - void OnEnabledChanged() override; - int16_t Capture(const Point &pos, WidgetUpdateCallback_t callback) override; - - WidgetHandleState_t ProcessEvent(const TimeTaggedVOSEvent &evt); - - private: - void DrawControlInternal(DrawSurface *surface, bool inverted); - - PascalStr<255> m_text; - bool m_haveMouseDown; - }; -} diff --git a/PortabilityLayer/PLMacTypes.h b/PortabilityLayer/PLMacTypes.h deleted file mode 100644 index 50e9667..0000000 --- a/PortabilityLayer/PLMacTypes.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/PortabilityLayer/PLRadioButtonWidget.h b/PortabilityLayer/PLRadioButtonWidget.h deleted file mode 100644 index 3859cf6..0000000 --- a/PortabilityLayer/PLRadioButtonWidget.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "PascalStr.h" -#include "PLWidgets.h" - -namespace PortabilityLayer -{ - class RadioButtonWidget final : public WidgetSpec - { - public: - RadioButtonWidget(const WidgetBasicState &state); - ~RadioButtonWidget(); - - bool Init(const WidgetBasicState &state, const void *additionalData) override; - - void DrawControl(DrawSurface *surface) override; - void SetString(const PLPasStr &str) override; - PLPasStr GetString() const override; - - void OnStateChanged() override; - - WidgetHandleState_t ProcessEvent(const TimeTaggedVOSEvent &evt); - - private: - PascalStr<255> m_text; - bool m_haveMouseDown; - }; -} diff --git a/PortabilityLayer/PortabilityLayer.vcxproj b/PortabilityLayer/PortabilityLayer.vcxproj index d9efe55..b92baf0 100644 --- a/PortabilityLayer/PortabilityLayer.vcxproj +++ b/PortabilityLayer/PortabilityLayer.vcxproj @@ -210,7 +210,6 @@ - @@ -226,7 +225,6 @@ - @@ -237,7 +235,6 @@ - diff --git a/PortabilityLayer/PortabilityLayer.vcxproj.filters b/PortabilityLayer/PortabilityLayer.vcxproj.filters index ffc3bed..f736409 100644 --- a/PortabilityLayer/PortabilityLayer.vcxproj.filters +++ b/PortabilityLayer/PortabilityLayer.vcxproj.filters @@ -90,9 +90,6 @@ Header Files - - Header Files - Header Files @@ -429,12 +426,6 @@ Header Files - - Header Files - - - Header Files - Header Files