Changeset 522

Show
Ignore:
Timestamp:
07/09/08 17:01:55 (3 months ago)
Author:
Mike Wey
Message:

implenent GtkTreeDragSource? and GtkTreeDragDest? as an interface - see ticket #24

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/build/gtkD.d

    r521 r522  
    283283private import gtk.TreeViewColumn; 
    284284private import gtk.TreeView; 
    285 private import gtk.TreeDragSource; 
     285private import gtk.TreeDragSourceIF; 
     286private import gtk.TreeDragSourceT; 
     287private import gtk.TreeDragDestIF; 
     288private import gtk.TreeDragDestT; 
    286289private import gtk.CellView; 
    287290private import gtk.IconView; 

  • trunk/src/gtk/ListStore.d

    r517 r522  
    3838 *  - BuildableIF 
    3939 *  - TreeModelIF 
     40 *  - TreeDragSourceIF 
     41 *  - TreeDragDestIF 
    4042 * prefixes: 
    4143 *  - gtk_list_store_ 
    …… 
    5961 *  - gtk.TreeModelIF 
    6062 *  - gobject.Signals 
     63 *  - gtk.TreeDragSourceT 
     64 *  - gtk.TreeDragSourceIF 
     65 *  - gtk.TreeDragDestT 
     66 *  - gtk.TreeDragDestIF 
    6167 * structWrap: 
    6268 *  - GValue* -> Value 
    …… 
    8692private import gtk.TreeModelIF; 
    8793private import gobject.Signals; 
     94private import gtk.TreeDragSourceT; 
     95private import gtk.TreeDragSourceIF; 
     96private import gtk.TreeDragDestT; 
     97private import gtk.TreeDragDestIF; 
    8898 
    8999 
    …… 
    209219 * </object> 
    210220 */ 
    211 public class ListStore : ObjectG, BuildableIF, TreeModelIF 
     221public class ListStore : ObjectG, BuildableIF, TreeModelIF, TreeDragSourceIF, TreeDragDestIF 
    212222{ 
    213223     
    …… 
    255265    // add the TreeModel capabilities 
    256266    mixin TreeModelT!(GtkListStore); 
     267     
     268    // add the TreeDragSource capabilities 
     269    mixin TreeDragSourceT!(GtkListStore); 
     270     
     271    // add the GtkTreeDragDest capabilities 
     272    mixin TreeDragDestT!(GtkListStore); 
    257273     
    258274    /** 

  • trunk/src/gtk/TreeModelFilter.d

    r517 r522  
    3737 * implements: 
    3838 *  - TreeModelIF 
     39 *  - TreeDragSourceIF 
    3940 * prefixes: 
    4041 *  - gtk_tree_model_filter_ 
    …… 
    5354 *  - gtk.TreeModelT 
    5455 *  - gobject.Signals 
     56 *  - gtk.TreeDragSourceT 
     57 *  - gtk.TreeDragSourceIF 
    5558 * structWrap: 
    5659 *  - GtkTreeIter* -> TreeIter 
    …… 
    7780private import gtk.TreeModelT; 
    7881private import gobject.Signals; 
     82private import gtk.TreeDragSourceT; 
     83private import gtk.TreeDragSourceIF; 
    7984 
    8085 
    …… 
    98103 * a GtkTreePath indicating the root node for the filter at construction time. 
    99104 */ 
    100 public class TreeModelFilter : ObjectG, TreeModelIF 
     105public class TreeModelFilter : ObjectG, TreeModelIF, TreeDragSourceIF 
    101106{ 
    102107     
    …… 
    141146    // add the TreeModel capabilities 
    142147    mixin TreeModelT!(GtkTreeModelFilter); 
     148     
     149    // add the TreeDragSource capabilities 
     150    mixin TreeDragSourceT!(GtkTreeModelFilter); 
    143151     
    144152    /** 

  • trunk/src/gtk/TreeModelSort.d

    r517 r522  
    3737 * implements: 
    3838 *  - TreeModelIF 
     39 *  - TreeDragSourceIF 
    3940 * prefixes: 
    4041 *  - gtk_tree_model_sort_ 
    …… 
    5354 *  - gtk.TreeModelT 
    5455 *  - gobject.Signals 
     56 *  - gtk.TreeDragSourceT 
     57 *  - gtk.TreeDragSourceIF 
    5558 * structWrap: 
    5659 *  - GtkTreeIter* -> TreeIter 
    …… 
    7780private import gtk.TreeModelT; 
    7881private import gobject.Signals; 
     82private import gtk.TreeDragSourceT; 
     83private import gtk.TreeDragSourceIF; 
    7984 
    8085 
    …… 
    162167 * } 
    163168 */ 
    164 public class TreeModelSort : ObjectG, TreeModelIF 
     169public class TreeModelSort : ObjectG, TreeModelIF, TreeDragSourceIF 
    165170{ 
    166171     
    …… 
    205210    // add the TreeModel capabilities 
    206211    mixin TreeModelT!(GtkTreeModelSort); 
     212     
     213    // add the TreeDragSource capabilities 
     214    mixin TreeDragSourceT!(GtkTreeModelSort); 
    207215     
    208216    /** 

  • trunk/src/gtk/TreeStore.d

    r517 r522  
    3737 * implements: 
    3838 *  - TreeModelIF 
     39 *  - TreeDragSourceIF 
     40 *  - TreeDragDestIF 
    3941 * prefixes: 
    4042 *  - gtk_tree_store_ 
    …… 
    5658 *  - gtk.TreeModelIF 
    5759 *  - gobject.Signals 
     60 *  - gtk.TreeDragSourceT 
     61 *  - gtk.TreeDragSourceIF 
     62 *  - gtk.TreeDragDestT 
     63 *  - gtk.TreeDragDestIF 
    5864 * structWrap: 
    5965 *  - GValue* -> Value 
    …… 
    8187private import gtk.TreeModelIF; 
    8288private import gobject.Signals; 
     89private import gtk.TreeDragSourceT; 
     90private import gtk.TreeDragSourceIF; 
     91private import gtk.TreeDragDestT; 
     92private import gtk.TreeDragDestIF; 
    8393 
    8494 
    …… 
    108118 * </object> 
    109119 */ 
    110 public class TreeStore : ObjectG, TreeModelIF 
     120public class TreeStore : ObjectG, TreeModelIF, TreeDragSourceIF, TreeDragDestIF 
    111121{ 
    112122     
    …… 
    151161    // add the TreeModel capabilities 
    152162    mixin TreeModelT!(GtkTreeStore); 
     163     
     164    // add the TreeDragSource capabilities 
     165    mixin TreeDragSourceT!(GtkTreeStore); 
     166     
     167    // add the GtkTreeDragDest capabilities 
     168    mixin TreeDragDestT!(GtkTreeStore); 
    153169     
    154170    /** 

  • trunk/src/gtkc/gtk.d

    r521 r522  
    15981598    void function(GtkTreeView* treeView, gint column)gtk_tree_view_set_tooltip_column; 
    15991599     
    1600     // gtk.TreeDragSource 
     1600    // gtk.TreeDragSourceT 
     1601     
     1602     
     1603    // gtk.TreeDragSourceT 
    16011604     
    16021605    gboolean function(GtkTreeDragSource* dragSource, GtkTreePath* path)gtk_tree_drag_source_drag_data_delete; 
    16031606    gboolean function(GtkTreeDragSource* dragSource, GtkTreePath* path, GtkSelectionData* selectionData)gtk_tree_drag_source_drag_data_get; 
    16041607    gboolean function(GtkTreeDragSource* dragSource, GtkTreePath* path)gtk_tree_drag_source_row_draggable; 
     1608    gboolean function(GtkSelectionData* selectionData, GtkTreeModel* treeModel, GtkTreePath* path)gtk_tree_set_row_drag_data; 
     1609    gboolean function(GtkSelectionData* selectionData, GtkTreeModel** treeModel, GtkTreePath** path)gtk_tree_get_row_drag_data; 
     1610     
     1611    // gtk.TreeDragDestT 
     1612     
     1613     
     1614    // gtk.TreeDragDestT 
     1615     
    16051616    gboolean function(GtkTreeDragDest* dragDest, GtkTreePath* dest, GtkSelectionData* selectionData)gtk_tree_drag_dest_drag_data_received; 
    16061617    gboolean function(GtkTreeDragDest* dragDest, GtkTreePath* destPath, GtkSelectionData* selectionData)gtk_tree_drag_dest_row_drop_possible; 
    1607     gboolean function(GtkSelectionData* selectionData, GtkTreeModel* treeModel, GtkTreePath* path)gtk_tree_set_row_drag_data; 
    1608     gboolean function(GtkSelectionData* selectionData, GtkTreeModel** treeModel, GtkTreePath** path)gtk_tree_get_row_drag_data; 
    16091618     
    16101619    // gtk.CellView 
    …… 
    47734782    { "gtk_tree_drag_source_drag_data_get",  cast(void**)& gtk_tree_drag_source_drag_data_get}, 
    47744783    { "gtk_tree_drag_source_row_draggable",  cast(void**)& gtk_tree_drag_source_row_draggable}, 
     4784    { "gtk_tree_set_row_drag_data",  cast(void**)& gtk_tree_set_row_drag_data}, 
     4785    { "gtk_tree_get_row_drag_data",  cast(void**)& gtk_tree_get_row_drag_data}, 
    47754786    { "gtk_tree_drag_dest_drag_data_received",  cast(void**)& gtk_tree_drag_dest_drag_data_received}, 
    47764787    { "gtk_tree_drag_dest_row_drop_possible",  cast(void**)& gtk_tree_drag_dest_row_drop_possible}, 
    4777     { "gtk_tree_set_row_drag_data",  cast(void**)& gtk_tree_set_row_drag_data}, 
    4778     { "gtk_tree_get_row_drag_data",  cast(void**)& gtk_tree_get_row_drag_data}, 
    47794788    { "gtk_cell_view_new",  cast(void**)& gtk_cell_view_new}, 
    47804789    { "gtk_cell_view_new_with_text",  cast(void**)& gtk_cell_view_new_with_text}, 

  • trunk/wrap/APILookupGtk.txt

    r521 r522  
    30703070file: gtk-GtkTreeView-drag-and-drop.html 
    30713071struct: GtkTreeDragSource 
    3072 class: TreeDragSource 
    3073 prefix: gtk_tree_drag_ 
    3074 prefix: gtk_ 
     3072class: TreeDragSourceT 
     3073template: TStruct 
     3074prefix: gtk_tree_drag_source_ 
     3075prefix: gtk_tree_ 
     3076noprefix: gtk_tree_drag_dest_ 
    30753077import: gtk.TreePath 
    30763078structWrap: GtkTreePath* TreePath 
    30773079#import: gtk.SelectionData 
    30783080#structWrap: GtkSelectionData* SelectionData 
    3079 #import: gtk.TreeDragDest 
    3080 #structWrap: GtkTreeDragDest* TreeDragDest 
    30813081import: gtk.TreeModelIF 
    30823082structWrap: GtkTreeModel* TreeModelIF 
    3083 outFile: TreeDragSource 
     3083interface: TreeDragSourceIF 
     3084outFile: TreeDragSourceT 
     3085 
     3086struct: GtkTreeDragDest 
     3087class: TreeDragDestT 
     3088template: TStruct 
     3089prefix: gtk_tree_drag_dest_ 
     3090strictPrefix: Y 
     3091import: gtk.TreeModelIF 
     3092import: gtk.TreePath 
     3093structWrap: GtkTreePath* TreePath 
     3094#import: gtk.SelectionData 
     3095#structWrap: GtkSelectionData* SelectionData 
     3096 
     3097interfaceCode: start 
     3098    /** 
     3099     * Sets selection data of target type GTK_TREE_MODEL_ROW. Normally used 
     3100     * in a drag_data_get handler. 
     3101     * Params: 
     3102     * selectionData =  some GtkSelectionData 
     3103     * treeModel =  a GtkTreeModel 
     3104     * path =  a row in tree_model 
     3105     * Returns: TRUE if the GtkSelectionData had the proper target type to allow us to set a tree row 
     3106     */ 
     3107    public static int setRowDragData(GtkSelectionData* selectionData, TreeModelIF treeModel, TreePath path); 
     3108     
     3109    /** 
     3110     * Obtains a tree_model and path from selection data of target type 
     3111     * GTK_TREE_MODEL_ROW. Normally called from a drag_data_received handler. 
     3112     * This function can only be used if selection_data originates from the same 
     3113     * process that's calling this function, because a pointer to the tree model 
     3114     * is being passed around. If you aren't in the same process, then you'll 
     3115     * get memory corruption. In the GtkTreeDragDest drag_data_received handler, 
     3116     * you can assume that selection data of type GTK_TREE_MODEL_ROW is 
     3117     * in from the current process. The returned path must be freed with 
     3118     * gtk_tree_path_free(). 
     3119     * Params: 
     3120     * selectionData =  a GtkSelectionData 
     3121     * treeModel =  a GtkTreeModel 
     3122     * path =  row in tree_model 
     3123     * Returns: TRUE if selection_data had target type GTK_TREE_MODEL_ROW and is otherwise valid 
     3124     */ 
     3125    public static int getRowDragData(GtkSelectionData* selectionData, GtkTreeModel** treeModel, GtkTreePath** path); 
     3126interfaceCode: end 
     3127interface: TreeDragDestIF 
     3128outFile: TreeDragDestT 
    30843129 
    30853130file: GtkCellView.html 
    …… 
    32013246class: TreeModelSort 
    32023247implements: TreeModelIF 
     3248implements: TreeDragSourceIF 
    32033249prefix: gtk_tree_model_sort_ 
    32043250prefix: gtk_ 
    …… 
    32213267import: gobject.Signals 
    32223268 
     3269# imports for TreeDragSource Interface 
     3270#import: gtk.TreePath 
     3271#import: gtk.TreeModelIF 
     3272import: gtk.TreeDragSourceT 
     3273import: gtk.TreeDragSourceIF 
     3274 
    32233275code: start 
    32243276    // add the TreeModel capabilities 
    32253277    mixin TreeModelT!(GtkTreeModelSort); 
     3278 
     3279    // add the TreeDragSource capabilities 
     3280    mixin TreeDragSourceT!(GtkTreeModelSort); 
    32263281cade: end 
    32273282outFile: TreeModelSort 
    …… 
    32313286class: TreeModelFilter 
    32323287implements: TreeModelIF 
     3288implements: TreeDragSourceIF 
    32333289prefix: gtk_tree_model_filter_ 
    32343290prefix: gtk_ 
    …… 
    32503306import: gobject.Signals 
    32513307 
     3308# imports for TreeDragSource Interface 
     3309#import: gtk.TreePath 
     3310#import: gtk.TreeModelIF 
     3311import: gtk.TreeDragSourceT 
     3312import: gtk.TreeDragSourceIF 
     3313 
    32523314code: start 
    32533315    // add the TreeModel capabilities 
    32543316    mixin TreeModelT!(GtkTreeModelFilter); 
     3317 
     3318    // add the TreeDragSource capabilities 
     3319    mixin TreeDragSourceT!(GtkTreeModelFilter); 
    32553320cade: end 
    32563321outFile: TreeModelFilter 
    …… 
    34383503implements: BuildableIF 
    34393504implements: TreeModelIF 
     3505implements: TreeDragSourceIF 
     3506implements: TreeDragDestIF 
    34403507prefix: gtk_list_store_ 
    34413508prefix: gtk_ 
    …… 
    34653532import: gobject.Signals 
    34663533 
     3534# imports for TreeDragSource Interface 
     3535#import: gtk.TreePath 
     3536#import: gtk.TreeModelIF 
     3537import: gtk.TreeDragSourceT 
     3538import: gtk.TreeDragSourceIF 
     3539 
     3540# imports for GtkTreeDragDest Interface 
     3541#import: gtk.TreePath 
     3542import: gtk.TreeDragDestT 
     3543import: gtk.TreeDragDestIF 
     3544 
    34673545nocode: gtk_list_store_set 
    34683546 
    …… 
    34733551    // add the TreeModel capabilities 
    34743552    mixin TreeModelT!(GtkListStore); 
     3553 
     3554    // add the TreeDragSource capabilities 
     3555    mixin TreeDragSourceT!(GtkListStore); 
     3556 
     3557    // add the GtkTreeDragDest capabilities 
     3558    mixin TreeDragDestT!(GtkListStore); 
    34753559 
    34763560    /** 
    …… 
    35563640class: TreeStore 
    35573641implements: TreeModelIF 
     3642implements: TreeDragSourceIF 
     3643implements: TreeDragDestIF 
    35583644prefix: gtk_tree_store_ 
    35593645prefix: gtk_ 
    …… 
    35763662import: gobject.Signals 
    35773663 
     3664# imports for TreeDragSource Interface 
     3665#import: gtk.TreePath 
     3666#import: gtk.TreeModelIF 
     3667import: gtk.TreeDragSourceT 
     3668import: gtk.TreeDragSourceIF 
     3669 
     3670# imports for GtkTreeDragDest Interface 
     3671#import: gtk.TreePath 
     3672import: gtk.TreeDragDestT 
     3673import: gtk.TreeDragDestIF 
     3674 
    35783675nocode: gtk_tree_store_set 
    35793676 
    …… 
    35813678    // add the TreeModel capabilities 
    35823679    mixin TreeModelT!(GtkTreeStore); 
     3680 
     3681    // add the TreeDragSource capabilities 
     3682    mixin TreeDragSourceT!(GtkTreeStore); 
     3683 
     3684    // add the GtkTreeDragDest capabilities 
     3685    mixin TreeDragDestT!(GtkTreeStore); 
    35833686 
    35843687    /**