diff -r 6a9399f56813 -r abac0179a26a map_win.h
--- a/map_win.h	Fri Jun 03 12:25:23 2005 +0000
+++ b/map_win.h	Mon Jun 06 17:01:12 2005 +0000
@@ -24,16 +24,14 @@
   ///The \ref MapStorage in which the visualizable maps are stored
   MapStorage & ms;
 
+  Gtk::Table table;
   
-  Gtk::HBox * radios;
-  Gtk::RadioButton ** rb_array;
+  Gtk::HBox combos, * labelpluscombo;
+  Gtk::Combo * combo_array;
 
-  Gtk::VBox vbox_b, * vbox_r1, * vbox_r2;
+  Gtk::VBox vbox_b, vbox_r1, vbox_r2;
 
-  ///The notebook has different pages for each attribute.
-  Gtk::Notebook notebook;
-
-  Gtk::Label * labels;
+  Gtk::Label * label;
 
 public:
   ///Constructor of MapWin creates the widgets shown in MapWin.
@@ -43,7 +41,8 @@
   ///which button was that and after that calls the
   ///appropriate function of the \ref GraphDisplayerCanvas
   ///to change the visible values of that attribute.
-  virtual void radio_click(int, int);
+  virtual void combo_changed(int);
+  virtual bool close_if_escape_is_pressed(GdkEventKey*);
 };
 
 #endif //MAP_WIN_H