Minor tweaks to get the develop branch compiling on Windows.

livecodemichael · livecodemichael · commit c4b7403cac05 · 2014-02-05T14:45:01.000Z
diff --git a/engine/src/debug.cpp b/engine/src/debug.cpp
@@ -98,6 +98,8 @@ bool MCB_error(MCExecPoint &ep, uint2 line, uint2 pos, uint2 id)
 	// Increasing the error lock means that more MCB_error invocations won't occur as
 	// we step back up the (script) call stack.
 	MCerrorlock++;
+
+	return true;
 }
 
 void MCB_done(MCExecPoint &ep)
diff --git a/engine/src/w32dce.cpp b/engine/src/w32dce.cpp
@@ -187,7 +187,7 @@ bool MCScreenDC::platform_getdisplays(bool p_effective, MCDisplay *&r_displays,
 }
 
 // IM-2014-01-29: [[ HiDPI ]] We receive notification of desktop changes on Windows, so can safely cache display info
-bool MCScreen::platform_displayinfocacheable(void)
+bool MCScreenDC::platform_displayinfocacheable(void)
 {
 	return true;
 }
diff --git a/engine/src/w32stack.cpp b/engine/src/w32stack.cpp
@@ -448,7 +448,7 @@ void MCStack::realize()
 		{
 			MCRegionRef t_region;
 			t_region = (MCRegionRef)m_window_shape -> handle;
-			MCRegionOffset(t_region, t_device_rect . x - wrect . left, t_device_rect . y - wrect . top);
+			MCRegionOffset(t_region, t_rect . x - wrect . left, t_rect . y - wrect . top);
 			MCRegionSetAsWindowShape(t_region, window->handle.window);
 
 			// The window now owns the region.
@@ -709,6 +709,8 @@ bool MCWin32ApplyMaskToRasterRegion(MCGRaster &p_raster, MCGFloat p_raster_scale
 		// Drawing the mask directly will not work as the effective shape of the drawing operation
 		// will be defined by the opaque parts of the mask - areas outside will be unaffected. Instead we
 		// draw a solid rectangle over the intended areas using the mask as a pattern.
+		MCGFloat t_scale;
+		t_scale = MCResGetPixelScale();
 
         // MM-2014-01-27: [[ UpdateImageFilters ]] Updated to use new libgraphics image filter types (was nearest).
 		MCGContextSetFillPattern(t_gcontext, t_mask_image, MCGAffineTransformMakeScale(t_scale, t_scale), kMCGImageFilterNone);
diff --git a/revdb/src/sqlite_connection.cpp b/revdb/src/sqlite_connection.cpp
@@ -14,6 +14,12 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
+// MM-2014-02-04: [[ Sqlite382 ]] Define string cmp functions for Windows.
+#ifdef _WINDOWS
+#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
+#endif
+
 #include "dbsqlite.h"
 #include <sqlitedataset/sqlitedataset.h>
 

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,8 @@ bool MCB_error(MCExecPoint &ep, uint2 line, uint2 pos, uint2 id)`
`98`	`98`	`// Increasing the error lock means that more MCB_error invocations won't occur as`
`99`	`99`	`// we step back up the (script) call stack.`
`100`	`100`	`MCerrorlock++;`
	`101`	`+`
	`102`	`+ return true;`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`void MCB_done(MCExecPoint &ep)`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ bool MCScreenDC::platform_getdisplays(bool p_effective, MCDisplay *&r_displays,`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`// IM-2014-01-29: [[ HiDPI ]] We receive notification of desktop changes on Windows, so can safely cache display info`
`190`		`-bool MCScreen::platform_displayinfocacheable(void)`
	`190`	`+bool MCScreenDC::platform_displayinfocacheable(void)`
`191`	`191`	`{`
`192`	`192`	`return true;`
`193`	`193`	`}`