Merge branch 'develop-6.7' into develop-7.0

peter-b · peter-b · commit 123f355cc95a · 2015-08-04T17:04:15.000+01:00
Trivial conflicts in header blocks:

* engine/src/field.h
* engine/src/player-legacy.h
* engine/src/player-platform.h
diff --git a/engine/engine-sources.gypi b/engine/engine-sources.gypi
@@ -181,7 +181,7 @@
 			'src/card.h',
 			'src/cardlst.h',
 			'src/cdata.h',
-			'src/control.h',
+			'src/mccontrol.h',
 			'src/cpalette.h',
 			'src/dispatch.h',
 			'src/edittool.h',
diff --git a/engine/src/button.h b/engine/src/button.h
@@ -17,7 +17,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef	BUTTON_H
 #define	BUTTON_H
 
-#include "control.h"
+#include "mccontrol.h"
 
 
 #define AQUA_FUDGE 8
diff --git a/engine/src/cmdsc.cpp b/engine/src/cmdsc.cpp
@@ -30,7 +30,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "undolst.h"
 #include "chunk.h"
 #include "object.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "mcerror.h"
 #include "dispatch.h"
 #include "stack.h"
diff --git a/engine/src/cmdsf.cpp b/engine/src/cmdsf.cpp
@@ -32,7 +32,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "chunk.h"
 #include "mcerror.h"
 #include "object.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "aclip.h"
 #include "vclip.h"
 #include "eps.h"
diff --git a/engine/src/control.cpp b/engine/src/control.cpp
@@ -27,7 +27,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "stack.h"
 #include "tooltip.h"
 #include "card.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "group.h"
 #include "field.h"
 #include "scrolbar.h"
diff --git a/engine/src/cpalette.h b/engine/src/cpalette.h
@@ -20,7 +20,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef	COLORS_H
 #define	COLORS_H
 
-#include "control.h"
+#include "mccontrol.h"
 
 class MCColors : public MCControl
 {
diff --git a/engine/src/desktop.cpp b/engine/src/desktop.cpp
@@ -33,7 +33,7 @@
 #include "card.h"
 #include "debug.h"
 #include "dispatch.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "field.h"
 #include "graphics_util.h"
 #include "redraw.h"
diff --git a/engine/src/eps.h b/engine/src/eps.h
@@ -20,7 +20,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef	MCEPS_H
 #define	MCEPS_H
 
-#include "control.h"
+#include "mccontrol.h"
 
 class MCEPS : public MCControl
 {
diff --git a/engine/src/externalv1.cpp b/engine/src/externalv1.cpp
@@ -32,7 +32,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "osspec.h"
 #include "globals.h"
 #include "object.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "notify.h"
 #include "stack.h"
 #include "card.h"
diff --git a/engine/src/externalv1.h b/engine/src/externalv1.h
@@ -35,7 +35,7 @@
 #include "osspec.h"
 #include "globals.h"
 #include "object.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "notify.h"
 #include "stack.h"
 #include "card.h"
diff --git a/engine/src/externalv1.mm b/engine/src/externalv1.mm
@@ -32,7 +32,7 @@
 #include "osspec.h"
 #include "globals.h"
 #include "object.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "notify.h"
 #include "stack.h"
 #include "card.h"
@@ -394,4 +394,4 @@
     
     return (MCExternalError)t_error;
 }
-    
+    
diff --git a/engine/src/field.h b/engine/src/field.h
@@ -20,7 +20,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef	FIELD_H
 #define	FIELD_H
 
-#include "control.h"
+#include "mccontrol.h"
 #include "exec.h"
 
 #define SCROLL_RATE 100
diff --git a/engine/src/graphic.h b/engine/src/graphic.h
@@ -22,7 +22,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #define __GRAPHIC_H
 
 #ifndef __CONTROL_H
-#include "control.h"
+#include "mccontrol.h"
 #endif
 
 #include "gradient.h"
diff --git a/engine/src/group.h b/engine/src/group.h
@@ -20,7 +20,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef	GROUP_H
 #define	GROUP_H
 
-#include "control.h"
+#include "mccontrol.h"
 
 class MCScrollbar;
 
diff --git a/engine/src/image.h b/engine/src/image.h
@@ -20,7 +20,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef	IMAGE_H
 #define	IMAGE_H
 
-#include "control.h"
+#include "mccontrol.h"
 #include "imagebitmap.h"
 #include "graphics.h"
 #include "exec.h"
diff --git a/engine/src/magnify.h b/engine/src/magnify.h
@@ -20,7 +20,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef	MAGNIFY_H
 #define	MAGNIFY_H
 
-#include "control.h"
+#include "mccontrol.h"
 
 class MCMagnify : public MCControl
 {
diff --git a/engine/src/mccontrol.h b/engine/src/mccontrol.h
diff --git a/engine/src/objptr.cpp b/engine/src/objptr.cpp
@@ -23,7 +23,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "mcio.h"
 
 #include "object.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "stack.h"
 #include "objptr.h"
 
diff --git a/engine/src/osxfiles.cpp b/engine/src/osxfiles.cpp
@@ -34,7 +34,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "card.h"
 #include "group.h"
 #include "button.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "param.h"
 #include "securemode.h"
 #include "osspec.h"
diff --git a/engine/src/osxspec.cpp b/engine/src/osxspec.cpp
@@ -37,7 +37,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "card.h"
 #include "group.h"
 #include "button.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "param.h"
 #include "securemode.h"
 #include "license.h"
diff --git a/engine/src/player-legacy.h b/engine/src/player-legacy.h
@@ -23,7 +23,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #ifndef FEATURE_PLATFORM_PLAYER
 
-#include "control.h"
+#include "mccontrol.h"
 #include "player-interface.h"
 #include "exec-interface.h"
 
diff --git a/engine/src/player-platform.h b/engine/src/player-platform.h
@@ -23,7 +23,7 @@
 
 #ifdef FEATURE_PLATFORM_PLAYER
 
-#include "control.h"
+#include "mccontrol.h"
 #include "platform.h"
 #include "player-interface.h"
 
diff --git a/engine/src/redraw.cpp b/engine/src/redraw.cpp
@@ -26,7 +26,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "stack.h"
 #include "stacklst.h"
 #include "card.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "objptr.h"
 #include "group.h"
 #include "field.h"
diff --git a/engine/src/scrolbar.h b/engine/src/scrolbar.h
@@ -20,7 +20,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef	SCROLLBAR_H
 #define	SCROLLBAR_H
 
-#include "control.h"
+#include "mccontrol.h"
 
 #define MIN_THUMB_SIZE 8
 
diff --git a/engine/src/scrollbardraw.cpp b/engine/src/scrollbardraw.cpp
@@ -381,7 +381,7 @@ void MCScrollbar::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bo
 	}
 }
 
