1.1 --- a/main_win.h	Thu Jul 28 19:09:39 2005 +0000
     1.2 +++ b/main_win.h	Fri Jul 29 12:01:37 2005 +0000
     1.3 @@ -3,10 +3,12 @@
     1.4  #ifndef MAIN_WIN_H
     1.5  #define MAIN_WIN_H
     1.6  
     1.7 -#include <all_include.h>
     1.8 -#include <mapstorage.h>
     1.9 -#include <map_win.h>
    1.10 -#include <new_map_win.h>
    1.11 +#include "all_include.h"
    1.12 +#include "mapstorage.h"
    1.13 +#include "map_win.h"
    1.14 +#include "new_map_win.h"
    1.15 +#include "edit_win.h"
    1.16 +#include "graph_displayer_canvas.h"
    1.17  #include <libgnomecanvasmm.h>
    1.18  #include <libgnomecanvasmm/polygon.h>
    1.19  
    1.20 @@ -17,10 +19,9 @@
    1.21  public:
    1.22    ///Constructor of the \ref MainWin. It creates the menu and the \ref GraphDisplayerCanvas on which the graph will be drawn.
    1.23    ///\param title is the title of the window
    1.24 -  ///\param graph is the graph that will be drawn here. It will be given further to the \ref GraphDisplayerCanvas
    1.25 -  ///\param cm stores the coordinates of the nodes of the graph
    1.26 -  ///\param ms is the \ref MapStorage in which the different visualizable maps are stored
    1.27 -  MainWin(const std::string& title, Graph &, CoordinatesMap &, MapStorage &);
    1.28 +  MainWin(const std::string& title);
    1.29 +
    1.30 +  MapStorage mapstorage;
    1.31  
    1.32  protected:
    1.33    ///Window of map-showing setup. Its type is \ref MapWin
    1.34 @@ -52,6 +53,8 @@
    1.35    virtual void saveFile();
    1.36    ///Callback for 'FileSaveAs' action.
    1.37    virtual void saveFileAs();
    1.38 +  ///Callback for 'Close' action.
    1.39 +  virtual void close();
    1.40  };
    1.41  
    1.42  #endif //MAIN_WIN_H