1.1 --- a/gui/graph_displayer_canvas.h	Tue Nov 29 08:43:50 2005 +0000
     1.2 +++ b/gui/graph_displayer_canvas.h	Tue Nov 29 19:31:58 2005 +0000
     1.3 @@ -6,8 +6,7 @@
     1.4  class GraphDisplayerCanvas;
     1.5  
     1.6  #include "all_include.h"
     1.7 -#include "mapstorage.h"
     1.8 -#include "map_win.h"
     1.9 +#include "main_win.h"
    1.10  #include <libgnomecanvasmm.h>
    1.11  #include <libgnomecanvasmm/polygon.h>
    1.12  #include <lemon/xy.h>
    1.13 @@ -40,7 +39,7 @@
    1.14    typedef Gnome::Canvas::CanvasAA Parent;
    1.15  
    1.16  public:
    1.17 -  GraphDisplayerCanvas(MapStorage &, MapWin &, Gtk::Window *);
    1.18 +  GraphDisplayerCanvas(MainWin &);
    1.19    virtual ~GraphDisplayerCanvas();
    1.20  
    1.21    ///Changes the linewidth attribute according to the given map.
    1.22 @@ -73,6 +72,13 @@
    1.23    int changeNodeText (std::string mapname, Node new_item=INVALID);
    1.24    int resetNodeText (Node new_item=INVALID);
    1.25  
    1.26 +  void propertyChange(bool, int);
    1.27 +  void propertyUpdate(Edge, int, int dummy=0);
    1.28 +  void propertyUpdate(Node, int, int dummy=0);
    1.29 +
    1.30 +  void propertyUpdate(Edge);
    1.31 +  void propertyUpdate(Node);
    1.32 +
    1.33    ///Callback for 'ViewZoomIn' action.
    1.34    virtual void zoomIn();
    1.35    ///Callback for 'ViewZoomOut' action.
    1.36 @@ -165,10 +171,6 @@
    1.37    ///Group of graphical elements of displayed_graph
    1.38    Gnome::Canvas::Group displayed_graph;
    1.39  
    1.40 -public:
    1.41 -  ///Here we store the maps that can be displayed through properties.
    1.42 -  MapStorage & mapstorage;
    1.43 -
    1.44  private:
    1.45    ///Indicates whether the button of mouse is pressed or not
    1.46    int isbutton;
    1.47 @@ -193,14 +195,10 @@
    1.48  
    1.49    static const int zoom_step = 5;
    1.50  
    1.51 -public:
    1.52 -  ///We need to store mapwin, to be able to ask the appropriate values for properties of new items.
    1.53 -  MapWin & mapwin;
    1.54 -
    1.55  private:
    1.56  
    1.57 -  ///pointer to the parent window
    1.58 -  Gtk::Window * parentwin;
    1.59 +  ///reference to the parent window
    1.60 +  MainWin & mainwin;
    1.61  
    1.62  };
    1.63