-/*the color enum is defined in control.h as:
+/*the color enum is defined in mccontrol.h as:
   5 colors: MAC_THUMB_TOP,MAC_THUMB_BACK,MAC_THUMB_BOTTOM,
   MAC_THUMB_GRIP,MAC_THUMB_HILITE, from light blue to darkest blue */
 #define MAC_THUMBCOLORS 5
diff --git a/engine/src/stack.cpp b/engine/src/stack.cpp
@@ -31,7 +31,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "card.h"
 #include "aclip.h"
 #include "vclip.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "image.h"
 #include "button.h"
 #include "mcerror.h"
diff --git a/engine/src/stack2.cpp b/engine/src/stack2.cpp
@@ -30,7 +30,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "vclip.h"
 #include "card.h"
 #include "objptr.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "image.h"
 #include "player.h"
 #include "field.h"
diff --git a/engine/src/stack3.cpp b/engine/src/stack3.cpp
@@ -30,7 +30,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "dispatch.h"
 #include "card.h"
 #include "objptr.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "image.h"
 #include "field.h"
 #include "button.h"
diff --git a/engine/src/stacke.cpp b/engine/src/stacke.cpp
@@ -25,7 +25,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "stack.h"
 #include "aclip.h"
 #include "card.h"
-#include "control.h"
+#include "mccontrol.h"
 #include "player.h"
 #include "sellst.h"
 #include "visual.h"
diff --git a/engine/src/vclip.h b/engine/src/vclip.h
@@ -20,7 +20,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef	VIDEOCLIP_H
 #define	VIDEOCLIP_H
 
-#include "control.h"
+#include "mccontrol.h"
 
 class MCVideoClip : public MCObject
 {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */`
`20`	`20`	`#ifndef COLORS_H`
`21`	`21`	`#define COLORS_H`
`22`	`22`
`23`		`-#include "control.h"`
	`23`	`+#include "mccontrol.h"`
`24`	`24`
`25`	`25`	`class MCColors : public MCControl`
`26`	`26`	`{`