diff --git a/src/Gtk.jl b/src/Gtk.jl index 80d1a43a..81935bab 100644 --- a/src/Gtk.jl +++ b/src/Gtk.jl @@ -35,7 +35,7 @@ export GtkWindow, GtkCanvas, GtkBox, GtkButtonBox, GtkPaned, GtkLayout, GtkNoteb GtkImage, GtkProgressBar, GtkSpinner, GtkStatusbar, GtkStatusIcon, GtkTextBuffer, GtkTextView, GtkTextMark, GtkTextTag, GtkMenuItem, GtkSeparatorMenuItem, GtkMenu, GtkMenuBar, GtkAboutDialog, GtkDialog, - GtkFileChooserDialog, GtkMessageDialog, GtkNullContainer, + GtkFileChooserDialog, GtkMessageDialog, GtkSeparator, GtkNullContainer, GtkBuilder, GtkListStore, GtkTreeStore, GtkTreeIter, GtkTreeSelection, GtkTreeView, GtkTreeViewColumn, GtkCellRendererAccel, GtkCellRendererCombo, GtkCellRendererPixbuf, @@ -132,7 +132,7 @@ end for container in subtypes(GtkContainerI,true) @eval $(symbol(string(container)))(child::GtkWidgetI,vargs...) = push!($container(vargs...),child) end -for orientable in tuple(:GtkPaned, :GtkScale, [sym.name.name for sym in subtypes(GtkBoxI,true)]...) +for orientable in tuple(:GtkPaned, :GtkScale, :GtkSeparator, [sym.name.name for sym in subtypes(GtkBoxI,true)]...) @eval $orientable(orientation::Symbol,vargs...) = $orientable( (orientation==:v ? true : (orientation==:h ? false : @@ -203,6 +203,7 @@ module ShortNames const Pixbuf = GdkPixbuf const Image = GtkImage const ProgressBar = GtkProgressBar + const Separator = GtkSeparator const Spinner = GtkSpinner const Statusbar = GtkStatusbar const StatusIcon = GtkStatusIcon @@ -257,7 +258,7 @@ module ShortNames Entry, Scale, Adjustment, SpinButton, ComboBoxText, Pixbuf, Image, ProgressBar, Spinner, Statusbar, StatusIcon, TextBuffer, TextView, TextMark, TextTag, - MenuItem, SeparatorMenuItem, Menu, MenuBar, + MenuItem, Separator, SeparatorMenuItem, Menu, MenuBar, NullContainer, Key, Builder, ListStore, TreeStore, TreeIter, TreeSelection, TreeView, TreeViewColumn, CellRendererAccel, CellRendererCombo, CellRendererPixbuf, diff --git a/src/windows.jl b/src/windows.jl index b5c76c57..89e3850f 100644 --- a/src/windows.jl +++ b/src/windows.jl @@ -71,4 +71,12 @@ function GtkMessageDialog(parent::GtkContainerI, flags::Integer, typ::Integer, w end -#GtkSeparator — A separator widget +@gtktype GtkSeparator +GtkSeparator(vertical::Bool) = + GtkSeparator( + if vertical + ccall((:gtk_vseparator_new,libgtk),Ptr{GObject},()) + else + ccall((:gtk_hseparator_new,libgtk),Ptr{GObject},()) + end + ) diff --git a/test/tests.jl b/test/tests.jl index a8bd6d54..4356f4cf 100644 --- a/test/tests.jl +++ b/test/tests.jl @@ -66,8 +66,10 @@ f = BoxLayout(:v) w = Window(f, "Last in, first covered", 400, 400) g1 = BoxLayout(:h) +hsep = Separator(:h) g2 = BoxLayout(:h) push!(f,g1) +push!(f,hsep) push!(f,g2) b11 = Button("first")