From fc0e7dfddf027fbdeaabbad91e6665a84a9c7660 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 28 Oct 2004 19:25:50 +0000 Subject: [PATCH] * 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 | 13 +++++++++ gdk/Gdk.metadata | 13 ++++----- gtk/Style.custom | 68 +++++++++++++++++++++++++++++++++++++++++++++++ gtk/glue/style.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 155 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1124eb3b4..a9a966679 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2004-10-26 Dan Winship + + * 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 * generator/SymbolTable.cs : map unsigned int to uint. [Fixes #67732] diff --git a/gdk/Gdk.metadata b/gdk/Gdk.metadata index a2eaf78c9..bb4e7a34d 100644 --- a/gdk/Gdk.metadata +++ b/gdk/Gdk.metadata @@ -1,5 +1,6 @@ + GdkPixmap** 1 1 1 @@ -86,12 +87,12 @@ 1 GdkDrawable 1 - out - out - gchar* - out - out - gchar* + out + out + 1 + out + out + 1 out 1 1 diff --git a/gtk/Style.custom b/gtk/Style.custom index 3e12a2531..ddae36a79 100644 --- a/gtk/Style.custom +++ b/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); diff --git a/gtk/glue/style.c b/gtk/glue/style.c index 3270826d3..f94f52f42 100644 --- a/gtk/glue/style.c +++ b/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*