From aa54aa2c95e7aaef47f855e7c855fea043934706 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Wed, 29 Sep 2004 18:45:59 +0000 Subject: [PATCH] 2004-09-29 Mike Kestner * gtk/Gtk.metadata : hide some ellipsis methods, add pass_as attrs. * gtk/Object.custom : new IsFloating property. * gtk/glue/object.c : new gtksharp_object_set_floating glue. svn path=/trunk/gtk-sharp/; revision=34529 --- ChangeLog | 6 ++ doc/en/Gtk/ListStore.xml | 186 +++++++++++++++++++++------------------ doc/en/Gtk/Object.xml | 15 +++- doc/en/Gtk/Tree.xml | 43 ++++----- doc/en/Gtk/TreeStore.xml | 86 ++++++++++-------- doc/en/Gtk/Widget.xml | 35 ++++---- gtk/Gtk.metadata | 9 ++ gtk/Object.custom | 13 +++ gtk/glue/object.c | 10 +++ 9 files changed, 236 insertions(+), 167 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18fbc2f1e..8201aeb97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-09-29 Mike Kestner + + * gtk/Gtk.metadata : hide some ellipsis methods, add pass_as attrs. + * gtk/Object.custom : new IsFloating property. + * gtk/glue/object.c : new gtksharp_object_set_floating glue. + 2004-09-29 Mike Kestner * generator/GStringGen.cs : new generatable impl for GStrings. diff --git a/doc/en/Gtk/ListStore.xml b/doc/en/Gtk/ListStore.xml index 837b57c07..c6f4b6b11 100644 --- a/doc/en/Gtk/ListStore.xml +++ b/doc/en/Gtk/ListStore.xml @@ -71,8 +71,6 @@ To be added - - Method @@ -118,8 +116,8 @@ Sets a sort function to be used for the column . A for the column number. - A - A + A + A A , function that will be run on destruction of @@ -137,8 +135,8 @@ Set the function that will be used by default to sort columns. - A - A (FIXME: explain this) + A + A (FIXME: explain this) A , function that will be run on destruction of @@ -154,9 +152,9 @@ - Returns true if the row at can + Returns true if the row at can have dropped on it. - A + A A A boolean. @@ -175,7 +173,7 @@ Drags data received into this object. A , the destination path of the drag - A , the data that was dragged + A , the data that was dragged A boolean, true if the data was successfully received. @@ -194,9 +192,9 @@ Method used when this ListStore is part of a source widget for a drag-and-drop operation; gets the data that was dragged from the associated widget. - a - A - A , true if the operation succeeded. + a + A + A , true if the operation succeeded. @@ -227,8 +225,8 @@ When this ListStore is the data source for a drag operation and the drag operation is a move, this method runs to delete the data after the data has been received by the target widget. - A , the path of the data to delete. - A , true if the operation succeeds. + A , the path of the data to delete. + A , true if the operation succeeds. @@ -243,9 +241,9 @@ - Fires a event. Call this after changing a row so that the view widget for this ListStore will update. - a - a + Fires a event. Call this after changing a row so that the view widget for this ListStore will update. + a + a @@ -260,7 +258,7 @@ Runs a method on every row of a ListStore. - A to run over every row. + A to run over every row. @@ -274,9 +272,9 @@ - Initializes with the first iterator in the ListStore (the top item). - A to reset - A , true if the operation is successful, false if the ListStore is empty. + Initializes with the first iterator in the ListStore (the top item). + A to reset + A , true if the operation is successful, false if the ListStore is empty. @@ -291,10 +289,10 @@ - Emits a event. This is meant to be called whenever the child state of a node changes. - a to pass to the event - a to pass to the event - This is mandated by the , but it + Emits a event. This is meant to be called whenever the child state of a node changes. + a to pass to the event + a to pass to the event + This is mandated by the , but it shouldn't get used much for ListStores because they don't generally have child nodes. @@ -309,9 +307,9 @@ - Turns a specified by into a . - a - a + Turns a specified by into a . + a + a @@ -326,9 +324,9 @@ Tests whether a given row has a child node. - a - A , always false for ListStores. - This is mandated by + a + A , always false for ListStores. + This is mandated by @@ -341,12 +339,12 @@ - Lets the ListStore reference the row pointed to by . - a + Lets the ListStore reference the row pointed to by . + a - This function is primarily meant as a way for views to let caching model know when nodes are being displayed (and hence, whether or not to cache that node.) For example, a file-system based model would not want to keep the entire file-hierarchy in memory, just the sections that are currently being displayed by every current view. - A model should be expected to be able to get an iter independent of its reffed state. - + This function is primarily meant as a way for views to let caching model know when nodes are being displayed (and hence, whether or not to cache that node.) For example, a file-system based model would not want to keep the entire file-hierarchy in memory, just the sections that are currently being displayed by every current view. + A model should be expected to be able to get an iter independent of its reffed state. + @@ -359,9 +357,9 @@ - Returns the number of children that has. If is null, as in the case of all ListStore objects, this will return the number of top-level items. + Returns the number of children that has. If is null, as in the case of all ListStore objects, this will return the number of top-level items. a - a + a FIXME: Why does ListStore.custom call gtk_tree_model_iter_n_children? @@ -378,7 +376,7 @@ Fires a event. a to pass to the event. - a see cref="T:Gtk.TreeIter" /> to pass to the event. + a see cref="T:Gtk.TreeIter" /> to pass to the event. @@ -425,15 +423,15 @@ Lets the ListStore unref the row at . - a - - This is an optional method + a + + This is an optional method for models to implement. To be more specific, models may ignore this call as it exists primarily for performance reasons. - For more information on what this means, see + For more information on what this means, see . Please note that nodes that are deleted are not unreffed. - + @@ -445,7 +443,7 @@ Removes all data from the store. - + @@ -478,9 +476,9 @@ Sets the value of the specified column in the row pointed by . - a - a , the column number - a + a + a , the column number + a The type of specified column must be a . @@ -532,7 +530,7 @@ The flags for this ListStore. - A + A Flags are about the shape of this object's data; see the class documentation for more details. @@ -620,11 +618,11 @@ - Sets to be the child of this ListStore, using the given index. The first index is 0. If is too big, or this ListStore has no rows, is set to an invalid iterator and false is returned. For ListStore objects, the th root node is set, since they don't have a tree-like structure. + Sets to be the child of this ListStore, using the given index. The first index is 0. If is too big, or this ListStore has no rows, is set to an invalid iterator and false is returned. For ListStore objects, the th root node is set, since they don't have a tree-like structure. - a - a - a , true if has an th child. + a + a + a , true if has an th child. This is a custom binding for Gtk# which assumes that the current object is the parent. An alternate invocation form that parallels the C API is available. @@ -640,12 +638,11 @@ - - Sets to be the child of , using the given index. The first index is 0. If is too big, or has no children, is set to an invalid iterator and false is returned. will remain a valid node after this function has been called. As a special case, if is , then the th root node is set. + Sets to be the child of , using the given index. The first index is 0. If is too big, or has no children, is set to an invalid iterator and false is returned. will remain a valid node after this function has been called. As a special case, if is , then the th root node is set. - a - a - a , true if has an th child. + a + a + a , true if has an th child. This invocation form is closer to the underlying C API, but it's probably less useful for most C# purposes. @@ -660,11 +657,11 @@ - Marshals a path string into a object that points to a row in this tree. - a to be set by this method + Marshals a path string into a object that points to a row in this tree. + a to be set by this method A path string - A , true if this string is a valid path for this ListStore. - + A , true if this string is a valid path for this ListStore. + @@ -678,10 +675,12 @@ - - , an object that will be set to point to the first child. - a , the parent row. - A , true if has children. + + + + , an object that will be set to point to the first child. + a , the parent row. + A , true if has children. In general, this will return false, as ListStore isn't tree-shaped. However, if is , will return the list itself, since they're all children of the root. @@ -696,7 +695,7 @@ - Gets an iterator object for the given . + Gets an iterator object for the given . a to set to point to the row. a A , true if the row exists @@ -714,7 +713,7 @@ - Gets the parent row of . + Gets the parent row of . a to set to point to the row. a , the child row whose parent we want to get A , true if the parent exists. Since ListStore objects aren't tree-shaped, this will always return false. @@ -780,10 +779,10 @@ - Move the row pointed to by to the - position after . If - is , - will be moved to point to the start + Move the row pointed to by to the + position after . If + is , + will be moved to point to the start of the list. a @@ -819,10 +818,10 @@ - Move the row pointed to by to the - position before . If - is , - will be moved to point to the end + Move the row pointed to by to the + position before . If + is , + will be moved to point to the end of the list. a @@ -840,9 +839,9 @@ - Test whether is valid for this ListStore. + Test whether is valid for this ListStore. a - a , true if is valid. + a , true if is valid. WARNING: this method is slow and is only intended for debugging/testing purposes. @@ -1030,8 +1029,8 @@ The above example creates a new three columns list store. The types of the colum - Gets the data from row of column - . + Gets the data from row of column + . a , the row to look in a , the column number to look in a @@ -1049,7 +1048,7 @@ The above example creates a new three columns list store. The types of the colum Find out whether this ListStore has a default sort function. a , true if there is a default sort function. - To set a default sort function, use . + To set a default sort function, use . @@ -1078,10 +1077,10 @@ The above example creates a new three columns list store. The types of the colum Sets what types go in each column of a ListStore. a This function is meant primarily for #GObjects that inherit - from and should only be used when - constructing a new . It will not + from and should only be used when + constructing a new . It will not function after a row has been added or after a method on the - interface has been called. + interface has been called. @@ -1349,11 +1348,11 @@ The above example creates a new three columns list store. The types of the colum - Fires a event. + Fires a event. a , pointer to the row whose children have been reordered a , pointer to the row whose children have been reordered a - This is part of the implementation of . It should be called by other class methods that reorder rows so that the proper events are fired. (FIXME: since lists don't have parents/children, how does this get used in practice? There should be an example here.) + This is part of the implementation of . It should be called by other class methods that reorder rows so that the proper events are fired. (FIXME: since lists don't have parents/children, how does this get used in practice? There should be an example here.) @@ -1385,7 +1384,7 @@ The above example creates a new three columns list store. The types of the colum Gets the value of row of column - and puts it in . + and puts it in . a a @@ -1409,5 +1408,16 @@ The above example creates a new three columns list store. The types of the colum + + + Constructor + + + + To be added + a + To be added + + - + \ No newline at end of file diff --git a/doc/en/Gtk/Object.xml b/doc/en/Gtk/Object.xml index 620bd6eb7..f510f06c3 100644 --- a/doc/en/Gtk/Object.xml +++ b/doc/en/Gtk/Object.xml @@ -177,5 +177,18 @@ The object is only destroyed if all the references to the object are released, t Internal constructor. + + + Property + + System.Boolean + + + + Determines if the object reference is floating. + a + An object is floating until it is added to a container which claims ownership of the floating reference. + + - \ No newline at end of file + diff --git a/doc/en/Gtk/Tree.xml b/doc/en/Gtk/Tree.xml index 04d9ba9f4..0521b8c90 100644 --- a/doc/en/Gtk/Tree.xml +++ b/doc/en/Gtk/Tree.xml @@ -46,26 +46,6 @@ - - - Method - - System.Boolean - - - - - - - - Deprecated. - a - a - a - a - - - Constructor @@ -77,5 +57,26 @@ + + + Method + + System.Boolean + + + + + + + + Gets row information from a Drag Selection. + a + a + a + a + + + + - \ No newline at end of file + diff --git a/doc/en/Gtk/TreeStore.xml b/doc/en/Gtk/TreeStore.xml index a2a1aaa1f..296c5f00a 100644 --- a/doc/en/Gtk/TreeStore.xml +++ b/doc/en/Gtk/TreeStore.xml @@ -128,10 +128,9 @@ Sets which column is to be used to sort the data in the tree. - A , the sort column index. - A , the kind of sort to use - - + A , the sort column index. + A , the kind of sort to use + @@ -148,11 +147,11 @@ Sets a function that should be used to be sort a particular column. - A , the index of the column to be sorted - A , the function to use for sorting - An , pointer to the user data, or - A to be called when user data is destroyed, or . - This method is meant to be used together with .(FIXME: explain the user data parameter.) + A , the index of the column to be sorted + A , the function to use for sorting + An , pointer to the user data, or + A to be called when user data is destroyed, or . + This method is meant to be used together with .(FIXME: explain the user data parameter.) @@ -167,11 +166,11 @@ - Sets a function that should be used to be sort columns by default if not otherwise specified by . - A , the function to use for sorting - An , pointer to the user data, or - A to be called when user data is destroyed, or . - This method is meant to be used together with .(FIXME: explain the user data parameter.) + Sets a function that should be used to be sort columns by default if not otherwise specified by . + A , the function to use for sorting + An , pointer to the user data, or + A to be called when user data is destroyed, or . + This method is meant to be used together with .(FIXME: explain the user data parameter.) @@ -185,11 +184,11 @@ - Tests whether can be dropped on . + Tests whether can be dropped on . a , potential drop destination a , potential data to be dropped. a , true if drop is allowed - + @@ -205,7 +204,7 @@ Drags data received into this object. A , the destination path of the drag - A , the data that was dragged + A , the data that was dragged A boolean, true if the data was successfully received. @@ -224,9 +223,9 @@ Method used when this TreeStore is part of a source widget for a drag-and-drop operation; gets the data that was dragged from the associated widget. - a - A - A , true if the operation succeeded. + a + A + A , true if the operation succeeded. @@ -257,8 +256,8 @@ When this TreeStore is the data source for a drag operation and the drag operation is a move, this method runs to delete the data after the data has been received by the target widget. - A , the path of the data to delete. - A , true if the operation succeeds. + A , the path of the data to delete. + A , true if the operation succeeds. @@ -938,10 +937,10 @@ - Move the row pointed to by to the - position after . If - is , - will be moved to point to the start + Move the row pointed to by to the + position after . If + is , + will be moved to point to the start of the list. a @@ -977,10 +976,10 @@ - Move the row pointed to by to the - position before . If - is , - will be moved to point to the end + Move the row pointed to by to the + position before . If + is , + will be moved to point to the end of the list. a @@ -998,9 +997,9 @@ - Test whether is valid for this TreeStore. + Test whether is valid for this TreeStore. a - a , true if is valid. + a , true if is valid. WARNING: this method is slow and is only intended for debugging/testing purposes. @@ -1206,7 +1205,7 @@ store = new TreeStore (typeof (int), typeof (string)); Find out whether this TreeStore has a default sort function. a , true if there is a default sort function. - To set a default sort function, use . + To set a default sort function, use . @@ -1235,10 +1234,10 @@ store = new TreeStore (typeof (int), typeof (string)); Sets what types go in each column of a ListStore. a This function is meant primarily for #GObjects that inherit - from and should only be used when - constructing a new . It will not + from and should only be used when + constructing a new . It will not function after a row has been added or after a method on the - interface has been called. + interface has been called. @@ -1549,7 +1548,7 @@ store = new TreeStore (typeof (int), typeof (string)); Gets the value of row of column - and puts it in . + and puts it in . a a @@ -1573,5 +1572,16 @@ store = new TreeStore (typeof (int), typeof (string)); If there is no next iter, is returned and iter is set to be invalid. + + + Constructor + + + + To be added + a + To be added + + - + \ No newline at end of file diff --git a/doc/en/Gtk/Widget.xml b/doc/en/Gtk/Widget.xml index bd984ec75..8609a7742 100644 --- a/doc/en/Gtk/Widget.xml +++ b/doc/en/Gtk/Widget.xml @@ -403,25 +403,6 @@ - - - Method - - System.Void - - - - - - Obtains ->. - A to be filled in. - - - Obtains ->, unless someone has forced a particular geometry, in which case it returns that geometry instead of the widget's . This method differs from in that it retrieves the last size request value from ->, while the method computes the size request and fill in ->, and only then returns ->. - - - - Method @@ -3970,4 +3951,20 @@ Widgets are required to honor the size allocation they receive; a size request i a vertical plane Override this method in a subclass to support scrolling of the widget within a viewport smaller than the widget's size. + + + Property + + Gtk.Requisition + + + + Obtains the widget's requisition. + a + + + Obtains requisition, unless someone has forced a particular geometry, in which case it returns that geometry instead of the widget's requisition. This method differs from in that it retrieves the last size request value, while the method recomputes the size request and fills in the requisition, and then returns the recomputed value. + + + diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata index ec746091f..b1e6aa76a 100644 --- a/gtk/Gtk.metadata +++ b/gtk/Gtk.metadata @@ -40,6 +40,8 @@ StockManager 1 ref + out + out 1 1 1 @@ -55,6 +57,7 @@ TextDeleted TextInserted out + 1 out out ref @@ -146,6 +149,7 @@ 1 1 ScrollAdjustmentsSet + 1 1 out out @@ -172,6 +176,7 @@ 1 Deactivated 1 + 1 Destroyed 1 1 @@ -250,6 +255,7 @@ out out 1 + 1 1 out out @@ -258,6 +264,7 @@ out ref 1 + 1 Click 1 1 @@ -287,9 +294,11 @@ 1 1 1 + 1 out 1 ProcessEvent + out 1 1 1 diff --git a/gtk/Object.custom b/gtk/Object.custom index 69961c34e..b975819c9 100755 --- a/gtk/Object.custom +++ b/gtk/Object.custom @@ -24,6 +24,9 @@ [DllImport("gtksharpglue")] private static extern bool gtksharp_object_is_floating (IntPtr raw); + [DllImport("gtksharpglue")] + private static extern bool gtksharp_object_set_floating (IntPtr raw, bool val); + [DllImport("libgobject-2.0-0.dll")] private static extern void g_object_ref (IntPtr raw); @@ -43,3 +46,13 @@ // System.Diagnostics.Debug.WriteLine ("Gtk.Object:set_Raw: object type is: " + (this as GLib.Object).GType.Name + " refcount now: " + RefCount + " needs_ref: " + needs_ref); } } + + public bool IsFloating { + get { + return gtksharp_object_is_floating (Handle); + } + set { + gtksharp_object_set_floating (Handle, value); + } + } + diff --git a/gtk/glue/object.c b/gtk/glue/object.c index c85bcc197..489bad48d 100644 --- a/gtk/glue/object.c +++ b/gtk/glue/object.c @@ -25,6 +25,7 @@ /* Forward declarations */ void gtksharp_object_unref_if_floating (GObject *obj); gboolean gtksharp_object_is_floating (GObject *obj); +void gtksharp_object_set_floating (GtkObject *obj, gboolean val); /* */ void @@ -40,3 +41,12 @@ gtksharp_object_is_floating (GObject *obj) return GTK_OBJECT_FLOATING (obj); } +void +gtksharp_object_set_floating (GtkObject *obj, gboolean val) +{ + if (val == TRUE) + GTK_OBJECT_SET_FLAGS (obj, GTK_FLOATING); + else + gtk_object_sink (obj); +} +