Author: mkestner
Date: 2007-05-01 21:20:52 -0400 (Tue, 01 May 2007)
New Revision: 76553
Modified:
trunk/stetic/
trunk/stetic/ChangeLog
trunk/stetic/libstetic/editor/ActionMenu.cs
trunk/stetic/libstetic/editor/ActionMenuItem.cs
trunk/stetic/libstetic/editor/IconSelectorMenuItem.cs
trunk/stetic/libstetic/wrapper/ActionToolbarWrapper.cs
trunk/stetic/libstetic/wrapper/MenuBar.cs
trunk/stetic/libsteticui/
Log:
2007-05-01 Mike Kestner <[EMAIL PROTECTED]>
* libstetic/wrapper/MenuBar.cs:
* libstetic/wrapper/ActionToolbarWrapper.cs:
* libstetic/editor/ActionMenuItem.cs:
* libstetic/editor/IconSelectorMenuItem.cs:
* libstetic/editor/ActionMenu.cs: Call base.Dispose on GLib.Objects
after all other dispose actions are performed.
Property changes on: trunk/stetic
___________________________________________________________________
Name: svn:ignore
- aclocal.m4
autom4te.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
depcomp
INSTALL
install-sh
libtool
ltmain.sh
Makefile
Makefile.in
missing
mkinstalldirs
stamp-h1
+ aclocal.m4
autom4te.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
depcomp
INSTALL
install-sh
libtool
ltmain.sh
Makefile
Makefile.in
missing
mkinstalldirs
stamp-h1
intltool-extract.in
intltool-update.in
stetic.pc
intltool-merge.in
bin
po
Modified: trunk/stetic/ChangeLog
===================================================================
--- trunk/stetic/ChangeLog 2007-05-02 00:35:36 UTC (rev 76552)
+++ trunk/stetic/ChangeLog 2007-05-02 01:20:52 UTC (rev 76553)
@@ -1,5 +1,14 @@
2007-05-01 Mike Kestner <[EMAIL PROTECTED]>
+ * libstetic/wrapper/MenuBar.cs:
+ * libstetic/wrapper/ActionToolbarWrapper.cs:
+ * libstetic/editor/ActionMenuItem.cs:
+ * libstetic/editor/IconSelectorMenuItem.cs:
+ * libstetic/editor/ActionMenu.cs: Call base.Dispose on GLib.Objects
+ after all other dispose actions are performed.
+
+2007-05-01 Mike Kestner <[EMAIL PROTECTED]>
+
* libsteticui/WidgetFactory.cs:
* libsteticui/ProjectView.cs:
* libsteticui/PaletteBackend.cs:
Modified: trunk/stetic/libstetic/editor/ActionMenu.cs
===================================================================
--- trunk/stetic/libstetic/editor/ActionMenu.cs 2007-05-02 00:35:36 UTC (rev
76552)
+++ trunk/stetic/libstetic/editor/ActionMenu.cs 2007-05-02 01:20:52 UTC (rev
76553)
@@ -50,10 +50,10 @@
w.Destroy ();
}
- base.Dispose ();
parentNode.ChildNodeAdded -= OnChildAdded;
parentNode.ChildNodeRemoved -= OnChildRemoved;
parentNode = null;
+ base.Dispose ();
}
public void Select (ActionTreeNode node)
Modified: trunk/stetic/libstetic/editor/ActionMenuItem.cs
===================================================================
--- trunk/stetic/libstetic/editor/ActionMenuItem.cs 2007-05-02 00:35:36 UTC
(rev 76552)
+++ trunk/stetic/libstetic/editor/ActionMenuItem.cs 2007-05-02 01:20:52 UTC
(rev 76553)
@@ -66,7 +66,6 @@
public override void Dispose ()
{
- base.Dispose ();
if (menuBarItem != null) {
menuBarItem.ButtonPressEvent -= OnMenuItemPress;
menuBarItem.ButtonReleaseEvent -=
OnMemuItemRelease;
@@ -74,6 +73,7 @@
}
if (node.Action != null)
node.Action.ObjectChanged -= OnActionChanged;
+ base.Dispose ();
}
public ActionTreeNode Node {
Modified: trunk/stetic/libstetic/editor/IconSelectorMenuItem.cs
===================================================================
--- trunk/stetic/libstetic/editor/IconSelectorMenuItem.cs 2007-05-02
00:35:36 UTC (rev 76552)
+++ trunk/stetic/libstetic/editor/IconSelectorMenuItem.cs 2007-05-02
01:20:52 UTC (rev 76553)
@@ -19,7 +19,7 @@
{
if (IconSelected != null)
IconSelected (this, new IconEventArgs
(selector.SelectedIcon));
- selector.Dispose ();
+ selector.Destroy ();
return base.OnButtonPressEvent (ev);
}
Modified: trunk/stetic/libstetic/wrapper/ActionToolbarWrapper.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/ActionToolbarWrapper.cs 2007-05-02
00:35:36 UTC (rev 76552)
+++ trunk/stetic/libstetic/wrapper/ActionToolbarWrapper.cs 2007-05-02
01:20:52 UTC (rev 76553)
@@ -30,8 +30,8 @@
public override void Dispose ()
{
+ DisposeTree ();
base.Dispose ();
- DisposeTree ();
}
public static new Gtk.Toolbar CreateInstance ()
Modified: trunk/stetic/libstetic/wrapper/MenuBar.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/MenuBar.cs 2007-05-02 00:35:36 UTC (rev
76552)
+++ trunk/stetic/libstetic/wrapper/MenuBar.cs 2007-05-02 01:20:52 UTC (rev
76553)
@@ -19,8 +19,8 @@
public override void Dispose ()
{
+ DisposeTree ();
base.Dispose ();
- DisposeTree ();
}
public static new Gtk.MenuBar CreateInstance ()
@@ -251,9 +251,9 @@
public override void Dispose ()
{
- base.Dispose ();
if (disposeNode)
node.Dispose ();
+ base.Dispose ();
}
}
Property changes on: trunk/stetic/libsteticui
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
sources.rsp
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
