CPP_MPVClass - optionally do not include Handle_.hxx files

diff --git a/src/CPPExt/CPPExt_MPV.cxx b/src/CPPExt/CPPExt_MPV.cxx
index a9bd73141b87d5502632bb81b6a797d63d3f4577..2b7f6ee3ca2b041ef5b758c66bf86e79a74af10b 100755 (executable)
--- a/src/CPPExt/CPPExt_MPV.cxx
+++ b/src/CPPExt/CPPExt_MPV.cxx
@@ -340,12 +340,21 @@ void CPP_MPVClass(const Handle(MS_MetaSchema)& aMeta,
 
     api->AddVariable(VSuffix,"hxx");
 
-    for (i = 1; i <= List->Length(); i++) {
-      if (!List->Value(i)->IsSameString(theClass->FullName())) {
-       api->AddVariable(VIClass,List->Value(i)->ToCString());
-       api->Apply(VTICIncludes,"Include");
-       publics->AssignCat(api->GetVariableValue(VTICIncludes));
+    for (i = 1; i <= List->Length(); i++)
+    {
+      Handle(TCollection_HAsciiString) aName = List->Value(i);
+      if (aName->IsSameString (theClass->FullName()))
+      {
+        continue;
+      }
+
+      if (!CPP_HaveHandleHeaders())
+      {
+        aName = CPP_WithoutHandleSuffix (aName);
       }
+      api->AddVariable (VIClass, aName->ToCString());
+      api->Apply (VTICIncludes, "Include");
+      publics->AssignCat (api->GetVariableValue (VTICIncludes));
     }