Merge branch 'feature/MXRoyale' into feature/new_merge
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
index 5725087..d4effda 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
@@ -877,10 +877,7 @@
*/
// private var headerSelected:Boolean = true;
- /**
- * @private
- */
- // private var _lockedColumnCountVal:int;
+
/**
* @private
@@ -1160,7 +1157,8 @@
//----------------------------------
// lockedColumnCount
//----------------------------------
-
+ private var _lockedColumnCountVal:int;
+
/**
* The index of the first column in the control that scrolls.
* Columns to the left of this one remain fixed in view.
@@ -1175,13 +1173,18 @@
* @playerversion AIR 1.1
* @productversion Royale 0.9.4
*/
- /* override public function set lockedColumnCount(value:int):void
- {
+ public function set lockedColumnCount(value:int):void
+ {
_lockedColumnCountVal = value;
- lockedColumnCountChanged = true;
+ /* lockedColumnCountChanged = true;
- invalidateProperties();
- } */
+ invalidateProperties(); */
+ }
+
+ public function get lockedColumnCount():int
+ {
+ return _lockedColumnCountVal
+ }
//----------------------------------
// columns
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 3e24147..feb5680 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,17 @@
typeNames = "Button";
}
+ // ------------------------------------------------
+ // textDecoration
+ // ------------------------------------------------
+
+ public function get textDecoration():String
+ {
+ return "none";
+ }
+ public function set textDecoration(value:String):void
+ {
+ }
// ------------------------------------------------
// paddingRight
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
index a3b74d1..59596e2 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
@@ -344,7 +344,20 @@
// Properties
//
//--------------------------------------------------------------------------
-
+
+
+ // ------------------------------------------------
+ // fontWeight
+ // ------------------------------------------------
+
+ public function get fontWeight():String
+ {
+ return "normal";
+ }
+ public function set fontWeight(value:String):void
+ {
+ }
+
//----------------------------------
// sortDescending
//----------------------------------
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/system/ApplicationDomain.as b/frameworks/projects/MXRoyale/src/main/royale/mx/system/ApplicationDomain.as
index 943a9a0..6e89d39 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/system/ApplicationDomain.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/system/ApplicationDomain.as
@@ -47,8 +47,14 @@
* @playerversion AIR 1.1
* @productversion Royale 0.0
*/
+
+
+ public function ApplicationDomain()
+ {
+ super();
+ }
private var _currentDomain:Object;
-
+
public function get currentDomain():Object
{
return _currentDomain;
@@ -56,16 +62,10 @@
public function set currentDomain(obj:Object):void
{
- _currentDomain = obj;
- }
+ _currentDomain = obj;
+ }
-
-
- public function ApplicationDomain()
- {
- super();
- }
-
+
}
}
