Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gcc 4.3 issues warning if type attributes are given again - even if they are identical - therefore comment them out

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-01-19 09:00:29 +00:00
parent 6b882f87aa
commit 9ae4b67f28
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/xti.h
View File

@@ -96,7 +96,7 @@ typedef bool (*wxObjectStreamingCallback) ( const wxObject *, wxObjectWriter *,
class WXDLLIMPEXP_BASE wxClassInfo class WXDLLIMPEXP_BASE wxClassInfo
{ {
friend class WXDLLIMPEXP_BASE wxPropertyInfo; friend class WXDLLIMPEXP_BASE wxPropertyInfo;
friend class WXDLLIMPEXP_BASE wxHandlerInfo; friend class /* WXDLLIMPEXP_BASE */ wxHandlerInfo;
friend wxObject *wxCreateDynamicObject(const wxString& name); friend wxObject *wxCreateDynamicObject(const wxString& name);
public: public:
@@ -333,7 +333,6 @@ private:
wxPropertyInfoFn m_firstPropertyFn; wxPropertyInfoFn m_firstPropertyFn;
wxHandlerInfoFn m_firstHandlerFn; wxHandlerInfoFn m_firstHandlerFn;
mutable bool m_firstInited;
protected: protected:
void EnsureInfosInited() const void EnsureInfosInited() const
@@ -351,6 +350,8 @@ protected:
mutable wxHandlerInfo* m_firstHandler; mutable wxHandlerInfo* m_firstHandler;
private: private:
mutable bool m_firstInited;
const wxClassInfo** m_parents; const wxClassInfo** m_parents;
const wxChar* m_unitName; const wxChar* m_unitName;

4
include/wx/xtiprop.h
View File

@@ -20,9 +20,11 @@
#include "wx/xti.h" #include "wx/xti.h"
#include "wx/any.h" #include "wx/any.h"
/*
class WXDLLIMPEXP_BASE wxObject; class WXDLLIMPEXP_BASE wxObject;
class WXDLLIMPEXP_BASE wxClassInfo; class WXDLLIMPEXP_BASE wxClassInfo;
class WXDLLIMPEXP_BASE wxDynamicClassInfo; class WXDLLIMPEXP_BASE wxDynamicClassInfo;
*/
class WXDLLIMPEXP_BASE wxHashTable; class WXDLLIMPEXP_BASE wxHashTable;
class WXDLLIMPEXP_BASE wxHashTable_Node; class WXDLLIMPEXP_BASE wxHashTable_Node;
class WXDLLIMPEXP_BASE wxEvent; class WXDLLIMPEXP_BASE wxEvent;
@@ -302,7 +304,7 @@ enum
class WXDLLIMPEXP_BASE wxPropertyInfo class WXDLLIMPEXP_BASE wxPropertyInfo
{ {
friend class WXDLLIMPEXP_BASE wxDynamicClassInfo; friend class /* WXDLLIMPEXP_BASE */ wxDynamicClassInfo;
public: public:
wxPropertyInfo(wxPropertyInfo* &iter, wxPropertyInfo(wxPropertyInfo* &iter,

14
include/wx/xtistrm.h
View File

@@ -38,14 +38,16 @@ const int wxNullObjectID = -3;
// or modify the value before it is streamed-out. // 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 wxObjectWriter;
class WXDLLIMPEXP_BASE wxObjectReader; 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 class WXDLLIMPEXP_BASE wxObjectWriterCallback
{ {