Author: jluke
Date: 2006-07-15 17:11:57 -0400 (Sat, 15 Jul 2006)
New Revision: 62648
Modified:
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorWidget.cs
Log:
2006-07-15 John Luke <[EMAIL PROTECTED]>
* MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs:
rename HasSelection to _HasSelection so it wont conflict with
gtk 2.10 version
* MonoDevelop.SourceEditor.Gui/SourceEditorWidget.cs:
disambiguate PrintJob for gtk 2.10
Modified: trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog 2006-07-15
20:14:15 UTC (rev 62647)
+++ trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog 2006-07-15
21:11:57 UTC (rev 62648)
@@ -1,3 +1,11 @@
+2006-07-15 John Luke <[EMAIL PROTECTED]>
+
+ * MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs:
+ rename HasSelection to _HasSelection so it wont conflict with
+ gtk 2.10 version
+ * MonoDevelop.SourceEditor.Gui/SourceEditorWidget.cs:
+ disambiguate PrintJob for gtk 2.10
+
2006-07-14 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs: When calling
Modified:
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs
2006-07-15 20:14:15 UTC (rev 62647)
+++
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs
2006-07-15 21:11:57 UTC (rev 62648)
@@ -320,7 +320,8 @@
}
#region IClipboardHandler
- bool HasSelection
+ // FIXME: remove when we depend on gtk > 2.10
+ bool _HasSelection
{
get {
TextIter dummy, dummy2;
@@ -330,7 +331,7 @@
public string GetSelectedText ()
{
- if (HasSelection)
+ if (_HasSelection)
{
TextIter select1, select2;
GetSelectionBounds (out select1, out select2);
@@ -369,13 +370,13 @@
void IClipboardHandler.Cut (object sender, EventArgs e)
{
- if (HasSelection)
+ if (_HasSelection)
CutClipboard (clipboard, true);
}
void IClipboardHandler.Copy (object sender, EventArgs e)
{
- if (HasSelection)
+ if (_HasSelection)
CopyClipboard (clipboard);
}
@@ -389,7 +390,7 @@
void IClipboardHandler.Delete (object sender, EventArgs e)
{
- if (HasSelection)
+ if (_HasSelection)
DeleteSelection (true, true);
}
@@ -706,7 +707,7 @@
public int GetLowerSelectionBounds ()
{
- if (HasSelection)
+ if (_HasSelection)
{
TextIter select1, select2;
GetSelectionBounds (out select1, out select2);
Modified:
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorWidget.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorWidget.cs
2006-07-15 20:14:15 UTC (rev 62647)
+++
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorWidget.cs
2006-07-15 21:11:57 UTC (rev 62648)
@@ -23,7 +23,7 @@
public SourceEditorBuffer Buffer;
public SourceEditorView View;
public SourceEditorDisplayBindingWrapper DisplayBinding;
- protected PrintJob printJob;
+ protected Gnome.PrintJob printJob;
protected PrintDialog printDialog;
static Gdk.Pixbuf dragIconPixbuf;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
