gcc 4.3 issues warning if type attributes are given again - even if they are identica...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/xti.h b/include/wx/xti.h
index ba8183a93adde4e0a688a84394bb0bdc7851df09..dbbfc2d09af6aab3dcdb66220a6a6b83b1926f31 100644 (file)
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -96,7 +96,7 @@ typedef bool (*wxObjectStreamingCallback) ( const wxObject *, wxObjectWriter *,
 class WXDLLIMPEXP_BASE wxClassInfo
 {
     friend class WXDLLIMPEXP_BASE wxPropertyInfo;
-    friend class WXDLLIMPEXP_BASE wxHandlerInfo;
+    friend class /* WXDLLIMPEXP_BASE */ wxHandlerInfo;
     friend wxObject *wxCreateDynamicObject(const wxString& name);
 
 public:
@@ -333,7 +333,6 @@ private:
     wxPropertyInfoFn          m_firstPropertyFn;
     wxHandlerInfoFn           m_firstHandlerFn;
 
-    mutable bool              m_firstInited;
 
 protected:
     void                      EnsureInfosInited() const
@@ -351,6 +350,8 @@ protected:
     mutable wxHandlerInfo*    m_firstHandler;
 
 private:
+    mutable bool              m_firstInited;
+
     const wxClassInfo**       m_parents;
     const wxChar*             m_unitName;
 

diff --git a/include/wx/xtiprop.h b/include/wx/xtiprop.h
index 23d901755f909c91256f00b9e199bddbfc414e8a..ab04a57d1536fd5907d16967202d4fb41b780088 100644 (file)
--- a/include/wx/xtiprop.h
+++ b/include/wx/xtiprop.h
@@ -20,9 +20,11 @@
 #include "wx/xti.h"
 #include "wx/any.h"
 
+/*
 class WXDLLIMPEXP_BASE wxObject;
 class WXDLLIMPEXP_BASE wxClassInfo;
 class WXDLLIMPEXP_BASE wxDynamicClassInfo;
+*/
 class WXDLLIMPEXP_BASE wxHashTable;
 class WXDLLIMPEXP_BASE wxHashTable_Node;
 class WXDLLIMPEXP_BASE wxEvent;
@@ -302,7 +304,7 @@ enum
 
 class WXDLLIMPEXP_BASE wxPropertyInfo
 {
-    friend class WXDLLIMPEXP_BASE wxDynamicClassInfo;
+    friend class /* WXDLLIMPEXP_BASE */ wxDynamicClassInfo;
 
 public:
     wxPropertyInfo(wxPropertyInfo* &iter,

diff --git a/include/wx/xtistrm.h b/include/wx/xtistrm.h
index 98917ca6ab0748ba365e50b556cd91ac47c90183..0876b9d5f91977e57605395f457a9b754444159b 100644 (file)
--- a/include/wx/xtistrm.h
+++ b/include/wx/xtistrm.h
@@ -38,14 +38,16 @@ const int wxNullObjectID = -3;
 // or modify the value before it is streamed-out.
 // ----------------------------------------------------------------------------
 
+/*
+ class WXDLLIMPEXP_BASE wxClassInfo;
+ class WXDLLIMPEXP_BASE wxAnyList;
+ class WXDLLIMPEXP_BASE wxPropertyInfo;
+ class WXDLLIMPEXP_BASE wxAny;
+ class WXDLLIMPEXP_BASE wxHandlerInfo;
+ */
+
 class WXDLLIMPEXP_BASE wxObjectWriter;
 class WXDLLIMPEXP_BASE wxObjectReader;
-class WXDLLIMPEXP_BASE wxClassInfo;
-class WXDLLIMPEXP_BASE wxAnyList;
-class WXDLLIMPEXP_BASE wxPropertyInfo;
-class WXDLLIMPEXP_BASE wxAny;
-class WXDLLIMPEXP_BASE wxObjectWriter;
-class WXDLLIMPEXP_BASE wxHandlerInfo;
 
 class WXDLLIMPEXP_BASE wxObjectWriterCallback
 {