* gdk/Gdk.metadata: Remap all "out Gdk.Bitmap" params to be

Gdk.Pixmaps instead, because the former will crash. Also fix the
	"data" param to Pixmap.CreateFromXpmD and
	Pixmap.ColormapCreateFromXpmD

	* gtk/Style.custom (TextAAGC, SetTextAAGC, LightGC, SetLightGC,
	DarkGC, SetDarkGC, MidGC, SetMidGC): add these to go along with
	BaseGC, SetBaseGC, etc.

	* gtk/glue/style.c: add the glue methods needed for the above

svn path=/trunk/gtk-sharp/; revision=35409

ChangeLog

@@ -1,3 +1,16 @@
+2004-10-26  Dan Winship  <danw@novell.com>
+
+	* gdk/Gdk.metadata: Remap all "out Gdk.Bitmap" params to be
+	Gdk.Pixmaps instead, because the former will crash. Also fix the
+	"data" param to Pixmap.CreateFromXpmD and
+	Pixmap.ColormapCreateFromXpmD
+
+	* gtk/Style.custom (TextAAGC, SetTextAAGC, LightGC, SetLightGC,
+	DarkGC, SetDarkGC, MidGC, SetMidGC): add these to go along with
+	BaseGC, SetBaseGC, etc.
+
+	* gtk/glue/style.c: add the glue methods needed for the above
+
 2004-10-21  Mike Kestner  <mkestner@ximian.com>
 
 	* generator/SymbolTable.cs : map unsigned int to uint.  [Fixes #67732]

gdk/Gdk.metadata

@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
+  <attr path="//*[@type='GdkBitmap**']" name="type">GdkPixmap**</attr>
   <attr path="/api/namespace/boxed[@cname='GdkColor']/method[@name='Copy']" name="hidden">1</attr>
   <attr path="/api/namespace/boxed[@cname='GdkColor']/method[@name='Free']" name="hidden">1</attr>
   <attr path="/api/namespace/boxed[@cname='GdkColor']/method[@name='Hash']" name="hidden">1</attr>
@@ -86,12 +87,12 @@
   <attr path="/api/namespace/object[@cname='GdkPixbufLoader']/method[@name='Write']/*/*[@name='buf']" name="array">1</attr>
   <attr path="/api/namespace/object[@cname='GdkPixmap']" name="parent">GdkDrawable</attr>
   <attr path="/api/namespace/object[@cname='GdkPixmap']/constructor[@cname='gdk_pixmap_new']/*/*[@type='GdkDrawable*']" name="null_ok">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='CreateFromXpm']/*/*[@type='GdkBitmap**']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='CreateFromXpm']/*/*[@name='mask']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='CreateFromXpmD']/*/*[@type='GdkBitmap**']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='CreateFromXpmD']/*/*[@name='mask']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='CreateFromXpmD']/*/*[@name='data']" name="type">gchar*</attr>
+  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='CreateFromXpmD']/*/*[@name='data']" name="array">1</attr>
-  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='ColormapCreateFromXpm']/*/*[@type='GdkBitmap**']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='ColormapCreateFromXpm']/*/*[@name='mask']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='ColormapCreateFromXpmD']/*/*[@type='GdkBitmap**']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='ColormapCreateFromXpmD']/*/*[@name='mask']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='ColormapCreateFromXpmD']/*/*[@name='data']" name="type">gchar*</attr>
+  <attr path="/api/namespace/object[@cname='GdkPixmap']/method[@name='ColormapCreateFromXpmD']/*/*[@name='data']" name="array">1</attr>
   <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='GetMonitorGeometry']/*/*[@type='GdkRectangle*']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='GetToplevelWindows']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GdkScreen']/method[@name='Height']" name="hidden">1</attr>

gtk/Style.custom

@@ -137,6 +137,74 @@ public void SetTextGC (StateType state, Gdk.GC gc)
 		gtksharp_gtk_style_set_text_gc (Handle, (int) state, gc.Handle);
 }
 
+[DllImport("gtksharpglue")]
+static extern IntPtr gtksharp_gtk_style_get_text_aa_gc (IntPtr style, int i);
+
+public Gdk.GC TextAAGC (StateType state)
+{
+	IntPtr raw = gtksharp_gtk_style_get_text_aa_gc (Handle, (int) state);
+	return EnsureGC (raw);
+}
+
+[DllImport("gtksharpglue")]
+static extern IntPtr gtksharp_gtk_style_set_text_aa_gc (IntPtr style, int i, IntPtr gc);
+
+public void SetTextAAGC (StateType state, Gdk.GC gc)
+{
+		gtksharp_gtk_style_set_text_aa_gc (Handle, (int) state, gc.Handle);
+}
+
+[DllImport("gtksharpglue")]
+static extern IntPtr gtksharp_gtk_style_get_light_gc (IntPtr style, int i);
+
+public Gdk.GC LightGC (StateType state)
+{
+	IntPtr raw = gtksharp_gtk_style_get_light_gc (Handle, (int) state);
+	return EnsureGC (raw);
+}
+
+[DllImport("gtksharpglue")]
+static extern IntPtr gtksharp_gtk_style_set_light_gc (IntPtr style, int i, IntPtr gc);
+
+public void SetLightGC (StateType state, Gdk.GC gc)
+{
+		gtksharp_gtk_style_set_light_gc (Handle, (int) state, gc.Handle);
+}
+
+[DllImport("gtksharpglue")]
+static extern IntPtr gtksharp_gtk_style_get_dark_gc (IntPtr style, int i);
+
+public Gdk.GC DarkGC (StateType state)
+{
+	IntPtr raw = gtksharp_gtk_style_get_dark_gc (Handle, (int) state);
+	return EnsureGC (raw);
+}
+
+[DllImport("gtksharpglue")]
+static extern IntPtr gtksharp_gtk_style_set_dark_gc (IntPtr style, int i, IntPtr gc);
+
+public void SetDarkGC (StateType state, Gdk.GC gc)
+{
+		gtksharp_gtk_style_set_dark_gc (Handle, (int) state, gc.Handle);
+}
+
+[DllImport("gtksharpglue")]
+static extern IntPtr gtksharp_gtk_style_get_mid_gc (IntPtr style, int i);
+
+public Gdk.GC MidGC (StateType state)
+{
+	IntPtr raw = gtksharp_gtk_style_get_mid_gc (Handle, (int) state);
+	return EnsureGC (raw);
+}
+
+[DllImport("gtksharpglue")]
+static extern IntPtr gtksharp_gtk_style_set_mid_gc (IntPtr style, int i, IntPtr gc);
+
+public void SetMidGC (StateType state, Gdk.GC gc)
+{
+		gtksharp_gtk_style_set_mid_gc (Handle, (int) state, gc.Handle);
+}
+
 [DllImport("gtksharpglue")]
 static extern IntPtr gtksharp_gtk_style_get_white (IntPtr style);
 

gtk/glue/style.c

@@ -35,6 +35,14 @@ GdkGC *gtksharp_gtk_style_get_base_gc (GtkStyle *style, int i);
 
 GdkGC *gtksharp_gtk_style_get_text_gc (GtkStyle *style, int i);
 
+GdkGC *gtksharp_gtk_style_get_text_aa_gc (GtkStyle *style, int i);
+
+GdkGC *gtksharp_gtk_style_get_light_gc (GtkStyle *style, int i);
+
+GdkGC *gtksharp_gtk_style_get_dark_gc (GtkStyle *style, int i);
+
+GdkGC *gtksharp_gtk_style_get_mid_gc (GtkStyle *style, int i);
+
 void gtksharp_gtk_style_set_fg_gc (GtkStyle *style, int i, GdkGC *gc);
 
 void gtksharp_gtk_style_set_bg_gc (GtkStyle *style, int i, GdkGC *gc);
@@ -43,6 +51,14 @@ void gtksharp_gtk_style_set_base_gc (GtkStyle *style, int i, GdkGC *gc);
 
 void gtksharp_gtk_style_set_text_gc (GtkStyle *style, int i, GdkGC *gc);
 
+void gtksharp_gtk_style_set_text_aa_gc (GtkStyle *style, int i, GdkGC *gc);
+
+void gtksharp_gtk_style_set_light_gc (GtkStyle *style, int i, GdkGC *gc);
+
+void gtksharp_gtk_style_set_dark_gc (GtkStyle *style, int i, GdkGC *gc);
+
+void gtksharp_gtk_style_set_mid_gc (GtkStyle *style, int i, GdkGC *gc);
+
 GdkColor *gtksharp_gtk_style_get_white (GtkStyle *style);
 
 GdkColor *gtksharp_gtk_style_get_black (GtkStyle *style);
@@ -106,6 +122,34 @@ gtksharp_gtk_style_get_text_gc (GtkStyle *style, int i)
 	return style->text_gc[i];
 }
 
+GdkGC*
+gtksharp_gtk_style_get_text_aa_gc (GtkStyle *style, int i)
+{
+	g_object_ref (G_OBJECT (style->text_aa_gc[i]));
+	return style->text_aa_gc[i];
+}
+
+GdkGC*
+gtksharp_gtk_style_get_light_gc (GtkStyle *style, int i)
+{
+	g_object_ref (G_OBJECT (style->light_gc[i]));
+	return style->light_gc[i];
+}
+
+GdkGC*
+gtksharp_gtk_style_get_dark_gc (GtkStyle *style, int i)
+{
+	g_object_ref (G_OBJECT (style->dark_gc[i]));
+	return style->dark_gc[i];
+}
+
+GdkGC*
+gtksharp_gtk_style_get_mid_gc (GtkStyle *style, int i)
+{
+	g_object_ref (G_OBJECT (style->mid_gc[i]));
+	return style->mid_gc[i];
+}
+
 void
 gtksharp_gtk_style_set_fg_gc (GtkStyle *style, int i, GdkGC *gc)
 {
@@ -134,6 +178,27 @@ gtksharp_gtk_style_set_text_gc (GtkStyle *style, int i, GdkGC *gc)
 	style->text_gc[i] = gc;
 }
 
+void
+gtksharp_gtk_style_set_text_aa_gc (GtkStyle *style, int i, GdkGC *gc)
+{
+	g_object_ref (G_OBJECT (gc));
+	style->text_aa_gc[i] = gc;
+}
+
+void
+gtksharp_gtk_style_set_light_gc (GtkStyle *style, int i, GdkGC *gc)
+{
+	g_object_ref (G_OBJECT (gc));
+	style->light_gc[i] = gc;
+}
+
+void
+gtksharp_gtk_style_set_dark_gc (GtkStyle *style, int i, GdkGC *gc)
+{
+	g_object_ref (G_OBJECT (gc));
+	style->dark_gc[i] = gc;
+}
+
 GdkColor*
 gtksharp_gtk_style_get_white (GtkStyle *style)
 {
@@ -159,9 +224,9 @@ gtksharp_gtk_style_get_bg (GtkStyle *style, int i)
 }
 
 GdkColor*
-gtksharp_gtk_style_get_text (GtkStyle *style, int i)
+gtksharp_gtk_style_get_mid (GtkStyle *style, int i)
 {
-	return &style->text[i];
+	return &style->mid[i];
 }
 
 GdkColor*