[royale-asjs] branch develop updated: Fix swf build (was:duplicate function/method declaration)

[gregdove]

This is an automated email from the ASF dual-hosted git repository.

gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new 7e9620f7ad Fix swf build (was:duplicate function/method declaration)
7e9620f7ad is described below

commit 7e9620f7ade802387c6eddf221525afd03c6085a
Author: greg-dove <greg.d...@gmail.com>
AuthorDate: Thu May 26 08:41:12 2022 +1200

    Fix swf build (was:duplicate function/method declaration)
---
 .../MXRoyale/src/main/royale/mx/controls/Label.as       | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as 
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as
index fa1a2fa04b..92098b597a 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as
@@ -772,6 +772,18 @@ public class Label extends UIComponent
                super.addedToParent();
                model.addEventListener("textChange", repeaterListener);
                model.addEventListener("htmlChange", repeaterListener);
+               //@todo check the following for swf:
+               //truncateToFit = _truncateToFit;
+       }
+
+       /**
+        *  @private
+        */
+       COMPILE::JS
+       override public function addedToParent():void
+       {
+               super.addedToParent();
+               truncateToFit = _truncateToFit;
        }
 
        /**
@@ -916,11 +928,6 @@ public class Label extends UIComponent
         _truncateToFit = value;
     }
 
-    override public function addedToParent():void
-    {
-        super.addedToParent();
-        truncateToFit = _truncateToFit;
-    }
 
 
     
//--------------------------------------------------------------------------