Merge branch 'listView' of github.com:tknopp/Gtk.jl into tknopp-listView

Conflicts:
	src/Gtk.jl

Author: vtjnash

src/Gtk.jl

@@ -18,10 +18,8 @@ import Cairo: destroy
 # generic interface:
 export width, height, #minsize, maxsize
     reveal, configure, draw, cairo_context,
-    visible, destroy,
-    hasparent, toplevel, 
-    stop
-
+    visible, destroy, stop,
+    hasparent, toplevel
     #property, margin, padding, align
     #raise, focus, destroy, enabled
 
@@ -34,7 +32,8 @@ export GtkWindow, GtkCanvas, GtkBox, GtkButtonBox, GtkPaned, GtkLayout, GtkNoteb
     GtkImage, GtkProgressBar, GtkSpinner, GtkStatusbar, GtkStatusIcon,
     GtkTextBuffer, GtkTextView, GtkTextMark, GtkTextTag,
     GtkMenuItem, GtkSeparatorMenuItem, GtkMenu, GtkMenuBar,
-    GtkFileChooserDialog, GtkNullContainer, GtkBuilder
+    GtkFileChooserDialog, GtkNullContainer, GtkBuilder, GtkListStore,
+    GtkTreeIter, GtkTreeView, GtkTreeViewColumn, GtkCellRenderer	
 
 # Gtk3 objects
 export GtkGrid
@@ -209,6 +208,11 @@ module ShortNames
     const Justification = GtkJustification
     const NullContainer = GtkNullContainer
     const Builder = GtkBuilder
+    const ListStore = GtkListStore 
+    const TreeIter = GtkTreeIter
+    const TreeView = GtkTreeView
+    const TreeViewColumn = GtkTreeViewColumn
+    const CellRenderer = GtkCellRenderer
 
     export G_, Window, Canvas, BoxLayout, ButtonBox, Paned, Layout, Notebook,
         Expander, Overlay, Frame, AspectFrame,
@@ -218,7 +222,8 @@ module ShortNames
         Pixbuf, Image, ProgressBar, Spinner, Statusbar,
         StatusIcon, TextBuffer, TextView, TextMark, TextTag,
         MenuItem, SeparatorMenuItem, Menu, MenuBar,
-        NullContainer, Key, ScrollDirection, Justification, Builder
+        NullContainer, Key, ScrollDirection, Justification, Builder, ListStore,
+        TreeIter, TreeView, TreeViewColumn, CellRenderer
 
     # Gtk 3
     if Gtk.gtk_version >= 3

src/lists.jl

@@ -54,3 +54,58 @@ end
 delete!(cb::GtkComboBoxText,i::Integer) =
     (ccall((:gtk_combo_box_text_remove,libgtk),Void,(Ptr{GObject},Cint),cb,i-1); cb)
 
+type GtkTreeIter
+  stamp::Cint
+  user_data::Ptr{Void}
+  user_data2::Ptr{Void}
+  user_data3::Ptr{Void}
+  GtkTreeIter() = new(0,C_NULL,C_NULL,C_NULL)
+end
+
+@gtktype GtkListStore
+function GtkListStore(types::(Type...))
+    gtypes = GLib.gvalues(types...)
+    handle = ccall((:gtk_list_store_newv,libgtk),Ptr{GObject},(Cint,Ptr{GLib.GType}), length(types), gtypes)
+    GtkListStore(handle)
+end
+
+function push!(listStore::GtkListStore, iter::GtkTreeIter)
+    ccall((:gtk_list_store_append,libgtk),Void,(Ptr{GObject},Ptr{GtkTreeIter}), listStore, &iter)
+    listStore
+end
+
+@gtktype GtkCellRenderer
+GtkCellRenderer() = GtkCellRenderer( ccall((:gtk_cell_renderer_text_new,libgtk),Ptr{GObject},()))
+	
+@gtktype GtkTreeViewColumn
+GtkTreeViewColumn() = GtkTreeViewColumn( ccall((:gtk_tree_view_column_new,libgtk),Ptr{GObject},()))
+
+
+empty!(treeColumn::GtkTreeViewColumn) = 
+    ccall((:gtk_tree_view_column_clear,libgtk), Void, (Ptr{GObject},),treeColumn)
+
+function unshift!(treeColumn::GtkTreeViewColumn, renderer::GtkCellRenderer, expand::Bool=false) 
+    ccall((:gtk_tree_view_column_pack_start,libgtk), Void,
+          (Ptr{GObject},Ptr{GObject},Bool),treeColumn,renderer,expand)
+    treeColumn
+end
+		  
+function push!(treeColumn::GtkTreeViewColumn, renderer::GtkCellRenderer, expand::Bool=false)
+    ccall((:gtk_tree_view_column_pack_end,libgtk), Void,
+          (Ptr{GObject},Ptr{GObject},Bool),treeColumn,renderer,expand)
+    treeColumn
+end
+
+add_attribute(treeColumn::GtkTreeViewColumn, renderer::GtkCellRenderer, attribute::String, column) = 
+    ccall((:gtk_tree_view_column_add_attribute,libgtk),Void,
+          (Ptr{GObject},Ptr{GObject},Ptr{Uint8},Cint),treeColumn,renderer,bytestring(attribute),int32(column))
+
+@gtktype GtkTreeView
+GtkTreeView() = GtkTreeView(ccall((:gtk_tree_view_new,libgtk),Ptr{GObject},()))
+GtkTreeView(listStore::GtkListStore) = GtkTreeView(
+   ccall((:gtk_tree_view_new_with_model,libgtk),Ptr{GObject},(Ptr{GObject},),listStore))
+   
+function push!(treeView::GtkTreeView,treeColumn::GtkTreeViewColumn)
+  ccall((:gtk_tree_view_append_column,libgtk),Void,(Ptr{GObject},Ptr{GObject}),treeView,treeColumn)
+  treeView
+end