fixed layout of tables that are first element on a page

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

diff --git a/include/wx/list.h b/include/wx/list.h
index 02805b9d03d8e80ed5c67e2c219b732778d61673..fb597e90aad579fea0852d98b53d1dea290d937f 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        list.h
+// Name:        wx/list.h

 // Purpose:     wxList, wxStringList classes
 // Author:      Julian Smart
 // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added
 // Purpose:     wxList, wxStringList classes
 // Author:      Julian Smart
 // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added


@@ -25,11 +25,6 @@
 #ifndef _WX_LISTH__
 #define _WX_LISTH__
 
 #ifndef _WX_LISTH__
 #define _WX_LISTH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && \
-    !(defined(__MINGW32__) && __GNUC__ == 3 && __GNUC_MINOR__ == 2)
-#pragma interface "list.h"
-#endif
-

 // -----------------------------------------------------------------------------
 // headers
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // headers
 // -----------------------------------------------------------------------------


@@ -314,7 +309,7 @@ private:
     WX_DECLARE_USER_EXPORTED_LIST(elementtype, listname, usergoo)
 
 // this macro must be inserted in your program after
     WX_DECLARE_USER_EXPORTED_LIST(elementtype, listname, usergoo)
 
 // this macro must be inserted in your program after

-//      #include <wx/listimpl.cpp>
+//      #include "wx/listimpl.cpp"

 #define WX_DEFINE_LIST(name)    "don't forget to include listimpl.cpp!"
 
 #define WX_DEFINE_EXPORTED_LIST(name)      WX_DEFINE_LIST(name)
 #define WX_DEFINE_LIST(name)    "don't forget to include listimpl.cpp!"
 
 #define WX_DEFINE_EXPORTED_LIST(name)      WX_DEFINE_LIST(name)


@@ -328,8 +323,6 @@ private:
 extern WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s);
 #endif
 
 extern WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s);
 #endif
 

-class WXDLLEXPORT wxObjectListNode;
-

 // undef it to get rid of old, deprecated functions
 #define wxLIST_COMPATIBILITY
 
 // undef it to get rid of old, deprecated functions
 #define wxLIST_COMPATIBILITY
 


@@ -460,9 +453,7 @@ class WXDLLIMPEXP_BASE wxListBase : public wxObject
 {
 friend class WXDLLIMPEXP_BASE wxNodeBase; // should be able to call DetachNode()
 friend class wxHashTableBase;   // should be able to call untyped Find()
 {
 friend class WXDLLIMPEXP_BASE wxNodeBase; // should be able to call DetachNode()
 friend class wxHashTableBase;   // should be able to call untyped Find()

-private:
-        // common part of all ctors
-    void Init(wxKeyType keyType = wxKEY_NONE); // Must be declared before it's used (for VC++ 1.5)
+

 public:
     // default ctor & dtor
     wxListBase(wxKeyType keyType = wxKEY_NONE)
 public:
     // default ctor & dtor
     wxListBase(wxKeyType keyType = wxKEY_NONE)


@@ -599,6 +590,10 @@ protected:
     void Reverse();
     void DeleteNodes(wxNodeBase* first, wxNodeBase* last);
 private:
     void Reverse();
     void DeleteNodes(wxNodeBase* first, wxNodeBase* last);
 private:

+
+        // common part of all ctors
+    void Init(wxKeyType keyType = wxKEY_NONE);
+

     // helpers
         // common part of copy ctor and assignment operator
     void DoCopy(const wxListBase& list);
     // helpers
         // common part of copy ctor and assignment operator
     void DoCopy(const wxListBase& list);


@@ -1069,7 +1064,7 @@ private:
     WX_DECLARE_LIST_PTR_2(elementtype, listname, wx##listname##Node, class usergoo)
 
 // this macro must be inserted in your program after
     WX_DECLARE_LIST_PTR_2(elementtype, listname, wx##listname##Node, class usergoo)
 
 // this macro must be inserted in your program after

-//      #include <wx/listimpl.cpp>
+//      #include "wx/listimpl.cpp"

 #define WX_DEFINE_LIST(name)    "don't forget to include listimpl.cpp!"
 
 #define WX_DEFINE_EXPORTED_LIST(name)      WX_DEFINE_LIST(name)
 #define WX_DEFINE_LIST(name)    "don't forget to include listimpl.cpp!"
 
 #define WX_DEFINE_EXPORTED_LIST(name)      WX_DEFINE_LIST(name)


@@ -1241,5 +1236,4 @@ public:
         (list).clear();                                                      \
     }
 
         (list).clear();                                                      \
     }
 

-#endif
-    // _WX_LISTH__
+#endif // _WX_LISTH__