diff --git a/ChangeLog b/ChangeLog index 8b4fe3792..cefc8bcd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-08-17 Mike Kestner + + * pango/Pango.metadata : metadata for the pango audit. + * pango/*.custom : customizations to fix audited API. + * doc/en/* : docs for some api changes and additions. + * glib/Marshaller.cs : some gunichar marshal-fu. + * glib/glue/unichar.c : a new glue method. + 2004-08-13 John Luke * gtk/Gtk.metadata: mark Gtk.StockManager.Lookup param as ref diff --git a/doc/en/Atk/EditableText.xml b/doc/en/Atk/EditableText.xml index cbb5b199b..b1c698ec8 100644 --- a/doc/en/Atk/EditableText.xml +++ b/doc/en/Atk/EditableText.xml @@ -14,12 +14,10 @@ should be implemented by UI components which - contain text which the user can edit, via the corresponding to that component (see ). + contain text which the user can edit, via the corresponding to that component (see ). - is a subclass of , and as such, an + is a subclass of , and as such, an object which implements AtkEditableText is by definition an implementor as well. @@ -49,8 +47,7 @@ end position - This only deletes text up to, but not including . + This only deletes text up to, but not including . @@ -85,8 +82,7 @@ end position - This method only cuts the text up to , it does not include the text at that position. + This method only cuts the text up to , it does not include the text at that position. @@ -107,8 +103,7 @@ end position - This method only copies the text up to , it does not include the text at that position. + This method only copies the text up to , it does not include the text at that position. @@ -131,8 +126,7 @@ end of range in which to set attributes if attributes successfully set for - the specified range, otherwise - + the specified range, otherwise Sets the attributes for a specified range. See the @@ -173,8 +167,7 @@ Insert text at a given position. the text to insert the position after the text has been inserted. - - + \ No newline at end of file diff --git a/doc/en/Atk/Image.xml b/doc/en/Atk/Image.xml index e8cc93971..7b1b141b9 100644 --- a/doc/en/Atk/Image.xml +++ b/doc/en/Atk/Image.xml @@ -18,8 +18,7 @@ - should be implemented by subtypes on behalf + should be implemented by subtypes on behalf of components which display image/pixmap information onscreen, and which provide information (other than just widget borders, etc.) via that image content. For instance, icons, buttons @@ -56,7 +55,8 @@ Sets the textual description for this image. a description to set for image - , or if operation could not be completed. + + , or if operation could not be completed. @@ -85,16 +85,15 @@ Gets the position of the image in the form of a point specifying the images top-left corner. - x coordinate position - y coordinate position - + x coordinate position + y coordinate position + specifies whether the coordinates are relative to the screen or to the components top level window - The values of and are returned as -1 if the values cannot be obtained. + The values of and are returned as -1 if the values cannot be obtained. diff --git a/doc/en/GLib/Marshaller.xml b/doc/en/GLib/Marshaller.xml index a6156bc99..ad2be2349 100644 --- a/doc/en/GLib/Marshaller.xml +++ b/doc/en/GLib/Marshaller.xml @@ -133,5 +133,37 @@ To be added + + + Method + + System.Char + + + + + + Marshals a UCS4 character represented as an uint to a UTF16 char. + a + a + + + + + + Method + + System.UInt32 + + + + + + Marshals a UTF16 char to a UCS4 character represented as an uint. + a + a + + + - \ No newline at end of file + diff --git a/doc/en/Gtk/Accel.xml b/doc/en/Gtk/Accel.xml index 24b108ec8..109a90073 100644 --- a/doc/en/Gtk/Accel.xml +++ b/doc/en/Gtk/Accel.xml @@ -294,4 +294,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/AccelChangedArgs.xml b/doc/en/Gtk/AccelChangedArgs.xml index c280d6664..e61f4f0dc 100644 --- a/doc/en/Gtk/AccelChangedArgs.xml +++ b/doc/en/Gtk/AccelChangedArgs.xml @@ -69,4 +69,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/AccelFlags.xml b/doc/en/Gtk/AccelFlags.xml index ecb2a15f3..07198b60f 100644 --- a/doc/en/Gtk/AccelFlags.xml +++ b/doc/en/Gtk/AccelFlags.xml @@ -91,4 +91,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/AccelGroup.xml b/doc/en/Gtk/AccelGroup.xml index 7e8cfdd50..7e64883d6 100644 --- a/doc/en/Gtk/AccelGroup.xml +++ b/doc/en/Gtk/AccelGroup.xml @@ -210,7 +210,7 @@ Default public constructor. A new . - + @@ -309,4 +309,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/AccelGroupEntry.xml b/doc/en/Gtk/AccelGroupEntry.xml index 550606b4d..275c2b186 100644 --- a/doc/en/Gtk/AccelGroupEntry.xml +++ b/doc/en/Gtk/AccelGroupEntry.xml @@ -74,4 +74,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/AccelKey.xml b/doc/en/Gtk/AccelKey.xml index 8faf4a86d..2e3b3a60d 100644 --- a/doc/en/Gtk/AccelKey.xml +++ b/doc/en/Gtk/AccelKey.xml @@ -83,7 +83,7 @@ The main keyboard key to use for this AccelKey. - Useful values are enumerated in . + Useful values are enumerated in . @@ -97,12 +97,12 @@ To be added - a enumerated in - a enumerated in , the modifiers (shift, ctrl, etc) that apply for this AccelKey - a enumerated in for whether this AccelKey should be displayed in the menu + a enumerated in + a enumerated in , the modifiers (shift, ctrl, etc) that apply for this AccelKey + a enumerated in for whether this AccelKey should be displayed in the menu a - + \ No newline at end of file diff --git a/doc/en/Gtk/AccelLabel.xml b/doc/en/Gtk/AccelLabel.xml index 4a351f24f..21174bc17 100644 --- a/doc/en/Gtk/AccelLabel.xml +++ b/doc/en/Gtk/AccelLabel.xml @@ -183,4 +183,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/Bin.xml b/doc/en/Gtk/Bin.xml index 051e018c5..f97e3507c 100644 --- a/doc/en/Gtk/Bin.xml +++ b/doc/en/Gtk/Bin.xml @@ -225,4 +225,4 @@ class Y { - + \ No newline at end of file diff --git a/doc/en/Gtk/Box.xml b/doc/en/Gtk/Box.xml index 95bd76e4c..de08b54a9 100644 --- a/doc/en/Gtk/Box.xml +++ b/doc/en/Gtk/Box.xml @@ -283,4 +283,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/ButtonPressEventArgs.xml b/doc/en/Gtk/ButtonPressEventArgs.xml index cf738ae3a..76ebc9f12 100644 --- a/doc/en/Gtk/ButtonPressEventArgs.xml +++ b/doc/en/Gtk/ButtonPressEventArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/ButtonReleaseEventArgs.xml b/doc/en/Gtk/ButtonReleaseEventArgs.xml index 39f9cdc45..895c957d1 100644 --- a/doc/en/Gtk/ButtonReleaseEventArgs.xml +++ b/doc/en/Gtk/ButtonReleaseEventArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/CellEditable.xml b/doc/en/Gtk/CellEditable.xml index 9593471fb..6d4345c07 100644 --- a/doc/en/Gtk/CellEditable.xml +++ b/doc/en/Gtk/CellEditable.xml @@ -98,4 +98,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/CellRenderer.xml b/doc/en/Gtk/CellRenderer.xml index 05b78788f..1a12c3471 100644 --- a/doc/en/Gtk/CellRenderer.xml +++ b/doc/en/Gtk/CellRenderer.xml @@ -421,7 +421,7 @@ - Invokes the virtual render function of the . The three passed-in rectangles are areas of window. Most renderers will draw within ; the xalign, yalign, xpad, and ypad fields of the should be honored with respect to . includes the blank space around the cell, and also the area containing the tree expander; so the rectangles for all cells tile to cover the entire window. is a clip rectangle. + Invokes the virtual render function of the . The three passed-in rectangles are areas of window. Most renderers will draw within ; the xalign, yalign, xpad, and ypad fields of the should be honored with respect to . includes the blank space around the cell, and also the area containing the tree expander; so the rectangles for all cells tile to cover the entire window. is a clip rectangle. a to render to a , the widget that owns a , entire cell area (including tree expanders and maybe padding on the sides) @@ -458,4 +458,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/ColorSelection.xml b/doc/en/Gtk/ColorSelection.xml index 25bfb1a18..6236b1a67 100644 --- a/doc/en/Gtk/ColorSelection.xml +++ b/doc/en/Gtk/ColorSelection.xml @@ -177,8 +177,8 @@ The color that was selected before the current one. - An object of type - a + An object of type + a @@ -269,4 +269,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/CurrentParagraphAlignmentChangedArgs.xml b/doc/en/Gtk/CurrentParagraphAlignmentChangedArgs.xml index cbdc98f2a..bd86be0d5 100644 --- a/doc/en/Gtk/CurrentParagraphAlignmentChangedArgs.xml +++ b/doc/en/Gtk/CurrentParagraphAlignmentChangedArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/CurrentParagraphIndentationChangedArgs.xml b/doc/en/Gtk/CurrentParagraphIndentationChangedArgs.xml index 174fe7425..a82704934 100644 --- a/doc/en/Gtk/CurrentParagraphIndentationChangedArgs.xml +++ b/doc/en/Gtk/CurrentParagraphIndentationChangedArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/Curve.xml b/doc/en/Gtk/Curve.xml index 8cf092976..afafdb8dd 100644 --- a/doc/en/Gtk/Curve.xml +++ b/doc/en/Gtk/Curve.xml @@ -315,4 +315,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/DragBeginArgs.xml b/doc/en/Gtk/DragBeginArgs.xml index 70f64a31a..2cb6c5c0d 100644 --- a/doc/en/Gtk/DragBeginArgs.xml +++ b/doc/en/Gtk/DragBeginArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/DragDataDeleteArgs.xml b/doc/en/Gtk/DragDataDeleteArgs.xml index e4d183807..c62f5d6be 100644 --- a/doc/en/Gtk/DragDataDeleteArgs.xml +++ b/doc/en/Gtk/DragDataDeleteArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/DragDataGetArgs.xml b/doc/en/Gtk/DragDataGetArgs.xml index 5eca243d4..a3f33400f 100644 --- a/doc/en/Gtk/DragDataGetArgs.xml +++ b/doc/en/Gtk/DragDataGetArgs.xml @@ -77,8 +77,8 @@ The context of this drag. a - + - + \ No newline at end of file diff --git a/doc/en/Gtk/DragDataReceivedArgs.xml b/doc/en/Gtk/DragDataReceivedArgs.xml index 81497976a..e42b91a93 100644 --- a/doc/en/Gtk/DragDataReceivedArgs.xml +++ b/doc/en/Gtk/DragDataReceivedArgs.xml @@ -65,7 +65,7 @@ The data from the drag-and-drop selection that was dropped as part of the event. a object. - + @@ -101,8 +101,8 @@ The context of this drag. a - + - + \ No newline at end of file diff --git a/doc/en/Gtk/DragDropArgs.xml b/doc/en/Gtk/DragDropArgs.xml index 064fa4832..673fe9d79 100644 --- a/doc/en/Gtk/DragDropArgs.xml +++ b/doc/en/Gtk/DragDropArgs.xml @@ -77,8 +77,8 @@ The context of this drag. a - + - + \ No newline at end of file diff --git a/doc/en/Gtk/DragEndArgs.xml b/doc/en/Gtk/DragEndArgs.xml index d5b65f025..4a434cccb 100644 --- a/doc/en/Gtk/DragEndArgs.xml +++ b/doc/en/Gtk/DragEndArgs.xml @@ -41,8 +41,8 @@ The context of this drag. a - + - + \ No newline at end of file diff --git a/doc/en/Gtk/DragLeaveArgs.xml b/doc/en/Gtk/DragLeaveArgs.xml index 00f81e73d..851f9e1af 100644 --- a/doc/en/Gtk/DragLeaveArgs.xml +++ b/doc/en/Gtk/DragLeaveArgs.xml @@ -53,8 +53,8 @@ The context of this drag. a - + - + \ No newline at end of file diff --git a/doc/en/Gtk/DragMotionArgs.xml b/doc/en/Gtk/DragMotionArgs.xml index 64c27aa7a..c87ed09ae 100644 --- a/doc/en/Gtk/DragMotionArgs.xml +++ b/doc/en/Gtk/DragMotionArgs.xml @@ -77,8 +77,8 @@ The context of this drag. a - + - + \ No newline at end of file diff --git a/doc/en/Gtk/Editable.xml b/doc/en/Gtk/Editable.xml index 4f5e1bdbf..674ff1b2d 100644 --- a/doc/en/Gtk/Editable.xml +++ b/doc/en/Gtk/Editable.xml @@ -68,7 +68,6 @@ - Deletes a sequence of characters. The characters that are deleted are those characters at positions from up to, but not including . If is negative, then the the characters deleted will be those characters from to the end of the text. An integer; the start position An integer; the end position @@ -225,4 +224,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/FileSelection.xml b/doc/en/Gtk/FileSelection.xml index e509eb610..9ab62e884 100644 --- a/doc/en/Gtk/FileSelection.xml +++ b/doc/en/Gtk/FileSelection.xml @@ -477,4 +477,4 @@ class FileSelectionSample - + \ No newline at end of file diff --git a/doc/en/Gtk/FocusOutEventArgs.xml b/doc/en/Gtk/FocusOutEventArgs.xml index b4e5fabd9..7d1f3f0bf 100644 --- a/doc/en/Gtk/FocusOutEventArgs.xml +++ b/doc/en/Gtk/FocusOutEventArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/HTML.xml b/doc/en/Gtk/HTML.xml index a5bad6ee1..31b1e7430 100644 --- a/doc/en/Gtk/HTML.xml +++ b/doc/en/Gtk/HTML.xml @@ -260,7 +260,8 @@ namespace HtmlTest Selects a paragraph. - + + @@ -2084,4 +2085,4 @@ class X { - + \ No newline at end of file diff --git a/doc/en/Gtk/HTMLCommandType.xml b/doc/en/Gtk/HTMLCommandType.xml index 68805166d..fee6547d3 100644 --- a/doc/en/Gtk/HTMLCommandType.xml +++ b/doc/en/Gtk/HTMLCommandType.xml @@ -2006,4 +2006,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/HTMLFontStyle.xml b/doc/en/Gtk/HTMLFontStyle.xml index c462e6124..9dfd3ac7f 100644 --- a/doc/en/Gtk/HTMLFontStyle.xml +++ b/doc/en/Gtk/HTMLFontStyle.xml @@ -75,7 +75,7 @@ Gtk.HTMLFontStyle - + A medium-small text size. @@ -251,4 +251,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/HTMLParagraphAlignment.xml b/doc/en/Gtk/HTMLParagraphAlignment.xml index 37c8c7747..391e9f3ee 100644 --- a/doc/en/Gtk/HTMLParagraphAlignment.xml +++ b/doc/en/Gtk/HTMLParagraphAlignment.xml @@ -82,4 +82,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/HTMLSaveReceiverFn.xml b/doc/en/Gtk/HTMLSaveReceiverFn.xml index bcedc3b89..48ce16b6a 100644 --- a/doc/en/Gtk/HTMLSaveReceiverFn.xml +++ b/doc/en/Gtk/HTMLSaveReceiverFn.xml @@ -30,4 +30,4 @@ System.Boolean - + \ No newline at end of file diff --git a/doc/en/Gtk/HelpShownArgs.xml b/doc/en/Gtk/HelpShownArgs.xml index 6f248f7f9..e688c4764 100644 --- a/doc/en/Gtk/HelpShownArgs.xml +++ b/doc/en/Gtk/HelpShownArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/IMContext.xml b/doc/en/Gtk/IMContext.xml index f44f69b75..4efdd4b09 100644 --- a/doc/en/Gtk/IMContext.xml +++ b/doc/en/Gtk/IMContext.xml @@ -416,4 +416,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/IconSet.xml b/doc/en/Gtk/IconSet.xml index 21558974d..42ecf1528 100644 --- a/doc/en/Gtk/IconSet.xml +++ b/doc/en/Gtk/IconSet.xml @@ -236,4 +236,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/IconSize.xml b/doc/en/Gtk/IconSize.xml index b0cadd930..2a94f4add 100644 --- a/doc/en/Gtk/IconSize.xml +++ b/doc/en/Gtk/IconSize.xml @@ -132,4 +132,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/IconSource.xml b/doc/en/Gtk/IconSource.xml index 2c2e3d23d..e64898c06 100644 --- a/doc/en/Gtk/IconSource.xml +++ b/doc/en/Gtk/IconSource.xml @@ -382,4 +382,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/IframeCreatedArgs.xml b/doc/en/Gtk/IframeCreatedArgs.xml index a15c9f85d..e4b1e15d0 100644 --- a/doc/en/Gtk/IframeCreatedArgs.xml +++ b/doc/en/Gtk/IframeCreatedArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/ImageIconSetData.xml b/doc/en/Gtk/ImageIconSetData.xml index 7f0b21b89..ce4a546df 100644 --- a/doc/en/Gtk/ImageIconSetData.xml +++ b/doc/en/Gtk/ImageIconSetData.xml @@ -56,11 +56,11 @@ - The underlying in this data. - a - an object of type + The underlying in this data. + a + an object of type - + \ No newline at end of file diff --git a/doc/en/Gtk/InsertAtCursorArgs.xml b/doc/en/Gtk/InsertAtCursorArgs.xml index d5e735196..f3b0fb3b0 100644 --- a/doc/en/Gtk/InsertAtCursorArgs.xml +++ b/doc/en/Gtk/InsertAtCursorArgs.xml @@ -59,4 +59,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/InsertionColorChangedArgs.xml b/doc/en/Gtk/InsertionColorChangedArgs.xml index 812aa480d..0aa7baa5c 100644 --- a/doc/en/Gtk/InsertionColorChangedArgs.xml +++ b/doc/en/Gtk/InsertionColorChangedArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/InsertionFontStyleChangedArgs.xml b/doc/en/Gtk/InsertionFontStyleChangedArgs.xml index e9a0527f6..2221a15e4 100644 --- a/doc/en/Gtk/InsertionFontStyleChangedArgs.xml +++ b/doc/en/Gtk/InsertionFontStyleChangedArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/KeyPressEventArgs.xml b/doc/en/Gtk/KeyPressEventArgs.xml index 7faa78acb..307ac7644 100644 --- a/doc/en/Gtk/KeyPressEventArgs.xml +++ b/doc/en/Gtk/KeyPressEventArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/KeyReleaseEventArgs.xml b/doc/en/Gtk/KeyReleaseEventArgs.xml index 4b13af49e..d38db5710 100644 --- a/doc/en/Gtk/KeyReleaseEventArgs.xml +++ b/doc/en/Gtk/KeyReleaseEventArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/Layout.xml b/doc/en/Gtk/Layout.xml index d1e1d4e8d..0139935f1 100644 --- a/doc/en/Gtk/Layout.xml +++ b/doc/en/Gtk/Layout.xml @@ -288,4 +288,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/MnemonicActivatedArgs.xml b/doc/en/Gtk/MnemonicActivatedArgs.xml index eaaf68d8f..cd7a5af56 100644 --- a/doc/en/Gtk/MnemonicActivatedArgs.xml +++ b/doc/en/Gtk/MnemonicActivatedArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/Rc.xml b/doc/en/Gtk/Rc.xml index 1f6a5d370..7e96f5968 100644 --- a/doc/en/Gtk/Rc.xml +++ b/doc/en/Gtk/Rc.xml @@ -29,7 +29,7 @@ - Finds all matching RC styles for a given widget, composites them together, and then creates a representing the composite appearance. + Finds all matching RC styles for a given widget, composites them together, and then creates a representing the composite appearance. a a (GTK+ actually keeps a cache of previously created styles, so a new style may not be created.) @@ -226,4 +226,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/RcProperty.xml b/doc/en/Gtk/RcProperty.xml index a3e4a1fe6..0f74d2f78 100644 --- a/doc/en/Gtk/RcProperty.xml +++ b/doc/en/Gtk/RcProperty.xml @@ -57,7 +57,8 @@ The type of this property. - + + @@ -100,4 +101,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/RcPropertyParser.xml b/doc/en/Gtk/RcPropertyParser.xml index ee8dc6f6c..450fc5752 100644 --- a/doc/en/Gtk/RcPropertyParser.xml +++ b/doc/en/Gtk/RcPropertyParser.xml @@ -28,4 +28,4 @@ System.Boolean - + \ No newline at end of file diff --git a/doc/en/Gtk/RcStyle.xml b/doc/en/Gtk/RcStyle.xml index 1f843909a..5c0ac37ad 100644 --- a/doc/en/Gtk/RcStyle.xml +++ b/doc/en/Gtk/RcStyle.xml @@ -106,4 +106,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/RcTokenType.xml b/doc/en/Gtk/RcTokenType.xml index d2d23e81a..49dbea1af 100644 --- a/doc/en/Gtk/RcTokenType.xml +++ b/doc/en/Gtk/RcTokenType.xml @@ -537,4 +537,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/ScrollArgs.xml b/doc/en/Gtk/ScrollArgs.xml index 6ed8a65f2..ded21c5e5 100644 --- a/doc/en/Gtk/ScrollArgs.xml +++ b/doc/en/Gtk/ScrollArgs.xml @@ -41,7 +41,7 @@ The position of the scroller. a - + @@ -69,4 +69,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/ScrollEventArgs.xml b/doc/en/Gtk/ScrollEventArgs.xml index dfea88b66..5fda97094 100644 --- a/doc/en/Gtk/ScrollEventArgs.xml +++ b/doc/en/Gtk/ScrollEventArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/SettingsPropertyValue.xml b/doc/en/Gtk/SettingsPropertyValue.xml index 55e399302..9a7f5c2d8 100644 --- a/doc/en/Gtk/SettingsPropertyValue.xml +++ b/doc/en/Gtk/SettingsPropertyValue.xml @@ -38,4 +38,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/StockItem.xml b/doc/en/Gtk/StockItem.xml index 56ff69ce8..c739f4571 100644 --- a/doc/en/Gtk/StockItem.xml +++ b/doc/en/Gtk/StockItem.xml @@ -141,4 +141,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/StockManager.xml b/doc/en/Gtk/StockManager.xml index 4647af7db..e5d02d03c 100644 --- a/doc/en/Gtk/StockManager.xml +++ b/doc/en/Gtk/StockManager.xml @@ -78,9 +78,9 @@ Looks up a the StockId of the to return. the if found - returns if a with the exists, else returns . - + returns if a with the exists, else returns . + - + \ No newline at end of file diff --git a/doc/en/Gtk/Style.xml b/doc/en/Gtk/Style.xml index b36556f2d..9bf0ef902 100644 --- a/doc/en/Gtk/Style.xml +++ b/doc/en/Gtk/Style.xml @@ -216,7 +216,8 @@ Attaches a style to a window; this process allocates the colors and creates the GCs (graphics components) for the style - it specializes it to a particular visual and colormap. The process may involve the creation of a new style if the style has already been attached to a window with a different style and colormap. - , the window to attach the style to + + , the window to attach the style to Either , or a newly-created . If the style is newly created, the style parameter will be dereferenced, and the new style will have a reference count belonging to the caller. @@ -1257,4 +1258,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/Text.xml b/doc/en/Gtk/Text.xml index 31e813d4e..f3eb8118b 100644 --- a/doc/en/Gtk/Text.xml +++ b/doc/en/Gtk/Text.xml @@ -47,4 +47,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TextAppearance.xml b/doc/en/Gtk/TextAppearance.xml index ab7180bbf..3d8cad265 100644 --- a/doc/en/Gtk/TextAppearance.xml +++ b/doc/en/Gtk/TextAppearance.xml @@ -130,4 +130,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TextAttributes.xml b/doc/en/Gtk/TextAttributes.xml index ba8c6fa9a..e77a3a698 100644 --- a/doc/en/Gtk/TextAttributes.xml +++ b/doc/en/Gtk/TextAttributes.xml @@ -327,4 +327,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TextDeletedArgs.xml b/doc/en/Gtk/TextDeletedArgs.xml index 9cff513df..1c894eb4b 100644 --- a/doc/en/Gtk/TextDeletedArgs.xml +++ b/doc/en/Gtk/TextDeletedArgs.xml @@ -76,4 +76,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TextInsertedArgs.xml b/doc/en/Gtk/TextInsertedArgs.xml index e302e2b1b..1dc669483 100644 --- a/doc/en/Gtk/TextInsertedArgs.xml +++ b/doc/en/Gtk/TextInsertedArgs.xml @@ -88,4 +88,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TextIter.xml b/doc/en/Gtk/TextIter.xml index 749214187..354989af2 100644 --- a/doc/en/Gtk/TextIter.xml +++ b/doc/en/Gtk/TextIter.xml @@ -1167,4 +1167,4 @@ If the GTK_TEXT_SEARCH_VISIBLE_ONLY flag is present, the match may have invisibl - + \ No newline at end of file diff --git a/doc/en/Gtk/TextMark.xml b/doc/en/Gtk/TextMark.xml index 90addb216..0bd64b405 100644 --- a/doc/en/Gtk/TextMark.xml +++ b/doc/en/Gtk/TextMark.xml @@ -210,4 +210,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TextMarkBody.xml b/doc/en/Gtk/TextMarkBody.xml index 7c564f46c..57552d4cc 100644 --- a/doc/en/Gtk/TextMarkBody.xml +++ b/doc/en/Gtk/TextMarkBody.xml @@ -40,4 +40,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TextTag.xml b/doc/en/Gtk/TextTag.xml index 20cc3f24a..dd85b96ee 100644 --- a/doc/en/Gtk/TextTag.xml +++ b/doc/en/Gtk/TextTag.xml @@ -743,4 +743,4 @@ Default value: 400 - + \ No newline at end of file diff --git a/doc/en/Gtk/TextView.xml b/doc/en/Gtk/TextView.xml index 1834b8884..6746ab932 100644 --- a/doc/en/Gtk/TextView.xml +++ b/doc/en/Gtk/TextView.xml @@ -920,7 +920,7 @@ class TextViewSample Fired whenever an anchor (e.g. ) is set within the TextView. - + @@ -932,7 +932,7 @@ class TextViewSample Fired whenever the cursor is moved. - + @@ -1339,4 +1339,4 @@ class TextViewSample - + \ No newline at end of file diff --git a/doc/en/Gtk/ThemeEngine.xml b/doc/en/Gtk/ThemeEngine.xml index 094444f16..4a01c24f2 100644 --- a/doc/en/Gtk/ThemeEngine.xml +++ b/doc/en/Gtk/ThemeEngine.xml @@ -122,4 +122,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TitleChangedArgs.xml b/doc/en/Gtk/TitleChangedArgs.xml index 3db7ffe93..63458dbcd 100644 --- a/doc/en/Gtk/TitleChangedArgs.xml +++ b/doc/en/Gtk/TitleChangedArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/ToggledArgs.xml b/doc/en/Gtk/ToggledArgs.xml index 653e326fd..57ba37499 100644 --- a/doc/en/Gtk/ToggledArgs.xml +++ b/doc/en/Gtk/ToggledArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/Toolbar.xml b/doc/en/Gtk/Toolbar.xml index 6f55dcf82..3e438b5c4 100644 --- a/doc/en/Gtk/Toolbar.xml +++ b/doc/en/Gtk/Toolbar.xml @@ -369,16 +369,16 @@ - + This method is deprecated and should not be used in new code. - + Adds a new button to the beginning of the toolbar (left or top, depending on toolbar orientation). - + If type == , widget is used as the new element. If type == , widget is used to determine the radio group for the new element. In all other cases, widget must be NULL. - + a , the type of widget to add a , the widget itself a , a label for the widget @@ -408,16 +408,16 @@ If type == , widget is used as the n - + This method is deprecated and should not be used in new code. - + Adds a new button to the beginning of the toolbar (left or top, depending on toolbar orientation). - + If type == , widget is used as the new element. If type == , widget is used to determine the radio group for the new element. In all other cases, widget must be NULL. - + a , the type of widget to add a , the widget itself a , a label for the widget @@ -425,7 +425,6 @@ If type == , widget is used as the n a , context-sensitive detailed help a , the icon to use for this widget a , a callback function to use when the new widget is touched. - a , data to pass to the callback. a , the number of toolbar widgets to insert this element after. a , the new toolbar element. @@ -577,4 +576,4 @@ If type == , widget is used as the n - + \ No newline at end of file diff --git a/doc/en/Gtk/Tooltips.xml b/doc/en/Gtk/Tooltips.xml index 47dbd014a..67fedfa7d 100644 --- a/doc/en/Gtk/Tooltips.xml +++ b/doc/en/Gtk/Tooltips.xml @@ -204,4 +204,4 @@ class ToolTipsExample - + \ No newline at end of file diff --git a/doc/en/Gtk/TooltipsData.xml b/doc/en/Gtk/TooltipsData.xml index 864610e62..3bcb12b33 100644 --- a/doc/en/Gtk/TooltipsData.xml +++ b/doc/en/Gtk/TooltipsData.xml @@ -127,4 +127,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/Tree.xml b/doc/en/Gtk/Tree.xml index 7015e4ffa..04d9ba9f4 100644 --- a/doc/en/Gtk/Tree.xml +++ b/doc/en/Gtk/Tree.xml @@ -78,4 +78,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TreeCellDataFunc.xml b/doc/en/Gtk/TreeCellDataFunc.xml index 7052d25a6..f38225e2a 100644 --- a/doc/en/Gtk/TreeCellDataFunc.xml +++ b/doc/en/Gtk/TreeCellDataFunc.xml @@ -32,4 +32,4 @@ System.Void - + \ No newline at end of file diff --git a/doc/en/Gtk/TreeDataList.xml b/doc/en/Gtk/TreeDataList.xml index c644a44b2..193b75cd8 100644 --- a/doc/en/Gtk/TreeDataList.xml +++ b/doc/en/Gtk/TreeDataList.xml @@ -95,4 +95,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TreeDestroyCountFunc.xml b/doc/en/Gtk/TreeDestroyCountFunc.xml index 9dc759588..b41b928b4 100644 --- a/doc/en/Gtk/TreeDestroyCountFunc.xml +++ b/doc/en/Gtk/TreeDestroyCountFunc.xml @@ -31,4 +31,4 @@ System.Void - + \ No newline at end of file diff --git a/doc/en/Gtk/TreeDragDest.xml b/doc/en/Gtk/TreeDragDest.xml index 4a4d092aa..d998124ec 100644 --- a/doc/en/Gtk/TreeDragDest.xml +++ b/doc/en/Gtk/TreeDragDest.xml @@ -35,8 +35,8 @@ Determines whether a drop is possible before the given , at the same depth as . i.e., can we drop the data in at that location. does not have to exist; the return value will almost certainly be FALSE if the parent of doesn't exist, though. - a , the potential drop target - a , the data to drop + a , the potential drop target + a , the data to drop A boolean for whether the drop is possible. @@ -55,13 +55,11 @@ Asks the TreeDragDest to insert a row before the given , deriving the contents of the row from the given . - a , where to drop the data - a , the data to drop + a , where to drop the data + a , the data to drop A boolean for whether the row was dropped successfully. If dest_path is outside the tree so that inserting before it is impossible, FALSE will be returned. Also, FALSE may be returned if the new row cannot be created for some model-specific reason. Should robustly handle a destination path no longer found in the model. - - - + \ No newline at end of file diff --git a/doc/en/Gtk/TreeDragSource.xml b/doc/en/Gtk/TreeDragSource.xml index 49bf570d0..6ecb9613f 100644 --- a/doc/en/Gtk/TreeDragSource.xml +++ b/doc/en/Gtk/TreeDragSource.xml @@ -36,7 +36,7 @@ a a object to fill with data A boolean; true if data of the required type was provided. - FIXME: the original doc says, "selection_data->target gives the required type of the data.", but there doesn't seem to be a parallel in Gtk#. Check this. + FIXME: the original doc says, "selection_data->target gives the required type of the data.", but there doesn't seem to be a parallel in Gtk#. Check this. @@ -74,4 +74,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TreeIter.xml b/doc/en/Gtk/TreeIter.xml index c1eed5c65..6f8770e1e 100644 --- a/doc/en/Gtk/TreeIter.xml +++ b/doc/en/Gtk/TreeIter.xml @@ -142,4 +142,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TreeIterCompareFunc.xml b/doc/en/Gtk/TreeIterCompareFunc.xml index e83773daa..61a113ef2 100644 --- a/doc/en/Gtk/TreeIterCompareFunc.xml +++ b/doc/en/Gtk/TreeIterCompareFunc.xml @@ -31,4 +31,4 @@ System.Int32 - + \ No newline at end of file diff --git a/doc/en/Gtk/TreeModel.xml b/doc/en/Gtk/TreeModel.xml index d874cd52e..da7405a77 100644 --- a/doc/en/Gtk/TreeModel.xml +++ b/doc/en/Gtk/TreeModel.xml @@ -712,4 +712,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TreeModelForeachFunc.xml b/doc/en/Gtk/TreeModelForeachFunc.xml index 36494572a..6ca010aa0 100644 --- a/doc/en/Gtk/TreeModelForeachFunc.xml +++ b/doc/en/Gtk/TreeModelForeachFunc.xml @@ -32,4 +32,4 @@ as parameters to . System.Boolean - + \ No newline at end of file diff --git a/doc/en/Gtk/TreeModelSort.xml b/doc/en/Gtk/TreeModelSort.xml index 276d5e018..0f6b445ef 100644 --- a/doc/en/Gtk/TreeModelSort.xml +++ b/doc/en/Gtk/TreeModelSort.xml @@ -1085,4 +1085,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TreePath.xml b/doc/en/Gtk/TreePath.xml index 1eebf6bb5..16b59e8b8 100644 --- a/doc/en/Gtk/TreePath.xml +++ b/doc/en/Gtk/TreePath.xml @@ -12,7 +12,6 @@ Represents a particular node of a . A TreePath can be converted into either an array of unsigned integers or a string. The string form is a list of numbers separated by a colon. Each number refers to the offset at that level. Thus, the path "0" refers to the root node and the path "2:4" refers to the fifth child of the third node. - GLib.Opaque @@ -283,4 +282,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TreeSelection.xml b/doc/en/Gtk/TreeSelection.xml index 521e18620..fed2a2c93 100644 --- a/doc/en/Gtk/TreeSelection.xml +++ b/doc/en/Gtk/TreeSelection.xml @@ -528,4 +528,4 @@ class TreeSelectionSample - + \ No newline at end of file diff --git a/doc/en/Gtk/TreeSelectionFunc.xml b/doc/en/Gtk/TreeSelectionFunc.xml index e47479c44..d17782e7f 100644 --- a/doc/en/Gtk/TreeSelectionFunc.xml +++ b/doc/en/Gtk/TreeSelectionFunc.xml @@ -8,7 +8,7 @@ Gtk# is thread aware, but not thread safe; See the Gtk# Thread Programming for details. A delegate for specifying the shape of functions passed as parameters to . - This function will get called on select and unselect of widget text. It should return if the state of the tree node may be toggled and if the state of the node should not be changed. + This function will get called on select and unselect of widget text. It should return if the state of the tree node may be toggled and if the state of the node should not be changed. System.Delegate @@ -32,4 +32,4 @@ System.Boolean - + \ No newline at end of file diff --git a/doc/en/Gtk/TreeSortable.xml b/doc/en/Gtk/TreeSortable.xml index 8f5a20364..7f4e526be 100644 --- a/doc/en/Gtk/TreeSortable.xml +++ b/doc/en/Gtk/TreeSortable.xml @@ -134,4 +134,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/TreeView.xml b/doc/en/Gtk/TreeView.xml index 3eb663264..6e9fbab18 100644 --- a/doc/en/Gtk/TreeView.xml +++ b/doc/en/Gtk/TreeView.xml @@ -1191,9 +1191,9 @@ tree_view.AppendColumn ("title", text, "text", 0); a a - If focus_column is not null, then focus is given to the column specified by it. If focus_column and focus_cell are not null, and focus_column contains 2 or more editable or activatable cells, then focus is given to the cell specified by focus_cell. Additionally, if focus_column is specified, and start_editing is null, then editing should be started in the specified cell. - This function is often followed by(tree_view_obj) in order to give keyboard focus to the widget. Please note that editing can only happen when the widget is realized. - + If focus_column is not null, then focus is given to the column specified by it. If focus_column and focus_cell are not null, and focus_column contains 2 or more editable or activatable cells, then focus is given to the cell specified by focus_cell. Additionally, if focus_column is specified, and start_editing is null, then editing should be started in the specified cell. + This function is often followed by(tree_view_obj) in order to give keyboard focus to the widget. Please note that editing can only happen when the widget is realized. + @@ -1711,9 +1711,9 @@ tree_view.AppendColumn ("title", text, "text", 0); a to fill with the y coordinate relative to the cell background. a , true if a row exists at (x,y). - x and y must come from an event on the tree_view only where the event's window is the same as the window this TreeView renders to. It is primarily for things like popup menus. If path is non-null, then it will be filled with the GtkTreePath at that point. This path should be freed with . If column is non-NULL, then it will be filled with the column at that point. - cell_x and cell_y return the coordinates relative to the cell background (i.e. the background_area passed to ). This function is only meaningful if the TreeView object is realized. - + x and y must come from an event on the tree_view only where the event's window is the same as the window this TreeView renders to. It is primarily for things like popup menus. If path is non-null, then it will be filled with the GtkTreePath at that point. This path should be freed with . If column is non-NULL, then it will be filled with the column at that point. + cell_x and cell_y return the coordinates relative to the cell background (i.e. the background_area passed to ). This function is only meaningful if the TreeView object is realized. + @@ -1739,4 +1739,4 @@ tree_view.AppendColumn ("title", text, "text", 0); - + \ No newline at end of file diff --git a/doc/en/Gtk/UnmapEventArgs.xml b/doc/en/Gtk/UnmapEventArgs.xml index a3cfb5eda..4ed638e80 100644 --- a/doc/en/Gtk/UnmapEventArgs.xml +++ b/doc/en/Gtk/UnmapEventArgs.xml @@ -46,4 +46,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/UnmapEventHandler.xml b/doc/en/Gtk/UnmapEventHandler.xml index 64fd189bd..2ab4f1c85 100644 --- a/doc/en/Gtk/UnmapEventHandler.xml +++ b/doc/en/Gtk/UnmapEventHandler.xml @@ -34,4 +34,4 @@ System.Void - + \ No newline at end of file diff --git a/doc/en/Gtk/UrlRequestedArgs.xml b/doc/en/Gtk/UrlRequestedArgs.xml index b6075285d..cfb375287 100644 --- a/doc/en/Gtk/UrlRequestedArgs.xml +++ b/doc/en/Gtk/UrlRequestedArgs.xml @@ -57,4 +57,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/VScrollbar.xml b/doc/en/Gtk/VScrollbar.xml index bf83cef4a..8070a1ff5 100644 --- a/doc/en/Gtk/VScrollbar.xml +++ b/doc/en/Gtk/VScrollbar.xml @@ -74,7 +74,8 @@ Creates a new vertical scrollbar. The to use, or to create a new adjustment. The new - + + @@ -105,4 +106,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/Visibility.xml b/doc/en/Gtk/Visibility.xml index 6db398720..7b097ff98 100644 --- a/doc/en/Gtk/Visibility.xml +++ b/doc/en/Gtk/Visibility.xml @@ -82,4 +82,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/VisibilityNotifyEventArgs.xml b/doc/en/Gtk/VisibilityNotifyEventArgs.xml index 2c8f983b6..e5bdf9ec4 100644 --- a/doc/en/Gtk/VisibilityNotifyEventArgs.xml +++ b/doc/en/Gtk/VisibilityNotifyEventArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/Widget.xml b/doc/en/Gtk/Widget.xml index 3db518a5a..c20c22158 100644 --- a/doc/en/Gtk/Widget.xml +++ b/doc/en/Gtk/Widget.xml @@ -1743,7 +1743,7 @@ handle focus grabs. Fired whenever this widget is focused. - a + a The widget gets this signal as the user uses keyboard shortcuts or tabs through the widgets in a window. @@ -3485,8 +3485,7 @@ xs a Override this method in a subclass to provide a default handler for the event. - - + Method @@ -3501,8 +3500,7 @@ xs a Override this method in a subclass to provide a default handler for the event. - - + Method @@ -3517,8 +3515,7 @@ xs a Override this method in a subclass to provide a default handler for the event. - - + Method @@ -3533,8 +3530,7 @@ xs a Override this method in a subclass to provide a default handler for the event. - - + Method @@ -3549,8 +3545,7 @@ xs a Override this method in a subclass to provide a default handler for the event. - - + Method @@ -3565,8 +3560,7 @@ xs a Override this method in a subclass to provide a default handler for the event. - - + Method @@ -3581,8 +3575,7 @@ xs a Override this method in a subclass to provide a default handler for the event. - - + Method @@ -3593,8 +3586,7 @@ xs Default handler for the event. Override this method in a subclass to provide a default handler for the event. - - + Method @@ -3609,8 +3601,7 @@ xs a Override this method in a subclass to provide a default handler for the event. - - + Method @@ -3625,8 +3616,7 @@ xs a Override this method in a subclass to provide a default handler for the event. - - + Method @@ -3641,8 +3631,7 @@ xs a Override this method in a subclass to provide a default handler for the event. - - + Method @@ -3671,8 +3660,7 @@ xs - - + Method @@ -3697,8 +3685,7 @@ xs - - + Property @@ -3723,8 +3710,7 @@ xs - - + Method @@ -3738,8 +3724,7 @@ xs a Override this method in a subclass to provide a default handler for the event. - - + Property @@ -3751,8 +3736,7 @@ xs a - - + Property @@ -3771,8 +3755,7 @@ xs - - + Method @@ -3794,8 +3777,7 @@ xs - - + Constructor @@ -3805,8 +3787,7 @@ xs a - - + Property @@ -3822,8 +3803,7 @@ xs - - + Property @@ -3842,8 +3822,7 @@ Widgets are required to honor the size allocation they receive; a size request i None. - - + Property @@ -3855,8 +3834,7 @@ Widgets are required to honor the size allocation they receive; a size request i true if the widget is Mapped, false otherwise. None. - - + Property @@ -3868,8 +3846,7 @@ Widgets are required to honor the size allocation they receive; a size request i returns true if the widget is Realized None. - - + Property @@ -3881,8 +3858,7 @@ Widgets are required to honor the size allocation they receive; a size request i True if the NoWindow flag is set. None. - - + Property @@ -3894,8 +3870,7 @@ Widgets are required to honor the size allocation they receive; a size request i True if the Toplevel flag is set. None - - + Property @@ -3907,8 +3882,7 @@ Widgets are required to honor the size allocation they receive; a size request i True if the HasGrab flag is set. None. - - + Property @@ -3920,8 +3894,7 @@ Widgets are required to honor the size allocation they receive; a size request i True if the CompositeChild flag is set None - - + Property @@ -3933,8 +3906,7 @@ Widgets are required to honor the size allocation they receive; a size request i True if the AppPaintable flag is set None - - + Property @@ -3946,8 +3918,7 @@ Widgets are required to honor the size allocation they receive; a size request i True if the DoubleBuffered flag is set. None - - + Property @@ -3959,8 +3930,7 @@ Widgets are required to honor the size allocation they receive; a size request i True if the widget is able to be drawn on None - - + Method @@ -3974,8 +3944,7 @@ Widgets are required to honor the size allocation they receive; a size request i a to set None. - - + Method @@ -3989,6 +3958,5 @@ Widgets are required to honor the size allocation they receive; a size request i a to set None - - - + + \ No newline at end of file diff --git a/doc/en/Gtk/WidgetEventArgs.xml b/doc/en/Gtk/WidgetEventArgs.xml index 9c3410ccf..aa5b75142 100644 --- a/doc/en/Gtk/WidgetEventArgs.xml +++ b/doc/en/Gtk/WidgetEventArgs.xml @@ -46,4 +46,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/WidgetHelpType.xml b/doc/en/Gtk/WidgetHelpType.xml index 3012fe85d..b41fd46b4 100644 --- a/doc/en/Gtk/WidgetHelpType.xml +++ b/doc/en/Gtk/WidgetHelpType.xml @@ -69,4 +69,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/WindowStateEventArgs.xml b/doc/en/Gtk/WindowStateEventArgs.xml index 452a2032d..d46b418de 100644 --- a/doc/en/Gtk/WindowStateEventArgs.xml +++ b/doc/en/Gtk/WindowStateEventArgs.xml @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/doc/en/Pango/AttrClass.xml b/doc/en/Pango/AttrClass.xml index 91f364364..209eca79a 100644 --- a/doc/en/Pango/AttrClass.xml +++ b/doc/en/Pango/AttrClass.xml @@ -28,7 +28,7 @@ Returns an empty - + @@ -61,4 +61,4 @@ - + \ No newline at end of file diff --git a/doc/en/Pango/AttrFontDesc.xml b/doc/en/Pango/AttrFontDesc.xml index 9ddf94224..cabb43e65 100644 --- a/doc/en/Pango/AttrFontDesc.xml +++ b/doc/en/Pango/AttrFontDesc.xml @@ -28,7 +28,7 @@ Returns an empty - + @@ -92,4 +92,4 @@ - + \ No newline at end of file diff --git a/doc/en/Pango/AttrLanguage.xml b/doc/en/Pango/AttrLanguage.xml index 13423d265..22b745069 100644 --- a/doc/en/Pango/AttrLanguage.xml +++ b/doc/en/Pango/AttrLanguage.xml @@ -75,7 +75,7 @@ the PangoLanguage which is the value of the attribute a a - + @@ -92,4 +92,4 @@ - + \ No newline at end of file diff --git a/doc/en/Pango/Context.xml b/doc/en/Pango/Context.xml index ffdab1f79..81afc57a1 100644 --- a/doc/en/Pango/Context.xml +++ b/doc/en/Pango/Context.xml @@ -208,5 +208,18 @@ This is an internal constructor, and should not be used by user code. + + + Property + + Pango.FontFamily[] + + + + Returns an array of Font Families. + a + + + - \ No newline at end of file + diff --git a/doc/en/Pango/Coverage.xml b/doc/en/Pango/Coverage.xml index 46858f67b..9f2addeeb 100644 --- a/doc/en/Pango/Coverage.xml +++ b/doc/en/Pango/Coverage.xml @@ -155,21 +155,19 @@ - + Method System.Void - - + Convert a structure into a flat binary format. - location to store result - a - + a + - \ No newline at end of file + diff --git a/doc/en/Pango/Font.xml b/doc/en/Pango/Font.xml index 39032e8e1..4d5364c97 100644 --- a/doc/en/Pango/Font.xml +++ b/doc/en/Pango/Font.xml @@ -26,23 +26,6 @@ - - - Method - - System.Void - - - - - - - Free a group of descriptions. - an object of type - an object of type - - - Method @@ -192,4 +175,4 @@ - \ No newline at end of file + diff --git a/doc/en/Pango/FontFamily.xml b/doc/en/Pango/FontFamily.xml index d41634514..3aecb8a04 100644 --- a/doc/en/Pango/FontFamily.xml +++ b/doc/en/Pango/FontFamily.xml @@ -120,5 +120,19 @@ + + + Property + + Pango.FontFace[] + + + + To be added + The font faces that make up . + a + + + - \ No newline at end of file + diff --git a/doc/en/Pango/FontMap.xml b/doc/en/Pango/FontMap.xml index 41d2c2b51..d3c0f36d2 100644 --- a/doc/en/Pango/FontMap.xml +++ b/doc/en/Pango/FontMap.xml @@ -146,5 +146,18 @@ + + + Property + + Pango.FontFamily[] + + + + List all families for a fontmap. + a + + + - \ No newline at end of file + diff --git a/doc/en/Pango/Global.xml b/doc/en/Pango/Global.xml index b047a5f45..66c5eb9bc 100644 --- a/doc/en/Pango/Global.xml +++ b/doc/en/Pango/Global.xml @@ -74,22 +74,6 @@ The array must have one for each position in text; if text contains N characters, it has N+1 positions, including the last position at the end of the text. text should be an entire paragraph; logical attributes cannot be computed without context (for example you need to see spaces on either side of a word to know the word is a word). - - - Method - - System.Boolean - - - - - - Skips 0 or more characters of whitespace - a - a , which is true if there are non-whitespace characters before the end of the string. - - - Constructor @@ -223,5 +207,63 @@ If no delimiters are found, both a a , false if a parse error occurred. + + + Method + + System.Boolean + + + + + + Skips 0 or more characters of whitespace + a + a , which is true if there are non-whitespace characters before the end of the string. + + + + + + Method + + System.Boolean + + + + + + + Scans a string looking for an integer. An integer consists of up to 31 decimal digits. + a + a + a + To be added + + + + + Method + + System.Boolean + + + + + + + + + + Parses a markup text string into text and a list of attributes. + a + a + a + a + a + a + + + - \ No newline at end of file + diff --git a/doc/en/Pango/GlyphString.xml b/doc/en/Pango/GlyphString.xml index ba37bc0a4..b7cea89c6 100644 --- a/doc/en/Pango/GlyphString.xml +++ b/doc/en/Pango/GlyphString.xml @@ -266,4 +266,4 @@ - + \ No newline at end of file diff --git a/doc/en/Pango/Layout.xml b/doc/en/Pango/Layout.xml index c46fbf03f..7f7efcabc 100644 --- a/doc/en/Pango/Layout.xml +++ b/doc/en/Pango/Layout.xml @@ -207,22 +207,6 @@ The X coordinate of the resulting represents th - - - Method - - System.Int32 - - - - - - Retrieves an array of logical attributes for each character in the layout. - a - a - - - Method @@ -305,7 +289,6 @@ The X coordinate of the resulting represents th - Convert from X and Y position within a layout to the byte index to the character at that logical position. a , the X offset (in thousandths of a device unit) from the left edge of the layout. @@ -468,7 +451,8 @@ The X coordinate of the resulting represents th a object. an object of type an object of type - + + @@ -612,5 +596,38 @@ The X coordinate of the resulting represents th The count of lines for the layout. + + + Property + + Pango.LogAttr[] + + + + Retrieves an array of logical attributes for each character in the layout. + a + + + + + + Method + + System.Void + + + + + + + + Sets the text of a Layout includ + Sets the layout text and attribute list from marked-up text with an accelerator marker (see markup format). + marked-up text + the character following this char is underlined. + returns a parsed accelerator char from the marked-up text. + Replaces the current text and attribute list. + + diff --git a/doc/en/Pango/LayoutIter.xml b/doc/en/Pango/LayoutIter.xml index 416a31e0d..c4aae1c5c 100644 --- a/doc/en/Pango/LayoutIter.xml +++ b/doc/en/Pango/LayoutIter.xml @@ -267,4 +267,4 @@ - + \ No newline at end of file diff --git a/doc/en/Pango/LayoutLine.xml b/doc/en/Pango/LayoutLine.xml index b33f3c6ae..4082f58a0 100644 --- a/doc/en/Pango/LayoutLine.xml +++ b/doc/en/Pango/LayoutLine.xml @@ -44,27 +44,6 @@ If the result is zero, the line and all associated memory will be freed. - - - Method - - System.Void - - - - - - - - - Gets a list of visual ranges corresponding to a given logical range. - Start byte index of the logical range. If this value is less than the start index for the line, then the first range will extend all the way to the leading edge of the layout. Otherwise it will start at the leading edge of the first character. - Ending byte index of the logical range. If this value is greater than the end index for the line, then the last range will extend all the way to the trailing edge of the layout. Otherwise, it will end at the trailing edge of the last character. - location to store a pointer to an array of ranges. The array will be of length 2*n_ranges, with each range starting at (*ranges)[2*n] and of width (*ranges)[2*n + 1] - (*ranges)[2*n]. This array must be freed with g_free(). The coordinates are relative to the layout and are in . - The number of ranges stored in . - This list is not necessarily minimal - there may be consecutive ranges which are adjacent. The ranges will be sorted from left to right. The ranges are with respect to the left edge of the entire layout, not with respect to the line. - - Method @@ -191,5 +170,24 @@ This is an internal constructor, and should not be used by user code. + + + Method + + System.Void + + + + + + + + Gets a list of visual ranges corresponding to a given logical range. + Start byte index of the logical range. If this value is less than the start index for the line, then the first range will extend all the way to the leading edge of the layout. Otherwise it will start at the leading edge of the first character. + Ending byte index of the logical range. If this value is greater than the end index for the line, then the last range will extend all the way to the trailing edge of the layout. Otherwise, it will end at the trailing edge of the last character. + location to store an array of ranges. The array will be of length 2*n_ranges, with each range starting at (*ranges)[2*n] and of width (*ranges)[2*n + 1] - (*ranges)[2*n]. This array must be freed with g_free(). The coordinates are relative to the layout and are in . + This list is not necessarily minimal - there may be consecutive ranges which are adjacent. The ranges will be sorted from left to right. The ranges are with respect to the left edge of the entire layout, not with respect to the line. + + - \ No newline at end of file + diff --git a/doc/en/Pango/TabArray.xml b/doc/en/Pango/TabArray.xml index a7616b2ce..1b7c32de2 100644 --- a/doc/en/Pango/TabArray.xml +++ b/doc/en/Pango/TabArray.xml @@ -138,23 +138,6 @@ - - - Method - - System.Void - - - - - - - Gets the an array of alignments and positions. - a - a - - - Method @@ -186,5 +169,22 @@ Returns the native value for . + + + Method + + System.Void + + + + + + + Gets the an array of alignments and positions. + an array of indicating the alignment of each tab stop. + an array of indicating the location of each tab stop in pango units. + + + diff --git a/glib/Marshaller.cs b/glib/Marshaller.cs index 218cb4bd4..98e99307e 100644 --- a/glib/Marshaller.cs +++ b/glib/Marshaller.cs @@ -171,6 +171,28 @@ namespace GLib { { return local_epoch.AddSeconds ((int)time_t); } + + [DllImport("glibsharpglue")] + static extern IntPtr gtksharp_unichar_to_utf8_string (uint c); + + public static char GUnicharToChar (uint ucs4_char) + { + IntPtr raw_ret = gtksharp_unichar_to_utf8_string (ucs4_char); + string ret = GLib.Marshaller.PtrToStringGFree(raw_ret); + if (ret.Length > 1) + throw new ArgumentOutOfRangeException ("ucs4char is not representable by a char."); + + return ret [0]; + } + + [DllImport("glibsharpglue")] + static extern uint glibsharp_utf16_to_gunichar (ushort c); + + public static uint CharToGUnichar (char c) + { + return glibsharp_utf16_to_gunichar ((ushort) c); + } + } } diff --git a/glib/glue/unichar.c b/glib/glue/unichar.c index 9e08a08f5..b9faf9f9b 100644 --- a/glib/glue/unichar.c +++ b/glib/glue/unichar.c @@ -24,6 +24,7 @@ /* Forward declarations */ gchar *gtksharp_unichar_to_utf8_string (gunichar chr); +gunichar glibsharp_utf16_to_unichar (guint16 chr); /* */ gchar * @@ -35,3 +36,15 @@ gtksharp_unichar_to_utf8_string (gunichar chr) return buf; } +gunichar +glibsharp_utf16_to_unichar (guint16 chr) +{ + gunichar *ucs4_str; + gunichar result; + + ucs4_str = g_utf16_to_ucs4 (&chr, 1, NULL, NULL, NULL); + result = *ucs4_str; + g_free (ucs4_str); + return result; +} + diff --git a/pango/Context.custom b/pango/Context.custom new file mode 100644 index 000000000..392cefb3d --- /dev/null +++ b/pango/Context.custom @@ -0,0 +1,56 @@ +// Pango.Context.custom - Pango Context class customizations +// +// Authors: Mike Kestner +// +// Copyright (c) 2004 Novell, Inc. +// +// This code is inserted after the automatically generated code. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + [DllImport("libglib-2.0-0.dll")] + static extern void g_free (IntPtr raw); + + [DllImport("libpango-1.0-0.dll")] + static extern void pango_context_list_families(IntPtr raw, out IntPtr families, out int n_families); + + public FontFamily [] Families { + get { + int count; + IntPtr array_ptr; + pango_context_list_families (Handle, out array_ptr, out count); + if (array_ptr == IntPtr.Zero) + return new FontFamily [0]; + FontFamily [] result = new FontFamily [count]; + for (int i = 0; i < count; i++) { + IntPtr fam_ptr = Marshal.ReadIntPtr (new IntPtr ((int)array_ptr + i * IntPtr.Size)); + result [i] = GLib.Object.GetObject (fam_ptr) as FontFamily; + } + + g_free (array_ptr); + return result; + } + } + + [DllImport("libpango-1.0-0.dll")] + static extern void pango_context_list_families(IntPtr raw, IntPtr families, out int n_families); + + [Obsolete] + public int ListFamilies(Pango.FontFamily families) { + int n_families; + pango_context_list_families(Handle, families.Handle, out n_families); + return n_families; + } + diff --git a/pango/Coverage.custom b/pango/Coverage.custom new file mode 100644 index 000000000..19e35419c --- /dev/null +++ b/pango/Coverage.custom @@ -0,0 +1,38 @@ +// Pango.Coverage.custom - Pango Coverage class customizations +// +// Author: Mike Kestner +// +// Copyright (c) 2004 Novell, Inc. +// +// This code is inserted after the automatically generated code. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + [DllImport("libglib-2.0-0.dll")] + static extern void g_free (IntPtr raw); + + [DllImport("libpango-1.0-0.dll")] + static extern void pango_coverage_to_bytes (IntPtr raw, out IntPtr bytes, out int n_bytes); + + public void ToBytes(out byte[] bytes) + { + int count; + IntPtr array_ptr; + pango_coverage_to_bytes (Handle, out array_ptr, out count); + bytes = new byte [count]; + Marshal.Copy (array_ptr, bytes, 0, count); + g_free (array_ptr); + } + diff --git a/pango/FontFamily.custom b/pango/FontFamily.custom new file mode 100644 index 000000000..2095467e7 --- /dev/null +++ b/pango/FontFamily.custom @@ -0,0 +1,56 @@ +// Pango.FontFamily.custom - Pango FontFamily class customizations +// +// Authors: Mike Kestner +// +// Copyright (c) 2004 Novell, Inc. +// +// This code is inserted after the automatically generated code. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + [DllImport("libglib-2.0-0.dll")] + static extern void g_free (IntPtr raw); + + [DllImport("libpango-1.0-0.dll")] + static extern void pango_font_family_list_faces(IntPtr raw, out IntPtr faces, out int n_faces); + + public FontFace [] Faces { + get { + int count; + IntPtr array_ptr; + pango_font_family_list_faces (Handle, out array_ptr, out count); + if (array_ptr == IntPtr.Zero) + return new FontFace [0]; + FontFace [] result = new FontFace [count]; + for (int i = 0; i < count; i++) { + IntPtr fam_ptr = Marshal.ReadIntPtr (new IntPtr ((int)array_ptr + i * IntPtr.Size)); + result [i] = GLib.Object.GetObject (fam_ptr) as FontFace; + } + + g_free (array_ptr); + return result; + } + } + + [DllImport("libpango-1.0-0.dll")] + static extern void pango_font_family_list_faces(IntPtr raw, IntPtr faces, out int n_faces); + + [Obsolete] + public int ListFaces(Pango.FontFace faces) { + int n_faces; + pango_font_family_list_faces(Handle, faces.Handle, out n_faces); + return n_faces; + } + diff --git a/pango/FontMap.custom b/pango/FontMap.custom new file mode 100644 index 000000000..c6575b68b --- /dev/null +++ b/pango/FontMap.custom @@ -0,0 +1,56 @@ +// Pango.FontMap.custom - Pango FontMap class customizations +// +// Authors: Mike Kestner +// +// Copyright (c) 2004 Novell, Inc. +// +// This code is inserted after the automatically generated code. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + [DllImport("libglib-2.0-0.dll")] + static extern void g_free (IntPtr raw); + + [DllImport("libpango-1.0-0.dll")] + static extern void pango_font_map_list_families(IntPtr raw, out IntPtr families, out int n_families); + + public FontFamily [] Families { + get { + int count; + IntPtr array_ptr; + pango_font_map_list_families (Handle, out array_ptr, out count); + if (array_ptr == IntPtr.Zero) + return new FontFamily [0]; + FontFamily [] result = new FontFamily [count]; + for (int i = 0; i < count; i++) { + IntPtr fam_ptr = Marshal.ReadIntPtr (new IntPtr ((int)array_ptr + i * IntPtr.Size)); + result [i] = GLib.Object.GetObject (fam_ptr) as FontFamily; + } + + g_free (array_ptr); + return result; + } + } + + [DllImport("libpango-1.0-0.dll")] + static extern void pango_font_map_list_families(IntPtr raw, IntPtr families, out int n_families); + + [Obsolete] + public int ListFamilies(Pango.FontFamily families) { + int n_families; + pango_font_map_list_families(Handle, families.Handle, out n_families); + return n_families; + } + diff --git a/pango/Global.custom b/pango/Global.custom new file mode 100644 index 000000000..e9c12c582 --- /dev/null +++ b/pango/Global.custom @@ -0,0 +1,46 @@ +// Pango.Global.custom - Pango Global class customizations +// +// Authors: Mike Kestner +// +// Copyright (c) 2004 Novell, Inc. +// +// This code is inserted after the automatically generated code. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + [DllImport("libpango-1.0-0.dll")] + static extern bool pango_scan_int(string pos, out int out_param); + + [Obsolete] + public static bool ScanInt(string pos, out int out_param) { + bool raw_ret = pango_scan_int(pos, out out_param); + bool ret = raw_ret; + return ret; + } + + [DllImport("libpango-1.0-0.dll")] + static extern bool pango_parse_markup (string markup, int length, uint accel_marker, out IntPtr attr_list_handle, out string text, out uint accel_char, IntPtr err); + + public static bool ParseMarkup (string markup, char accel_marker, out Pango.AttrList attrs, out string text, out char accel_char) + { + uint ucs4_accel_char; + IntPtr attrs_handle; + bool result = pango_parse_markup (markup, -1, GLib.Marshaller.CharToGUnichar (accel_marker), out attrs_handle, out text, out ucs4_accel_char, IntPtr.Zero); + accel_char = GLib.Marshaller.GUnicharToChar (ucs4_accel_char); + attrs = new Pango.AttrList (attrs_handle); + return result; + } + + diff --git a/pango/Layout.custom b/pango/Layout.custom index efacb871b..dfac7e591 100644 --- a/pango/Layout.custom +++ b/pango/Layout.custom @@ -37,3 +37,37 @@ public LayoutLine[] Lines { } } +[DllImport("libpango-1.0-0.dll")] +static extern void pango_layout_set_markup_with_accel (IntPtr raw, string markup, int length, uint accel_marker, out uint accel_char); + +public void SetMarkupWithAccel (string markup, char accel_marker, out char accel_char) +{ + uint ucs4_accel_char; + pango_layout_set_markup_with_accel (Handle, markup, -1, GLib.Marshaller.CharToGUnichar (accel_marker), out ucs4_accel_char); + accel_char = GLib.Marshaller.GUnicharToChar (ucs4_accel_char); +} + + [DllImport("libglib-2.0-0.dll")] + static extern void g_free (IntPtr raw); + + [DllImport("libpango-1.0-0.dll")] + static extern void pango_layout_get_log_attrs (IntPtr raw, out IntPtr attrs, out int n_attrs); + + public LogAttr [] LogAttrs { + get { + int count; + IntPtr array_ptr; + pango_layout_get_log_attrs (Handle, out array_ptr, out count); + if (array_ptr == IntPtr.Zero) + return new LogAttr [0]; + LogAttr [] result = new LogAttr [count]; + for (int i = 0; i < count; i++) { + IntPtr fam_ptr = Marshal.ReadIntPtr (new IntPtr ((int)array_ptr + i * IntPtr.Size)); + result [i] = LogAttr.New (fam_ptr); + } + + g_free (array_ptr); + return result; + } + } + diff --git a/pango/LayoutLine.custom b/pango/LayoutLine.custom index 1e017b9b6..5bd816122 100644 --- a/pango/LayoutLine.custom +++ b/pango/LayoutLine.custom @@ -1,6 +1,7 @@ // Pango.LayoutLine.custom - Pango LayoutLine class customizations // // Authors: Jeroen Zwartepoorte // // Copyright (c) 2004 Novell, Inc. // @@ -52,3 +53,31 @@ public int Length { return pangosharp_pango_layout_line_get_length (Handle); } } + + +[DllImport("libglib-2.0-0.dll")] +static extern void g_free (IntPtr raw); + +[DllImport("libpango-1.0-0.dll")] +static extern void pango_layout_line_get_x_ranges(IntPtr raw, int start_index, int end_index, out IntPtr ranges_handle, out int n_ranges); + +public void GetXRanges(int start_index, int end_index, out int[][] ranges) +{ + // FIXME: this is broke + throw new NotImplementedException (); + /* + int count; + IntPtr array_ptr; + pango_layout_line_get_x_ranges(Handle, start_index, end_index, out array_ptr, out count); + ranges = new int[count] []; + for (int i = 0; i < count; i++) { + IntPtr tmp = new IntPtr (array_ptr + 2 * i * IntPtr.Size); + IntPtr rng_ptr = Marshal.ReadIntPtr (tmp); + IntPtr end_ptr = Marshal.ReadIntPtr (tmp, IntPtr.Size); + + } + Marshal.Copy (array_ptr, ranges, 0, count); + g_free (array_ptr); + */ +} + diff --git a/pango/Makefile.am b/pango/Makefile.am index 2c0a125e9..4205c0c48 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -22,9 +22,15 @@ dist_sources = $(sources) customs = \ AttrIterator.custom \ + Context.custom \ + Coverage.custom \ + FontFamily.custom \ + FontMap.custom \ + Global.custom \ GlyphItem.custom \ Layout.custom \ - LayoutLine.custom + LayoutLine.custom \ + TabArray.custom build_customs = $(addprefix $(srcdir)/, $(customs)) dist_customs = $(customs) diff --git a/pango/Pango.metadata b/pango/Pango.metadata index fb8d16d5f..67ecb9609 100644 --- a/pango/Pango.metadata +++ b/pango/Pango.metadata @@ -1,22 +1,39 @@ - out - out - out + 1 + 1 + 1 + 1 + 1 + 1 1 + ref + 1 + 1 + ref + 1 + 1 + 1 + 1 + 1 out out 1 + 1 out out out out + 1 1 1 + 1 1 1 ref 1 ref 1 + 1 + 1 diff --git a/pango/TabArray.custom b/pango/TabArray.custom new file mode 100644 index 000000000..66ac1a352 --- /dev/null +++ b/pango/TabArray.custom @@ -0,0 +1,46 @@ +// Pango.TabArray.custom - Pango TabArray class customizations +// +// Author: Mike Kestner +// +// Copyright (c) 2004 Novell, Inc. +// +// This code is inserted after the automatically generated code. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + [DllImport("libglib-2.0-0.dll")] + static extern void g_free (IntPtr raw); + + [DllImport("libpango-1.0-0.dll")] + static extern void pango_tab_array_get_tabs (IntPtr raw, out IntPtr alignments, out IntPtr locations); + + public void GetTabs (out TabAlign[] alignments, out int[] locations) + { + int sz = Size; + IntPtr align_ptr, loc_ptr; + alignments = new TabAlign [sz]; + locations = new int [sz]; + int[] tmp = new int [sz]; + if (sz == 0) + return; + pango_tab_array_get_tabs (Handle, out align_ptr, out loc_ptr); + Marshal.Copy (loc_ptr, locations, 0, sz); + Marshal.Copy (align_ptr, tmp, 0, sz); + for (int i = 0; i < sz; i++) + alignments [i] = (TabAlign) tmp [i]; + g_free (align_ptr); + g_free (loc_ptr); + } + diff --git a/pango/pango-sharp.dll.config.in b/pango/pango-sharp.dll.config.in index cbfa9a76d..12368fdbc 100644 --- a/pango/pango-sharp.dll.config.in +++ b/pango/pango-sharp.dll.config.in @@ -1,3 +1,4 @@ +