[Monodevelop-patches-list] r860 - in trunk/MonoDevelop/src: AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels AddIns/Misc/StartPage Libraries/MonoDevelop.Gui.Widgets/Dock Libraries/MonoDevelop.Gui.Widgets/Tree Main/Base/Gui/Dialogs/ReferenceDialog Main/Base/Gui/Dialogs/Wizard Main/Base/Gui/Pads Main/Base/Gui/Pads/ClassScout Main/Base/Gui/Pads/ProjectBrowser Main/Base/Gui/Workbench
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Tue Feb 10 16:05:40 EST 2004
Author: tberman
Date: 2004-02-10 16:05:39 -0500 (Tue, 10 Feb 2004)
New Revision: 860
Modified:
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs
trunk/MonoDevelop/src/AddIns/Misc/StartPage/StartPage.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Dock/Docker.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeView.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
Log:
fixing more of mike's gtk-sharp breakage
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs 2004-02-10 18:58:33 UTC (rev 859)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs 2004-02-10 21:05:39 UTC (rev 860)
@@ -89,7 +89,7 @@
addGroupButton.Clicked += new System.EventHandler(AddGroupEvent);
editGroupButton.Clicked += new System.EventHandler(EditGroupEvent);
removeGroupButton.Clicked += new System.EventHandler(RemoveGroupEvent);
- templateListView.RowActivated += new GtkSharp.RowActivatedHandler(RowActivatedEvent);
+ templateListView.RowActivated += new Gtk.RowActivatedHandler(RowActivatedEvent);
templateListView.Selection.Changed += new EventHandler(IndexChange);
templateTextBuffer.Changed += new EventHandler(TextChange);
@@ -310,7 +310,7 @@
}
// raised when a treeview row is double clicked on
- void RowActivatedEvent(object sender, GtkSharp.RowActivatedArgs ra)
+ void RowActivatedEvent(object sender, Gtk.RowActivatedArgs ra)
{
EditEvent(sender, System.EventArgs.Empty);
}
Modified: trunk/MonoDevelop/src/AddIns/Misc/StartPage/StartPage.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/Misc/StartPage/StartPage.cs 2004-02-10 18:58:33 UTC (rev 859)
+++ trunk/MonoDevelop/src/AddIns/Misc/StartPage/StartPage.cs 2004-02-10 21:05:39 UTC (rev 860)
@@ -13,7 +13,7 @@
using ICSharpCode.SharpDevelop.Gui.HtmlControl;
using ICSharpCode.Core.Services;
-using GtkMozEmbedSharp;
+using GtkMozEmbed;
namespace ICSharpCode.StartPage
{
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Dock/Docker.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Dock/Docker.cs 2004-02-10 18:58:33 UTC (rev 859)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Dock/Docker.cs 2004-02-10 21:05:39 UTC (rev 860)
@@ -8,10 +8,10 @@
public Docker () : base ()
{
- this.ExposeEvent += new GtkSharp.ExposeEventHandler (OnExpose);
+ this.ExposeEvent += new ExposeEventHandler (OnExpose);
}
- void OnExpose (object o, GtkSharp.ExposeEventArgs e)
+ void OnExpose (object o, ExposeEventArgs e)
{
}
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeView.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeView.cs 2004-02-10 18:58:33 UTC (rev 859)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeView.cs 2004-02-10 21:05:39 UTC (rev 860)
@@ -43,7 +43,7 @@
text_render = new Gtk.CellRendererText ();
if (canEdit)
- text_render.Edited += new GtkSharp.EditedHandler (HandleOnEdit);
+ text_render.Edited += new Gtk.EditedHandler (HandleOnEdit);
complete_column.PackStart (text_render, true);
complete_column.AddAttribute (text_render, "text", 0);
@@ -55,7 +55,7 @@
nodes.NodeInserted += new NodeInsertedHandler (OnNodeInserted);
nodes.NodeRemoved += new NodeRemovedHandler (OnNodeRemoved);
- TestExpandRow += new GtkSharp.TestExpandRowHandler (OnTestExpandRow);
+ TestExpandRow += new Gtk.TestExpandRowHandler (OnTestExpandRow);
}
public TreeView (bool edit, Gtk.TreeIterCompareFunc cb_compare) : this (edit)
@@ -64,7 +64,7 @@
store.SetSortColumnId (/* GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID */ -1, Gtk.SortType.Ascending);
}
- void HandleOnEdit (object o, GtkSharp.EditedArgs e)
+ void HandleOnEdit (object o, Gtk.EditedArgs e)
{
text_render.Editable = false;
Gtk.TreeIter iter;
@@ -246,7 +246,7 @@
return ret;
}
- private void OnTestExpandRow (object sender, GtkSharp.TestExpandRowArgs args)
+ private void OnTestExpandRow (object sender, Gtk.TestExpandRowArgs args)
{
TreeNode node = GetNodeByIter (args.Iter);
TreeViewCancelEventArgs e = new TreeViewCancelEventArgs (node);
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs 2004-02-10 18:58:33 UTC (rev 859)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs 2004-02-10 21:05:39 UTC (rev 860)
@@ -37,7 +37,7 @@
TreeViewColumn firstColumn = new TreeViewColumn ();
firstColumn.Title = resourceService.GetString ("Dialog.SelectReferenceDialog.GacReferencePanel.ReferenceHeader");
CellRendererToggle tog_render = new CellRendererToggle ();
- tog_render.Toggled += new GtkSharp.ToggledHandler (AddReference);
+ tog_render.Toggled += new Gtk.ToggledHandler (AddReference);
firstColumn.PackStart (tog_render, false);
firstColumn.AddAttribute (tog_render, "active", 3);
@@ -58,7 +58,7 @@
ShowAll ();
}
- public void AddReference(object sender, GtkSharp.ToggledArgs e)
+ public void AddReference(object sender, Gtk.ToggledArgs e)
{
//foreach (ListViewItem item in SelectedItems) {
Gtk.TreeIter iter;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs 2004-02-10 18:58:33 UTC (rev 859)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs 2004-02-10 21:05:39 UTC (rev 860)
@@ -49,7 +49,7 @@
bitmap = resourceService.GetBitmap ("GeneralWizardBackground");
AddEvents ((int) (Gdk.EventMask.ExposureMask));
- ExposeEvent += new GtkSharp.ExposeEventHandler (OnPaint);
+ ExposeEvent += new Gtk.ExposeEventHandler (OnPaint);
Realized += new EventHandler (OnRealized);
}
@@ -59,7 +59,7 @@
ly = new Pango.Layout(PangoContext);
}
- protected void OnPaint(object o, GtkSharp.ExposeEventArgs e)
+ protected void OnPaint(object o, Gtk.ExposeEventArgs e)
{
GdkWindow.BeginPaintRect (e.Event.Area);
GdkWindow.DrawPixbuf (gc, bitmap, 0, 0, 0, 0, -1, -1, Gdk.RgbDither.None, 0, 0);
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs 2004-02-10 18:58:33 UTC (rev 859)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs 2004-02-10 21:05:39 UTC (rev 860)
@@ -133,8 +133,8 @@
AmbienceService ambienceService = (AmbienceService)ServiceManager.Services.GetService(typeof(AmbienceService));
ambienceService.AmbienceChanged += new EventHandler(AmbienceChangedEvent);
- RowActivated += new GtkSharp.RowActivatedHandler(OnNodeActivated);
- contentPanel.ButtonReleaseEvent += new GtkSharp.ButtonReleaseEventHandler(OnButtonRelease);
+ RowActivated += new Gtk.RowActivatedHandler(OnNodeActivated);
+ contentPanel.ButtonReleaseEvent += new Gtk.ButtonReleaseEventHandler(OnButtonRelease);
}
void AmbienceChangedEvent(object sender, EventArgs e)
@@ -183,7 +183,7 @@
#if !GTK
protected override void OnDoubleClick(EventArgs e)
#else
- private void OnNodeActivated(object sender, GtkSharp.RowActivatedArgs args)
+ private void OnNodeActivated(object sender, Gtk.RowActivatedArgs args)
#endif
{
//base.OnDoubleClick(e);
@@ -216,7 +216,7 @@
}
*/
#if GTK
- private void OnButtonRelease(object sender, GtkSharp.ButtonReleaseEventArgs args)
+ private void OnButtonRelease(object sender, Gtk.ButtonReleaseEventArgs args)
#else
protected override void OnMouseUp(MouseEventArgs e)
#endif
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs 2004-02-10 18:58:33 UTC (rev 859)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout.cs 2004-02-10 21:05:39 UTC (rev 860)
@@ -316,7 +316,7 @@
public FileScout()
{
fb.TreeView.Selection.Changed += new EventHandler (OnDirChanged);
- filelister.RowActivated += new GtkSharp.RowActivatedHandler(FileSelected);
+ filelister.RowActivated += new Gtk.RowActivatedHandler(FileSelected);
Gtk.Frame treef = new Gtk.Frame();
Gtk.VBox utilVBox = new Gtk.VBox (false, 0);
@@ -387,7 +387,7 @@
}
}
- void FileSelected(object sender, GtkSharp.RowActivatedArgs e)
+ void FileSelected(object sender, Gtk.RowActivatedArgs e)
{
IProjectService projectService = (IProjectService)ICSharpCode.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
IFileService fileService = (IFileService)ICSharpCode.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs 2004-02-10 18:58:33 UTC (rev 859)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs 2004-02-10 21:05:39 UTC (rev 860)
@@ -111,8 +111,8 @@
sw.Add(this);
contentPanel = new Gtk.Frame();
contentPanel.Add(sw);
- RowActivated += new GtkSharp.RowActivatedHandler(OnNodeActivated);
- contentPanel.ButtonReleaseEvent += new GtkSharp.ButtonReleaseEventHandler(OnButtonRelease);
+ RowActivated += new Gtk.RowActivatedHandler(OnNodeActivated);
+ contentPanel.ButtonReleaseEvent += new Gtk.ButtonReleaseEventHandler(OnButtonRelease);
}
void TrackPropertyChange (object o, ICSharpCode.Core.Properties.PropertyEventArgs e)
@@ -333,7 +333,7 @@
return true;
}
*/
- private void OnButtonRelease(object sender, GtkSharp.ButtonReleaseEventArgs args)
+ private void OnButtonRelease(object sender, Gtk.ButtonReleaseEventArgs args)
{
if (args.Event.Button != 3 || SelectedNode == null) {
return;
@@ -386,7 +386,7 @@
#if !GTK
protected override void OnDoubleClick(EventArgs e)
#else
- private void OnNodeActivated(object sender, GtkSharp.RowActivatedArgs args)
+ private void OnNodeActivated(object sender, Gtk.RowActivatedArgs args)
#endif
{
if (SelectedNode != null && SelectedNode is AbstractBrowserNode) {
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-02-10 18:58:33 UTC (rev 859)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-02-10 21:05:39 UTC (rev 860)
@@ -145,7 +145,7 @@
DefaultWidth = normalBounds.Width;
DefaultHeight = normalBounds.Height;
- DeleteEvent += new GtkSharp.DeleteEventHandler (OnClosing);
+ DeleteEvent += new Gtk.DeleteEventHandler (OnClosing);
this.Icon = resourceService.GetBitmap ("Icons.SharpDevelopIcon");
this.WindowPosition = Gtk.WindowPosition.None;
}
@@ -455,7 +455,7 @@
// SetStandardStatusBar(null, null);
// }
- protected /*override*/ void OnClosing(object o, GtkSharp.DeleteEventArgs e)
+ protected /*override*/ void OnClosing(object o, Gtk.DeleteEventArgs e)
{
if (Close()) {
Gtk.Application.Quit ();
More information about the Monodevelop-patches-list
mailing list