1.1 --- a/gui/map_win.cc Wed Jun 29 12:52:20 2005 +0000
1.2 +++ b/gui/map_win.cc Wed Jun 29 15:41:33 2005 +0000
1.3 @@ -1,7 +1,7 @@
1.4 #include <map_win.h>
1.5 #include <set>
1.6
1.7 -bool MapWin::close_if_escape_is_pressed(GdkEventKey* e)
1.8 +bool MapWin::closeIfEscapeIsPressed(GdkEventKey* e)
1.9 {
1.10 if(e->keyval==GDK_Escape)
1.11 {
1.12 @@ -15,7 +15,7 @@
1.13 set_title(title);
1.14 set_default_size(200, 50);
1.15
1.16 - signal_key_press_event().connect(sigc::mem_fun(*this, &MapWin::close_if_escape_is_pressed));
1.17 + signal_key_press_event().connect(sigc::mem_fun(*this, &MapWin::closeIfEscapeIsPressed));
1.18
1.19 e_combo_array=new Gtk::Combo [EDGE_PROPERTY_NUM];
1.20
1.21 @@ -74,7 +74,7 @@
1.22 (
1.23 sigc::bind
1.24 (
1.25 - sigc::mem_fun(*this, &MapWin::e_combo_changed),
1.26 + sigc::mem_fun(*this, &MapWin::eComboChanged),
1.27 i
1.28 )
1.29 );
1.30 @@ -153,7 +153,7 @@
1.31 (
1.32 sigc::bind
1.33 (
1.34 - sigc::mem_fun(*this, &MapWin::n_combo_changed),
1.35 + sigc::mem_fun(*this, &MapWin::nComboChanged),
1.36 i
1.37 )
1.38 );
1.39 @@ -179,7 +179,7 @@
1.40
1.41 }
1.42
1.43 -void MapWin::e_combo_changed(int prop)
1.44 +void MapWin::eComboChanged(int prop)
1.45 {
1.46 Gtk::Entry* entry = e_combo_array[prop].get_entry();
1.47
1.48 @@ -214,7 +214,7 @@
1.49 }
1.50 };
1.51
1.52 -void MapWin::n_combo_changed(int prop)
1.53 +void MapWin::nComboChanged(int prop)
1.54 {
1.55
1.56 Gtk::Entry* entry = n_combo_array[prop].get_entry();
1.57 @@ -250,7 +250,7 @@
1.58 }
1.59 };
1.60
1.61 -void MapWin::update_node(Graph::Node node)
1.62 +void MapWin::updateNode(Graph::Node node)
1.63 {
1.64 for(int i=0;i<NODE_PROPERTY_NUM;i++)
1.65 {
1.66 @@ -289,7 +289,7 @@
1.67 }
1.68 }
1.69
1.70 -void MapWin::update_edge(Graph::Edge edge)
1.71 +void MapWin::updateEdge(Graph::Edge edge)
1.72 {
1.73 for(int i=0;i<EDGE_PROPERTY_NUM;i++)
1.74 {