[GitHub] alinakazi closed pull request #289: Branch11

[GitBox <gi...@apache.org>]

alinakazi closed pull request #289: Branch11
URL: https://github.com/apache/royale-asjs/pull/289
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Button.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Button.as
index feb568091..546f45248 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Button.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Button.as
@@ -253,6 +253,18 @@ public class Button extends UIComponent implements IDataRenderer
 		typeNames = "Button";
 	}
 	
+	// ------------------------------------------------
+	//  locale
+	// ------------------------------------------------
+	
+	public function get locale():String
+	{
+		return "en";
+	}
+	public function set locale(value:String):void
+	{
+	}
+	
 	// ------------------------------------------------
 	//  textDecoration
 	// ------------------------------------------------
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/Panel.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/Panel.as
index e5d207122..3a1a7d90d 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/Panel.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/Panel.as
@@ -67,7 +67,7 @@ use namespace mx_internal;
  *  @playerversion AIR 1.5
  *  @productversion Royale 0.9.4
  */
-[Style(name="borderVisible", type="Boolean", inherit="no", theme="spark")]
+[Style(name="borderVisible", type="Boolean", inherit="no")]
 
 /**
  *  The radius of the corners for this component.
@@ -648,4 +648,4 @@ public class Panel extends SkinnableContainer
         return state;
     } */
 }
-}
\ No newline at end of file
+}


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services