From 8bcc27057303dc3786c1d7a05993c8334b536766 Mon Sep 17 00:00:00 2001
From: PeterForstmeier <peter.forstmeier@t-online.de>
Date: Tue, 18 Sep 2012 20:27:25 +0200
Subject: [PATCH] Rework PreprocessorOptions

---
 .../Project/PreprocessorOptions.xaml.cs       | 54 +++++++++----------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs
index 5a8d9b8909..e26e0d2e8d 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs
@@ -22,35 +22,13 @@ namespace ICSharpCode.CppBinding.Project
 	public partial class PreprocessorOptions : ProjectOptionPanel
 	{
 		private const string metaElement ="ClCompile";
-		private MSBuildBasedProject project;
+	
 		
 		public PreprocessorOptions()
 		{
 			InitializeComponent();
 		}
 		
-		
-		private void Initialize()
-		{
-			MSBuildItemDefinitionGroup group = new MSBuildItemDefinitionGroup(project,
-			                                                                  project.ActiveConfiguration, project.ActivePlatform);
-			
-			this.defineTextBox.Text = GetElementMetaData(group,"PreprocessorDefinitions");
-			
-			this.undefineTextBox.Text =  GetElementMetaData(group,"UndefinePreprocessorDefinitions" );
-			
-			string defs = GetElementMetaData(group,"UndefineAllPreprocessorDefinitions");
-			
-			bool check;
-			if (bool.TryParse(defs, out check))
-			{
-				this.CheckBoxChecked = check;
-				this.undefineAllCheckBox.IsChecked = check;
-			}
-			IsDirty = false;
-		}
-		
-		
 		#region Properties
 		
 		public ProjectProperty<string> IncludePath {
@@ -71,20 +49,35 @@ namespace ICSharpCode.CppBinding.Project
 		
 		#endregion
 		
-		
 		#region overrides
 		
+		protected override void Initialize()
+		{
+			MSBuildItemDefinitionGroup group = new MSBuildItemDefinitionGroup(base.Project,
+			                                                                  base.Project.ActiveConfiguration, base.Project.ActivePlatform);
+			
+			this.defineTextBox.Text = GetElementMetaData(group,"PreprocessorDefinitions");
+			
+			this.undefineTextBox.Text =  GetElementMetaData(group,"UndefinePreprocessorDefinitions" );
+			
+			string defs = GetElementMetaData(group,"UndefineAllPreprocessorDefinitions");
+			
+			bool check;
+			if (bool.TryParse(defs, out check))
+			{
+				this.CheckBoxChecked = check;
+				this.undefineAllCheckBox.IsChecked = check;
+			}
+			IsDirty = false;
+		}
+		
+		
 		public override void OnApplyTemplate()
 		{
 			base.OnApplyTemplate();
 			HideHeader();
 		}
-		protected override void Load(MSBuildBasedProject project, string configuration, string platform)
-		{
-			base.Load(project, configuration, platform);
-			this.project = project;
-			Initialize();
-		}
+
 		
 		protected override bool Save(MSBuildBasedProject project, string configuration, string platform)
 		{
@@ -103,6 +96,7 @@ namespace ICSharpCode.CppBinding.Project
 					
 			return base.Save(project, configuration, platform);
 		}
+		
 		#endregion
 		
 		#region MSBuildItemDefinitionGroup Set-Get