Canvas: use new naGCSave/naGCRelease functions.

diff --git a/simgear/canvas/CanvasEventListener.cxx b/simgear/canvas/CanvasEventListener.cxx
index 03675ff78ba33fad8bb03872d418007dc7cee862..5dcfab516cb72107d6dc112d8a744f18d44bdcdd 100644 (file)
--- a/simgear/canvas/CanvasEventListener.cxx
+++ b/simgear/canvas/CanvasEventListener.cxx
@@ -43,14 +43,13 @@ namespace canvas
         "canvas::NasalEventListener: invalid function argument"
       );
 
-    _gc_key = sys_adapter->gcSave(_code);
+    _gc_key = naGCSave(_code);
   }
 
   //----------------------------------------------------------------------------
   NasalEventListener::~NasalEventListener()
   {
-    if( !_sys.expired() )
-      _sys.lock()->gcRelease(_gc_key);
+    naGCRelease(_gc_key);
   }
 
   //----------------------------------------------------------------------------

diff --git a/simgear/canvas/CanvasSystemAdapter.hxx b/simgear/canvas/CanvasSystemAdapter.hxx
index a2bb1fe281ec4edf27bfd9f8812da548f2673e92..6a250f4da4dea8b6dcfdb727217d47a5351dbd51 100644 (file)
--- a/simgear/canvas/CanvasSystemAdapter.hxx
+++ b/simgear/canvas/CanvasSystemAdapter.hxx
@@ -39,18 +39,6 @@ namespace canvas
 
       virtual naContext getNasalContext() const = 0;
 
-      /**
-       * Save passed reference to Nasal object from being deleted by the
-       * garbage collector.
-       */
-      virtual int gcSave(naRef r) = 0;
-
-      /**
-       * Release an object previously passed to ::gcSave to allow it being
-       * cleaned up by the garbage collector.
-       */
-      virtual void gcRelease(int key) = 0;
-
       /**
        * Call a Nasal function with the given environment and arguments.
        */