mirror of
https://github.com/Ryujinx/GtkSharp.git
synced 2024-12-23 10:15:31 +00:00
* gtk/ColorSelectionDialog.custom: Rename the inner Button class
to be ColorSelectionButton to avoid a name clash in the doc generator. * gtk/TextBuffer.custom: Fix the Text property. Patch from Mathias Hasselmann <mathias.hasselmann@gmx.de>. svn path=/trunk/gtk-sharp/; revision=12572
This commit is contained in:
parent
335ddb466a
commit
31a519a4cd
|
@ -8,14 +8,14 @@
|
||||||
// This code is inserted after the automatically generated code.
|
// This code is inserted after the automatically generated code.
|
||||||
//
|
//
|
||||||
|
|
||||||
public class Button : Gtk.Button {
|
public class ColorSelectionButton : Gtk.Button {
|
||||||
private ColorSelectionDialog color_sel;
|
private ColorSelectionDialog color_sel;
|
||||||
|
|
||||||
public ColorSelectionDialog ColorSelectionDialog {
|
public ColorSelectionDialog ColorSelectionDialog {
|
||||||
get { return color_sel; }
|
get { return color_sel; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public Button (ColorSelectionDialog cs, IntPtr raw) : base (raw) {
|
public ColorSelectionButton (ColorSelectionDialog cs, IntPtr raw) : base (raw) {
|
||||||
color_sel = cs;
|
color_sel = cs;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,23 +23,23 @@ public class Button : Gtk.Button {
|
||||||
[DllImport("gtksharpglue")]
|
[DllImport("gtksharpglue")]
|
||||||
static extern IntPtr gtksharp_color_selection_dialog_get_colorsel (IntPtr i);
|
static extern IntPtr gtksharp_color_selection_dialog_get_colorsel (IntPtr i);
|
||||||
public Gtk.ColorSelection ColorSelection {
|
public Gtk.ColorSelection ColorSelection {
|
||||||
get { return new Gtk.ColorSelection (gtksharp_color_selection_dialog_get_colorsel (this.Handle)); }
|
get { return new ColorSelection (gtksharp_color_selection_dialog_get_colorsel (this.Handle)); }
|
||||||
}
|
}
|
||||||
|
|
||||||
[DllImport("gtksharpglue")]
|
[DllImport("gtksharpglue")]
|
||||||
static extern IntPtr gtksharp_color_selection_dialog_get_ok_button (IntPtr i);
|
static extern IntPtr gtksharp_color_selection_dialog_get_ok_button (IntPtr i);
|
||||||
public Gtk.Button OkButton {
|
public Gtk.Button OkButton {
|
||||||
get { return new Button (this, gtksharp_color_selection_dialog_get_ok_button (this.Handle)); }
|
get { return new ColorSelectionButton (this, gtksharp_color_selection_dialog_get_ok_button (this.Handle)); }
|
||||||
}
|
}
|
||||||
|
|
||||||
[DllImport("gtksharpglue")]
|
[DllImport("gtksharpglue")]
|
||||||
static extern IntPtr gtksharp_color_selection_dialog_get_cancel_button (IntPtr i);
|
static extern IntPtr gtksharp_color_selection_dialog_get_cancel_button (IntPtr i);
|
||||||
public Gtk.Button CancelButton {
|
public Gtk.Button CancelButton {
|
||||||
get { return new Button (this, gtksharp_color_selection_dialog_get_cancel_button (this.Handle)); }
|
get { return new ColorSelectionButton (this, gtksharp_color_selection_dialog_get_cancel_button (this.Handle)); }
|
||||||
}
|
}
|
||||||
|
|
||||||
[DllImport("gtksharpglue")]
|
[DllImport("gtksharpglue")]
|
||||||
static extern IntPtr gtksharp_color_selection_dialog_get_help_button (IntPtr i);
|
static extern IntPtr gtksharp_color_selection_dialog_get_help_button (IntPtr i);
|
||||||
public Gtk.Button HelpButton {
|
public Gtk.Button HelpButton {
|
||||||
get { return new Button (this, gtksharp_color_selection_dialog_get_help_button (this.Handle)); }
|
get { return new ColorSelectionButton (this, gtksharp_color_selection_dialog_get_help_button (this.Handle)); }
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@ public string Text {
|
||||||
|
|
||||||
set {
|
set {
|
||||||
gtk_text_buffer_set_text (Handle, value,
|
gtk_text_buffer_set_text (Handle, value,
|
||||||
System.Text.Encoding.Default.GetByteCount(value));
|
System.Text.Encoding.UTF8.GetByteCount(value));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue