Changeset 12505 for branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Scripting.Views/3.3/ScriptView.Designer.cs

Timestamp:

06/25/15 11:26:25 (9 years ago)

Author:

mkommend

Message:

#2276: Merged trunk changes into dataset refactoring branch.

Location:

branches/HeuristicLab.DatasetRefactor/sources

Files:

• . (modified) (2 props)
• HeuristicLab.Scripting.Views/3.3/ScriptView.Designer.cs (modified) (4 diffs)

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Scripting.Views/3.3/ScriptView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
-using System.Reflection;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.Scripting.Views {
@@ -64 +61 @@
       this.columnColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
       this.descriptionColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+#if __MonoCS__
+      this.codeEditor = new HeuristicLab.CodeEditor.SimpleCodeEditor();
+#else
       this.codeEditor = new HeuristicLab.CodeEditor.CodeEditor();
+#endif
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
@@ -225 +226 @@
       // splitContainer1
       // 
-      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.splitContainer1.Location = new System.Drawing.Point(0, 56);
@@ -287 +288 @@
     protected System.Windows.Forms.ColumnHeader columnColumnHeader;
     protected System.Windows.Forms.ColumnHeader descriptionColumnHeader;
-    protected CodeEditor.CodeEditor codeEditor;
+    protected CodeEditor.CodeEditorBase codeEditor;
     protected System.Windows.Forms.SplitContainer splitContainer1;
   }