Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1 from perl6/master
merge to master
  • Loading branch information
finanalyst committed Nov 5, 2016
2 parents 91f4f35 + 533b1c3 commit a403ec7
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -5,7 +5,7 @@ os:
- osx

perl6:
- 2016.05
- 2016.08.1
- latest

before_install:
Expand Down
2 changes: 1 addition & 1 deletion Build.pm
Expand Up @@ -100,7 +100,7 @@ class Build is Panda::Builder {
my $basedir = $workdir ~ '/resources/blib/lib/GTK';
mkdir($basedir);
for @files -> $f {
say "writing $f to $basedir/$f";
# write empty files for now
spurt("$basedir/$f", "");
}
}
Expand Down
76 changes: 38 additions & 38 deletions lib/GTK/Simple.pm6
@@ -1,41 +1,41 @@

use v6;

require GTK::Simple::ConnectionHandler;
require GTK::Simple::Widget;
require GTK::Simple::Container;
require GTK::Simple::Window;
require GTK::Simple::Scheduler;
require GTK::Simple::App;
require GTK::Simple::Box;
require GTK::Simple::HBox;
require GTK::Simple::VBox;
require GTK::Simple::Grid;
require GTK::Simple::Label;
require GTK::Simple::MarkUpLabel;
require GTK::Simple::Scale;
require GTK::Simple::Entry;
require GTK::Simple::TextView;
require GTK::Simple::Button;
require GTK::Simple::ToggleButton;
require GTK::Simple::CheckButton;
require GTK::Simple::DrawingArea;
require GTK::Simple::Switch;
require GTK::Simple::StatusBar;
require GTK::Simple::Separator;
require GTK::Simple::ProgressBar;
require GTK::Simple::Frame;
require GTK::Simple::ComboBoxText;
require GTK::Simple::ActionBar;
require GTK::Simple::Spinner;
require GTK::Simple::Toolbar;
require GTK::Simple::MenuToolButton;
require GTK::Simple::MenuBar;
require GTK::Simple::Menu;
require GTK::Simple::MenuItem;
require GTK::Simple::FileChooserButton;
require GTK::Simple::PlacesSidebar;
require GTK::Simple::RadioButton;
require GTK::Simple::LevelBar;
require GTK::Simple::LinkButton;
require GTK::Simple::ScrolledWindow;
need GTK::Simple::ConnectionHandler;
need GTK::Simple::Widget;
need GTK::Simple::Container;
need GTK::Simple::Window;
need GTK::Simple::Scheduler;
need GTK::Simple::App;
need GTK::Simple::Box;
need GTK::Simple::HBox;
need GTK::Simple::VBox;
need GTK::Simple::Grid;
need GTK::Simple::Label;
need GTK::Simple::MarkUpLabel;
need GTK::Simple::Scale;
need GTK::Simple::Entry;
need GTK::Simple::TextView;
need GTK::Simple::Button;
need GTK::Simple::ToggleButton;
need GTK::Simple::CheckButton;
need GTK::Simple::DrawingArea;
need GTK::Simple::Switch;
need GTK::Simple::StatusBar;
need GTK::Simple::Separator;
need GTK::Simple::ProgressBar;
need GTK::Simple::Frame;
need GTK::Simple::ComboBoxText;
need GTK::Simple::ActionBar;
need GTK::Simple::Spinner;
need GTK::Simple::Toolbar;
need GTK::Simple::MenuToolButton;
need GTK::Simple::MenuBar;
need GTK::Simple::Menu;
need GTK::Simple::MenuItem;
need GTK::Simple::FileChooserButton;
need GTK::Simple::PlacesSidebar;
need GTK::Simple::RadioButton;
need GTK::Simple::LevelBar;
need GTK::Simple::LinkButton;
need GTK::Simple::ScrolledWindow;
2 changes: 1 addition & 1 deletion lib/GTK/Simple/Raw.pm6
Expand Up @@ -1001,7 +1001,7 @@ sub gtk_level_bar_set_value(GtkWidget $level-bar, num64 $value)
#
# Scrolled Window
#
sub gtk_scrolled_window_new()
sub gtk_scrolled_window_new(Pointer $h-adjustment, Pointer $v-adjustment)
returns GtkWidget
is native(&gtk-lib)
is export(:scrolled-window)
Expand Down
4 changes: 3 additions & 1 deletion lib/GTK/Simple/ScrolledWindow.pm6
Expand Up @@ -5,13 +5,15 @@ use GTK::Simple::Raw :scrolled-window, :DEFAULT;
use GTK::Simple::Widget;
use GTK::Simple::Container;

use NativeCall;

unit class GTK::Simple::ScrolledWindow
does GTK::Simple::Widget
does GTK::Simple::Container;

submethod BUILD(Cool :$title = "Gtk Scrolled Window",
GtkPolicyType :$hpolicy = GTK_POLICY_AUTOMATIC,
GtkPolicyType :$vpolity = GTK_POLICY_AUTOMATIC) {
$!gtk_widget = gtk_scrolled_window_new; # the null paramenters are for 'hadjust' structures, not normally needed
$!gtk_widget = gtk_scrolled_window_new(Pointer, Pointer); # the null paramenters are for 'hadjust' structures, not normally needed
gtk_scrolled_window_set_policy($!gtk_widget, $hpolicy, $vpolity);
}
2 changes: 1 addition & 1 deletion lib/GTK/Simple/Widget.pm6
Expand Up @@ -112,7 +112,7 @@ method show() {
}

method hide() {
gtk_widget_show($!gtk_widget);
gtk_widget_hide($!gtk_widget);
}

# All widgets get the 'delete-event'
Expand Down

0 comments on commit a403ec7

Please sign in to comment.