We surely don't need two debugging sections,

[wxWidgets.git] / include / wx / list.h

diff --git a/include/wx/list.h b/include/wx/list.h
index 1fd7c4808ef71c75dac0823eccb565b9b4eed2ef..66dfd104edbe42570bfeb4105ee9d1a1b7e994f0 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -25,7 +25,7 @@
 #ifndef _WX_LISTH__
 #define _WX_LISTH__
 
 #ifndef _WX_LISTH__
 #define _WX_LISTH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "list.h"
 #endif
 
 #pragma interface "list.h"
 #endif
 


@@ -155,10 +155,10 @@ public:
     void SetKeyInteger(long i) { m_key.integer = i; }
 
 #ifdef wxLIST_COMPATIBILITY
     void SetKeyInteger(long i) { m_key.integer = i; }
 
 #ifdef wxLIST_COMPATIBILITY

-    // compatibility methods
-    wxNode *Next() const { return (wxNode *)GetNext(); }
-    wxNode *Previous() const { return (wxNode *)GetPrevious(); }
-    wxObject *Data() const { return (wxObject *)GetData(); }
+    // compatibility methods, use Get* instead.
+    wxDEPRECATED( wxNode *Next() const );
+    wxDEPRECATED( wxNode *Previous() const );
+    wxDEPRECATED( wxObject *Data() const );

 #endif // wxLIST_COMPATIBILITY
 
 protected:
 #endif // wxLIST_COMPATIBILITY
 
 protected:


@@ -191,9 +191,11 @@ private:
 // a double-linked list class
 // -----------------------------------------------------------------------------
 
 // a double-linked list class
 // -----------------------------------------------------------------------------
 

+class wxList;
+

 class WXDLLEXPORT wxListBase : public wxObject
 {
 class WXDLLEXPORT wxListBase : public wxObject
 {

-friend class wxNodeBase;        // should be able to call DetachNode()
+friend class WXDLLEXPORT wxNodeBase; // should be able to call DetachNode()

 friend class wxHashTableBase;   // should be able to call untyped Find()
 private:
         // common part of all ctors
 friend class wxHashTableBase;   // should be able to call untyped Find()
 private:
         // common part of all ctors


@@ -232,10 +234,14 @@ public:
         { wxASSERT( m_count==0 ); m_keyType = keyType; }
 
 #ifdef wxLIST_COMPATIBILITY
         { wxASSERT( m_count==0 ); m_keyType = keyType; }
 
 #ifdef wxLIST_COMPATIBILITY

-    int Number() const { return GetCount(); }
-    wxNode *First() const { return (wxNode *)GetFirst(); }
-    wxNode *Last() const { return (wxNode *)GetLast(); }
-    wxNode *Nth(size_t index) const { return (wxNode *)Item(index); }
+    // compatibility methods from old wxList
+    wxDEPRECATED( int Number() const );             // use GetCount instead.
+    wxDEPRECATED( wxNode *First() const );          // use GetFirst
+    wxDEPRECATED( wxNode *Last() const );           // use GetLast
+    wxDEPRECATED( wxNode *Nth(size_t n) const );    // use Item
+
+    // kludge for typesafe list migration in core classes.
+    wxDEPRECATED( operator wxList&() const );

 #endif // wxLIST_COMPATIBILITY
 
 protected:
 #endif // wxLIST_COMPATIBILITY
 
 protected:


@@ -274,8 +280,12 @@ protected:
     wxNodeBase *Item(size_t index) const;
 
         // get the list item's data
     wxNodeBase *Item(size_t index) const;
 
         // get the list item's data

-    void *operator[](size_t index) const
-        { wxNodeBase *node = Item(index); return node ? node->GetData() : (wxNodeBase*)NULL; }
+    void *operator[](size_t n) const
+    {
+        wxNodeBase *node = Item(n);
+
+        return node ? node->GetData() : (wxNodeBase *)NULL;
+    }

 
     // operations
         // append to end of list
 
     // operations
         // append to end of list


@@ -498,6 +508,9 @@ private:
 
 #ifdef wxLIST_COMPATIBILITY
 
 
 #ifdef wxLIST_COMPATIBILITY
 

+// define this to make a lot of noise about use of the old wxList classes.
+//#define wxWARN_COMPAT_LIST_USE
+

 // -----------------------------------------------------------------------------
 // wxList compatibility class: in fact, it's a list of wxObjects
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // wxList compatibility class: in fact, it's a list of wxObjects
 // -----------------------------------------------------------------------------


@@ -507,7 +520,12 @@ WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode, class WXDLLEXPORT);
 class WXDLLEXPORT wxList : public wxObjectList
 {
 public:
 class WXDLLEXPORT wxList : public wxObjectList
 {
 public:

-    wxList(int key_type = wxKEY_NONE) : wxObjectList((wxKeyType)key_type) { }
+#ifdef wxWARN_COMPAT_LIST_USE
+    wxDEPRECATED( wxList(int key_type = wxKEY_NONE) );
+#else
+    wxList(int key_type = wxKEY_NONE);
+#endif
+

     // this destructor is required for Darwin
    ~wxList() { }
 
     // this destructor is required for Darwin
    ~wxList() { }
 


@@ -534,8 +552,13 @@ class WXDLLEXPORT wxStringList : public wxStringListBase
 public:
     // ctors and such
         // default
 public:
     // ctors and such
         // default

-    wxStringList() { DeleteContents(TRUE); }
+#ifdef wxWARN_COMPAT_LIST_USE
+    wxDEPRECATED( wxStringList() );
+    wxDEPRECATED( wxStringList(const wxChar *first ...) );
+#else
+    wxStringList();

     wxStringList(const wxChar *first ...);
     wxStringList(const wxChar *first ...);

+#endif

 
         // copying the string list: the strings are copied, too (extremely
         // inefficient!)
 
         // copying the string list: the strings are copied, too (extremely
         // inefficient!)