better use unset() for unsetting ...

[flightgear.git] / src / Instrumentation / wxradar.cxx

diff --git a/src/Instrumentation/wxradar.cxx b/src/Instrumentation/wxradar.cxx
index 30680b9d2898391267cac2fe71b6c02752172ff6..a97a6fb738224ef6a2419b8ac29a9eef2556f0b4 100644 (file)
--- a/src/Instrumentation/wxradar.cxx
+++ b/src/Instrumentation/wxradar.cxx
@@ -46,12 +46,12 @@
 
 #include <sstream>
 #include <iomanip>
-SG_USING_STD(stringstream);
-SG_USING_STD(endl);
-SG_USING_STD(setprecision);
-SG_USING_STD(fixed);
-SG_USING_STD(setw);
-SG_USING_STD(setfill);
+using std::stringstream;
+using std::endl;
+using std::setprecision;
+using std::fixed;
+using std::setw;
+using std::setfill;
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
@@ -95,7 +95,6 @@ wxRadarBg::wxRadarBg(SGPropertyNode *node) :
     _Tacan = fgGetNode(tacan_source, true);
 
     _font_node = _Instrument->getNode("font", true);
-    _font_node->addChangeListener(this, true);
 
 #define INITFONT(p, val, type) if (!_font_node->hasValue(p)) _font_node->set##type##Value(p, val)
     INITFONT("name", DEFAULT_FONT, String);
@@ -106,6 +105,8 @@ wxRadarBg::wxRadarBg(SGPropertyNode *node) :
     INITFONT("color/blue", 0, Float);
     INITFONT("color/alpha", 1, Float);
 #undef INITFONT
+
+    _font_node->addChangeListener(this, true);
 }