Merge remote-tracking branch 'origin/5.4' 34/10234/1
Sylvestre Ledru [Wed, 16 Jan 2013 16:59:28 +0000 (17:59 +0100)]
Change-Id: I618f0ee7bfdbf383dc95b59b4b9880c8953fa413

1  2 
scilab/CHANGES_5.4.X
scilab/configure
scilab/configure.ac
scilab/modules/graphics/sci_gateway/c/sci_delete.c

Simple merge
Simple merge
Simple merge
@@@ -177,9 -129,14 +177,14 @@@ int sci_delete(char *fname, unsigned lo
                              deleteGraphicObject(childrenUID[i]);
                          }
                      }
+                     /*
+                      * Clone a new Axes object using the Axes model which is then
+                      * attached to the 'cleaned' Figure.
+                      */
+                     cloneAxesModel(pFigureUID);
  
 -                    LhsVar(1) = 0;
 -                    PutLhsVar();
 +                    AssignOutputVariable(pvApiCtx, 1) = 0;
 +                    ReturnArguments(pvApiCtx);
  
                      return 0;
                  }