[Monodevelop-patches-list] r2241 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Gui Gui/Dialogs Gui/Dialogs/ReferenceDialog
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Wed Feb 9 14:23:29 EST 2005
Author: jluke
Date: 2005-02-09 14:23:29 -0500 (Wed, 09 Feb 2005)
New Revision: 2241
Removed:
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/FusionNative.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/InputBox.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TabbedOptions.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/XmlForms/
Modified:
trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewFileDialog.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TreeViewOptions.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
Log:
remove unused stuff that will never be used
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-02-09 19:00:37 UTC (rev 2240)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-02-09 19:23:29 UTC (rev 2241)
@@ -1,3 +1,19 @@
+2005-02-09 John Luke <john.luke at gmail.com>
+
+ * Gui/Dialogs/TreeViewOptions.cs
+ * Gui/Dialogs/NewFileDialog.cs: dont ref XmlForms
+
+ * Gui/Dialogs/TabbedOptions.cs
+ * Gui/Dialogs/InputBox.cs
+ * Gui/Dialogs/FusionNative.cs
+ * Gui/XmlForms
+ * Gui/XmlForms/BaseSharpDevelopForm.cs
+ * Gui/XmlForms/SharpDevelopPropertyValueCreator.cs
+ * Gui/XmlForms/SharpDevelopObjectCreator.cs
+ * Gui/XmlForms/SharpDevelopStringValueFilter.cs
+ * Gui/XmlForms/BaseSharpDevelopUserControl.cs
+ * Makefile.am: kill some unused stuff
+
2005-02-02 Lluis Sanchez Gual <lluis at novell.com>
* Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs:
Deleted: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/FusionNative.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/FusionNative.cs 2005-02-09 19:00:37 UTC (rev 2240)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/FusionNative.cs 2005-02-09 19:23:29 UTC (rev 2241)
@@ -1,274 +0,0 @@
-// <file>
-// <copyright see="prj:///doc/copyright.txt"/>
-// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
-// <version value="$version"/>
-// </file>
-
-using System;
-using System.Text;
-using System.Runtime.InteropServices;
-
-namespace MSjogren.GacTool.FusionNative
-{
- [ComImport(), Guid("E707DCDE-D1CD-11D2-BAB9-00C04F8ECEAE"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
- public interface IAssemblyCache
- {
- [PreserveSig()]
- int UninstallAssembly(uint dwFlags,
- [MarshalAs(UnmanagedType.LPWStr)] string pszAssemblyName,
- IntPtr pvReserved,
- out uint pulDisposition);
-
- [PreserveSig()]
- int QueryAssemblyInfo(uint dwFlags,
- [MarshalAs(UnmanagedType.LPWStr)] string pszAssemblyName,
- IntPtr pAsmInfo);
-
- [PreserveSig()]
- int CreateAssemblyCacheItem(uint dwFlags,
- IntPtr pvReserved,
- out IAssemblyCacheItem ppAsmItem,
- [MarshalAs(UnmanagedType.LPWStr)] string pszAssemblyName);
-
- [PreserveSig()]
- int CreateAssemblyScavenger(out object ppAsmScavenger);
-
- [PreserveSig()]
- int InstallAssembly(uint dwFlags,
- [MarshalAs(UnmanagedType.LPWStr)] string pszManifestFilePath,
- IntPtr pvReserved);
- }
-
- [ComImport(), Guid("9E3AAEB4-D1CD-11D2-BAB9-00C04F8ECEAE"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
- public interface IAssemblyCacheItem
- {
- void CreateStream([MarshalAs(UnmanagedType.LPWStr)] string pszName,
- uint dwFormat,
- uint dwFlags,
- uint dwMaxSize,
- out UCOMIStream ppStream);
-
- void IsNameEqual(IAssemblyName pName);
-
- void Commit(uint dwFlags);
-
- void MarkAssemblyVisible(uint dwFlags);
-
- }
-
-
- [ComImport(), Guid("CD193BC0-B4BC-11D2-9833-00C04FC31D2E"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
- public interface IAssemblyName
- {
- //
- // Assembly name properties
- // 0 = PublicKey, byte[]* ; ???
- // 1 = PublicKeyToken, byte[8]*
- // 3 = Assembly Name, LPWSTR
- // 4 = Major Version, ushort*
- // 5 = Minor Version, ushort*
- // 6 = Build Number, ushort*
- // 7 = Revison Number, ushort*
- // 8 = Culture, LPWSTR
- // 9 = Processor Type, ??? ; ???
- // 10 = OS Type, ??? ; ???
- // 13 = Codebase, LPWSTR
- // 14 = Modified Date, FILETIME* ; Only for Downloaded assemblies ?
- // 17 = Custom, LPWSTR ; ZAP string, only for NGEN assemblies
- // 19 = MVID, byte[16]* ; MVID value from __AssemblyInfo__.ini - what's this?
- //
- [PreserveSig()]
- int SetProperty(uint PropertyId,
- IntPtr pvProperty,
- uint cbProperty);
-
- [PreserveSig()]
- int GetProperty(uint PropertyId,
- IntPtr pvProperty,
- ref uint pcbProperty);
-
- [PreserveSig()]
- int Finalize();
-
- [PreserveSig()]
- int GetDisplayName([Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder szDisplayName,
- ref uint pccDisplayName,
- uint dwDisplayFlags);
-
- [PreserveSig()]
- int BindToObject(object refIID,
- object pAsmBindSink,
- IApplicationContext pApplicationContext,
- [MarshalAs(UnmanagedType.LPWStr)] string szCodeBase,
- long llFlags,
- int pvReserved,
- uint cbReserved,
- out int ppv);
-
- [PreserveSig()]
- int GetName(ref uint lpcwBuffer,
- [Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder pwzName);
-
- [PreserveSig()]
- int GetVersion(out uint pdwVersionHi,
- out uint pdwVersionLow);
-
- [PreserveSig()]
- int IsEqual(IAssemblyName pName,
- uint dwCmpFlags);
-
- [PreserveSig()]
- int Clone(out IAssemblyName pName);
- }
-
-
-
- [ComImport(), Guid("7C23FF90-33AF-11D3-95DA-00A024A85B51"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
- public interface IApplicationContext
- {
- void SetContextNameObject(IAssemblyName pName);
-
- void GetContextNameObject(out IAssemblyName ppName);
-
- void Set([MarshalAs(UnmanagedType.LPWStr)] string szName,
- int pvValue,
- uint cbValue,
- uint dwFlags);
-
- void Get([MarshalAs(UnmanagedType.LPWStr)] string szName,
- out int pvValue,
- ref uint pcbValue,
- uint dwFlags);
-
- void GetDynamicDirectory(out int wzDynamicDir,
- ref uint pdwSize);
- }
-
- [ComImport(), Guid("21B8916C-F28E-11D2-A473-00C04F8EF448"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
- public interface IAssemblyEnum
- {
- [PreserveSig()]
- int GetNextAssembly(out IApplicationContext ppAppCtx,
- out IAssemblyName ppName,
- uint dwFlags);
-
- [PreserveSig()]
- int Reset();
-
- [PreserveSig()]
- int Clone(out IAssemblyEnum ppEnum);
- }
-
-
- [ComImport(), Guid("1D23DF4D-A1E2-4B8B-93D6-6EA3DC285A54"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
- public interface IHistoryReader
- {
- [PreserveSig()]
- int GetFilePath([Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder wzFilePath,
- ref uint pdwSize);
-
- [PreserveSig()]
- int GetApplicationName([Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder wzAppName,
- ref uint pdwSize);
-
- [PreserveSig()]
- int GetEXEModulePath([Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder wzExePath,
- ref uint pdwSize);
-
- void GetNumActivations(out uint pdwNumActivations);
-
- void GetActivationDate(uint dwIdx, // One-based!
- out long /* FILETIME */ pftDate);
-
- [PreserveSig()]
- int GetRunTimeVersion(ref long /* FILETIME */ pftActivationDate,
- [Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder wzRunTimeVersion,
- ref uint pdwSize);
-
- void GetNumAssemblies(ref long /* FILETIME */ pftActivationDate,
- out uint pdwNumAsms);
-
- void GetHistoryAssembly(ref long /* FILETIME */ pftActivationDate,
- uint dwIdx, // One-based!
- [MarshalAs(UnmanagedType.IUnknown)] out object ppHistAsm);
-
- }
-
- public class Fusion
- {
-
- [DllImport("fusion.dll", CharSet=CharSet.Auto)]
- public static extern int CreateAssemblyCache(out IAssemblyCache ppAsmCache,
- uint dwReserved);
-
-
- //
- // dwFlags: 1 = Enumerate native image (NGEN) assemblies
- // 2 = Enumerate GAC assemblies
- // 4 = Enumerate Downloaded assemblies ???
- //
- [DllImport("fusion.dll", CharSet=CharSet.Auto)]
- public static extern int CreateAssemblyEnum(out IAssemblyEnum ppEnum,
- IApplicationContext pAppCtx,
- IAssemblyName pName,
- uint dwFlags,
- int pvReserved);
-
- [DllImport("fusion.dll", CharSet=CharSet.Auto)]
- public static extern int CreateAssemblyNameObject(out IAssemblyName ppName,
- string szAssemblyName,
- uint dwFlags,
- int pvReserved);
-
- [DllImport("fusion.dll", CharSet=CharSet.Auto)]
- public static extern int CreateHistoryReader(string wzFilePath,
- out IHistoryReader ppHistReader);
-
-
-
-
-
- // Retrieves the path of the ApplicationHistory folder, typically
- // Documents and Settings\<user>\Local Settings\Application Data\ApplicationHistory
- // containing .ini files that can be read with IHistoryReader.
- // pwdSize appears to be the offset of the last backslash in the returned
- // string after the call.
- // Returns S_OK on success, error HRESULT on failure.
- //
- [DllImport("fusion.dll", CharSet=CharSet.Unicode)]
- public static extern int GetHistoryFileDirectory([MarshalAs(UnmanagedType.LPWStr)] StringBuilder wzDir,
- ref uint pdwSize);
-
- [DllImport("fusion.dll")]
- public static extern int NukeDownloadedCache();
-
- // ?????
- [DllImport("fusion.dll")]
- public static extern int CreateApplicationContext(out IApplicationContext ppAppContext,
- uint dw);
-
- [DllImport("fusion.dll")]
- public static extern int GetCachePath([MarshalAs(UnmanagedType.LPWStr)] StringBuilder wzDir,
- ref uint pdwSize,
- uint dwreserved);
-
- // _InstallCustomAssembly at 16
- // _InstallCustomModule at 8
- // _LookupHistoryAssembly at 28
- // _PreBindAssembly at 20
- // _CreateInstallReferenceEnum at 16
-
-
- //
- // Brings up the .NET Applicaion Restore wizard
- // Returns S_OK, 0x80131075 (App not run) or 0x80131087 (Fix failed)
- //
- [DllImport("shfusion.dll", CharSet=CharSet.Unicode)]
- public static extern uint PolicyManager(IntPtr hWndParent,
- string pwzFullyQualifiedAppPath,
- string pwzAppName,
- int dwFlags);
-
- }
-}
Deleted: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/InputBox.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/InputBox.cs 2005-02-09 19:00:37 UTC (rev 2240)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/InputBox.cs 2005-02-09 19:23:29 UTC (rev 2241)
@@ -1,31 +0,0 @@
-// created on 08.09.2003 at 22:11
-using System;
-
-using MonoDevelop.Gui.XmlForms;
-
-namespace MonoDevelop.Gui.Dialogs {
-/*
- public class InputBox : BaseSharpDevelopForm
- {
- Label label;
- TextBox textBox;
-
- public Label Label {
- get {
- return label;
- }
- }
- public TextBox TextBox {
- get {
- return textBox;
- }
- }
-
- public InputBox() : base(System.IO.Path.Combine(PropertyService.DataDirectory,
- @"resources\dialogs\InputBox.xfrm"))
- {
- label = (Label)ControlDictionary["label"];
- textBox = (TextBox)ControlDictionary["textBox"];
- }
- }*/
-}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewFileDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewFileDialog.cs 2005-02-09 19:00:37 UTC (rev 2240)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewFileDialog.cs 2005-02-09 19:23:29 UTC (rev 2241)
@@ -16,7 +16,6 @@
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.AddIns;
using MonoDevelop.Internal.Templates;
-using MonoDevelop.Gui.XmlForms;
using Gtk;
using MonoDevelop.Gui.Widgets;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs 2005-02-09 19:00:37 UTC (rev 2240)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs 2005-02-09 19:23:29 UTC (rev 2241)
@@ -10,7 +10,6 @@
using System.Drawing;
using System.Collections;
using System.ComponentModel;
-using MSjogren.GacTool.FusionNative;
using MonoDevelop.Internal.Project;
using MonoDevelop.Core.Services;
Deleted: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TabbedOptions.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TabbedOptions.cs 2005-02-09 19:00:37 UTC (rev 2240)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TabbedOptions.cs 2005-02-09 19:23:29 UTC (rev 2241)
@@ -1,75 +0,0 @@
-// <file>
-// <copyright see="prj:///doc/copyright.txt"/>
-// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
-// <version value="$version"/>
-// </file>
-
-using System;
-using System.IO;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
-using System.Xml;
-
-using MonoDevelop.Gui.Dialogs.OptionPanels;
-using MonoDevelop.Internal.Project;
-using MonoDevelop.Core.AddIns;
-using MonoDevelop.Core.AddIns.Codons;
-using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.Services;
-using MonoDevelop.Gui.XmlForms;
-
-namespace MonoDevelop.Gui.Dialogs
-{/*
- /// <summary>
- /// Basic "tabbed" options dialog
- /// </summary>
- public class TabbedOptions : BaseSharpDevelopForm
- {
- ArrayList OptionPanels = new ArrayList();
- IProperties properties = null;
-
- void AcceptEvent(object sender, EventArgs e)
- {
- foreach (AbstractOptionPanel pane in OptionPanels) {
- if (!pane.ReceiveDialogMessage(DialogMessage.OK)) {
- return;
- }
- }
- DialogResult = DialogResult.OK;
- }
-
- void AddOptionPanels(ArrayList dialogPanelDescriptors)
- {
- foreach (IDialogPanelDescriptor descriptor in dialogPanelDescriptors) {
- if (descriptor.DialogPanel != null) { // may be null, if it is only a "path"
- descriptor.DialogPanel.CustomizationObject = properties;
- descriptor.DialogPanel.Control.Dock = DockStyle.Fill;
- descriptor.DialogPanel.ReceiveDialogMessage(DialogMessage.Activated);
- OptionPanels.Add(descriptor.DialogPanel);
-
- TabPage page = new TabPage(descriptor.Label);
- page.Controls.Add(descriptor.DialogPanel.Control);
- ((TabControl)ControlDictionary["optionPanelTabControl"]).TabPages.Add(page);
- }
-
- if (descriptor.DialogPanelDescriptors != null) {
- AddOptionPanels(descriptor.DialogPanelDescriptors);
- }
- }
- }
-
- public TabbedOptions(string dialogName, IProperties properties, IAddInTreeNode node)
- {
- this.properties = properties;
-
- base.SetupFromXml(Path.Combine(PropertyService.DataDirectory, @"resources\dialogs\TabbedOptionsDialog.xfrm"));
- this.Text = dialogName;
- ControlDictionary["okButton"].Click += new EventHandler(AcceptEvent);
- Icon = null;
- Owner = (Form)WorkbenchSingleton.Workbench;
- AddOptionPanels(node.BuildChildItems(this));
- }
- }*/
-}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TreeViewOptions.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TreeViewOptions.cs 2005-02-09 19:00:37 UTC (rev 2240)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TreeViewOptions.cs 2005-02-09 19:23:29 UTC (rev 2241)
@@ -13,7 +13,6 @@
using MonoDevelop.Core.Services;
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.AddIns.Codons;
-using MonoDevelop.Gui.XmlForms;
using MonoDevelop.Services;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am 2005-02-09 19:00:37 UTC (rev 2240)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am 2005-02-09 19:23:29 UTC (rev 2241)
@@ -96,7 +96,6 @@
Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs \
Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs \
Gui/Dialogs/CombineConfiguration/ConfigurationManager.cs \
-Gui/Dialogs/FusionNative.cs \
Gui/Dialogs/NewProjectDialog.cs \
Gui/Dialogs/AbstractOptionPanel.cs \
Gui/Dialogs/ReferenceDialog/COMReferencePanel.cs \
@@ -106,10 +105,8 @@
Gui/Dialogs/ReferenceDialog/AddWebReferenceDialog.cs \
Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs \
Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs \
-Gui/Dialogs/TabbedOptions.cs \
Gui/Dialogs/DirtyFilesDialog.cs \
Gui/Dialogs/TipOfTheDay.cs \
-Gui/Dialogs/InputBox.cs \
Gui/Dialogs/NewFileDialog.cs \
Gui/Dialogs/ProjectOptionsDialog.cs \
Gui/Dialogs/NewLayoutDialog.cs \
@@ -122,11 +119,6 @@
Gui/ContentInterfaces/IEditable.cs \
Gui/ContentInterfaces/IParseInformationListener.cs \
Gui/ContentInterfaces/IParsableContent.cs \
-Gui/XmlForms/SharpDevelopStringValueFilter.cs \
-Gui/XmlForms/BaseSharpDevelopForm.cs \
-Gui/XmlForms/SharpDevelopPropertyValueCreator.cs \
-Gui/XmlForms/BaseSharpDevelopUserControl.cs \
-Gui/XmlForms/SharpDevelopObjectCreator.cs \
Gui/IBaseViewContent.cs \
Gui/ErrorDialogs/LoadingError.cs \
Gui/IWorkbenchLayout.cs \
More information about the Monodevelop-patches-list
mailing list