diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index 186ab0844..1890a5f7e 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -1703,18 +1703,31 @@
   <define name="wxOVERRIDE" value="override"/>
   <define name="wxEXPLICIT" value="explicit"/>
   <define name="WXSIZEOF(array)" value="(sizeof(array)/sizeof(array[0]))"/>
-  <define name="DECLARE_EVENT_TABLE()" value="wxDECLARE_EVENT_TABLE()"/>
+  <define name="wxEVT_NULL" value="wxEventType"/>
+  <define name="EVT_MENU(id,func)" value=""/>
+  <define name="EVT_BUTTON(id,func)" value=""/>
+  <define name="EVT_TOGGLEBUTTON(id,func)" value=""/>
+  <define name="EVT_CHECKBOX(id,func)" value=""/>
+  <define name="EVT_TIMER(id,func)" value=""/>
+  <define name="EVT_PG_CHANGED(id,func)" value=""/>
+  <define name="EVT_NOTEBOOK_PAGE_CHANGED(id,func)" value=""/>
+  <define name="EVT_PG_CHANGING(id,func)" value=""/>
+  <define name="EVT_SIZE(func)" value=""/>
+  <define name="EVT_SET_FOCUS(func)" value=""/>
+  <define name="EVT_KILL_FOCUS(func)" value=""/>
+  <define name="DECLARE_EVENT_TABLE()" value=""/>
   <define name="wxNO_LEN" value="((size_t)-1)"/>
-  <define name="wxDECLARE_EVENT_TABLE()" value="private: static const wxEventTableEntry sm_eventTableEntries[]; protected: const wxEventTable* GetEventTable() const; wxEventHashTable&amp; GetEventHashTable() const; static const wxEventTable sm_eventTable; static wxEventHashTable sm_eventHashTable;"/>
-  <define name="wxIMPLEMENT_APP(appname)" value="wxIMPLEMENT_WX_THEME_SUPPORT wxIMPLEMENT_APP_NO_THEMES(appname)"/>
+  <define name="wxDECLARE_EVENT_TABLE()" value=""/>
+  <define name="wxIMPLEMENT_APP(appname)" value=""/>
   <define name="wxIMPLEMENT_WX_THEME_SUPPORT" value=""/>
-  <define name="wxIMPLEMENT_APP_NO_THEMES(appname)" value="wxIMPLEMENT_APP_WXWIN_MAIN wxIMPLEMENT_APP_NO_MAIN(appname)"/>
-  <define name="wxIMPLEMENT_APP_WXWIN_MAIN" value="int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, wxCmdLineArgType WXUNUSED(lpCmdLine), int nCmdShow) { wxDISABLE_DEBUG_SUPPORT(); return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow);} wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD"/>
+  <define name="wxIMPLEMENT_APP_NO_THEMES(appname)" value=""/>
+  <define name="wxIMPLEMENT_APP_WXWIN_MAIN" value=""/>
   <define name="wxDISABLE_DEBUG_SUPPORT" value=""/>
   <define name="wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD" value=""/>
   <define name="wxIMPLEMENT_APP_NO_MAIN(appname)" value=""/>
   <!-- Override macros which don't necessarily require semicolons at the end -->
   <define name="WXUNUSED(n)" value=""/>
+  <define name="wxDECLARE_APP(MyApp)" value="extern appname&amp; wxGetApp()"/>
   <define name="DECLARE_CLASS(n)" value=""/>
   <define name="DECLARE_DYNAMIC_CLASS(n)" value=""/>
   <define name="DECLARE_ABSTRACT_CLASS(n)" value=""/>
@@ -1894,6 +1907,32 @@
   <define name="wxID_FILECTRL" value="5950"/>
   <define name="wxID_HIGHEST" value="5999"/>
   <!-- End of standard button and menu IDs -->
+  <define name="wxNB_HITTEST_NOWHERE" value="1"/>
+  <define name="wxNB_HITTEST_ONICON" value="2"/>
+  <define name="wxNB_HITTEST_ONLABEL" value="3"/>
+  <define name="wxNB_HITTEST_ONITEM" value="4"/>
+  <define name="wxNB_HITTEST_ONPAGE" value="5"/>
+  <define name="wxNB_DEFAULT" value="0"/>
+  <define name="wxNB_TOP" value="0x10"/>
+  <define name="wxNB_BOTTOM" value="0x20"/>
+  <define name="wxNB_LEFT" value="0x40"/>
+  <define name="wxNB_RIGHT" value="0x80"/>
+  <define name="wxNB_FIXEDWIDTH" value="0x100"/>
+  <define name="wxNB_MULTILINE" value="0x200"/>
+  <define name="wxNB_NOPAGETHEME" value="0x400"/>
+  <define name="wxBK_DEFAULT" value="0"/>
+  <define name="wxBK_TOP" value="0x10"/>
+  <define name="wxBK_BOTTOM" value="0x20"/>
+  <define name="wxBK_LEFT" value="0x40"/>
+  <define name="wxBK_RIGHT" value="0x80"/>
+  <define name="wxBK_ALIGN_MASK" value="0xF0"/>
+  <define name="wxBK_HITTEST_NOWHERE" value="1"/>
+  <define name="wxBK_HITTEST_ONICON" value="2"/>
+  <define name="wxBK_HITTEST_ONLABEL" value="3"/>
+  <define name="wxBK_HITTEST_ONITEM" value="4"/>
+  <define name="wxBK_HITTEST_ONPAGE" value="5"/>
+  <define name="wxPG_DEFAULT_STYLE" value="0"/>
+  <define name="wxPGMAN_DEFAULT_STYLE" value="0"/>
   <define name="wxKEY_NONE" value="0"/>
   <define name="wxKEY_INTEGER" value="1"/>
   <define name="wxKEY_STRING" value="2"/>