ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gtk: Track API changes (I- interface prefixes)

Browse source 
This includes changes to fix the build, and changes to custom code that
gets added to the generated code. I.e. TreeModel now becomes ITreeModel
This commit is contained in:
Andres G. Aragoneses 2013-04-01 23:54:41 +01:00 committed by Bertrand Lorentz
parent 321181b761
commit 2e56a23e9f
7 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gtk/CellRenderer.cs
View file

@ -31,12 +31,12 @@ namespace Gtk {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_cell_renderer_start_editing (IntPtr handle, IntPtr evnt, IntPtr widget, IntPtr path, ref Gdk.Rectangle bg_area, ref Gdk.Rectangle cell_area, int flags);
public CellEditable StartEditing (Widget widget, Gdk.Event evnt, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, CellRendererState flags)
public ICellEditable StartEditing (Widget widget, Gdk.Event evnt, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, CellRendererState flags)
{
IntPtr native = GLib.Marshaller.StringToPtrGStrdup (path);
IntPtr raw_ret = gtk_cell_renderer_start_editing (Handle, evnt.Handle, widget.Handle, native, ref background_area, ref cell_area, (int) flags);
GLib.Marshaller.Free (native);
Gtk.CellEditable ret = (Gtk.CellEditable) GLib.Object.GetObject(raw_ret);
var ret = (ICellEditable) GLib.Object.GetObject (raw_ret);
return ret;
}

2
gtk/CellLayout.cs → gtk/ICellLayout.cs
View file

@ -22,7 +22,7 @@ namespace Gtk {
using System;
public partial interface CellLayout {
public partial interface ICellLayout {
void SetAttributes (CellRenderer renderer, object[] attrs);

2
gtk/TreeModel.cs → gtk/ITreeModel.cs
View file

@ -22,7 +22,7 @@ namespace Gtk {
using System;
public partial interface TreeModel {
public partial interface ITreeModel {
/// <summary>IterChildren Method</summary>
/// <remarks>To be completed</remarks>

4
gtk/Makefile.am
View file

@ -24,7 +24,6 @@ sources = \
Button.cs \
Calendar.cs \
CellAreaBox.cs \
CellLayout.cs \
CellLayoutAdapter.cs \
CellRenderer.cs \
CellView.cs \
@ -44,6 +43,7 @@ sources = \
Global.cs \
HBox.cs \
HScale.cs \
ICellLayout.cs \
IconFactory.cs \
IconSet.cs \
IconTheme.cs \
@ -51,6 +51,7 @@ sources = \
Image.cs \
ImageMenuItem.cs \
Init.cs \
ITreeModel.cs \
ITreeNode.cs \
Key.cs \
Label.cs \
@ -98,7 +99,6 @@ sources = \
TreeEnumerator.cs \
TreeIter.cs \
TreeMenu.cs \
TreeModel.cs \
TreeModelAdapter.cs \
TreeModelFilter.cs \
TreeModelSort.cs \

6
gtk/NodeStore.cs
View file

@ -81,7 +81,7 @@ namespace Gtk {
return implementor.GetEnumerator ();
}
internal class NodeStoreImplementor : GLib.Object, TreeModelImplementor, IEnumerable {
internal class NodeStoreImplementor : GLib.Object, ITreeModelImplementor, IEnumerable {
TreeModelAdapter model_adapter;
GLib.GType[] ctypes;
MemberInfo [] getters;
@ -239,8 +239,8 @@ namespace Gtk {
return gch.Target as ITreeNode;
}
void TreeModelImplementor.RefNode (Gtk.TreeIter iter) { }
void TreeModelImplementor.UnrefNode (Gtk.TreeIter iter) { }
void ITreeModelImplementor.RefNode (Gtk.TreeIter iter) { }
void ITreeModelImplementor.UnrefNode (Gtk.TreeIter iter) { }
#endregion
public bool GetIter (out TreeIter iter, TreePath path)

6
gtk/TreeEnumerator.cs
View file

@ -1,4 +1,4 @@
// TreeEnumerator.cs - .NET-style Enumerator for TreeModel classes
// TreeEnumerator.cs - .NET-style Enumerator for ITreeModel classes
//
// Author: Eric Butler <eric@extremeboredom.net>
//
@ -27,11 +27,11 @@ namespace Gtk
internal class TreeEnumerator : IEnumerator
{
private Gtk.TreeIter iter;
private Gtk.TreeModel model;
private Gtk.ITreeModel model;
private bool reset = true;
private bool changed = false;
public TreeEnumerator (TreeModel model)
public TreeEnumerator (ITreeModel model)
{
this.model = model;

4
gtk/gtk.csproj
View file

@ -48,7 +48,7 @@
<Compile Include="Button.cs" />
<Compile Include="Calendar.cs" />
<Compile Include="CellAreaBox.cs" />
<Compile Include="CellLayout.cs" />
<Compile Include="ICellLayout.cs" />
<Compile Include="CellLayoutAdapter.cs" />
<Compile Include="CellRenderer.cs" />
<Compile Include="CellView.cs" />
@ -121,7 +121,7 @@
<Compile Include="TreeEnumerator.cs" />
<Compile Include="TreeIter.cs" />
<Compile Include="TreeMenu.cs" />
<Compile Include="TreeModel.cs" />
<Compile Include="ITreeModel.cs" />
<Compile Include="TreeModelAdapter.cs" />
<Compile Include="TreeModelFilter.cs" />
<Compile Include="TreeModelSort.cs" />