Author: jacobilsoe
Date: 2007-06-22 10:23:42 -0400 (Fri, 22 Jun 2007)
New Revision: 80555
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs
Log:
* MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs: Use the new CloseClicked
event of TabLabel. Fixes bug #81890.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2007-06-22
14:23:07 UTC (rev 80554)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2007-06-22
14:23:42 UTC (rev 80555)
@@ -1,3 +1,8 @@
+2007-06-22 Jacob Ilsø Christensen <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs: Use the new CloseClicked
+ event of TabLabel. Fixes bug #81890.
+
2007-06-22 Mike Krüger <[EMAIL PROTECTED]>
Added MIT license to standard headers.
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs
2007-06-22 14:23:07 UTC (rev 80554)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs
2007-06-22 14:23:42 UTC (rev 80555)
@@ -662,8 +662,7 @@
SdiWorkspaceWindow f = (SdiWorkspaceWindow) sender;
// Unsubscribe events to avoid memory leaks
- f.TabLabel.Button.Clicked -= new EventHandler
(closeClicked);
- f.TabLabel.Button.StateChanged -= new
StateChangedHandler (stateChanged);
+ f.TabLabel.CloseClicked -= new EventHandler
(closeClicked);
if (f.ViewContent != null) {
((IWorkbench)wbWindow).CloseContent
(f.ViewContent);
@@ -685,8 +684,7 @@
}
TabLabel tabLabel = new TabLabel (new Label (),
mimeimage != null ? mimeimage : new Gtk.Image (""));
- tabLabel.Button.Clicked += new EventHandler
(closeClicked);
- tabLabel.Button.StateChanged += new StateChangedHandler
(stateChanged);
+ tabLabel.CloseClicked += new EventHandler
(closeClicked);
tabLabel.ClearFlag (WidgetFlags.CanFocus);
SdiWorkspaceWindow sdiWorkspaceWindow = new
SdiWorkspaceWindow (workbench, content, tabControl, tabLabel);
@@ -697,17 +695,11 @@
return sdiWorkspaceWindow;
}
- void stateChanged (object o, StateChangedArgs e)
- {
- if (((Gtk.Widget)o).State == Gtk.StateType.Active)
- ((Gtk.Widget)o).State = Gtk.StateType.Normal;
- }
-
void closeClicked (object o, EventArgs e)
{
- Widget parent = ((Widget)o).Parent;
+ Widget tabLabel = ((Widget)o);
foreach (Widget child in tabControl.Children) {
- if (tabControl.GetTabLabel (child) == parent) {
+ if (tabControl.GetTabLabel (child) == tabLabel)
{
int pageNum = tabControl.PageNum
(child);
((SdiWorkspaceWindow)child).CloseWindow
(false, false, pageNum);
break;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
