[mapguide-commits] r6519 - in trunk/MgDev/Desktop: DesktopUnmanagedApi MapViewerTest

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-02-17 23:02:48 -0800 (Fri, 17 Feb 2012)
New Revision: 6519

Modified:
   trunk/MgDev/Desktop/DesktopUnmanagedApi/getclassid.code
   trunk/MgDev/Desktop/MapViewerTest/app.config
Log:
mg-desktop: PInvoke fix for .net 4.0 (same as r5814)

Modified: trunk/MgDev/Desktop/DesktopUnmanagedApi/getclassid.code
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/getclassid.code	2012-02-17 10:25:25 UTC (rev 6518)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/getclassid.code	2012-02-18 07:02:48 UTC (rev 6519)
@@ -1,15 +1,15 @@
 
-DllExport int getClassId(void* ptrObj)
+DllExport int SWIGSTDCALL getClassId(void* ptrObj)
 {
   return ((MgObject*)ptrObj)->GetClassId();
 }
 
-DllExport char* getClassName(void* ptrObj)
+DllExport char* SWIGSTDCALL getClassName(void* ptrObj)
 {
   return ((MgObject*)ptrObj)->GetMultiByteClassName();
 }
 
-DllExport char* getNameSpace(void* ptrObj)
+DllExport char* SWIGSTDCALL getNameSpace(void* ptrObj)
 {
   return ((MgObject*)ptrObj)->GetNameSpace();
 }

Modified: trunk/MgDev/Desktop/MapViewerTest/app.config
===================================================================
--- trunk/MgDev/Desktop/MapViewerTest/app.config	2012-02-17 10:25:25 UTC (rev 6518)
+++ trunk/MgDev/Desktop/MapViewerTest/app.config	2012-02-18 07:02:48 UTC (rev 6519)
@@ -1,3 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    </startup>
+</configuration>