From df9c3bc1cc20d686b43418b828b2b53d2e1aa08d Mon Sep 17 00:00:00 2001
From: Alp Toker <alp@mono-cvs.ximian.com>
Date: Sat, 6 Sep 2003 18:11:13 +0000
Subject: [PATCH] 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
---
 ChangeLog            | 11 +++++++++++
 api/gdk-api.xml      |  6 +++---
 glade/makefile.win32 |  8 ++++++++
 glue/Makefile.am     |  2 ++
 glue/makefile.win32  | 35 ++++++++++++++++++++---------------
 glue/win32dll.c      |  4 ++--
 sources/Gdk.metadata | 24 ++++++++++++++++++++++++
 7 files changed, 70 insertions(+), 20 deletions(-)
 create mode 100755 glade/makefile.win32

diff --git a/ChangeLog b/ChangeLog
index d766a448f..10f9478a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
  
  	* parser/GAPI/Metadata.pm: enable enums processing using
diff --git a/api/gdk-api.xml b/api/gdk-api.xml
index 8e33762dd..4e02b7042 100644
--- a/api/gdk-api.xml
+++ b/api/gdk-api.xml
@@ -1772,9 +1772,9 @@
       <method name="GetInternalPaintInfo" cname="gdk_window_get_internal_paint_info">
         <return-type type="void"/>
         <parameters>
-          <parameter type="GdkDrawable**" name="real_drawable"/>
-          <parameter type="gint*" name="x_offset"/>
-          <parameter type="gint*" name="y_offset"/>
+          <parameter type="GdkDrawable**" name="real_drawable" pass_as="out"/>
+          <parameter type="gint*" name="x_offset" pass_as="out"/>
+          <parameter type="gint*" name="y_offset" pass_as="out"/>
         </parameters>
       </method>
       <method name="GetOrigin" cname="gdk_window_get_origin">
diff --git a/glade/makefile.win32 b/glade/makefile.win32
new file mode 100755
index 000000000..41d009a9f
--- /dev/null
+++ b/glade/makefile.win32
@@ -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
+
diff --git a/glue/Makefile.am b/glue/Makefile.am
index c88114789..3dc43fb26 100644
--- a/glue/Makefile.am
+++ b/glue/Makefile.am
@@ -20,6 +20,8 @@ BASESOURCES = 			\
 	value.c			\
 	widget.c
 
+# Adding a new glue file?
+# Please remember to update makefile.win32
 
 GNOMESOURCES = \
 	canvasitem.c \
diff --git a/glue/makefile.win32 b/glue/makefile.win32
index dec806098..df58e4b24 100755
--- a/glue/makefile.win32
+++ b/glue/makefile.win32
@@ -1,22 +1,27 @@
 GTK_CFLAGS=`pkg-config --cflags gtk+-win32-2.0`
 GTK_LIBS=`pkg-config --libs gtk+-win32-2.0`
-CC=gcc -b i686-pc-mingw32
-DLLWRAP=dllwrap --mno-cygwin --target i386-mingw32 --export-all-symbols
+CC=gcc -mno-cygwin
+DLLWRAP=dllwrap -mno-cygwin --target i386-mingw32 --export-all-symbols
 
 GLUE_OBJS = \
-	adjustment.o \
-	dialog.o \
-	error.o \
-	event.o \
-	fileselection.o \
-	list.o \
-	object.o \
-	paned.o \
-	slist.o \
-	style.o \
-	type.o \
-	value.o \
-	widget.o \
+        adjustment.o            \
+        clipboard.o             \
+        colorseldialog.o        \
+        combo.o                 \
+        dialog.o                \
+        error.o                 \
+        event.o                 \
+        fileselection.o         \
+        layout.o                \
+        list.o                  \
+        object.o                \
+        paned.o                 \
+        selection.o             \
+        slist.o                 \
+        style.o                 \
+        type.o                  \
+        value.o                 \
+        widget.o                \
 	win32dll.o
 
 all: gtksharpglue.dll
diff --git a/glue/win32dll.c b/glue/win32dll.c
index a2b42a95c..a57c07683 100755
--- a/glue/win32dll.c
+++ b/glue/win32dll.c
@@ -8,9 +8,9 @@ BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
 	return TRUE;
 }
 
-
+/*
 BOOL APIENTRY DllMainCRTStartup (HINSTANCE hInst, DWORD reason, LPVOID reserved)
 {
 	return TRUE;
 }
-
+*/
diff --git a/sources/Gdk.metadata b/sources/Gdk.metadata
index 502925893..800542f35 100644
--- a/sources/Gdk.metadata
+++ b/sources/Gdk.metadata
@@ -157,6 +157,30 @@
     </attribute>
   </data>
 </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>
   <class name="GdkWindow">
     <method>GetOrigin</method>