Prevent exceptions when SharpDevelop is started without project browser.

Set SharpDevelop to run in 32-bit emulation mode - works around problems with the debugger on Windows x64.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2003 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Main/Base/Project/Src/Gui/AbstractViewContent.cs

@@ -71,7 +71,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		public virtual string TitleName {
 			get {
-				return titleName;
+				return titleName ?? Path.GetFileName(untitledName);
 			}
 			set {
 				titleName = value;

src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPad.cs

@@ -21,7 +21,14 @@ namespace ICSharpCode.SharpDevelop.Project
 		public static ProjectBrowserPad Instance {
 			get {
 				if (instance == null) {
-					WorkbenchSingleton.Workbench.GetPad(typeof(ProjectBrowserPad)).CreatePad();
+					PadDescriptor pad = WorkbenchSingleton.Workbench.GetPad(typeof(ProjectBrowserPad));
+					if (pad != null) {
+						pad.CreatePad();
+					} else {
+						// Pad is not used (stripped-down SD version, e.g. SharpReport)
+						// Create dummy pad to prevent NullReferenceExceptions
+						instance = new ProjectBrowserPad();
+					}
 				}
 				return instance;
 			}

src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs

@@ -237,12 +237,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 				return;
 			}
 			SetToolTipText();
-			string newTitle;
-			if (content.TitleName == null) {
-				newTitle = Path.GetFileName(content.UntitledName);
-			} else {
-				newTitle = content.TitleName;
-			}
+			string newTitle = content.TitleName;
 			
 			if (content.IsDirty) {
 				newTitle += "*";

src/Main/ICSharpCode.SharpDevelop.Sda/Src/CallHelper.cs

@@ -49,7 +49,7 @@ namespace ICSharpCode.SharpDevelop.Sda
 			}
 			
 			startup.StartCoreServices();
-			Assembly exe = Assembly.Load("SharpDevelop");
+			Assembly exe = Assembly.Load(properties.ResourceAssemblyName);
 			ResourceService.RegisterNeutralStrings(new ResourceManager("Resources.StringResources", exe));
 			ResourceService.RegisterNeutralImages(new ResourceManager("Resources.BitmapResources", exe));
 			

src/Main/ICSharpCode.SharpDevelop.Sda/Src/StartupSettings.cs

@@ -24,20 +24,30 @@ namespace ICSharpCode.SharpDevelop.Sda
 		string propertiesName;
 		string configDirectory;
 		string dataDirectory;
+		string resourceAssemblyName = "SharpDevelop";
 		internal List<string> addInDirectories = new List<string>();
 		internal List<string> addInFiles = new List<string>();
 		
+		/// <summary>
+		/// Gets/Sets the name of the assembly to load the BitmapResources
+		/// and English StringResources from.
+		/// </summary>
+		public string ResourceAssemblyName {
+			get { return resourceAssemblyName; }
+			set {
+				if (value == null)
+					throw new ArgumentNullException("value");
+				resourceAssemblyName = value;
+			}
+		}
+		
 		/// <summary>
 		/// Gets/Sets whether the SharpDevelop exception box should be used for
 		/// unhandled exceptions. The default is true.
 		/// </summary>
 		public bool UseSharpDevelopErrorHandler {
-			get {
-				return useSharpDevelopErrorHandler;
-			}
-			set {
-				useSharpDevelopErrorHandler = value;
-			}
+			get { return useSharpDevelopErrorHandler; }
+			set { useSharpDevelopErrorHandler = value; }
 		}
 		
 		/// <summary>
@@ -47,12 +57,8 @@ namespace ICSharpCode.SharpDevelop.Sda
 		/// The default value is true.
 		/// </summary>
 		public bool AllowAddInConfigurationAndExternalAddIns {
-			get {
-				return allowAddInConfigurationAndExternalAddIns;
-			}
-			set {
-				allowAddInConfigurationAndExternalAddIns = value;
-			}
+			get { return allowAddInConfigurationAndExternalAddIns; }
+			set { allowAddInConfigurationAndExternalAddIns = value; }
 		}
 		
 		/// <summary>
@@ -60,12 +66,8 @@ namespace ICSharpCode.SharpDevelop.Sda
 		/// The default is false.
 		/// </summary>
 		public bool AllowUserAddIns {
-			get {
-				return allowUserAddIns;
-			}
-			set {
-				allowUserAddIns = value;
-			}
+			get { return allowUserAddIns; }
+			set { allowUserAddIns = value; }
 		}
 		
 		/// <summary>
@@ -73,9 +75,7 @@ namespace ICSharpCode.SharpDevelop.Sda
 		/// SharpDevelop windows. The default is "SharpDevelop".
 		/// </summary>
 		public string ApplicationName {
-			get {
-				return applicationName;
-			}
+			get { return applicationName; }
 			set {
 				if (value == null)
 					throw new ArgumentNullException("value");
@@ -88,12 +88,8 @@ namespace ICSharpCode.SharpDevelop.Sda
 		/// Use null (default) to use the base directory of the SharpDevelop AppDomain.
 		/// </summary>
 		public string ApplicationRootPath {
-			get {
-				return applicationRootPath;
-			}
-			set {
-				applicationRootPath = value;
-			}
+			get { return applicationRootPath; }
+			set { applicationRootPath = value; }
 		}
 		
 		/// <summary>
@@ -102,12 +98,8 @@ namespace ICSharpCode.SharpDevelop.Sda
 		/// Use null (default) to use "ApplicationData\ApplicationName"
 		/// </summary>
 		public string ConfigDirectory {
-			get {
-				return configDirectory;
-			}
-			set {
-				configDirectory = value;
-			}
+			get { return configDirectory; }
+			set { configDirectory = value; }
 		}
 		
 		/// <summary>
@@ -115,12 +107,8 @@ namespace ICSharpCode.SharpDevelop.Sda
 		/// Use null (default) to use the default path "ApplicationRootPath\data".
 		/// </summary>
 		public string DataDirectory {
-			get {
-				return dataDirectory;
-			}
-			set {
-				dataDirectory = value;
-			}
+			get { return dataDirectory; }
+			set { dataDirectory = value; }
 		}
 		
 		/// <summary>
@@ -128,12 +116,8 @@ namespace ICSharpCode.SharpDevelop.Sda
 		/// Use null (default) to use the default name.
 		/// </summary>
 		public string PropertiesName {
-			get {
-				return propertiesName;
-			}
-			set {
-				propertiesName = value;
-			}
+			get { return propertiesName; }
+			set { propertiesName = value; }
 		}
 		
 		/// <summary>

src/Main/StartUp/Project/StartUp.csproj

@@ -17,7 +17,7 @@
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <RegisterForComInterop>False</RegisterForComInterop>
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <FileAlignment>4096</FileAlignment>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <DelaySign>False</DelaySign>