mirror of
https://github.com/Ryujinx/GtkSharp.git
synced 2024-09-16 19:44:45 +02:00
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
52 lines
2.1 KiB
Plaintext
52 lines
2.1 KiB
Plaintext
// App.custom - Gnome.App customizations
|
|
//
|
|
// 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("gnomeui-2")]
|
|
static extern IntPtr gnome_app_new(IntPtr appname, IntPtr title);
|
|
|
|
public App (string appname, string title) : base (IntPtr.Zero)
|
|
{
|
|
if (GetType () != typeof (App)) {
|
|
CreateNativeObject (new string[0], new GLib.Value[0]);
|
|
Construct (appname, title);
|
|
return;
|
|
}
|
|
IntPtr nappname = GLib.Marshaller.StringToPtrGStrdup (appname);
|
|
IntPtr ntitle = GLib.Marshaller.StringToPtrGStrdup (title);
|
|
Raw = gnome_app_new(nappname, ntitle);
|
|
GLib.Marshaller.Free (nappname);
|
|
GLib.Marshaller.Free (ntitle);
|
|
}
|
|
|
|
[Obsolete("Replaced by overload with no IntPtr arg")]
|
|
public void CreateMenusInterp (Gnome.UIInfo uiinfo, Gtk.CallbackMarshal relay_func, IntPtr data, Gtk.DestroyNotify destroy_func)
|
|
{
|
|
CreateMenusInterp (uiinfo, relay_func, destroy_func);
|
|
}
|
|
|
|
[Obsolete("Replaced by overload with no IntPtr arg")]
|
|
public void InsertMenusInterp (string path, Gnome.UIInfo menuinfo, Gtk.CallbackMarshal relay_func, IntPtr data, Gtk.DestroyNotify destroy_func)
|
|
{
|
|
InsertMenusInterp (path, menuinfo, relay_func, destroy_func);
|
|
}
|
|
|
|
[Obsolete("Replaced by overload with no IntPtr arg")]
|
|
public void CreateToolbarInterp (Gnome.UIInfo uiinfo, Gtk.CallbackMarshal relay_func, IntPtr data, Gtk.DestroyNotify destroy_func)
|
|
{
|
|
CreateToolbarInterp (uiinfo, relay_func, destroy_func);
|
|
}
|