diff options
Diffstat (limited to 'x11-libs/wxGTK/files/wxGTK-2.6.0-gcc4.patch')
| -rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.6.0-gcc4.patch | 256 |
1 files changed, 256 insertions, 0 deletions
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); |