Changeset 517

Timestamp:

07/05/08 10:03:45 (2 months ago)

Author:

Mike Wey

Message:

Implement TreeModel? as an interface - see Ticket #24

Files:

• trunk/src/build/gtkD.d (modified) (1 diff)
• trunk/src/gtk/CellView.d (modified) (4 diffs)
• trunk/src/gtk/ComboBox.d (modified) (7 diffs)
• trunk/src/gtk/ComboBoxEntry.d (modified) (3 diffs)
• trunk/src/gtk/EntryCompletion.d (modified) (10 diffs)
• trunk/src/gtk/IconView.d (modified) (6 diffs)
• trunk/src/gtk/ListStore.d (modified) (6 diffs)
• trunk/src/gtk/TreeDragSource.d (modified) (3 diffs)
• trunk/src/gtk/TreeIter.d (modified) (5 diffs)
• trunk/src/gtk/TreeModel.d (modified) (4 diffs)
• trunk/src/gtk/TreeModelFilter.d (modified) (7 diffs)
• trunk/src/gtk/TreeModelIF.d (added)
• trunk/src/gtk/TreeModelSort.d (modified) (7 diffs)
• trunk/src/gtk/TreeModelT.d (added)
• trunk/src/gtk/TreePath.d (modified) (3 diffs)
• trunk/src/gtk/TreeRowReference.d (modified) (7 diffs)
• trunk/src/gtk/TreeSelection.d (modified) (4 diffs)
• trunk/src/gtk/TreeStore.d (modified) (5 diffs)
• trunk/src/gtk/TreeView.d (modified) (9 diffs)
• trunk/src/gtk/TreeViewColumn.d (modified) (4 diffs)
• trunk/src/gtk/Widget.d (modified) (1 diff)
• trunk/src/gtkc/gtk.d (modified) (5 diffs)
• trunk/src/gtkc/gtktypes.d (modified) (1 diff)
• trunk/wrap/APILookupGtk.txt (modified) (34 diffs)
• trunk/wrap/utils/GtkDClass.d (modified) (1 diff)
• trunk/wrap/utils/funct.d (modified) (3 diffs)

trunk/src/build/gtkD.d

@@ -272 +272 @@
-private import gtk.TextView;
-private import gtk.TextChildAnchor;
-
+
+
+
-private import gtk.TreeIter;
-private import gtk.TreePath;
-private import gtk.TreeRowReference;
-private import gtk.TreeIterError;
+private import gtk.TreeModel;
-private import gtk.TreeSelection;
-private import gtk.TreeViewColumn;

trunk/src/gtk/CellView.d

@@ -48 +48 @@
- *  - glib.Str
- *  - gdk.Pixbuf
-
+IF
- *  - gtk.TreePath
- *  - gdk.Color
@@ -56 +56 @@
- *  - GdkColor* -> Color
- *  - GdkPixbuf* -> Pixbuf
-
+IF
- *  - GtkTreePath* -> TreePath
- * module aliases:
@@ -72 +72 @@
-private import glib.Str;
-private import gdk.Pixbuf;
-
+IF
-private import gtk.TreePath;
-private import gdk.Color;
@@ -202 +202 @@
-     * model =  a GtkTreeModel
-     */
-
+IF
-    {
-        // void gtk_cell_view_set_model (GtkCellView *cell_view,  GtkTreeModel *model);
-
+T
-    }
-    

trunk/src/gtk/ComboBox.d

