From f808e4513207833b1869355718c1ad531f9547bc Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Tue, 2 May 2023 08:28:46 -0700 Subject: [PATCH] Fix more :enum abstract warnings in Haxe 4.3 --- .../_internal/backend/kha/KhaApplication.hx | 24 +++++++++---------- .../backend/native/NativeApplication.hx | 24 +++++++++---------- .../_internal/backend/native/NativeWindow.hx | 4 ++-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/lime/_internal/backend/kha/KhaApplication.hx b/src/lime/_internal/backend/kha/KhaApplication.hx index ead0a578e..85cefebd0 100644 --- a/src/lime/_internal/backend/kha/KhaApplication.hx +++ b/src/lime/_internal/backend/kha/KhaApplication.hx @@ -192,7 +192,7 @@ private class ApplicationEventInfo } } -@:enum private abstract ApplicationEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract ApplicationEventType(Int) { var UPDATE = 0; var EXIT = 1; @@ -213,7 +213,7 @@ private class ClipboardEventInfo } } -@:enum private abstract ClipboardEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract ClipboardEventType(Int) { var UPDATE = 0; } @@ -239,7 +239,7 @@ private class DropEventInfo } } -@:enum private abstract DropEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract DropEventType(Int) { var DROP_FILE = 0; } @@ -267,7 +267,7 @@ private class GamepadEventInfo } } -@:enum private abstract GamepadEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract GamepadEventType(Int) { var AXIS_MOVE = 0; var BUTTON_DOWN = 1; @@ -301,7 +301,7 @@ private class JoystickEventInfo } } -@:enum private abstract JoystickEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract JoystickEventType(Int) { var AXIS_MOVE = 0; var HAT_MOVE = 1; @@ -333,7 +333,7 @@ private class KeyEventInfo } } -@:enum private abstract KeyEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract KeyEventType(Int) { var KEY_DOWN = 0; var KEY_UP = 1; @@ -366,7 +366,7 @@ private class MouseEventInfo } } -@:enum private abstract MouseEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract MouseEventType(Int) { var MOUSE_DOWN = 0; var MOUSE_UP = 1; @@ -391,7 +391,7 @@ private class RenderEventInfo } } -@:enum private abstract RenderEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract RenderEventType(Int) { var RENDER = 0; var RENDER_CONTEXT_LOST = 1; @@ -421,7 +421,7 @@ private class SensorEventInfo } } -@:enum private abstract SensorEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract SensorEventType(Int) { var ACCELEROMETER = 0; } @@ -454,7 +454,7 @@ private class TextEventInfo } } -@:enum private abstract TextEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract TextEventType(Int) { var TEXT_INPUT = 0; var TEXT_EDIT = 1; @@ -489,7 +489,7 @@ private class TouchEventInfo } } -@:enum private abstract TouchEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract TouchEventType(Int) { var TOUCH_START = 0; var TOUCH_END = 1; @@ -521,7 +521,7 @@ private class WindowEventInfo } } -@:enum private abstract WindowEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract WindowEventType(Int) { var WINDOW_ACTIVATE = 0; var WINDOW_CLOSE = 1; diff --git a/src/lime/_internal/backend/native/NativeApplication.hx b/src/lime/_internal/backend/native/NativeApplication.hx index af2f38d29..549873fc3 100644 --- a/src/lime/_internal/backend/native/NativeApplication.hx +++ b/src/lime/_internal/backend/native/NativeApplication.hx @@ -633,7 +633,7 @@ class NativeApplication } } -@:enum private abstract ApplicationEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract ApplicationEventType(Int) { var UPDATE = 0; var EXIT = 1; @@ -654,7 +654,7 @@ class NativeApplication } } -@:enum private abstract ClipboardEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract ClipboardEventType(Int) { var UPDATE = 0; } @@ -676,7 +676,7 @@ class NativeApplication } } -@:enum private abstract DropEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract DropEventType(Int) { var DROP_FILE = 0; } @@ -704,7 +704,7 @@ class NativeApplication } } -@:enum private abstract GamepadEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract GamepadEventType(Int) { var AXIS_MOVE = 0; var BUTTON_DOWN = 1; @@ -738,7 +738,7 @@ class NativeApplication } } -@:enum private abstract JoystickEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract JoystickEventType(Int) { var AXIS_MOVE = 0; var HAT_MOVE = 1; @@ -770,7 +770,7 @@ class NativeApplication } } -@:enum private abstract KeyEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract KeyEventType(Int) { var KEY_DOWN = 0; var KEY_UP = 1; @@ -803,7 +803,7 @@ class NativeApplication } } -@:enum private abstract MouseEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract MouseEventType(Int) { var MOUSE_DOWN = 0; var MOUSE_UP = 1; @@ -826,7 +826,7 @@ class NativeApplication } } -@:enum private abstract RenderEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract RenderEventType(Int) { var RENDER = 0; var RENDER_CONTEXT_LOST = 1; @@ -856,7 +856,7 @@ class NativeApplication } } -@:enum private abstract SensorEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract SensorEventType(Int) { var ACCELEROMETER = 0; } @@ -885,7 +885,7 @@ class NativeApplication } } -@:enum private abstract TextEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract TextEventType(Int) { var TEXT_INPUT = 0; var TEXT_EDIT = 1; @@ -920,7 +920,7 @@ class NativeApplication } } -@:enum private abstract TouchEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract TouchEventType(Int) { var TOUCH_START = 0; var TOUCH_END = 1; @@ -952,7 +952,7 @@ class NativeApplication } } -@:enum private abstract WindowEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract WindowEventType(Int) { var WINDOW_ACTIVATE = 0; var WINDOW_CLOSE = 1; diff --git a/src/lime/_internal/backend/native/NativeWindow.hx b/src/lime/_internal/backend/native/NativeWindow.hx index 15a01b05c..77b428342 100644 --- a/src/lime/_internal/backend/native/NativeWindow.hx +++ b/src/lime/_internal/backend/native/NativeWindow.hx @@ -665,7 +665,7 @@ class NativeWindow } } -@:enum private abstract MouseCursorType(Int) from Int to Int +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract MouseCursorType(Int) from Int to Int { var HIDDEN = 0; var ARROW = 1; @@ -682,7 +682,7 @@ class NativeWindow var WAIT_ARROW = 12; } -@:enum private abstract WindowFlags(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract WindowFlags(Int) { var WINDOW_FLAG_FULLSCREEN = 0x00000001; var WINDOW_FLAG_BORDERLESS = 0x00000002;