Changeset 12495 for branches/GBT/HeuristicLab.Scripting.Views/3.3
- Timestamp:
- 06/23/15 12:50:05 (9 years ago)
- Location:
- branches/GBT
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/GBT
- Property svn:mergeinfo changed
/trunk/sources merged: 12392-12393,12397-12401,12422,12424,12428-12435,12442-12443,12445,12455-12458,12461,12463-12465,12470-12476,12478-12482,12485,12488,12490-12494 -
Property
svn:global-ignores
set to
*.nuget
packages
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Scripting.Views/3.3/ScriptView.Designer.cs
r12012 r12495 20 20 #endregion 21 21 22 using System.Collections.Generic;23 using System.Reflection;24 using HeuristicLab.Common;25 22 26 23 namespace HeuristicLab.Scripting.Views { … … 64 61 this.columnColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); 65 62 this.descriptionColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); 63 #if __MonoCS__ 64 this.codeEditor = new HeuristicLab.CodeEditor.SimpleCodeEditor(); 65 #else 66 66 this.codeEditor = new HeuristicLab.CodeEditor.CodeEditor(); 67 #endif 67 68 this.splitContainer1 = new System.Windows.Forms.SplitContainer(); 68 69 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); … … 225 226 // splitContainer1 226 227 // 227 this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 228 | System.Windows.Forms.AnchorStyles.Left) 228 this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 229 | System.Windows.Forms.AnchorStyles.Left) 229 230 | System.Windows.Forms.AnchorStyles.Right))); 230 231 this.splitContainer1.Location = new System.Drawing.Point(0, 56); … … 287 288 protected System.Windows.Forms.ColumnHeader columnColumnHeader; 288 289 protected System.Windows.Forms.ColumnHeader descriptionColumnHeader; 289 protected CodeEditor.CodeEditor codeEditor;290 protected CodeEditor.CodeEditorBase codeEditor; 290 291 protected System.Windows.Forms.SplitContainer splitContainer1; 291 292 }
Note: See TracChangeset
for help on using the changeset viewer.