fe699e9fbb
* gconf/Value.cs: Update to use new string marshalling. * generator/StringGen.cs, ConstStringGen.cs: Added. * generator/IGeneratable.cs: Add new method ToNativeReturn. * generator/CallbackGen.cs: Implement ToNativeReturn. Call ToNativeReturn for the return statement. Fix a couple of places where s_ret was being used incorrectly for m_ret. * generator/ClassGen.cs, EnumGen.cs, ManualGen.cs, SimpleGen.cs, StructBase.cs: Implement ToNativeReturn. * generator/SignalHandler.cs: Call ToNativeReturn for the return statement, instead of CallByName. * generator/SymbolTable.cs: Use StringGen for gchar, char, and gunichar, and ConstStringGen for their const variants. Add a new method wrapper for ToNativeReturn. (Trim): Add a special-case for const strings so that the const is not stripped. Otherwise there is no way of resolving the const case. * glade/XML.custom: Update to use new string marshalling. * glib/Marshaller.cs: Added. * glib/GException.cs, Markup.cs, ObjectManager.cs, Value.cs: Update to use new string marshalling. * glib/Object.cs: Remove old g_type_name DllImport as it is no longer used. * glue/fileselection.c (gtksharp_file_selection_get_fileop_entry): Mark this as const return. * gtk/ColorSelection.custom, FileSelection.custom, SelectionData.custom: Update to use new string marshalling. svn path=/trunk/gtk-sharp/; revision=15286
59 lines
1.9 KiB
Text
59 lines
1.9 KiB
Text
// Gtk.ColorSelection.custom - customizations and corrections for ColorSelection
|
|
// Author: Lee Mallabone <gnome@fonicmonkey.net>
|
|
// Author: Justin Malcolm
|
|
|
|
[DllImport("libgtk-win32-2.0-0.dll")]
|
|
static extern IntPtr gtk_color_selection_palette_to_string(Gdk.Color[] colors, int n_colors);
|
|
|
|
/// <summary> PaletteToString Method </summary>
|
|
public static string PaletteToString(Gdk.Color[] colors) {
|
|
int n_colors = colors.Length;
|
|
IntPtr raw_ret = gtk_color_selection_palette_to_string(colors, n_colors);
|
|
string ret = GLibSharp.Marshaller.PtrToStringGFree (raw_ret);
|
|
return ret;
|
|
}
|
|
|
|
[DllImport("libgtk-win32-2.0-0.dll")]
|
|
static extern bool gtk_color_selection_palette_from_string(string str, out IntPtr colors, out int n_colors);
|
|
|
|
public static Gdk.Color[] PaletteFromString(string str) {
|
|
IntPtr parsedColors;
|
|
int n_colors;
|
|
bool raw_ret = gtk_color_selection_palette_from_string(str, out parsedColors, out n_colors);
|
|
|
|
// If things failed, return silently
|
|
if (!raw_ret)
|
|
{
|
|
return null;
|
|
}
|
|
System.Console.WriteLine("Raw call finished, making " + n_colors + " actual colors");
|
|
Gdk.Color[] colors = new Gdk.Color[n_colors];
|
|
for (int i=0; i < n_colors; i++)
|
|
{
|
|
colors[i] = Gdk.Color.New(parsedColors);
|
|
parsedColors = (IntPtr) ((int)parsedColors + Marshal.SizeOf(colors[i]));
|
|
}
|
|
return colors;
|
|
}
|
|
|
|
[DllImport("libgtk-win32-2.0-0.dll")]
|
|
static extern void gtk_color_selection_set_previous_color(IntPtr raw, ref Gdk.Color color);
|
|
|
|
[DllImport("libgtk-win32-2.0-0.dll")]
|
|
static extern void gtk_color_selection_get_previous_color(IntPtr raw, out Gdk.Color color);
|
|
|
|
// Create Gtk# property to replace two Gtk+ functions
|
|
public Gdk.Color PreviousColor
|
|
{
|
|
get
|
|
{
|
|
Gdk.Color returnColor;
|
|
gtk_color_selection_get_previous_color(Handle, out returnColor);
|
|
return returnColor;
|
|
}
|
|
set
|
|
{
|
|
gtk_color_selection_set_previous_color(Handle, ref value);
|
|
}
|
|
}
|
|
|