--- a/cnd.source/nbproject/project.properties	Thu Aug 25 10:04:24 2011 +0200
+++ a/cnd.source/nbproject/project.properties	Thu Aug 25 19:23:13 2011 +0400
@@ -1,3 +1,3 @@ 
 javac.source=1.6
 javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.5.1
+spec.version.base=1.5.2
--- a/cnd.source/src/org/netbeans/modules/cnd/source/CppEditorSupport.java	Thu Aug 25 10:04:24 2011 +0200
+++ a/cnd.source/src/org/netbeans/modules/cnd/source/CppEditorSupport.java	Thu Aug 25 19:23:13 2011 +0400
@@ -51,6 +51,7 @@ 
 import javax.swing.text.DefaultEditorKit;
 import javax.swing.text.EditorKit;
 import javax.swing.text.StyledDocument;
+import org.netbeans.modules.cnd.source.spi.CndPaneProvider;
 
 import org.netbeans.modules.cnd.support.ReadOnlySupport;
 import org.netbeans.modules.cnd.utils.cache.CndFileUtils;
@@ -67,6 +68,7 @@ 
 import org.openide.filesystems.FileObject;
 import org.openide.loaders.MultiDataObject;
 import org.openide.text.DataEditorSupport;
+import org.openide.util.Lookup;
 import org.openide.util.lookup.InstanceContent;
 import org.openide.windows.CloneableOpenSupport;
 
@@ -100,8 +102,8 @@ 
     public CppEditorSupport(SourceDataObject obj) {
         super(obj, new Environment(obj));
         this.ic = obj.getInstanceContent();
+        this.ic.add(obj.getNodeDelegate());
     }
-
     /** 
      * Overrides superclass method. Adds adding of save cookie if the document has been marked modified.
      * @return true if the environment accepted being marked as modified
@@ -195,6 +197,18 @@ 
         return ""; // NOI18N
     }
 
+    @Override
+    protected Pane createPane() {
+        CndPaneProvider provider = Lookup.getDefault().lookup(CndPaneProvider.class);
+        if (provider != null) {
+            Pane pane = provider.createPane(this);
+            if (pane != null) {
+                return pane;
+            }
+        }
+        return super.createPane();
+    }
+
     /** Nested class. Environment for this support. Extends <code>DataEditorSupport.Env</code> abstract class. */
     private static class Environment extends DataEditorSupport.Env {
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ a22c435d3518	Thu Aug 25 19:23:13 2011 +0400
@@ -0,0 +1,63 @@ 
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2011 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.cnd.source.spi;
+
+import org.openide.text.CloneableEditorSupport.Pane;
+import org.openide.text.DataEditorSupport;
+
+/**
+ * If such a provider is defined, then for C/C++ data objects pane creation
+ * is delegated to the provider. It can anyhow return null,
+ * in which case standard pane will be created.
+ * @author Vladimir Kvashin
+ */
+public interface CndPaneProvider {
+
+    /**
+     * The method is called each time an editor for C/C++ file is opened.
+     * If method returns non null Pane, this pane is used for editing.
+     * If it returns null, then standard C/C++ pane  is created.
+     * @param DataEditorSupport 
+     * @return Pane or null
+     */
+    Pane createPane(DataEditorSupport support);
+}