6bf7376094
anonymous function pointer types in method signatures. Before, we added a <callback> child to the <parameters> node, but the generator just ignored it. Now we add the callback (with a made-up name) to the toplevel node, and add an ordinary <param> node referencing it to the <parameters> node. Also, if the last param of the callback is a gpointer, rename it from "arg#" to "data" so it will be treated correctly (as the user data passed from the calling method). [Fixes #66241] * art/art-api.raw: * gdk/gdk-api-2.4.raw: * gdk/gdk-api-2.6.raw: Regen * generator/Parameters.cs (IsHidden): loosen the definition of hideable user_data; it doesn't have to occur at the end of the parameter list, as long as there's a callback arg before it. * generator/MethodBody.cs (GetCallString): Use Parameters.IsHidden to decide whether or not to squash user_data params, rather than trying to duplicate its logic. As a side effect, this also causes a handful of methods that take non-hidden IntPtr arguments to start actually passing those arguments to C rather than always passing IntPtr.Zero. * generator/Method.cs (Equals, GetHashCode): Remove unnecessary and possibly erroneous hashing overrides. * gtk/Gtk.metadata: Hide Gtk.Container.ForeachFull, since it's useless and wasn't in gtk# 1.0 * gtk/Menu.custom (Popup): * gtk/TextIter.custom (ForwardFindChar, BackwardFindChar): * gnome/App.custom (CreateMenusInterp, InsertMenusInterp, CreateToolbarInterp): * gnome/Client.custom (RequestInteractionInterp): * gnome/Popup.custom (MenuDoPopupModal, MenuDoPopup): Add [Obsolete] compat overloads for methods that have now lost a useless IntPtr. svn path=/trunk/gtk-sharp/; revision=47566
91 lines
3 KiB
Text
Executable file
91 lines
3 KiB
Text
Executable file
// TextIter.custom - customizations to Gtk.TextIter
|
|
//
|
|
// Authors: Mike Kestner <mkestner@ximian.com>
|
|
//
|
|
// Copyright (c) 2004 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.
|
|
|
|
|
|
[DllImport("glibsharpglue-2")]
|
|
static extern IntPtr gtksharp_unichar_to_utf8_string (int raw);
|
|
|
|
[DllImport("libgtk-win32-2.0-0.dll")]
|
|
static extern int gtk_text_iter_get_char(ref Gtk.TextIter raw);
|
|
|
|
public string Char {
|
|
get {
|
|
IntPtr raw_ret = gtksharp_unichar_to_utf8_string (gtk_text_iter_get_char (ref this));
|
|
string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
[DllImport("libgtk-win32-2.0-0.dll")]
|
|
static extern IntPtr gtk_text_iter_get_marks (ref TextIter iter);
|
|
|
|
public TextMark[] Marks {
|
|
get {
|
|
IntPtr raw_ret = gtk_text_iter_get_marks (ref this);
|
|
if (raw_ret == IntPtr.Zero)
|
|
return new TextMark [0];
|
|
GLib.SList list = new GLib.SList(raw_ret);
|
|
TextMark[] result = new TextMark [list.Count];
|
|
for (int i = 0; i < list.Count; i++)
|
|
result [i] = list [i] as TextMark;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
[DllImport("libgtk-win32-2.0-0.dll")]
|
|
static extern IntPtr gtk_text_iter_get_tags (ref TextIter iter);
|
|
|
|
public TextTag[] Tags {
|
|
get {
|
|
IntPtr raw_ret = gtk_text_iter_get_tags (ref this);
|
|
if (raw_ret == IntPtr.Zero)
|
|
return new TextTag [0];
|
|
GLib.SList list = new GLib.SList(raw_ret);
|
|
TextTag[] result = new TextTag [list.Count];
|
|
for (int i = 0; i < list.Count; i++)
|
|
result [i] = list [i] as TextTag;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
[DllImport("libgtk-win32-2.0-0.dll")]
|
|
static extern IntPtr gtk_text_iter_get_toggled_tags (ref TextIter iter, bool toggled_on);
|
|
|
|
public TextTag[] GetToggledTags (bool toggled_on)
|
|
{
|
|
IntPtr raw_ret = gtk_text_iter_get_toggled_tags (ref this, toggled_on);
|
|
if (raw_ret == IntPtr.Zero)
|
|
return new TextTag [0];
|
|
GLib.SList list = new GLib.SList(raw_ret);
|
|
TextTag[] result = new TextTag [list.Count];
|
|
for (int i = 0; i < list.Count; i++)
|
|
result [i] = list [i] as TextTag;
|
|
return result;
|
|
}
|
|
|
|
[Obsolete("Replaced by overload without IntPtr argument")]
|
|
public bool ForwardFindChar (Gtk.TextCharPredicate pred, IntPtr user_data, Gtk.TextIter limit) {
|
|
return ForwardFindChar (pred, limit);
|
|
}
|
|
|
|
[Obsolete("Replaced by overload without IntPtr argument")]
|
|
public bool BackwardFindChar (Gtk.TextCharPredicate pred, IntPtr user_data, Gtk.TextIter limit) {
|
|
return BackwardFindChar (pred, limit);
|
|
}
|