Attachment #75930 for bug #117357

Lines 354-361 Link Here

(-)wxGTK-2.4.2/contrib/src/xrc/xml.cpp.orig (-2 / +2 lines)
354	#else	354	#else
355	if ( conv )	355	if ( conv )
356	{	356	{
357	size_t nLen = (len != wxSTRING_MAXLEN) ? len :	357	size_t nLen = ((len != wxSTRING_MAXLEN) ? len :
358	nLen = wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);	358	wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0));
359		359
360	wchar_t *buf = new wchar_t[nLen+1];	360	wchar_t *buf = new wchar_t[nLen+1];
361	wxConvUTF8.MB2WC(buf, s, nLen);	361	wxConvUTF8.MB2WC(buf, s, nLen);

Lines 203-210 Link Here

(-)wxGTK-2.4.2/contrib/src/xrc/expat/xmlparse/xmlparse.c.orig (+2 lines)
203	static enum XML_Error	203	static enum XML_Error
204	doProlog(XML_Parser parser, const ENCODING enc, const char s,	204	doProlog(XML_Parser parser, const ENCODING enc, const char s,
205	const char end, int tok, const char next, const char **nextPtr);	205	const char end, int tok, const char next, const char **nextPtr);
		206	#ifdef XML_DTD
206	static enum XML_Error	207	static enum XML_Error
207	processInternalParamEntity(XML_Parser parser, ENTITY *entity);	208	processInternalParamEntity(XML_Parser parser, ENTITY *entity);
		209	#endif /* XML_DTD */
208	static enum XML_Error	210	static enum XML_Error
209	doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,	211	doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
210	const char start, const char end, const char **endPtr);	212	const char start, const char end, const char **endPtr);

Lines 850-855 Link Here

(-)wxGTK-2.4.2/contrib/src/stc/scintilla/src/Document.cxx.orig (+2 lines)
850	DocumentIndexer(Document *pdoc_, int end_) :	850	DocumentIndexer(Document *pdoc_, int end_) :
851	pdoc(pdoc_), end(end_) {	851	pdoc(pdoc_), end(end_) {
852	}	852	}
		853
		854	virtual ~DocumentIndexer() {};
853		855
854	virtual char CharAt(int index) {	856	virtual char CharAt(int index) {
855	if (index < 0 \|\| index >= end)	857	if (index < 0 \|\| index >= end)

Lines 9-15 Link Here

(-)wxGTK-2.4.2/src/common/sckfile.cpp.orig (-1 / +1 lines)
9	// Licence: wxWindows license	9	// Licence: wxWindows license
10	/////////////////////////////////////////////////////////////////////////////	10	/////////////////////////////////////////////////////////////////////////////
11	#ifdef __GNUG__	11	#ifdef __GNUG__
12	#pragma implementation "sckfile.h"	12	#pragma implementation "file.h"
13	#endif	13	#endif
14		14
15	// For compilers that support precompilation, includes "wx.h".	15	// For compilers that support precompilation, includes "wx.h".

Lines 52-57 Link Here

(-)wxGTK-2.4.2/include/wx/dir.h.orig (+1 lines)
52	class WXDLLEXPORT wxDirTraverser	52	class WXDLLEXPORT wxDirTraverser
53	{	53	{
54	public:	54	public:
		55	virtual ~wxDirTraverser() {};
55	// called for each file found by wxDir::Traverse()	56	// called for each file found by wxDir::Traverse()
56	//	57	//
57	// return wxDIR_STOP or wxDIR_CONTINUE from here	58	// return wxDIR_STOP or wxDIR_CONTINUE from here

Lines 38-43 Link Here

(-)wxGTK-2.4.2/contrib/src/stc/scintilla/src/ExternalLexer.h.orig (+1 lines)
38	strncpy(name, languageName_, sizeof(name));	38	strncpy(name, languageName_, sizeof(name));
39	languageName = name;	39	languageName = name;
40	};	40	};
		41	virtual ~ExternalLexerModule() {};
41	virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,	42	virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
42	WordList *keywordlists[], Accessor &styler) const;	43	WordList *keywordlists[], Accessor &styler) const;
43	virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,	44	virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,

Lines 29-34 Link Here

