diff --git a/Makefile.am b/Makefile.am
index ed42497db..decd152d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = sources generator parser glib gio cairo pango atk gdk gtk gtkdotnet sample doc
+SUBDIRS = sources generator parser glib gio cairo pango atk gdk gtk gtkdotnet doc
EXTRA_DIST = \
gtk-sharp.snk \
diff --git a/gdk/Rectangle.cs b/gdk/Rectangle.cs
index af88cd530..7620f9907 100644
--- a/gdk/Rectangle.cs
+++ b/gdk/Rectangle.cs
@@ -232,5 +232,12 @@ namespace Gdk {
{
return gdk_rectangle_intersect (ref this, ref src, out dest);
}
+
+ public static Rectangle New (IntPtr raw)
+ {
+ return (Gdk.Rectangle) Marshal.PtrToStructure (raw, typeof (Gdk.Rectangle));
+ }
+
+ public static Rectangle Zero;
}
}
diff --git a/gio/Gio.metadata b/gio/Gio.metadata
index a97dfe586..b2624075f 100644
--- a/gio/Gio.metadata
+++ b/gio/Gio.metadata
@@ -3,6 +3,7 @@
GLib
private
+ GioGlobal
async
1
GetCanRemoveSupportsType
diff --git a/gtk/Application.cs b/gtk/Application.cs
index 97e4287ca..a73abf44c 100755
--- a/gtk/Application.cs
+++ b/gtk/Application.cs
@@ -25,14 +25,7 @@ namespace Gtk {
using System.Runtime.InteropServices;
using Gdk;
- public class Application {
-
- //
- // Disables creation of instances.
- //
- private Application ()
- {
- }
+ public partial class Application {
const int WS_EX_TOOLWINDOW = 0x00000080;
const int WS_OVERLAPPEDWINDOW = 0x00CF0000;
diff --git a/gtk/TreeSortable.custom b/gtk/CellAreaBox.cs
similarity index 52%
rename from gtk/TreeSortable.custom
rename to gtk/CellAreaBox.cs
index d476da7fd..bd9aa6141 100644
--- a/gtk/TreeSortable.custom
+++ b/gtk/CellAreaBox.cs
@@ -1,13 +1,7 @@
-// Gtk.TreeSortable.Custom - Gtk TreeSortable interface customizations
-//
-// Author: Mike Kestner
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
+// Copyright (c) 2011 Novell, Inc.
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General
+// modify it under the terms of version 2 of the Lesser GNU General
// Public License as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
@@ -20,9 +14,23 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
- [Obsolete ("Replaced by SetDefaultSortFunc (TreeIterCompareFunc) overload.")]
- void SetDefaultSortFunc (TreeIterCompareFunc sort_func, IntPtr user_data, Gtk.DestroyNotify destroy);
- [Obsolete ("Replaced by SetSortFunc (int, TreeIterCompareFunc) overload.")]
- void SetSortFunc (int sort_column_id, TreeIterCompareFunc sort_func, IntPtr user_data, Gtk.DestroyNotify destroy);
+using System;
+
+namespace Gtk {
+
+ public partial class CellAreaBox {
+
+ public void SetAttributes (CellRenderer cell, params object[] attrs)
+ {
+ if (attrs.Length % 2 != 0)
+ throw new ArgumentException ("attrs should contain pairs of attribute/col");
+
+ ClearAttributes (cell);
+ for (int i = 0; i < attrs.Length - 1; i += 2) {
+ AddAttribute (cell, (string) attrs [i], (int) attrs [i + 1]);
+ }
+ }
+ }
+}
diff --git a/gtk/CellRenderer.custom b/gtk/CellRenderer.custom
index 0e85e8110..2837b4960 100644
--- a/gtk/CellRenderer.custom
+++ b/gtk/CellRenderer.custom
@@ -39,9 +39,9 @@
[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_cell_renderer_render (IntPtr handle, IntPtr drawable, IntPtr widget, ref Gdk.Rectangle bg_area, ref Gdk.Rectangle cell_area, ref Gdk.Rectangle expose_area, int flags);
- public void Render (Widget widget, Gdk.Drawable window, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)
+ public void Render (Cairo.Context context, Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)
{
- gtk_cell_renderer_render (Handle, window == null ? IntPtr.Zero : window.Handle, widget == null ? IntPtr.Zero : widget.Handle, ref background_area, ref cell_area, ref expose_area, (int) flags);
+ gtk_cell_renderer_render (Handle, context == null ? IntPtr.Zero : context.Handle, widget == null ? IntPtr.Zero : widget.Handle, ref background_area, ref cell_area, ref expose_area, (int) flags);
}
// We have to implement this VM manually because x_offset, y_offset, width and height params may be NULL and therefore cannot be treated as "out int"
@@ -99,93 +99,3 @@
Marshal.FreeHGlobal (native_cell_area);
}
- // Compatibility code for old GetSize(..) virtual method
- static void ObsoleteGetSize_cb (IntPtr item, IntPtr widget, IntPtr cell_area_ptr, IntPtr x_offset, IntPtr y_offset, IntPtr width, IntPtr height)
- {
- try {
- CellRenderer obj = GLib.Object.GetObject (item, false) as CellRenderer;
- Gtk.Widget widg = GLib.Object.GetObject (widget, false) as Gtk.Widget;
- Gdk.Rectangle cell_area = Gdk.Rectangle.New (cell_area_ptr);
- int a, b, c, d;
-
- obj.GetSize (widg, ref cell_area, out a, out b, out c, out d);
- if (x_offset != IntPtr.Zero)
- Marshal.WriteInt32 (x_offset, a);
- if (y_offset != IntPtr.Zero)
- Marshal.WriteInt32 (y_offset, b);
- if (width != IntPtr.Zero)
- Marshal.WriteInt32 (width, c);
- if (height != IntPtr.Zero)
- Marshal.WriteInt32 (height, d);
- } catch (Exception e) {
- GLib.ExceptionManager.RaiseUnhandledException (e, false);
- }
- }
-
- static void OverrideObsoleteGetSize (GLib.GType gtype)
- {
- if (OnGetSizeCallback == null)
- OnGetSizeCallback = new OnGetSizeDelegate (ObsoleteGetSize_cb);
- gtksharp_cellrenderer_override_get_size (gtype.Val, OnGetSizeCallback);
- }
-
- [Obsolete ("Replaced by OnGetSize for implementations and GetSize(..., out Gdk.Rectangle bounds) for callers.")]
- [GLib.DefaultSignalHandler(Type=typeof(Gtk.CellRenderer), ConnectionMethod="OverrideObsoleteGetSize")]
- public virtual void GetSize(Gtk.Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- InternalOnGetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
- }
-
- // Compatibility code for old Render(..) virtual method
- static void ObsoleteRender_cb (IntPtr cell, IntPtr window, IntPtr widget, IntPtr background_area, IntPtr cell_area, IntPtr expose_area, int flags)
- {
- try {
- Gtk.CellRenderer __obj = GLib.Object.GetObject (cell, false) as Gtk.CellRenderer;
- __obj.Render (GLib.Object.GetObject(window) as Gdk.Drawable, GLib.Object.GetObject(widget) as Gtk.Widget, Gdk.Rectangle.New (background_area), Gdk.Rectangle.New (cell_area), Gdk.Rectangle.New (expose_area), (Gtk.CellRendererState) flags);
- } catch (Exception e) {
- GLib.ExceptionManager.RaiseUnhandledException (e, false);
- }
- }
-
- static RenderNativeDelegate ObsoleteRenderVMCallback;
- static void OverrideObsoleteRender (GLib.GType gtype)
- {
- if (ObsoleteRenderVMCallback == null)
- ObsoleteRenderVMCallback = new RenderNativeDelegate (ObsoleteRender_cb);
- OverrideRender (gtype, ObsoleteRenderVMCallback); // -> autogenerated method
- }
-
- [Obsolete ("Replaced by OnRender for subclass overrides and Render (Widget ...) for callers.")]
- [GLib.DefaultSignalHandler(Type=typeof(Gtk.CellRenderer), ConnectionMethod="OverrideObsoleteRender")]
- protected virtual void Render (Gdk.Drawable window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags)
- {
- InternalRender (window, widget, background_area, cell_area, expose_area, flags);
- }
-
- // Compatibility code for old StartEditing(..) virtual method
- static IntPtr ObsoleteStartEditing_cb (IntPtr cell, IntPtr evnt, IntPtr widget, IntPtr path, IntPtr background_area, IntPtr cell_area, int flags)
- {
- try {
- Gtk.CellRenderer __obj = GLib.Object.GetObject (cell, false) as Gtk.CellRenderer;
- Gtk.CellEditable __result = __obj.StartEditing (Gdk.Event.GetEvent (evnt), GLib.Object.GetObject(widget) as Gtk.Widget, GLib.Marshaller.Utf8PtrToString (path), Gdk.Rectangle.New (background_area), Gdk.Rectangle.New (cell_area), (Gtk.CellRendererState) flags);
- return __result == null ? IntPtr.Zero : __result.Handle;
- } catch (Exception e) {
- GLib.ExceptionManager.RaiseUnhandledException (e, true);
- // NOTREACHED: above call does not return.
- throw e;
- }
- }
-
- static StartEditingNativeDelegate ObsoleteStartEditingVMCallback;
- static void OverrideObsoleteStartEditing (GLib.GType gtype)
- {
- if (ObsoleteStartEditingVMCallback == null)
- ObsoleteStartEditingVMCallback = new StartEditingNativeDelegate (ObsoleteStartEditing_cb);
- OverrideStartEditing (gtype, ObsoleteStartEditingVMCallback);
- }
-
- [Obsolete ("Replaced by OnStartEditing for subclass overrides and StartEditing (Gtk.Widget ...) for callers.")]
- [GLib.DefaultSignalHandler(Type=typeof(Gtk.CellRenderer), ConnectionMethod="OverrideObsoleteStartEditing")]
- public virtual Gtk.CellEditable StartEditing(Gdk.Event evnt, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags) {
- return InternalStartEditing (evnt, widget, path, background_area, cell_area, flags);
- }
diff --git a/gtk/CellRendererAccel.custom b/gtk/CellRendererAccel.custom
deleted file mode 100644
index bba9b932c..000000000
--- a/gtk/CellRendererAccel.custom
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// CellRendererAccel.custom - Gtk CellRendererAccel class customizations
-//
-// Author: Peter Johanson
-//
-// Copyright (C) 2007 Peter Johanson
-//
-// This code is inserted after the automatically generated code.
-//
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
- [Obsolete ("Replaced by OnGetSize for implementations and GetSize(..., out Gdk.Rectangle bounds) for callers.")]
- public override void GetSize (Gtk.Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
- }
-
- [Obsolete ("Replaced by OnRender for subclass overrides and Render (Widget ...) for callers.")]
- protected override void Render (Gdk.Drawable window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags)
- {
- base.Render (window, widget, background_area, cell_area, expose_area, flags);
- }
-
- [Obsolete ("Replaced by OnStartEditing for subclass overrides and StartEditing (Gtk.Widget ...) for callers.")]
- public override Gtk.CellEditable StartEditing(Gdk.Event evnt, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags)
- {
- return base.StartEditing (evnt, widget, path, background_area, cell_area, flags);
- }
diff --git a/gtk/CellRendererCombo.custom b/gtk/CellRendererCombo.custom
deleted file mode 100644
index 02893657d..000000000
--- a/gtk/CellRendererCombo.custom
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// CellRendererCombo.custom - Gtk CellRendererCombo class customizations
-//
-// Author: Peter Johanson
-//
-// Copyright (C) 2007 Peter Johanson
-//
-// This code is inserted after the automatically generated code.
-//
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
- [Obsolete ("Replaced by OnGetSize for implementations and GetSize(..., out Gdk.Rectangle bounds) for callers.")]
- public override void GetSize (Gtk.Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
- }
-
- [Obsolete ("Replaced by OnRender for subclass overrides and Render (Widget ...) for callers.")]
- protected override void Render (Gdk.Drawable window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags)
- {
- base.Render (window, widget, background_area, cell_area, expose_area, flags);
- }
-
- [Obsolete ("Replaced by OnStartEditing for subclass overrides and StartEditing (Gtk.Widget ...) for callers.")]
- public override Gtk.CellEditable StartEditing(Gdk.Event evnt, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags)
- {
- return base.StartEditing (evnt, widget, path, background_area, cell_area, flags);
- }
diff --git a/gtk/CellRendererPixbuf.custom b/gtk/CellRendererPixbuf.custom
deleted file mode 100644
index e2ea3ee89..000000000
--- a/gtk/CellRendererPixbuf.custom
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// CellRendererPixbuf.custom - Gtk CellRendererPixbuf class customizations
-//
-// Author: Peter Johanson
-//
-// Copyright (C) 2007 Peter Johanson
-//
-// This code is inserted after the automatically generated code.
-//
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
- [Obsolete ("Replaced by OnGetSize for implementations and GetSize(..., out Gdk.Rectangle bounds) for callers.")]
- public override void GetSize (Gtk.Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
- }
-
- [Obsolete ("Replaced by OnRender for subclass overrides and Render (Widget ...) for callers.")]
- protected override void Render (Gdk.Drawable window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags)
- {
- base.Render (window, widget, background_area, cell_area, expose_area, flags);
- }
-
- [Obsolete ("Replaced by OnStartEditing for subclass overrides and StartEditing (Gtk.Widget ...) for callers.")]
- public override Gtk.CellEditable StartEditing(Gdk.Event evnt, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags)
- {
- return base.StartEditing (evnt, widget, path, background_area, cell_area, flags);
- }
diff --git a/gtk/CellRendererProgress.custom b/gtk/CellRendererProgress.custom
deleted file mode 100644
index 53eca7f45..000000000
--- a/gtk/CellRendererProgress.custom
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// CellRendererProgress.custom - Gtk CellRendererProgress class customizations
-//
-// Author: Peter Johanson
-//
-// Copyright (C) 2007 Peter Johanson
-//
-// This code is inserted after the automatically generated code.
-//
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
- [Obsolete ("Replaced by OnGetSize for implementations and GetSize(..., out Gdk.Rectangle bounds) for callers.")]
- public override void GetSize (Gtk.Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
- }
-
- [Obsolete ("Replaced by OnRender for subclass overrides and Render (Widget ...) for callers.")]
- protected override void Render (Gdk.Drawable window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags)
- {
- base.Render (window, widget, background_area, cell_area, expose_area, flags);
- }
-
- [Obsolete ("Replaced by OnStartEditing for subclass overrides and StartEditing (Gtk.Widget ...) for callers.")]
- public override Gtk.CellEditable StartEditing(Gdk.Event evnt, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags)
- {
- return base.StartEditing (evnt, widget, path, background_area, cell_area, flags);
- }
diff --git a/gtk/CellRendererSpin.custom b/gtk/CellRendererSpin.custom
deleted file mode 100644
index aa636ecee..000000000
--- a/gtk/CellRendererSpin.custom
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// CellRendererSpin.custom - Gtk CellRendererSpin class customizations
-//
-// Author: Peter Johanson
-//
-// Copyright (C) 2007 Peter Johanson
-//
-// This code is inserted after the automatically generated code.
-//
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
- [Obsolete ("Replaced by OnGetSize for implementations and GetSize(..., out Gdk.Rectangle bounds) for callers.")]
- public override void GetSize (Gtk.Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
- }
-
- [Obsolete ("Replaced by OnRender for subclass overrides and Render (Widget ...) for callers.")]
- protected override void Render (Gdk.Drawable window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags)
- {
- base.Render (window, widget, background_area, cell_area, expose_area, flags);
- }
-
- [Obsolete ("Replaced by OnStartEditing for subclass overrides and StartEditing (Gtk.Widget ...) for callers.")]
- public override Gtk.CellEditable StartEditing(Gdk.Event evnt, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags)
- {
- return base.StartEditing (evnt, widget, path, background_area, cell_area, flags);
- }
diff --git a/gtk/CellRendererText.custom b/gtk/CellRendererText.custom
deleted file mode 100644
index 6374edf87..000000000
--- a/gtk/CellRendererText.custom
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// CellRendererText.custom - Gtk CellRendererText class customizations
-//
-// Author: Peter Johanson
-//
-// Copyright (C) 2007 Peter Johanson
-//
-// This code is inserted after the automatically generated code.
-//
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
- [Obsolete ("Replaced by OnGetSize for implementations and GetSize(..., out Gdk.Rectangle bounds) for callers.")]
- public override void GetSize (Gtk.Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
- }
-
- [Obsolete ("Replaced by OnRender for subclass overrides and Render (Widget ...) for callers.")]
- protected override void Render (Gdk.Drawable window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags)
- {
- base.Render (window, widget, background_area, cell_area, expose_area, flags);
- }
-
- [Obsolete ("Replaced by OnStartEditing for subclass overrides and StartEditing (Gtk.Widget ...) for callers.")]
- public override Gtk.CellEditable StartEditing(Gdk.Event evnt, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags)
- {
- return base.StartEditing (evnt, widget, path, background_area, cell_area, flags);
- }
diff --git a/gtk/CellRendererToggle.custom b/gtk/CellRendererToggle.custom
deleted file mode 100644
index ab5d4bb8a..000000000
--- a/gtk/CellRendererToggle.custom
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// CellRendererToggle.custom - Gtk CellRendererToggle class customizations
-//
-// Author: Peter Johanson
-//
-// Copyright (C) 2007 Peter Johanson
-//
-// This code is inserted after the automatically generated code.
-//
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
- [Obsolete ("Replaced by OnGetSize for implementations and GetSize(..., out Gdk.Rectangle bounds) for callers.")]
- public override void GetSize (Gtk.Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)
- {
- base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
- }
-
- [Obsolete ("Replaced by OnRender for subclass overrides and Render (Widget ...) for callers.")]
- protected override void Render (Gdk.Drawable window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags)
- {
- base.Render (window, widget, background_area, cell_area, expose_area, flags);
- }
-
- [Obsolete ("Replaced by OnStartEditing for subclass overrides and StartEditing (Gtk.Widget ...) for callers.")]
- public override Gtk.CellEditable StartEditing(Gdk.Event evnt, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags)
- {
- return base.StartEditing (evnt, widget, path, background_area, cell_area, flags);
- }
diff --git a/gtk/ComboBox.custom b/gtk/ComboBox.custom
index d7b8f7b2e..c41b473de 100644
--- a/gtk/ComboBox.custom
+++ b/gtk/ComboBox.custom
@@ -22,11 +22,12 @@
public ComboBox (string[] entries) : this (new ListStore (typeof (string)))
{
+ ListStore store = Model as ListStore;
CellRendererText cell = new CellRendererText ();
PackStart (cell, true);
SetAttributes (cell, "text", 0);
foreach (string entry in entries)
- AppendText (entry);
+ store.AppendValues (entry);
}
public void SetAttributes (CellRenderer cell, params object[] attrs)
diff --git a/gtk/Dialog.custom b/gtk/Dialog.custom
index 7bc96463c..9400c2cc7 100644
--- a/gtk/Dialog.custom
+++ b/gtk/Dialog.custom
@@ -39,8 +39,6 @@ public Dialog (string title, Gtk.Window parent, Gtk.DialogFlags flags, params ob
Modal = true;
if ((flags & DialogFlags.DestroyWithParent) > 0)
DestroyWithParent = true;
- if ((flags & DialogFlags.NoSeparator) > 0)
- HasSeparator = false;
} else {
IntPtr native = GLib.Marshaller.StringToPtrGStrdup (title);
Raw = gtk_dialog_new_with_buttons (native, parent == null ? IntPtr.Zero : parent.Handle, (int) flags, IntPtr.Zero);
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 5348a736c..cca830279 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -40,6 +40,9 @@
1
guchar
1
+ false
+ GtkTargetFlags
+ 1
call
out
1
@@ -64,6 +67,7 @@
1
GdkModifierType
BindingsActivate
+ CairoHelper
1
1
1
@@ -125,6 +129,14 @@
1
1
1
+ CornerTopLeft
+ CornerTopRight
+ CornerBottomLeft
+ CornerBottomRight
+ CornerTopLeft | CornerTopRight
+ CornerBottomLeft | CornerBottomRight
+ CornerTopLeft | CornerBottomLeft
+ CornerTopRight | CornerBottomRight
1
1
1
@@ -219,6 +231,7 @@
ref
out
out
+ ref
EmitRowChanged
EmitRowDeleted
EmitRowHasChildToggled
@@ -294,6 +307,7 @@
Entered
Left
SetDisplayOptions
+ AttributesApplied
CancelEditing
1
1
@@ -500,6 +514,7 @@
out
out
out
+ Respond
GtkButton*
public
GtkButton*
@@ -509,9 +524,6 @@
GetItem
GetWidget
GtkDestroyNotify
- Deselected
- Selected
- Toggled
1
label
LineWrapMode
@@ -535,6 +547,9 @@
1
1
Activated
+ Deselected
+ Selected
+ Toggled
ToggleSizeAllocated
ToggleSizeRequested
async
@@ -548,15 +563,6 @@
1
void
void
- 1
- 1
- 1
- 1
- GtkDestroyNotify
- GtkDestroyNotify
- GtkDestroyNotify
- GtkDestroyNotify
- 1
const-gfilename*
const-gfilename*
1
@@ -821,16 +827,22 @@
1
1
ProcessEvent
+ out
out
1
1
1
1
GdkEventMask
+ GetIsMapped
1
1
+ GetWidgetPath
+ GetIsRealized
1
1
+ GetHasDefault
+ GetHasFocus
out
GetIsFocus
1
@@ -839,6 +851,8 @@
1
GdkEventMask
1
+ SetIsMapped
+ SetIsRealized
1
out
1
@@ -849,6 +863,8 @@
ChildNotified
drag_context
drag_result
+ 1
+ Drawn
WidgetEvent
event
WidgetEventAfter
@@ -911,7 +927,6 @@
1
1
1
- GtkTargetFlags
1
private
1
@@ -947,4 +962,7 @@
/api/namespace/object[@cname='GtkStyle']
/api/namespace/object[@cname='GtkStyle']
/api/namespace/object[@cname='GtkStyle']
+
+
+
diff --git a/gtk/ListStore.custom b/gtk/ListStore.custom
index d873a95c7..67c7220cd 100644
--- a/gtk/ListStore.custom
+++ b/gtk/ListStore.custom
@@ -21,12 +21,6 @@
// Boston, MA 02111-1307, USA.
- [Obsolete ("Replaced by Reorder (int[]) overload")]
- public int Reorder ()
- {
- return -1;
- }
-
[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent);
public bool IterChildren (out Gtk.TreeIter iter)
@@ -191,12 +185,6 @@
ColumnTypes = gtypes;
}
- [Obsolete ("Replaced by ColumnTypes property.")]
- public void SetColumnTypes (GLib.GType[] types)
- {
- ColumnTypes = types;
- }
-
public object GetValue(Gtk.TreeIter iter, int column)
{
GLib.Value val = GLib.Value.Empty;
@@ -206,18 +194,6 @@
return ret;
}
- [Obsolete ("Replaced by SetSortFunc (int, TreeIterCompareFunc) overload.")]
- public void SetSortFunc (int sort_column_id, TreeIterCompareFunc sort_func, IntPtr user_data, Gtk.DestroyNotify destroy)
- {
- SetSortFunc (sort_column_id, sort_func);
- }
-
- [Obsolete ("Replaced by DefaultSortFunc property.")]
- public void SetDefaultSortFunc (TreeIterCompareFunc sort_func, IntPtr user_data, Gtk.DestroyNotify destroy)
- {
- DefaultSortFunc = sort_func;
- }
-
public IEnumerator GetEnumerator()
{
return new TreeEnumerator(this);
@@ -278,18 +254,9 @@
OverrideVirtualMethod (gtype, "rows_reordered", RowsReorderedVMCallback);
}
- [Obsolete ("Replaced by int[] new_order overload.")]
- [GLib.DefaultSignalHandler(Type=typeof(Gtk.ListStore), ConnectionMethod="OverrideRowsReordered")]
- protected virtual void OnRowsReordered (Gtk.TreePath path, Gtk.TreeIter iter, out int new_order)
- {
- new_order = -1;
- }
-
[GLib.DefaultSignalHandler(Type=typeof(Gtk.ListStore), ConnectionMethod="OverrideRowsReordered")]
protected virtual void OnRowsReordered (Gtk.TreePath path, Gtk.TreeIter iter, int[] new_order)
{
- int dummy;
- OnRowsReordered (path, iter, out dummy);
GLib.Value ret = GLib.Value.Empty;
GLib.ValueArray inst_and_params = new GLib.ValueArray (4);
GLib.Value[] vals = new GLib.Value [4];
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 96dd908fd..a70e06159 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -14,6 +14,7 @@ sources = \
ActionEntry.cs \
Application.cs \
BindingAttribute.cs \
+ CellAreaBox.cs \
ChildPropertyAttribute.cs \
ITreeNode.cs \
Key.cs \
@@ -26,14 +27,13 @@ sources = \
StockManager.cs \
ThreadNotify.cs \
ToggleActionEntry.cs \
- Timeout.cs \
TreeEnumerator.cs \
+ TreeMenu.cs \
TreeNodeAttribute.cs \
TreeNode.cs \
TreeNodeValueAttribute.cs
customs = \
- AboutDialog.custom \
Accel.custom \
AccelKey.custom \
Action.custom \
@@ -44,13 +44,6 @@ customs = \
Button.custom \
Calendar.custom \
CellRenderer.custom \
- CellRendererAccel.custom \
- CellRendererCombo.custom \
- CellRendererPixbuf.custom \
- CellRendererProgress.custom \
- CellRendererSpin.custom \
- CellRendererText.custom \
- CellRendererToggle.custom \
CellLayout.custom \
CellLayoutAdapter.custom \
CellView.custom \
@@ -109,14 +102,12 @@ customs = \
TargetList.custom \
TargetPair.custom \
TextAttributes.custom \
- TextAppearance.custom \
TextBuffer.custom \
TextChildAnchor.custom \
TextIter.custom \
TextMark.custom \
TextTag.custom \
TextView.custom \
- Toolbar.custom \
TooltipsData.custom \
TreeIter.custom \
TreeModel.custom \
@@ -125,8 +116,6 @@ customs = \
TreeModelSort.custom \
TreePath.custom \
TreeSelection.custom \
- TreeSortable.custom \
- TreeSortableAdapter.custom \
TreeStore.custom \
TreeViewColumn.custom \
TreeView.custom \
diff --git a/gtk/NodeStore.cs b/gtk/NodeStore.cs
index 9c9c4ad34..7e71abbf4 100644
--- a/gtk/NodeStore.cs
+++ b/gtk/NodeStore.cs
@@ -302,6 +302,23 @@ namespace Gtk {
return true;
}
+ public bool IterPrevious (ref TreeIter iter)
+ {
+ ITreeNode node = GetNode (iter);
+
+ int idx;
+ if (node.Parent == null)
+ idx = Nodes.IndexOf (node);
+ else
+ idx = node.Parent.IndexOf (node);
+
+ if (idx < 0) throw new Exception ("Node not found in Nodes list");
+ else if (idx == 0) return false;
+ node = node.Parent == null ? Nodes [idx - 1] as ITreeNode : node.Parent [idx - 1];
+ GetIter (node, ref iter);
+ return true;
+ }
+
public bool IterChildren (out Gtk.TreeIter first_child, Gtk.TreeIter parent)
{
first_child = Gtk.TreeIter.Zero;
diff --git a/gtk/NodeView.cs b/gtk/NodeView.cs
index 2aab11aff..cff52de07 100644
--- a/gtk/NodeView.cs
+++ b/gtk/NodeView.cs
@@ -74,9 +74,11 @@ namespace Gtk {
return CollapseRow (store.GetPath (node));
}
+#if FIXME30
public Gdk.Pixmap CreateRowDragIcon (ITreeNode node) {
return CreateRowDragIcon (store.GetPath (node));
}
+#endif
public Gdk.Rectangle GetBackgroundArea (ITreeNode node, Gtk.TreeViewColumn column) {
return GetBackgroundArea (store.GetPath (node), column);
diff --git a/gtk/Style.custom b/gtk/Style.custom
index af0671363..63a89f549 100644
--- a/gtk/Style.custom
+++ b/gtk/Style.custom
@@ -26,6 +26,7 @@
// Boston, MA 02111-1307, USA.
+#if FIXME30
static Gdk.GC EnsureGC (IntPtr raw) {
if (raw == IntPtr.Zero)
return null;
@@ -202,6 +203,7 @@ public void SetMidGC (StateType state, Gdk.GC gc)
{
gtksharp_gtk_style_set_mid_gc (Handle, (int) state, gc.Handle);
}
+#endif
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_bg (IntPtr style, int i);
@@ -370,29 +372,3 @@ public Pango.FontDescription FontDescription {
}
}
-[DllImport ("gtksharpglue-3")]
-static extern IntPtr gtksharp_gtk_style_get_bg_pixmap (IntPtr style, int state);
-
-[DllImport ("gtksharpglue-3")]
-static extern void gtksharp_gtk_style_set_bg_pixmap (IntPtr style, int state, IntPtr pixmap);
-
-public Gdk.Pixmap BgPixmap (StateType state)
-{
- IntPtr raw = gtksharp_gtk_style_get_bg_pixmap (Handle, (int) state);
- return GLib.Object.GetObject (raw) as Gdk.Pixmap;
-}
-
-public Gdk.Pixmap[] BgPixmaps {
- get {
- Gdk.Pixmap[] ret = new Gdk.Pixmap [5];
- for (int i = 0; i < 5; i++)
- ret [i] = GLib.Object.GetObject (gtksharp_gtk_style_get_dark (Handle, i)) as Gdk.Pixmap;
- return ret;
- }
-}
-
-public void SetBgPixmap (StateType state, Gdk.Pixmap pixmap)
-{
- gtksharp_gtk_style_set_bg_pixmap (Handle, (int) state, pixmap == null ? IntPtr.Zero : pixmap.Handle);
-}
-
diff --git a/gtk/TextAppearance.custom b/gtk/TextAppearance.custom
deleted file mode 100644
index 995b7f91b..000000000
--- a/gtk/TextAppearance.custom
+++ /dev/null
@@ -1,41 +0,0 @@
-// Gtk.TextAppearance.custom - Gtk TextAppearance class customizations
-//
-// Authors: Mike Kestner
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
- [Obsolete ("Replaced by BgStipple property.")]
- public Gdk.Pixmap bg_stipple {
- get {
- Gdk.Pixmap ret = GLib.Object.GetObject(_bg_stipple) as Gdk.Pixmap;
- return ret;
- }
- set { _bg_stipple = value.Handle; }
- }
-
- [Obsolete ("Replaced by FgStipple property.")]
- public Gdk.Pixmap fg_stipple {
- get {
- Gdk.Pixmap ret = GLib.Object.GetObject(_fg_stipple) as Gdk.Pixmap;
- return ret;
- }
- set { _fg_stipple = value.Handle; }
- }
-
diff --git a/gtk/TextAttributes.custom b/gtk/TextAttributes.custom
index 790302b4a..4ec6f4f90 100644
--- a/gtk/TextAttributes.custom
+++ b/gtk/TextAttributes.custom
@@ -1,10 +1,4 @@
-// Gtk.TextAttributes.custom - Gtk TextAttributes class customizations
-//
-// Authors: Mike Kestner
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
+// Copyright (c) 2011 Novell, Inc.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of version 2 of the Lesser GNU General
@@ -21,36 +15,8 @@
// Boston, MA 02111-1307, USA.
- [Obsolete("Gtk.TextAttributes is a reference type now, use null")]
- public static TextAttributes Zero = null;
-
- [Obsolete("Replaced by TextAttributes(IntPtr) constructor")]
- public static TextAttributes New (IntPtr raw)
- {
- return new TextAttributes (raw);
- }
-
- [Obsolete("Replaced by TextAttributes() constructor")]
- public static TextAttributes New ()
- {
- return new TextAttributes ();
- }
-
- [Obsolete ("Replaced by Font property.")]
- public Pango.FontDescription font {
- get { return Font; }
- set { Font = value; }
- }
-
- [Obsolete ("Replaced by Tabs property.")]
- public Pango.TabArray tabs {
- get { return Tabs; }
- set { Tabs = value; }
- }
-
- [Obsolete ("Replaced by Language property.")]
- public Pango.Language language {
- get { return Language; }
- set { Language = value; }
+ public TextAppearance Appearance {
+ get { return (TextAppearance) Marshal.PtrToStructure (new IntPtr (Handle.ToInt64 () + 4), typeof (TextAppearance)); }
+ set { Marshal.StructureToPtr (value, new IntPtr (Handle.ToInt64 () + 4), false); }
}
diff --git a/gtk/Timeout.cs b/gtk/Timeout.cs
deleted file mode 100644
index 6c5d84f96..000000000
--- a/gtk/Timeout.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// Gtk.Timeout.cs - Gtk Timeout implementation.
-//
-// Author: Mike Kestner
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-namespace Gtk {
-
- using System;
- using System.Runtime.InteropServices;
-
- [Obsolete ("Replaced by GLib.Timeout")]
- public class Timeout {
-
- [Obsolete ("Replaced by GLib.Source.Remove")]
- public static void Remove (uint timeout_handler_id)
- {
- GLib.Source.Remove (timeout_handler_id);
- }
-
- [Obsolete ("Replaced by GLib.Timeout.Add")]
- public static uint AddFull (uint interval, Gtk.Function function, Gtk.CallbackMarshal marshal, IntPtr data, Gtk.DestroyNotify destroy)
- {
- if (marshal != null || destroy != null)
- Console.WriteLine ("marshal, data, and destroy parameters ignored by Gtk.Timeout.AddFull ().");
- return Add (interval, function);
- }
-
- class GTimeoutProxy {
-
- GLib.TimeoutHandler handler;
- Function function;
-
- public GTimeoutProxy (Gtk.Function function)
- {
- this.function = function;
- handler = new GLib.TimeoutHandler (Invoke);
- }
-
- public GLib.TimeoutHandler Handler {
- get {
- return handler;
- }
- }
-
- bool Invoke ()
- {
- return function ();
- }
- }
-
- [Obsolete ("Replaced by GLib.Timeout.Add")]
- public static uint Add (uint interval, Gtk.Function function)
- {
- GTimeoutProxy proxy = new GTimeoutProxy (function);
- return GLib.Timeout.Add (interval, proxy.Handler);
- }
- }
-}
-
diff --git a/gtk/Toolbar.custom b/gtk/Toolbar.custom
deleted file mode 100644
index 6bae38d87..000000000
--- a/gtk/Toolbar.custom
+++ /dev/null
@@ -1,217 +0,0 @@
-// Gtk.Toolbar.custom - Gtk Toolbar class customizations
-//
-// Author: Mike Kestner
-//
-// Copyright (C) 2005 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
- static extern void g_object_weak_ref (IntPtr raw, WeakNotify cb, IntPtr data);
-
- delegate void WeakNotify (IntPtr handle, IntPtr obj);
-
- static void ReleaseDelegateCB (IntPtr handle, IntPtr obj)
- {
- GCHandle gch = (GCHandle) handle;
- gch.Free ();
- }
-
- static WeakNotify on_weak_notify;
- static WeakNotify OnWeakNotify {
- get {
- if (on_weak_notify == null)
- on_weak_notify = new WeakNotify (ReleaseDelegateCB);
- return on_weak_notify;
- }
- }
-
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr gtk_toolbar_append_element (IntPtr raw, int type, IntPtr widget, IntPtr text, IntPtr tooltip_text, IntPtr tooltip_private_text, IntPtr icon, GtkSharp.SignalFuncNative cb, IntPtr user_data);
-
- [Obsolete ("Replaced by ToolItem API")]
- public Gtk.Widget AppendElement (Gtk.ToolbarChildType type, Gtk.Widget widget, string text, string tooltip_text, string tooltip_private_text, Gtk.Widget icon, Gtk.SignalFunc cb)
- {
- GtkSharp.SignalFuncWrapper cb_wrapper = new GtkSharp.SignalFuncWrapper (cb);
- IntPtr ntext = GLib.Marshaller.StringToPtrGStrdup (text);
- IntPtr ntiptext = GLib.Marshaller.StringToPtrGStrdup (tooltip_text);
- IntPtr ntipprivtext = GLib.Marshaller.StringToPtrGStrdup (tooltip_private_text);
- IntPtr raw_ret = gtk_toolbar_append_element (Handle, (int) type, widget == null ? IntPtr.Zero : widget.Handle, ntext, ntiptext, ntipprivtext, icon == null ? IntPtr.Zero : icon.Handle, cb_wrapper.NativeDelegate, IntPtr.Zero);
- GLib.Marshaller.Free (ntext);
- GLib.Marshaller.Free (ntiptext);
- GLib.Marshaller.Free (ntipprivtext);
- Gtk.Widget ret;
- if (raw_ret == IntPtr.Zero)
- ret = null;
- else {
- ret = (Gtk.Widget) GLib.Object.GetObject (raw_ret);
- g_object_weak_ref (raw_ret, OnWeakNotify, (IntPtr) GCHandle.Alloc (cb_wrapper));
- }
- return ret;
- }
-
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr gtk_toolbar_insert_element (IntPtr raw, int type, IntPtr widget, IntPtr text, IntPtr tooltip_text, IntPtr tooltip_private_text, IntPtr icon, GtkSharp.SignalFuncNative cb, IntPtr user_data, int position);
-
- [Obsolete ("Replaced by ToolItem API")]
- public Gtk.Widget InsertElement (Gtk.ToolbarChildType type, Gtk.Widget widget, string text, string tooltip_text, string tooltip_private_text, Gtk.Widget icon, Gtk.SignalFunc cb, IntPtr user_data, int position)
- {
- GtkSharp.SignalFuncWrapper cb_wrapper = new GtkSharp.SignalFuncWrapper (cb);
- IntPtr ntext = GLib.Marshaller.StringToPtrGStrdup (text);
- IntPtr ntiptext = GLib.Marshaller.StringToPtrGStrdup (tooltip_text);
- IntPtr ntipprivtext = GLib.Marshaller.StringToPtrGStrdup (tooltip_private_text);
- IntPtr raw_ret = gtk_toolbar_insert_element (Handle, (int) type, widget == null ? IntPtr.Zero : widget.Handle, ntext, ntiptext, ntipprivtext, icon == null ? IntPtr.Zero : icon.Handle, cb_wrapper.NativeDelegate, user_data, position);
- GLib.Marshaller.Free (ntext);
- GLib.Marshaller.Free (ntiptext);
- GLib.Marshaller.Free (ntipprivtext);
- Gtk.Widget ret;
- if (raw_ret == IntPtr.Zero)
- ret = null;
- else {
- ret = (Gtk.Widget) GLib.Object.GetObject (raw_ret);
- g_object_weak_ref (raw_ret, OnWeakNotify, (IntPtr) GCHandle.Alloc (cb_wrapper));
- }
-
- return ret;
- }
-
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr gtk_toolbar_prepend_element (IntPtr raw, int type, IntPtr widget, IntPtr text, IntPtr tooltip_text, IntPtr tooltip_private_text, IntPtr icon, GtkSharp.SignalFuncNative cb, IntPtr user_data);
-
- [Obsolete ("Replaced by ToolItem API")]
- public Gtk.Widget PrependElement (Gtk.ToolbarChildType type, Gtk.Widget widget, string text, string tooltip_text, string tooltip_private_text, Gtk.Widget icon, Gtk.SignalFunc cb)
- {
- GtkSharp.SignalFuncWrapper cb_wrapper = new GtkSharp.SignalFuncWrapper (cb);
- IntPtr ntext = GLib.Marshaller.StringToPtrGStrdup (text);
- IntPtr ntiptext = GLib.Marshaller.StringToPtrGStrdup (tooltip_text);
- IntPtr ntipprivtext = GLib.Marshaller.StringToPtrGStrdup (tooltip_private_text);
- IntPtr raw_ret = gtk_toolbar_prepend_element (Handle, (int) type, widget == null ? IntPtr.Zero : widget.Handle, ntext, ntiptext, ntipprivtext, icon == null ? IntPtr.Zero : icon.Handle, cb_wrapper.NativeDelegate, IntPtr.Zero);
- GLib.Marshaller.Free (ntext);
- GLib.Marshaller.Free (ntiptext);
- GLib.Marshaller.Free (ntipprivtext);
- Gtk.Widget ret;
- if (raw_ret == IntPtr.Zero)
- ret = null;
- else {
- ret = (Gtk.Widget) GLib.Object.GetObject (raw_ret);
- g_object_weak_ref (raw_ret, OnWeakNotify, (IntPtr) GCHandle.Alloc (cb_wrapper));
- }
- return ret;
- }
-
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr gtk_toolbar_append_item (IntPtr raw, IntPtr text, IntPtr tooltip_text, IntPtr tooltip_private_text, IntPtr icon, GtkSharp.SignalFuncNative cb, IntPtr user_data);
-
- [Obsolete ("Replaced by ToolItem API")]
- public Gtk.Widget AppendItem (string text, string tooltip_text, string tooltip_private_text, Gtk.Widget icon, Gtk.SignalFunc cb)
- {
- GtkSharp.SignalFuncWrapper cb_wrapper = new GtkSharp.SignalFuncWrapper (cb);
- IntPtr ntext = GLib.Marshaller.StringToPtrGStrdup (text);
- IntPtr ntiptext = GLib.Marshaller.StringToPtrGStrdup (tooltip_text);
- IntPtr ntipprivtext = GLib.Marshaller.StringToPtrGStrdup (tooltip_private_text);
- IntPtr raw_ret = gtk_toolbar_append_item (Handle, ntext, ntiptext, ntipprivtext, icon == null ? IntPtr.Zero : icon.Handle, cb_wrapper.NativeDelegate, IntPtr.Zero);
- GLib.Marshaller.Free (ntext);
- GLib.Marshaller.Free (ntiptext);
- GLib.Marshaller.Free (ntipprivtext);
- Gtk.Widget ret;
- if (raw_ret == IntPtr.Zero)
- ret = null;
- else {
- ret = (Gtk.Widget) GLib.Object.GetObject(raw_ret);
- g_object_weak_ref (raw_ret, OnWeakNotify, (IntPtr) GCHandle.Alloc (cb_wrapper));
- }
- return ret;
- }
-
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr gtk_toolbar_insert_item (IntPtr raw, IntPtr text, IntPtr tooltip_text, IntPtr tooltip_private_text, IntPtr icon, GtkSharp.SignalFuncNative cb, IntPtr user_data, int position);
-
- [Obsolete ("Replaced by ToolItem API")]
- public Gtk.Widget InsertItem (string text, string tooltip_text, string tooltip_private_text, Gtk.Widget icon, Gtk.SignalFunc cb, IntPtr user_data, int position)
- {
- GtkSharp.SignalFuncWrapper cb_wrapper = new GtkSharp.SignalFuncWrapper (cb);
- IntPtr ntext = GLib.Marshaller.StringToPtrGStrdup (text);
- IntPtr ntiptext = GLib.Marshaller.StringToPtrGStrdup (tooltip_text);
- IntPtr ntipprivtext = GLib.Marshaller.StringToPtrGStrdup (tooltip_private_text);
- IntPtr raw_ret = gtk_toolbar_insert_item (Handle, ntext, ntiptext, ntipprivtext, icon == null ? IntPtr.Zero : icon.Handle, cb_wrapper.NativeDelegate, user_data, position);
- GLib.Marshaller.Free (ntext);
- GLib.Marshaller.Free (ntiptext);
- GLib.Marshaller.Free (ntipprivtext);
- Gtk.Widget ret;
- if (raw_ret == IntPtr.Zero)
- ret = null;
- else {
- ret = (Gtk.Widget) GLib.Object.GetObject(raw_ret);
- g_object_weak_ref (raw_ret, OnWeakNotify, (IntPtr) GCHandle.Alloc (cb_wrapper));
- }
- return ret;
- }
-
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr gtk_toolbar_prepend_item (IntPtr raw, IntPtr text, IntPtr tooltip_text, IntPtr tooltip_private_text, IntPtr icon, GtkSharp.SignalFuncNative cb, IntPtr user_data);
-
- [Obsolete ("Replaced by ToolItem API")]
- public Gtk.Widget PrependItem (string text, string tooltip_text, string tooltip_private_text, Gtk.Widget icon, Gtk.SignalFunc cb)
- {
- GtkSharp.SignalFuncWrapper cb_wrapper = new GtkSharp.SignalFuncWrapper (cb);
- IntPtr ntext = GLib.Marshaller.StringToPtrGStrdup (text);
- IntPtr ntiptext = GLib.Marshaller.StringToPtrGStrdup (tooltip_text);
- IntPtr ntipprivtext = GLib.Marshaller.StringToPtrGStrdup (tooltip_private_text);
- IntPtr raw_ret = gtk_toolbar_prepend_item (Handle, ntext, ntiptext, ntipprivtext, icon == null ? IntPtr.Zero : icon.Handle, cb_wrapper.NativeDelegate, IntPtr.Zero);
- GLib.Marshaller.Free (ntext);
- GLib.Marshaller.Free (ntiptext);
- GLib.Marshaller.Free (ntipprivtext);
- Gtk.Widget ret;
- if (raw_ret == IntPtr.Zero)
- ret = null;
- else {
- ret = (Gtk.Widget) GLib.Object.GetObject(raw_ret);
- g_object_weak_ref (raw_ret, OnWeakNotify, (IntPtr) GCHandle.Alloc (cb_wrapper));
- }
- return ret;
- }
-
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
- static extern IntPtr gtk_toolbar_insert_stock (IntPtr raw, IntPtr stock_id, IntPtr tooltip_text, IntPtr tooltip_private_text, GtkSharp.SignalFuncNative cb, IntPtr user_data, int position);
-
- [Obsolete ("Replaced by ToolItem API")]
- public Gtk.Widget InsertStock (string stock_id, string tooltip_text, string tooltip_private_text, Gtk.SignalFunc cb, int position)
- {
- return InsertStock (stock_id, tooltip_text, tooltip_private_text, cb, IntPtr.Zero, position);
- }
-
- [Obsolete ("Replaced by ToolItem API")]
- public Gtk.Widget InsertStock (string stock_id, string tooltip_text, string tooltip_private_text, Gtk.SignalFunc cb, IntPtr user_data, int position)
- {
- GtkSharp.SignalFuncWrapper cb_wrapper = new GtkSharp.SignalFuncWrapper (cb);
- IntPtr nstock = GLib.Marshaller.StringToPtrGStrdup (stock_id);
- IntPtr ntiptext = GLib.Marshaller.StringToPtrGStrdup (tooltip_text);
- IntPtr ntipprivtext = GLib.Marshaller.StringToPtrGStrdup (tooltip_private_text);
- IntPtr raw_ret = gtk_toolbar_insert_stock (Handle, nstock, ntiptext, ntipprivtext, cb_wrapper.NativeDelegate, user_data, position);
- GLib.Marshaller.Free (nstock);
- GLib.Marshaller.Free (ntiptext);
- GLib.Marshaller.Free (ntipprivtext);
- Gtk.Widget ret;
- if (raw_ret == IntPtr.Zero)
- ret = null;
- else {
- ret = (Gtk.Widget) GLib.Object.GetObject (raw_ret);
- g_object_weak_ref (raw_ret, OnWeakNotify, (IntPtr) GCHandle.Alloc (cb_wrapper));
- }
- return ret;
- }
-
diff --git a/gtk/AboutDialog.custom b/gtk/TreeMenu.cs
similarity index 60%
rename from gtk/AboutDialog.custom
rename to gtk/TreeMenu.cs
index 87a6684e5..d2bf153eb 100644
--- a/gtk/AboutDialog.custom
+++ b/gtk/TreeMenu.cs
@@ -1,11 +1,7 @@
-// AboutDialog.custom - customizations to Gtk.AboutDialog
-//
-// Authors: Mike Kestner
-//
-// Copyright (c) 2007 Novell, Inc.
+// Copyright (c) 2011 Novell, Inc.
//
// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General
+// modify it under the terms of version 2 of the Lesser GNU General
// Public License as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
@@ -18,14 +14,23 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
- [Obsolete("Use ProgramName instead")]
- [GLib.Property ("program-name")]
- public string Name {
- get {
- return ProgramName;
- }
- set {
- ProgramName = value;
+
+using System;
+
+namespace Gtk {
+
+ public partial class TreeMenu {
+
+ public void SetAttributes (CellRenderer cell, params object[] attrs)
+ {
+ if (attrs.Length % 2 != 0)
+ throw new ArgumentException ("attrs should contain pairs of attribute/col");
+
+ ClearAttributes (cell);
+ for (int i = 0; i < attrs.Length - 1; i += 2) {
+ AddAttribute (cell, (string) attrs [i], (int) attrs [i + 1]);
}
}
+ }
+}
diff --git a/gtk/TreeModelSort.custom b/gtk/TreeModelSort.custom
index 9e98ec3d6..d66755b16 100644
--- a/gtk/TreeModelSort.custom
+++ b/gtk/TreeModelSort.custom
@@ -93,18 +93,6 @@
return ret;
}
- [Obsolete ("Replaced by SetSortFunc (int, TreeIterCompareFunc) overload.")]
- public void SetSortFunc (int sort_column_id, TreeIterCompareFunc sort_func, IntPtr user_data, Gtk.DestroyNotify destroy)
- {
- SetSortFunc (sort_column_id, sort_func);
- }
-
- [Obsolete ("Replaced by DefaultSortFunc property.")]
- public void SetDefaultSortFunc (TreeIterCompareFunc sort_func, IntPtr user_data, Gtk.DestroyNotify destroy)
- {
- DefaultSortFunc = sort_func;
- }
-
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RowsReorderedSignalDelegate (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch);
@@ -160,18 +148,9 @@
OverrideVirtualMethod (gtype, "rows_reordered", RowsReorderedVMCallback);
}
- [Obsolete ("Replaced by int[] new_order overload.")]
- [GLib.DefaultSignalHandler(Type=typeof(Gtk.TreeModelSort), ConnectionMethod="OverrideRowsReordered")]
- protected virtual void OnRowsReordered (Gtk.TreePath path, Gtk.TreeIter iter, out int new_order)
- {
- new_order = -1;
- }
-
[GLib.DefaultSignalHandler(Type=typeof(Gtk.TreeModelSort), ConnectionMethod="OverrideRowsReordered")]
protected virtual void OnRowsReordered (Gtk.TreePath path, Gtk.TreeIter iter, int[] new_order)
{
- int dummy;
- OnRowsReordered (path, iter, out dummy);
GLib.Value ret = GLib.Value.Empty;
GLib.ValueArray inst_and_params = new GLib.ValueArray (4);
GLib.Value[] vals = new GLib.Value [4];
diff --git a/gtk/TreeSelection.custom b/gtk/TreeSelection.custom
index b85d0ec83..eb23beba4 100644
--- a/gtk/TreeSelection.custom
+++ b/gtk/TreeSelection.custom
@@ -32,12 +32,6 @@
return (TreePath[]) GLib.Marshaller.ListToArray (list, typeof (Gtk.TreePath));
}
- [Obsolete ("Replaced by SelectFunction property.")]
- public void SetSelectFunction (Gtk.TreeSelectionFunc func, IntPtr data, Gtk.DestroyNotify destroy)
- {
- SelectFunction = func;
- }
-
[DllImport ("libgtk-win32-2.0-0.dll", EntryPoint="gtk_tree_selection_get_selected", CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_selection_get_selected_without_model (IntPtr raw, IntPtr model, out Gtk.TreeIter iter);
diff --git a/gtk/TreeSortableAdapter.custom b/gtk/TreeSortableAdapter.custom
deleted file mode 100644
index f133a4e84..000000000
--- a/gtk/TreeSortableAdapter.custom
+++ /dev/null
@@ -1,36 +0,0 @@
-// Gtk.TreeSortableAdapter.Custom - Gtk TreeSortableAdapter class customizations
-//
-// Author: Mike Kestner
-//
-// Copyright (c) 2007 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
- [Obsolete ("Replaced by SetSortFunc (int, TreeIterCompareFunc) overload.")]
- public void SetSortFunc (int sort_column_id, TreeIterCompareFunc sort_func, IntPtr user_data, Gtk.DestroyNotify destroy)
- {
- SetSortFunc (sort_column_id, sort_func);
- }
-
- [Obsolete ("Replaced by DefaultSortFunc property.")]
- public void SetDefaultSortFunc (TreeIterCompareFunc sort_func, IntPtr user_data, Gtk.DestroyNotify destroy)
- {
- DefaultSortFunc = sort_func;
- }
-
-
diff --git a/gtk/TreeStore.custom b/gtk/TreeStore.custom
index 486a3c401..57d4cfb64 100644
--- a/gtk/TreeStore.custom
+++ b/gtk/TreeStore.custom
@@ -29,20 +29,6 @@
[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_append (IntPtr raw, out TreeIter iter, IntPtr parent);
- [Obsolete ("Replaced by AppendNode")]
- public TreeIter Append (TreeIter parent)
- {
- TreeIter iter;
- gtk_tree_store_append (Handle, out iter, ref parent);
- return iter;
- }
-
- [Obsolete ("Replaced by AppendNode")]
- public void Append (out TreeIter iter)
- {
- gtk_tree_store_append (Handle, out iter, IntPtr.Zero);
- }
-
public TreeIter AppendNode ()
{
TreeIter iter;
@@ -63,20 +49,6 @@
[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_insert (IntPtr raw, out TreeIter iter, IntPtr parent, int position);
- [Obsolete ("Replaced by InsertNode")]
- public TreeIter Insert (TreeIter parent, int position)
- {
- TreeIter iter;
- gtk_tree_store_insert (Handle, out iter, ref parent, position);
- return iter;
- }
-
- [Obsolete ("Replaced by InsertNode")]
- public void Insert (out TreeIter iter, int position)
- {
- gtk_tree_store_insert (Handle, out iter, IntPtr.Zero, position);
- }
-
public TreeIter InsertNode (TreeIter parent, int position)
{
TreeIter iter;
@@ -97,20 +69,6 @@
[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_prepend (IntPtr raw, out TreeIter iter, IntPtr parent);
- [Obsolete ("Replaced by PrependNode")]
- public TreeIter Prepend(TreeIter parent)
- {
- TreeIter iter;
- gtk_tree_store_prepend (Handle, out iter, ref parent);
- return iter;
- }
-
- [Obsolete ("Replaced by PrependNode")]
- public void Prepend (out TreeIter iter)
- {
- gtk_tree_store_append (Handle, out iter, IntPtr.Zero);
- }
-
public TreeIter PrependNode (TreeIter parent)
{
TreeIter iter;
@@ -131,20 +89,6 @@
[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_insert_before (IntPtr raw, out TreeIter iter, IntPtr parent, ref TreeIter sibling);
- [Obsolete ("Replaced by InsertNodeBefore")]
- public TreeIter InsertBefore (TreeIter parent, TreeIter sibling)
- {
- TreeIter iter;
- gtk_tree_store_insert_before (Handle, out iter, ref parent, ref sibling);
- return iter;
- }
-
- [Obsolete ("Replaced by InsertNodeBefore")]
- public void InsertBefore (out TreeIter iter, TreeIter sibling)
- {
- gtk_tree_store_insert_before (Handle, out iter, IntPtr.Zero, ref sibling);
- }
-
public TreeIter InsertNodeBefore (TreeIter sibling)
{
TreeIter iter;
@@ -165,20 +109,6 @@
[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_insert_after (IntPtr raw, out TreeIter iter, IntPtr parent, ref TreeIter sibling);
- [Obsolete ("Replaced by InsertNodeAfter")]
- public TreeIter InsertAfter (TreeIter parent, TreeIter sibling)
- {
- TreeIter iter;
- gtk_tree_store_insert_after (Handle, out iter, ref parent, ref sibling);
- return iter;
- }
-
- [Obsolete ("Replaced by InsertNodeAfter")]
- public void InsertAfter (out TreeIter iter, TreeIter sibling)
- {
- gtk_tree_store_insert_after (Handle, out iter, IntPtr.Zero, ref sibling);
- }
-
public TreeIter InsertNodeAfter (TreeIter sibling)
{
TreeIter iter;
@@ -377,12 +307,6 @@
ColumnTypes = gtypes;
}
- [Obsolete ("Replaced by ColumnTypes property.")]
- public void SetColumnTypes (GLib.GType[] types)
- {
- ColumnTypes = types;
- }
-
public object GetValue (Gtk.TreeIter iter, int column) {
GLib.Value val = GLib.Value.Empty;
GetValue (iter, column, ref val);
@@ -391,18 +315,6 @@
return ret;
}
- [Obsolete ("Replaced by SetSortFunc (int, TreeIterCompareFunc) overload.")]
- public void SetSortFunc (int sort_column_id, TreeIterCompareFunc sort_func, IntPtr user_data, Gtk.DestroyNotify destroy)
- {
- SetSortFunc (sort_column_id, sort_func);
- }
-
- [Obsolete ("Replaced by DefaultSortFunc property.")]
- public void SetDefaultSortFunc (TreeIterCompareFunc sort_func, IntPtr user_data, Gtk.DestroyNotify destroy)
- {
- DefaultSortFunc = sort_func;
- }
-
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RowsReorderedSignalDelegate (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch);
@@ -458,18 +370,9 @@
OverrideVirtualMethod (gtype, "rows_reordered", RowsReorderedVMCallback);
}
- [Obsolete ("Replaced by int[] new_order overload.")]
- [GLib.DefaultSignalHandler(Type=typeof(Gtk.TreeStore), ConnectionMethod="OverrideRowsReordered")]
- protected virtual void OnRowsReordered (Gtk.TreePath path, Gtk.TreeIter iter, out int new_order)
- {
- new_order = -1;
- }
-
[GLib.DefaultSignalHandler(Type=typeof(Gtk.TreeStore), ConnectionMethod="OverrideRowsReordered")]
protected virtual void OnRowsReordered (Gtk.TreePath path, Gtk.TreeIter iter, int[] new_order)
{
- int dummy;
- OnRowsReordered (path, iter, out dummy);
GLib.Value ret = GLib.Value.Empty;
GLib.ValueArray inst_and_params = new GLib.ValueArray (4);
GLib.Value[] vals = new GLib.Value [4];
diff --git a/gtk/TreeView.custom b/gtk/TreeView.custom
index a971cab58..a57774fa4 100644
--- a/gtk/TreeView.custom
+++ b/gtk/TreeView.custom
@@ -24,9 +24,6 @@
// Boston, MA 02111-1307, USA.
- [Obsolete ("Use NodeView with NodeStores")]
- public TreeView (NodeStore store) : this (store == null ? null : store.Adapter) {}
-
public Gdk.Color OddRowColor {
get {
GLib.Value value = StyleGetPropertyValue ("odd-row-color");
@@ -151,25 +148,3 @@
return InsertColumn (col, pos);
}
- [Obsolete ("Replaced by SearchEqualFunc property.")]
- public void SetSearchEqualFunc (TreeViewSearchEqualFunc search_equal_func, IntPtr search_user_data, DestroyNotify search_destroy)
- {
- SearchEqualFunc = search_equal_func;
- }
-
- [Obsolete ("Replaced by DestroyCountFunc property.")]
- public void SetDestroyCountFunc (TreeDestroyCountFunc func, IntPtr data, DestroyNotify destroy)
- {
- DestroyCountFunc = func;
- }
-
- [Obsolete ("Replaced by ColumnDragFunction property.")]
- public void SetColumnDragFunction (TreeViewColumnDropFunc func, IntPtr user_data, DestroyNotify destroy)
- {
- ColumnDragFunction = func;
- }
-
- [Obsolete ("Replaced by VisibleRect property.")]
- public void GetVisibleRect(Gdk.Rectangle visible_rect) {
- ;
- }
diff --git a/gtk/TreeViewColumn.custom b/gtk/TreeViewColumn.custom
index a5acfa1a6..990246e2c 100644
--- a/gtk/TreeViewColumn.custom
+++ b/gtk/TreeViewColumn.custom
@@ -78,9 +78,3 @@
gtk_cell_layout_set_cell_data_func (Handle, cell_renderer == null ? IntPtr.Zero : cell_renderer.Handle, func_wrapper.NativeDelegate, (IntPtr) gch, GLib.DestroyHelper.NotifyHandler);
}
- [Obsolete ("Replaced by SetCellDataFunc (CellRenderer, TreeCellDataFunc) overload")]
- public void SetCellDataFunc (Gtk.CellRenderer cell_renderer, Gtk.TreeCellDataFunc func, IntPtr func_data, Gtk.DestroyNotify destroy)
- {
- SetCellDataFunc (cell_renderer, func);
- }
-
diff --git a/gtk/Widget.custom b/gtk/Widget.custom
index e2433bcf6..6f23fce90 100644
--- a/gtk/Widget.custom
+++ b/gtk/Widget.custom
@@ -24,24 +24,6 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
-public override void Destroy ()
-{
- base.Destroy ();
-}
-
-protected override void CreateNativeObject (string[] names, GLib.Value[] vals)
-{
- base.CreateNativeObject (names, vals);
-}
-
-[DllImport("gtksharpglue-3")]
-static extern IntPtr gtksharp_gtk_widget_get_allocation (IntPtr style);
-
-public Gdk.Rectangle Allocation {
- get { return Gdk.Rectangle.New (gtksharp_gtk_widget_get_allocation (Handle)); }
- set { SizeAllocate (value); }
-}
-
[DllImport ("gtksharpglue-3")]
static extern void gtksharp_gtk_widget_set_window (IntPtr widget, IntPtr window);
public Gdk.Window GdkWindow {
@@ -60,111 +42,6 @@ public void AddAccelerator (string accel_signal, AccelGroup accel_group, AccelKe
}
-[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
-static extern void gtk_widget_set_state (IntPtr raw, int state);
-
-[DllImport("gtksharpglue-3")]
-static extern int gtksharp_gtk_widget_get_state (IntPtr raw);
-
-public Gtk.StateType State {
- set {
- gtk_widget_set_state (Handle, (int) value);
- }
- get {
- return (Gtk.StateType) gtksharp_gtk_widget_get_state (Handle);
- }
-}
-
-[DllImport("gtksharpglue-3")]
-static extern int gtksharp_gtk_widget_get_flags (IntPtr raw);
-
-[DllImport("gtksharpglue-3")]
-static extern void gtksharp_gtk_widget_set_flags (IntPtr raw, int flags);
-
-[Obsolete]
-public int Flags {
- get {
- return gtksharp_gtk_widget_get_flags (Handle);
- }
- set {
- gtksharp_gtk_widget_set_flags (Handle, (int) value);
- }
-}
-
-public WidgetFlags WidgetFlags {
- get {
- return (WidgetFlags) gtksharp_gtk_widget_get_flags (Handle);
- }
- set {
- gtksharp_gtk_widget_set_flags (Handle, (int) value);
- }
-}
-
-public void SetFlag (WidgetFlags flag)
-{
- Flags |= (int)flag;
-}
-
-public void ClearFlag (WidgetFlags flag)
-{
- Flags &= ~((int)flag);
-}
-
-public bool IsMapped {
- get {
- return ((Flags & (int)Gtk.WidgetFlags.Mapped) != 0);
- }
-}
-
-public bool IsRealized {
- get {
- return ((Flags & (int)Gtk.WidgetFlags.Realized) != 0);
- }
-}
-
-public bool IsNoWindow {
- get {
- return ((Flags & (int)Gtk.WidgetFlags.NoWindow) != 0);
- }
-}
-
-public bool IsTopLevel {
- get {
- return ((Flags & (int)Gtk.WidgetFlags.Toplevel) != 0);
- }
-}
-
-public bool HasGrab {
- get {
- return ((Flags & (int)Gtk.WidgetFlags.HasGrab) != 0);
- }
-}
-
-public bool IsCompositeChild {
- get {
- return ((Flags & (int)Gtk.WidgetFlags.CompositeChild) != 0);
- }
-}
-
-public bool IsAppPaintable {
- get {
- return ((Flags & (int)Gtk.WidgetFlags.AppPaintable) != 0);
- }
-}
-
-public bool IsDoubleBuffered {
- get {
- return ((Flags & (int)Gtk.WidgetFlags.DoubleBuffered) != 0);
- }
-}
-
-
-public bool IsDrawable {
- get {
- return (Visible && IsMapped);
- }
-}
-
public int FocusLineWidth {
get {
return (int) StyleGetProperty ("focus-line-width");
@@ -210,45 +87,6 @@ static uint RegisterSignal (string signal_name, GLib.GType gtype, GLib.Signal.Fl
}
}
-static void SetScrollAdjustmentsMarshal_cb (IntPtr closure, IntPtr return_val, uint n_param_vals, IntPtr param_values, IntPtr invocation_hint, IntPtr marshal_data)
-{
- try {
- GLib.Value[] inst_and_params = new GLib.Value [n_param_vals];
- int gvalue_size = Marshal.SizeOf (typeof (GLib.Value));
- for (int idx = 0; idx < n_param_vals; idx++)
- inst_and_params [idx] = (GLib.Value) Marshal.PtrToStructure (new IntPtr (param_values.ToInt64 () + idx * gvalue_size), typeof (GLib.Value));
-
- Widget inst;
- try {
- inst = inst_and_params [0].Val as Widget;
- } catch (GLib.MissingIntPtrCtorException) {
- return;
- }
- Gtk.Adjustment h = inst_and_params [1].Val as Gtk.Adjustment;
- Gtk.Adjustment v = inst_and_params [2].Val as Gtk.Adjustment;
- inst.OnSetScrollAdjustments (h, v);
- } catch (Exception e) {
- GLib.ExceptionManager.RaiseUnhandledException (e, false);
- }
-}
-
-static ClosureMarshal SetScrollAdjustmentsMarshalCallback;
-
-static void ConnectSetScrollAdjustments (GLib.GType gtype)
-{
- if (SetScrollAdjustmentsMarshalCallback == null)
- SetScrollAdjustmentsMarshalCallback = new ClosureMarshal (SetScrollAdjustmentsMarshal_cb);
-
- GtkWidgetClass klass = GetClassStruct (gtype, false);
- klass.SetScrollAdjustmentsSignal = RegisterSignal ("set_scroll_adjustments", gtype, GLib.Signal.Flags.RunLast, GLib.GType.None, new GLib.GType [] {Adjustment.GType, Adjustment.GType}, SetScrollAdjustmentsMarshalCallback);
- OverrideClassStruct (gtype, klass);
-}
-
-[GLib.DefaultSignalHandler (Type=typeof (Gtk.Widget), ConnectionMethod="ConnectSetScrollAdjustments")]
-protected virtual void OnSetScrollAdjustments (Gtk.Adjustment hadj, Gtk.Adjustment vadj)
-{
-}
-
static void ActivateMarshal_cb (IntPtr raw_closure, IntPtr return_val, uint n_param_vals, IntPtr param_values, IntPtr invocation_hint, IntPtr marshal_data)
{
try {
@@ -460,3 +298,141 @@ public void Path (out string path, out string path_reversed)
Path (out len, out path, out path_reversed);
}
+
+// Code from Object.custom in 2.x
+// Object is gone in 3.x
+
+ static Hashtable destroy_handlers;
+ static Hashtable DestroyHandlers {
+ get {
+ if (destroy_handlers == null)
+ destroy_handlers = new Hashtable ();
+ return destroy_handlers;
+ }
+ }
+
+ private static void OverrideDestroyed (GLib.GType gtype)
+ {
+ // Do Nothing. We don't want to hook into the native vtable.
+ // We will manually invoke the VM on signal invocation. The signal
+ // always raises before the default handler because this signal
+ // is RUN_CLEANUP.
+ }
+
+ [GLib.DefaultSignalHandler(Type=typeof(Gtk.Widget), ConnectionMethod="OverrideDestroyed")]
+ protected virtual void OnDestroyed ()
+ {
+ if (DestroyHandlers.Contains (Handle)) {
+ EventHandler handler = (EventHandler) DestroyHandlers [Handle];
+ handler (this, EventArgs.Empty);
+ DestroyHandlers.Remove (Handle);
+ }
+ }
+
+ [GLib.Signal("destroy")]
+ public event EventHandler Destroyed {
+ add {
+ EventHandler handler = (EventHandler) DestroyHandlers [Handle];
+ DestroyHandlers [Handle] = Delegate.Combine (handler, value);
+ }
+ remove {
+ EventHandler handler = (EventHandler) DestroyHandlers [Handle];
+ handler = (EventHandler) Delegate.Remove (handler, value);
+ if (handler != null)
+ DestroyHandlers [Handle] = handler;
+ else
+ DestroyHandlers.Remove (Handle);
+ }
+ }
+
+ event EventHandler InternalDestroyed {
+ add {
+ GLib.Signal sig = GLib.Signal.Lookup (this, "destroy");
+ sig.AddDelegate (value);
+ }
+ remove {
+ GLib.Signal sig = GLib.Signal.Lookup (this, "destroy");
+ sig.RemoveDelegate (value);
+ }
+ }
+
+ static void NativeDestroy (object o, EventArgs args)
+ {
+ Gtk.Widget widget = o as Gtk.Widget;
+ if (widget == null)
+ return;
+ widget.OnDestroyed ();
+ }
+
+ static EventHandler native_destroy_handler;
+ static EventHandler NativeDestroyHandler {
+ get {
+ if (native_destroy_handler == null)
+ native_destroy_handler = new EventHandler (NativeDestroy);
+ return native_destroy_handler;
+ }
+ }
+
+ protected override void CreateNativeObject (string[] names, GLib.Value[] vals)
+ {
+ base.CreateNativeObject (names, vals);
+ }
+
+ public override void Dispose ()
+ {
+ if (Handle == IntPtr.Zero)
+ return;
+ InternalDestroyed -= NativeDestroyHandler;
+ base.Dispose ();
+ }
+
+ [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ private static extern void g_object_ref_sink (IntPtr raw);
+
+ protected override IntPtr Raw {
+ get {
+ return base.Raw;
+ }
+ set {
+ if (value != IntPtr.Zero)
+ g_object_ref_sink (value);
+ base.Raw = value;
+ if (value != IntPtr.Zero)
+ InternalDestroyed += NativeDestroyHandler;
+ }
+ }
+
+ [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ private static extern void gtk_widget_destroy (IntPtr raw);
+
+ public virtual void Destroy ()
+ {
+ if (Handle == IntPtr.Zero)
+ return;
+ gtk_widget_destroy (Handle);
+ InternalDestroyed -= NativeDestroyHandler;
+ }
+
+ [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ static extern bool g_object_is_floating (IntPtr raw);
+
+ [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ static extern void g_object_force_floating (IntPtr raw);
+
+ [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ static extern void g_object_unref (IntPtr raw);
+
+ public bool IsFloating {
+ get {
+ return g_object_is_floating (Handle);
+ }
+ set {
+ if (value == true) {
+ if (!IsFloating)
+ g_object_force_floating (Handle);
+ } else {
+ g_object_ref_sink (Handle);
+ g_object_unref (Handle);
+ }
+ }
+ }
diff --git a/gtk/glue/cellrenderer.c b/gtk/glue/cellrenderer.c
index 623c11c18..b63bf46a1 100644
--- a/gtk/glue/cellrenderer.c
+++ b/gtk/glue/cellrenderer.c
@@ -21,7 +21,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include
+#include
const gchar *__gtype_prefix = "__gtksharp_";
#define HAS_PREFIX(a) (*((guint64 *)(a)) == *((guint64 *) __gtype_prefix))
diff --git a/gtk/glue/container.c b/gtk/glue/container.c
index dac5e0f56..b9c7b75b2 100644
--- a/gtk/glue/container.c
+++ b/gtk/glue/container.c
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include
+#include
void gtksharp_container_base_forall (GtkContainer *container, gboolean include_internals, GtkCallback cb, gpointer data);
diff --git a/gtk/glue/style.c b/gtk/glue/style.c
index d62e062d0..c3ff48fb7 100644
--- a/gtk/glue/style.c
+++ b/gtk/glue/style.c
@@ -20,45 +20,9 @@
* Boston, MA 02111-1307, USA.
*/
-#include
+#include
/* Forward declarations */
-GdkGC *gtksharp_gtk_style_get_white_gc (GtkStyle *style);
-
-GdkGC *gtksharp_gtk_style_get_black_gc (GtkStyle *style);
-
-GdkGC *gtksharp_gtk_style_get_fg_gc (GtkStyle *style, int i);
-
-GdkGC *gtksharp_gtk_style_get_bg_gc (GtkStyle *style, int i);
-
-GdkGC *gtksharp_gtk_style_get_base_gc (GtkStyle *style, int i);
-
-GdkGC *gtksharp_gtk_style_get_text_gc (GtkStyle *style, int i);
-
-GdkGC *gtksharp_gtk_style_get_text_aa_gc (GtkStyle *style, int i);
-
-GdkGC *gtksharp_gtk_style_get_light_gc (GtkStyle *style, int i);
-
-GdkGC *gtksharp_gtk_style_get_dark_gc (GtkStyle *style, int i);
-
-GdkGC *gtksharp_gtk_style_get_mid_gc (GtkStyle *style, int i);
-
-void gtksharp_gtk_style_set_fg_gc (GtkStyle *style, int i, GdkGC *gc);
-
-void gtksharp_gtk_style_set_bg_gc (GtkStyle *style, int i, GdkGC *gc);
-
-void gtksharp_gtk_style_set_base_gc (GtkStyle *style, int i, GdkGC *gc);
-
-void gtksharp_gtk_style_set_text_gc (GtkStyle *style, int i, GdkGC *gc);
-
-void gtksharp_gtk_style_set_text_aa_gc (GtkStyle *style, int i, GdkGC *gc);
-
-void gtksharp_gtk_style_set_light_gc (GtkStyle *style, int i, GdkGC *gc);
-
-void gtksharp_gtk_style_set_dark_gc (GtkStyle *style, int i, GdkGC *gc);
-
-void gtksharp_gtk_style_set_mid_gc (GtkStyle *style, int i, GdkGC *gc);
-
GdkColor *gtksharp_gtk_style_get_fg (GtkStyle *style, int i);
GdkColor *gtksharp_gtk_style_get_bg (GtkStyle *style, int i);
@@ -79,133 +43,8 @@ int gtksharp_gtk_style_get_thickness (GtkStyle *style, int x);
void gtksharp_gtk_style_set_thickness (GtkStyle *style, int thickness);
-GdkPixmap *gtksharp_gtk_style_get_bg_pixmap (GtkStyle *style, int i);
-
-void gtksharp_gtk_style_set_bg_pixmap (GtkStyle *style, int i, GdkPixmap *pixmap);
-
/* */
-/* FIXME: include all fields */
-
-GdkGC*
-gtksharp_gtk_style_get_white_gc (GtkStyle *style)
-{
- g_object_ref (G_OBJECT (style->white_gc));
- return style->white_gc;
-}
-
-GdkGC*
-gtksharp_gtk_style_get_black_gc (GtkStyle *style)
-{
- g_object_ref (G_OBJECT (style->black_gc));
- return style->black_gc;
-}
-
-GdkGC*
-gtksharp_gtk_style_get_fg_gc (GtkStyle *style, int i)
-{
- g_object_ref (G_OBJECT (style->fg_gc[i]));
- return style->fg_gc[i];
-}
-
-GdkGC*
-gtksharp_gtk_style_get_bg_gc (GtkStyle *style, int i)
-{
- g_object_ref (G_OBJECT (style->bg_gc[i]));
- return style->bg_gc[i];
-}
-
-GdkGC*
-gtksharp_gtk_style_get_base_gc (GtkStyle *style, int i)
-{
- g_object_ref (G_OBJECT (style->base_gc[i]));
- return style->base_gc[i];
-}
-
-GdkGC*
-gtksharp_gtk_style_get_text_gc (GtkStyle *style, int i)
-{
- g_object_ref (G_OBJECT (style->text_gc[i]));
- return style->text_gc[i];
-}
-
-GdkGC*
-gtksharp_gtk_style_get_text_aa_gc (GtkStyle *style, int i)
-{
- g_object_ref (G_OBJECT (style->text_aa_gc[i]));
- return style->text_aa_gc[i];
-}
-
-GdkGC*
-gtksharp_gtk_style_get_light_gc (GtkStyle *style, int i)
-{
- g_object_ref (G_OBJECT (style->light_gc[i]));
- return style->light_gc[i];
-}
-
-GdkGC*
-gtksharp_gtk_style_get_dark_gc (GtkStyle *style, int i)
-{
- g_object_ref (G_OBJECT (style->dark_gc[i]));
- return style->dark_gc[i];
-}
-
-GdkGC*
-gtksharp_gtk_style_get_mid_gc (GtkStyle *style, int i)
-{
- g_object_ref (G_OBJECT (style->mid_gc[i]));
- return style->mid_gc[i];
-}
-
-void
-gtksharp_gtk_style_set_fg_gc (GtkStyle *style, int i, GdkGC *gc)
-{
- g_object_ref (G_OBJECT (gc));
- style->fg_gc[i] = gc;
-}
-
-void
-gtksharp_gtk_style_set_bg_gc (GtkStyle *style, int i, GdkGC *gc)
-{
- g_object_ref (G_OBJECT (gc));
- style->bg_gc[i] = gc;
-}
-
-void
-gtksharp_gtk_style_set_base_gc (GtkStyle *style, int i, GdkGC *gc)
-{
- g_object_ref (G_OBJECT (gc));
- style->base_gc[i] = gc;
-}
-
-void
-gtksharp_gtk_style_set_text_gc (GtkStyle *style, int i, GdkGC *gc)
-{
- g_object_ref (G_OBJECT (gc));
- style->text_gc[i] = gc;
-}
-
-void
-gtksharp_gtk_style_set_text_aa_gc (GtkStyle *style, int i, GdkGC *gc)
-{
- g_object_ref (G_OBJECT (gc));
- style->text_aa_gc[i] = gc;
-}
-
-void
-gtksharp_gtk_style_set_light_gc (GtkStyle *style, int i, GdkGC *gc)
-{
- g_object_ref (G_OBJECT (gc));
- style->light_gc[i] = gc;
-}
-
-void
-gtksharp_gtk_style_set_dark_gc (GtkStyle *style, int i, GdkGC *gc)
-{
- g_object_ref (G_OBJECT (gc));
- style->dark_gc[i] = gc;
-}
-
GdkColor*
gtksharp_gtk_style_get_fg (GtkStyle *style, int i)
{
@@ -272,15 +111,4 @@ gtksharp_gtk_style_set_thickness (GtkStyle *style, int thickness)
style->ythickness = -thickness;
}
-GdkPixmap *
-gtksharp_gtk_style_get_bg_pixmap (GtkStyle *style, int i)
-{
- return style->bg_pixmap[i];
-}
-
-void gtksharp_gtk_style_set_bg_pixmap (GtkStyle *style, int i, GdkPixmap *pixmap)
-{
- g_object_ref (G_OBJECT (pixmap));
- style->bg_pixmap[i] = pixmap;
-}
diff --git a/gtk/glue/widget.c b/gtk/glue/widget.c
index 19066400c..2ea950fe4 100644
--- a/gtk/glue/widget.c
+++ b/gtk/glue/widget.c
@@ -21,46 +21,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include
-#include
+#include
/* Forward declarations */
-GdkRectangle *gtksharp_gtk_widget_get_allocation (GtkWidget *widget);
-void gtksharp_gtk_widget_set_window (GtkWidget *widget, GdkWindow *window);
-int gtksharp_gtk_widget_get_state (GtkWidget *widget);
-int gtksharp_gtk_widget_get_flags (GtkWidget *widget);
-void gtksharp_gtk_widget_set_flags (GtkWidget *widget, int flags);
-/* */
-
-GdkRectangle*
-gtksharp_gtk_widget_get_allocation (GtkWidget *widget)
-{
- return &widget->allocation;
-}
-
-void
-gtksharp_gtk_widget_set_window (GtkWidget *widget, GdkWindow *window)
-{
- if (widget->window)
- g_object_unref (widget->window);
- widget->window = g_object_ref (window);
-}
-
-int
-gtksharp_gtk_widget_get_state (GtkWidget *widget)
-{
- return GTK_WIDGET_STATE (widget);
-}
-
-int
-gtksharp_gtk_widget_get_flags (GtkWidget *widget)
-{
- return GTK_WIDGET_FLAGS (widget);
-}
-
-void
-gtksharp_gtk_widget_set_flags (GtkWidget *widget, int flags)
-{
- GTK_OBJECT(widget)->flags = flags;
-}
diff --git a/gtk/gtk-api.raw b/gtk/gtk-api.raw
index d0be18c43..524eb6ccc 100644
--- a/gtk/gtk-api.raw
+++ b/gtk/gtk-api.raw
@@ -6,37 +6,22 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
@@ -51,12 +36,19 @@
+
+
+
+
+
+
+
@@ -66,10 +58,10 @@
+
-
-
+
@@ -88,7 +80,6 @@
-
@@ -113,10 +104,8 @@
-
-
-
-
+
+
@@ -131,6 +120,7 @@
+
@@ -151,7 +141,6 @@
-
@@ -169,6 +158,10 @@
+
+
+
+
@@ -190,6 +183,7 @@
+
@@ -237,8 +231,6 @@
-
-
@@ -246,19 +238,33 @@
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -273,11 +279,6 @@
-
-
-
-
-
@@ -304,12 +305,6 @@
-
-
-
-
-
-
@@ -359,10 +354,6 @@
-
-
-
-
@@ -402,6 +393,7 @@
+
@@ -420,23 +412,13 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -519,6 +501,13 @@
+
+
+
+
+
+
+
@@ -568,12 +557,15 @@
+
+
+
+
-
@@ -587,26 +579,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -624,20 +610,23 @@
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
@@ -658,6 +647,7 @@
+
@@ -668,12 +658,20 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -717,6 +715,7 @@
+
@@ -724,37 +723,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -811,16 +779,7 @@
-
-
-
-
-
-
-
-
-
@@ -884,13 +843,20 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
-
-
@@ -985,12 +951,6 @@
-
-
-
-
-
-
@@ -1007,12 +967,6 @@
-
-
-
-
-
-
@@ -1021,25 +975,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1048,21 +983,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1101,16 +1021,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1118,19 +1028,12 @@
-
-
-
-
-
-
-
-
+
@@ -1171,8 +1074,13 @@
-
-
+
+
+
+
+
+
+
@@ -1247,6 +1155,14 @@
+
+
+
+
+
+
+
+
@@ -1337,16 +1253,73 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1515,18 +1488,18 @@
-
-
+
+
-
+
-
-
+
+
-
+
@@ -1560,6 +1533,7 @@
+
@@ -1613,6 +1587,10 @@
+
+
+
+
@@ -1630,6 +1608,9 @@
+
+
+
@@ -1675,7 +1656,7 @@
-
+
@@ -1785,8 +1766,8 @@
-
-
+
+
@@ -1806,8 +1787,8 @@
-
-
+
+
@@ -1842,43 +1823,12 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1963,6 +1913,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1989,6 +1959,9 @@
+
+
+
@@ -2112,6 +2085,12 @@
+
+
+
+
+
+
@@ -2232,6 +2211,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2247,6 +2243,7 @@
+
@@ -2298,6 +2295,9 @@
+
+
+
@@ -2332,27 +2332,9 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2413,10 +2395,18 @@
-
-
+
+
+
+
+
+
+
+
+
+
@@ -2453,9 +2443,6 @@
-
-
-
@@ -2536,12 +2523,6 @@
-
-
-
-
-
-
@@ -2578,6 +2559,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2586,6 +2664,10 @@
+
+
+
+
@@ -2607,6 +2689,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2619,6 +2720,15 @@
+
+
+
+
+
+
+
+
+
@@ -2728,6 +2838,7 @@
+
@@ -2812,6 +2923,12 @@
+
+
+
+
+
+
@@ -2974,6 +3091,12 @@
+
+
+
+
+
+
@@ -3054,16 +3177,16 @@
-
-
+
+
-
-
+
+
@@ -3115,17 +3238,25 @@
-