diff --git a/contrib/utils/convertrc/Makefile.in b/contrib/utils/convertrc/Makefile.in
deleted file mode 100644
index a1fdd6172a..0000000000
--- a/contrib/utils/convertrc/Makefile.in
+++ /dev/null
@@ -1,190 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-STRIP = @STRIP@
-NM = @NM@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DIR = @INSTALL_DIR@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-bindir = @bindir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_XML = @EXTRALIBS_XML@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR = 
-WX_RELEASE = 2.9
-LIBDIRNAME = $(wx_top_builddir)/lib
-CONVERTRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
-	-I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-CONVERTRC_OBJECTS =  \
-	$(__convertrc_os2_lib_res) \
-	convertrc_convert.o \
-	convertrc_rc2wxr.o \
-	convertrc_rc2xml.o \
-	convertrc_wxr2xml.o \
-	$(__convertrc___win32rc)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
-@COND_PLATFORM_MAC_1@__convertrc___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C convertrc$(EXEEXT)
-@COND_PLATFORM_MAC_1@__convertrc___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___convertrc___os2_emxbindcmd = $(NM) convertrc$(EXEEXT) | \
-	if grep -q pmwin.763 ; then emxbind -ep convertrc$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__convertrc___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___convertrc___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_OS2_1@__convertrc_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_XML_p = \
-	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
-	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__convertrc___win32rc = convertrc_wxconvert_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
-	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
-	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
-	$(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
-	$(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
-	$(srcdir)/../../include -o convertrc$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: convertrc$(EXEEXT)
-
-install: all install_convertrc
-
-uninstall: uninstall_convertrc
-
-install-strip: install
-	$(STRIP) $(DESTDIR)$(bindir)/convertrc$(EXEEXT)
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f convertrc$(EXEEXT)
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-convertrc$(EXEEXT): $(CONVERTRC_OBJECTS) $(__convertrc___win32rc)
-	$(CXX) -o $@ $(CONVERTRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(EXTRALIBS_XML) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
-	$(__convertrc___mac_rezcmd)
-	$(__convertrc___mac_setfilecmd)
-	$(__convertrc___os2_emxbindcmd)
-
-install_convertrc: 
-	$(INSTALL_DIR) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) convertrc$(EXEEXT) $(DESTDIR)$(bindir)
-
-uninstall_convertrc: 
-	rm -f $(DESTDIR)$(bindir)/convertrc$(EXEEXT)
-
-convertrc_convert.o: $(srcdir)/convert.cpp
-	$(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $(srcdir)/convert.cpp
-
-convertrc_rc2wxr.o: $(srcdir)/rc2wxr.cpp
-	$(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $(srcdir)/rc2wxr.cpp
-
-convertrc_rc2xml.o: $(srcdir)/rc2xml.cpp
-	$(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $(srcdir)/rc2xml.cpp
-
-convertrc_wxr2xml.o: $(srcdir)/wxr2xml.cpp
-	$(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $(srcdir)/wxr2xml.cpp
-
-convertrc_wxconvert_rc.o: $(srcdir)/wxconvert.rc
-	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_convertrc uninstall_convertrc
diff --git a/contrib/utils/convertrc/convert.cpp b/contrib/utils/convertrc/convert.cpp
deleted file mode 100644
index 078c29d5e5..0000000000
--- a/contrib/utils/convertrc/convert.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-//wxConvertApp Programming Utility
-/*This program currently offers 3 useful conversions
-1.  Converts most of an .RC file into a wxXml file
-2.  Converts most of an .wxr file into a wxXml file
-3.  Converts portions of an .RC file into a wxr file
-*/
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWidgets headers
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/image.h"
-
-#include "wx/deprecated/setup.h"
-#include "wx/deprecated/resource.h"
-
-#include "convert.h"
-#include "rc2wxr.h"
-#include "wxr2xml.h"
-#include "rc2xml.h"
-
-IMPLEMENT_APP(wxConvertApp)
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-wxConvertApp::wxConvertApp()
-{
-    m_pFrame=NULL;
-    m_pMenuBar=NULL;
-
-}
-
-wxConvertApp::~wxConvertApp()
-{
-
-}
-
-
-bool wxConvertApp::OnInit()
-{
-//Initialize all image loaders(JPEG,BMP,PNG,and etc)
-    wxInitAllImageHandlers();
-    SetAppName(_T("wxConvertApp"));
-
-    if (HandleCommandLine())
-        return true;
-
-
-// Create the main frame window
-    m_pFrame = new wxMainFrame(NULL, wxID_ANY, _T("wxConvertApp"), wxPoint(0, 0), wxSize(500, 400),
-        wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
-
-    InitMenu();
-    m_pFrame->Show(true);
-    SetTopWindow(m_pFrame);
-    return true;
-}
-
-void wxConvertApp::InitMenu()
-{
-    m_pMenuBar=new wxMenuBar;
-    wxASSERT(m_pMenuBar);
-
-    wxMenu *filemenu=new wxMenu;
-    filemenu->Append(ID_RC2WXR,_T("Convert RC file to WXR file"));
-    filemenu->Append(ID_WXR2XML,_T("Convert WXR file to XML file"));
-    filemenu->Append(ID_RC2XML,_T("Convert RC file to XML file"));
-
-    filemenu->Append(ID_QUIT, _T("E&xit"));
-    m_pMenuBar->Append(filemenu,_T("&File"));
-
-    m_pFrame->SetMenuBar(m_pMenuBar);
-}
-
-
-
-// MainFrame.cpp: implementation of the wxMainFrame class.
-//
-//////////////////////////////////////////////////////////////////////
-
-BEGIN_EVENT_TABLE(wxMainFrame, wxFrame)
-    EVT_MENU(ID_QUIT,wxMainFrame::OnQuit)
-    EVT_MENU(ID_RC2WXR,wxMainFrame::OnRc2Wxr)
-    EVT_MENU(ID_WXR2XML,wxMainFrame::OnWXR2XML)
-    EVT_MENU(ID_RC2XML,wxMainFrame::OnRC2XML)
-END_EVENT_TABLE()
-
-
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-wxMainFrame::wxMainFrame(wxWindow* parent,wxWindowID id,
-const wxString& title, const wxPoint& pos, const wxSize& size,
-long style, const wxString& name)
-:wxFrame(parent,id,title,pos,size,style,name)
-{
-
-}
-
-wxMainFrame::~wxMainFrame()
-{
-}
-
-
-
-void wxMainFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    Close(true);
-}
-
-
-void wxMainFrame::OnRc2Wxr(wxCommandEvent& WXUNUSED(event))
-{
-#if wxUSE_FILEDLG
-    wxFileDialog filed(this, wxEmptyString,
-                       wxEmptyString, wxEmptyString,
-                       _T("*.rc"), wxFD_OPEN);
-
-    if (filed.ShowModal()!=wxID_OK)
-        return;
-
-    wxFileDialog wxrfile(this, _T("Enter Desired WXR file name"),
-                         wxEmptyString, _T("resource.wxr"),
-                         _T("*.wxr"), wxFD_OPEN);
-
-    if (wxrfile.ShowModal()!=wxID_OK)
-        return;
-
-    rc2wxr convert;
-    convert.Convert(wxrfile.GetPath(),filed.GetPath());
-#endif // wxUSE_FILEDLG
-}
-
-void wxMainFrame::OnWXR2XML(wxCommandEvent& WXUNUSED(event))
-{
-#if wxUSE_FILEDLG
-    wxFileDialog f(this);
-    f.SetWildcard(_T("*.wxr"));
-    if (f.ShowModal()!=wxID_OK)
-        return;
-
-
-    wxFileDialog xmlfile(this,_T("Enter Desired XML file name"),
-                         wxEmptyString, _T("resource.xml"),
-                         _T("*.xml"), wxFD_OPEN);
-
-    if (xmlfile.ShowModal()!=wxID_OK)
-        return;
-
-    wxr2xml XMLCon;
-    XMLCon.Convert(f.GetPath(),xmlfile.GetPath());
-#endif // wxUSE_FILEDLG
-}
-
-void wxMainFrame::OnRC2XML(wxCommandEvent& WXUNUSED(event))
-{
-#if wxUSE_FILEDLG
-    wxFileDialog f(this);
-    f.SetWildcard(_T("*.rc"));
-    if (f.ShowModal()!=wxID_OK)
-        return;
-
-    wxFileDialog xmlfile(this,_T("Enter Desired XML file name"),
-                         wxEmptyString, _T("resource.xml"),
-                         _T("*.xml"), wxFD_OPEN);
-
-    if (xmlfile.ShowModal()!=wxID_OK)
-        return;
-
-    rc2xml XMLCon;
-    XMLCon.Convert(f.GetPath(),xmlfile.GetPath());
-#endif // wxUSE_FILEDLG
-}
-
-bool wxConvertApp::HandleCommandLine()
-{
-
-   if (argc != 2)
-       return false;
-
-//Figure out kind of conversion
-    wxString source,target;
-
-    wxr2xml trans_wxr2xml;
-    rc2xml trans_rc2xml;
-    rc2wxr trans_rc2wxr;
-
-    source=argv[1];
-    target=argv[2];
-
-
-    if ((source.Find(_T(".wxr"))>0)&&(target.Find(_T(".xml"))>0))
-        {
-        trans_wxr2xml.Convert(source,target);
-        return true;
-        }
-    else if ((source.Find(_T(".rc"))!=wxNOT_FOUND)&(target.Find(_T(".wxr"))!=wxNOT_FOUND))
-        {
-        trans_rc2wxr.Convert(source,target);
-        return true;
-        }
-    else if ((source.Find(_T(".rc"))!=wxNOT_FOUND)&(target.Find(_T(".xml"))!=wxNOT_FOUND))
-        {
-        trans_rc2xml.Convert(source,target);
-        return true;
-        }
-
-    return false;
-}
diff --git a/contrib/utils/convertrc/convert.h b/contrib/utils/convertrc/convert.h
deleted file mode 100644
index b7ae887ec3..0000000000
--- a/contrib/utils/convertrc/convert.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// MainFrame.h: interface for the wxMainFrame class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(MAINFRAME_H)
-#define MAINFRAME_H
-
-#include "wx/wxprec.h"
-
-
-#define ID_QUIT 1002
-#define ID_ABOUT 1003
-#define ID_RC2WXR 1005
-#define ID_WXR2XML 1006
-#define ID_RC2XML 1007
-
-class wxMainFrame:public wxFrame
-{
-public:
-    void OnRC2XML(wxCommandEvent& event);
-    void OnWXR2XML(wxCommandEvent& event);
-    void OnRc2Wxr(wxCommandEvent& event);
-    void OnQuit(wxCommandEvent& event);
-    wxMainFrame(wxWindow* parent, wxWindowID id,
-        const wxString& title, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE,
-        const wxString& name = _T("frame"));
-    virtual ~wxMainFrame();
-
-protected:
-    DECLARE_EVENT_TABLE()
-};
-
-class wxConvertApp : public wxApp
-{
-public:
-    bool HandleCommandLine();
-    void InitMenu();
-    bool OnInit(void);
-    wxConvertApp();
-    virtual ~wxConvertApp();
-
-protected:
-    wxMenuBar * m_pMenuBar;
-    wxMainFrame *m_pFrame;
-};
-
-
-
-#endif // !defined(MAINFRAME_H)
diff --git a/contrib/utils/convertrc/convertrc.bkl b/contrib/utils/convertrc/convertrc.bkl
deleted file mode 100644
index 4b1b40fad6..0000000000
--- a/contrib/utils/convertrc/convertrc.bkl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <include file="../../../build/bakefiles/common_samples.bkl"/>
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="convertrc" template="wx_contrib_util" template_append="wx_append">
-        <sources>
-            convert.cpp
-            rc2wxr.cpp
-            rc2xml.cpp
-            wxr2xml.cpp
-        </sources>
-        <wx-lib>deprecated</wx-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>xml</wx-lib>
-        <wx-lib>base</wx-lib>
-        <win32-res>wxconvert.rc</win32-res>
-        <ldlibs>$(EXTRALIBS_XML)</ldlibs>
-        <install-to>$(BINDIR)</install-to>
-    </exe>
-
-</makefile>
diff --git a/contrib/utils/convertrc/convertrc.dsp b/contrib/utils/convertrc/convertrc.dsp
deleted file mode 100644
index 3f43474982..0000000000
--- a/contrib/utils/convertrc/convertrc.dsp
+++ /dev/null
@@ -1,492 +0,0 @@
-# Microsoft Developer Studio Project File - Name="convertrc" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=convertrc - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "convertrc.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "convertrc.mak" CFG="convertrc - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "convertrc - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "convertrc - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "convertrc - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\convertrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\convertrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29_xml.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\convertrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29_xml.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\convertrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d_xml.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d_xml.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\convertrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\convertrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29_xml.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\convertrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29_xml.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\convertrc.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d_xml.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d_xml.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\convertrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29u_deprecated.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\convertrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29ud_deprecated.lib wxmswuniv29ud_core.lib wxbase29ud_xml.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29_xml.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\convertrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29_deprecated.lib wxmswuniv29_core.lib wxbase29_xml.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\convertrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d_xml.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv29d_deprecated.lib wxmswuniv29d_core.lib wxbase29d_xml.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\convertrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29u_deprecated.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\convertrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29ud_deprecated.lib wxmsw29ud_core.lib wxbase29ud_xml.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\convertrc.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29_xml.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\convertrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29_deprecated.lib wxmsw29_core.lib wxbase29_xml.lib wxbase29.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\convertrc.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "convertrc - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\convertrc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\convertrc"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\convertrc.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d_xml.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw29d_deprecated.lib wxmsw29d_core.lib wxbase29d_xml.lib wxbase29d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\convertrc.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "convertrc - Win32 DLL Universal Unicode Release"
-# Name "convertrc - Win32 DLL Universal Unicode Debug"
-# Name "convertrc - Win32 DLL Universal Release"
-# Name "convertrc - Win32 DLL Universal Debug"
-# Name "convertrc - Win32 DLL Unicode Release"
-# Name "convertrc - Win32 DLL Unicode Debug"
-# Name "convertrc - Win32 DLL Release"
-# Name "convertrc - Win32 DLL Debug"
-# Name "convertrc - Win32 Universal Unicode Release"
-# Name "convertrc - Win32 Universal Unicode Debug"
-# Name "convertrc - Win32 Universal Release"
-# Name "convertrc - Win32 Universal Debug"
-# Name "convertrc - Win32 Unicode Release"
-# Name "convertrc - Win32 Unicode Debug"
-# Name "convertrc - Win32 Release"
-# Name "convertrc - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\convert.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rc2wxr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\rc2xml.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\wxconvert.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\wxr2xml.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/utils/convertrc/makefile.bcc b/contrib/utils/convertrc/makefile.bcc
deleted file mode 100644
index 9c57474b52..0000000000
--- a/contrib/utils/convertrc/makefile.bcc
+++ /dev/null
@@ -1,250 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-CONVERTRC_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
-	-I.\..\..\..\samples -DNOPCH -I.\..\..\include $(CPPFLAGS) $(CXXFLAGS)
-CONVERTRC_OBJECTS =  \
-	$(OBJS)\convertrc_convert.obj \
-	$(OBJS)\convertrc_rc2wxr.obj \
-	$(OBJS)\convertrc_rc2xml.obj \
-	$(OBJS)\convertrc_wxr2xml.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE = 
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =  
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = 
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\convertrc.exe
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
-	-if exist $(OBJS)\convertrc.exe del $(OBJS)\convertrc.exe
-	-if exist $(OBJS)\convertrc.tds del $(OBJS)\convertrc.tds
-	-if exist $(OBJS)\convertrc.ilc del $(OBJS)\convertrc.ilc
-	-if exist $(OBJS)\convertrc.ild del $(OBJS)\convertrc.ild
-	-if exist $(OBJS)\convertrc.ilf del $(OBJS)\convertrc.ilf
-	-if exist $(OBJS)\convertrc.ils del $(OBJS)\convertrc.ils
-
-$(OBJS)\convertrc.exe: $(CONVERTRC_OBJECTS)  $(OBJS)\convertrc_wxconvert.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(CONVERTRC_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)   $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\convertrc_wxconvert.res
-|
-
-$(OBJS)\convertrc_convert.obj: .\convert.cpp
-	$(CXX) -q -c -P -o$@ $(CONVERTRC_CXXFLAGS) $**
-
-$(OBJS)\convertrc_rc2wxr.obj: .\rc2wxr.cpp
-	$(CXX) -q -c -P -o$@ $(CONVERTRC_CXXFLAGS) $**
-
-$(OBJS)\convertrc_rc2xml.obj: .\rc2xml.cpp
-	$(CXX) -q -c -P -o$@ $(CONVERTRC_CXXFLAGS) $**
-
-$(OBJS)\convertrc_wxr2xml.obj: .\wxr2xml.cpp
-	$(CXX) -q -c -P -o$@ $(CONVERTRC_CXXFLAGS) $**
-
-$(OBJS)\convertrc_wxconvert.res: .\wxconvert.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH -i.\..\..\include $**
-
diff --git a/contrib/utils/convertrc/makefile.gcc b/contrib/utils/convertrc/makefile.gcc
deleted file mode 100644
index d358bc6543..0000000000
--- a/contrib/utils/convertrc/makefile.gcc
+++ /dev/null
@@ -1,249 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 29
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-CONVERTRC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-	$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
-	$(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH -I.\..\..\include \
-	$(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
-	$(CXXFLAGS)
-CONVERTRC_OBJECTS =  \
-	$(OBJS)\convertrc_convert.o \
-	$(OBJS)\convertrc_rc2wxr.o \
-	$(OBJS)\convertrc_rc2xml.o \
-	$(OBJS)\convertrc_wxr2xml.o \
-	$(OBJS)\convertrc_wxconvert_rc.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE = 
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =  
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 = 
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 = 
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XML_p = \
-	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
-	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = 
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO = 
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG = 
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\convertrc.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\convertrc.exe del $(OBJS)\convertrc.exe
-
-$(OBJS)\convertrc.exe: $(CONVERTRC_OBJECTS) $(OBJS)\convertrc_wxconvert_rc.o
-	$(CXX) -o $@ $(CONVERTRC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)   $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\convertrc_convert.o: ./convert.cpp
-	$(CXX) -c -o $@ $(CONVERTRC_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\convertrc_rc2wxr.o: ./rc2wxr.cpp
-	$(CXX) -c -o $@ $(CONVERTRC_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\convertrc_rc2xml.o: ./rc2xml.cpp
-	$(CXX) -c -o $@ $(CONVERTRC_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\convertrc_wxr2xml.o: ./wxr2xml.cpp
-	$(CXX) -c -o $@ $(CONVERTRC_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\convertrc_wxconvert_rc.o: ./wxconvert.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/contrib/utils/convertrc/makefile.vc b/contrib/utils/convertrc/makefile.vc
deleted file mode 100644
index 28fd9a9833..0000000000
--- a/contrib/utils/convertrc/makefile.vc
+++ /dev/null
@@ -1,325 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-CONVERTRC_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\convertrc.pdb $(____DEBUGRUNTIME_2_p) \
-	$(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-	$(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \
-	$(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH /I.\..\..\include \
-	$(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)
-CONVERTRC_OBJECTS =  \
-	$(OBJS)\convertrc_convert.obj \
-	$(OBJS)\convertrc_rc2wxr.obj \
-	$(OBJS)\convertrc_rc2xml.obj \
-	$(OBJS)\convertrc_wxr2xml.obj \
-	$(OBJS)\convertrc_wxconvert.res
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE = 
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =  
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 = 
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\convertrc.exe
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(OBJS)\convertrc.exe del $(OBJS)\convertrc.exe
-	-if exist $(OBJS)\convertrc.ilk del $(OBJS)\convertrc.ilk
-	-if exist $(OBJS)\convertrc.pdb del $(OBJS)\convertrc.pdb
-
-$(OBJS)\convertrc.exe: $(CONVERTRC_OBJECTS) $(OBJS)\convertrc_wxconvert.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(CONVERTRC_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)   $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\convertrc_convert.obj: .\convert.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CONVERTRC_CXXFLAGS) $**
-
-$(OBJS)\convertrc_rc2wxr.obj: .\rc2wxr.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CONVERTRC_CXXFLAGS) $**
-
-$(OBJS)\convertrc_rc2xml.obj: .\rc2xml.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CONVERTRC_CXXFLAGS) $**
-
-$(OBJS)\convertrc_wxr2xml.obj: .\wxr2xml.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CONVERTRC_CXXFLAGS) $**
-
-$(OBJS)\convertrc_wxconvert.res: .\wxconvert.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH /i .\..\..\include $**
-
diff --git a/contrib/utils/convertrc/makefile.wat b/contrib/utils/convertrc/makefile.wat
deleted file mode 100644
index 8488f50c3c..0000000000
--- a/contrib/utils/convertrc/makefile.wat
+++ /dev/null
@@ -1,279 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-!  loaddll wcc      wccd
-!  loaddll wccaxp   wccdaxp
-!  loaddll wcc386   wccd386
-!  loaddll wpp      wppdi86
-!  loaddll wppaxp   wppdaxp
-!  loaddll wpp386   wppd386
-!  loaddll wlink    wlink
-!  loaddll wlib     wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE = 
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =  
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 = 
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 = 
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 = 
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_XML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_XML_p = &
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-CONVERTRC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
-	$(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-	$(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
-	-i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
-	$(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include &
-	$(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-CONVERTRC_OBJECTS =  &
-	$(OBJS)\convertrc_convert.obj &
-	$(OBJS)\convertrc_rc2wxr.obj &
-	$(OBJS)\convertrc_rc2xml.obj &
-	$(OBJS)\convertrc_wxr2xml.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\convertrc.exe
-
-clean : .SYMBOLIC 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(OBJS)\convertrc.exe del $(OBJS)\convertrc.exe
-
-$(OBJS)\convertrc.exe :  $(CONVERTRC_OBJECTS) $(OBJS)\convertrc_wxconvert.res
-	@%create $(OBJS)\convertrc.lbc
-	@%append $(OBJS)\convertrc.lbc option quiet
-	@%append $(OBJS)\convertrc.lbc name $^@
-	@%append $(OBJS)\convertrc.lbc option caseexact
-	@%append $(OBJS)\convertrc.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(CONVERTRC_OBJECTS)) do @%append $(OBJS)\convertrc.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)   $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\convertrc.lbc library %i
-	@%append $(OBJS)\convertrc.lbc option resource=$(OBJS)\convertrc_wxconvert.res
-	@for %i in () do @%append $(OBJS)\convertrc.lbc option stack=%i
-	wlink @$(OBJS)\convertrc.lbc
-
-$(OBJS)\convertrc_convert.obj :  .AUTODEPEND .\convert.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $<
-
-$(OBJS)\convertrc_rc2wxr.obj :  .AUTODEPEND .\rc2wxr.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $<
-
-$(OBJS)\convertrc_rc2xml.obj :  .AUTODEPEND .\rc2xml.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $<
-
-$(OBJS)\convertrc_wxr2xml.obj :  .AUTODEPEND .\wxr2xml.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CONVERTRC_CXXFLAGS) $<
-
-$(OBJS)\convertrc_wxconvert.res :  .AUTODEPEND .\wxconvert.rc
-	wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include $<
-
diff --git a/contrib/utils/convertrc/rc2wxr.cpp b/contrib/utils/convertrc/rc2wxr.cpp
deleted file mode 100644
index 4a44fb84c8..0000000000
--- a/contrib/utils/convertrc/rc2wxr.cpp
+++ /dev/null
@@ -1,797 +0,0 @@
-// rc2wxr.cpp: implementation of the rc2wxr class.
-//
-//////////////////////////////////////////////////////////////////////
-//Author:  Brian Gavin 9/24/00
-//License: wxWindows License
-/*
-WARNING- I know this code has some bugs to work out but
-I don't plan to fix them since I feel that wxr files will
-not be used much longer.
-This code was used as a starting point for my rc2xml converter
-*/
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-
-// need because it includes almost all "standard" wxWidgets headers
-
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-#include "wx/image.h"
-#include "wx/deprecated/setup.h"
-#include "wx/deprecated/resource.h"
-
-#include "rc2wxr.h"
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-rc2wxr::rc2wxr()
-{
-    m_done=false;
-    m_controlid=6000;
-}
-
-rc2wxr::~rc2wxr()
-{
-}
-
-void rc2wxr::Convert(wxString wxrfile, wxString rcfile)
-{
-    m_rc.Open(rcfile);
-    m_filesize=m_rc.Length();
-    if( (m_wxr  = wxFopen( wxrfile, _T("wt") )) == NULL )
-    {
-        return;
-    }
-
-    wxString tok,prevtok;
-
-    while (!m_done)
-    {
-        tok=GetToken();
-
-        if (tok==_T("DIALOG"))
-        {
-            ParseDialog(prevtok);
-        }
-
-        if (tok==_T("MENU"))
-        {
-            ParseMenu(prevtok);
-        }
-
-        prevtok=tok;
-    }
-
-    fclose(m_wxr);
-
-    m_rc.Close();
-}
-
-
-/*
-
-Example .rc
-
-Microsoft style as of v5.0
-
-IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 217, 55
-
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-
-CAPTION "About Funimator"
-
-FONT 8, "MS Sans Serif"
-
-  Borland 4.5 style rc
-
-IDD_DIBATTR DIALOG 7, 16, 172, 119
-
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-
-CAPTION "DIB Attributes"
-
-FONT 8, "MS Sans Serif"
-
-{
-
- DEFPUSHBUTTON "Ok", IDOK, 114, 8, 50, 14
-
- PUSHBUTTON "Cancel", IDCANCEL, 114, 28, 50, 14
-
-*/
-
-void rc2wxr::ParseDialog(wxString dlgname)
-
-{
-
-wxString tok;
-
-static int dlgid=999;
-
-dlgid++;
-
-/* Make sure that this really is a dialog
-
-microsoft reuses the keyword DIALOG for other things
-
-*/
-
-tok=PeekToken();
-
-//Microsoft notation?
-
-if (tok==_T("DISCARDABLE"))
-
-{
-
-tok=GetToken();
-
-tok=PeekToken();
-
-}
-
-//This isn't a Dialog resource eject eject
-
-if (!tok.IsNumber())
-
-    return;
-
-//Generate Dialog text
-
-wxFprintf(m_wxr,_T("static char *dialog%i = \"dialog(name = '%s',\\\n"),dlgid,dlgname.c_str());
-
-//be lazy about style for now. add it later
-
-wxFprintf(m_wxr,_T("style = 'wxRAISED_BORDER | wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU',\\\n"));
-wxFprintf(m_wxr,_T("id = %i,\\\n"),dlgid);
-
-//Record x,y,width,height
-
-int x,y,width,height;
-
-ReadRect(x,y,width,height);
-
-wxFprintf(m_wxr,_T("x = %i, y = %i, width = %i, height = %i,\\\n"),x,y,width,height);
-
-
-//CAPTION "About Funimator"
-
-//Get Title
-
-tok=GetToken();
-
-wxString title;
-
-
-
-while ((tok!=_T("BEGIN"))&(tok!=_T("{")))
-
-{
-
-if (tok==_T("CAPTION"))
-
-{
-
-title=GetQuoteField();
-
-wxFprintf(m_wxr,_T("title = '%s',\\\n"),title.c_str());
-
-}
-
-tok=GetToken();
-
-}
-
-wxFprintf(m_wxr,_T("use_dialog_units = 1,\\\n"));
-
-wxFprintf(m_wxr,_T("use_system_defaults = 0,\\\n"));
-
-
-
-wxFprintf(m_wxr,_T("font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\\\n"));
-
-ParseControls();
-
-wxFprintf(m_wxr,_T(").\";\n\n"));
-
-}
-
-
-
-/*
-
-BEGIN
-
-
-
-
-
-
-
-    EDITTEXT        IDC_BANDS,36,83,22,14,ES_AUTOHSCROLL | ES_NUMBER | NOT
-
-                    WS_TABSTOP
-
-    LTEXT           "Bands",IDC_STATIC,11,86,21,8
-
-    EDITTEXT        IDC_NAME,10,3,75,14,ES_AUTOHSCROLL
-
-END
-
-*/
-
-void rc2wxr::ParseControls()
-
-{
-
-wxString tok;
-
-
-
-tok=GetToken();
-
-while ((tok!=_T("END"))&(tok!=_T("}")))
-
-{
-
-if (tok==_T("LTEXT"))
-
-    ParseStaticText();
-
-if (tok==_T("EDITTEXT"))
-
-    ParseTextCtrl();
-
-if (tok==_T("PUSHBUTTON"))
-
-    ParsePushButton();
-
-if (tok==_T("DEFPUSHBUTTON"))
-
-    ParsePushButton();
-
-if (tok==_T("GROUPBOX"))
-
-    ParseGroupBox();
-
-if (tok==_T("COMBOBOX"))
-
-    ParseComboBox();
-
-if (tok==_T("CONTROL"))
-
-    ParseControlMS();
-
-
-
-tok=GetToken();
-
-}
-
-
-
-}
-
-//LTEXT           "Radius",IDC_STATIC,9,67,23,8
-
-void rc2wxr::ParseStaticText()
-
-{
-
-wxString tok;
-
-wxString phrase,varname;
-
-phrase=GetQuoteField();
-
-varname=GetToken();
-
-m_controlid++;
-
-int x,y,width,height;
-
-ReadRect(x,y,width,height);
-
-wxFprintf(m_wxr,_T("  control = [%i,wxStaticText,'%s','0','%s',"),m_controlid,phrase.c_str(),varname.c_str());
-
-wxFprintf(m_wxr,_T("%i,%i,%i,%i,'',\\\n"),x,y,width,height);
-
-wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"));
-
-}
-
-//EDITTEXT        IDC_RADIUS,36,65,40,14,ES_AUTOHSCROLL
-
-void rc2wxr::ParseTextCtrl()
-
-{
-
-wxString tok;
-
-wxString varname;
-
-varname=GetToken();
-
-m_controlid++;
-
-int x,y,width,height;
-
-ReadRect(x,y,width,height);
-
-wxFprintf(m_wxr,_T("  control = [%i,wxTextCtrl,'','0','%s',"),m_controlid,varname.c_str());
-
-wxFprintf(m_wxr,_T("%i,%i,%i,%i,'',\\\n"),x,y,width,height);
-
-wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"));
-
-
-
-}
-
-//PUSHBUTTON      "Create/Update",IDC_CREATE,15,25,53,13,NOT WS_TABSTOP
-
-void rc2wxr::ParsePushButton()
-
-{
-
-wxString tok;
-
-wxString phrase,varname;
-
-phrase=GetQuoteField();
-
-varname=GetToken();
-
-int c;
-
-m_controlid++;
-
-c=m_controlid;
-
-if (varname==_T("IDOK"))
-
-c=wxID_OK;
-
-
-
-if (varname==_T("IDCANCEL"))
-
-c=wxID_CANCEL;
-
-
-
-if (varname==_T("IDAPPLY"))
-
-c=wxID_APPLY;
-
-
-
-int x,y,width,height;
-
-ReadRect(x,y,width,height);
-
-wxFprintf(m_wxr,_T("  control = [%i,wxButton,'%s','0','%s',"),c,phrase.c_str(),varname.c_str());
-
-wxFprintf(m_wxr,_T("%i,%i,%i,%i,'',\\\n"),x,y,width,height);
-
-wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"));
-
-
-
-}
-
-
-
-
-
-bool rc2wxr::Separator(int ch)
-
-{
-
-if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='|'))
-
-   return true;
-
-
-
-if (ch==EOF)
-
-{
-
-m_done=true;
-
-return true;
-
-}
-
-return false;
-
-}
-
-
-
-void rc2wxr::ParseGroupBox()
-
-{
-
-//    GROUPBOX        "Rotate",IDC_STATIC,1,1,71,79
-
-wxString tok;
-
-wxString phrase,varname;
-
-phrase=GetQuoteField();
-
-varname=GetToken();
-
-m_controlid++;
-
-int x,y,width,height;
-
-ReadRect(x,y,width,height);
-
-wxFprintf(m_wxr,_T("  control = [%i,wxStaticBox,'%s','0','%s',"),m_controlid,phrase.c_str(),varname.c_str());
-
-wxFprintf(m_wxr,_T("%i,%i,%i,%i,'',\\\n"),x,y,width,height);
-
-wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"));
-
-
-
-
-
-}
-
-
-
-void rc2wxr::ReadRect(int & x, int & y, int & width, int & height)
-
-{
-
-x=wxAtoi(GetToken());
-
-y=wxAtoi(GetToken());
-
-width=wxAtoi(GetToken());
-
-height=wxAtoi(GetToken());
-
-
-
-}
-
-
-
-wxString rc2wxr::GetToken()
-
-{
-
-wxString tok=wxEmptyString;
-
-
-
-if (m_rc.Eof())
-
-{
-
-m_done=true;
-
-return tok;
-
-}
-
-
-
-int ch=0;
-
-ReadChar(ch);
-
-if (ch==EOF)
-
-{
-
-m_done=true;
-
-return tok;
-
-}
-
-
-
-while (Separator(ch))
-
-{
-
-  ReadChar(ch);
-
-  if (m_done)
-
-  return tok;
-
-}
-
-
-
-if (ch==EOF)
-
-{
-
-m_done=true;
-
-
-
-}
-
-
-
-
-
-while (!Separator(ch))
-
-{
-
-tok+=(char)ch;
-
-ReadChar(ch);
-
-
-
-}
-
-
-
-if (ch==EOF)
-
-   m_done=true;
-
-
-
-
-
-return tok;
-
-}
-
-
-
-wxString rc2wxr::GetQuoteField()
-{
-    wxString phrase;
-
-    //ASCII code 34 "
-    int ch=0;
-    ReadChar(ch);
-
-    while (ch!=34)
-        ReadChar(ch);
-
-    ReadChar(ch);
-
-    while (ch!=34)
-    {
-        phrase+=(char)ch;
-        ReadChar(ch);
-    }
-
-    return phrase;
-}
-
-
-
-void rc2wxr::ReadChar(int &ch)
-{
-    wxFileOffset result = m_rc.Tell();
-
-    if ( result >= m_filesize )
-        m_done=true;
-
-    result = m_rc.Read(&ch,1);
-
-    if ( result==wxInvalidOffset )
-        m_done=true;
-
-    if(ch==EOF)
-        m_done=true;
-}
-
-
-/* COMBOBOX        IDC_SCALECOMBO,10,110,48,52,CBS_DROPDOWNLIST | CBS_SORT |
-                    WS_VSCROLL | WS_TABSTOP */
-void rc2wxr::ParseComboBox()
-{
-    int x,y,width,height;
-    wxString tok;
-    wxString varname = GetToken();
-
-    m_controlid++;
-
-    ReadRect(x,y,width,height);
-    wxFprintf(m_wxr,_T("  control = [%i,wxChoice,'','0','%s',"),m_controlid,varname.c_str());
-    wxFprintf(m_wxr,_T("%i,%i,%i,%i,[],\\\n"),x,y,width,height);
-    wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"));
-}
-
-
-void rc2wxr::ParseMenu(wxString name)
-{
-    wxString tok;
-    static int menuid=0;
-    menuid++;
-    wxFprintf(m_wxr,_T("static char *MenuBar%i = \"menu(name = '%s',\\\n"),menuid,name.c_str());
-    wxFprintf(m_wxr,_T("menu = \\\n"));
-    wxFprintf(m_wxr,_T("[\\\n"));
-
-    while ((tok!=_T("BEGIN"))&(tok!=_T("{")))
-        tok=GetToken();
-
-    while ((tok!=_T("END"))&(tok!=_T("}")))
-    {
-        tok=GetToken();
-
-        if (tok==_T("POPUP"))
-        {
-            ParsePopupMenu();
-            wxFprintf(m_wxr,_T("  ],\\\n"));
-        }
-    }
-
-    wxFprintf(m_wxr,_T("]).\";\n\n"));
-}
-
-
-void rc2wxr::ParsePopupMenu()
-{
-    static int menuitem=99;
-
-    menuitem++;
-
-    wxString tok = GetQuoteField();
-    int spot;
-
-    //Remove /t because it causes problems
-    spot=tok.First(_T("\\t"));
-    tok=tok.Left(spot);
-
-    wxFprintf(m_wxr,_T("  ['%s',%i,'',\\\n"),tok.c_str(),menuitem);
-
-    while ((tok!=_T("BEGIN"))&(tok!=_T("{")))
-        tok=GetToken();
-
-    while ((tok!=_T("END"))&(tok!=_T("}")))
-    {
-        tok=GetToken();
-
-        if (tok==_T("MENUITEM"))
-        {
-            if (PeekToken()==_T("SEPARATOR"))
-            {
-                wxFprintf(m_wxr,_T("      [],\\\n"));
-            }
-            else
-            {
-                tok=GetQuoteField();
-                //Remove /t because it causes problems
-                spot=tok.First(_T("\\t"));
-                tok=tok.Left(spot);
-                menuitem++;
-                wxFprintf(m_wxr,_T("      ['%s',%i,''],\\\n"),tok.c_str(),menuitem);
-            }
-        }
-    }
-}
-
-
-
-wxString rc2wxr::PeekToken()
-{
-    wxFileOffset p = m_rc.Tell();
-    wxString tok = GetToken();
-    m_rc.Seek(p);
-    return tok;
-}
-
-//Windows pain in the butt CONTROL
-void rc2wxr::ParseControlMS()
-{
-    wxString tok;
-    wxString label=GetQuoteField();
-    wxString varname=GetToken();
-    wxString kindctrl=GetQuoteField();
-
-    kindctrl.MakeUpper();
-    if (kindctrl==_T("MSCTLS_TRACKBAR32"))
-        ParseSlider(label,varname);
-    if (kindctrl==_T("MSCTLS_PROGRESS32"))
-        ParseProgressBar(label,varname);
-    if (kindctrl==_T("BUTTON"))
-        ParseCtrlButton(label,varname);
-}
-
-/*    CONTROL         "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH |
-                    TBS_NOTICKS | WS_TABSTOP,52,73,100,15
-*/
-void rc2wxr::ParseSlider(wxString WXUNUSED(label), wxString varname)
-{
-    int x,y,width,height;
-    wxString tok;
-
-    while (ReadOrs(tok))
-        ;
-    wxFprintf(m_wxr,_T("  control = [%i,wxSlider,'','wxSL_HORIZONTAL','%s',"),m_controlid,varname.c_str());
-    ReadRect(x,y,width,height);
-    wxFprintf(m_wxr,_T("%i,%i,%i,%i,"),x,y,width,height);
-    wxFprintf(m_wxr,_T(" 1, 1, 10,\\\n"));
-    wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"));
-}
-
-/*
-CONTROL         "Progress1",CG_IDC_PROGDLG_PROGRESS,"msctls_progress32",
-                    WS_BORDER,15,52,154,13
-*/
-void rc2wxr::ParseProgressBar(wxString WXUNUSED(label), wxString varname)
-{
-    int x,y,width,height;
-    wxString tok;
-
-    while (ReadOrs(tok))
-        ;
-
-    wxFprintf(m_wxr,_T("  control = [%i,wxGauge,'','wxGA_HORIZONTAL','%s',"),m_controlid,varname.c_str());
-    ReadRect(x,y,width,height);
-    wxFprintf(m_wxr,_T("%i,%i,%i,%i,"),x,y,width,height);
-    wxFprintf(m_wxr,_T(" 0, 10,\\\n"));
-    wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"));
-}
-
-
-bool rc2wxr::ReadOrs(wxString & w)
-{
-    wxString tok = PeekToken();
-    if (tok.IsNumber())
-        return false;
-    w=GetToken();
-    return true;
-}
-
-
-//Is it a check button or a radio button
-void rc2wxr::ParseCtrlButton(wxString label, wxString varname)
-{
-    int x,y,width,height;
-    wxString tok = GetToken();
-
-    m_controlid++;
-
-    if (tok==_T("BS_AUTOCHECKBOX"))
-    {
-        wxFprintf(m_wxr,_T("  control = [%i,wxCheckBox,'%s','0','%s',"),m_controlid,label.c_str(),varname.c_str());
-        while (ReadOrs(tok))
-            ;
-
-        ReadRect(x,y,width,height);
-        wxFprintf(m_wxr,_T("%i,%i,%i,%i,0,\\\n"),x,y,width,height);
-        wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"));
-    }
-
-    if (tok==_T("BS_AUTORADIOBUTTON"))
-    {
-        wxFprintf(m_wxr,_T("  control = [%i,wxRadioButton,'%s','0','%s',"),m_controlid,label.c_str(),varname.c_str());
-        while(ReadOrs(tok))
-            ;
-
-        ReadRect(x,y,width,height);
-        wxFprintf(m_wxr,_T("%i,%i,%i,%i,0,\\\n"),x,y,width,height);
-        wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n"));
-    }
-}
diff --git a/contrib/utils/convertrc/rc2wxr.h b/contrib/utils/convertrc/rc2wxr.h
deleted file mode 100644
index b4bd9e6fc5..0000000000
--- a/contrib/utils/convertrc/rc2wxr.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// wxHandleWXR.h: interface for the wxHandleWXR class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(RC2WXR_H)
-#define RC2WXR_H
-
-#include "wx/file.h"
-#include "stdio.h"
-
-class rc2wxr : public wxObject
-{
-public:
-    rc2wxr();
-    ~rc2wxr();
-    void Convert(wxString wxrfile, wxString rcfile);
-
-private:
-    wxFile m_rc;
-    FILE *m_wxr;
-    wxFileOffset m_filesize;
-    bool m_done;
-    int m_controlid;
-    void ParseDialog(wxString dlgname);
-    void ParseControls();
-    void ParseStaticText();
-    void ParseTextCtrl();
-    void ParsePushButton();
-    bool Separator(int ch);
-    void ParseGroupBox();
-    void ReadRect(int & x, int & y, int & width, int & height);
-    wxString GetToken();
-    wxString GetQuoteField();
-    void ReadChar(int &ch);
-    void ParseComboBox();
-    void ParseMenu(wxString name);
-    void ParsePopupMenu();
-    wxString PeekToken();
-    void ParseControlMS();
-    void ParseSlider(wxString label, wxString varname);
-    void ParseProgressBar(wxString label, wxString varname);
-    bool ReadOrs(wxString & w);
-    void ParseCtrlButton(wxString label, wxString varname);
-};
-
-
-#endif
diff --git a/contrib/utils/convertrc/rc2xml.cpp b/contrib/utils/convertrc/rc2xml.cpp
deleted file mode 100644
index 17fc4cebf7..0000000000
--- a/contrib/utils/convertrc/rc2xml.cpp
+++ /dev/null
@@ -1,1425 +0,0 @@
-// rc2xml.cpp: implementation of the rc2xml class.
-//Author:  Brian Gavin 9/24/00
-//License: wxWindows License
-/*
-How to use:
-#include "rc2xml.h"
-...
-rc2xml trans;
-trans->Convert("Myfile.rc","Myfile.xml");
-*/
-/* TODO
-1.  Figure how to fix memory leaks in all wxLists in this class
-2.  Find a way to rename MS Windows fonts so that they work
-cross platform (wxGTK,etc)
-3.  Be able to abort incorrectly formatted files without crashing
-*/
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWidgets headers
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-
-#include "rc2xml.h"
-#include "wx/image.h"
-#include "wx/deprecated/setup.h"
-#include "wx/deprecated/resource.h"
-#include "wx/textfile.h"
-#include "wx/tokenzr.h"
-
-
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-rc2xml::rc2xml()
-{
-    m_done=false;
-    m_bitmaplist=new wxList(wxKEY_STRING);
-    m_stringtable=new wxList(wxKEY_STRING);
-    m_iconlist = new wxList(wxKEY_STRING);
-    m_resourcelist =new wxList(wxKEY_INTEGER);
-}
-
-rc2xml::~rc2xml()
-{
-    delete m_bitmaplist;
-    delete m_stringtable;
-    delete m_iconlist;
-    delete m_resourcelist;
-}
-
-bool rc2xml::Convert(wxString rcfile, wxString xmlfile)
-{
-    m_rc.Open(rcfile.c_str());
-    m_filesize=m_rc.Length();
-
-
-    m_workingpath=wxPathOnly(rcfile);
-
-    m_targetpath=wxPathOnly(xmlfile) + _T("\\");
-
-
-
-    wxSetWorkingDirectory(m_workingpath);
-
-
-    bool result;
-    result=m_xmlfile.Open(xmlfile.c_str(),_T("w+t"));
-    wxASSERT_MSG(result,_T("Couldn't create XML file"));
-    if (!result)
-        return false;
-
-
-/* Write Basic header for XML file */
-    m_xmlfile.Write(_T("<?xml version=\"1.0\" ?>\n"));
-    m_xmlfile.Write(_T("<resource>\n"));
-
-//Read resource.h
-    ParseResourceHeader();
-//Gather all the resource we need for toolbars,menus, and etc
-    FirstPass();
-    m_done=false;
-    m_rc.Seek(0);
-//Read in dialogs, toolbars,menus
-    SecondPass();
-
-    m_xmlfile.Write(_T("</resource>\n"));
-    m_xmlfile.Close();
-    m_rc.Close();
-    wxMessageBox(_("Conversion complete."), _("Done"),
-                            wxOK | wxICON_INFORMATION);
-
-return true;
-}
-
-
-void rc2xml::ParseDialog(wxString dlgname)
-{
-    wxString token;
-    static int dlgid=999;
-    dlgid++;
-/* Make sure that this really is a dialog
-microsoft reuses the keyword DIALOG for other things
-*/
-    token=PeekToken();
-//Microsoft notation?
-    while ((token==_T("DISCARDABLE"))
-            ||(token==_T("LOADONCALL"))||(token==_T("MOVEABLE")))
-    {
-    token=GetToken();
-    token=PeekToken();
-    }
-//Error isn't a Dialog resource eject eject
-    if (!token.IsNumber())
-    return;
-
-//Record x,y,width,height
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-//Get Title
-    token=GetToken();
-    wxString title;
-    wxString ptsize,face;
-
-    m_xmlfile.Write(_T("\t<object class=\"wxDialog\""));
-    //Avoid duplicate names this way
-    dlgname.Replace(_T("IDD_"),_T("DLG_"));
-    WriteBasicInfo(x,y,width,height,dlgname);
-    WriteTitle(title);
-
-
-    while ((token!=_T("BEGIN"))&(token!=_T("{")))
-    {
-        if (token==_T("CAPTION"))
-        {
-            title=GetQuoteField();
-        }
-
-//TODO fix face name so that it is cross platform name
-//  FONT 8, "MS Sans Serif"
-    if (token==_T("FONT"))
-    {
-        ptsize=GetToken();
-        face=GetQuoteField();
-        m_xmlfile.Write(_T("\t\t<font>\n"));
-        m_xmlfile.Write(_T("\t\t\t<size>")+ptsize+_T("</size>\n"));
-        m_xmlfile.Write(_T("\t\t\t<face>")+face+_T("</face>\n"));
-        m_xmlfile.Write(_T("\t\t</font>\n"));
-    }
-
-    token=GetToken();
-    }
-
-    ParseControls();
-    m_xmlfile.Write(_T("\t</object>\n"));
-}
-
-/*
-BEGIN
-    EDITTEXT        IDC_BANDS,36,83,22,14,ES_AUTOHSCROLL | ES_NUMBER | NOT
-                    WS_TABSTOP
-    LTEXT           "Bands",IDC_STATIC,11,86,21,8
-    EDITTEXT        IDC_NAME,10,3,75,14,ES_AUTOHSCROLL
-END
-*/
-void rc2xml::ParseControls()
-{
-    wxString token;
-    wxString label,varname;
-
-    token=GetToken();
-    while ((token!=_T("END"))&(token!=_T("}")))
-        {
-        if (token==_T("AUTOCHECKBOX"))
-           {
-            label=GetQuoteField();
-            varname=GetToken();
-            ParseCheckBox(label,varname);
-            }
-        else
-        if (token==_T("AUTORADIOBUTTON"))
-           {
-            label=GetQuoteField();
-            varname=GetToken();
-            ParseRadioButton(label,varname);
-           }
-        else
-        if (token==_T("LTEXT"))
-           {
-            label=GetQuoteField();
-            varname=GetToken();
-            ParseStaticText(label,varname);
-            }
-        else if (token==_T("EDITTEXT"))
-           {
-            varname=GetToken();
-            ParseTextCtrl(varname);
-            }
-        else if ((token==_T("PUSHBUTTON"))||(token==_T("DEFPUSHBUTTON")))
-           {
-            label=GetQuoteField();
-            varname=GetToken();
-            ParsePushButton(label,varname);
-            }
-        else if (token==_T("GROUPBOX"))
-           {
-            label=GetQuoteField();
-            varname=GetToken();
-            ParseGroupBox(label,varname);
-            }
-        else if (token==_T("COMBOBOX"))
-            {
-            varname=GetToken();
-            ParseComboBox(varname);
-             }
-        else if (token==_T("CONTROL"))
-            ParseControlMS();
-        else if (token==_T("LISTBOX"))
-           {
-            varname=GetToken();
-            ParseListBox(varname);
-            }
-        else if (token==_T("ICON"))
-            ParseIconStatic();
-        else if (token==_T("SCROLLBAR"))
-            ParseScrollBar();
-        token=GetToken();
-        }
-
-}
-//LTEXT           "Radius",IDC_STATIC,9,67,23,8
-void rc2xml::ParseStaticText(wxString phrase, wxString varname)
-{
-    wxString token;
-    token=PeekToken();
-    while (!token.IsNumber())
-        {
-        token=GetToken();
-        token=PeekToken();
-        }
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-
-    m_xmlfile.Write(_T("\t\t<object class=\"wxStaticText\""));
-    WriteBasicInfo(x,y,width,height,varname);WriteLabel(phrase);
-    m_xmlfile.Write(_T("\t\t</object>\n"));
-
-}
-//EDITTEXT        IDC_RADIUS,36,65,40,14,ES_AUTOHSCROLL
-void rc2xml::ParseTextCtrl(wxString varname)
-{
-    wxString token;
-    wxString style;
-    token=PeekToken();
-    while (!token.IsNumber())
-        {
-        token=GetToken();
-        token=PeekToken();
-        }
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-//TODO
-//style=GetToken();
-    m_xmlfile.Write(_T("\t\t<object class=\"wxTextCtrl\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    m_xmlfile.Write(_T("\t\t</object>\n"));
-
-}
-//AUTOCHECKBOX "&log.", ID_XLOG, 25, 24, 21, 12
-void rc2xml::ParseCheckBox(wxString phrase, wxString varname)
-{
-    wxString token;
-    token=PeekToken();
-    while (!token.IsNumber())
-        {
-        token=GetToken();
-        token=PeekToken();
-        }
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-
-    m_xmlfile.Write(_T("\t\t<object class=\"wxCheckBox\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    WriteLabel(phrase);
-    m_xmlfile.Write(_T("\t\t</object>\n"));
-
-}
-//AUTORADIOBUTTON "&text", ID_SW10, 13, 12, 68, 10, BS_AUTORADIOBUTTON | WS_GROUP
-void rc2xml::ParseRadioButton(wxString phrase, wxString varname)
-{
-    wxString token,style;
-    int x,y,width,height;
-    bool GotOrs;
-    GotOrs = ReadOrs(token);
-    if (ReadRect(x,y,width,height))
-        if (GotOrs==false)
-      ReadOrs(token);
-    if (token.Find(_T("WS_GROUP")) != wxNOT_FOUND)
-        style += _T("wxRB_GROUP");
-
-    m_xmlfile.Write(_T("\t\t<object class=\"wxRadioButton\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    WriteLabel(phrase);
-    WriteStyle(style);
-    m_xmlfile.Write(_T("\t\t</object>\n"));
-
-}
-
-//PUSHBUTTON      "Create/Update",IDC_CREATE,15,25,53,13,NOT WS_TABSTOP
-void rc2xml::ParsePushButton(wxString phrase, wxString varname)
-{
-    wxString token;
-
-    token=PeekToken();
-    while (!token.IsNumber())
-        {
-        token=GetToken();
-        token=PeekToken();
-        }
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-
-    m_xmlfile.Write(_T("\t\t<object class=\"wxButton\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    WriteLabel(phrase);
-    m_xmlfile.Write(_T("\t\t</object>\n"));
-
-}
-
-
-bool rc2xml::Separator(int ch)
-{
-//if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='|')|(ch=='\t'))
-    if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='\t'))
-        return true;
-
-    if (ch==EOF)
-    {
-        m_done=true;
-        return true;
-    }
-
-    return false;
-}
-
-void rc2xml::ParseGroupBox(wxString phrase, wxString varname)
-{
-//    GROUPBOX        "Rotate",IDC_STATIC,1,1,71,79
-    wxString token;
-    token=PeekToken();
-    while (!token.IsNumber())
-        {
-        token=GetToken();
-        token=PeekToken();
-        }
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-
-    m_xmlfile.Write(_T("\t\t<object class=\"wxStaticBox\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    WriteLabel(phrase);
-    m_xmlfile.Write(_T("\t\t</object>\n"));
-}
-
-bool rc2xml::ReadRect(int & x, int & y, int & width, int & height)
-{
-    x=wxAtoi(GetToken());
-    y=wxAtoi(GetToken());
-    width=wxAtoi(GetToken());
-    bool ret;
-    wxString tmp = GetToken(&ret);
-    height=wxAtoi(tmp);
-    return ret; // check for more parameters
-}
-
-wxString rc2xml::GetToken(bool *listseparator)
-{
-    wxString token=wxEmptyString;
-
-    if (m_rc.Eof())
-    {
-    m_done=true;
-    return token;
-}
-
-    int ch=0;
-    ReadChar(ch);
-    if (ch==EOF)
-    {
-    m_done=true;
-    return token;
-    }
-
-    while (Separator(ch))
-    {
-    ReadChar(ch);
-    if (m_done)
-        return token;
-    }
-
-    if (ch==EOF)
-    {
-    m_done=true;
-    }
-
-
-    while (!Separator(ch))
-    {
-    token += (char)ch;
-    ReadChar(ch);
-    }
-
-    if (ch == EOF)
-        m_done = true;
-
-    if (listseparator)
-      *listseparator = (ch == ',');
-    return token;
-}
-
-wxString rc2xml::GetQuoteField()
-{
-    wxString phrase;
-    //ASCII code 34 "
-    int ch=0;
-    int ch1=0;
-
-    ReadChar(ch);
-
-    // !! Changed by MS, 15th/11/04. Can now read strings such as
-    // """Catapult"" - blah blah", ...
-
-    while (ch!=34)
-        ReadChar(ch);
-
-    // found first '"'
-    while (true)
-    {
-        ReadChar(ch);
-        if (ch == 34)
-        {
-            // another quote?
-            ReadChar(ch1);
-            if (ch1 != 34)
-            {
-                // real end of string..
-                break;
-            }
-
-            // add a single quote - fall through
-        }
-        phrase+=(char)ch;
-    }
-
-    return phrase;
-}
-
-// string in stringtable may contain embedded quotes
-// escape characters retained to allow strings to be rewritten
-wxString rc2xml::GetStringQuote()
-{
-    wxString phrase;
-    //ASCII code 34 "
-    bool done=false;
-    int ch=0,lastch=0;
-    ReadChar(ch);
-
-    while (ch!=34)
-        ReadChar(ch);
-
-    ReadChar(ch);
-    while (done==false)
-    {
-        if ((ch==34)&&(lastch!='\\'))
-        {
-            wxFileOffset p = m_rc.Tell();
-            ReadChar(ch);
-            // RC supports "", for embedded quote, as well as  \"
-            if (ch==34)
-                phrase+='\\';
-            else
-            {
-                m_rc.Seek(p);
-                done = true;
-                }
-            }
-         if (done==true)
-             break;
-         if (ch=='\r')
-             ReadChar(ch);                    // skip
-         if ((ch=='\n')&&(lastch=='\\'))      // lastch <should> be this
-             phrase+='n';                     // escape
-         else
-             phrase+=(char)ch;
-
-         lastch=ch;
-         ReadChar(ch);
-    }
-
-    return phrase;
-}
-
-void rc2xml::ReadChar(int &ch)
-{
-    wxFileOffset result = m_rc.Tell();
-
-    if((result>=m_filesize))
-        m_done=true;
-
-    result = m_rc.Read(&ch,1);
-
-    if( result == wxInvalidOffset )
-        m_done=true;
-
-    if(ch==EOF)
-        m_done=true;
-}
-
-void rc2xml::ParseComboBox(wxString varname)
-{
-/* COMBOBOX        IDC_SCALECOMBO,10,110,48,52,CBS_DROPDOWNLIST | CBS_SORT |
-                    WS_VSCROLL | WS_TABSTOP */
-    wxString token,style;
-    int x,y,width,height;
-    bool GotOrs;
-    GotOrs = ReadOrs(token);
-    if (ReadRect(x,y,width,height))
-        if (GotOrs==false)
-      ReadOrs(token);
-
-    m_xmlfile.Write(_T("\t\t<object class=\"wxComboBox\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    if (token.Find(_T("CBS_SIMPLE")) != wxNOT_FOUND)
-        WriteStyle(_T("wxCB_SIMPLE"));
-    if (token.Find(_T("CBS_SORT")) != wxNOT_FOUND)
-        WriteStyle(_T("wxCB_SORT"));
-    if (token.Find(_T("CBS_DISABLENOSCROLL")) != wxNOT_FOUND)
-        WriteStyle(_T("wxLB_ALWAYS_SB"));
-    m_xmlfile.Write(_T("\n\t\t</object>\n"));
-
-}
-
-void rc2xml::ParseMenu(wxString varname)
-{
-    wxString token=wxEmptyString;
-
-    //Write menubar to xml file
-    m_xmlfile.Write(_T("\t<object class=\"wxMenuBar\""));
-    //Avoid duplicate names this way
-    varname.Replace(_T("IDR_"),_T("MB_"));
-    WriteName(varname);
-    m_xmlfile.Write(_T(">\n"));
-
-    while ((token!=_T("BEGIN"))&(token!=_T("{")))
-        token=GetToken();
-
-    while ((token!=_T("END"))&(token!=_T("}")))
-    {
-    token=GetToken();
-    token.MakeUpper();
-
-    if (token==_T("POPUP"))
-        {
-        ParsePopupMenu();
-        }
-    }
-    m_xmlfile.Write(_T("\t</object>\n"));
-}
-
-void rc2xml::ParsePopupMenu()
-{
-    static int menucount=0;
-    menucount++;
-    wxString token,name,msg,longhelp,tip;
-    token=GetQuoteField();
-
-//Remove \t because it causes problems
-
-//spot=token.First("\\t");
-//token=token.Left(spot);
-
-//Write Menu item
-//Generate a fake name since RC menus don't have one
-    name << _T("Menu_") << menucount;
-    m_xmlfile.Write(_T("\t\t<object class=\"wxMenu\""));
-    WriteName(name);
-    m_xmlfile.Write(_T(">\n"));
-    WriteLabel(token);
-
-    while ((token!=_T("BEGIN"))&(token!=_T("{")))
-        token=GetToken();
-
-    while ((token!=_T("END"))&(token!=_T("}")))
-    {
-    token=GetToken();
-    token.MakeUpper();
-
-    if (token==_T("POPUP"))
-        ParsePopupMenu();
-
-    if (token==_T("MENUITEM"))
-        ParseMenuItem();
-    }
-    m_xmlfile.Write(_T("\t\t\t</object>\n"));
-}
-
-wxString rc2xml::PeekToken()
-{
-    wxFileOffset p = m_rc.Tell();
-    wxString token=GetToken();
-
-    m_rc.Seek(p);
-    return token;
-}
-
-//MS Windows pain in the butt CONTROL
-void rc2xml::ParseControlMS()
-{
-    wxString token = PeekToken();
-
-    if (token.Contains(_T("\"")))
-        ParseNormalMSControl();
-    else
-        ParseWeirdMSControl();
-}
-
-/*    CONTROL         "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH |
-                    TBS_NOTICKS | WS_TABSTOP,52,73,100,15
-*/
-
-void rc2xml::ParseSlider(wxString WXUNUSED(label), wxString varname)
-{
-    wxString token,style;
-    ReadOrs(token);
-    if (token.Find(_T("TBS_VERT"))!=wxNOT_FOUND)
-        style+=_T("wxSL_VERTICAL");
-    //MFC RC Default is horizontal
-    else
-        style+=_T("wxSL_HORIZONTAL");
-
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-    m_xmlfile.Write(_T("\t\t<object class=\"wxSlider\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    WriteStyle(style);
-    m_xmlfile.Write(_T("\n\t\t</object>\n"));
-
-}
-/*
-CONTROL         "Progress1",CG_IDC_PROGDLG_PROGRESS,"msctls_progress32",
-                    WS_BORDER,15,52,154,13
-*/
-void rc2xml::ParseProgressBar(wxString WXUNUSED(label), wxString varname)
-{
-    wxString token,style;
-    ReadOrs(token);
-
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-
-//Always horizontal in MFC
-    m_xmlfile.Write(_T("\t\t<object class=\"wxGauge\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    WriteStyle(style);
-    m_xmlfile.Write(_T("\t\t</object>\n"));
-}
-
-bool rc2xml::ReadOrs(wxString & orstring)
-{
-    wxString token;
-
-    token=PeekToken();
-    if (token.IsNumber())
-        return false;
-    orstring=GetToken();
-
-    while(PeekToken()==_T("|"))
-    {
-    //Grab |
-    orstring+=GetToken();
-    //Grab next token
-    orstring+=GetToken();
-    }
-    return true;
-}
-
-//Is it a checkbutton or a radiobutton or a pushbutton or a groupbox
-void rc2xml::ParseCtrlButton(wxString label, wxString varname)
-{
-    wxString token;
-    wxFileOffset p = m_rc.Tell();
-    ReadOrs(token);
-    m_rc.Seek(p);
-
-    if (token.Find(_T("BS_AUTOCHECKBOX"))!=wxNOT_FOUND)
-        ParseCheckBox(label, varname);
-    else if ((token.Find(_T("BS_AUTORADIOBUTTON"))!=wxNOT_FOUND)||
-             (token.Find(_T("BS_RADIOBUTTON"))!=wxNOT_FOUND))
-        ParseRadioButton(label, varname);
-    else if (token.Find(_T("BS_GROUPBOX"))!=wxNOT_FOUND)
-        ParseGroupBox(label, varname);
-    else  // if ((token.Find("BS_PUSHBUTTON")!=wxNOT_FOUND)||
-//                (token.Find("BS_DEFPUSHBUTTON")!=wxNOT_FOUND))
-        ParsePushButton(label, varname);           // make default case
-}
-
-void rc2xml::WriteSize(int width, int height)
-{
-    wxString msg;
-    msg << _T(" <size>") << width << _T(",") << height << _T("d</size>");
-    m_xmlfile.Write(msg);
-}
-
-void rc2xml::WritePosition(int x, int y)
-{
-    wxString msg;
-    msg << _T(" <pos>") << x << _T(",") << y << _T("d</pos>");
-    m_xmlfile.Write(msg);
-}
-
-void rc2xml::WriteTitle(wxString title)
-{
-    wxString msg;
-    msg=_T("\t\t<title>")+title+_T("</title>\n");
-    m_xmlfile.Write(msg);
-}
-
-void rc2xml::WriteName(wxString name)
-{
-
-//Try to convert any number ids into names
-name=LookUpId(name);
-//Replace common MS ids with wxWidgets ids
-//I didn't do everyone of them
-    if (name==_T("IDOK"))
-        name=_T("wxID_OK");
-    else if (name==_T("IDCANCEL"))
-        name=_T("wxID_CANCEL");
-    else if (name==_T("IDAPPLY"))
-        name=_T("wxID_APPLY");
-    else if (name==_T("ID_FILE_OPEN"))
-        name=_T("wxID_OPEN");
-    else if (name==_T("ID_FILE_CLOSE"))
-        name=_T("wxID_CLOSE");
-    else if (name==_T("ID_FILE_SAVE"))
-        name=_T("wxID_SAVE");
-    else if (name==_T("ID_FILE_SAVE_AS"))
-        name=_T("wxID_SAVEAS");
-    else if (name==_T("ID_APP_EXIT"))
-        name=_T("wxID_EXIT");
-    else if (name==_T("ID_FILE_PRINT"))
-        name=_T("wxID_PRINT");
-    else if (name==_T("ID_FILE_PRINT_PREVIEW"))
-        name=_T("wxID_PREVIEW");
-    else if (name==_T("ID_FILE_PRINT_SETUP"))
-        name=_T("wxID_PRINT_SETUP");
-    else if (name==_T("ID_APP_ABOUT"))
-        name=_T("wxID_ABOUT");
-    else if (name==_T("ID_EDIT_UNDO"))
-        name=_T("wxID_UNDO");
-    else if (name==_T("ID_EDIT_CUT"))
-        name=_T("wxID_CUT");
-    else if (name==_T("ID_EDIT_COPY"))
-        name=_T("wxID_COPY");
-    else if (name==_T("ID_EDIT_PASTE"))
-        name=_T("wxID_PASTE");
-    else if (name==_T("IDYES"))
-        name=_T("wxID_YES");
-    else if (name==_T("IDNO"))
-        name=_T("wxID_NO");
-    else if (name==_T("IDHELP"))
-        name=_T("wxID_HELP");
-
-    m_xmlfile.Write(_T(" name= \"")+name+_T("\""));
-}
-
-void rc2xml::WriteLabel(wxString label)
-{
-    label.Replace(_T("&"),_T("$"));
-    // changes by MS, handle '<' '>' characters within a label.
-    label.Replace(_T("<"),_T("&lt;"));
-    label.Replace(_T(">"),_T("&gt;"));
-    m_xmlfile.Write(_T("\t\t\t<label>")+label+_T("</label>\n"));
-}
-
-void rc2xml::WriteBasicInfo(int x, int y, int width, int height, wxString name)
-{
-    WriteName(name);
-    m_xmlfile.Write(_T(">\n"));
-    m_xmlfile.Write(_T("\t\t\t"));
-    WritePosition(x,y);
-    WriteSize(width,height);
-    m_xmlfile.Write(_T("\n"));
-}
-
-void rc2xml::WriteStyle(wxString style)
-{
-    if (style.Length()==0)
-        return;
-    m_xmlfile.Write(_T("\t\t\t<style>")+style+_T("</style>\n"));
-}
-/*
-    LISTBOX         IDC_LIST1,16,89,48,40,LBS_SORT | LBS_MULTIPLESEL |
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-*/
-void rc2xml::ParseListBox(wxString varname)
-{
-    wxString token;
-    token=PeekToken();
-    while (!token.IsNumber())
-        {
-        token=GetToken();
-        token=PeekToken();
-        }
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-
-    m_xmlfile.Write(_T("\t\t<object class=\"wxListBox\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    m_xmlfile.Write(_T("\n\t\t</object>\n"));
-
-}
-/*
-    CONTROL         "",IDC_RICHEDIT1,"RICHEDIT",ES_AUTOHSCROLL | WS_BORDER |
-                    WS_TABSTOP,103,110,40,14
-*/
-void rc2xml::ParseRichEdit(wxString WXUNUSED(label), wxString varname)
-{
-    wxString token;
-    //while (ReadOrs(token));
-    ReadOrs(token);
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-    wxString style;
-//Make it a rich text control
-    style+=_T("wxTE_MULTILINE ");
-    m_xmlfile.Write(_T("\t\t<object class=\"wxTextCtrl\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    WriteStyle(style);
-    m_xmlfile.Write(_T("\t\t</object>\n"));
-
-}
-/*
-CONTROL         "Spin1",IDC_SPIN1,"msctls_updown32",UDS_ARROWKEYS,209,72,
-                 19,26
-*/
-void rc2xml::ParseSpinCtrl(wxString WXUNUSED(label), wxString varname)
-{
-    wxString token,style;
-
-    ReadOrs(token);
-    if (token.Find(_T("UDS_HORZ"))!=wxNOT_FOUND)
-        style=_T("wxSP_HORIZONTAL");
-    //MFC default
-    else
-        style=_T("wxSP_VERTICAL");
-
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-    m_xmlfile.Write(_T("\t\t<object class=\"wxSpinButton\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    WriteStyle(style);
-    m_xmlfile.Write(_T("\n\t\t</object>\n"));
-
-}
-
-void rc2xml::FirstPass()
-{
-    wxString token,prevtok;
-    while (!m_done)
-        {
-        token=GetToken();
-        if (token==_T("BITMAP"))
-            ParseBitmap(prevtok);
-        else if (token==_T("STRINGTABLE"))
-            ParseStringTable(prevtok);
-        else if (token==_T("ICON"))
-            ParseIcon(prevtok);
-
-        prevtok=token;
-        }
-}
-
-void rc2xml::ParseBitmap(wxString varname)
-{
-    wxString token;
-    wxString *bitmapfile;
-
-    token=PeekToken();
-    //Microsoft notation?
-    if (token==_T("DISCARDABLE"))
-        {
-        token=GetToken();
-        token=PeekToken();
-        }
-    bitmapfile=new wxString;
-    *bitmapfile=GetQuoteField();
-    m_bitmaplist->Append(varname,bitmapfile);
-
-}
-
-
-void rc2xml::SecondPass()
-{
-    wxString token,prevtok;
-    while (!m_done)
-        {
-        token=GetToken();
-        if ((token==_T("DIALOG"))||(token==_T("DIALOGEX")))
-            ParseDialog(prevtok);
-        else if (token==_T("MENU"))
-            ParseMenu(prevtok);
-        else if (token==_T("TOOLBAR"))
-            ParseToolBar(prevtok);
-
-        prevtok=token;
-        }
-
-}
-
-void rc2xml::ParseToolBar(wxString varname)
-{
-    wxString token;
-    token=GetToken();
-    wxASSERT_MSG(token==_T("DISCARDABLE"),_T("Error in toolbar parsing"));
-//Look up bitmap for toolbar and load
-    wxNode *node=m_bitmaplist->Find(LookUpId(varname));
-    wxString *bitmappath;
-    bitmappath=(wxString *)node->GetData();
-    wxBitmap bitmap;
-    if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP ))
-        wxLogError(_T("Unable to load bitmap:")+*bitmappath);
-
-//Write toolbar to xml file
-    m_xmlfile.Write(_T("\t<object class=\"wxToolBar\""));
-//Avoid duplicate names this way
-    varname.Replace(_T("IDR_"),_T("TB_"));
-    WriteName(varname);
-    m_xmlfile.Write(_T(">\n"));
-    wxString style;
-    style+=_T("wxTB_FLAT");
-    WriteStyle(style);
-
-
-//Grab width and height
-    int width,height;
-    width=wxAtoi(GetToken());
-    height=wxAtoi(GetToken());
-
-    int c=0;
-    wxString buttonname,msg,tip,longhelp;
-    token=GetToken();
-    while ((token!=_T("BEGIN"))&(token!=_T("{")))
-        token=GetToken();
-
-    while ((token!=_T("END"))&(token!=_T("}")))
-        {
-        if (token==_T("BUTTON"))
-            {
-            buttonname=GetToken();
-            m_xmlfile.Write(_T("\t\t\t<object class=\"tool\""));
-            WriteName(buttonname);
-            m_xmlfile.Write(_T(">\n"));
-    //Write tool tip if any
-            if (LookUpString(buttonname,msg))
-                {
-                SplitHelp(msg,tip,longhelp);
-                m_xmlfile.Write(_T("\t\t\t\t<tooltip>")+tip+_T("</tooltip>\n"));
-                m_xmlfile.Write(_T("\t\t<longhelp>")+longhelp+_T("</longhelp>\n"));
-                }
-            //Make a bitmap file name
-            buttonname=CleanName(buttonname);
-            buttonname+=_T(".bmp");
-            m_xmlfile.Write(_T("\t\t\t\t<bitmap>")+buttonname+_T("</bitmap>\n"));
-        WriteToolButton(buttonname,c,width,height,bitmap);
-        m_xmlfile.Write(_T("\t\t\t</object>\n"));
-        c++;
-        }
-    else if (token==_T("SEPARATOR"))
-    {
-    m_xmlfile.Write(_T("\t\t\t<object class=\"separator\"/>\n"));
-    }
-    token=GetToken();
-    }
-    m_xmlfile.Write(_T("\t</object>\n"));
-}
-
-//Extract bitmaps from larger toolbar bitmap
-void rc2xml::WriteToolButton(wxString name,int index, int width, int height, wxBitmap bitmap)
-{
-    int x;
-    x=index*width;
-    wxRect r(x,0,width,height);
-    wxBitmap little;
-    little=bitmap.GetSubBitmap(r);
-    little.SaveFile(m_targetpath+name,wxBITMAP_TYPE_BMP);
-}
-
-void rc2xml::ParseStringTable(wxString WXUNUSED(varname))
-{
-    wxString token;
-    token=GetToken();
-    while ((token!=_T("BEGIN"))&(token!=_T("{")))
-        token=GetToken();
-    token=GetToken();
-    wxString *msg;
-
-    while ((token!=_T("END"))&(token!=_T("}")))
-    {
-        msg=new wxString;
-        *msg=GetStringQuote();
-        m_stringtable->Append(token,msg);
-        token=GetToken();
-    }
-}
-
-bool rc2xml::LookUpString(wxString strid,wxString & st)
-{
-    wxNode *node=m_stringtable->Find(strid);
-    wxString *s;
-    if (node==NULL)
-        return false;
-
-    s=(wxString *)node->GetData();
-    st=*s;
-
-    return true;
-}
-
-bool rc2xml::SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp)
-{
-    int spot;
-    spot=msg.Find(_T("\\n"));
-    if (spot==wxNOT_FOUND)
-        {
-        shorthelp=msg;
-        longhelp=msg;
-        }
-
-    longhelp=msg.Left(spot);
-    spot=msg.Length()-spot-2;
-    shorthelp=msg.Right(spot);
-    return true;
-}
-
-void rc2xml::ParseMenuItem()
-{
-    wxString token,name,msg,tip,longhelp;
-//int spot;
-    if (PeekToken()==_T("SEPARATOR"))
-        {
-        m_xmlfile.Write(_T("\t\t\t<object class=\"separator\"/>\n"));
-        return;
-        }
-
-    token=GetQuoteField();
-    name=GetToken();
-//Remove \t because it causes problems
-//spot=token.First("\\t");
-//token=token.Left(spot);
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxMenuItem\""));
-    WriteName(name);
-    m_xmlfile.Write(_T(">\n"));
-    WriteLabel(token);
-//Look up help if any listed in stringtable
-//can't assume numbers correlate, restrict to string identifiers
-    if ((!name.IsNumber())&&(LookUpString(name,msg)))
-        {
-        SplitHelp(msg,tip,longhelp);
-        m_xmlfile.Write(_T("\t\t\t<help>")
-            +longhelp+_T("</help>\n"));
-        }
-//look for extra attributes like checked and break
-    wxString ptoken;
-    ptoken=PeekToken();
-    ptoken.MakeUpper();
-    while ((ptoken!=_T("MENUITEM"))&(ptoken!=_T("POPUP"))&(ptoken!=_T("END")))
-        {
-        token=GetToken();
-        ptoken.MakeUpper();
-        if (token==_T("CHECKED"))
-            m_xmlfile.Write(_T("\t\t\t<checkable>1</checkable>\n"));
-        else if (token==_T("MENUBREAK"))
-            ;
-//m_xmlfile.Write("\t\t\t</break>\n");
-        else if (token==_T("GRAYED"))
-            ;
-        else
-            wxLogError(_T("Unknown Menu Item token:")+token);
-
-        ptoken=PeekToken();
-        ptoken.MakeUpper();
-        }
-    m_xmlfile.Write(_T("\t\t\t</object>\n"));
-
-}
-
-//ICON            IDR_MAINFRAME,IDC_STATIC,11,17,20,20
-void rc2xml::ParseIconStatic()
-{
-    wxString token;
-    wxString varname,iconname;
-    token = PeekToken();
-    if (token.Contains(_T("\"")))
-        iconname = GetQuoteField();
-    else
-    iconname=GetToken();
-//Look up icon
-    varname=GetToken();
-
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-
-    m_xmlfile.Write(_T("\t\t<object class=\"wxStaticBitmap\""));
-    WriteBasicInfo(x,y,width,height,varname);
-//Save icon as a bitmap
-    WriteIcon(iconname);
-    m_xmlfile.Write(_T("\t\t</object>\n"));
-
-}
-//IDR_MAINFRAME           ICON    DISCARDABLE     "res\\mfcexample.ico"
-void rc2xml::ParseIcon(wxString varname)
-{
-    wxString token;
-    wxString *iconfile;
-    iconfile=new wxString;
-    token=PeekToken();
-
-    *iconfile=GetQuoteField();
-    m_iconlist->Append(varname,iconfile);
-
-
-}
-
-wxString rc2xml::CleanName(wxString name)
-{
-    name.MakeLower();
-    name.Replace(_T("id_"),wxEmptyString);
-    name.Replace(_T("idr_"),wxEmptyString);
-    name.Replace(_T("idb_"),wxEmptyString);
-    name.Replace(_T("idc_"),wxEmptyString);
-
-    name.Replace(_T(".ico"),wxEmptyString);
-
-    name.Replace(_T(".bmp"),wxEmptyString);
-    return name;
-}
-// And the award for most messed up control goes to...
-//    CONTROL         IDB_FACE,IDC_STATIC,"Static",SS_BITMAP,26,62,32,30
-void rc2xml::ParseStaticBitmap(wxString bitmapname, wxString varname)
-{
-    wxString token;
-    //Grab SS_BITMAP
-    ReadOrs(token);
-
-
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-
-    m_xmlfile.Write(_T("\t\t<object class=\"wxStaticBitmap\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    WriteBitmap(bitmapname);
-    m_xmlfile.Write(_T("\t\t</object>\n"));
-
-}
-
-void rc2xml::ParseNormalMSControl()
-{
-    wxString label=GetQuoteField();
-    wxString varname=GetToken();
-    wxString kindctrl=GetQuoteField();
-    kindctrl.MakeUpper();
-
-    if (kindctrl==_T("MSCTLS_UPDOWN32"))
-        ParseSpinCtrl(label,varname);
-    else if (kindctrl==_T("MSCTLS_TRACKBAR32"))
-        ParseSlider(label,varname);
-    else if (kindctrl==_T("MSCTLS_PROGRESS32"))
-        ParseProgressBar(label,varname);
-    else if (kindctrl==_T("SYSTREEVIEW32"))
-        ParseTreeCtrl(label,varname);
-    else if (kindctrl==_T("SYSMONTHCAL32"))
-        ParseCalendar(label,varname);
-    else if (kindctrl==_T("SYSLISTVIEW32"))
-        ParseListCtrl(label,varname);
-    else if (kindctrl==_T("BUTTON"))
-        ParseCtrlButton(label,varname);
-    else if (kindctrl==_T("RICHEDIT"))
-        ParseRichEdit(label,varname);
-    else if (kindctrl==_T("STATIC"))
-    {
-        wxString token;
-        wxFileOffset p = m_rc.Tell();
-        ReadOrs(token);
-        m_rc.Seek(p);
-        if (token.Find(_T("SS_BITMAP"))!=wxNOT_FOUND)
-            ParseStaticBitmap(label,varname);
-        else
-            ParseStaticText(label,varname);
-    }
-    else if (kindctrl==_T("EDIT"))
-        ParseTextCtrl(varname);
-    else if (kindctrl==_T("LISTBOX"))
-        ParseListBox(varname);
-    else if (kindctrl==_T("COMBOBOX"))
-        ParseComboBox(varname);
-}
-
-void rc2xml::ParseWeirdMSControl()
-{
-    wxString id = GetToken();
-    wxString varname = GetToken();
-    wxString kindctrl = GetQuoteField();
-    kindctrl.MakeUpper();
-//    CONTROL         IDB_FACE,IDC_STATIC,"Static",SS_BITMAP,26,62,32,30
-    if (kindctrl==_T("STATIC"))
-    {
-        if (PeekToken()==_T("SS_BITMAP"))
-            ParseStaticBitmap(id,varname);
-        else
-            wxLogError(_T("Unknown MS Control Static token"));
-    }
-}
-
-//SCROLLBAR       IDC_SCROLLBAR1,219,56,10,40,SBS_VERT
-void rc2xml::ParseScrollBar()
-{
-    wxString token;
-    wxString varname;
-
-    varname=GetToken();
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-    wxString style;
-
-    ReadOrs(token);
-
-if (token.Find(_T("SBS_VERT"))!=wxNOT_FOUND)
-    style=_T("wxSB_VERTICAL");
-//Default MFC style is horizontal
-    else
-        style=_T("wxSB_HORIZONTAL");
-
-    m_xmlfile.Write(_T("\t\t<object class=\"wxScrollBar\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    WriteStyle(style);
-    m_xmlfile.Write(_T("\n\t\t</object>\n"));
-
-}
-//    CONTROL         "Tree1",IDC_TREE1,"SysTreeView32",WS_BORDER | WS_TABSTOP,
-//                      7,7,66,61
-
-void rc2xml::ParseTreeCtrl(wxString WXUNUSED(label), wxString varname)
-{
-    wxString token;
-//while (ReadOrs(token));
-    ReadOrs(token);
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-    m_xmlfile.Write(_T("\t\t<object class=\"wxTreeCtrl\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    m_xmlfile.Write(_T("\t\t</object>\n"));
-
-}
-//    CONTROL         "MonthCalendar1",IDC_MONTHCALENDAR1,"SysMonthCal32",
-                    //MCS_NOTODAY | WS_TABSTOP,105,71,129,89
-
-void rc2xml::ParseCalendar(wxString WXUNUSED(label), wxString varname)
-{
-    wxString token;
-//while (ReadOrs(token));
-    ReadOrs(token);
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-    m_xmlfile.Write(_T("\t\t<object class=\"wxCalendarCtrl\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    m_xmlfile.Write(_T("\t\t</object>\n"));
-}
-//    CONTROL         "List1",IDC_LIST1,"SysListView32",WS_BORDER | WS_TABSTOP,
-  //                  7,89,68,71
-
-void rc2xml::ParseListCtrl(wxString WXUNUSED(label), wxString varname)
-{
-    wxString token;
-    //while (ReadOrs(token));
-    ReadOrs(token);
-    int x,y,width,height;
-    ReadRect(x,y,width,height);
-    m_xmlfile.Write(_T("\t\t<object class=\"wxListCtrl\""));
-    WriteBasicInfo(x,y,width,height,varname);
-    m_xmlfile.Write(_T("\t\t</object>\n"));
-
-}
-
-void rc2xml::WriteBitmap(wxString bitmapname)
-{
-//Look up bitmap
-    wxNode *node=m_bitmaplist->Find(LookUpId(bitmapname));
-    if (node==NULL)
-        {
-        m_xmlfile.Write(_T("\t\t\t<bitmap>missingfile</bitmap>\n"));
-        wxLogError(_T("Unable to find bitmap:")+bitmapname);
-        return;
-        }
-
-    wxString *bitmappath;
-    bitmappath=(wxString *)node->GetData();
-
-    bitmapname=wxFileNameFromPath(*bitmappath);
-    wxBitmap bitmap;
-    if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP ))
-        wxLogError(_T("Unable to load bitmap:")+*bitmappath);
-
-    //Make a bitmap file name
-    bitmapname=CleanName(bitmapname);
-    bitmapname+=_T(".bmp");
-    m_xmlfile.Write(_T("\t\t\t<bitmap>")+bitmapname+_T("</bitmap>\n"));
-    bitmap.SaveFile(m_targetpath+bitmapname,wxBITMAP_TYPE_BMP);
-}
-
-void rc2xml::WriteIcon(wxString iconname)
-{
-wxNode *node=m_iconlist->Find(iconname);
-    if (node==NULL)
-        {
-        m_xmlfile.Write(_T("\t\t\t<bitmap>missing_file</bitmap>\n"));
-        wxLogError(_T("Unable to find icon:")+iconname);
-        }
-    wxString *iconpath;
-    iconpath=(wxString *)node->GetData();
-    wxIcon icon;
-    wxBitmap bitmap;
-    if (!icon.LoadFile(*iconpath,wxBITMAP_TYPE_ICO ))
-        wxLogError(_T("Unable to load icon:")+*iconpath);
-#ifdef __WXMSW__
-    bitmap.CopyFromIcon(icon);
-#else
-    bitmap = icon;
-#endif
-    iconname=wxFileNameFromPath(*iconpath);
-    //Make a bitmap file name
-    iconname=CleanName(iconname);
-    iconname+=_T(".bmp");
-    m_xmlfile.Write(_T("\t\t\t<bitmap>")+iconname+_T("</bitmap>\n"));
-    bitmap.SaveFile(m_targetpath+iconname,wxBITMAP_TYPE_BMP);
-
-
-}
-/*Unfortunately sometimes the great MSVC Resource editor decides
-to use numbers instead of the word id.  I have no idea why they
-do this, but that is the way it is.
-*/
-/* this is a quick and dirty way to parse the resource.h file
-it will not recognize #ifdef so it can be easily fooled
-*/
-void rc2xml::ParseResourceHeader()
-{
-wxTextFile r;
-//Attempt to load resource.h in current path
-    if (!r.Open(_T("resource.h")))
-        {
-        wxLogError(_T("Warining Unable to load resource.h file"));
-        return;
-        }
-
-    wxString str;
-    wxString id,v;
-    wxStringTokenizer tok;
-    wxString *varname;
-
-
-    long n;
-
-//Read through entire file
-    for ( str = r.GetFirstLine(); !r.Eof(); str = r.GetNextLine() )
-    {
-    if (str.Find(_T("#define"))!=wxNOT_FOUND)
-        {
-        tok.SetString(str);
-        //Just ignore #define token
-        tok.GetNextToken();
-        v=tok.GetNextToken();
-        id=tok.GetNextToken();
-        if (id.IsNumber())
-            {
-            varname=new wxString;
-            id.ToLong(&n);
-            *varname=v;
-            m_resourcelist->Append(n,varname);
-            }
-        }
-    }
-
-
-
-}
-
-
-wxString rc2xml::LookUpId(wxString id)
-{
-wxString st;
-
-if (!id.IsNumber())
-    return id;
-long n;
-id.ToLong(&n);
-wxNode *node=m_resourcelist->Find(n);
-    wxString *s;
-    if (node==NULL)
-        return id;
-
-    s=(wxString *)node->GetData();
-    st=*s;
-return st;
-}
diff --git a/contrib/utils/convertrc/rc2xml.h b/contrib/utils/convertrc/rc2xml.h
deleted file mode 100644
index e4d458059d..0000000000
--- a/contrib/utils/convertrc/rc2xml.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// rc2xml.h
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(RC2XML_H)
-#define RC2XML_H
-
-#include "wx/file.h"
-#include "wx/ffile.h"
-#include "wx/list.h"
-
-
-class rc2xml : public wxObject
-{
-public:
-    wxString m_workingpath;
-    wxString m_targetpath;
-    void WriteIcon(wxString iconname);
-    void ParseNormalMSControl();
-    bool Convert(wxString rcfile, wxString xmlfile);
-    rc2xml();
-    ~rc2xml();
-
-protected:
-    wxString LookUpId(wxString id);
-
-    void ParseResourceHeader();
-    void WriteBitmap(wxString bitmapname);
-    void ParseListCtrl(wxString label,wxString varname);
-    void ParseCalendar(wxString label,wxString varname);
-    void ParseTreeCtrl(wxString label,wxString varname);
-    void ParseScrollBar();
-    void ParseWeirdMSControl();
-    void ParseStaticBitmap(wxString label,wxString varname);
-    wxString CleanName(wxString name);
-    void ParseIcon(wxString varname);
-    wxList * m_iconlist;
-    void ParseIconStatic();
-    void ParseMenuItem();
-
-//Functions
-    bool SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp);
-    bool LookUpString(wxString strid,wxString & st);
-    void ParseStringTable(wxString varname);
-    void WriteToolButton(wxString name,int index,int width,int height,wxBitmap bitmap);
-    wxString LookupString(wxString varname,wxStringList id,wxStringList msg);
-    void ParseToolBar(wxString varname);
-    void SecondPass();
-    void FirstPass();
-    void ParseBitmap(wxString varname);
-    void ParseSpinCtrl(wxString label,wxString varname);
-    void ParseRichEdit(wxString label, wxString varname);
-    void ParseDialog(wxString dlgname);
-    void ParseControls();
-    void ParseListBox(wxString varname);
-    void ParseStaticText(wxString phrase,wxString varname);
-    void ParseTextCtrl(wxString varname);
-    void ParseRadioButton(wxString phrase,wxString varname);
-    void ParseCheckBox(wxString phrase,wxString varname);
-    void ParsePushButton(wxString phrase, wxString varname);
-    bool Separator(int ch);
-    void ParseGroupBox(wxString phrase, wxString varname);
-    bool ReadRect(int & x, int & y, int & width, int & height);
-    wxString GetToken(bool *listseparator = 0);
-    wxString GetQuoteField();
-    wxString GetStringQuote();
-    void ReadChar(int &ch);
-    void ParseComboBox(wxString varname);
-    void ParseMenu(wxString varname);
-    void ParsePopupMenu();
-    wxString PeekToken();
-    void ParseControlMS();
-    void ParseSlider(wxString label, wxString varname);
-    void ParseProgressBar(wxString label, wxString varname);
-    bool ReadOrs(wxString & w);
-    void ParseCtrlButton(wxString label, wxString varname);
-    void WriteStyle(wxString style);
-    void WriteBasicInfo(int x,int y,int width,int height,wxString name);
-    void WriteName(wxString name);
-    void WriteTitle(wxString title);
-    void WritePosition(int x,int y);
-    void WriteSize(int width,int height);
-    void WriteLabel(wxString label);
-//variables
-    wxList * m_stringtable;
-    wxList *m_bitmaplist;
-    wxList * m_resourcelist;
-    wxFile m_rc;
-    wxFFile m_xmlfile;
-    wxFileOffset m_filesize;
-    bool m_done;
-
-};
-
-
-#endif
diff --git a/contrib/utils/convertrc/wxconvert.rc b/contrib/utils/convertrc/wxconvert.rc
deleted file mode 100644
index b86c4e2265..0000000000
--- a/contrib/utils/convertrc/wxconvert.rc
+++ /dev/null
@@ -1 +0,0 @@
-#include "wx/msw/wx.rc"
diff --git a/contrib/utils/convertrc/wxr2xml.cpp b/contrib/utils/convertrc/wxr2xml.cpp
deleted file mode 100644
index cbef29444b..0000000000
--- a/contrib/utils/convertrc/wxr2xml.cpp
+++ /dev/null
@@ -1,832 +0,0 @@
-// wxr2xml.cpp: implementation of the wxr2xml class.
-// 8/30/00  Brian Gavin
-// only tested on wxMSW so far
-// License: wxWindows Liscense
-// ////////////////////////////////////////////////////////////////////
-
-/*
-How to use class:
-#include "wxr2xml.h"
-...
-wxr2xml trans;
-trans->Convert("Myfile.wxr","Myfile.xml");
-*/
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wxr2xml.h"
-
-// ////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-// ////////////////////////////////////////////////////////////////////
-
-wxr2xml::wxr2xml()
-{
-}
-
-wxr2xml::~wxr2xml()
-{
-}
-
-bool wxr2xml::Convert(wxString wxrfile, wxString xmlfile)
-{
-    bool result;
-    result = m_xmlfile.Open(xmlfile.c_str(), _T("w+t"));
-    wxASSERT_MSG(result, _T("Couldn't create XML file"));
-    if (!result)
-        return false;
-
-    result = m_table.ParseResourceFile(wxrfile);
-    wxASSERT_MSG(result, _T("Couldn't Load WXR file"));
-    if (!result)
-        return false;
-    // Write basic xml header
-    m_xmlfile.Write(_T("<?xml version=\"1.0\" ?>\n"));
-    m_xmlfile.Write(_T("<resource>\n"));
-    result = ParseResources();
-    m_xmlfile.Write(_T("</resource>\n"));
-
-    m_xmlfile.Close();
-
-    return result;
-}
-
-bool wxr2xml::ParseResources()
-{
-    m_table.BeginFind();
-    wxHashTable::Node *node;
-
-    node = m_table.Next();
-    while (node)
-        {
-        wxItemResource *res = (wxItemResource *) node->GetData();
-        wxString resType(res->GetType());
-        if (resType == _T("wxDialog"))
-            ParseDialog(res);
-        else if (resType == _T("wxPanel"))
-            ParsePanel(res);
-        else if (resType == _T("wxPanel"))
-            ParsePanel(res);
-        else if (resType == _T("wxMenu"))
-            ParseMenuBar(res);
-        else if (resType == _T("wxBitmap"))
-            ParseBitmap(res);
-        else
-            wxLogError(_T("Found unsupported resource ") + resType);
-        node = m_table.Next();
-    }
-    return true;
-}
-
-void wxr2xml::ParsePanel(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t<object class=\"wxPanel\""));
-    PanelStuff(res);
-    WriteControlInfo(res);
-    m_xmlfile.Write(_T("\n"));
-    ParseControls(res);
-    m_xmlfile.Write(_T("\t</object>\n\n"));
-}
-
-void wxr2xml::ParseDialog(wxItemResource * res)
-{
-    PanelStuff(res);
-    m_xmlfile.Write(_T("\t<object class=\"wxDialog\""));
-    WriteControlInfo(res);
-    m_xmlfile.Write(GetTitle(res));
-
-    m_xmlfile.Write(_T("\n"));
-    ParseControls(res);
-    m_xmlfile.Write(_T("\t</object>\n\n"));
-}
-
-void wxr2xml::ParseControls(wxItemResource * res)
-{
-    wxNode *node = res->GetChildren().GetFirst();
-    while (node)
-        {
-        wxItemResource *res = (wxItemResource *) node->GetData();
-        wxString resType(res->GetType());
-        if (resType == _T("wxButton"))
-            ParseButton(res);
-        else if ((resType == _T("wxTextCtrl")) | (resType == _T("wxText"))
-         | (resType == _T("wxMultiText")))
-            ParseTextCtrl(res);
-        else if (resType == _T("wxCheckBox"))
-            ParseCheckBox(res);
-        else if (resType == _T("wxRadioBox"))
-            ParseRadioBox(res);
-        else if (resType == _T("wxListBox"))
-            ParseListBox(res);
-        else if ((resType == _T("wxStaticText")) | (resType == _T("wxMessage")))
-            ParseStaticText(res);
-        else if (resType == _T("wxChoice"))
-            ParseChoice(res);
-        else if (resType == _T("wxGauge"))
-           ParseGauge(res);
-        else if (resType == _T("wxSlider"))
-            ParseSlider(res);
-        else if (resType == _T("wxComboBox"))
-            ParseComboBox(res);
-        else if (resType == _T("wxRadioButton"))
-            ParseRadioButton(res);
-        else if (resType == _T("wxStaticBitmap"))
-            ParseStaticBitmap(res);
-        else if (resType == _T("wxScrollBar"))
-            ParseScrollBar(res);
-        else if ((resType == _T("wxStaticBox")) | (resType == _T("wxGroupBox")))
-            ParseStaticBox(res);
-        else if (resType == _T("wxBitmapButton"))
-            ParseBitmapButton(res);
-        else
-            wxLogError(_T("Found unsupported resource ") + resType);
-        node = node->GetNext();
-        }
-}
-
-// Write out basic stuff every control has
-// name,position,size,bg,fg
-void wxr2xml::WriteControlInfo(wxItemResource * res)
-{
-    m_xmlfile.Write(GenerateName(res));
-    m_xmlfile.Write(_T(">\n"));
-    m_xmlfile.Write(GetPosition(res));
-    m_xmlfile.Write(GetSize(res));
-    m_xmlfile.Write(GetStyles(res));
-    WriteFontInfo(res);
-}
-
-wxString wxr2xml::GetSize(wxItemResource * res)
-{
-    wxString msg;
-    if (m_dlgunits)
-        msg << _T("\t\t\t\t<size>") << res->GetWidth() << _T(",") << res->GetHeight() << _T("d</size>\n");
-    else
-        msg << _T("\t\t\t\t<size>") << res->GetWidth() << _T(",") << res->GetHeight() << _T("</size>\n");
-    return msg;
-}
-
-wxString wxr2xml::GetPosition(wxItemResource * res)
-{
-    wxString msg;
-    if (m_dlgunits)
-        msg << _T("\t\t\t\t<pos>") << res->GetX() << _T(",") << res->GetY() << _T("d</pos>\n");
-    else
-        msg << _T("\t\t\t\t<pos>") << res->GetX() << _T(",") << res->GetY() << _T("</pos>\n");
-    return msg;
-}
-
-void wxr2xml::ParseButton(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxButton\""));
-    WriteControlInfo(res);
-    m_xmlfile.Write(GetLabel(res));
-    m_xmlfile.Write(_T("\t\t\t</object>\n"));
-}
-
-void wxr2xml::ParseTextCtrl(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxTextCtrl\""));
-    WriteControlInfo(res);
-    m_xmlfile.Write(GetValue4(res));
-    m_xmlfile.Write(_T("\t\t\t</object>\n"));
-
-}
-
-wxString wxr2xml::GetTitle(wxItemResource * res)
-{
-    wxString msg;
-    msg = _T("\t\t\t\t<title>") + res->GetTitle() + _T("</title>");
-    return msg;
-}
-
-wxString wxr2xml::GetValue4(wxItemResource * res)
-{
-    wxString msg;
-    msg = _T("\t\t\t\t<value>") + res->GetValue4() + _T("</value>\n");
-    return msg;
-}
-
-void wxr2xml::ParseCheckBox(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxCheckBox\""));
-    WriteControlInfo(res);
-    m_xmlfile.Write(GetLabel(res));
-    m_xmlfile.Write(GetCheckStatus(res));
-    m_xmlfile.Write(_T("\t\t\t</object>\n"));
-}
-
-wxString wxr2xml::GetLabel(wxItemResource * res)
-{
-    return _T("\t\t\t\t<label>") + res->GetTitle() + _T("</label>\n");
-}
-
-void wxr2xml::ParseRadioBox(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxRadioBox\""));
-    WriteControlInfo(res);
-    m_xmlfile.Write(GetLabel(res));
-    // Add radio box items
-    WriteStringList(res);
-    // Value1
-    m_xmlfile.Write(GetDimension(res));
-    m_xmlfile.Write(_T("\t\t\t</object>\n"));
-}
-
-void wxr2xml::ParseListBox(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxListBox\""));
-    WriteControlInfo(res);
-    WriteStringList(res);
-    m_xmlfile.Write(_T("\t\t\t</object>\n"));
-}
-
-void wxr2xml::ParseStaticText(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxStaticText\""));
-    WriteControlInfo(res);
-    m_xmlfile.Write(GetLabel(res));
-    m_xmlfile.Write(_T("\t\t\t</object>\n"));
-}
-
-void wxr2xml::ParseStaticBox(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxStaticBox\""));
-    WriteControlInfo(res);
-    m_xmlfile.Write(GetLabel(res));
-    m_xmlfile.Write(_T("\t\t\t</object>\n"));
-}
-
-void wxr2xml::WriteStringList(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t\t<content>\n"));
-    for (wxStringListNode * node = res->GetStringValues().GetFirst();
-        node;node = node->GetNext()) {
-        const wxString s1 = node->GetData();
-        m_xmlfile.Write(_T("\t\t\t\t\t<item>") + s1 + _T("</item>\n"));
-    }
-    m_xmlfile.Write(_T("\t\t\t\t</content>\n"));
-}
-
-void wxr2xml::ParseChoice(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxChoice\""));
-    WriteControlInfo(res);
-    // Add choice items
-    WriteStringList(res);
-    m_xmlfile.Write(_T("\t\t\t</object>\n"));
-}
-
-void wxr2xml::ParseGauge(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxGauge\""));
-    WriteControlInfo(res);
-    m_xmlfile.Write(GetValue1(res));
-    m_xmlfile.Write(GetRange(res));
-    m_xmlfile.Write(_T("\n\t\t\t</object>\n"));
-}
-
-wxString wxr2xml::GetValue1(wxItemResource * res)
-{
-    wxString msg;
-    msg << _T("\t\t\t\t<value>") << res->GetValue1() << _T("</value>\n");
-    return msg;
-}
-
-wxString wxr2xml::GetRange(wxItemResource * res)
-{
-    wxString msg;
-    msg << _T("\t\t\t\t<range>") << res->GetValue2() << _T("</range>");
-    return msg;
-}
-
-void wxr2xml::ParseSlider(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxSlider\""));
-    WriteControlInfo(res);
-    m_xmlfile.Write(GetValue1(res));
-    m_xmlfile.Write(GetMax(res));
-    m_xmlfile.Write(GetMin(res));
-    m_xmlfile.Write(_T("\n\t\t\t</object>\n"));
-}
-
-wxString wxr2xml::GetMax(wxItemResource * res)
-{
-    wxString msg;
-    msg << _T("\t\t\t\t<max>") << res->GetValue3() << _T("</max>\n");
-    return msg;
-}
-
-wxString wxr2xml::GetMin(wxItemResource * res)
-{
-    wxString msg;
-    msg << _T("\t\t\t\t<min>") << res->GetValue2() << _T("</min>");
-    return msg;
-}
-
-void wxr2xml::ParseComboBox(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxComboBox\""));
-    WriteControlInfo(res);
-    // Add combo items
-    WriteStringList(res);
-    m_xmlfile.Write(_T("\n\t\t\t</object>\n"));
-}
-
-void wxr2xml::ParseRadioButton(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxRadioButton\""));
-    WriteControlInfo(res);
-    m_xmlfile.Write(GetLabel(res));
-
-    wxString msg;
-    m_xmlfile.Write(GetValue1(res));
-    m_xmlfile.Write(GetCheckStatus(res));
-    m_xmlfile.Write(_T("\t\t\t</object>\n"));
-}
-
-void wxr2xml::ParseScrollBar(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxScrollBar\""));
-    WriteControlInfo(res);
-    m_xmlfile.Write(GetValue1(res));
-    m_xmlfile.Write(_T("\t\t\t\t<thumbsize>")+GetValue2(res)+_T("</thumbsize>\n"));
-    m_xmlfile.Write(_T("\t\t\t\t<range>")+GetValue3(res)+_T("</range>\n"));
-    m_xmlfile.Write(_T("\t\t\t\t<pagesize>")+GetValue5(res)+_T("</pagesize>\n"));
-    m_xmlfile.Write(_T("\t\t\t</object>\n"));
-}
-
-wxString wxr2xml::GetCheckStatus(wxItemResource * res)
-{
-    wxString msg;
-    msg << _T("\t\t\t\t<checked>") << res->GetValue1() << _T("</checked>\n");
-    return msg;
-}
-
-wxString wxr2xml::GetStyles(wxItemResource * res)
-{
-    // Very crude way to get styles
-    long style;
-    wxString s, restype;
-    restype = res->GetType();
-    style = res->GetStyle();
-
-    s = _T("\t\t\t\t<style>");
-
-    // Common styles for all controls
-    if (style & wxSIMPLE_BORDER)
-        s += _T("wxSIMPLE_BORDER|");
-    if (style & wxSUNKEN_BORDER)
-        s += _T("wxSUNKEN_BORDER|");
-    if (style & wxSIMPLE_BORDER)
-        s += _T("wxSIMPLE_BORDER|");
-    if (style & wxDOUBLE_BORDER)
-        s += _T("wxDOUBLE_BORDER|");
-    if (style & wxRAISED_BORDER)
-        s += _T("wxRAISED_BORDER|");
-    if (style & wxTRANSPARENT_WINDOW)
-        s += _T("wxTRANSPARENT_WINDOW|");
-    if (style & wxWANTS_CHARS)
-        s += _T("wxWANTS_CHARS|");
-    if (style & wxNO_FULL_REPAINT_ON_RESIZE)
-        s += _T("wxNO_FULL_REPAINT_ON_RESIZE|");
-
-    if (restype == _T("wxDialog"))
-        {
-        if (style & wxDEFAULT_DIALOG_STYLE)
-            s += _T("wxDEFAULT_DIALOG_STYLE|");
-#if WXWIN_COMPATIBILITY_2_6
-        if (style & wxDIALOG_MODAL)
-            s += _T("wxDIALOG_MODAL|");
-        if (style & wxDIALOG_MODELESS)
-            s += _T("wxDIALOG_MODELESS|");
-        if (style & wxNO_3D)
-            s += _T("wxNO_3D|");
-#endif // WXWIN_COMPATIBILITY_2_6
-        if (style & wxTAB_TRAVERSAL)
-            s += _T("wxTAB_TRAVERSAL|");
-        if (style & wxWS_EX_VALIDATE_RECURSIVELY)
-            s += _T("wxWS_EX_VALIDATE_RECURSIVELY|");
-        if (style & wxSTAY_ON_TOP)
-            s += _T("wxSTAY_ON_TOP|");
-        if (style & wxCAPTION)
-            s += _T("wxCAPTION|");
-        if (style & wxRESIZE_BORDER)
-            s += _T("wxRESIZE_BORDER|");
-#if WXWIN_COMPATIBILITY_2_6
-        if (style & wxRESIZE_BOX)
-            s += _T("wxRESIZE_BOX|");
-#endif // WXWIN_COMPATIBILITY_2_6
-        if (style & wxRESIZE_BORDER)
-            s += _T("wxRESIZE_BORDER|");
-        if (style & wxSYSTEM_MENU)
-            s += _T("wxSYSTEM_MENU|");
-        if (style & wxCLIP_CHILDREN)
-            s += _T("wxCLIP_CHILDREN|");
-        }
-
-    if (restype == _T("wxPanel"))
-        {
-        if (style & wxCLIP_CHILDREN)
-            s += _T("wxCLIP_CHILDREN|");
-#if WXWIN_COMPATIBILITY_2_6
-        if (style & wxNO_3D)
-            s += _T("wxNO_3D|");
-#endif // WXWIN_COMPATIBILITY_2_6
-        if (style & wxTAB_TRAVERSAL)
-            s += _T("wxTAB_TRAVERSAL|");
-        if (style & wxWS_EX_VALIDATE_RECURSIVELY)
-            s += _T("wxWS_EX_VALIDATE_RECURSIVELY|");
-        }
-
-    if (restype == _T("wxComboBox"))
-        {
-        if (style & wxCB_SORT)
-            s += _T("wxCB_SORT|");
-        if (style & wxCB_SIMPLE)
-            s += _T("wxCB_SIMPLE|");
-        if (style & wxCB_READONLY)
-            s += _T("wxCB_READONLY|");
-        if (style & wxCB_DROPDOWN)
-            s += _T("wxCB_DROPDOWN|");
-        }
-
-    if (restype == _T("wxGauge"))
-        {
-        if (style & wxGA_HORIZONTAL)
-            s += _T("wxGA_HORIZONTAL|");
-        if (style & wxGA_VERTICAL)
-            s += _T("wxGA_VERTICAL|");
-    // windows only
-        if (style & wxGA_SMOOTH)
-            s += _T("wxGA_SMOOTH|");
-        }
-
-    if (restype == _T("wxRadioButton"))
-        {
-        if (style & wxRB_GROUP)
-        s += _T("wxRB_GROUP|");
-        }
-
-    if (restype == _T("wxStaticText"))
-        {
-        if (style & wxST_NO_AUTORESIZE)
-            s += _T("wxST_NO_AUTORESIZEL|");
-        }
-
-    if (restype == _T("wxRadioBox"))
-        {
-        if (style & wxRA_HORIZONTAL)
-            s += _T("wxRA_HORIZONTAL|");
-        if (style & wxRA_SPECIFY_COLS)
-            s += _T("wxRA_SPECIFY_COLS|");
-        if (style & wxRA_SPECIFY_ROWS)
-            s += _T("wxRA_SPECIFY_ROWS|");
-        if (style & wxRA_VERTICAL)
-            s += _T("wxRA_VERTICAL|");
-        }
-
-    if (restype == _T("wxListBox"))
-        {
-        if (style & wxLB_SINGLE)
-            s += _T("wxLB_SINGLE|");
-        if (style & wxLB_MULTIPLE)
-            s += _T("wxLB_MULTIPLE|");
-        if (style & wxLB_EXTENDED)
-            s += _T("wxLB_EXTENDED|");
-        if (style & wxLB_HSCROLL)
-            s += _T("wxLB_HSCROLL|");
-        if (style & wxLB_ALWAYS_SB)
-            s += _T("wxLB_ALWAYS_SB|");
-        if (style & wxLB_NEEDED_SB)
-            s += _T("wxLB_NEEDED_SB|");
-        if (style & wxLB_SORT)
-        s += _T("wxLB_SORT|");
-        }
-
-    if (restype == _T("wxTextCtrl"))
-        {
-        if (style & wxTE_PROCESS_ENTER)
-            s += _T("wxTE_PROCESS_ENTER|");
-        if (style & wxTE_PROCESS_TAB)
-            s += _T("wxTE_PROCESS_TAB|");
-        if (style & wxTE_MULTILINE)
-            s += _T("wxTE_MULTILINE|");
-        if (style & wxTE_PASSWORD)
-            s += _T("wxTE_PASSWORD|");
-        if (style & wxTE_READONLY)
-            s += _T("wxTE_READONLY|");
-        if (style & wxHSCROLL)
-            s += _T("wxHSCROLL|");
-        }
-
-
-    if (restype == _T("wxScrollBar"))
-        {
-        if (style & wxSB_HORIZONTAL)
-            s += _T("wxSB_HORIZONTAL|");
-        if (style & wxSB_VERTICAL)
-            s += _T("wxSB_VERTICAL|");
-        }
-
-    int l = s.length();
-    // No styles defined
-    if (l == 11)
-        return wxEmptyString;
-    // Trim off last |
-    s = s.Truncate(l - 1);
-
-    s += _T("</style>\n");
-    return s;
-}
-
-wxString wxr2xml::GetDimension(wxItemResource * res)
-{
-    wxString msg;
-    msg << _T("\t\t\t\t<dimension>") << res->GetValue1() << _T("</dimension>\n");
-    return msg;
-}
-
-wxString wxr2xml::GenerateName(wxItemResource * res)
-{
-    wxString name;
-    name = _T(" name=\"");
-    switch (res->GetId()) {
-    case wxID_OK:
-        name += _T("wxID_OK");
-    break;
-    case wxID_CANCEL:
-        name += _T("wxID_CANCEL");
-    break;
-    default:
-        name += res->GetName();
-    }
-
-    name += _T("\"");
-    return name;
-}
-
-void wxr2xml::ParseMenuBar(wxItemResource * res)
-{
-    wxItemResource *child;
-    wxNode *node = res->GetChildren().GetFirst();
-    // Get Menu Bar Name
-    m_xmlfile.Write(_T("\t<object class=\"wxMenuBar\" "));
-    m_xmlfile.Write(GenerateName(res));
-    m_xmlfile.Write(_T(">\n"));
-    while (node) {
-        child = (wxItemResource *) node->GetData();
-        ParseMenu(child);
-        node = node->GetNext();
-    }
-
-    m_xmlfile.Write(_T("\t</object> \n\n"));
-}
-
-void wxr2xml::ParseMenu(wxItemResource * res)
-{
-    wxItemResource *child;
-    wxNode *node = res->GetChildren().GetFirst();
-    // Get Menu
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxMenu\" "));
-    wxString menuname;
-    menuname << _T("name = \"menu_") << res->GetValue1() << _T("\"");
-    m_xmlfile.Write(menuname);
-    m_xmlfile.Write(_T(">\n"));
-    m_xmlfile.Write(_T("\t\t\t\t<label>")
-        + FixMenuString(res->GetTitle()) + _T("</label>\n"));
-    if (!res->GetValue4().empty())
-        m_xmlfile.Write(_T("\t\t\t\t<help>") + res->GetValue4() +
-        _T("</help>\n"));
-    // Read in menu items and additional menus
-    while (node) {
-        child = (wxItemResource *) node->GetData();
-        if (!child->GetChildren().GetFirst())
-            ParseMenuItem(child);
-        else
-            ParseMenu(child);
-            node = node->GetNext();
-    }
-    m_xmlfile.Write(_T("\t\t\t</object> \n"));
-}
-
-void wxr2xml::ParseMenuItem(wxItemResource * res)
-{
-    // Get Menu Item or Separator
-    if (res->GetTitle().empty()) {
-        m_xmlfile.Write(_T("\t\t\t<object class=\"separator\"/>\n"));
-    } else {
-        m_xmlfile.Write(_T("\t\t\t\t<object class=\"wxMenuItem\" "));
-        wxString menuname;
-        menuname << _T("name = \"menuitem_") << res->GetValue1() << _T("\"");
-        m_xmlfile.Write(menuname);
-        m_xmlfile.Write(_T(">\n"));
-            m_xmlfile.Write(_T("\t\t\t<label>")
-            + FixMenuString(res->GetTitle()) + _T("</label>\n"));
-        if (!res->GetValue4().empty())
-            m_xmlfile.Write(_T("\t\t\t<help>") +
-        res->GetValue4() + _T("</help>\n"));
-        if (res->GetValue2())
-            m_xmlfile.Write(_T("\t\t\t\t<checkable>1</checkable>\n"));
-        m_xmlfile.Write(_T("\t\t\t</object> \n"));
-    }
-}
-
-wxString wxr2xml::FixMenuString(wxString phrase)
-{
-    phrase.Replace(_T("&"), _T("$"));
-    return phrase;
-}
-
-void wxr2xml::ParseStaticBitmap(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxStaticBitmap\""));
-    WriteControlInfo(res);
-    // value4 holds bitmap name
-    wxString bitmapname;
-    bitmapname = res->GetValue4();
-    wxBitmap bitmap;
-    bitmap = wxResourceCreateBitmap(bitmapname, &m_table);
-    bitmapname += _T(".bmp");
-    bitmap.SaveFile(bitmapname, wxBITMAP_TYPE_BMP);
-    m_xmlfile.Write(_T("\n\t\t\t\t<bitmap>") + bitmapname + _T("</bitmap>"));
-    m_xmlfile.Write(_T("\t\t\t</object>\n"));
-    // bitmap5
-}
-//Parse a bitmap resource
-void wxr2xml::ParseBitmap(wxItemResource * res)
-{
-    m_xmlfile.Write(_T("\t<object class=\"wxBitmap\" "));
-    m_xmlfile.Write(GenerateName(res)+_T(">"));
-    wxString bitmapname;
-    bitmapname = res->GetName();
-    wxBitmap bitmap;
-    bitmap = wxResourceCreateBitmap(bitmapname, &m_table);
-    bitmapname += _T(".bmp");
-    bitmap.SaveFile(bitmapname, wxBITMAP_TYPE_BMP);
-    m_xmlfile.Write(bitmapname);
-    m_xmlfile.Write(_T("</object>\n\n"));
-}
-
-void wxr2xml::PanelStuff(wxItemResource * res)
-{
-    if ((res->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0)
-        m_dlgunits = true;
-    else
-        m_dlgunits = false;
-
-    // If this is true ignore fonts, background color and use system
-    // defaults instead
-    if ((res->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
-        m_systemdefaults = true;
-    else
-        m_systemdefaults = false;
-
-}
-
-wxString wxr2xml::GetValue2(wxItemResource *res)
-{
-    wxString msg;
-    msg << res->GetValue2();
-    return msg;
-}
-
-wxString wxr2xml::GetValue3(wxItemResource *res)
-{
-    wxString msg;
-    msg << res->GetValue3();
-    return msg;
-
-}
-
-wxString wxr2xml::GetValue5(wxItemResource *res)
-{
-    wxString msg;
-    msg << res->GetValue5();
-    return msg;
-
-}
-
-void wxr2xml::ParseBitmapButton(wxItemResource *res)
-{
-
-    m_xmlfile.Write(_T("\t\t\t<object class=\"wxBitmapButton\""));
-    WriteControlInfo(res);
-    // value4 holds bitmap name
-    wxString bitmapname;
-    bitmapname = res->GetValue4();
-    wxBitmap bitmap;
-    bitmap = wxResourceCreateBitmap(bitmapname, &m_table);
-    bitmapname += _T(".bmp");
-    bitmap.SaveFile(bitmapname, wxBITMAP_TYPE_BMP);
-    m_xmlfile.Write(_T("\t\t\t\t<bitmap>") + bitmapname + _T("</bitmap>\n"));
-
-    m_xmlfile.Write(_T("\t\t\t</object>\n"));
-}
-
-void wxr2xml::WriteFontInfo(wxItemResource *res)
-{
-//if systems_defaults true just ignore the fonts
-    if (m_systemdefaults)
-        return;
-    wxFont font;
-    font=res->GetFont();
-    if (!font.GetRefData())
-        return;
-
-    m_xmlfile.Write(_T("\t\t\t<font>\n"));
-    //Get font point size,font family,weight,font style,underline
-    int pt;
-    wxString msg;
-    pt=font.GetPointSize();
-    msg<<_T("\t\t\t\t<size>")<<pt<<_T("</size>\n");
-    m_xmlfile.Write(msg);
-    GetFontFace(font);
-    GetFontStyle(font);
-    GetFontWeight(font);
-
-    if (font.GetUnderlined())
-        m_xmlfile.Write(_T("\t\t\t\t<underlined>1</underlined>\n"));
-
-    m_xmlfile.Write(_T("\t\t\t</font>\n"));
-}
-
-//WARNING possible make here
-//I wasn't really sure the right way to do this.
-void wxr2xml::GetFontFace(wxFont font)
-{
-    int family=font.GetFamily();
-
-    switch (family)
-        {
-        case wxDEFAULT:
-            break;
-        case wxDECORATIVE:
-            m_xmlfile.Write(_T("\t\t\t\t<face>decorative</face>\n"));
-            break;
-        case wxROMAN:
-            m_xmlfile.Write(_T("\t\t\t\t<face>roman</face>\n"));
-            break;
-        case wxSCRIPT:
-            m_xmlfile.Write(_T("\t\t\t\t<face>script</face>\n"));
-            break;
-        case wxSWISS:
-            m_xmlfile.Write(_T("\t\t\t\t<face>swiss</face>\n"));
-            break;
-        case wxMODERN:
-            m_xmlfile.Write(_T("\t\t\t\t<face>modern</face>\n"));
-            break;
-        default:
-            wxLogError(_T("Unknown font face"));
-        }
-}
-
-void wxr2xml::GetFontStyle(wxFont font)
-{
-
-    int style=font.GetStyle();
-
-    switch (style)
-        {
-//since this is default no point in making file any larger
-        case wxNORMAL:
-            break;
-        case wxITALIC:
-            m_xmlfile.Write(_T("<style>italic</style>\n"));
-            break;
-        case wxSLANT:
-            m_xmlfile.Write(_T("<style>slant</style>\n"));
-            break;
-        default:
-            wxLogError(_T("Unknown font style"));
-        }
-}
-
-void wxr2xml::GetFontWeight(wxFont font)
-{
-    int weight=font.GetWeight();
-
-    switch (weight)
-        {
-//since this is default no point in making file any larger
-        case wxNORMAL:
-            break;
-        case wxLIGHT:
-            m_xmlfile.Write(_T("\t\t\t\t<weight>light</weight>\n"));
-            break;
-        case wxBOLD:
-            m_xmlfile.Write(_T("\t\t\t\t<weight>bold</weight>\n"));
-            break;
-        default:
-            wxLogError(_T("Unknown font weight"));
-        }
-}
diff --git a/contrib/utils/convertrc/wxr2xml.h b/contrib/utils/convertrc/wxr2xml.h
deleted file mode 100644
index a8df9ad27a..0000000000
--- a/contrib/utils/convertrc/wxr2xml.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// wxr2xml.h:
-// 8/30/00 Brian Gavin
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(WXR2XML_H)
-#define WXR2XML_H
-
-#include "wx/ffile.h"
-#include "wx/deprecated/setup.h"
-#include "wx/deprecated/resource.h"
-
-#if !wxUSE_WX_RESOURCES
-#error  "convertc requires wxUSE_WX_RESOURCES"
-#endif  // wxUSE_WX_RESOURCES
-
-class wxr2xml : public wxObject
-{
-public:
-    bool Convert(wxString wxrfile,wxString xmlfile);
-    wxr2xml();
-    virtual ~wxr2xml();
-
-protected:
-    void GetFontWeight(wxFont font);
-    void GetFontStyle(wxFont font);
-    void ParseBitmapButton(wxItemResource *res);
-    void GetFontFace(wxFont font);
-    void WriteFontInfo(wxItemResource *res);
-    wxString GetValue2(wxItemResource *res);
-    wxString GetValue3(wxItemResource *res);
-    wxString GetValue5(wxItemResource *res);
-    void PanelStuff(wxItemResource *res);
-    bool m_systemdefaults;
-    bool m_dlgunits;
-    void ParseBitmap(wxItemResource *res);
-    void ParseStaticBitmap(wxItemResource *res);
-    wxString FixMenuString(wxString phrase);
-    void ParseMenuItem(wxItemResource *res);
-    void ParseMenu(wxItemResource *res);
-    void ParseMenuBar(wxItemResource *res);
-    wxString GenerateName(wxItemResource *res);
-    wxString GetStyles(wxItemResource *res);
-    wxString GetDimension(wxItemResource *res);
-    void ParsePanel(wxItemResource *res);
-    void ParseRadioButton(wxItemResource *res);
-    wxString GetMin(wxItemResource *res);
-    wxString GetCheckStatus(wxItemResource *res);
-    void ParseScrollBar(wxItemResource *res);
-    void ParseComboBox(wxItemResource * res);
-    wxString GetMax(wxItemResource *res);
-    void ParseSlider(wxItemResource *res);
-    wxString GetValue1(wxItemResource *res);
-    wxString GetRange(wxItemResource *res);
-    void ParseGauge(wxItemResource *res);
-    void ParseChoice(wxItemResource *res);
-    void WriteStringList(wxItemResource *res);
-    void ParseStaticBox(wxItemResource *res);
-    void ParseRadioBox(wxItemResource *res);
-    wxString GetLabel(wxItemResource *res);
-    void ParseCheckBox(wxItemResource *res);
-    wxString GetValue4(wxItemResource *res);
-    wxString GetTitle(wxItemResource *res);
-    void ParseTextCtrl(wxItemResource *res);
-    void ParseButton(wxItemResource *res);
-    wxString GetPosition(wxItemResource *res);
-    void WriteControlInfo(wxItemResource *res);
-    void ParseStaticText(wxItemResource *res);
-    void ParseListBox(wxItemResource *res);
-    wxString GetSize(wxItemResource *res);
-    void ParseControls(wxItemResource *res);
-    void ParseDialog(wxItemResource *res);
-    bool ParseResources();
-    //Variables
-    wxResourceTable m_table;
-    wxFFile m_xmlfile;
-};
-
-#endif