diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index d024085981f..383cbcdd979 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -136,7 +136,6 @@
   <define name="EVT_SYS_COLOUR_CHANGED(func)" value=""/>
   <define name="EVT_HTML_CELL_HOVER(id,func)" value=""/>
   <define name="EVT_HTML_LINK_CLICKED(id,func)" value=""/>
-  <define name="EVT_MENU(id,func)" value=""/>
   <define name="EVT_BUTTON(id,func)" value=""/>
   <define name="EVT_UPDATE_UI(id,func)" value=""/>
   <define name="EVT_UPDATE_UI_RANGE(id1,id2,func)" value=""/>
@@ -205,7 +204,6 @@
   <define name="EVT_LISTBOX_DCLICK(id,func)" value=""/>
   <define name="EVT_COMMAND(id,event,func)" value=""/>
   <define name="EVT_COMMAND_RANGE(id1,id2,event,func)" value=""/>
-  <define name="EVT_COMMAND_SCROLL(id,func)" value=""/>
   <define name="EVT_TOOL_ENTER(id,func)" value=""/>
   <define name="EVT_TOOL_DROPDOWN(id,func)" value=""/>
   <define name="EVT_COMMAND_LEFT_CLICK(id,func)" value=""/>
@@ -256,7 +254,6 @@
   <define name="EVT_NOTIFY(event,id,func)" value=""/>
   <define name="EVT_CUSTOM_RANGE(event,id1,id2, func)" value=""/>
   <define name="EVT_NOTIFY_RANGE(event,id1,id2, func)" value=""/>
-  <define name="EVT_UPDATE_UI(id,func)" value=""/>
   <define name="EVT_CHOICE(id,func)" value=""/>
   <define name="EVT_PG_SELECTED(id,func)" value=""/>
   <define name="EVT_PG_CHANGING(id,func)" value=""/>
@@ -284,7 +281,6 @@
   <define name="EVT_GRID_CMD_SELECT_CELL(id,func)" value=""/>
   <define name="EVT_GRID_CMD_EDITOR_HIDDEN(id,func)" value=""/>
   <define name="EVT_GRID_CMD_EDITOR_SHOWN(id,func)" value=""/>
-  <define name="EVT_COLOURPICKER_CHANGED(id,func)" value=""/>
   <define name="EVT_COLOURPICKER_CURRENT_CHANGED(id,func)" value=""/>
   <define name="EVT_COLOURPICKER_DIALOG_CANCELLED(id,func)" value=""/>
   <define name="EVT_COLLAPSIBLEHEADER_CHANGED(id,func)" value=""/>
@@ -348,13 +344,11 @@
   <define name="EVT_RIGHT_DOWN(func)" value=""/>
   <define name="EVT_MOTION(func)" value=""/>
   <define name="EVT_MIDDLE_UP(func)" value=""/>
-  <define name="EVT_MOUSEWHEEL(func)" value=""/>
   <define name="EVT_MOUSE_CAPTURE_LOST(func)" value=""/>
   <define name="EVT_RIGHT_UP(func)" value=""/>
   <define name="EVT_KEY_DOWN(func)" value=""/>
   <define name="EVT_KEY_UP(func)" value=""/>
   <define name="EVT_LEFT_DCLICK(func)" value=""/>
-  <define name="EVT_MOTION(func)" value=""/>
   <define name="EVT_ENTER_WINDOW(func)" value=""/>
   <define name="EVT_LEAVE_WINDOW(func)" value=""/>
   <define name="EVT_MOUSEWHEEL(func)" value=""/>
@@ -398,7 +392,6 @@
   <define name="EVT_KILL_FOCUS(func)" value=""/>
   <define name="EVT_MOUSE_CAPTURE_CHANGED(func)" value=""/>
   <define name="EVT_PALETTE_CHANGED(func)" value=""/>
-  <define name="EVT_MOUSE_EVENTS(func)" value=""/>
   <define name="EVT_MIDDLE_DOWN(func)" value=""/>
   <define name="EVT_AUI_PANE_BUTTON(func)" value=""/>
   <define name="EVT_AUI_PANE_CLOSE(func)" value=""/>
@@ -579,10 +572,7 @@
   <define name="BEGIN_DECLARE_EVENT_TYPES()" value=""/>
   <define name="END_DECLARE_EVENT_TYPES()" value=""/>
   <define name="DECLARE_EXPORTED_EVENT_TYPE(expdecl, name, value)" value=""/>
-  <define name="DECLARE_EVENT_TYPE(name, value)" value=""/>
-  <define name="DECLARE_LOCAL_EVENT_TYPE(name, value)" value=""/>
   <define name="DEFINE_EVENT_TYPE(name)" value="const wxEventType name = wxNewEventType();"/>
-  <define name="DEFINE_LOCAL_EVENT_TYPE(name)" value=""/>
   <define name="WX_DECLARE_STRING_HASH_MAP(name, value)" value=""/>
   <define name="DECLARE_LOCAL_EVENT_TYPE(name, value)" value=""/>
   <define name="DEFINE_LOCAL_EVENT_TYPE(name)" value=""/>
@@ -613,7 +603,6 @@
   <define name="wxDEFINE_EVENT_ALIAS( name, type, value )" value=""/>
   <define name="wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type )" value=""/>
   <define name="wxEND_EVENT_TABLE()" value=""/>
-  <define name="wxDECLARE_EVENT_TABLE_TERMINATOR()" value=""/>
   <!-- http://docs.wxwidgets.org/trunk/group__group__funcmacro__debug.html -->
   <!-- #define wxASSERT(condition) -->
   <define name="wxASSERT(condition)" value="assert(condition)"/>
