From 104dbedf0768afb0690749bb08757302144ab20f Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 17 Dec 2004 17:55:07 +0000 Subject: [PATCH] * generator/ClassBase.cs (IgnoreMethod): Don't ignore GetFoo and SetFoo methods if they aren't in the right form to be turned into property accessors. (Causes 13 previously ignored methods to now be wrapped. See doc/ChangeLog.) * gtk/Gtk.metadata: Fix up a few of those newly-exposed methods svn path=/trunk/gtk-sharp/; revision=37891 --- ChangeLog | 9 +++++ doc/ChangeLog | 17 +++++++++ doc/en/Gnome/Entry.xml | 4 +-- doc/en/Gnome/FileEntry.xml | 4 +-- doc/en/Gnome/FontPicker.xml | 16 +++++++++ doc/en/Gnome/IconEntry.xml | 16 +++++++++ doc/en/GnomeDb/Combo.xml | 17 +++++++++ doc/en/GnomeDb/List.xml | 19 +++++++++- doc/en/Gtk/Combo.xml | 17 +++++++++ doc/en/Gtk/FontButton.xml | 16 +++++++++ doc/en/Gtk/FontSelection.xml | 18 +++++++++- doc/en/Gtk/Image.xml | 68 ++++++++++++++++++++++++++++++++++++ doc/en/Gtk/Table.xml | 37 +++++++++++++++++++- generator/ClassBase.cs | 4 +-- gtk/Gtk.metadata | 8 +++++ 15 files changed, 261 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index f3c534eda..95c939ebd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-12-17 Dan Winship + + * generator/ClassBase.cs (IgnoreMethod): Don't ignore GetFoo and + SetFoo methods if they aren't in the right form to be turned into + property accessors. (Causes 13 previously ignored methods to now + be wrapped. See doc/ChangeLog.) + + * gtk/Gtk.metadata: Fix up a few of those newly-exposed methods + 2004-12-16 Dan Winship * generator/ManagedCallString.cs (Setup, Finish, ToString): Add diff --git a/doc/ChangeLog b/doc/ChangeLog index d4bcccd3c..301ebf427 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,20 @@ +2004-12-17 Dan Winship + + * en/Gnome/FontPicker.xml (SetFontName): + * en/Gnome/IconEntry.xml (SetFilename): + * en/GnomeDb/Combo.xml (SetModel): + * en/GnomeDb/List.xml (SetModel): + * en/Gtk/Combo.xml (SetValueInList): + * en/Gtk/FontButton.xml (SetFontName): + * en/Gtk/FontSelection.xml (SetFontName): + * en/Gtk/Image.xml (GetStock, GetIconSet, GetPixmap, GetImage): + * en/Gtk/Table.xml (SetRowSpacing, GetRowSpacing): Newly-visible + methods + + * en/Gnome/Entry.xml (OnTextInserted): + * en/Gnome/FileEntry.xml (OnTextInserted): belatedly update for + previous change + 2004-12-17 Shane Landrum * en/Gtk/FontSelectionDialog.xml: Doc 1 property diff --git a/doc/en/Gnome/Entry.xml b/doc/en/Gnome/Entry.xml index 13d8f4b63..7719ed8bf 100644 --- a/doc/en/Gnome/Entry.xml +++ b/doc/en/Gnome/Entry.xml @@ -440,14 +440,14 @@ - + Method System.Void - + Default handler for the event. diff --git a/doc/en/Gnome/FileEntry.xml b/doc/en/Gnome/FileEntry.xml index afe6e83a2..7050cad4f 100644 --- a/doc/en/Gnome/FileEntry.xml +++ b/doc/en/Gnome/FileEntry.xml @@ -531,14 +531,14 @@ - + Method System.Void - + Default handler for the event. diff --git a/doc/en/Gnome/FontPicker.xml b/doc/en/Gnome/FontPicker.xml index be639df4d..312a0176d 100644 --- a/doc/en/Gnome/FontPicker.xml +++ b/doc/en/Gnome/FontPicker.xml @@ -302,5 +302,21 @@ Chain to this constructor if you have manually registered a native value for your subclass. + + + Method + + System.Boolean + + + + + + To be added + a + a + To be added + + \ No newline at end of file diff --git a/doc/en/Gnome/IconEntry.xml b/doc/en/Gnome/IconEntry.xml index 5cbe76ab1..ab1cfdb95 100644 --- a/doc/en/Gnome/IconEntry.xml +++ b/doc/en/Gnome/IconEntry.xml @@ -306,5 +306,21 @@ To be added + + + Method + + System.Boolean + + + + + + To be added + a + a + To be added + + \ No newline at end of file diff --git a/doc/en/GnomeDb/Combo.xml b/doc/en/GnomeDb/Combo.xml index f181f7ad1..2e9483767 100644 --- a/doc/en/GnomeDb/Combo.xml +++ b/doc/en/GnomeDb/Combo.xml @@ -109,5 +109,22 @@ Chain to this constructor if you have manually registered a native value for your subclass. + + + Method + + System.Void + + + + + + + To be added + a + a + To be added + + \ No newline at end of file diff --git a/doc/en/GnomeDb/List.xml b/doc/en/GnomeDb/List.xml index 2a16690d1..8e216d9de 100644 --- a/doc/en/GnomeDb/List.xml +++ b/doc/en/GnomeDb/List.xml @@ -176,5 +176,22 @@ To be added + + + Method + + System.Void + + + + + + + To be added + a + a + To be added + + - + \ No newline at end of file diff --git a/doc/en/Gtk/Combo.xml b/doc/en/Gtk/Combo.xml index 6d0473835..ed75ef04c 100644 --- a/doc/en/Gtk/Combo.xml +++ b/doc/en/Gtk/Combo.xml @@ -347,5 +347,22 @@ class ComboSample + + + Method + + System.Void + + + + + + + To be added + a + a + To be added + + \ No newline at end of file diff --git a/doc/en/Gtk/FontButton.xml b/doc/en/Gtk/FontButton.xml index d9bfb8a56..7ba2c4c7f 100644 --- a/doc/en/Gtk/FontButton.xml +++ b/doc/en/Gtk/FontButton.xml @@ -208,5 +208,21 @@ To be added + + + Method + + System.Boolean + + + + + + To be added + a + a + To be added + + \ No newline at end of file diff --git a/doc/en/Gtk/FontSelection.xml b/doc/en/Gtk/FontSelection.xml index d5524e268..00eb1ad9f 100644 --- a/doc/en/Gtk/FontSelection.xml +++ b/doc/en/Gtk/FontSelection.xml @@ -94,7 +94,7 @@ The name of a system font to select. The name of the currently selected font. - If this property is used to alter the widget's font name to a font that could not be found, the widget will retain its original font selection. + If this property is used to alter the widget's font name to a font that could not be found, the widget will retain its original font selection. See also , which returns a value indicating whether or not the new font name was found. @@ -154,5 +154,21 @@ Chain to this constructor if you have manually registered a native value for your subclass. + + + Method + + System.Boolean + + + + + + Set the current font selection + the name of the font to be selected + if the font was found and selected + This can be used instead of setting property if you need to know whether or not was valid. + + \ No newline at end of file diff --git a/doc/en/Gtk/Image.xml b/doc/en/Gtk/Image.xml index 74642b830..9b7c539fc 100644 --- a/doc/en/Gtk/Image.xml +++ b/doc/en/Gtk/Image.xml @@ -600,5 +600,73 @@ masked by the given . To be added + + + Method + + System.Void + + + + + + + Get the stock item name and size, if this is a stock image + the stock item name + the stock item size, a + If the is displaying a stock image, this method can be used to retrieve the stock item name and the size. + + + + + Method + + System.Void + + + + + + + Get the icon set and size, if this image is using an icon set + the + the icon size, a + If the is displaying an image from an icon set, this method can be used to retrieve the icon set and the size. + + + + + Method + + System.Void + + + + + + + Get the pixmap and mask for an image + the + the mask + + + + + + Method + + System.Void + + + + + + + Get the image data and mask for an image + the image data + the mask + + + \ No newline at end of file diff --git a/doc/en/Gtk/Table.xml b/doc/en/Gtk/Table.xml index b06e99e8f..8e456d714 100644 --- a/doc/en/Gtk/Table.xml +++ b/doc/en/Gtk/Table.xml @@ -14,7 +14,7 @@ The Table widget allows a programmer to arrange widgets in rows and columns, making it easy to align many widgets adjacent to each other, horizontally and vertically. Tables are created with a specific size - the number of rows and columns. This can be changed dynamically with the method. Widgets are packed into the table with methods. - The layout of a table can be altered by setting the spacing between rows and columns. This is done with the and properties, respectively. The spacing of individual cells can be adjusted with . + The layout of a table can be altered by setting the spacing between rows and columns. This is done with the and properties, respectively. The spacing of individual cells can be adjusted with and . The following shows how to create a table with three widgets: @@ -91,6 +91,41 @@ public Widget MakeTableTester() + + + Method + + System.Void + + + + + + + Sets the spacing around a specified row. + A zero-indexed row number to adjust the spacing of. + The number of pixels on each side of the . + + To adjust the spacing between all rows, use the property. + + + + + + Method + + System.UInt32 + + + + + + The spacing currently set for a given row. + A zero-indexed row number to retrieve spacing information from. + The number of pixels of spacing assigned to the specified . + + + Method diff --git a/generator/ClassBase.cs b/generator/ClassBase.cs index 1fc7e7cf3..1d66759a1 100644 --- a/generator/ClassBase.cs +++ b/generator/ClassBase.cs @@ -235,8 +235,8 @@ namespace GtkSharp.Generation { protected bool IgnoreMethod (Method method) { string mname = method.Name; - return ((mname.StartsWith("Set") || mname.StartsWith("Get")) && - (props != null) && props.ContainsKey(mname.Substring(3))); + return ((method.IsSetter || (method.IsGetter && mname.StartsWith("Get"))) && + (props != null) && props.ContainsKey(mname.Substring(3))); } public void GenMethods (GenerationInfo gen_info, Hashtable collisions, ClassBase implementor) diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata index 072c0118d..b775d2524 100644 --- a/gtk/Gtk.metadata +++ b/gtk/Gtk.metadata @@ -128,7 +128,9 @@ Toggle 1 1 + out 1 + out 1 1 1 @@ -180,6 +182,12 @@ icon_size stock icon_size + out + out + out + out + out + out 1 SurroundingDeleted 1