[commit] r1304 - trunk/SDK/DecoratorLib
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Fri May 13 14:30:58 CDT 2011
Author: ksmyth
Date: Fri May 13 14:30:57 2011
New Revision: 1304
Log:
Support compiling against GME10
Added:
trunk/SDK/DecoratorLib/GmeApi.h (contents, props changed)
Modified:
trunk/SDK/DecoratorLib/DecoratorExceptions.h
trunk/SDK/DecoratorLib/DecoratorInterface.h
trunk/SDK/DecoratorLib/DecoratorLib.vcxproj
trunk/SDK/DecoratorLib/DecoratorLib.vcxproj.filters
trunk/SDK/DecoratorLib/DecoratorUtil.cpp
trunk/SDK/DecoratorLib/DecoratorUtil.h
trunk/SDK/DecoratorLib/ModelSwitchButtonPart.cpp
trunk/SDK/DecoratorLib/ModelSwitchPart.cpp
trunk/SDK/DecoratorLib/PartBase.h
trunk/SDK/DecoratorLib/PartInterface.h
trunk/SDK/DecoratorLib/ResizablePart.cpp
Modified: trunk/SDK/DecoratorLib/DecoratorExceptions.h
==============================================================================
--- trunk/SDK/DecoratorLib/DecoratorExceptions.h Fri May 13 14:30:56 2011 (r1303)
+++ trunk/SDK/DecoratorLib/DecoratorExceptions.h Fri May 13 14:30:57 2011 (r1304)
@@ -10,7 +10,7 @@
#include "StdAfx.h"
-#include "Gme.h"
+#include "GmeApi.h"
#include <exception>
Modified: trunk/SDK/DecoratorLib/DecoratorInterface.h
==============================================================================
--- trunk/SDK/DecoratorLib/DecoratorInterface.h Fri May 13 14:30:56 2011 (r1303)
+++ trunk/SDK/DecoratorLib/DecoratorInterface.h Fri May 13 14:30:57 2011 (r1304)
@@ -10,7 +10,7 @@
#include "StdAfx.h"
-#include "Gme.h"
+#include "GmeApi.h"
#include "PreferenceVariant.h"
Modified: trunk/SDK/DecoratorLib/DecoratorLib.vcxproj
==============================================================================
--- trunk/SDK/DecoratorLib/DecoratorLib.vcxproj Fri May 13 14:30:56 2011 (r1303)
+++ trunk/SDK/DecoratorLib/DecoratorLib.vcxproj Fri May 13 14:30:57 2011 (r1304)
@@ -95,7 +95,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(GME_ROOT)\GME\Interfaces;$(GME_ROOT)\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(GME_ROOT)\GME\Gme;$(GME_ROOT)\GME\Interfaces;$(GME_ROOT)\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;OLD_DECORATOR_LOOKANDFEEL;LIBCOMPILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -123,7 +123,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(GME_ROOT)\GME\Interfaces;$(GME_ROOT)\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(GME_ROOT)\GME\Gme;$(GME_ROOT)\GME\Interfaces;$(GME_ROOT)\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;OLD_DECORATOR_LOOKANDFEEL;LIBCOMPILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -153,7 +153,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>$(GME_ROOT)\GME\Interfaces;$(GME_ROOT)\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(GME_ROOT)\GME\Gme;$(GME_ROOT)\GME\Interfaces;$(GME_ROOT)\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;OLD_DECORATOR_LOOKANDFEEL;LIBCOMPILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -183,7 +183,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>$(GME_ROOT)\GME\Interfaces;$(GME_ROOT)\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(GME_ROOT)\GME\Gme;$(GME_ROOT)\GME\Interfaces;$(GME_ROOT)\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;OLD_DECORATOR_LOOKANDFEEL;LIBCOMPILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -285,6 +285,7 @@
<ClInclude Include="DiamondVectorPart.h" />
<ClInclude Include="DIBAPI.H" />
<ClInclude Include="EllipseVectorPart.h" />
+ <ClInclude Include="GmeApi.h" />
<ClInclude Include="InheritanceVectorPart.h" />
<ClInclude Include="InPlaceEditDialog.h" />
<ClInclude Include="LabelPart.h" />
Modified: trunk/SDK/DecoratorLib/DecoratorLib.vcxproj.filters
==============================================================================
--- trunk/SDK/DecoratorLib/DecoratorLib.vcxproj.filters Fri May 13 14:30:56 2011 (r1303)
+++ trunk/SDK/DecoratorLib/DecoratorLib.vcxproj.filters Fri May 13 14:30:57 2011 (r1304)
@@ -332,6 +332,9 @@
<ClInclude Include="VectorPart.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="GmeApi.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\atom.bmp">
Modified: trunk/SDK/DecoratorLib/DecoratorUtil.cpp
==============================================================================
--- trunk/SDK/DecoratorLib/DecoratorUtil.cpp Fri May 13 14:30:56 2011 (r1303)
+++ trunk/SDK/DecoratorLib/DecoratorUtil.cpp Fri May 13 14:30:57 2011 (r1304)
@@ -11,8 +11,7 @@
#include <math.h>
#include "DecoratorDefs.h"
-#include "Gme.h"
-#include "MgaUtil.h"
+#include "GmeApi.h"
#include "BitmapUtil.h"
Modified: trunk/SDK/DecoratorLib/DecoratorUtil.h
==============================================================================
--- trunk/SDK/DecoratorLib/DecoratorUtil.h Fri May 13 14:30:56 2011 (r1303)
+++ trunk/SDK/DecoratorLib/DecoratorUtil.h Fri May 13 14:30:57 2011 (r1304)
@@ -15,7 +15,7 @@
#include <vector>
#include <map>
-#include "Gme.h"
+#include "GmeApi.h"
#include "DecoratorDefs.h"
Added: trunk/SDK/DecoratorLib/GmeApi.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/SDK/DecoratorLib/GmeApi.h Fri May 13 14:30:57 2011 (r1304)
@@ -0,0 +1,52 @@
+#pragma once
+
+#include "GmeVersion.h"
+#if defined(GME_VERSION_MAJOR) && GME_VERSION_MAJOR < 11
+#if defined(LIBCOMPILE)
+#import "libid:9E9AAACF-28B8-11D3-B36C-0060082DF884" // CORELib
+#import "libid:0ADEEC71-D83A-11D3-B36B-005004D38590" //METALib
+#import "libid:270B4F86-B17C-11D3-9AD1-00AA00B6FE26" //MGALib
+#import "libid:461F30AE-3BF0-11D4-B3F0-005004D38590" //MGAUTILLib
+
+#define get_Kind get_kind
+#define get_Referred get_referred
+using MGAUTILLib::IMgaRegistrar;
+typedef MGAUTILLib::edgesmoothmode_enum edgesmoothmode_enum;
+typedef MGAUTILLib::fontsmoothmode_enum fontsmoothmode_enum;
+using MGAUTILLib::REGACCESS_USER;
+using MGAUTILLib::REGACCESS_BOTH;
+// n.b. no_namespace is important, since Decorators will use midl which doesn't produce namespaces
+#import "libid:0ADEEC71-D83A-11D3-B36B-005004CC8592" no_namespace, raw_interfaces_only //GmeLib
+typedef unsigned long feature_code;
+
+const unsigned long F_RESIZABLE = 1<<0;
+const unsigned long F_MOUSEEVENTS = 1<<1;
+const unsigned long F_HASLABEL = 1<<2;
+const unsigned long F_HASSTATE = 1<<3;
+const unsigned long F_HASPORTS = 1<<4;
+const unsigned long F_ANIMATION = 1<<5;
+const unsigned long F_IMGPATH = 1<<6;
+const unsigned long F_RESIZEAFTERMOD = 1<<7;
+using MGALib::OBJECT_EXISTS;
+using MGALib::OBJECT_DELETED;
+using MGALib::OBJECT_ZOMBIE;
+typedef enum decorator_error {
+ E_DECORATOR_UNKNOWN_PARAMETER = 0x80737001,
+ E_DECORATOR_INIT_WITH_NULL = 0x80737002,
+ E_DECORATOR_UNINITIALIZED = 0x80737003,
+ E_DECORATOR_LOCISNOTSET = 0x80737004,
+ E_DECORATOR_PORTNOTFOUND = 0x80737005,
+ E_DECORATOR_USING_DEPRECATED_FUNCTION = 0x80737006,
+ E_DECORATOR_NOT_IMPLEMENTED = 0x80737007,
+ S_DECORATOR_EVENT_HANDLED = 0x00737001,
+ S_DECORATOR_EVENT_NOT_HANDLED = 0x00737002
+} decorator_error;
+#else
+#include "DecoratorLib.h"
+
+#endif
+#else
+#include "Gme.h"
+#include "Mga.h"
+#include "MgaUtil.h"
+#endif
Modified: trunk/SDK/DecoratorLib/ModelSwitchButtonPart.cpp
==============================================================================
--- trunk/SDK/DecoratorLib/ModelSwitchButtonPart.cpp Fri May 13 14:30:56 2011 (r1303)
+++ trunk/SDK/DecoratorLib/ModelSwitchButtonPart.cpp Fri May 13 14:30:57 2011 (r1304)
@@ -142,7 +142,7 @@
bool inTrans = (status & 0x08L) != 0;
CComPtr<IMgaTerritory> terr;
if (!inTrans) {
- COMTHROW(m_spProject->CreateTerritory(NULL, &terr));
+ COMTHROW(m_spProject->CreateTerritory(NULL, &terr, 0));
COMTHROW(m_spProject->BeginTransaction(terr, TRANSACTION_GENERAL));
} else {
COMTHROW(m_spProject->get_ActiveTerritory(&terr));
Modified: trunk/SDK/DecoratorLib/ModelSwitchPart.cpp
==============================================================================
--- trunk/SDK/DecoratorLib/ModelSwitchPart.cpp Fri May 13 14:30:56 2011 (r1303)
+++ trunk/SDK/DecoratorLib/ModelSwitchPart.cpp Fri May 13 14:30:57 2011 (r1304)
@@ -56,7 +56,7 @@
CComBSTR bstrVal;
CComPtr<IMgaPart> part;
if (!inTrans) {
- COMTHROW(pProject->CreateTerritory(NULL, &terr));
+ COMTHROW(pProject->CreateTerritory(NULL, &terr, 0));
COMTHROW(pProject->BeginTransaction(terr, TRANSACTION_READ_ONLY));
CComPtr<IMgaFCO> terrFco;
Modified: trunk/SDK/DecoratorLib/PartBase.h
==============================================================================
--- trunk/SDK/DecoratorLib/PartBase.h Fri May 13 14:30:56 2011 (r1303)
+++ trunk/SDK/DecoratorLib/PartBase.h Fri May 13 14:30:57 2011 (r1304)
@@ -10,7 +10,7 @@
#include "StdAfx.h"
-#include "Gme.h"
+#include "GmeApi.h"
#include "DecoratorDefs.h"
#include "DecoratorUtil.h"
#include "PartInterface.h"
Modified: trunk/SDK/DecoratorLib/PartInterface.h
==============================================================================
--- trunk/SDK/DecoratorLib/PartInterface.h Fri May 13 14:30:56 2011 (r1303)
+++ trunk/SDK/DecoratorLib/PartInterface.h Fri May 13 14:30:57 2011 (r1304)
@@ -10,7 +10,7 @@
#include "StdAfx.h"
-#include "Gme.h"
+#include "GmeApi.h"
#include "PreferenceVariant.h"
Modified: trunk/SDK/DecoratorLib/ResizablePart.cpp
==============================================================================
--- trunk/SDK/DecoratorLib/ResizablePart.cpp Fri May 13 14:30:56 2011 (r1303)
+++ trunk/SDK/DecoratorLib/ResizablePart.cpp Fri May 13 14:30:57 2011 (r1304)
@@ -71,7 +71,7 @@
CComPtr<IMgaPart> part;
CComBSTR regName(PREF_PREFERREDSIZE);
if (!inTrans) {
- COMTHROW(m_spProject->CreateTerritory(NULL, &terr));
+ COMTHROW(m_spProject->CreateTerritory(NULL, &terr, 0));
COMTHROW(m_spProject->BeginTransaction(terr, TRANSACTION_READ_ONLY));
CComPtr<IMgaFCO> terrFco;
@@ -278,7 +278,7 @@
bool inTrans = (status & 0x08L) != 0;
CComPtr<IMgaTerritory> terr;
if (!inTrans) {
- COMTHROW(m_spProject->CreateTerritory(NULL, &terr));
+ COMTHROW(m_spProject->CreateTerritory(NULL, &terr, 0));
COMTHROW(m_spProject->BeginTransaction(terr, TRANSACTION_GENERAL));
} else {
COMTHROW(m_spProject->get_ActiveTerritory(&terr));
@@ -296,7 +296,7 @@
ASSERT(part);
if (part) {
CPoint pt = location.TopLeft();
- COMTHROW(part->SetGmeAttrs(0, pt.x, pt.y));
+ COMTHROW(part->SetGmeAttrs((BSTR)0, pt.x, pt.y));
// Save preferred size part
CSize size(location.Width(), location.Height());
if (size.cx >= 0 && size.cy >= 0) {
More information about the gme-commit
mailing list