* wxCreateDynamicObject() uses an hashtable now

[wxWidgets.git] / user / wxLayout / kbList.h

diff --git a/user/wxLayout/kbList.h b/user/wxLayout/kbList.h
index 277157861f2aa1181da60fe5e60e0b7daf4032cb..fea12a903268769c2aaeb473bfe748b33b866299 100644 (file)
--- a/user/wxLayout/kbList.h
+++ b/user/wxLayout/kbList.h
@@ -4,14 +4,6 @@
  * (C) 1998 by Karsten Ballüder (Ballueder@usa.net)                 *
  *                                                                  *
  * $Id$
  * (C) 1998 by Karsten Ballüder (Ballueder@usa.net)                 *
  *                                                                  *
  * $Id$

- * $Log$
- * Revision 1.1  1998/06/29 12:44:36  KB
- * Added my wxWindows based layout engine to the repository.
- * It arranges text and graphics for display on a wxDC.
- * This code is licensed under the LGPL.
- *
- * Revision 1.6  1998/06/27 20:06:10  KB
- * Added my layout code.

  *
  *******************************************************************/
 
  *
  *******************************************************************/
 


@@ -48,8 +40,8 @@ struct kbListNode
        @param inext if not NULL, use this as next element in list
    */
    kbListNode( void *ielement,
        @param inext if not NULL, use this as next element in list
    */
    kbListNode( void *ielement,

-               kbListNode *iprev = NULL,
-               kbListNode *inext = NULL);
+               kbListNode *iprev = (kbListNode *) NULL,
+               kbListNode *inext = (kbListNode *) NULL);

    /// Destructor.
    ~kbListNode();
 };
    /// Destructor.
    ~kbListNode();
 };


@@ -71,7 +63,7 @@ public:
       /** Constructor.
           @param n if not NULL, the node to which to point
       */
       /** Constructor.
           @param n if not NULL, the node to which to point
       */

-      iterator(kbListNode *n = NULL);
+      iterator(kbListNode *n = (kbListNode *) NULL);

       /** Dereference operator.
           @return the data pointer of the node belonging to this
           iterator
       /** Dereference operator.
           @return the data pointer of the node belonging to this
           iterator


@@ -209,7 +201,7 @@ public:
    bool empty(void) const
       { return first == NULL ; }
 
    bool empty(void) const
       { return first == NULL ; }
 

-private:
+protected:

    /// if true, list owns entries
    bool        ownsEntries;
    /// pointer to first element in list
    /// if true, list owns entries
    bool        ownsEntries;
    /// pointer to first element in list


@@ -217,6 +209,7 @@ private:
    /// pointer to last element in list
    kbListNode *last;
 
    /// pointer to last element in list
    kbListNode *last;
 

+private:

    /// forbid copy construction
    kbList(kbList const &foo);
    /// forbid assignments
    /// forbid copy construction
    kbList(kbList const &foo);
    /// forbid assignments


@@ -245,13 +238,13 @@ public: \
          { node = i.Node(); } \
       friend class name; \
    public: \
          { node = i.Node(); } \
       friend class name; \
    public: \

-      inline iterator(kbListNode *n = NULL) \
+      inline iterator(kbListNode *n = (kbListNode *) NULL) \

          : kbList::iterator(n) {} \
       inline type * operator*() \
          /* the cast is needed for MS VC++ 5.0 */ \
          { return (type *)((kbList::iterator *)this)->operator*() ; } \
    }; \
          : kbList::iterator(n) {} \
       inline type * operator*() \
          /* the cast is needed for MS VC++ 5.0 */ \
          { return (type *)((kbList::iterator *)this)->operator*() ; } \
    }; \

-   inline name(bool ownsEntriesFlag = true) \
+   inline name(bool ownsEntriesFlag = FALSE) \

       : kbList(ownsEntriesFlag) {} \
    \
    inline void push_back(type *element) \
       : kbList(ownsEntriesFlag) {} \
    \
    inline void push_back(type *element) \


@@ -269,7 +262,7 @@ public: \
    inline void insert(iterator & i, type *element) \
       { kbList::insert(i, (void *) element); } \
    \
    inline void insert(iterator & i, type *element) \
       { kbList::insert(i, (void *) element); } \
    \

-   void erase(iterator & i) \
+   inline void erase(iterator & i) \

       { kbList::erase(i); } \
    \
    inline iterator begin(void) const \
       { kbList::erase(i); } \
    \
    inline iterator begin(void) const \


@@ -280,7 +273,22 @@ public: \
    \
    inline iterator tail(void) const \
       { return kbList::tail(); } \
    \
    inline iterator tail(void) const \
       { return kbList::tail(); } \

-}
+   ~name() \
+   { \
+      kbListNode *next; \
+      while ( first != (kbListNode *) NULL ) \
+      { \
+         next = first->next; \
+         if(ownsEntries) \
+            delete typecast(first->element); \
+         delete first; \
+         first = next; \
+      } \
+   } \
+   private: \
+   inline type * typecast(void *ptr) \
+      { return (type *) ptr; } \
+   }

 
 #ifdef   MCONFIG_H
 /// define the most commonly used list type once:
 
 #ifdef   MCONFIG_H
 /// define the most commonly used list type once: