Changeset 1838:b61682f0ee96 in lemon-0.x for gui/map_win.cc

Timestamp:

11/30/05 14:24:23 (18 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

MapWin? is created and disposed from now instead of being show and hide.

File:

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

gui/map_win.cc

@@ -6 +6 @@
   if(e->keyval==GDK_Escape)
   {
-    hide();
+    mainwin.closeMapWin();
+    //    hide();
   }
   return true;
@@ -24 +25 @@
   for(int i=0;i<EDGE_PROPERTY_NUM;i++)
   {
-    e_combo_array[i]=new MapSelector(eml, i, true);
+    e_combo_array[i]=new MapSelector(eml, mainwin.getActiveEdgeMap(i), i, true);
 
     (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
@@ -44 +45 @@
   for(int i=0;i<NODE_PROPERTY_NUM;i++)
   {
-    n_combo_array[i]=new MapSelector(nml, i, false);
+    n_combo_array[i]=new MapSelector(nml, mainwin.getActiveNodeMap(i), i, false);
 
     (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
@@ -60 +61 @@
   show_all_children();
 
+}
+
+MapWin::~MapWin()
+{
 }
 
@@ -107 +112 @@
   }
 }
+
+bool MapWin::on_delete_event(GdkEventAny * event)
+{
+  event=event;
+  mainwin.closeMapWin();
+  return true;
+}