Moved some functionality to VTKViewer_Utilities.h

[modules/kernel.git] / src / SALOMEDS / SALOMEDS_AttributePixMap_i.hxx

diff --git a/src/SALOMEDS/SALOMEDS_AttributePixMap_i.hxx b/src/SALOMEDS/SALOMEDS_AttributePixMap_i.hxx
index 16696a4a5d81e1ecd891c4002a59c02876d490a4..c17fa5c2f1a6863d7746ea9398f52ce4ae6182af 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_AttributePixMap_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_AttributePixMap_i.hxx
@@ -30,21 +30,20 @@
 #define SALOMEDS_AttributePixMap_i_HeaderFile
 
 // IDL headers
-#include "SALOMEDS_PixMapAttribute.hxx"
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
+
+#include "SALOMEDS_PixMapAttribute.hxx"
 #include "SALOMEDS_GenericAttribute_i.hxx"
 
-class SALOMEDS_AttributePixMap_i: public virtual POA_SALOMEDS::AttributePixMap,
-                               public virtual SALOMEDS_GenericAttribute_i {
+DEFINE_DERIVED_ATTR(AttributePixMap,SALOMEDS_PixMapAttribute,false);
+
+class SALOMEDS_AttributePixMap_i: 
+  public virtual POA_SALOMEDS::AttributePixMap,
+  public virtual SALOMEDS_TAttributePixMap_i 
+{
+  DEFINE_DERIVED_ATTR_METH_DEFAULT(AttributePixMap,SALOMEDS_PixMapAttribute);
 public:
-  
-  SALOMEDS_AttributePixMap_i(const Handle(SALOMEDS_PixMapAttribute)& thePixMapAttr, CORBA::ORB_ptr orb) 
-  {
-    _myOrb = CORBA::ORB::_duplicate(orb);
-    _myAttr = thePixMapAttr;
-  };
-  ~SALOMEDS_AttributePixMap_i() {};
   CORBA::Boolean HasPixMap();
   char* GetPixMap();
   void SetPixMap(const char* value);