(-)wxGTK-2.4.2/contrib/src/stc/scintilla/include/KeyWords.h.orig (+1 lines)
29	LexerModule(int language_, LexerFunction fnLexer_,	29	LexerModule(int language_, LexerFunction fnLexer_,
30	const char *languageName_=0, LexerFunction fnFolder_=0,	30	const char *languageName_=0, LexerFunction fnFolder_=0,
31	const char * const wordListDescriptions_[] = NULL);	31	const char * const wordListDescriptions_[] = NULL);
		32	virtual ~LexerModule() {};
32	int GetLanguage() const { return language; }	33	int GetLanguage() const { return language; }
33		34
34	// -1 is returned if no WordList information is available	35	// -1 is returned if no WordList information is available

Lines 147-152 Link Here

(-)wxGTK-2.4.2/src/common/dircmn.cpp.orig (+1 lines)
147	{	147	{
148	public:	148	public:
149	wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }	149	wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
		150	virtual ~wxDirTraverserSimple() {};
150		151
151	virtual wxDirTraverseResult OnFile(const wxString& filename)	152	virtual wxDirTraverseResult OnFile(const wxString& filename)
152	{	153	{

Lines 669-675 Link Here

(-)wxGTK-2.4.2/src/common/xpmdecod.cpp.orig (-2 / +2 lines)
669	wxChar key[64];	669	wxChar key[64];
670	const char *clr_def;	670	const char *clr_def;
671	bool hasMask;	671	bool hasMask;
672	wxXPMColourMapData clr_data;	672	wxXPMColourMapData clr_data = {0, 0, 0};
673	wxXPMColourMap clr_tbl;	673	wxXPMColourMap clr_tbl;
674		674
675	/*	675	/*
Lines 712-718 Link Here
712	}	712	}
713	else	713	else
714	{	714	{
715	bool isNone;	715	bool isNone = false;
716	if ( !GetRGBFromName(clr_def, &isNone,	716	if ( !GetRGBFromName(clr_def, &isNone,
717	&clr_data.R, &clr_data.G, &clr_data.B) )	717	&clr_data.R, &clr_data.G, &clr_data.B) )
718	{	718	{

Lines 1580-1586 Link Here

(-)wxGTK-2.4.2/src/unix/mimetype.cpp.orig (-1 / +1 lines)
1580	{	1580	{
1581	// now got a file we can write to ....	1581	// now got a file we can write to ....
1582	wxMimeTypeCommands * entries = m_aEntries[index];	1582	wxMimeTypeCommands * entries = m_aEntries[index];
1583	size_t iOpen;	1583	size_t iOpen = 0;
1584	wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);	1584	wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);
1585	wxString sTmp;	1585	wxString sTmp;
1586		1586

Lines 39-44 Link Here

(-)wxGTK-2.4.2/include/wx/statline.h.orig (+1 lines)
39	public:	39	public:
40	// constructor	40	// constructor
41	wxStaticLineBase() { }	41	wxStaticLineBase() { }
		42	virtual ~wxStaticLineBase() {};
42		43
43	// is the line vertical?	44	// is the line vertical?
44	bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }	45	bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }

Lines 1300-1305 Link Here

(-)wxGTK-2.4.2/include/wx/datetime.h.orig (+3 lines)
1300	{	1300	{
1301	friend class wxDateTimeHolidaysModule;	1301	friend class wxDateTimeHolidaysModule;
1302	public:	1302	public:
		1303	virtual ~wxDateTimeHolidayAuthority() {};
1303	// returns TRUE if the given date is a holiday	1304	// returns TRUE if the given date is a holiday
1304	static bool IsHoliday(const wxDateTime& dt);	1305	static bool IsHoliday(const wxDateTime& dt);
1305		1306
Lines 1340-1345 Link Here
1340	// the holidays for this class are all Saturdays and Sundays	1341	// the holidays for this class are all Saturdays and Sundays
1341	class WXDLLEXPORT wxDateTimeWorkDays : public wxDateTimeHolidayAuthority	1342	class WXDLLEXPORT wxDateTimeWorkDays : public wxDateTimeHolidayAuthority
1342	{	1343	{
		1344	public:
		1345	virtual ~wxDateTimeWorkDays() {};
1343	protected:	1346	protected:
1344	virtual bool DoIsHoliday(const wxDateTime& dt) const;	1347	virtual bool DoIsHoliday(const wxDateTime& dt) const;
1345	virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,	1348	virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,

Lines 193-198 Link Here

(-)wxGTK-2.4.2/include/wx/notebook.h.orig (+1 lines)
193	m_nSel = nSel;	193	m_nSel = nSel;
194	m_nOldSel = nOldSel;	194	m_nOldSel = nOldSel;
195	}	195	}
		196	virtual ~wxNotebookEvent() {};
196		197
197	// accessors	198	// accessors
198	// the currently selected page (-1 if none)	199	// the currently selected page (-1 if none)

Lines 1952-1957 Link Here

(-)wxGTK-2.4.2/include/wx/event.h.orig (+1 lines)
1952	: wxEventTableEntryBase(id, idLast, fn, data),	1952	: wxEventTableEntryBase(id, idLast, fn, data),
1953	m_eventType(evType)	1953	m_eventType(evType)
1954	{ }	1954	{ }
		1955	virtual ~wxEventTableEntry() {};
1955		1956
1956	// the reference to event type: this allows us to not care about the	1957	// the reference to event type: this allows us to not care about the
1957	// (undefined) order in which the event table entries and the event types	1958	// (undefined) order in which the event table entries and the event types

Lines 785-790 Link Here

(-)wxGTK-2.4.2/include/wx/geometry.h.orig (+1 lines)
785	class wxTransform2D	785	class wxTransform2D
786	{	786	{
787	public :	787	public :
		788	virtual ~wxTransform2D() {};
788	virtual void Transform( wxPoint2DInt* pt )const = 0;	789	virtual void Transform( wxPoint2DInt* pt )const = 0;
789	virtual void Transform( wxRect2DInt* r ) const;	790	virtual void Transform( wxRect2DInt* r ) const;
790	virtual wxPoint2DInt Transform( const wxPoint2DInt &pt ) const;	791	virtual wxPoint2DInt Transform( const wxPoint2DInt &pt ) const;

Lines 385-390 Link Here

(-)wxGTK-2.4.2/include/wx/list.h.orig (+4 lines)
385	const wxListKey& key = wxDefaultListKey) \	385	const wxListKey& key = wxDefaultListKey) \
386	: wxNodeBase(list, previous, next, data, key) { } \	386	: wxNodeBase(list, previous, next, data, key) { } \
387	\	387	\
		388	virtual ~nodetype() {}; \
		389	\
388	nodetype *GetNext() const \	390	nodetype *GetNext() const \
389	{ return (nodetype *)wxNodeBase::GetNext(); } \	391	{ return (nodetype *)wxNodeBase::GetNext(); } \
390	nodetype *GetPrevious() const \	392	nodetype *GetPrevious() const \
Lines 411-416 Link Here
411	name& operator=(const name& list) \	413	name& operator=(const name& list) \
412	{ (void) wxListBase::operator=(list); return *this; } \	414	{ (void) wxListBase::operator=(list); return *this; } \
413	\	415	\
		416	virtual ~name() {}; \
		417	\
414	nodetype *GetFirst() const \	418	nodetype *GetFirst() const \
415	{ return (nodetype *)wxListBase::GetFirst(); } \	419	{ return (nodetype *)wxListBase::GetFirst(); } \
416	nodetype *GetLast() const \	420	nodetype *GetLast() const \

Lines 35-40 Link Here

(-)wxGTK-2.4.2/include/wx/radiobox.h.orig (+1 lines)
35	class WXDLLEXPORT wxRadioBoxBase	35	class WXDLLEXPORT wxRadioBoxBase
36	{	36	{
37	public:	37	public:
		38	virtual ~wxRadioBoxBase() {};
38	// selection	39	// selection
39	virtual void SetSelection(int n) = 0;	40	virtual void SetSelection(int n) = 0;
40	virtual int GetSelection() const = 0;	41	virtual int GetSelection() const = 0;

Lines 61-66 Link Here

(-)wxGTK-2.4.2/include/wx/caret.h.orig (+1 lines)
61	(void)Create(window, size);	61	(void)Create(window, size);
62	}	62	}
63		63
		64	virtual ~wxCaretBase() {};
64	// Create() functions - same as ctor but returns the success code	65	// Create() functions - same as ctor but returns the success code
65	// --------------------------------------------------------------	66	// --------------------------------------------------------------
66		67

Lines 39-44 Link Here

(-)wxGTK-2.4.2/include/wx/clipbrd.h.orig (+1 lines)
39	{	39	{
40	public:	40	public:
41	wxClipboardBase();	41	wxClipboardBase();
		42	virtual ~wxClipboardBase() {};
42		43
43	// open the clipboard before Add/SetData() and GetData()	44	// open the clipboard before Add/SetData() and GetData()
44	virtual bool Open() = 0;	45	virtual bool Open() = 0;

Return to bug 117357