?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
* updated ksmtp (21.12.1 -> 21.12.2), untested
[t2-trunk.git] / package / x11 / wxwidgets24 / hotfix-gcc4.0.patch
blob6401733aa5289c85654545fd16109cc92d17a301
1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
3 #
4 # T2 SDE: package/.../wxwidgets24/gcc-4.0.patch
5 # Copyright (C) 2004 - 2005 The T2 SDE Project
6 #
7 # More information can be found in the files COPYING and README.
8 #
9 # This patch file is dual-licensed. It is available under the license the
10 # patched project is licensed under, as long as it is an OpenSource license
11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
12 # of the GNU General Public License as published by the Free Software
13 # Foundation; either version 2 of the License, or (at your option) any later
14 # version.
15 # --- T2-COPYRIGHT-NOTE-END ---
16
17 Taken from Fedora Core to fix compilation with gcc-4.0.
18
19 diff -ur wxPythonSrc-2.4.2.4_orig/contrib/src/stc/scintilla/include/KeyWords.h wxPythonSrc-2.4.2.4/contrib/src/stc/scintilla/include/KeyWords.h
20 --- wxPythonSrc-2.4.2.4_orig/contrib/src/stc/scintilla/include/KeyWords.h 2003-09-18 00:59:53.000000000 +0200
21 +++ wxPythonSrc-2.4.2.4/contrib/src/stc/scintilla/include/KeyWords.h 2005-09-11 02:41:02.000000000 +0200
22 @@ -29,6 +29,7 @@
23 LexerModule(int language_, LexerFunction fnLexer_,
24 const char *languageName_=0, LexerFunction fnFolder_=0,
25 const char * const wordListDescriptions_[] = NULL);
26 + virtual ~LexerModule() {};
27 int GetLanguage() const { return language; }
28
29 // -1 is returned if no WordList information is available
30 diff -ur wxPythonSrc-2.4.2.4_orig/contrib/src/stc/scintilla/src/Document.cxx wxPythonSrc-2.4.2.4/contrib/src/stc/scintilla/src/Document.cxx
31 --- wxPythonSrc-2.4.2.4_orig/contrib/src/stc/scintilla/src/Document.cxx 2003-09-18 01:00:28.000000000 +0200
32 +++ wxPythonSrc-2.4.2.4/contrib/src/stc/scintilla/src/Document.cxx 2005-09-11 02:41:02.000000000 +0200
33 @@ -850,6 +850,7 @@
34 DocumentIndexer(Document *pdoc_, int end_) :
35 pdoc(pdoc_), end(end_) {
36 }
37 + virtual ~DocumentIndexer() {};
38
39 virtual char CharAt(int index) {
40 if (index < 0 || index >= end)
41 diff -ur wxPythonSrc-2.4.2.4_orig/contrib/src/stc/scintilla/src/ExternalLexer.h wxPythonSrc-2.4.2.4/contrib/src/stc/scintilla/src/ExternalLexer.h
42 --- wxPythonSrc-2.4.2.4_orig/contrib/src/stc/scintilla/src/ExternalLexer.h 2003-09-18 01:48:01.000000000 +0200
43 +++ wxPythonSrc-2.4.2.4/contrib/src/stc/scintilla/src/ExternalLexer.h 2005-09-11 02:41:02.000000000 +0200
44 @@ -38,6 +38,7 @@
45 strncpy(name, languageName_, sizeof(name));
46 languageName = name;
47 };
48 + virtual ~ExternalLexerModule() {};
49 virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
50 WordList *keywordlists[], Accessor &styler) const;
51 virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
52 diff -ur wxPythonSrc-2.4.2.4_orig/contrib/src/stc/scintilla/src/RESearch.h wxPythonSrc-2.4.2.4/contrib/src/stc/scintilla/src/RESearch.h
53 --- wxPythonSrc-2.4.2.4_orig/contrib/src/stc/scintilla/src/RESearch.h 2003-09-18 01:00:47.000000000 +0200
54 +++ wxPythonSrc-2.4.2.4/contrib/src/stc/scintilla/src/RESearch.h 2005-09-11 02:41:02.000000000 +0200
55 @@ -20,6 +20,7 @@
56 class CharacterIndexer {
57 public:
58 virtual char CharAt(int index)=0;
59 + virtual ~CharacterIndexer() {};
60 };
61
62 class RESearch {
63 diff -ur wxPythonSrc-2.4.2.4_orig/contrib/src/xrc/expat/xmlparse/xmlparse.c wxPythonSrc-2.4.2.4/contrib/src/xrc/expat/xmlparse/xmlparse.c
64 --- wxPythonSrc-2.4.2.4_orig/contrib/src/xrc/expat/xmlparse/xmlparse.c 2001-06-10 00:43:36.000000000 +0200
65 +++ wxPythonSrc-2.4.2.4/contrib/src/xrc/expat/xmlparse/xmlparse.c 2005-09-11 02:41:02.000000000 +0200
66 @@ -203,8 +203,10 @@
67 static enum XML_Error
68 doProlog(XML_Parser parser, const ENCODING *enc, const char *s,
69 const char *end, int tok, const char *next, const char **nextPtr);
70 +#ifdef XML_DTD
71 static enum XML_Error
72 processInternalParamEntity(XML_Parser parser, ENTITY *entity);
73 +#endif /* XML_DTD */
74 static enum XML_Error
75 doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
76 const char *start, const char *end, const char **endPtr);
77 diff -ur wxPythonSrc-2.4.2.4_orig/contrib/src/xrc/xml.cpp wxPythonSrc-2.4.2.4/contrib/src/xrc/xml.cpp
78 --- wxPythonSrc-2.4.2.4_orig/contrib/src/xrc/xml.cpp 2003-10-01 20:58:04.000000000 +0200
79 +++ wxPythonSrc-2.4.2.4/contrib/src/xrc/xml.cpp 2005-09-11 02:41:02.000000000 +0200
80 @@ -354,8 +354,8 @@
81 #else
82 if ( conv )
83 {
84 - size_t nLen = (len != wxSTRING_MAXLEN) ? len :
85 - nLen = wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);
86 + size_t nLen = ((len != wxSTRING_MAXLEN) ? len :
87 + wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0));
88
89 wchar_t *buf = new wchar_t[nLen+1];
90 wxConvUTF8.MB2WC(buf, s, nLen);
91 diff -ur wxPythonSrc-2.4.2.4_orig/include/wx/caret.h wxPythonSrc-2.4.2.4/include/wx/caret.h
92 --- wxPythonSrc-2.4.2.4_orig/include/wx/caret.h 2002-09-05 07:17:11.000000000 +0200
93 +++ wxPythonSrc-2.4.2.4/include/wx/caret.h 2005-09-11 02:41:02.000000000 +0200
94 @@ -60,6 +60,7 @@
95
96 (void)Create(window, size);
97 }
98 + virtual ~wxCaretBase() {};
99
100 // Create() functions - same as ctor but returns the success code
101 // --------------------------------------------------------------
102 diff -ur wxPythonSrc-2.4.2.4_orig/include/wx/clipbrd.h wxPythonSrc-2.4.2.4/include/wx/clipbrd.h
103 --- wxPythonSrc-2.4.2.4_orig/include/wx/clipbrd.h 2002-09-05 07:17:11.000000000 +0200
104 +++ wxPythonSrc-2.4.2.4/include/wx/clipbrd.h 2005-09-11 02:41:02.000000000 +0200
105 @@ -39,6 +39,7 @@
106 {
107 public:
108 wxClipboardBase();
109 + virtual ~wxClipboardBase() {};
110
111 // open the clipboard before Add/SetData() and GetData()
112 virtual bool Open() = 0;
113 diff -ur wxPythonSrc-2.4.2.4_orig/include/wx/datetime.h wxPythonSrc-2.4.2.4/include/wx/datetime.h
114 --- wxPythonSrc-2.4.2.4_orig/include/wx/datetime.h 2003-06-25 21:12:39.000000000 +0200
115 +++ wxPythonSrc-2.4.2.4/include/wx/datetime.h 2005-09-11 02:41:02.000000000 +0200
116 @@ -1300,6 +1300,7 @@
117 {
118 friend class wxDateTimeHolidaysModule;
119 public:
120 + virtual ~wxDateTimeHolidayAuthority() {};
121 // returns TRUE if the given date is a holiday
122 static bool IsHoliday(const wxDateTime& dt);
123
124 @@ -1340,6 +1341,8 @@
125 // the holidays for this class are all Saturdays and Sundays
126 class WXDLLEXPORT wxDateTimeWorkDays : public wxDateTimeHolidayAuthority
127 {
128 +public:
129 + virtual ~wxDateTimeWorkDays() {};
130 protected:
131 virtual bool DoIsHoliday(const wxDateTime& dt) const;
132 virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,
133 diff -ur wxPythonSrc-2.4.2.4_orig/include/wx/dir.h wxPythonSrc-2.4.2.4/include/wx/dir.h
134 --- wxPythonSrc-2.4.2.4_orig/include/wx/dir.h 2002-09-05 07:17:11.000000000 +0200
135 +++ wxPythonSrc-2.4.2.4/include/wx/dir.h 2005-09-11 02:41:02.000000000 +0200
136 @@ -52,6 +52,7 @@
137 class WXDLLEXPORT wxDirTraverser
138 {
139 public:
140 + virtual ~wxDirTraverser() {};
141 // called for each file found by wxDir::Traverse()
142 //
143 // return wxDIR_STOP or wxDIR_CONTINUE from here
144 diff -ur wxPythonSrc-2.4.2.4_orig/include/wx/event.h wxPythonSrc-2.4.2.4/include/wx/event.h
145 --- wxPythonSrc-2.4.2.4_orig/include/wx/event.h 2003-06-02 22:40:21.000000000 +0200
146 +++ wxPythonSrc-2.4.2.4/include/wx/event.h 2005-09-11 02:41:02.000000000 +0200
147 @@ -1952,6 +1952,7 @@
148 : wxEventTableEntryBase(id, idLast, fn, data),
149 m_eventType(evType)
150 { }
151 + virtual ~wxEventTableEntry() {};
152
153 // the reference to event type: this allows us to not care about the
154 // (undefined) order in which the event table entries and the event types
155 diff -ur wxPythonSrc-2.4.2.4_orig/include/wx/geometry.h wxPythonSrc-2.4.2.4/include/wx/geometry.h
156 --- wxPythonSrc-2.4.2.4_orig/include/wx/geometry.h 2003-04-17 19:37:38.000000000 +0200
157 +++ wxPythonSrc-2.4.2.4/include/wx/geometry.h 2005-09-11 02:41:02.000000000 +0200
158 @@ -785,6 +785,7 @@
159 class wxTransform2D
160 {
161 public :
162 + virtual ~wxTransform2D() {};
163 virtual void Transform( wxPoint2DInt* pt )const = 0;
164 virtual void Transform( wxRect2DInt* r ) const;
165 virtual wxPoint2DInt Transform( const wxPoint2DInt &pt ) const;
166 diff -ur wxPythonSrc-2.4.2.4_orig/include/wx/list.h wxPythonSrc-2.4.2.4/include/wx/list.h
167 --- wxPythonSrc-2.4.2.4_orig/include/wx/list.h 2002-10-18 20:32:52.000000000 +0200
168 +++ wxPythonSrc-2.4.2.4/include/wx/list.h 2005-09-11 02:41:02.000000000 +0200
169 @@ -384,6 +384,7 @@
170 T *data = (T *)NULL, \
171 const wxListKey& key = wxDefaultListKey) \
172 : wxNodeBase(list, previous, next, data, key) { } \
173 + virtual ~nodetype() {}; \
174 \
175 nodetype *GetNext() const \
176 { return (nodetype *)wxNodeBase::GetNext(); } \
177 @@ -410,6 +411,7 @@
178 \
179 name& operator=(const name& list) \
180 { (void) wxListBase::operator=(list); return *this; } \
181 + virtual ~name() {}; \
182 \
183 nodetype *GetFirst() const \
184 { return (nodetype *)wxListBase::GetFirst(); } \
185 diff -ur wxPythonSrc-2.4.2.4_orig/include/wx/notebook.h wxPythonSrc-2.4.2.4/include/wx/notebook.h
186 --- wxPythonSrc-2.4.2.4_orig/include/wx/notebook.h 2003-06-03 23:11:56.000000000 +0200
187 +++ wxPythonSrc-2.4.2.4/include/wx/notebook.h 2005-09-11 02:41:02.000000000 +0200
188 @@ -193,6 +193,7 @@
189 m_nSel = nSel;
190 m_nOldSel = nOldSel;
191 }
192 + virtual ~wxNotebookEvent() {};
193
194 // accessors
195 // the currently selected page (-1 if none)
196 diff -ur wxPythonSrc-2.4.2.4_orig/include/wx/radiobox.h wxPythonSrc-2.4.2.4/include/wx/radiobox.h
197 --- wxPythonSrc-2.4.2.4_orig/include/wx/radiobox.h 2003-06-02 22:40:21.000000000 +0200
198 +++ wxPythonSrc-2.4.2.4/include/wx/radiobox.h 2005-09-11 02:41:02.000000000 +0200
199 @@ -35,6 +35,7 @@
200 class WXDLLEXPORT wxRadioBoxBase
201 {
202 public:
203 + virtual ~wxRadioBoxBase() {};
204 // selection
205 virtual void SetSelection(int n) = 0;
206 virtual int GetSelection() const = 0;
207 diff -ur wxPythonSrc-2.4.2.4_orig/include/wx/statline.h wxPythonSrc-2.4.2.4/include/wx/statline.h
208 --- wxPythonSrc-2.4.2.4_orig/include/wx/statline.h 2001-06-26 22:59:07.000000000 +0200
209 +++ wxPythonSrc-2.4.2.4/include/wx/statline.h 2005-09-11 02:41:02.000000000 +0200
210 @@ -39,6 +39,7 @@
211 public:
212 // constructor
213 wxStaticLineBase() { }
214 + virtual ~wxStaticLineBase() {};
215
216 // is the line vertical?
217 bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }
218 diff -ur wxPythonSrc-2.4.2.4_orig/src/common/dircmn.cpp wxPythonSrc-2.4.2.4/src/common/dircmn.cpp
219 --- wxPythonSrc-2.4.2.4_orig/src/common/dircmn.cpp 2002-07-27 21:39:04.000000000 +0200
220 +++ wxPythonSrc-2.4.2.4/src/common/dircmn.cpp 2005-09-11 02:41:02.000000000 +0200
221 @@ -147,6 +147,7 @@
222 {
223 public:
224 wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
225 + virtual ~wxDirTraverserSimple() {};
226
227 virtual wxDirTraverseResult OnFile(const wxString& filename)
228 {
229 diff -ur wxPythonSrc-2.4.2.4_orig/src/common/sckfile.cpp wxPythonSrc-2.4.2.4/src/common/sckfile.cpp
230 --- wxPythonSrc-2.4.2.4_orig/src/common/sckfile.cpp 2002-01-05 23:11:03.000000000 +0100
231 +++ wxPythonSrc-2.4.2.4/src/common/sckfile.cpp 2005-09-11 02:41:08.000000000 +0200
232 @@ -9,7 +9,7 @@
233 // Licence: wxWindows license
234 /////////////////////////////////////////////////////////////////////////////
235 #ifdef __GNUG__
236 -#pragma implementation "sckfile.h"
237 +#pragma implementation "file.h"
238 #endif
239
240 // For compilers that support precompilation, includes "wx.h".
241 diff -ur wxPythonSrc-2.4.2.4_orig/src/common/xpmdecod.cpp wxPythonSrc-2.4.2.4/src/common/xpmdecod.cpp
242 --- wxPythonSrc-2.4.2.4_orig/src/common/xpmdecod.cpp 2003-03-29 20:10:43.000000000 +0100
243 +++ wxPythonSrc-2.4.2.4/src/common/xpmdecod.cpp 2005-09-11 02:41:02.000000000 +0200
244 @@ -669,7 +669,7 @@
245 wxChar key[64];
246 const char *clr_def;
247 bool hasMask;
248 - wxXPMColourMapData clr_data;
249 + wxXPMColourMapData clr_data = {0, 0, 0};
250 wxXPMColourMap clr_tbl;
251
252 /*
253 @@ -712,7 +712,7 @@
254 }
255 else
256 {
257 - bool isNone;
258 + bool isNone = false;
259 if ( !GetRGBFromName(clr_def, &isNone,
260 &clr_data.R, &clr_data.G, &clr_data.B) )
261 {
262 diff -ur wxPythonSrc-2.4.2.4_orig/src/unix/mimetype.cpp wxPythonSrc-2.4.2.4/src/unix/mimetype.cpp
263 --- wxPythonSrc-2.4.2.4_orig/src/unix/mimetype.cpp 2003-04-08 23:58:38.000000000 +0200
264 +++ wxPythonSrc-2.4.2.4/src/unix/mimetype.cpp 2005-09-11 02:41:02.000000000 +0200
265 @@ -1580,7 +1580,7 @@
266 {
267 // now got a file we can write to ....
268 wxMimeTypeCommands * entries = m_aEntries[index];
269 - size_t iOpen;
270 + size_t iOpen = 0;
271 wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);
272 wxString sTmp;
273
t2sde - trunk