diff --git a/wxGTK-2.4.2-aclocal18.patch b/wxGTK-2.4.2-aclocal18.patch
deleted file mode 100644
index 0859167..0000000
--- a/wxGTK-2.4.2-aclocal18.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- wxwin.m4~ 2003-09-21 14:31:27.000000000 +0300
-+++ wxwin.m4 2004-12-06 11:33:44.097041699 +0200
-@@ -33,7 +33,7 @@
- dnl command line options
- dnl ---------------------------------------------------------------------------
-
--AC_DEFUN(AM_OPTIONS_WXCONFIG,
-+AC_DEFUN([AM_OPTIONS_WXCONFIG],
- [
- AC_ARG_WITH(wx-prefix, [ --with-wx-prefix=PREFIX Prefix where wxWindows is installed (optional)],
- wx_config_prefix="$withval", wx_config_prefix="")
-@@ -56,7 +56,7 @@
- dnl
- dnl Get the cflags and libraries from the wx-config script
- dnl
--AC_DEFUN(AM_PATH_WXCONFIG,
-+AC_DEFUN([AM_PATH_WXCONFIG],
- [
- dnl do we have wx-config name: it can be wx-config or wxd-config or ...
- if test x${WX_CONFIG_NAME+set} != xset ; then
diff --git a/wxGTK-2.4.2-gcc4.patch b/wxGTK-2.4.2-gcc4.patch
deleted file mode 100644
index 6c6b530..0000000
--- a/wxGTK-2.4.2-gcc4.patch
+++ /dev/null
@@ -1,235 +0,0 @@
---- 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".
diff --git a/wxGTK-2.4.2-privates.patch b/wxGTK-2.4.2-privates.patch
deleted file mode 100644
index 5be5684..0000000
--- a/wxGTK-2.4.2-privates.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur wxGTK-2.4.2.vanilla/src/gtk/menu.cpp wxGTK-2.4.2/src/gtk/menu.cpp
---- wxGTK-2.4.2.vanilla/src/gtk/menu.cpp 2003-09-21 13:31:57.000000000 +0200
-+++ wxGTK-2.4.2/src/gtk/menu.cpp 2004-05-22 20:57:58.753013328 +0200
-@@ -30,13 +30,13 @@
- #ifdef __WXGTK20__
- #include <glib-object.h>
-
-- #define gtk_accel_group_attach(g, o) _gtk_accel_group_attach((g), (o))
-- #define gtk_accel_group_detach(g, o) _gtk_accel_group_detach((g), (o))
-+ #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
-+ #define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
- #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
-
-- #define ACCEL_OBJECT GObject
-+ #define ACCEL_OBJECT GtkWindow
- #define ACCEL_OBJECTS(a) (a)->acceleratables
-- #define ACCEL_OBJ_CAST(obj) G_OBJECT(obj)
-+ #define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
- #else // GTK+ 1.x
- #define ACCEL_OBJECT GtkObject
- #define ACCEL_OBJECTS(a) (a)->attach_objects
-Endast i wxGTK-2.4.2/src/gtk: menu.cppprivates
-diff -ur wxGTK-2.4.2.vanilla/src/gtk/settings.cpp wxGTK-2.4.2/src/gtk/settings.cpp
---- wxGTK-2.4.2.vanilla/src/gtk/settings.cpp 2003-09-21 13:31:57.000000000 +0200
-+++ wxGTK-2.4.2/src/gtk/settings.cpp 2004-05-22 20:57:15.330585304 +0200
-@@ -340,9 +340,20 @@
- }
- else
- {
-- const gchar *font_name =
-- _gtk_rc_context_get_default_font_name(gtk_settings_get_default());
-- g_systemFont = new wxFont(wxString::FromAscii(font_name));
-+ GtkSettings *settings = gtk_settings_get_default();
-+ gchar *font_name = NULL;
-+ g_object_get ( settings,
-+ "gtk-font-name",
-+ &font_name,
-+ NULL);
-+
-+ if (!font_name)
-+ g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
-+
-+ else
-+ g_systemFont = new wxFont(wxString::FromAscii(font_name));
-+ g_free (font_name);
-+
- }
- gtk_widget_destroy( widget );
- #else
-Endast i wxGTK-2.4.2/src/gtk: settings.cppprivates