[Monodevelop-patches-list] r1821 - in trunk/MonoDevelop: . src/AddIns/BackendBindings/CSharpBinding src/AddIns/DisplayBindings/SourceEditor src/AddIns/prj2make-sharp-lib src/Libraries/Gdl src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions src/Main/StartUp
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Thu Jun 24 19:21:44 EDT 2004
Author: jluke
Date: 2004-06-24 19:21:44 -0400 (Thu, 24 Jun 2004)
New Revision: 1821
Added:
trunk/MonoDevelop/src/Libraries/Gdl/DockBar.cs
trunk/MonoDevelop/src/Libraries/Gdl/DockLayout.cs
Modified:
trunk/MonoDevelop/ChangeLog
trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBinding.prjx
trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.CSharpBinding
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/SourceEditor.prjx
trunk/MonoDevelop/src/AddIns/prj2make-sharp-lib/Prj2MakeSharp.prjx
trunk/MonoDevelop/src/Libraries/Gdl/Gdl.prjx
trunk/MonoDevelop/src/Libraries/Gdl/Makefile.Gdl
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs
trunk/MonoDevelop/src/Main/StartUp/Makefile.MonoDevelop
trunk/MonoDevelop/src/Main/StartUp/MonoDevelop.prjx
Log:
stub the last 2 Gdl classes
we can now compile MD from MD
(dont expect run to work though)
Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog 2004-06-24 22:44:48 UTC (rev 1820)
+++ trunk/MonoDevelop/ChangeLog 2004-06-24 23:21:44 UTC (rev 1821)
@@ -3,6 +3,9 @@
fix all the projects and generated makefiles
(add/remove needed files, add refs)
+ stub Gdl.DockBar and Gdl.DockLayout to compile
+ and more projects/other trivial fixes
+
2004-06-23 Todd Berman <tberman at off.net>
* *.cs: Lots of changes to reflect the ServiceManager change.
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBinding.prjx
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBinding.prjx 2004-06-24 22:44:48 UTC (rev 1820)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBinding.prjx 2004-06-24 23:21:44 UTC (rev 1821)
@@ -36,6 +36,7 @@
<Reference type="Project" refto="SharpRefactory" localcopy="True" />
<Reference type="Project" refto="MonoDevelop.Gui.Widgets" localcopy="True" />
<Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
+ <Reference type="Project" refto="SharpAssembly" localcopy="True" />
</References>
<DeploymentInformation target="" script="" strategy="File" />
<Configuration runwithwarnings="False" name="Debug">
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.CSharpBinding
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.CSharpBinding 2004-06-24 22:44:48 UTC (rev 1820)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.CSharpBinding 2004-06-24 23:21:44 UTC (rev 1821)
@@ -48,7 +48,8 @@
"../../DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll" \
"../../../Main/Base/MonoDevelop.Base.dll" \
"../../../Libraries/SharpRefactory/ICSharpCode.SharpRefactory.dll" \
-"../../../Libraries/MonoDevelop.Gui.Widgets/MonoDevelop.Gui.Widgets.dll"
+"../../../Libraries/MonoDevelop.Gui.Widgets/MonoDevelop.Gui.Widgets.dll" \
+"../../../Libraries/SharpAssembly/ICSharpCode.SharpAssembly.dll"
PROJECT_REFERENCES_BUILD = $(addprefix -r:, $(PROJECT_REFERENCES))
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/SourceEditor.prjx
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/SourceEditor.prjx 2004-06-24 22:44:48 UTC (rev 1820)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/SourceEditor.prjx 2004-06-24 23:21:44 UTC (rev 1821)
@@ -86,6 +86,7 @@
<Reference type="Project" refto="MonoDevelop.Gui.Utils" localcopy="True" />
<Reference type="Project" refto="MonoDevelop.Gui.Widgets" localcopy="True" />
<Reference type="Project" refto="MonoDevelop.Base" localcopy="True" />
+ <Reference type="Gac" refto="pango-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
</References>
<DeploymentInformation target="" script="" strategy="File" />
<Configuration runwithwarnings="False" name="Debug">
Modified: trunk/MonoDevelop/src/AddIns/prj2make-sharp-lib/Prj2MakeSharp.prjx
===================================================================
--- trunk/MonoDevelop/src/AddIns/prj2make-sharp-lib/Prj2MakeSharp.prjx 2004-06-24 22:44:48 UTC (rev 1820)
+++ trunk/MonoDevelop/src/AddIns/prj2make-sharp-lib/Prj2MakeSharp.prjx 2004-06-24 23:21:44 UTC (rev 1821)
@@ -13,6 +13,7 @@
<File name="./prj2make-sharp-lib.addin.xml" subtype="Code" buildaction="Exclude" dependson="" data="" />
<File name="./sharp_d_cmbx.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./sharp_d_prjx.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+ <File name="./pkgconfiginvoker.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
</Contents>
<References>
<Reference type="Gac" refto="System.Xml, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" localcopy="True" />
@@ -23,6 +24,7 @@
<Reference type="Gac" refto="pango-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
<Reference type="Project" refto="MonoDevelop.Core" localcopy="True" />
<Reference type="Project" refto="MonoDevelop.Base" localcopy="True" />
+ <Reference type="Project" refto="MonoDevelop.Gui.Widgets" localcopy="True" />
</References>
<DeploymentInformation target="" script="" strategy="File" />
<Configuration runwithwarnings="False" name="Debug">
Added: trunk/MonoDevelop/src/Libraries/Gdl/DockBar.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockBar.cs 2004-06-24 22:44:48 UTC (rev 1820)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockBar.cs 2004-06-24 23:21:44 UTC (rev 1821)
@@ -0,0 +1,16 @@
+// created on 6/24/2004 at 7:43 PM
+
+using System;
+using System.Collections;
+using Gtk;
+
+namespace Gdl
+{
+ // stub so I can compile in MD
+ public class DockBar : Widget // maybe not really
+ {
+ public DockBar (Dock dock)
+ {
+ }
+ }
+}
\ No newline at end of file
Added: trunk/MonoDevelop/src/Libraries/Gdl/DockLayout.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockLayout.cs 2004-06-24 22:44:48 UTC (rev 1820)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockLayout.cs 2004-06-24 23:21:44 UTC (rev 1821)
@@ -0,0 +1,37 @@
+// created on 6/24/2004 at 7:39 PM
+
+using System;
+using System.Collections;
+using Gtk;
+
+namespace Gdl
+{
+ // stub so I can compile in MD
+ public class DockLayout
+ {
+ public DockLayout (Dock dock)
+ {
+ }
+
+ public string[] GetLayouts (bool something)
+ {
+ return new string[] {""};
+ }
+
+ public void LoadLayout (string newLayout)
+ {
+ }
+
+ public void LoadFromFile (string configFile)
+ {
+ }
+
+ public void SaveLayout (string currentLayout)
+ {
+ }
+
+ public void SaveToFile (string file)
+ {
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/MonoDevelop/src/Libraries/Gdl/Gdl.prjx
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/Gdl.prjx 2004-06-24 22:44:48 UTC (rev 1820)
+++ trunk/MonoDevelop/src/Libraries/Gdl/Gdl.prjx 2004-06-24 23:21:44 UTC (rev 1821)
@@ -21,6 +21,8 @@
<File name="./stock-menu-right-12.png" subtype="Code" buildaction="Exclude" dependson="" data="" />
<File name="./DetachedHandler.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./DockedHandler.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+ <File name="./DockLayout.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+ <File name="./DockBar.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
</Contents>
<References>
<Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
Modified: trunk/MonoDevelop/src/Libraries/Gdl/Makefile.Gdl
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/Makefile.Gdl 2004-06-24 22:44:48 UTC (rev 1820)
+++ trunk/MonoDevelop/src/Libraries/Gdl/Makefile.Gdl 2004-06-24 23:21:44 UTC (rev 1821)
@@ -18,7 +18,9 @@
./DockPaned.cs \
./DockNotebook.cs \
./DetachedHandler.cs \
-./DockedHandler.cs
+./DockedHandler.cs \
+./DockLayout.cs \
+./DockBar.cs
PKG_REFERENCES = \
gtk-sharp
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs 2004-06-24 22:44:48 UTC (rev 1820)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs 2004-06-24 23:21:44 UTC (rev 1821)
@@ -28,7 +28,7 @@
{
// service instances needed
- PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
+ PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
ProjectAndCombinePanelWidget widget;
const string projectAndCombineProperty = "SharpDevelop.UI.ProjectAndCombineOptions";
@@ -59,9 +59,9 @@
[Glade.Widget] public Gtk.Label buildAndRunOptionsLabel;
// service instances needed
- StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (
+ StringParserService StringParserService = (StringParserService)ServiceManager.GetService (
typeof (StringParserService));
- PropertyService PropertyService = (PropertyService)ServiceManager.Services.GetService (
+ PropertyService PropertyService = (PropertyService)ServiceManager.GetService (
typeof (PropertyService));
public ProjectAndCombinePanelWidget () : base ("Base.glade", "ProjectAndCombinePanel")
Modified: trunk/MonoDevelop/src/Main/StartUp/Makefile.MonoDevelop
===================================================================
--- trunk/MonoDevelop/src/Main/StartUp/Makefile.MonoDevelop 2004-06-24 22:44:48 UTC (rev 1820)
+++ trunk/MonoDevelop/src/Main/StartUp/Makefile.MonoDevelop 2004-06-24 23:21:44 UTC (rev 1821)
@@ -8,7 +8,8 @@
./Dialogs/ExceptionBox.cs
PKG_REFERENCES = \
-gtk-sharp
+gtk-sharp \
+gnome-sharp
PKG_REFERENCES_BUILD = $(addprefix -pkg:, $(PKG_REFERENCES))
Modified: trunk/MonoDevelop/src/Main/StartUp/MonoDevelop.prjx
===================================================================
--- trunk/MonoDevelop/src/Main/StartUp/MonoDevelop.prjx 2004-06-24 22:44:48 UTC (rev 1820)
+++ trunk/MonoDevelop/src/Main/StartUp/MonoDevelop.prjx 2004-06-24 23:21:44 UTC (rev 1821)
@@ -14,6 +14,9 @@
<Reference type="Gac" refto="System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" localcopy="True" />
<Reference type="Project" refto="MonoDevelop.Core" localcopy="True" />
<Reference type="Project" refto="MonoDevelop.Base" localcopy="True" />
+ <Reference type="Gac" refto="glib-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
+ <Reference type="Gac" refto="gdk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
+ <Reference type="Gac" refto="gnome-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
</References>
<DeploymentInformation target="" script="" strategy="File" />
<Configuration runwithwarnings="False" name="Debug">
More information about the Monodevelop-patches-list
mailing list