@@ -50 +50 @@
- *  - glib.Str
- *  - gtk.TreeModel
+ *  - gtk.TreeModelIF
- *  - gtk.TreeIter
- *  - gtk.CellRenderer
@@ -58 +59 @@
- *  - AtkObject* -> ObjectAtk
- *  - GtkTreeIter* -> TreeIter
-
+IF
- * module aliases:
- * local aliases:
@@ -76 +77 @@
-private import glib.Str;
-private import gtk.TreeModel;
+private import gtk.TreeModelIF;
-private import gtk.TreeIter;
-private import gtk.CellRenderer;
@@ -207 +209 @@
-    {
-        TreeIter iter = new TreeIter();
-
+IF
-        iter.setModel(model);
-        int index = 0;
@@ -401 +403 @@
-     * model =  A GtkTreeModel.
-     */
-
+IF
-    {
-        // GtkWidget* gtk_combo_box_new_with_model (GtkTreeModel *model);
-
+T
-        if(p is null)
-        {
@@ -550 +552 @@
-     * Returns: A GtkTreeModel which was passed during construction.
-     */
-
+IF
-    {
-        // GtkTreeModel* gtk_combo_box_get_model (GtkComboBox *combo_box);
@@ -572 +574 @@
-     * model =  A GtkTreeModel
-     */
-
+IF
-    {
-        // void gtk_combo_box_set_model (GtkComboBox *combo_box,  GtkTreeModel *model);
-
+T
-    }
-    

trunk/src/gtk/ComboBoxEntry.d

@@ -45 +45 @@
- * omit signals:
- * imports:
-
+IF
- *  - gtk.Adjustment
- * structWrap:
- *  - GtkAdjustment* -> Adjustment
-
+IF
- * module aliases:
- * local aliases:
@@ -62 +62 @@
-
-
-
+IF
-private import gtk.Adjustment;
-
@@ -175 +175 @@
-     * textColumn =  A column in model to get the strings from.
-     */
-
+IF
-    {
-        // GtkWidget* gtk_combo_box_entry_new_with_model (GtkTreeModel *model,  gint text_column);
-
+T
-        if(p is null)
-        {

trunk/src/gtk/EntryCompletion.d

@@ -47 +47 @@
- *  - gtk.Widget
- *  - gtk.TreeModel
+ *  - gtk.TreeModelIF
- * structWrap:
-
+IF
- *  - GtkWidget* -> Widget
- * module aliases:
@@ -67 +68 @@
-private import gtk.Widget;
-private import gtk.TreeModel;
+private import gtk.TreeModelIF;
-
-
@@ -174 +176 @@
-    }
-    
-
+IF
-    /**
-     * Gets emitted when a match from the cursor is on a match
@@ -182 +184 @@
-     * Since 2.12
-     */
-
+IF
-    {
-        if ( !("cursor-on-match" in connectedSignals) )
@@ -201 +203 @@
-        bool consumed = false;
-        
-
+IF
-        {
-            dlg(new TreeModel(model), iter, entryCompletion);
@@ -247 +249 @@
-    }
-    
-
+IF
-    /**
-     * Gets emitted when a match from the list is selected.
@@ -255 +257 @@
-     * Since 2.4
-     */
-
+IF
-    {
-        if ( !("match-selected" in connectedSignals) )
@@ -274 +276 @@
-        bool consumed = false;
-        
-
+IF
-        {
-            dlg(new TreeModel(model), iter, entryCompletion);
@@ -325 +327 @@
-     * model =  The GtkTreeModel.
-     */
-
+IF
-    {
-        // void gtk_entry_completion_set_model (GtkEntryCompletion *completion,  GtkTreeModel *model);
-
+T
-    }
-    
@@ -337 +339 @@
-     * Returns: A GtkTreeModel, or NULL if none is currently being used.
-     */
-
+IF
-    {
-        // GtkTreeModel* gtk_entry_completion_get_model (GtkEntryCompletion *completion);

trunk/src/gtk/IconView.d

@@ -45 +45 @@
- * imports:
- *  - gtk.TreeModel
+ *  - gtk.TreeModelIF
- *  - gtk.TreePath
- *  - gtk.CellRenderer
@@ -57 +58 @@
- *  - GtkTooltip* -> Tooltip
- *  - GtkTreeIter* -> TreeIter
-
+IF
- *  - GtkTreePath* -> TreePath
- * module aliases:
@@ -74 +75 @@
-
-private import gtk.TreeModel;
+private import gtk.TreeModelIF;
-private import gtk.TreePath;
-private import gtk.CellRenderer;
@@ -433 +435 @@
-     * model =  The model.
-     */
-
+IF
-    {
-        // GtkWidget* gtk_icon_view_new_with_model (GtkTreeModel *model);
-
+T
-        if(p is null)
-        {
@@ -455 +457 @@
-     * model =  The model.
-     */
-
+IF
-    {
-        // void gtk_icon_view_set_model (GtkIconView *icon_view,  GtkTreeModel *model);
-
+T
-    }
-    
@@ -467 +469 @@
-     * Returns: A GtkTreeModel, or NULL if none is currently being used.
-     */
-
+IF
-    {
-        // GtkTreeModel* gtk_icon_view_get_model (GtkIconView *icon_view);

trunk/src/gtk/ListStore.d

@@ -34 +34 @@
- * interface Code: No
- * template for:
-GtkTreeModel
+
- * implements:
- *  - BuildableIF
+ *  - TreeModelIF
- * prefixes:
- *  - gtk_list_store_
@@ -54 +55 @@
- *  - gtk.BuildableIF
- *  - gtk.BuildableT
+ *  - gtk.TreePath
+ *  - gtk.TreeModelT
+ *  - gtk.TreeModelIF
+ *  - gobject.Signals
- * structWrap:
- *  - GValue* -> Value
@@ -77 +82 @@
-private import gtk.BuildableIF;
-private import gtk.BuildableT;
-
-
-
-
+
+
+
+
+
+
+
+
-
-/**
@@ -200 +209 @@
- * </object>
- */
-TreeModel, Buildable
+ObjectG, BuildableIF, TreeModel
-{
-    
@@ -237 +246 @@
-            return;
-        }
-tkTreeModel
+Object
-        this.gtkListStore = gtkListStore;
-    }
@@ -243 +252 @@
-    // add the Buildable capabilities
-    mixin BuildableT!(GtkListStore);
+    
+    // add the TreeModel capabilities
+    mixin TreeModelT!(GtkListStore);
-    
-    /**

trunk/src/gtk/TreeDragSource.d

@@ -45 +45 @@
- * imports:
- *  - gtk.TreePath
-
+IF
- * structWrap:
-
+IF
- *  - GtkTreePath* -> TreePath
- * module aliases:
@@ -62 +62 @@
-
-private import gtk.TreePath;
-
+IF
-
-
@@ -211 +211 @@
-     * Returns: TRUE if the GtkSelectionData had the proper target type to allow us to set a tree row
-     */
-
+IF
-    {
-        // gboolean gtk_tree_set_row_drag_data (GtkSelectionData *selection_data,  GtkTreeModel *tree_model,  GtkTreePath *path);
-
+T
-    }
-    

trunk/src/gtk/TreeIter.d

@@ -42 +42 @@
- * omit code:
- * omit signals:
+ *  - row-changed
+ *  - row-deleted
+ *  - row-has-child-toggled
+ *  - row-inserted
+ *  - rows-reordered
- * imports:
- *  - glib.Str
-
+IF
- *  - gtk.TreePath
- *  - gtk.TreeIterError
-;
+
- * structWrap:
- *  - GtkTreeIter* -> TreeIter
- *  - GtkTreeModel* -> TreeModel
- * module aliases:
- * local aliases:
@@ -66 +70 @@
-
-private import glib.Str;
-
+IF
-private import gtk.TreePath;
-private import gtk.TreeIterError;
-;
+
-
-
@@ -241 +245 @@
-     * is created from the model.
-     */
- *
+* 
-    
-    /** */
- *
+* 
-    {
-        this.gtkTreeModel = gtkTreeModel;
@@ -250 +254 @@
-    
-    /** */
-
-
-
+IF
+
+T
-    }
-    
-    /** */
-
+IF
-    {
-        this();
-        setModel(treeModel);
-        if ( gtk_tree_model_get_iter_from_string(
-
+T
-        getTreeIterStruct(), Str.toStringz(treePath.toString())) )
-        {
@@ -401 +405 @@
-    }
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    
-    /**

trunk/src/gtk/TreeModel.d

@@ -23 +23 @@
-/*
- * Conversion parameters:
-GtkTreeModel.html
+
- * outPack = gtk
- * outFile = TreeModel
-GtkTreeModel
+
- * realStrct=
- * ctorStrct=
@@ -32 +32 @@
- * interf  = 
- * class Code: Yes
-Yes
+No
- * template for:
-GObject
+ObjectG
- * implements:
+ *  - TreeModelIF
- * prefixes:
- *  - gtk_tree_model_
- * omit structs:
- * omit prefixes:
- *  - gtk_tree_row_reference_
- *  - gtk_tree_path_
- *  - gtk_tree_iter_
- * omit code:
- *  - gtk_tree_model_get_iter
- * omit signals:
- * imports:
+ *  - gobject.ObjectG;
+ *  - gtk.TreeModel
- *  - glib.Str
- *  - gtk.TreeIter
- *  - gtk.TreePath
- *  - gobject.Value
+ *  - gtk.TreeModelT
+ *  - gtk.TreeModelIF
+ *  - gobject.Signals
- * structWrap:
- *  - GValue* -> Value
- *  - GtkTreeIter* -> TreeIter
- *  - GtkTreePath* -> TreePath
- * module aliases:
- * local aliases:
@@ -66 +64 @@
-private import gtkc.gtk;
-
-private import gobject.Signals;
-public  import gtkc.gdktypes;
-
+private import gobject.ObjectG;;
+private import gtk.TreeModel;
-private import glib.Str;
-private import gtk.TreeIter;
-private import gtk.TreePath;
-private import gobject.Value;
+private import gtk.TreeModelT;
+private import gtk.TreeModelIF;
+private import gobject.Signals;
-
-
-
-private import gobject.ObjectG;
-
-/**
- * Description
- * The GtkTreeModel interface defines a generic tree interface for use by
- * the GtkTreeView widget. It is an abstract interface, and is designed
- * to be usable with any appropriate data structure. The programmer just
- * has to implement this interface on their own data type for it to be
- * viewable by a GtkTreeView widget.
- * The model is represented as a hierarchical tree of strongly-typed,
- * columned data. In other words, the model can be seen as a tree where
- * every node has different values depending on which column is being
- * queried. The type of data found in a column is determined by using the
- * GType system (ie. G_TYPE_INT, GTK_TYPE_BUTTON, G_TYPE_POINTER, etc.).
- * The types are homogeneous per column across all nodes. It is important
- * to note that this interface only provides a way of examining a model and
- * observing changes. The implementation of each individual model decides
- * how and if changes are made.
- * In order to make life simpler for programmers who do not need to write
- * their own specialized model, two generic models are provided  the
- * GtkTreeStore and the GtkListStore. To use these, the developer simply
- * pushes data into these models as necessary. These models provide the
- * data structure as well as all appropriate tree interfaces. As a result,
- * implementing drag and drop, sorting, and storing data is trivial. For
- * the vast majority of trees and lists, these two models are sufficient.
- * Models are accessed on a node/column level of granularity. One can
- * query for the value of a model at a certain node and a certain column
- * on that node. There are two structures used to reference a particular
- * node in a model. They are the GtkTreePath and the GtkTreeIter
- * [4]
- * Most of the interface consists of operations on a GtkTreeIter.
- * A path is essentially a potential node. It is a location on a model
- * that may or may not actually correspond to a node on a specific model.
- * The GtkTreePath struct 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.
- * By contrast, a GtkTreeIter is a reference to a specific node on a
- * specific model. It is a generic struct with an integer and three
- * generic pointers. These are filled in by the model in a model-specific
- * way. One can convert a path to an iterator by calling
- * gtk_tree_model_get_iter(). These iterators are the primary way of
- * accessing a model and are similar to the iterators used by
- * GtkTextBuffer. They are generally statically allocated on the stack and
- * only used for a short time. The model interface defines a set of
- * operations using them for navigating the model.
- * It is expected that models fill in the iterator with private data. For
- * example, the GtkListStore model, which is internally a simple linked
- * list, stores a list node in one of the pointers. The GtkTreeModelSort
- * stores an array and an offset in two of the pointers. Additionally,
- * there is an integer field. This field is generally filled with a unique
- * stamp per model. This stamp is for catching errors resulting from using
- * invalid iterators with a model.
- * The lifecycle of an iterator can be a little confusing at first.
- * Iterators are expected to always be valid for as long as the model is
- * unchanged (and doesn't emit a signal). The model is considered to own
- * all outstanding iterators and nothing needs to be done to free them from
- * the user's point of view. Additionally, some models guarantee that an
- * iterator is valid for as long as the node it refers to is valid (most
- * notably the GtkTreeStore and GtkListStore). Although generally
- * uninteresting, as one always has to allow for the case where iterators
- * do not persist beyond a signal, some very important performance
- * enhancements were made in the sort model. As a result, the
- * GTK_TREE_MODEL_ITERS_PERSIST flag was added to indicate this behavior.
- * To help show some common operation of a model, some examples are
- * provided. The first example shows three ways of getting the iter at the
- * location 3:2:5. While the first method shown is easier,
- * the second is much more common, as you often get paths from callbacks.
- * Example15.Acquiring a GtkTreeIter
- * /+* Three ways of getting the iter pointing to the location
- *  +/
- * {
-     *  GtkTreePath *path;
-     *  GtkTreeIter iter;
-     *  GtkTreeIter parent_iter;
-     *  /+* get the iterator from a string +/
-     *  gtk_tree_model_get_iter_from_string (model, iter, "3:2:5");
-     *  /+* get the iterator from a path +/
-     *  path = gtk_tree_path_new_from_string ("3:2:5");
-     *  gtk_tree_model_get_iter (model, iter, path);
-     *  gtk_tree_path_free (path);
-     *  /+* walk the tree to find the iterator +/
-     *  gtk_tree_model_iter_nth_child (model, iter, NULL, 3);
-     *  parent_iter = iter;
-     *  gtk_tree_model_iter_nth_child (model, iter, parent_iter, 2);
-     *  parent_iter = iter;
-     *  gtk_tree_model_iter_nth_child (model, iter, parent_iter, 5);
- * }
- * This second example shows a quick way of iterating through a list and
- * getting a string and an integer from each row. The
- * populate_model function used below is not shown, as
- * it is specific to the GtkListStore. For information on how to write
- * such a function, see the GtkListStore documentation.
- * Example16.Reading data from a GtkTreeModel
- * enum
- * {
-     *  STRING_COLUMN,
-     *  INT_COLUMN,
-     *  N_COLUMNS
- * };
- * {
-     *  GtkTreeModel *list_store;
-     *  GtkTreeIter iter;
-     *  gboolean valid;
-     *  gint row_count = 0;
-     *  /+* make a new list_store +/
-     *  list_store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
-     *  /+* Fill the list store with data +/
-     *  populate_model (list_store);
-     *  /+* Get the first iter in the list +/
-     *  valid = gtk_tree_model_get_iter_first (list_store, iter);
-     *  while (valid)
-     *  {
-         *  /+* Walk through the list, reading each row +/
-         *  gchar *str_data;
-         *  gint int_data;
-         *  /+* Make sure you terminate calls to gtk_tree_model_get()
-         *  * with a '-1' value
-         *  +/
-         *  gtk_tree_model_get (list_store, iter,
-         *  STRING_COLUMN, str_data,
-         *  INT_COLUMN, int_data,
-         *  -1);
-         *  /+* Do something with the data +/
-         *  g_print ("Row %d: (%s,%d)\n", row_count, str_data, int_data);
-         *  g_free (str_data);
-         *  row_count ++;
-         *  valid = gtk_tree_model_iter_next (list_store, iter);
-     *  }
- * }
- */
-
+, TreeModelIF
-{
-    
-
-
-
-
-
-
-
-
-
+
+
-    
-    /** the main Gtk struct as a void* */
@@ -250 +115 @@
-    
-    /**
-     * Get the value of a column as a char array.
-     * this is the same calling getValue and get the string from the value object
-     */
-    string getValueString(TreeIter iter, int column)
-    {
-        Value value = new Value();
-        getValue(iter, column, value);
-        return value.getString();
-    }
-    
-    /**
-     * Get the value of a column as a char array.
-     * this is the same calling getValue and get the int from the value object
-     */
-    int getValueInt(TreeIter iter, int column)
-    {
-        Value value = new Value();
-        getValue(iter, column, value);
-        return value.getInt();
-    }
-    
-    /**
-     * Sets iter to a valid iterator pointing to path.
-     * Params:
-     *  iter = The uninitialized GtkTreeIter.
-     *  path = The GtkTreePath.
-     * Returns:
-     *  TRUE, if iter was set.
-     */
-    public int getIter(TreeIter iter, TreePath path)
-    {
-        // gboolean gtk_tree_model_get_iter (GtkTreeModel *tree_model,  GtkTreeIter *iter,  GtkTreePath *path);
-        iter.setModel(this);
-        return gtk_tree_model_get_iter(gtkTreeModel, (iter is null) ? null : iter.getTreeIterStruct(), (path is null) ? null : path.getTreePathStruct());
-    }
-    
-    /**
-     */
-    int[char[]] connectedSignals;
-    
-    void delegate(TreePath, TreeIter, TreeModel)[] onRowChangedListeners;
-    /**
-     * This signal is emitted when a row in the model has changed.
-     */
-    void addOnRowChanged(void delegate(TreePath, TreeIter, TreeModel) dlg, ConnectFlags connectFlags=cast(ConnectFlags)0)
-    {
-        if ( !("row-changed" in connectedSignals) )
-        {
-            Signals.connectData(
-            getStruct(),
-            "row-changed",
-            cast(GCallback)&callBackRowChanged,
-            cast(void*)this,
-            null,
-            connectFlags);
-            connectedSignals["row-changed"] = 1;
-        }
-        onRowChangedListeners ~= dlg;
-    }
-    extern(C) static void callBackRowChanged(GtkTreeModel* treeModelStruct, GtkTreePath* path, GtkTreeIter* iter, TreeModel treeModel)
-    {
-        bool consumed = false;
-        
-        foreach ( void delegate(TreePath, TreeIter, TreeModel) dlg ; treeModel.onRowChangedListeners )
-        {
-            dlg(new TreePath(path), new TreeIter(iter), treeModel);
-        }
-        
-        return consumed;
-    }
-    
-    void delegate(TreePath, TreeModel)[] onRowDeletedListeners;
-    /**
-     * This signal is emitted when a row has been deleted.
-     * Note that no iterator is passed to the signal handler,
-     * since the row is already deleted.
-     * Implementations of GtkTreeModel must emit row-deleted
-     * before removing the node from its
-     * internal data structures. This is because models and
-     * views which access and monitor this model might have
-     * references on the node which need to be released in the
-     * row-deleted handler.
-     */
-    void addOnRowDeleted(void delegate(TreePath, TreeModel) dlg, ConnectFlags connectFlags=cast(ConnectFlags)0)
-    {
-        if ( !("row-deleted" in connectedSignals) )
-        {
-            Signals.connectData(
-            getStruct(),
-            "row-deleted",