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

Merge pull request #10 from bl8/various-fixes

Browse source 
Various build fixes, fixups and clean ups
This commit is contained in:
Mike Kestner 2011-07-04 10:17:52 -07:00
commit 59e38f55dc
10 changed files with 20 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cairo/Makefile.am
View file

@ -79,5 +79,5 @@ uninstall-local:
$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
fi
EXTRA_DIST = $(sources) mono.snk
EXTRA_DIST = $(sources) cairo-api.xml mono.snk

1
configure.ac
View file

@ -233,7 +233,6 @@ atk/atk-sharp.dll.config
atk/glue/Makefile
gdk/Makefile
gdk/gdk-sharp.dll.config
gdk/glue/Makefile
gtk/Makefile
gtk/gtk-sharp-3.0.pc
gtk/gtk-sharp.dll.config

20
gdk/Device.custom
View file

@ -19,26 +19,6 @@
// Boston, MA 02111-1307, USA.
[DllImport("gdksharpglue-3")]
static extern DeviceKey gtksharp_gdk_device_get_device_key (IntPtr device, uint axis);
[DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_device_get_state(IntPtr device, IntPtr window, double [] axes, out int maskAsInt);
#if FIXME30
public void GetState(Gdk.Window window, out double [] axes, out Gdk.ModifierType mask) {
int maskAsInt;
axes = new double [this.NumAxes];
gdk_device_get_state(Handle, window.Handle, axes, out maskAsInt);
mask = (Gdk.ModifierType) maskAsInt;
}
#endif
public Gdk.DeviceKey GetDeviceKey (uint axis) {
return gtksharp_gdk_device_get_device_key (Handle, axis);
}
[DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_device_free_history(IntPtr events, int n_events);

18
gdk/Gdk.metadata
View file

@ -41,7 +41,18 @@
<attr path="/api/namespace/object[@cname='GdkDevice']/method[@name='GetAxis']/*/*[@name='axes']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GdkDevice']/method[@name='FreeHistory']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkDevice']/method[@name='GetHistory']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkDevice']/method[@name='GetState']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkDevice']/method[@name='ListAxes']/return-type" name="element_type">GdkAtom*</attr>
<attr path="/api/namespace/object[@cname='GdkDevice']/method[@name='ListAxes']/return-type" name="owned">true</attr>
<attr path="/api/namespace/object[@cname='GdkDevice']/method[@name='ListAxes']/return-type" name="elements_owned">false</attr>
<attr path="/api/namespace/object[@cname='GdkDevice']/method[@name='ListSlaveDevices']/return-type" name="element_type">GdkDevice*</attr>
<attr path="/api/namespace/object[@cname='GdkDevice']/method[@name='ListSlaveDevices']/return-type" name="owned">true</attr>
<attr path="/api/namespace/object[@cname='GdkDevice']/method[@name='ListSlaveDevices']/return-type" name="elements_owned">false</attr>
<attr path="/api/namespace/object[@cname='GdkDeviceManager']/method[@name='ListDevices']/return-type" name="element_type">GdkDevice*</attr>
<attr path="/api/namespace/object[@cname='GdkDeviceManager']/method[@name='ListDevices']/return-type" name="owned">true</attr>
<attr path="/api/namespace/object[@cname='GdkDeviceManager']/method[@name='ListDevices']/return-type" name="elements_owned">false</attr>
<attr path="/api/namespace/object[@cname='GdkDeviceManager']/virtual_method[@name='ListDevices']/return-type" name="element_type">GdkDevice*</attr>
<attr path="/api/namespace/object[@cname='GdkDeviceManager']/virtual_method[@name='ListDevices']/return-type" name="owned">true</attr>
<attr path="/api/namespace/object[@cname='GdkDeviceManager']/virtual_method[@name='ListDevices']/return-type" name="elements_owned">false</attr>
<attr path="/api/namespace/object[@cname='GdkDisplay']/method[@name='GetPointer']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkDisplay']/method[@name='ListDevices']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkDisplay']/method[@name='SupportsComposite']" name="name">GetSupportsComposite</attr>
@ -87,6 +98,9 @@
<attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='GetWindowStack']/return-type" name="owned">true</attr>
<attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='GetWindowStack']/return-type" name="elements_owned">true</attr>
<attr path="/api/namespace/object[@cname='GdkScreen']/property[@name='FontOptions']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkScreen']/virtual_method[@name='GetWindowStack']/return-type" name="element_type">GdkWindow*</attr>
<attr path="/api/namespace/object[@cname='GdkScreen']/virtual_method[@name='GetWindowStack']/return-type" name="owned">true</attr>
<attr path="/api/namespace/object[@cname='GdkScreen']/virtual_method[@name='GetWindowStack']/return-type" name="elements_owned">true</attr>
<attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='AddFilter']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='Destroy']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='FreezeToplevelUpdatesLibgtkOnly']" name="hidden">1</attr>
@ -104,6 +118,8 @@
<attr path="/api/namespace/object[@cname='GdkWindow']/method[@cname='gdk_window_set_user_data']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='GdkAtom']/method[@name='Name']" name="name">GetName</attr>
<attr path="/api/namespace/struct[@cname='GdkAtom']/method[@name='InternStaticString']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='GdkColorInfo']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='GdkDeviceKey']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='GdkEventAny']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='GdkEventButton']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='GdkEventConfigure']" name="hidden">1</attr>

