--- deliantra/Deliantra-Client/bin/cfplus	2007/07/14 12:05:53	1.168
+++ deliantra/Deliantra-Client/bin/cfplus	2007/07/15 21:15:14	1.170
@@ -1282,7 +1282,14 @@
 }
 
 sub autopickup_setup {
-   my $table = new CFPlus::UI::Table;
+   my $r = new CFPlus::UI::ScrolledWindow (
+      expand   => 1,
+      scroll_y => 1
+   );
+   $r->add (my $table = new CFPlus::UI::Table
+      row_expand => [0],
+      col_expand => [0, 1, 0, 1],
+   );
 
    for (
          ["General", 0, 0,
@@ -1376,7 +1383,7 @@
          0
       });
 
-   $table
+   $r
 }
 
 my %SORT_ORDER = (
@@ -2164,7 +2171,7 @@
    $NOW = time;
 
    ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
-      for CFPlus::SDL_PollEvent;
+      for CFPlus::poll_events;
 
    if (%animate_object) {
       $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;