diff -r c397e85ec555 -r 4042761b21e3 map_win.h
--- a/map_win.h	Thu Nov 17 15:34:18 2005 +0000
+++ b/map_win.h	Mon Nov 21 12:07:05 2005 +0000
@@ -9,7 +9,6 @@
 #include "graph_displayer_canvas.h"
 #include "mapstorage.h"
 #include "new_map_win.h"
-#include "mapselector.h"
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
 
@@ -18,6 +17,61 @@
 ///assigned to maps.
 class MapWin : public Gtk::Window
 {
+
+  class MapSelector : public Gtk::HBox
+  {
+  protected:
+    GraphDisplayerCanvas & gdc;
+    ///The \ref MapStorage in which the visualizable maps are stored
+    MapStorage & ms;
+    NewMapWin & nmw;
+
+    int id;
+
+    bool itisedge;
+
+    bool default_state;
+
+    bool set_new_map;
+
+    Gtk::ComboBoxText cbt;
+
+    Gtk::Button * newbut, * defbut;
+
+    Gtk::HBox hbox;
+
+    Gtk::Label * label;
+
+    Node node_to_update;
+    Edge edge_to_update;
+
+
+  public:
+
+    MapSelector(GraphDisplayerCanvas &, MapStorage &, NewMapWin &, int, bool);
+
+    void update_list();
+
+    ///If a radiobutton is clicked, this function determines
+    ///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 comboChanged();
+
+    virtual void new_but_pressed();
+
+    virtual void reset();
+
+    virtual void update(Node node);
+    virtual void update(Edge edge);
+
+    Glib::ustring get_active_text();
+    void set_active_text(Glib::ustring);
+    void append_text(Glib::ustring);
+  };
+
+
+
 protected:
   ///The \ref GraphDisplayerCanvas on which the graph will be drawn.
   ///It has to be known for this class, because