From fa27d000b71321a4472fcc7840521aacb41f6ea7 Mon Sep 17 00:00:00 2001 From: Hugh Sanderson Date: Wed, 20 Mar 2024 14:36:45 +0800 Subject: [PATCH] Update @:extern to extern --- acadnme/src/Acadnme.hx | 2 +- src/nme/net/SharedObjectFlushStatus.hx | 10 +--------- src/nme/text/FontStyle.hx | 14 ++------------ src/nme/text/FontType.hx | 12 +----------- src/nme/text/TextFormatAlign.hx | 4 ++-- 5 files changed, 7 insertions(+), 35 deletions(-) diff --git a/acadnme/src/Acadnme.hx b/acadnme/src/Acadnme.hx index 248946971..f0f7f1625 100644 --- a/acadnme/src/Acadnme.hx +++ b/acadnme/src/Acadnme.hx @@ -123,7 +123,7 @@ class Acadnme extends Sprite implements IScriptHandler } @:native("hx::EnableJit") - @:extern static function enableJit(enable:Bool) : Void #if (haxe_ver>=4) ; #else { } #end + extern static function enableJit(enable:Bool) : Void; public static function getNmeAppsDir() : String diff --git a/src/nme/net/SharedObjectFlushStatus.hx b/src/nme/net/SharedObjectFlushStatus.hx index 66bb76e1c..2d32a9db0 100644 --- a/src/nme/net/SharedObjectFlushStatus.hx +++ b/src/nme/net/SharedObjectFlushStatus.hx @@ -2,19 +2,11 @@ package nme.net; #if (!flash) -#if haxe4 -@:enum(String) abstract SharedObjectFlushStatus(String) +enum abstract SharedObjectFlushStatus(String) { var FLUSHED = "FLUSHED"; var PENDING = "PENDING"; } -#else -@:fakeEnum(String) enum SharedObjectFlushStatus -{ - FLUSHED; - PENDING; -} -#end #else typedef SharedObjectFlushStatus = flash.net.SharedObjectFlushStatus; diff --git a/src/nme/text/FontStyle.hx b/src/nme/text/FontStyle.hx index 13cb2f23d..ab886f261 100644 --- a/src/nme/text/FontStyle.hx +++ b/src/nme/text/FontStyle.hx @@ -1,8 +1,8 @@ package nme.text; + #if (!flash) -#if haxe4 -@:enum(String) abstract FontStyle(String) +enum abstract FontStyle(String) { var BOLD = "BOLD"; var BOLD_ITALIC = "BOLD_ITALIC"; @@ -10,16 +10,6 @@ package nme.text; var REGULAR = "REGULAR"; } -#else -@:fakeEnum(String) enum FontStyle -{ - BOLD; - BOLD_ITALIC; - ITALIC; - REGULAR; -} -#end - #else typedef FontStyle = flash.text.FontStyle; #end diff --git a/src/nme/text/FontType.hx b/src/nme/text/FontType.hx index 26d459ec1..9db279844 100644 --- a/src/nme/text/FontType.hx +++ b/src/nme/text/FontType.hx @@ -1,23 +1,13 @@ package nme.text; #if (!flash) -#if haxe4 -@:enum abstract FontType(String) +enum abstract FontType(String) { var DEVICE = "DEVICE"; var EMBEDDED = "EMBEDDED"; var EMBEDDED_CFF = "EMBEDDED_CFF"; } -#else -@:fakeEnum(String) enum FontType -{ - DEVICE; - EMBEDDED; - EMBEDDED_CFF; -} -#end - #else typedef FontType = flash.text.FontType; #end diff --git a/src/nme/text/TextFormatAlign.hx b/src/nme/text/TextFormatAlign.hx index 578eb6986..9c2cab294 100644 --- a/src/nme/text/TextFormatAlign.hx +++ b/src/nme/text/TextFormatAlign.hx @@ -1,8 +1,8 @@ package nme.text; + #if (!flash) -@:enum -abstract TextFormatAlign(String) from String to String +enum abstract TextFormatAlign(String) from String to String { var LEFT = "left"; var RIGHT = "right";