Merge to XFA: Kill CFX_Object.

core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h

 
 //----------------------------------------------------------------------------
 // Anti-Grain Geometry - Version 2.3
 // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
 //
 // Permission to copy, use, modify, sell and distribute this software
 // is granted provided this copyright notice appears in all copies.
 // This software is provided "as is" without express or implied
 // warranty, and with no claim as to its suitability for any purpose.
 //
 //----------------------------------------------------------------------------
 // Contact: mcseem@antigrain.com
 //          mcseemagg@yahoo.com
 //          http://www.antigrain.com
 //----------------------------------------------------------------------------
 #ifndef AGG_CONV_ADAPTOR_VCGEN_INCLUDED
 #define AGG_CONV_ADAPTOR_VCGEN_INCLUDED
 #include "agg_basics.h"
 namespace agg
 {
-struct null_markers : public CFX_Object {
+struct null_markers  {
     void remove_all() {}
     void add_vertex(FX_FLOAT, FX_FLOAT, unsigned) {}
     void prepare_src() {}
     void rewind(unsigned) {}
     unsigned vertex(FX_FLOAT*, FX_FLOAT*)
     {
         return path_cmd_stop;
     }
 };
 template<class VertexSource,
          class Generator,
-         class Markers = null_markers> class conv_adaptor_vcgen : public CFX_Object
+         class Markers = null_markers> class conv_adaptor_vcgen 
 {
     enum status {
         initial,
         accumulate,
         generate
     };
 public:
     conv_adaptor_vcgen(VertexSource& source) :
         m_source(&source),
         m_status(initial)
@@ skipping 85 matching lines @@
                     break;
                 }
                 done = true;
                 break;
         }
     }
     return cmd;
 }
 }
 #endif