immplemented areacontainers to group areas

1 files changed, 11 insertions, 7 deletions

diff --git a/libtemplate/templateviewelement.h b/libtemplate/templateviewelement.h
index 20c0906..cbc2911 100644
--- a/libtemplate/templateviewelement.h
+++ b/libtemplate/templateviewelement.h
@@ -91,24 +91,28 @@ protected:
     int containerY;

     int containerWidth;

     int containerHeight;

-    vector<cTemplatePixmap*> viewPixmaps;

-    vector<cTemplatePixmap*>::iterator pixIterator;

+    vector<cTemplatePixmapNode*> viewPixmapNodes;

+    vector<cTemplatePixmapNode*>::iterator pixmapNodeIterator;

+    cTemplatePixmap *pixmapIterator;

+    cTemplatePixmapContainer *currentNode;

     int pixOffset;

 public:

     cTemplateViewElement(void);

     virtual ~cTemplateViewElement(void);

+    void SetContainer(int x, int y, int width, int height);

+    virtual void SetGlobals(cGlobals *globals);

     void SetParameters(vector<pair<string, string> > &params);

     bool CalculateParameters(void);

     virtual bool CalculatePixmapParameters(void);

     bool CalculatePixmapParametersList(int orientation, int numElements);    

+    void AddPixmap(cTemplatePixmapNode *pix) { viewPixmapNodes.push_back(pix); };

     int GetNumericParameter(eParamType type);

-    void AddPixmap(cTemplatePixmap *pix) { viewPixmaps.push_back(pix); };

-    virtual void SetGlobals(cGlobals *globals);

-    void SetContainer(int x, int y, int width, int height);

     void SetPixOffset(int offset) { pixOffset = offset; };

     int GetPixOffset(void) { return pixOffset; };

-    virtual int GetNumPixmaps(void) { return viewPixmaps.size(); };

-    void InitIterator(void);

+    virtual int GetNumPixmaps(void);

+    void InitPixmapNodeIterator(void);

+    cTemplatePixmapNode *GetNextPixmapNode(void);

+    void InitPixmapIterator(void);

     cTemplatePixmap *GetNextPixmap(void);

     cTemplateFunction *GetFunction(string name);

     bool Execute(void);