2003-09-06 Alp Toker <alp@atoker.com>

* api/gdk-api.xml:
        * sources/Gdk.metadata: out params for Gdk.Window.GetInternalPaintInfo
        * glade/makefile.win32: new win32 makefile
        * glue/win32dll.c:
        * glue/makefile.win32: Patch to remove cygwin1.dll dependency on win32
        from Todd Berman <tberman@gentoo.org>
        * glue/makefile.win32: Update list of sources
        * glue/Makefile.am: Remind people to keep makefile.win32 up to date

svn path=/trunk/gtk-sharp/; revision=17945
This commit is contained in:
Alp Toker 2003-09-06 18:11:13 +00:00
parent d552766aea
commit df9c3bc1cc
7 changed files with 70 additions and 20 deletions

View File

@ -1,3 +1,14 @@
2003-09-06 Alp Toker <alp@atoker.com>
* api/gdk-api.xml:
* sources/Gdk.metadata: out params for Gdk.Window.GetInternalPaintInfo
* glade/makefile.win32: new win32 makefile
* glue/win32dll.c:
* glue/makefile.win32: Patch to remove cygwin1.dll dependency on win32
from Todd Berman <tberman@gentoo.org>
* glue/makefile.win32: Update list of sources
* glue/Makefile.am: Remind people to keep makefile.win32 up to date
2003-09-03 Aleksey Sanin <aleksey@aleksey.com> 2003-09-03 Aleksey Sanin <aleksey@aleksey.com>
* parser/GAPI/Metadata.pm: enable enums processing using * parser/GAPI/Metadata.pm: enable enums processing using

View File

@ -1772,9 +1772,9 @@
<method name="GetInternalPaintInfo" cname="gdk_window_get_internal_paint_info"> <method name="GetInternalPaintInfo" cname="gdk_window_get_internal_paint_info">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GdkDrawable**" name="real_drawable"/> <parameter type="GdkDrawable**" name="real_drawable" pass_as="out"/>
<parameter type="gint*" name="x_offset"/> <parameter type="gint*" name="x_offset" pass_as="out"/>
<parameter type="gint*" name="y_offset"/> <parameter type="gint*" name="y_offset" pass_as="out"/>
</parameters> </parameters>
</method> </method>
<method name="GetOrigin" cname="gdk_window_get_origin"> <method name="GetOrigin" cname="gdk_window_get_origin">

8
glade/makefile.win32 Executable file
View File

@ -0,0 +1,8 @@
all: windows
windows:
$(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /out:glade-sharp.dll /recurse:*.cs
docs:
$(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /doc:glade-sharp-docs.xml /out:glade-sharp.dll /recurse:*.cs

View File

@ -20,6 +20,8 @@ BASESOURCES = \
value.c \ value.c \
widget.c widget.c
# Adding a new glue file?
# Please remember to update makefile.win32
GNOMESOURCES = \ GNOMESOURCES = \
canvasitem.c \ canvasitem.c \

View File

@ -1,22 +1,27 @@
GTK_CFLAGS=`pkg-config --cflags gtk+-win32-2.0` GTK_CFLAGS=`pkg-config --cflags gtk+-win32-2.0`
GTK_LIBS=`pkg-config --libs gtk+-win32-2.0` GTK_LIBS=`pkg-config --libs gtk+-win32-2.0`
CC=gcc -b i686-pc-mingw32 CC=gcc -mno-cygwin
DLLWRAP=dllwrap --mno-cygwin --target i386-mingw32 --export-all-symbols DLLWRAP=dllwrap -mno-cygwin --target i386-mingw32 --export-all-symbols
GLUE_OBJS = \ GLUE_OBJS = \
adjustment.o \ adjustment.o \
dialog.o \ clipboard.o \
error.o \ colorseldialog.o \
event.o \ combo.o \
fileselection.o \ dialog.o \
list.o \ error.o \
object.o \ event.o \
paned.o \ fileselection.o \
slist.o \ layout.o \
style.o \ list.o \
type.o \ object.o \
value.o \ paned.o \
widget.o \ selection.o \
slist.o \
style.o \
type.o \
value.o \
widget.o \
win32dll.o win32dll.o
all: gtksharpglue.dll all: gtksharpglue.dll

View File

@ -8,9 +8,9 @@ BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
return TRUE; return TRUE;
} }
/*
BOOL APIENTRY DllMainCRTStartup (HINSTANCE hInst, DWORD reason, LPVOID reserved) BOOL APIENTRY DllMainCRTStartup (HINSTANCE hInst, DWORD reason, LPVOID reserved)
{ {
return TRUE; return TRUE;
} }
*/

View File

@ -157,6 +157,30 @@
</attribute> </attribute>
</data> </data>
</rule> </rule>
<rule>
<class name="GdkWindow">
<method>GetInternalPaintInfo</method>
</class>
<data>
<attribute target="param">
<filter level="type">GdkDrawable*</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
</rule>
<rule>
<class name="GdkWindow">
<method>GetInternalPaintInfo</method>
</class>
<data>
<attribute target="param">
<filter level="type">gint*</filter>
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
</rule>
<rule> <rule>
<class name="GdkWindow"> <class name="GdkWindow">
<method>GetOrigin</method> <method>GetOrigin</method>