@@ -676,32 +665,6 @@
   <define name="wxTextFileType_Os2" value="4"/>
   <define name="wxTextEntryDialogStyle" value="(wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)"/>
   <define name="wxWS_EX_VALIDATE_RECURSIVELY" value="1"/>
-  <define name="wxIMAGE_OPTION_BMP_FORMAT" value="wxString(&quot;wxBMP_FORMAT&quot;)"/>
-  <define name="wxIMAGE_OPTION_CUR_HOTSPOT_X" value="wxString(&quot;HotSpotX&quot;)"/>
-  <define name="wxIMAGE_OPTION_CUR_HOTSPOT_Y" value="wxString(&quot;HotSpotY&quot;)"/>
-  <define name="wxIMAGE_OPTION_FILENAME" value="wxString(&quot;FileName&quot;)"/>
-  <define name="wxIMAGE_OPTION_GIF_COMMENT" value="wxString(&quot;GifComment&quot;)"/>
-  <define name="wxIMAGE_OPTION_MAX_HEIGHT" value="wxString(&quot;MaxHeight&quot;)"/>
-  <define name="wxIMAGE_OPTION_MAX_WIDTH" value="wxString(&quot;MaxWidth&quot;)"/>
-  <define name="wxIMAGE_OPTION_ORIGINAL_HEIGHT" value="wxString(&quot;OriginalHeight&quot;)"/>
-  <define name="wxIMAGE_OPTION_ORIGINAL_WIDTH" value="wxString(&quot;OriginalWidth&quot;)"/>
-  <define name="wxIMAGE_OPTION_PNG_BITDEPTH" value="wxString(&quot;PngBitDepth&quot;)"/>
-  <define name="wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE" value="wxString(&quot;PngZB&quot;)"/>
-  <define name="wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL" value="wxString(&quot;PngZL&quot;)"/>
-  <define name="wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL" value="wxString(&quot;PngZM&quot;)"/>
-  <define name="wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY" value="wxString(&quot;PngZS&quot;)"/>
-  <define name="wxIMAGE_OPTION_PNG_FILTER" value="wxString(&quot;PngF&quot;)"/>
-  <define name="wxIMAGE_OPTION_PNG_FORMAT" value="wxString(&quot;PngFormat&quot;)"/>
-  <define name="wxIMAGE_OPTION_QUALITY" value="wxString(&quot;quality&quot;)"/>
-  <define name="wxIMAGE_OPTION_RESOLUTION" value="wxString(&quot;Resolution&quot;)"/>
-  <define name="wxIMAGE_OPTION_RESOLUTIONUNIT" value="wxString(&quot;ResolutionUnit&quot;)"/>
-  <define name="wxIMAGE_OPTION_RESOLUTIONX" value="wxString(&quot;ResolutionX&quot;)"/>
-  <define name="wxIMAGE_OPTION_RESOLUTIONY" value="wxString(&quot;ResolutionY&quot;)"/>
-  <define name="wxIMAGE_OPTION_TIFF_BITSPERSAMPLE" value="wxString(&quot;BitsPerSample&quot;)"/>
-  <define name="wxIMAGE_OPTION_TIFF_COMPRESSION" value="wxString(&quot;Compression&quot;)"/>
-  <define name="wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR" value="wxString(&quot;ImageDescriptor&quot;)"/>
-  <define name="wxIMAGE_OPTION_TIFF_PHOTOMETRIC" value="wxString(&quot;Photometric&quot;)"/>
-  <define name="wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL" value="wxString(&quot;SamplesPerPixel&quot;)"/>
   <define name="wxUPDATE_UI_PROCESS_ALL" value="0"/>
   <define name="wxUPDATE_UI_PROCESS_SPECIFIED" value="1"/>
   <define name="wxMOUSE_WHEEL_VERTICAL" value="0"/>
@@ -780,13 +743,6 @@
   <define name="wxDV_VERT_RULES" value="0x0008"/>
   <define name="wxDV_ROW_LINES" value="0x0010"/>
   <define name="wxDV_VARIABLE_LINE_HEIGHT" value="0x0020"/>
-  <define name="wxDATAVIEW_CELL_INERT" value="0"/>
-  <define name="wxDATAVIEW_CELL_ACTIVATABLE" value="1"/>
-  <define name="wxDATAVIEW_CELL_EDITABLE" value="2"/>
-  <define name="wxDATAVIEW_CELL_SELECTED" value="1"/>
-  <define name="wxDATAVIEW_CELL_PRELIT" value="2"/>
-  <define name="wxDATAVIEW_CELL_INSENSITIVE" value="4"/>
-  <define name="wxDATAVIEW_CELL_FOCUSED" value="8"/>
   <define name="wxDATAVIEW_COL_RESIZABLE" value="1"/>
   <define name="wxDATAVIEW_COL_SORTABLE" value="2"/>
   <define name="wxDATAVIEW_COL_REORDERABLE" value="4"/>
@@ -1062,10 +1018,6 @@
   <define name="wxCHK_2STATE" value="0x4000"/>
   <define name="wxCHK_3STATE" value="0x1000"/>
   <define name="wxCHK_ALLOW_3RD_STATE_FOR_USER" value="0x2000"/>
-  <define name="wxSYS_OEM_FIXED_FONT" value="10"/>
-  <define name="wxSYS_ANSI_FIXED_FONT" value="11"/>
-  <define name="wxSYS_ANSI_VAR_FONT" value="12"/>
-  <define name="wxSYS_SYSTEM_FONT" value="13"/>
   <define name="wxSYS_DEVICE_DEFAULT_FONT" value="14"/>
   <define name="wxSYS_DEFAULT_PALETTE" value="15"/>
   <define name="wxSYS_SYSTEM_FIXED_FONT" value="16"/>