Changeset 1733:5e0d97823ba2 in lemon-0.x for gui/map_win.cc

Timestamp:

10/21/05 15:32:12 (19 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2260

Message:

MapSelector? widget is able to pop up NewMap? window. At the moment I hope MapSelector? widget is done.

File:

• gui/map_win.cc (modified) (4 diffs)

gui/map_win.cc

@@ -11 +11 @@
 }
 
-MapWin::MapWin(const std::string& title, MapStorage & mapst, GraphDisplayerCanvas & grdispc):gdc(grdispc),ms(mapst)
+MapWin::MapWin(const std::string& title, MapStorage & mapst, GraphDisplayerCanvas & grdispc, NewMapWin & newmapwin):gdc(grdispc),ms(mapst), nmw(newmapwin)
 {
   set_title(title);
@@ -24 +24 @@
   for(int i=0;i<EDGE_PROPERTY_NUM;i++)
   {
-    e_combo_array[i]=new MapSelector(gdc, ms, *this, i, true);
+    e_combo_array[i]=new MapSelector(gdc, ms, nmw, i, true);
 
     (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
@@ -41 +41 @@
   for(int i=0;i<NODE_PROPERTY_NUM;i++)
   {
-    n_combo_array[i]=new MapSelector(gdc, ms, *this, i, false);
+    n_combo_array[i]=new MapSelector(gdc, ms, nmw, i, false);
 
     (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
@@ -102 +102 @@
   {
     //filling in combo box with choices
-    e_combo_array[i]->append_text((Glib::ustring)newmapname);
+    n_combo_array[i]->append_text((Glib::ustring)newmapname);
   }
   //setting text property for the new map