22
gdk/glue/Makefile.am
View file

@ -1,22 +0,0 @@
lib_LTLIBRARIES = libgdksharpglue-3.la
libgdksharpglue_3_la_SOURCES = \
device.c \
vmglueheaders.h
nodist_libgdksharpglue_3_la_SOURCES = generated.c
# Adding a new glue file?
libgdksharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined
libgdksharpglue_3_la_LIBADD = $(GTK_LIBS)
INCLUDES = $(GTK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
libgdksharpglue.dll: $(libgdksharpglue_3_la_OBJECTS) libgdksharpglue.rc libgdksharpglue.def
./build-dll libgdksharpglue-3 $(VERSION)
CLEANFILES = lib*.a lib*.dll
EXTRA_DIST = win32dll.c

40
gdk/glue/device.c
View file

@ -1,40 +0,0 @@
/* device.c : Glue to access fields in GdkDevice.
*
* Author: Manuel V. Santos <mvsl@telefonica.net>
*
* Copyright (c) Manuel V. Santos
*
* 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.
*/
#include <gdk/gdk.h>
/* Forward declarations */
GdkDeviceAxis gtksharp_gdk_device_get_device_axis (GdkDevice *device, guint i);
GdkDeviceKey gtksharp_gdk_device_get_device_key (GdkDevice *device, guint i);
GdkDeviceAxis
gtksharp_gdk_device_get_device_axis (GdkDevice *device, guint i)
{
return device->axes[i];
}
GdkDeviceKey
gtksharp_gdk_device_get_device_key (GdkDevice *device, guint i)
{
return device->keys[i];
}

4
gdk/glue/vmglueheaders.h
View file

@ -1,4 +0,0 @@
/* Headers for virtual method glue compilation */
#include <gdk/gdk.h>

16
gdk/glue/win32dll.c
View file

@ -1,16 +0,0 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#include <stdio.h>
BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
{
return TRUE;
}
/*
BOOL APIENTRY DllMainCRTStartup (HINSTANCE hInst, DWORD reason, LPVOID reserved)
{
return TRUE;
}
*/

4
gtk/NodeView.cs
View file

@ -74,11 +74,9 @@ namespace Gtk {
return CollapseRow (store.GetPath (node));
}
#if FIXME30
public Gdk.Pixmap CreateRowDragIcon (ITreeNode node) {
public Cairo.Surface CreateRowDragIcon (ITreeNode node) {
return CreateRowDragIcon (store.GetPath (node));
}
#endif
public Gdk.Rectangle GetBackgroundArea (ITreeNode node, Gtk.TreeViewColumn column) {
return GetBackgroundArea (store.GetPath (node), column);

1
sample/Makefile.am
View file

@ -110,6 +110,7 @@ EXTRA_DIST = \
TreeModelDemo.cs \
TreeViewDemo.cs \
ManagedTreeViewDemo.cs \
NativeInstantiationTest.cs \
NodeViewDemo.cs \
GExceptionTest.cs \
CairoSample.cs \