Merge branch 'refactor-syntax_unicode' of https://github.com/runrev/livecode into refactor-syntax_unicode

Fraser J. Gordon · Fraser J. Gordon · commit 8ff27a6356d8 · 2014-05-28T16:58:51.000+01:00
diff --git a/docs/notes/bugfix-12477.md b/docs/notes/bugfix-12477.md
@@ -0,0 +1 @@
+# Native mobile controls created with mobGui do not seem to function under LiveCode 7.0
diff --git a/docs/notes/bugfix-12515.md b/docs/notes/bugfix-12515.md
@@ -0,0 +1 @@
+# crash on clicking linktext (on second click) 
diff --git a/engine/src/fieldh.cpp b/engine/src/fieldh.cpp
@@ -739,7 +739,11 @@ bool MCField::importparagraph(MCParagraph*& x_paragraphs, const MCFieldParagraph
     // SN-2014-04-25 [[ Bug 12177 ]] Importing HTML was creating parent-less paragraphs,
     // thus sometimes causing crashing when the parent was accessed - mainly when getfontattrs() was needed
     t_new_paragraph -> setparent(this);
-	
+    
+    // AL-2014-05-28: [[ Bug 12515 ]] If inittext() is not called, the new paragraph
+    //  can have nil blocks when it contains an image.
+    t_new_paragraph -> inittext();
+    
 	if (p_style != nil)
 		t_new_paragraph->importattrs(*p_style);
 
diff --git a/engine/src/mblandroidmisc.cpp b/engine/src/mblandroidmisc.cpp
@@ -156,7 +156,8 @@ bool MCParseParameters(MCParameter*& p_parameters, const char *p_format, ...)
         MCAutoValueRef t_value;
 		if (p_parameters != nil)
         {
-			t_success = p_parameters -> eval(ctxt, &t_value);
+            // AL-2014-05-28: [[ Bug 12477 ]] Use eval_argument here otherwise variable references do not get resolved
+			t_success = p_parameters -> eval_argument(ctxt, &t_value);
         }
 		else if (t_now_optional)
 			break;
diff --git a/engine/src/mbliphonedialog.mm b/engine/src/mbliphonedialog.mm
@@ -488,9 +488,9 @@ static void dopopupaskdialog_postwait(void *p_context)
 	
 	popupaskdialog_t ctxt;
 	ctxt . type = p_type;
-	ctxt . title = MCValueRetain(p_title);
-	ctxt . message = MCValueRetain(p_message);
-	ctxt . initial = MCValueRetain(p_initial);
+	ctxt . title = MCValueRetain(p_title != nil ? p_title : kMCEmptyString);
+	ctxt . message = MCValueRetain(p_message != nil ? p_message : kMCEmptyString);
+	ctxt . initial = MCValueRetain(p_initial != nil ? p_initial : kMCEmptyString);
 	ctxt . hint = p_hint;
  
 	MCIPhoneRunOnMainFiber(dopopupaskdialog_prewait, &ctxt);
diff --git a/engine/src/mbliphoneextra.mm b/engine/src/mbliphoneextra.mm
@@ -93,7 +93,8 @@ bool MCParseParameters(MCParameter*& p_parameters, const char *p_format, ...)
         MCAutoValueRef t_value;
 		if (p_parameters != nil)
         {
-			t_success = p_parameters -> eval(ctxt, &t_value);
+            // AL-2014-05-28: [[ Bug 12477 ]] Use eval_argument here otherwise variable references do not get resolved
+			t_success = p_parameters -> eval_argument(ctxt, &t_value);
         }
 		else if (t_now_optional)
 			break;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Native mobile controls created with mobGui do not seem to function under LiveCode 7.0`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# crash on clicking linktext (on second click)`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,8 @@ bool MCParseParameters(MCParameter& p_parameters, const char p_format, ...)`
`156`	`156`	`MCAutoValueRef t_value;`
`157`	`157`	`if (p_parameters != nil)`
`158`	`158`	`{`
`159`		`- t_success = p_parameters -> eval(ctxt, &t_value);`
	`159`	`+ // AL-2014-05-28: [[ Bug 12477 ]] Use eval_argument here otherwise variable references do not get resolved`
	`160`	`+ t_success = p_parameters -> eval_argument(ctxt, &t_value);`
`160`	`161`	`}`
`161`	`162`	`else if (t_now_optional)`
`162`	`163`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@ bool MCParseParameters(MCParameter& p_parameters, const char p_format, ...)`
`93`	`93`	`MCAutoValueRef t_value;`
`94`	`94`	`if (p_parameters != nil)`
`95`	`95`	`{`
`96`		`- t_success = p_parameters -> eval(ctxt, &t_value);`
	`96`	`+ // AL-2014-05-28: [[ Bug 12477 ]] Use eval_argument here otherwise variable references do not get resolved`
	`97`	`+ t_success = p_parameters -> eval_argument(ctxt, &t_value);`
`97`	`98`	`}`
`98`	`99`	`else if (t_now_optional)`
`99`	`100`	`break;`