Version bump. gcc4 fix bug# 89937. Changed evil no_wxgtk1 USE flag to wxgtk1

(Portage version: 2.0.51.20-r5)

5 files changed, 507 insertions, 0 deletions

diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r4 b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r4
new file mode 100644
index 000000000000..81bb0e836695
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r4
@@ -0,0 +1 @@
+MD5 cdadfe82fc93f8a65a2ae18a95b0b0e3 wxGTK-2.4.2.tar.bz2 5381935
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.5.3 b/x11-libs/wxGTK/files/digest-wxGTK-2.5.3
new file mode 100644
index 000000000000..c3befefec80c
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.5.3
@@ -0,0 +1 @@
+MD5 eccd8fee99f7031b380b7ce026ea78be wxGTK-2.5.3.tar.bz2 6783651
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.0 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.0
new file mode 100644
index 000000000000..dfba0bbdf465
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.6.0
@@ -0,0 +1,2 @@
+MD5 93359c101085770ff6c8aae42d25adcf wxWidgets-2.6.0.tar.bz2 13036418
+MD5 3e137bdfa2406e6c8687d0b650e8b47a wxWidgets-2.6.0-HTML.tar.gz 1429436
diff --git a/x11-libs/wxGTK/files/wxGTK-2.4.2-gcc4.patch b/x11-libs/wxGTK/files/wxGTK-2.4.2-gcc4.patch
new file mode 100644
index 000000000000..810902be838b
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.4.2-gcc4.patch
@@ -0,0 +1,247 @@
+--- wxGTK-2.4.2/contrib/src/xrc/xml.cpp.gcc4	2003-09-21 07:32:56.000000000 -0400
++++ wxGTK-2.4.2/contrib/src/xrc/xml.cpp	2005-04-15 06:59:47.000000000 -0400
+@@ -354,8 +354,8 @@
+ #else
+     if ( conv )
+     {
+-        size_t nLen = (len != wxSTRING_MAXLEN) ? len :
+-                          nLen = wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);
++        size_t nLen = ((len != wxSTRING_MAXLEN) ? len :
++                          wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0));
+ 
+         wchar_t *buf = new wchar_t[nLen+1];
+         wxConvUTF8.MB2WC(buf, s, nLen);
+--- wxGTK-2.4.2/contrib/src/xrc/expat/xmlparse/xmlparse.c.gcc4	2003-09-21 07:32:54.000000000 -0400
++++ wxGTK-2.4.2/contrib/src/xrc/expat/xmlparse/xmlparse.c	2005-04-15 06:59:47.000000000 -0400
+@@ -203,8 +203,10 @@
+ static enum XML_Error
+ doProlog(XML_Parser parser, const ENCODING *enc, const char *s,
+ 	 const char *end, int tok, const char *next, const char **nextPtr);
++#ifdef XML_DTD
+ static enum XML_Error
+ processInternalParamEntity(XML_Parser parser, ENTITY *entity);
++#endif /* XML_DTD */
+ static enum XML_Error
+ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
+ 	  const char *start, const char *end, const char **endPtr);
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/Document.cxx.gcc4	2003-09-21 07:32:47.000000000 -0400
++++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/Document.cxx	2005-04-15 06:59:47.000000000 -0400
+@@ -850,6 +850,7 @@
+ 	DocumentIndexer(Document *pdoc_, int end_) :
+ 		pdoc(pdoc_), end(end_) {
+ 	}
++	virtual ~DocumentIndexer() {};
+ 
+ 	virtual char CharAt(int index) {
+ 		if (index < 0 || index >= end)
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/ExternalLexer.h.gcc4	2003-09-21 07:32:50.000000000 -0400
++++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/ExternalLexer.h	2005-04-15 06:59:47.000000000 -0400
+@@ -38,6 +38,7 @@
+ 		strncpy(name, languageName_, sizeof(name));
+ 		languageName = name;
+ 	};
++	virtual ~ExternalLexerModule() {};
+ 	virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
+ 					WordList *keywordlists[], Accessor &styler) const;
+ 	virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/RESearch.h.gcc4	2003-09-21 07:32:50.000000000 -0400
++++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/RESearch.h	2005-04-15 06:59:47.000000000 -0400
+@@ -20,6 +20,7 @@
+ class CharacterIndexer {
+ public: 
+ 	virtual char CharAt(int index)=0;
++	virtual ~CharacterIndexer() {};
+ };
+ 
+ class RESearch {
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/include/KeyWords.h.gcc4	2003-09-21 07:32:47.000000000 -0400
++++ wxGTK-2.4.2/contrib/src/stc/scintilla/include/KeyWords.h	2005-04-15 06:59:47.000000000 -0400
+@@ -29,6 +29,7 @@
+ 	LexerModule(int language_, LexerFunction fnLexer_, 
+ 		const char *languageName_=0, LexerFunction fnFolder_=0,
+ 		const char * const wordListDescriptions_[] = NULL);
++	virtual ~LexerModule() {};
+ 	int GetLanguage() const { return language; }
+ 
+ 	// -1 is returned if no WordList information is available
+--- wxGTK-2.4.2/src/common/dircmn.cpp.gcc4	2003-09-21 07:31:39.000000000 -0400
++++ wxGTK-2.4.2/src/common/dircmn.cpp	2005-04-15 06:59:47.000000000 -0400
+@@ -147,6 +147,7 @@
+ {
+ public:
+     wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
++    virtual ~wxDirTraverserSimple() {};
+ 
+     virtual wxDirTraverseResult OnFile(const wxString& filename)
+     {
+--- wxGTK-2.4.2/src/common/xpmdecod.cpp.gcc4	2003-09-21 07:31:39.000000000 -0400
++++ wxGTK-2.4.2/src/common/xpmdecod.cpp	2005-04-15 14:06:53.000000000 -0400
+@@ -669,7 +669,7 @@
+     wxChar key[64];
+     const char *clr_def;
+     bool hasMask;
+-    wxXPMColourMapData clr_data;
++    wxXPMColourMapData clr_data = {0, 0, 0};
+     wxXPMColourMap clr_tbl;
+ 
+     /*
+@@ -712,7 +712,7 @@
+         }
+         else
+         {
+-            bool isNone;
++            bool isNone = false;
+             if ( !GetRGBFromName(clr_def, &isNone,
+                                  &clr_data.R, &clr_data.G, &clr_data.B) )
+             {
+--- wxGTK-2.4.2/src/unix/mimetype.cpp.gcc4	2003-09-21 07:31:40.000000000 -0400
++++ wxGTK-2.4.2/src/unix/mimetype.cpp	2005-04-15 06:59:47.000000000 -0400
+@@ -1580,7 +1580,7 @@
+     {
+         // now got a file we can write to ....
+         wxMimeTypeCommands * entries = m_aEntries[index];
+-        size_t iOpen;
++        size_t iOpen = 0;
+         wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);
+         wxString sTmp;
+ 
+--- wxGTK-2.4.2/include/wx/statline.h.gcc4	2003-09-21 07:31:35.000000000 -0400
++++ wxGTK-2.4.2/include/wx/statline.h	2005-04-15 06:59:47.000000000 -0400
+@@ -39,6 +39,7 @@
+ public:
+     // constructor
+     wxStaticLineBase() { }
++    virtual ~wxStaticLineBase() {};
+ 
+     // is the line vertical?
+     bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }
+--- wxGTK-2.4.2/include/wx/datetime.h.gcc4	2003-09-21 07:31:30.000000000 -0400
++++ wxGTK-2.4.2/include/wx/datetime.h	2005-04-15 06:59:47.000000000 -0400
+@@ -1300,6 +1300,7 @@
+ {
+ friend class wxDateTimeHolidaysModule;
+ public:
++    virtual ~wxDateTimeHolidayAuthority() {};
+     // returns TRUE if the given date is a holiday
+     static bool IsHoliday(const wxDateTime& dt);
+ 
+@@ -1340,6 +1341,8 @@
+ // the holidays for this class are all Saturdays and Sundays
+ class WXDLLEXPORT wxDateTimeWorkDays : public wxDateTimeHolidayAuthority
+ {
++public:
++    virtual ~wxDateTimeWorkDays() {};
+ protected:
+     virtual bool DoIsHoliday(const wxDateTime& dt) const;
+     virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,
+--- wxGTK-2.4.2/include/wx/notebook.h.gcc4	2003-09-21 07:31:34.000000000 -0400
++++ wxGTK-2.4.2/include/wx/notebook.h	2005-04-15 06:59:47.000000000 -0400
+@@ -193,6 +193,7 @@
+             m_nSel = nSel;
+             m_nOldSel = nOldSel;
+         }
++    virtual ~wxNotebookEvent() {};
+ 
+     // accessors
+         // the currently selected page (-1 if none)
+--- wxGTK-2.4.2/include/wx/event.h.gcc4	2003-09-21 07:31:33.000000000 -0400
++++ wxGTK-2.4.2/include/wx/event.h	2005-04-15 06:59:47.000000000 -0400
+@@ -1952,6 +1952,7 @@
+         : wxEventTableEntryBase(id, idLast, fn, data),
+         m_eventType(evType)
+     { }
++    virtual ~wxEventTableEntry() {};
+ 
+     // the reference to event type: this allows us to not care about the
+     // (undefined) order in which the event table entries and the event types
+--- wxGTK-2.4.2/include/wx/geometry.h.gcc4	2003-09-21 07:31:34.000000000 -0400
++++ wxGTK-2.4.2/include/wx/geometry.h	2005-04-15 06:59:47.000000000 -0400
+@@ -785,6 +785,7 @@
+ class wxTransform2D
+ {
+ public :
++    virtual ~wxTransform2D() {};
+     virtual void                    Transform( wxPoint2DInt* pt )const  = 0;
+     virtual void                    Transform( wxRect2DInt* r ) const;
+     virtual wxPoint2DInt    Transform( const wxPoint2DInt &pt ) const;
+--- wxGTK-2.4.2/include/wx/list.h.gcc4	2003-09-21 07:31:34.000000000 -0400
++++ wxGTK-2.4.2/include/wx/list.h	2005-04-15 14:05:22.000000000 -0400
+@@ -384,6 +384,7 @@
+                  T *data = (T *)NULL,                                       \
+                  const wxListKey& key = wxDefaultListKey)                   \
+             : wxNodeBase(list, previous, next, data, key) { }               \
++        virtual ~nodetype() {};                                             \
+                                                                             \
+         nodetype *GetNext() const                                           \
+             { return (nodetype *)wxNodeBase::GetNext(); }                   \
+@@ -410,6 +411,7 @@
+                                                                             \
+         name& operator=(const name& list)                                   \
+             { (void) wxListBase::operator=(list); return *this; }           \
++        virtual ~name() {};                                                 \
+                                                                             \
+         nodetype *GetFirst() const                                          \
+             { return (nodetype *)wxListBase::GetFirst(); }                  \
+--- wxGTK-2.4.2/include/wx/radiobox.h.gcc4	2003-09-21 07:31:35.000000000 -0400
++++ wxGTK-2.4.2/include/wx/radiobox.h	2005-04-15 06:59:47.000000000 -0400
+@@ -35,6 +35,7 @@
+ class WXDLLEXPORT wxRadioBoxBase
+ {
+ public:
++    virtual ~wxRadioBoxBase() {};
+     // selection
+     virtual void SetSelection(int n) = 0;
+     virtual int GetSelection() const = 0;
+--- wxGTK-2.4.2/include/wx/caret.h.gcc4	2003-09-21 07:31:30.000000000 -0400
++++ wxGTK-2.4.2/include/wx/caret.h	2005-04-15 06:59:47.000000000 -0400
+@@ -60,6 +60,7 @@
+ 
+         (void)Create(window, size);
+     }
++    virtual ~wxCaretBase() {};
+ 
+     // Create() functions - same as ctor but returns the success code
+     // --------------------------------------------------------------
+--- wxGTK-2.4.2/include/wx/dir.h.gcc4	2003-09-21 07:31:32.000000000 -0400
++++ wxGTK-2.4.2/include/wx/dir.h	2005-04-15 06:59:47.000000000 -0400
+@@ -52,6 +52,7 @@
+ class WXDLLEXPORT wxDirTraverser
+ {
+ public:
++    virtual ~wxDirTraverser() {};
+     // called for each file found by wxDir::Traverse()
+     //
+     // return wxDIR_STOP or wxDIR_CONTINUE from here
+--- wxGTK-2.4.2/include/wx/clipbrd.h.gcc4	2003-09-21 07:31:30.000000000 -0400
++++ wxGTK-2.4.2/include/wx/clipbrd.h	2005-04-15 06:59:47.000000000 -0400
+@@ -39,6 +39,7 @@
+ {
+ public:
+     wxClipboardBase();
++    virtual ~wxClipboardBase() {};
+ 
+     // open the clipboard before Add/SetData() and GetData()
+     virtual bool Open() = 0;
+--- wxGTK-2.4.2/src/common/sckfile.cpp.orig	2005-04-16 16:50:11.000000000 -0700
++++ wxGTK-2.4.2/src/common/sckfile.cpp	2005-04-16 16:50:14.000000000 -0700
+@@ -9,7 +9,7 @@
+ // Licence:     wxWindows license
+ /////////////////////////////////////////////////////////////////////////////
+ #ifdef __GNUG__
+-#pragma implementation "sckfile.h"
++#pragma implementation "file.h"
+ #endif
+ 
+ // For compilers that support precompilation, includes "wx.h".
+--- wxGTK-2.4.2/include/wx/protocol/file.h  2003-09-21 05:31:38.000000000 -0600
++++ wxGTK-2.4.2/include/wx/protocol/file.h     2005-02-15 23:36:57.000000000 -0700
+@@ -13,7 +13,7 @@
+ #define __WX_PROTO_FILE_H__
+
+ #if defined(__GNUG__) && !defined(__APPLE__)
+-#pragma interface "sckfile.h"
++#pragma interface
+ #endif
+
+ #include "wx/defs.h"
+
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.0-gcc4.patch b/x11-libs/wxGTK/files/wxGTK-2.6.0-gcc4.patch
new file mode 100644
index 000000000000..81a966f9b77f
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.6.0-gcc4.patch
@@ -0,0 +1,256 @@
+diff -ru wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/include/KeyWords.h wxWidgets-2.6.0/contrib/src/stc/scintilla/include/KeyWords.h
+--- wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/include/KeyWords.h	2003-09-18 10:28:17.000000000 -0600
++++ wxWidgets-2.6.0/contrib/src/stc/scintilla/include/KeyWords.h	2005-04-29 13:34:00.000000000 -0600
+@@ -29,6 +29,7 @@
+ 	LexerModule(int language_, LexerFunction fnLexer_, 
+ 		const char *languageName_=0, LexerFunction fnFolder_=0,
+ 		const char * const wordListDescriptions_[] = NULL);
++	virtual ~LexerModule() {};
+ 	int GetLanguage() const { return language; }
+ 
+ 	// -1 is returned if no WordList information is available
+diff -ru wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/src/Document.cxx wxWidgets-2.6.0/contrib/src/stc/scintilla/src/Document.cxx
+--- wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/src/Document.cxx	2005-03-21 05:17:52.000000000 -0600
++++ wxWidgets-2.6.0/contrib/src/stc/scintilla/src/Document.cxx	2005-04-29 13:29:52.000000000 -0600
+@@ -925,7 +925,8 @@
+ 	DocumentIndexer(Document *pdoc_, int end_) :
+ 		pdoc(pdoc_), end(end_) {
+ 	}
+-
++	virtual ~DocumentIndexer () {};
++	
+ 	virtual char CharAt(int index) {
+ 		if (index < 0 || index >= end)
+ 			return 0;
+diff -ru wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/src/ExternalLexer.h wxWidgets-2.6.0/contrib/src/stc/scintilla/src/ExternalLexer.h
+--- wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/src/ExternalLexer.h	2003-09-18 10:28:17.000000000 -0600
++++ wxWidgets-2.6.0/contrib/src/stc/scintilla/src/ExternalLexer.h	2005-04-29 13:31:37.000000000 -0600
+@@ -38,6 +38,7 @@
+ 		strncpy(name, languageName_, sizeof(name));
+ 		languageName = name;
+ 	};
++	virtual ~ExternalLexerModule() {};
+ 	virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
+ 					WordList *keywordlists[], Accessor &styler) const;
+ 	virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
+diff -ru wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/src/RESearch.h wxWidgets-2.6.0/contrib/src/stc/scintilla/src/RESearch.h
+--- wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/src/RESearch.h	2003-09-18 10:28:18.000000000 -0600
++++ wxWidgets-2.6.0/contrib/src/stc/scintilla/src/RESearch.h	2005-04-29 13:32:46.000000000 -0600
+@@ -20,6 +20,7 @@
+ class CharacterIndexer {
+ public: 
+ 	virtual char CharAt(int index)=0;
++	virtual ~CharacterIndexer() {};
+ };
+ 
+ class RESearch {
+diff -ru wxWidgets-2.6.0-orig/include/wx/caret.h wxWidgets-2.6.0/include/wx/caret.h
+--- wxWidgets-2.6.0-orig/include/wx/caret.h	2005-03-21 05:18:14.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/caret.h	2005-04-29 14:22:27.000000000 -0600
+@@ -62,7 +62,7 @@
+     }
+ 
+     // a virtual dtor has been provided since this class has virtual members
+-    virtual ~wxCaretBase() { }
++    virtual ~wxCaretBase() { };
+ 
+     // Create() functions - same as ctor but returns the success code
+     // --------------------------------------------------------------
+diff -ru wxWidgets-2.6.0-orig/include/wx/clipbrd.h wxWidgets-2.6.0/include/wx/clipbrd.h
+--- wxWidgets-2.6.0-orig/include/wx/clipbrd.h	2004-09-19 09:04:46.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/clipbrd.h	2005-04-29 14:24:27.000000000 -0600
+@@ -39,7 +39,8 @@
+ class WXDLLEXPORT wxClipboardBase : public wxObject
+ {
+ public:
+-    wxClipboardBase() {}
++    wxClipboardBase() {};
++	virtual ~wxClipboardBase() {};
+ 
+     // open the clipboard before Add/SetData() and GetData()
+     virtual bool Open() = 0;
+diff -ru wxWidgets-2.6.0-orig/include/wx/datetime.h wxWidgets-2.6.0/include/wx/datetime.h
+--- wxWidgets-2.6.0-orig/include/wx/datetime.h	2005-02-07 14:56:48.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/datetime.h	2005-04-29 14:43:16.000000000 -0600
+@@ -1447,7 +1447,7 @@
+ {
+ friend class wxDateTimeHolidaysModule;
+ public:
+-    // returns true if the given date is a holiday
++	// returns true if the given date is a holiday
+     static bool IsHoliday(const wxDateTime& dt);
+ 
+     // fills the provided array with all holidays in the given range, returns
+@@ -1490,6 +1490,8 @@
+ // the holidays for this class are all Saturdays and Sundays
+ class WXDLLIMPEXP_BASE wxDateTimeWorkDays : public wxDateTimeHolidayAuthority
+ {
++public:
++	virtual ~wxDateTimeWorkDays() {};
+ protected:
+     virtual bool DoIsHoliday(const wxDateTime& dt) const;
+     virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,
+diff -ru wxWidgets-2.6.0-orig/include/wx/dir.h wxWidgets-2.6.0/include/wx/dir.h
+--- wxWidgets-2.6.0-orig/include/wx/dir.h	2005-03-21 05:18:15.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/dir.h	2005-04-29 14:23:17.000000000 -0600
+@@ -55,7 +55,7 @@
+ {
+ public:
+     /// a virtual dtor has been provided since this class has virtual members
+-    virtual ~wxDirTraverser() { }
++    virtual ~wxDirTraverser() { };
+     // called for each file found by wxDir::Traverse()
+     //
+     // return wxDIR_STOP or wxDIR_CONTINUE from here (wxDIR_IGNORE doesn't
+diff -ru wxWidgets-2.6.0-orig/include/wx/event.h wxWidgets-2.6.0/include/wx/event.h
+--- wxWidgets-2.6.0-orig/include/wx/event.h	2005-03-21 05:18:15.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/event.h	2005-04-29 14:06:38.000000000 -0600
+@@ -2174,6 +2174,7 @@
+         : wxEventTableEntryBase(winid, idLast, fn, data),
+         m_eventType(evType)
+     { }
++	virtual ~wxEventTableEntry() {};
+ 
+     // the reference to event type: this allows us to not care about the
+     // (undefined) order in which the event table entries and the event types
+diff -ru wxWidgets-2.6.0-orig/include/wx/geometry.h wxWidgets-2.6.0/include/wx/geometry.h
+--- wxWidgets-2.6.0-orig/include/wx/geometry.h	2005-03-21 05:18:16.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/geometry.h	2005-04-29 14:08:19.000000000 -0600
+@@ -785,7 +785,7 @@
+ class wxTransform2D
+ {
+ public :
+-    virtual ~wxTransform2D() { }
++    virtual ~wxTransform2D() { };
+     virtual void                    Transform( wxPoint2DInt* pt )const  = 0;
+     virtual void                    Transform( wxRect2DInt* r ) const;
+     virtual wxPoint2DInt    Transform( const wxPoint2DInt &pt ) const;
+diff -ru wxWidgets-2.6.0-orig/include/wx/list.h wxWidgets-2.6.0/include/wx/list.h
+--- wxWidgets-2.6.0-orig/include/wx/list.h	2005-04-11 14:18:26.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/list.h	2005-04-29 14:14:57.000000000 -0600
+@@ -662,6 +662,7 @@
+                  T *data = (T *)NULL,                                       \
+                  const wxListKey& key = wxDefaultListKey)                   \
+             : wxNodeBase(list, previous, next, data, key) { }               \
++        virtual ~nodetype() {};                                             \
+                                                                             \
+         nodetype *GetNext() const                                           \
+             { return (nodetype *)wxNodeBase::GetNext(); }                   \
+@@ -694,6 +695,7 @@
+                                                                             \
+         name& operator=(const name& list)                                   \
+             { Assign(list); return *this; }                                 \
++        virtual ~name() {};                                                 \
+                                                                             \
+         nodetype *GetFirst() const                                          \
+             { return (nodetype *)wxListBase::GetFirst(); }                  \
+diff -ru wxWidgets-2.6.0-orig/include/wx/notebook.h wxWidgets-2.6.0/include/wx/notebook.h
+--- wxWidgets-2.6.0-orig/include/wx/notebook.h	2005-04-17 00:56:07.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/notebook.h	2005-04-29 14:04:38.000000000 -0600
+@@ -118,7 +118,8 @@
+         : wxBookCtrlBaseEvent(commandType, winid, nSel, nOldSel)
+     {
+     }
+-
++	virtual ~wxNotebookEvent() {};
++	
+ private:
+     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNotebookEvent)
+ };
+diff -ru wxWidgets-2.6.0-orig/include/wx/protocol/file.h wxWidgets-2.6.0/include/wx/protocol/file.h
+--- wxWidgets-2.6.0-orig/include/wx/protocol/file.h	2004-05-25 01:45:34.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/protocol/file.h	2005-04-29 14:28:36.000000000 -0600
+@@ -13,7 +13,7 @@
+ #define __WX_PROTO_FILE_H__
+ 
+ #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+-#pragma interface "sckfile.h"
++#pragma interface
+ #endif
+ 
+ #include "wx/defs.h"
+diff -ru wxWidgets-2.6.0-orig/include/wx/radiobox.h wxWidgets-2.6.0/include/wx/radiobox.h
+--- wxWidgets-2.6.0-orig/include/wx/radiobox.h	2005-03-21 05:18:17.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/radiobox.h	2005-04-29 14:19:54.000000000 -0600
+@@ -31,6 +31,7 @@
+ class WXDLLEXPORT wxRadioBoxBase : public wxItemContainerImmutable
+ {
+ public:
++	virtual ~wxRadioBoxBase() {};
+     // change the individual radio button state
+     virtual bool Enable(int n, bool enable = true) = 0;
+     virtual bool Show(int n, bool show = true) = 0;
+diff -ru wxWidgets-2.6.0-orig/include/wx/statline.h wxWidgets-2.6.0/include/wx/statline.h
+--- wxWidgets-2.6.0-orig/include/wx/statline.h	2005-04-11 14:18:27.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/statline.h	2005-04-29 13:46:31.000000000 -0600
+@@ -39,6 +39,7 @@
+ public:
+     // constructor
+     wxStaticLineBase() { }
++	virtual ~wxStaticLineBase() {};
+ 
+     // is the line vertical?
+     bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }
+diff -ru wxWidgets-2.6.0-orig/src/common/dircmn.cpp wxWidgets-2.6.0/src/common/dircmn.cpp
+--- wxWidgets-2.6.0-orig/src/common/dircmn.cpp	2005-02-07 14:58:18.000000000 -0600
++++ wxWidgets-2.6.0/src/common/dircmn.cpp	2005-04-29 13:36:28.000000000 -0600
+@@ -204,6 +204,7 @@
+ {
+ public:
+     wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
++	virtual ~wxDirTraverserSimple() {};
+ 
+     virtual wxDirTraverseResult OnFile(const wxString& filename)
+     {
+diff -ru wxWidgets-2.6.0-orig/src/common/sckfile.cpp wxWidgets-2.6.0/src/common/sckfile.cpp
+--- wxWidgets-2.6.0-orig/src/common/sckfile.cpp	2004-11-01 10:05:25.000000000 -0600
++++ wxWidgets-2.6.0/src/common/sckfile.cpp	2005-04-29 14:24:59.000000000 -0600
+@@ -9,7 +9,7 @@
+ // Licence:     wxWindows licence
+ /////////////////////////////////////////////////////////////////////////////
+ #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+-#pragma implementation "sckfile.h"
++#pragma implementation "file.h"
+ #endif
+ 
+ // For compilers that support precompilation, includes "wx.h".
+diff -ru wxWidgets-2.6.0-orig/src/expat/lib/xmlparse.c wxWidgets-2.6.0/src/expat/lib/xmlparse.c
+--- wxWidgets-2.6.0-orig/src/expat/lib/xmlparse.c	2004-10-06 14:24:04.000000000 -0600
++++ wxWidgets-2.6.0/src/expat/lib/xmlparse.c	2005-04-29 13:27:23.000000000 -0600
+@@ -299,8 +299,10 @@
+ static enum XML_Error
+ doProlog(XML_Parser parser, const ENCODING *enc, const char *s,
+          const char *end, int tok, const char *next, const char **nextPtr);
++#ifdef XML_DTD
+ static enum XML_Error
+ processInternalParamEntity(XML_Parser parser, ENTITY *entity);
++#endif /* XML_DTD */
+ static enum XML_Error
+ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
+           const char *start, const char *end, const char **endPtr);
+diff -ru wxWidgets-2.6.0-orig/src/unix/mimetype.cpp wxWidgets-2.6.0/src/unix/mimetype.cpp
+--- wxWidgets-2.6.0-orig/src/unix/mimetype.cpp	2004-05-25 01:47:07.000000000 -0600
++++ wxWidgets-2.6.0/src/unix/mimetype.cpp	2005-04-29 13:45:18.000000000 -0600
+@@ -1749,7 +1749,7 @@
+     {
+         // now got a file we can write to ....
+         wxMimeTypeCommands * entries = m_aEntries[index];
+-        size_t iOpen;
++        size_t iOpen = 0;
+         wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);
+         wxString sTmp;
+ 
+diff -ru wxWidgets-2.6.0-orig/src/xml/xml.cpp wxWidgets-2.6.0/src/xml/xml.cpp
+--- wxWidgets-2.6.0-orig/src/xml/xml.cpp	2005-03-29 13:12:15.000000000 -0600
++++ wxWidgets-2.6.0/src/xml/xml.cpp	2005-04-29 13:22:45.000000000 -0600
+@@ -360,8 +360,8 @@
+ #else
+     if ( conv )
+     {
+-        size_t nLen = (len != wxSTRING_MAXLEN) ? len :
+-                          wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);
++        size_t nLen = ((len != wxSTRING_MAXLEN) ? len :
++                          wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0));
+ 
+         wchar_t *buf = new wchar_t[nLen+1];
+         wxConvUTF8.MB2WC(buf, s, nLen);