--- deliantra/server/ext/item-worldmap.ext	2007/07/21 18:01:26	1.1
+++ deliantra/server/ext/item-worldmap.ext	2007/07/22 14:17:58	1.3
@@ -9,22 +9,24 @@
    $info->{ws} = my $ws = $ns->new_widgetset;
 
    $info->{toplevel} = my $w = $ws->new (Toplevel =>
+      title   => "Worldmap",
+      name    => "server_item_worldmap",
       force_w => 400,
       force_h => 400,
       x       => "center",
       y       => "center",
-      title   => "Worldmap",
       has_close_button => 1,
       on_delete => sub { shift->hide },
    );
 
    my $face = cf::face::find "res/worldmap.jpg";
    $ns->send_face ($face);
+   $ns->flush_fx;
 
    $w->add (my $sw = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1));
-   $sw->add (my $fixed = $ws->new (Fixed => expand => 1));
-   $fixed->add ($ws->new (Face => expand => 1, size_w => undef, size_h => undef, face => $face), abs => 0, 0, rel => 1, 1);
-   $fixed->add ($ws->new (Label => text => "lb1"), abs => 10, 10, rel => 1, 1);
+   $sw->add (my $canvas = $ws->new (Canvas => expand => 1));
+   $canvas->add_fixed ($ws->new (Face => expand => 1, size_w => undef, size_h => undef, face => $face), abs => 0, 0, rel => 1, 1);
+   $canvas->add_fixed ($ws->new (Label => text => "lb1"), abs => 10, 10, rel => 1, 1);
 
    $info
 }
@@ -36,10 +38,13 @@
       my ($self, $who) = @_;
 
       my $ns = $who->contr->ns;
-      my $ws = $ns->{ws_worldmap} ||= create_widgets $ns;
 
-      $ws->{toplevel}->show;
-      warn "worldmap apply\n";
+      if ($ns->{can_widget}) {
+         my $ws = $ns->{ws_worldmap} ||= create_widgets $ns;
+         $ws->{toplevel}->show;
+      } else {
+         $ns->send_msg ("log", "Your client doesn't support the (required) widget extension. Try CFPlus at http://crossfire.schmorp.de/.", cf::NDI_RED);
+      }
 
       cf::override 1;
    },