Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Auto-generate all enums in Gtk/Gdk #62

Merged
merged 40 commits into from
Feb 15, 2014
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
51cf1ca
Add TreeModel to void pointer conversion enabling getters/setters
tknopp Jan 24, 2014
bab1372
remove Bool from ccall
tknopp Jan 24, 2014
e88f089
Merge remote-tracking branch 'upstream/master' into listView
tknopp Jan 24, 2014
ca9ae2d
Make GtkTreeModelFiltered work and add various functions for TreeModel
tknopp Jan 24, 2014
9e3649c
GtkTreeSortableI defined
tknopp Jan 25, 2014
72df939
add GtkScrolledWindow
tknopp Jan 26, 2014
37497fa
Add GtkToolbar and some related types
tknopp Jan 31, 2014
8d8daea
push! and unshift! for GtkToolbar now accept more arguments
tknopp Jan 31, 2014
8e69eee
merge upstream
tknopp Jan 31, 2014
5e63fd6
fix GtkTreeSortableI definition
tknopp Jan 31, 2014
0add403
move GtkIconSize into an own file (also used in toolbar)
tknopp Jan 31, 2014
955ab81
fix GtkSortType
tknopp Jan 31, 2014
8f73aae
Add GtkSeparatorToolItem and GtkSeparatorToolItem
tknopp Jan 31, 2014
626203a
Add GtkMenuToolButton
tknopp Jan 31, 2014
9bce88c
Fixed various issues based on Jamesons comments
tknopp Feb 1, 2014
d4bdc35
remove push! version of tree/list store that leaves the appended valu…
tknopp Feb 1, 2014
8d6dd4d
Add more functions for GtkTreeSelection (hasselection, length,...)
tknopp Feb 1, 2014
2553fd8
Merge remote-tracking branch 'upstream/master' into listView
tknopp Feb 1, 2014
77bfaee
remove usage of pointer function
tknopp Feb 2, 2014
31cc237
remove forgotten debug println
tknopp Feb 2, 2014
9f0ddb5
Changed GtkTextIter to take an GtkTextBufferI as constructor argument
tknopp Feb 3, 2014
883c5e4
Fix GtkPaned setindex! and introduce present for GtkWindow
tknopp Feb 4, 2014
f9c9ce9
update Julia 0.2 cache files
tknopp Feb 4, 2014
35a100b
Add GtkEntryCompletion
tknopp Feb 5, 2014
bc7bca3
add GtkEditableI
tknopp Feb 5, 2014
035c9c3
Add GtkTreePath
tknopp Feb 5, 2014
c2580fe
Allow GtkNotebook to take widget header
tknopp Feb 5, 2014
b74443f
Extend GtkImage to take stock item and implement some Themeing stuff
tknopp Feb 6, 2014
959132b
merge upstream
tknopp Feb 6, 2014
4f55592
Adress Jamesons comments
tknopp Feb 6, 2014
4aac452
Add begin/end_user action
tknopp Feb 6, 2014
f499652
Add FontButton and run gen script
tknopp Feb 7, 2014
3c6eb78
Make GtkTreeIter immutable
tknopp Feb 8, 2014
21d658d
Merge pull request #59 from tknopp/listView
vtjnash Feb 8, 2014
28bc1ae
fix compat with Gtk+ 2. fix #63
vtjnash Feb 8, 2014
1563b37
new and improved GList interfaces.
vtjnash Feb 11, 2014
55094fc
merge, but also add Clang implementation of enum generator
vtjnash Feb 15, 2014
b7aa1e1
cleanup some Gtk constants definitions
vtjnash Feb 15, 2014
9a0f107
update gi_gen_consts
bfredl Feb 15, 2014
4ae95b4
gconsts using GI
bfredl Feb 15, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 70 additions & 21 deletions gen/gbox2
Original file line number Diff line number Diff line change
@@ -1244,23 +1244,27 @@ $(Expr(:toplevel, :($(Expr(:module, true, :GAccessor, quote
function column_type(tree_model::Gtk.GtkTreeModelI,index_)
return $(Expr(:ccall, :(:gtk_tree_model_get_column_type,Gtk.libgtk), :Culong, :(Ptr{Gtk.GObject},Cint), :tree_model, :index_))
end
function iter(tree_model::Gtk.GtkTreeModelI,iter_,path)
return convert(Bool,$(Expr(:ccall, :(:gtk_tree_model_get_iter,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},Ptr{Void},Ptr{Void}), :tree_model, :iter_, :path)))
function iter(tree_model::Gtk.GtkTreeModelI,path)
iter_ = Gtk.mutable(Gtk.GtkTreeIter)
return (convert(Bool,$(Expr(:ccall, :(:gtk_tree_model_get_iter,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},Ptr{Gtk.GtkTreeIter},Ptr{Void}), :tree_model, :iter_, :path))),iter_[])
end
function iter_from_string(tree_model::Gtk.GtkTreeModelI,iter,path_string)
return convert(Bool,$(Expr(:ccall, :(:gtk_tree_model_get_iter_from_string,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},Ptr{Void},Ptr{Uint8}), :tree_model, :iter, :path_string)))
return convert(Bool,$(Expr(:ccall, :(:gtk_tree_model_get_iter_from_string,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},Ptr{Gtk.GtkTreeIter},Ptr{Uint8}), :tree_model, :iter, :path_string)))
end
function string_from_iter(tree_model::Gtk.GtkTreeModelI,iter)
return $(Expr(:ccall, :(:gtk_tree_model_get_string_from_iter,Gtk.libgtk), :(Ptr{Uint8}), :(Ptr{Gtk.GObject},Ptr{Void}), :tree_model, :iter))
function string_from_iter(tree_model::Gtk.GtkTreeModelI)
iter = Gtk.mutable(Gtk.GtkTreeIter)
return ($(Expr(:ccall, :(:gtk_tree_model_get_string_from_iter,Gtk.libgtk), :(Ptr{Uint8}), :(Ptr{Gtk.GObject},Ptr{Gtk.GtkTreeIter}), :tree_model, :iter)),iter[])
end
function iter_first(tree_model::Gtk.GtkTreeModelI,iter)
return convert(Bool,$(Expr(:ccall, :(:gtk_tree_model_get_iter_first,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},Ptr{Void}), :tree_model, :iter)))
function iter_first(tree_model::Gtk.GtkTreeModelI)
iter = Gtk.mutable(Gtk.GtkTreeIter)
return (convert(Bool,$(Expr(:ccall, :(:gtk_tree_model_get_iter_first,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},Ptr{Gtk.GtkTreeIter}), :tree_model, :iter))),iter[])
end
function path(tree_model::Gtk.GtkTreeModelI,iter)
return $(Expr(:ccall, :(:gtk_tree_model_get_path,Gtk.libgtk), :(Ptr{Void}), :(Ptr{Gtk.GObject},Ptr{Void}), :tree_model, :iter))
function path(tree_model::Gtk.GtkTreeModelI)
iter = Gtk.mutable(Gtk.GtkTreeIter)
return ($(Expr(:ccall, :(:gtk_tree_model_get_path,Gtk.libgtk), :(Ptr{Void}), :(Ptr{Gtk.GObject},Ptr{Gtk.GtkTreeIter}), :tree_model, :iter)),iter[])
end
function value(tree_model::Gtk.GtkTreeModelI,iter,column,value_)
return $(Expr(:ccall, :(:gtk_tree_model_get_value,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Void},Cint,Ptr{Void}), :tree_model, :iter, :column, :value_))
return $(Expr(:ccall, :(:gtk_tree_model_get_value,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Gtk.GtkTreeIter},Cint,Ptr{Void}), :tree_model, :iter, :column, :value_))
end
function sort_column_id(sortable::Gtk.GtkTreeSortableI)
order = Gtk.mutable(Cint)
@@ -1406,7 +1410,7 @@ $(Expr(:toplevel, :($(Expr(:module, true, :GAccessor, quote
return $(Expr(:ccall, :(:gtk_tree_view_column_get_sort_order,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},), :tree_column))
end
function cell_data(tree_column::Gtk.GtkTreeViewColumnI,tree_model,iter,is_expander,is_expanded)
$(Expr(:ccall, :(:gtk_tree_view_column_cell_set_cell_data,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Gtk.GObject},Ptr{Void},Cint,Cint), :tree_column, :tree_model, :iter, :is_expander, :is_expanded))
$(Expr(:ccall, :(:gtk_tree_view_column_cell_set_cell_data,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Gtk.GObject},Ptr{Gtk.GtkTreeIter},Cint,Cint), :tree_column, :tree_model, :iter, :is_expander, :is_expanded))
return tree_column
end
function size(tree_column::Gtk.GtkTreeViewColumnI)
@@ -1574,11 +1578,11 @@ $(Expr(:toplevel, :($(Expr(:module, true, :GAccessor, quote
return list_store
end
function value(list_store::Gtk.GtkListStoreI,iter,column,value_)
$(Expr(:ccall, :(:gtk_list_store_set_value,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Void},Cint,Ptr{Void}), :list_store, :iter, :column, :value_))
$(Expr(:ccall, :(:gtk_list_store_set_value,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Gtk.GtkTreeIter},Cint,Ptr{Void}), :list_store, :iter, :column, :value_))
return list_store
end
function valuesv(list_store::Gtk.GtkListStoreI,iter,columns,values,n_values)
$(Expr(:ccall, :(:gtk_list_store_set_valuesv,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Void},Ptr{Cint},Ptr{Void},Cint), :list_store, :iter, :columns, :values, :n_values))
$(Expr(:ccall, :(:gtk_list_store_set_valuesv,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Gtk.GtkTreeIter},Ptr{Cint},Ptr{Void},Cint), :list_store, :iter, :columns, :values, :n_values))
return list_store
end
function visible_func(filter::Gtk.GtkTreeModelFilterI,func,data,destroy)
@@ -2101,10 +2105,11 @@ $(Expr(:toplevel, :($(Expr(:module, true, :GAccessor, quote
$(Expr(:ccall, :(:gtk_tree_view_set_tooltip_cell,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Void},Ptr{Void},Ptr{Gtk.GObject},Ptr{Gtk.GObject}), :tree_view, :tooltip, :path, :column, :cell))
return tree_view
end
function tooltip_context(tree_view::Gtk.GtkTreeViewI,x,y,keyboard_tip,iter)
function tooltip_context(tree_view::Gtk.GtkTreeViewI,x,y,keyboard_tip)
iter = Gtk.mutable(Gtk.GtkTreeIter)
path = Gtk.mutable(Ptr{Void})
model = Gtk.mutable(Ptr{Gtk.GObject})
return (convert(Bool,$(Expr(:ccall, :(:gtk_tree_view_get_tooltip_context,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},Ptr{Cint},Ptr{Cint},Cint,Ptr{Ptr{Gtk.GObject}},Ptr{Ptr{Void}},Ptr{Void}), :tree_view, :x, :y, :keyboard_tip, :model, :path, :iter))),convert(Gtk.GtkTreeModelI,model[]),path[])
return (convert(Bool,$(Expr(:ccall, :(:gtk_tree_view_get_tooltip_context,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},Ptr{Cint},Ptr{Cint},Cint,Ptr{Ptr{Gtk.GObject}},Ptr{Ptr{Void}},Ptr{Gtk.GtkTreeIter}), :tree_view, :x, :y, :keyboard_tip, :model, :path, :iter))),convert(Gtk.GtkTreeModelI,model[]),path[],iter[])
end
function tooltip_column(tree_view::Gtk.GtkTreeViewI,column)
$(Expr(:ccall, :(:gtk_tree_view_set_tooltip_column,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Cint), :tree_view, :column))
@@ -2306,6 +2311,48 @@ $(Expr(:toplevel, :($(Expr(:module, true, :GAccessor, quote
function filter(chooser::Gtk.GtkFileChooserDialogI)
return $(Expr(:ccall, :(:gtk_file_chooser_get_filter,Gtk.libgtk), :(Ptr{Void}), :(Ptr{Gtk.GObject},), :chooser))
end
function title(font_button::Gtk.GtkFontButtonI)
return $(Expr(:ccall, :(:gtk_font_button_get_title,Gtk.libgtk), :(Ptr{Uint8}), :(Ptr{Gtk.GObject},), :font_button))
end
function title(font_button::Gtk.GtkFontButtonI,title_)
$(Expr(:ccall, :(:gtk_font_button_set_title,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Uint8}), :font_button, :title_))
return font_button
end
function use_font(font_button::Gtk.GtkFontButtonI)
return convert(Bool,$(Expr(:ccall, :(:gtk_font_button_get_use_font,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},), :font_button)))
end
function use_font(font_button::Gtk.GtkFontButtonI,use_font_)
$(Expr(:ccall, :(:gtk_font_button_set_use_font,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Cint), :font_button, :use_font_))
return font_button
end
function use_size(font_button::Gtk.GtkFontButtonI)
return convert(Bool,$(Expr(:ccall, :(:gtk_font_button_get_use_size,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},), :font_button)))
end
function use_size(font_button::Gtk.GtkFontButtonI,use_size_)
$(Expr(:ccall, :(:gtk_font_button_set_use_size,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Cint), :font_button, :use_size_))
return font_button
end
function font_name(font_button::Gtk.GtkFontButtonI)
return $(Expr(:ccall, :(:gtk_font_button_get_font_name,Gtk.libgtk), :(Ptr{Uint8}), :(Ptr{Gtk.GObject},), :font_button))
end
function font_name(font_button::Gtk.GtkFontButtonI,fontname)
$(Expr(:ccall, :(:gtk_font_button_set_font_name,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},Ptr{Uint8}), :font_button, :fontname))
return font_button
end
function show_style(font_button::Gtk.GtkFontButtonI)
return convert(Bool,$(Expr(:ccall, :(:gtk_font_button_get_show_style,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},), :font_button)))
end
function show_style(font_button::Gtk.GtkFontButtonI,show_style_)
$(Expr(:ccall, :(:gtk_font_button_set_show_style,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Cint), :font_button, :show_style_))
return font_button
end
function show_size(font_button::Gtk.GtkFontButtonI)
return convert(Bool,$(Expr(:ccall, :(:gtk_font_button_get_show_size,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},), :font_button)))
end
function show_size(font_button::Gtk.GtkFontButtonI,show_size_)
$(Expr(:ccall, :(:gtk_font_button_set_show_size,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Cint), :font_button, :show_size_))
return font_button
end
function position(paned::Gtk.GtkPanedI)
return $(Expr(:ccall, :(:gtk_paned_get_position,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},), :paned))
end
@@ -2625,10 +2672,11 @@ $(Expr(:toplevel, :($(Expr(:module, true, :GAccessor, quote
$(Expr(:ccall, :(:gtk_icon_view_set_tooltip_cell,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Void},Ptr{Void},Ptr{Gtk.GObject}), :icon_view, :tooltip, :path, :cell))
return icon_view
end
function tooltip_context(icon_view::Gtk.GtkIconViewI,x,y,keyboard_tip,iter)
function tooltip_context(icon_view::Gtk.GtkIconViewI,x,y,keyboard_tip)
iter = Gtk.mutable(Gtk.GtkTreeIter)
path = Gtk.mutable(Ptr{Void})
model = Gtk.mutable(Ptr{Gtk.GObject})
return (convert(Bool,$(Expr(:ccall, :(:gtk_icon_view_get_tooltip_context,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},Ptr{Cint},Ptr{Cint},Cint,Ptr{Ptr{Gtk.GObject}},Ptr{Ptr{Void}},Ptr{Void}), :icon_view, :x, :y, :keyboard_tip, :model, :path, :iter))),convert(Gtk.GtkTreeModelI,model[]),path[])
return (convert(Bool,$(Expr(:ccall, :(:gtk_icon_view_get_tooltip_context,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},Ptr{Cint},Ptr{Cint},Cint,Ptr{Ptr{Gtk.GObject}},Ptr{Ptr{Void}},Ptr{Gtk.GtkTreeIter}), :icon_view, :x, :y, :keyboard_tip, :model, :path, :iter))),convert(Gtk.GtkTreeModelI,model[]),path[],iter[])
end
function tooltip_column(icon_view::Gtk.GtkIconViewI,column)
$(Expr(:ccall, :(:gtk_icon_view_set_tooltip_column,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Cint), :icon_view, :column))
@@ -3665,9 +3713,10 @@ $(Expr(:toplevel, :($(Expr(:module, true, :GAccessor, quote
function select_function(selection::Gtk.GtkTreeSelectionI)
return $(Expr(:ccall, :(:gtk_tree_selection_get_select_function,Gtk.libgtk), :(Ptr{Void}), :(Ptr{Gtk.GObject},), :selection))
end
function selected(selection::Gtk.GtkTreeSelectionI,iter)
function selected(selection::Gtk.GtkTreeSelectionI)
iter = Gtk.mutable(Gtk.GtkTreeIter)
model = Gtk.mutable(Ptr{Gtk.GObject})
return (convert(Bool,$(Expr(:ccall, :(:gtk_tree_selection_get_selected,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},Ptr{Ptr{Gtk.GObject}},Ptr{Void}), :selection, :model, :iter))),convert(Gtk.GtkTreeModelI,model[]))
return (convert(Bool,$(Expr(:ccall, :(:gtk_tree_selection_get_selected,Gtk.libgtk), :Cint, :(Ptr{Gtk.GObject},Ptr{Ptr{Gtk.GObject}},Ptr{Gtk.GtkTreeIter}), :selection, :model, :iter))),convert(Gtk.GtkTreeModelI,model[]),iter[])
end
function selected_rows(selection::Gtk.GtkTreeSelectionI)
model = Gtk.mutable(Ptr{Gtk.GObject})
@@ -3678,11 +3727,11 @@ $(Expr(:toplevel, :($(Expr(:module, true, :GAccessor, quote
return tree_store
end
function value(tree_store::Gtk.GtkTreeStoreI,iter,column,value_)
$(Expr(:ccall, :(:gtk_tree_store_set_value,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Void},Cint,Ptr{Void}), :tree_store, :iter, :column, :value_))
$(Expr(:ccall, :(:gtk_tree_store_set_value,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Gtk.GtkTreeIter},Cint,Ptr{Void}), :tree_store, :iter, :column, :value_))
return tree_store
end
function valuesv(tree_store::Gtk.GtkTreeStoreI,iter,columns,values,n_values)
$(Expr(:ccall, :(:gtk_tree_store_set_valuesv,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Void},Ptr{Cint},Ptr{Void},Cint), :tree_store, :iter, :columns, :values, :n_values))
$(Expr(:ccall, :(:gtk_tree_store_set_valuesv,Gtk.libgtk), :Void, :(Ptr{Gtk.GObject},Ptr{Gtk.GtkTreeIter},Ptr{Cint},Ptr{Void},Cint), :tree_store, :iter, :columns, :values, :n_values))
return tree_store
end
end)))))
Binary file modified gen/gbox2_julia0_2
Binary file not shown.
Binary file modified gen/gbox2_julia0_3
Binary file not shown.
Loading