зеркало из https://github.com/mono/mail-archives.git
503 строки
19 KiB
HTML
503 строки
19 KiB
HTML
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
|
|
<HTML>
|
|
<HEAD>
|
|
<TITLE> [Monodevelop-patches-list] r1195 - in trunk/MonoDevelop: . src/Main/Base src/Main/Base/Gui src/Main/Base/Gui/Pads/ClassScout src/Main/Base/Gui/Pads/HelpBrowser src/Main/Base/Gui/Pads/ProjectBrowser src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder src/Main/Base/Gui/Workbench src/Main/Base/Internal/Project/Project src/Main/Base/Services/Tasks
|
|
</TITLE>
|
|
<LINK REL="Index" HREF="index.html" >
|
|
<LINK REL="made" HREF="mailto:monodevelop-patches-list%40lists.ximian.com?Subject=%5BMonodevelop-patches-list%5D%20r1195%20-%20in%20trunk/MonoDevelop%3A%20.%20src/Main/Base%20src/Main/Base/Gui%20src/Main/Base/Gui/Pads/ClassScout%20src/Main/Base/Gui/Pads/HelpBrowser%20src/Main/Base/Gui/Pads/ProjectBrowser%20src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder%20src/Main/Base/Gui/Workbench%20src/Main/Base/Internal/Project/Project%20src/Main/Base/Services/Tasks&In-Reply-To=">
|
|
<META NAME="robots" CONTENT="index,nofollow">
|
|
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
|
|
<LINK REL="Previous" HREF="000801.html">
|
|
<LINK REL="Next" HREF="000803.html">
|
|
</HEAD>
|
|
<BODY BGCOLOR="#ffffff">
|
|
<H1>[Monodevelop-patches-list] r1195 - in trunk/MonoDevelop: . src/Main/Base src/Main/Base/Gui src/Main/Base/Gui/Pads/ClassScout src/Main/Base/Gui/Pads/HelpBrowser src/Main/Base/Gui/Pads/ProjectBrowser src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder src/Main/Base/Gui/Workbench src/Main/Base/Internal/Project/Project src/Main/Base/Services/Tasks</H1>
|
|
<B>commit-watcher at mono-cvs.ximian.com</B>
|
|
<A HREF="mailto:monodevelop-patches-list%40lists.ximian.com?Subject=%5BMonodevelop-patches-list%5D%20r1195%20-%20in%20trunk/MonoDevelop%3A%20.%20src/Main/Base%20src/Main/Base/Gui%20src/Main/Base/Gui/Pads/ClassScout%20src/Main/Base/Gui/Pads/HelpBrowser%20src/Main/Base/Gui/Pads/ProjectBrowser%20src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder%20src/Main/Base/Gui/Workbench%20src/Main/Base/Internal/Project/Project%20src/Main/Base/Services/Tasks&In-Reply-To="
|
|
TITLE="[Monodevelop-patches-list] r1195 - in trunk/MonoDevelop: . src/Main/Base src/Main/Base/Gui src/Main/Base/Gui/Pads/ClassScout src/Main/Base/Gui/Pads/HelpBrowser src/Main/Base/Gui/Pads/ProjectBrowser src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder src/Main/Base/Gui/Workbench src/Main/Base/Internal/Project/Project src/Main/Base/Services/Tasks">commit-watcher at mono-cvs.ximian.com
|
|
</A><BR>
|
|
<I>Fri Mar 19 19:20:23 EST 2004</I>
|
|
<P><UL>
|
|
<LI>Previous message: <A HREF="000801.html">[Monodevelop-patches-list] r1194 - in trunk/MonoDevelop: . src/Main/Base/Commands src/Main/Base/Gui src/Main/Base/Gui/CompletionDatabaseWizard src/Main/Base/Gui/Components src/Main/Base/Gui/Components/StatusBar src/Main/Base/Services/StatusBar
|
|
</A></li>
|
|
<LI>Next message: <A HREF="000803.html">[Monodevelop-patches-list] r1196 - trunk/MonoDevelop/build/data/resources/icons
|
|
</A></li>
|
|
<LI> <B>Messages sorted by:</B>
|
|
<a href="date.html#802">[ date ]</a>
|
|
<a href="thread.html#802">[ thread ]</a>
|
|
<a href="subject.html#802">[ subject ]</a>
|
|
<a href="author.html#802">[ author ]</a>
|
|
</LI>
|
|
</UL>
|
|
<HR>
|
|
<!--beginarticle-->
|
|
<PRE>Author: jluke
|
|
Date: 2004-03-19 19:20:23 -0500 (Fri, 19 Mar 2004)
|
|
New Revision: 1195
|
|
|
|
Modified:
|
|
trunk/MonoDevelop/ChangeLog
|
|
trunk/MonoDevelop/src/Main/Base/Gui/IWorkbenchLayout.cs
|
|
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
|
|
trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs
|
|
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
|
|
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
|
|
trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
|
|
trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs
|
|
trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/TypelibImporter.cs
|
|
trunk/MonoDevelop/src/Main/Base/Makefile.am
|
|
trunk/MonoDevelop/src/Main/Base/Services/Tasks/Task.cs
|
|
Log:
|
|
there is a story behind this involving a un-decorated window bug,
|
|
but it is too embarassing to tell
|
|
|
|
|
|
Modified: trunk/MonoDevelop/ChangeLog
|
|
===================================================================
|
|
--- trunk/MonoDevelop/ChangeLog 2004-03-20 00:04:08 UTC (rev 1194)
|
|
+++ trunk/MonoDevelop/ChangeLog 2004-03-20 00:20:23 UTC (rev 1195)
|
|
@@ -8,6 +8,8 @@
|
|
* src/Main/Base/Gui/Components/StatusBar/SdStatusBar.cs:
|
|
use double instead of casting to int everywhere
|
|
and implement ProgressBar
|
|
+ * src/Main/Base/Makefile.am: cleanup and undefine GTK and LINUX
|
|
+ * *.cs: account for above
|
|
|
|
2004-03-19 Iñigo Illán <kodeport AT terra.es>
|
|
* src/Main/Base/Commands/FileCommands.cs:
|
|
|
|
Modified: trunk/MonoDevelop/src/Main/Base/Gui/IWorkbenchLayout.cs
|
|
===================================================================
|
|
--- trunk/MonoDevelop/src/Main/Base/Gui/IWorkbenchLayout.cs 2004-03-20 00:04:08 UTC (rev 1194)
|
|
+++ trunk/MonoDevelop/src/Main/Base/Gui/IWorkbenchLayout.cs 2004-03-20 00:20:23 UTC (rev 1195)
|
|
@@ -21,11 +21,9 @@
|
|
/// The active workbench window.
|
|
/// </summary>
|
|
|
|
-#if GTK
|
|
Gtk.Widget LayoutWidget {
|
|
get;
|
|
}
|
|
-#endif
|
|
|
|
IWorkbenchWindow ActiveWorkbenchwindow {
|
|
get;
|
|
|
|
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
|
|
===================================================================
|
|
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs 2004-03-20 00:04:08 UTC (rev 1194)
|
|
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs 2004-03-20 00:20:23 UTC (rev 1195)
|
|
@@ -168,11 +168,7 @@
|
|
Gdk.Threads.Leave();
|
|
}
|
|
|
|
-#if !GTK
|
|
- protected override void OnDoubleClick(EventArgs e)
|
|
-#else
|
|
private void OnNodeActivated(object sender, Gtk.RowActivatedArgs args)
|
|
-#endif
|
|
{
|
|
//base.OnDoubleClick(e);
|
|
TreeNode node = SelectedNode;
|
|
@@ -203,11 +199,7 @@
|
|
base.OnMouseDown(e);
|
|
}
|
|
*/
|
|
-#if GTK
|
|
private void OnButtonRelease(object sender, Gtk.ButtonReleaseEventArgs args)
|
|
-#else
|
|
- protected override void OnMouseUp(MouseEventArgs e)
|
|
-#endif
|
|
{
|
|
//if (e.Button == MouseButtons.Right && SelectedNode != null && SelectedNode is AbstractClassScoutNode) {
|
|
if (args.Event.Button == 3 && SelectedNode != null && SelectedNode is AbstractClassScoutNode) {
|
|
|
|
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs
|
|
===================================================================
|
|
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs 2004-03-20 00:04:08 UTC (rev 1194)
|
|
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs 2004-03-20 00:20:23 UTC (rev 1195)
|
|
@@ -12,28 +12,23 @@
|
|
using Monodoc;
|
|
|
|
using MonoDevelop.Gui;
|
|
-
|
|
using MonoDevelop.Core.Services;
|
|
using MonoDevelop.Services;
|
|
|
|
namespace MonoDevelop.Gui.Pads
|
|
{
|
|
-
|
|
public class HelpTree : AbstractPadContent
|
|
{
|
|
-
|
|
MonodocService mds;
|
|
|
|
TreeStore store;
|
|
TreeView tree_view;
|
|
|
|
ScrolledWindow scroller;
|
|
-
|
|
TreeIter root_iter;
|
|
|
|
public HelpTree () : base ("Help", Gtk.Stock.Help)
|
|
{
|
|
-
|
|
mds = (MonodocService)ServiceManager.Services.GetService (typeof (MonodocService));
|
|
tree_view = new TreeView ();
|
|
|
|
|
|
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
|
|
===================================================================
|
|
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs 2004-03-20 00:04:08 UTC (rev 1194)
|
|
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs 2004-03-20 00:20:23 UTC (rev 1195)
|
|
@@ -280,7 +280,7 @@
|
|
}
|
|
}
|
|
break;
|
|
-#if NOT_DONE
|
|
+#if false
|
|
case Subtype.WebReferences:
|
|
{
|
|
// add a web directory
|
|
|
|
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
|
|
===================================================================
|
|
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs 2004-03-20 00:04:08 UTC (rev 1194)
|
|
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs 2004-03-20 00:20:23 UTC (rev 1195)
|
|
@@ -383,11 +383,7 @@
|
|
}
|
|
}
|
|
*/
|
|
-#if !GTK
|
|
- protected override void OnDoubleClick(EventArgs e)
|
|
-#else
|
|
private void OnNodeActivated(object sender, Gtk.RowActivatedArgs args)
|
|
-#endif
|
|
{
|
|
if (SelectedNode != null && SelectedNode is AbstractBrowserNode) {
|
|
((AbstractBrowserNode)SelectedNode).ActivateItem();
|
|
|
|
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
|
|
===================================================================
|
|
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-03-20 00:04:08 UTC (rev 1194)
|
|
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-03-20 00:20:23 UTC (rev 1195)
|
|
@@ -42,9 +42,6 @@
|
|
int cur_dbgLineNumber;
|
|
|
|
bool fullscreen;
|
|
-#if !GTK
|
|
- FormWindowState defaultWindowState = FormWindowState.Normal;
|
|
-#endif
|
|
Rectangle normalBounds = new Rectangle(0, 0, 640, 480);
|
|
|
|
private IWorkbenchLayout layout = null;
|
|
@@ -67,9 +64,7 @@
|
|
}
|
|
}
|
|
|
|
-#if GTK
|
|
- // FIXME: GTKize (Actually, do we need too? --Todd)
|
|
-#else
|
|
+ /*
|
|
public string Title {
|
|
get {
|
|
return Text;
|
|
@@ -77,8 +72,7 @@
|
|
set {
|
|
Text = value;
|
|
}
|
|
- }
|
|
-#endif
|
|
+ }*/
|
|
|
|
EventHandler windowChangeEventHandler;
|
|
|
|
@@ -190,15 +184,8 @@
|
|
|
|
public void InitializeWorkspace()
|
|
{
|
|
-#if GTK
|
|
// FIXME: GTKize
|
|
ActiveWorkbenchWindowChanged += new EventHandler(UpdateMenu);
|
|
-#else
|
|
- //statusBarManager.Control.Dock = DockStyle.Bottom;
|
|
-
|
|
- MenuComplete += new EventHandler(SetStandardStatusBar);
|
|
- SetStandardStatusBar(null, null);
|
|
-#endif
|
|
|
|
IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
|
|
IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
|
|
@@ -396,12 +383,7 @@
|
|
} else {
|
|
memento.Bounds = normalBounds;
|
|
}
|
|
-#if GTK
|
|
- // FIXME: GTKize
|
|
-#else
|
|
- memento.DefaultWindowState = fullscreen ? defaultWindowState : WindowState;
|
|
- memento.WindowState = WindowState;
|
|
-#endif
|
|
+
|
|
memento.FullScreen = fullscreen;
|
|
return memento;
|
|
}
|
|
@@ -414,39 +396,19 @@
|
|
normalBounds = memento.Bounds;
|
|
Move (normalBounds.X, normalBounds.Y);
|
|
Resize (normalBounds.Width, normalBounds.Height);
|
|
-#if GTK
|
|
- // FIXME: GTKize
|
|
-#else
|
|
- WindowState = memento.WindowState;
|
|
- defaultWindowState = memento.DefaultWindowState;
|
|
-#endif
|
|
FullScreen = memento.FullScreen;
|
|
}
|
|
}
|
|
|
|
protected /*override*/ void OnResize(EventArgs e)
|
|
{
|
|
-#if GTK
|
|
// FIXME: GTKize
|
|
-#else
|
|
- base.OnResize(e);
|
|
- if (WindowState == FormWindowState.Normal) {
|
|
- normalBounds = Bounds;
|
|
- }
|
|
-#endif
|
|
|
|
}
|
|
|
|
protected /*override*/ void OnLocationChanged(EventArgs e)
|
|
{
|
|
-#if GTK
|
|
// FIXME: GTKize
|
|
-#else
|
|
- base.OnLocationChanged(e);
|
|
- if (WindowState == FormWindowState.Normal) {
|
|
- normalBounds = Bounds;
|
|
- }
|
|
-#endif
|
|
}
|
|
|
|
void CheckRemovedFile(object sender, FileEventArgs e)
|
|
@@ -511,9 +473,6 @@
|
|
|
|
protected /*override*/ void OnClosed(EventArgs e)
|
|
{
|
|
-#if !GTK
|
|
- base.OnClosed(e);
|
|
-#endif
|
|
layout.Detach();
|
|
foreach (IPadContent content in PadContentCollection) {
|
|
content.Dispose();
|
|
@@ -656,48 +615,6 @@
|
|
// Handle keyboard shortcuts
|
|
|
|
|
|
-#if GTK
|
|
- // FIXME: GTKize
|
|
-#else
|
|
- protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
|
|
- {
|
|
- if (this.commandBarManager.PreProcessMessage(ref msg)) {
|
|
- return true;
|
|
- }
|
|
-
|
|
- return base.ProcessCmdKey(ref msg, keyData);
|
|
- }
|
|
-
|
|
- protected override void OnDragEnter(DragEventArgs e)
|
|
- {
|
|
- base.OnDragEnter(e);
|
|
- if (e.Data != null && e.Data.GetDataPresent(DataFormats.FileDrop)) {
|
|
- string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);
|
|
- foreach (string file in files) {
|
|
- if (File.Exists(file)) {
|
|
- e.Effect = DragDropEffects.Copy;
|
|
- return;
|
|
- }
|
|
- }
|
|
- }
|
|
- e.Effect = DragDropEffects.None;
|
|
- }
|
|
-
|
|
- protected override void OnDragDrop(DragEventArgs e)
|
|
- {
|
|
- base.OnDragDrop(e);
|
|
- if (e.Data != null && e.Data.GetDataPresent(DataFormats.FileDrop)) {
|
|
- string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);
|
|
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
|
|
- foreach (string file in files) {
|
|
- if (File.Exists(file)) {
|
|
- fileService.OpenFile(file);
|
|
- }
|
|
- }
|
|
- }
|
|
- }
|
|
-#endif
|
|
-
|
|
public event EventHandler ActiveWorkbenchWindowChanged;
|
|
|
|
/// Context switching specific parts
|
|
|
|
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs
|
|
===================================================================
|
|
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs 2004-03-20 00:04:08 UTC (rev 1194)
|
|
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs 2004-03-20 00:20:23 UTC (rev 1195)
|
|
@@ -92,21 +92,14 @@
|
|
{
|
|
switch (ReferenceType) {
|
|
case ReferenceType.Typelib:
|
|
-#if LINUX
|
|
return String.Empty;
|
|
-#else
|
|
- return new TypelibImporter().Import(this, project);
|
|
-#endif
|
|
case ReferenceType.Assembly:
|
|
return reference;
|
|
|
|
case ReferenceType.Gac:
|
|
-#if LINUX
|
|
return GetPathToGACAssembly(this);
|
|
-#else
|
|
// TODO: gac on linux
|
|
- return reference;
|
|
-#endif
|
|
+ //return reference;
|
|
case ReferenceType.Project:
|
|
IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
|
|
string projectOutputLocation = projectService.GetOutputAssemblyName(reference);
|
|
|
|
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/TypelibImporter.cs
|
|
===================================================================
|
|
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/TypelibImporter.cs 2004-03-20 00:04:08 UTC (rev 1194)
|
|
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/TypelibImporter.cs 2004-03-20 00:20:23 UTC (rev 1195)
|
|
@@ -4,13 +4,12 @@
|
|
// <owner name="Poul Staugaard" email="<A HREF="http://lists.ximian.com/mailman/listinfo/monodevelop-patches-list">poul at staugaard.dk</A>"/>
|
|
// <version value="$version"/>
|
|
// </file>
|
|
-#if !LINUX
|
|
+#if false
|
|
using System;
|
|
using System.IO;
|
|
using System.Reflection;
|
|
using System.Reflection.Emit;
|
|
using System.Runtime.InteropServices;
|
|
-using System.Windows.Forms;
|
|
using System.Diagnostics;
|
|
|
|
using Microsoft.Win32;
|
|
|
|
Modified: trunk/MonoDevelop/src/Main/Base/Makefile.am
|
|
===================================================================
|
|
--- trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-03-20 00:04:08 UTC (rev 1194)
|
|
+++ trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-03-20 00:20:23 UTC (rev 1195)
|
|
@@ -1,3 +1,19 @@
|
|
+
|
|
+CSC = mcs /debug
|
|
+
|
|
+DLLS = /r:System.Drawing /r:ICSharpCode.SharpZipLib.dll \
|
|
+ /r:../../../build/bin/ICSharpCode.SharpRefactory.dll \
|
|
+ /r:../../../build/bin/MonoDevelop.Core.dll \
|
|
+ /r:../../../build/bin/ICSharpCode.SharpAssembly.dll \
|
|
+ /r:../../../build/bin/MonoDevelop.Gui.Utils.dll \
|
|
+ /r:../../../build/bin/MonoDevelop.Gui.Widgets.dll \
|
|
+ /r:System.Data /r:System.Web.Services \
|
|
+ /r:gtk-sharp /r:gdk-sharp /r:glib-sharp /r:pango-sharp \
|
|
+ /r:../../../build/bin/gtkmozembed-sharp.dll \
|
|
+ /r:../../../build/bin/gdl-sharp.dll \
|
|
+ /r:glade-sharp /r:gnome-sharp /r:gtkhtml-sharp \
|
|
+ /r:$(debugger_prefix)/lib/Mono.Debugger.dll
|
|
+
|
|
FILES= \
|
|
./Gui/Pads/ProjectBrowser/ProjectBrowserView.cs \
|
|
./Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs \
|
|
@@ -356,37 +372,24 @@
|
|
|
|
build_sources = $(addprefix $(srcdir)/, $(FILES))
|
|
|
|
-DLL = MonoDevelop.Base.dll
|
|
+ASSEMBLY = MonoDevelop.Base.dll
|
|
|
|
-all: $(DLL)
|
|
+all: $(ASSEMBLY)
|
|
|
|
-$(DLL): $(build_sources) ../../../data/resources/glade/Base.glade
|
|
- @ mcs /debug /out:$(DLL) /target:library /r:System.Drawing /r:ICSharpCode.SharpZipLib.dll \
|
|
- /r:../../../build/bin/ICSharpCode.SharpRefactory.dll /r:../../../build/bin/MonoDevelop.Core.dll \
|
|
- /r:../../../build/bin/ICSharpCode.SharpAssembly.dll \
|
|
- /r:../../../build/bin/MonoDevelop.Gui.Utils.dll \
|
|
- /r:../../../build/bin/MonoDevelop.Gui.Widgets.dll \
|
|
- /r:../../../build/bin/gdl-sharp.dll \
|
|
+$(ASSEMBLY): $(build_sources) ../../../data/resources/glade/Base.glade
|
|
+ @ $(CSC) /out:$(ASSEMBLY) /target:library $(DLLS) \
|
|
/resource:$(srcdir)/../../../data/resources/glade/Base.glade,Base.glade \
|
|
- /r:System.Data /r:System.Web.Services /define:LINUX \
|
|
- /define:GTK /r:gtk-sharp /r:gdk-sharp /r:glib-sharp \
|
|
- /r:pango-sharp \
|
|
- /r:../../../build/bin/gtkmozembed-sharp.dll \
|
|
- /r:glade-sharp \
|
|
- /r:gnome-sharp \
|
|
- /r:gtkhtml-sharp \
|
|
- /r:$(debugger_prefix)/lib/Mono.Debugger.dll \
|
|
$(monodoc_libflags) \
|
|
$(build_sources) \
|
|
- && cp $(DLL) ../../../build/bin/.
|
|
+ && cp $(ASSEMBLY) ../../../build/bin/.
|
|
|
|
Services/StockIcons.cs : ./Services/process-icons.pl
|
|
perl -x$(srcdir)/../../../build/data/resources/icons -w $(srcdir)/./Services/process-icons.pl > $@
|
|
|
|
assemblydir = $(libdir)/monodevelop/bin
|
|
-assembly_DATA = $(DLL)
|
|
+assembly_DATA = $(ASSEMBLY)
|
|
|
|
-CLEANFILES=$(DLL)
|
|
+CLEANFILES = $(ASSEMBLY)
|
|
|
|
EXTRA_DIST = $(FILES) ./Services/process-icons.pl
|
|
|
|
|
|
Modified: trunk/MonoDevelop/src/Main/Base/Services/Tasks/Task.cs
|
|
===================================================================
|
|
--- trunk/MonoDevelop/src/Main/Base/Services/Tasks/Task.cs 2004-03-20 00:04:08 UTC (rev 1194)
|
|
+++ trunk/MonoDevelop/src/Main/Base/Services/Tasks/Task.cs 2004-03-20 00:20:23 UTC (rev 1195)
|
|
@@ -111,11 +111,6 @@
|
|
IViewContent content = window.ViewContent;
|
|
if (content is IPositionable) {
|
|
((IPositionable)content).JumpTo(Math.Max(0, line), Math.Max(0, column));
|
|
-#if !LINUX
|
|
- // Begin Svante Lidman (by mike : May be workaround for .NET bug ... ?)
|
|
- content.Control.Focus();
|
|
- // End Svante Lidman
|
|
-#endif
|
|
}
|
|
}
|
|
|
|
|
|
|
|
</PRE>
|
|
|
|
<!--endarticle-->
|
|
<HR>
|
|
<P><UL>
|
|
<!--threads-->
|
|
<LI>Previous message: <A HREF="000801.html">[Monodevelop-patches-list] r1194 - in trunk/MonoDevelop: . src/Main/Base/Commands src/Main/Base/Gui src/Main/Base/Gui/CompletionDatabaseWizard src/Main/Base/Gui/Components src/Main/Base/Gui/Components/StatusBar src/Main/Base/Services/StatusBar
|
|
</A></li>
|
|
<LI>Next message: <A HREF="000803.html">[Monodevelop-patches-list] r1196 - trunk/MonoDevelop/build/data/resources/icons
|
|
</A></li>
|
|
<LI> <B>Messages sorted by:</B>
|
|
<a href="date.html#802">[ date ]</a>
|
|
<a href="thread.html#802">[ thread ]</a>
|
|
<a href="subject.html#802">[ subject ]</a>
|
|
<a href="author.html#802">[ author ]</a>
|
|
</LI>
|
|
</UL>
|
|
|
|
<hr>
|
|
<a href="http://lists.ximian.com/mailman/listinfo/monodevelop-patches-list">More information about the Monodevelop-patches-list
|
|
mailing list</a><br>
|
|
</body></html>
|