X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d7ddd02649628327f8169cf2f4f9ee7b52f39c7..0ded6bb695f82a0b98d0862ec6870fc5c6cb8b97:/src/os2/wx23.def

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index 75703b92d7..e80efe2448 100644
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -14,7 +14,13 @@ EXPORTS
       wxOnAssert__FPCciT1
       ;wxAppBase::OnInitGui()
       OnInitGui__9wxAppBaseFv
+      ;wxAppBase::OnInitCmdLine(wxCmdLineParser&)
+      OnInitCmdLine__9wxAppBaseFR15wxCmdLineParser
+      ;wxAppBase::OnCmdLineParsed(wxCmdLineParser&)
+      OnCmdLineParsed__9wxAppBaseFR15wxCmdLineParser
       __vft9wxAppBase8wxObject
+      ;wxAppBase::OnCmdLineHelp(wxCmdLineParser&)
+      OnCmdLineHelp__9wxAppBaseFR15wxCmdLineParser
       ;wxTrap()
       wxTrap__Fv
       ;wxAppBase::OnAssert(const char*,int,const char*)
@@ -29,9 +35,10 @@ EXPORTS
       OnInit__9wxAppBaseFv
       ;wxAppBase::ProcessPendingEvents()
       ProcessPendingEvents__9wxAppBaseFv
+      ;wxAppBase::OnCmdLineError(wxCmdLineParser&)
+      OnCmdLineError__9wxAppBaseFR15wxCmdLineParser
       ;wxAppBase::SetActive(unsigned long,wxWindow*)
       SetActive__9wxAppBaseFUlP8wxWindow
-  ;From object file:  ..\common\bmpbase.cpp
   ;From object file:  ..\common\choiccmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxChoiceBase::SetStringSelection(const wxString&)
@@ -54,7 +61,109 @@ EXPORTS
       __vft17wxClipboardModule8wxObject
       ;wxConstructorForwxClipboardModule()
       wxConstructorForwxClipboardModule__Fv
+  ;From object file:  ..\common\clntdata.cpp
+    ;PUBDEFs (Symbols available from object file):
+      __vft21wxClientDataContainer
+      ;wxClientDataContainer::DoSetClientObject(wxClientData*)
+      DoSetClientObject__21wxClientDataContainerFP12wxClientData
+      ;wxClientDataContainer::DoGetClientObject() const
+      DoGetClientObject__21wxClientDataContainerCFv
+      ;wxClientDataContainer::DoGetClientData() const
+      DoGetClientData__21wxClientDataContainerCFv
+      ;wxClientDataContainer::~wxClientDataContainer()
+      __dt__21wxClientDataContainerFv
+      ;wxClientDataContainer::DoSetClientData(void*)
+      DoSetClientData__21wxClientDataContainerFPv
+      ;wxClientDataContainer::wxClientDataContainer()
+      __ct__21wxClientDataContainerFv
   ;From object file:  ..\common\cmdline.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxCmdLineParser::EnableLongOptions(unsigned long)
+      EnableLongOptions__15wxCmdLineParserFUl
+      ;wxArrayParams::Index(const wxCmdLineParam&,unsigned long) const
+      Index__13wxArrayParamsCFRC14wxCmdLineParamUl
+      ;wxCmdLineParser::Found(const wxString&,long*) const
+      Found__15wxCmdLineParserCFRC8wxStringPl
+      ;wxArrayParams::RemoveAt(unsigned int)
+      RemoveAt__13wxArrayParamsFUi
+      ;wxCmdLineParser::AddSwitch(const wxString&,const wxString&,const wxString&,int)
+      AddSwitch__15wxCmdLineParserFRC8wxStringN21i
+      ;wxArrayOptions::Add(const wxCmdLineOption&)
+      Add__14wxArrayOptionsFRC15wxCmdLineOption
+      ;wxCmdLineParser::Reset()
+      Reset__15wxCmdLineParserFv
+      ;wxCmdLineParser::SetCmdLine(int,char**)
+      SetCmdLine__15wxCmdLineParserFiPPc
+      ;wxArrayOptions::wxArrayOptions(const wxArrayOptions&)
+      __ct__14wxArrayOptionsFRC14wxArrayOptions
+      ;wxCmdLineParser::SetSwitchChars(const wxString&)
+      SetSwitchChars__15wxCmdLineParserFRC8wxString
+      ;wxCmdLineParser::SetDesc(const wxCmdLineEntryDesc*)
+      SetDesc__15wxCmdLineParserFPC18wxCmdLineEntryDesc
+      ;wxCmdLineParser::Found(const wxString&,wxString*) const
+      Found__15wxCmdLineParserCFRC8wxStringP8wxString
+      ;wxCmdLineParserData::FindOptionByLongName(const wxString&)
+      FindOptionByLongName__19wxCmdLineParserDataFRC8wxString
+      ;wxArrayOptions::Index(const wxCmdLineOption&,unsigned long) const
+      Index__14wxArrayOptionsCFRC15wxCmdLineOptionUl
+      ;wxArrayOptions::RemoveAt(unsigned int)
+      RemoveAt__14wxArrayOptionsFUi
+      ;wxArrayParams::Insert(const wxCmdLineParam&,unsigned int)
+      Insert__13wxArrayParamsFRC14wxCmdLineParamUi
+      ;wxCmdLineParserData::wxCmdLineParserData()
+      __ct__19wxCmdLineParserDataFv
+      ;wxCmdLineParser::SetCmdLine(const wxString&)
+      SetCmdLine__15wxCmdLineParserFRC8wxString
+      ;wxArrayParams::wxArrayParams(const wxArrayParams&)
+      __ct__13wxArrayParamsFRC13wxArrayParams
+      ;wxArrayOptions::operator=(const wxArrayOptions&)
+      __as__14wxArrayOptionsFRC14wxArrayOptions
+      ;wxCmdLineParserData::SetArguments(const wxString&)
+      SetArguments__19wxCmdLineParserDataFRC8wxString
+      ;wxArrayOptions::Insert(const wxCmdLineOption&,unsigned int)
+      Insert__14wxArrayOptionsFRC15wxCmdLineOptionUi
+      ;wxArrayParams::Add(const wxCmdLineParam&)
+      Add__13wxArrayParamsFRC14wxCmdLineParam
+      ;wxArrayParams::DoEmpty()
+      DoEmpty__13wxArrayParamsFv
+      ;wxArrayOptions::~wxArrayOptions()
+      __dt__14wxArrayOptionsFv
+      ;wxCmdLineParser::Usage()
+      Usage__15wxCmdLineParserFv
+      ;wxCmdLineParser::Parse()
+      Parse__15wxCmdLineParserFv
+      ;wxCmdLineParserData::SetArguments(int,char**)
+      SetArguments__19wxCmdLineParserDataFiPPc
+      ;wxCmdLineParser::Found(const wxString&) const
+      Found__15wxCmdLineParserCFRC8wxString
+      ;wxCmdLineParser::AddParam(const wxString&,wxCmdLineParamType,int)
+      AddParam__15wxCmdLineParserFRC8wxString18wxCmdLineParamTypei
+      ;wxCmdLineParser::GetParam(unsigned int) const
+      GetParam__15wxCmdLineParserCFUi
+      ;wxCmdLineParser::Found(const wxString&,wxDateTime*) const
+      Found__15wxCmdLineParserCFRC8wxStringP10wxDateTime
+      ;wxCmdLineParser::Init()
+      Init__15wxCmdLineParserFv
+      ;wxCmdLineParser::~wxCmdLineParser()
+      __dt__15wxCmdLineParserFv
+      ;wxArrayParams::~wxArrayParams()
+      __dt__13wxArrayParamsFv
+      ;wxArrayParams::operator=(const wxArrayParams&)
+      __as__13wxArrayParamsFRC13wxArrayParams
+      ;wxCmdLineParser::AddOption(const wxString&,const wxString&,const wxString&,wxCmdLineParamType,int)
+      AddOption__15wxCmdLineParserFRC8wxStringN2118wxCmdLineParamTypei
+      ;wxArrayOptions::DoEmpty()
+      DoEmpty__14wxArrayOptionsFv
+      ;wxCmdLineParser::GetParamCount() const
+      GetParamCount__15wxCmdLineParserCFv
+      ;wxArrayOptions::DoCopy(const wxArrayOptions&)
+      DoCopy__14wxArrayOptionsFRC14wxArrayOptions
+      ;wxCmdLineParser::SetLogo(const wxString&)
+      SetLogo__15wxCmdLineParserFRC8wxString
+      ;wxCmdLineParserData::FindOption(const wxString&)
+      FindOption__19wxCmdLineParserDataFRC8wxString
+      ;wxArrayParams::DoCopy(const wxArrayParams&)
+      DoCopy__13wxArrayParamsFRC13wxArrayParams
   ;From object file:  ..\common\cmndata.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxColourData::GetCustomColour(int)
@@ -229,6 +338,24 @@ EXPORTS
       ;wxConfigBase::ms_bAutoCreate
       ms_bAutoCreate__12wxConfigBase
       __vft12wxConfigBase
+  ;From object file:  ..\common\containr.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxControlContainer::HandleOnFocus(wxFocusEvent&)
+      HandleOnFocus__18wxControlContainerFR12wxFocusEvent
+      ;wxControlContainer::DoSetFocus()
+      DoSetFocus__18wxControlContainerFv
+      ;wxControlContainer::wxControlContainer(wxWindow*)
+      __ct__18wxControlContainerFP8wxWindow
+      ;wxControlContainer::SetLastFocus(wxWindow*)
+      SetLastFocus__18wxControlContainerFP8wxWindow
+      ;wxControlContainer::HandleOnNavigationKey(wxNavigationKeyEvent&)
+      HandleOnNavigationKey__18wxControlContainerFR20wxNavigationKeyEvent
+      ;wxControlContainer::HandleOnWindowDestroy(wxWindowBase*)
+      HandleOnWindowDestroy__18wxControlContainerFP12wxWindowBase
+      ;wxControlContainer::SetFocusToChild()
+      SetFocusToChild__18wxControlContainerFv
+      ;wxSetFocusToChild(wxWindow*,wxWindow**)
+      wxSetFocusToChild__FP8wxWindowPP8wxWindow
   ;From object file:  ..\common\cshelp.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxContextHelpButton::wxContextHelpButton(wxWindow*,int,const wxPoint&,const wxSize&,long)
@@ -732,11 +859,17 @@ EXPORTS
       GetAllFiles__5wxDirFRC8wxStringP13wxArrayStringT1i
       ;wxDir::Traverse(wxDirTraverser&,const wxString&,int) const
       Traverse__5wxDirCFR14wxDirTraverserRC8wxStringi
+      ;wxDir::HasFiles(const wxString&)
+      HasFiles__5wxDirFRC8wxString
+      ;wxDir::HasSubDirs(const wxString&)
+      HasSubDirs__5wxDirFRC8wxString
   ;From object file:  ..\common\dndcmn.cpp
   ;From object file:  ..\common\dlgcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDialogBase::CreateButtonSizer(long)
       CreateButtonSizer__12wxDialogBaseFl
+      ;wxDialogBase::Init()
+      Init__12wxDialogBaseFv
       ;wxDialogBase::CreateTextSizer(const wxString&)
       CreateTextSizer__12wxDialogBaseFRC8wxString
   ;From object file:  ..\common\dobjcmn.cpp
@@ -1235,20 +1368,14 @@ EXPORTS
       GetAllEquivalents__19wxEncodingConverterF14wxFontEncoding
       ;wxEncodingConverter::wxEncodingConverter()
       __ct__19wxEncodingConverterFv
-      ;wxEncodingConverter::Convert(const char*,wchar_t*)
-      Convert__19wxEncodingConverterFPCcPw
       ;wxEncodingConverter::Init(wxFontEncoding,wxFontEncoding,int)
       Init__19wxEncodingConverterF14wxFontEncodingT1i
-      ;wxEncodingConverter::Convert(const wchar_t*,char*)
-      Convert__19wxEncodingConverterFPCwPc
       ;wxEncodingConverter::Convert(const wxString&)
       Convert__19wxEncodingConverterFRC8wxString
       ;wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding,int)
       GetPlatformEquivalents__19wxEncodingConverterF14wxFontEncodingi
       ;wxEncodingConverter::Convert(const char*,char*)
       Convert__19wxEncodingConverterFPCcPc
-      ;wxEncodingConverter::Convert(const wchar_t*,wchar_t*)
-      Convert__19wxEncodingConverterFPCwPw
   ;From object file:  ..\common\event.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxEvent::CopyObject(wxObject&) const
@@ -1307,14 +1434,18 @@ EXPORTS
       wxConstructorForwxDropFilesEvent__Fv
       ;wxEvtHandler::sm_eventTableEntries
       sm_eventTableEntries__12wxEvtHandler
-      ;wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow*)
-      __ct__20wxWindowDestroyEventFP8wxWindow
+      ;wxEvtHandler::DoGetClientData() const
+      DoGetClientData__12wxEvtHandlerCFv
+      ;wxChildFocusEvent::wxChildFocusEvent(wxWindow*)
+      __ct__17wxChildFocusEventFP8wxWindow
       ;wxFindFocusDescendant(wxWindow*)
       wxFindFocusDescendant__FP8wxWindow
       wxEVT_RIGHT_DCLICK
       wxEVT_ENTER_WINDOW
       wxEVT_COMMAND_LEFT_CLICK
       wxEVT_CHAR_HOOK
+      ;wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow*)
+      __ct__20wxWindowDestroyEventFP8wxWindow
       ;wxEvtHandler::Connect(int,int,int,void( wxObject::*)(wxEvent&),wxObject*)
       Connect__12wxEvtHandlerFiN21M8wxObjectFR7wxEvent_vP8wxObject
       wxEVT_SOCKET
@@ -1367,6 +1498,8 @@ EXPORTS
       wxEVT_DRAW_ITEM
       ;wxKeyEvent::wxKeyEvent(int)
       __ct__10wxKeyEventFi
+      ;wxEvtHandler::DoSetClientObject(wxClientData*)
+      DoSetClientObject__12wxEvtHandlerFP12wxClientData
       ;wxEvtHandler::wxEvtHandler()
       __ct__12wxEvtHandlerFv
       wxEVT_POWER
@@ -1388,6 +1521,7 @@ EXPORTS
       __dt__12wxEvtHandlerFv
       ;wxEvtHandler::GetEventTable() const
       GetEventTable__12wxEvtHandlerCFv
+      wxEVT_CHILD_FOCUS
       wxEVT_NC_LEAVE_WINDOW
       wxEVT_DROP_FILES
       wxEVT_COMMAND_RIGHT_CLICK
@@ -1412,6 +1546,8 @@ EXPORTS
       sm_classwxMoveEvent__11wxMoveEvent
       ;wxIconizeEvent::sm_classwxIconizeEvent
       sm_classwxIconizeEvent__14wxIconizeEvent
+      ;wxChildFocusEvent::sm_classwxChildFocusEvent
+      sm_classwxChildFocusEvent__17wxChildFocusEvent
       __vft16wxScrollWinEvent8wxObject
       __vft13wxNotifyEvent8wxObject
       __vft12wxMouseEvent8wxObject
@@ -1454,6 +1590,8 @@ EXPORTS
       wxConstructorForwxCloseEvent__Fv
       ;wxEvtHandler::sm_classwxEvtHandler
       sm_classwxEvtHandler__12wxEvtHandler
+      ;wxEvtHandler::DoGetClientObject() const
+      DoGetClientObject__12wxEvtHandlerCFv
       wxEVT_LEAVE_WINDOW
       wxEVT_NC_RIGHT_DCLICK
       wxEVT_KILL_FOCUS
@@ -1609,8 +1747,12 @@ EXPORTS
       wxConstructorForwxQueryNewPaletteEvent__Fv
       ;wxConstructorForwxFocusEvent()
       wxConstructorForwxFocusEvent__Fv
+      ;wxConstructorForwxChildFocusEvent()
+      wxConstructorForwxChildFocusEvent__Fv
       ;wxEvtHandler::sm_eventTable
       sm_eventTable__12wxEvtHandler
+      ;wxEvtHandler::DoSetClientData(void*)
+      DoSetClientData__12wxEvtHandlerFPv
       wxEVT_LEFT_DCLICK
       wxEVT_SET_FOCUS
       wxEVT_NC_LEFT_DCLICK
@@ -1730,6 +1872,8 @@ EXPORTS
       FindEntry__17wxFileConfigGroupCFPCc
       ;wxFileConfigEntry::SetValue(const wxString&,unsigned long)
       SetValue__17wxFileConfigEntryFRC8wxStringUl
+      ;wxFileConfig::wxFileConfig(wxInputStream&)
+      __ct__12wxFileConfigFR13wxInputStream
       ;wxFileConfig::RenameGroup(const wxString&,const wxString&)
       RenameGroup__12wxFileConfigFRC8wxStringT1
       ;wxFileConfig::Init()
@@ -1740,12 +1884,10 @@ EXPORTS
       LineListAppend__12wxFileConfigFRC8wxString
       ;wxFileConfig::DeleteGroup(const wxString&)
       DeleteGroup__12wxFileConfigFRC8wxString
-      ;wxFileConfig::Parse(wxTextFile&,unsigned long)
-      Parse__12wxFileConfigFR10wxTextFileUl
-      ;wxFileConfig::LineListInsert(const wxString&,wxFileConfigLineList*)
-      LineListInsert__12wxFileConfigFRC8wxStringP20wxFileConfigLineList
       ;wxFileConfig::Flush(unsigned long)
       Flush__12wxFileConfigFUl
+      ;wxFileConfig::LineListInsert(const wxString&,wxFileConfigLineList*)
+      LineListInsert__12wxFileConfigFRC8wxStringP20wxFileConfigLineList
       ;wxFileConfig::Read(const wxString&,wxString*,const wxString&) const
       Read__12wxFileConfigCFRC8wxStringP8wxStringT1
       ;wxFileConfig::RenameEntry(const wxString&,const wxString&)
@@ -1783,6 +1925,8 @@ EXPORTS
       Read__12wxFileConfigCFRC8wxStringP8wxString
       ;wxFileConfigGroup::DeleteEntry(const char*)
       DeleteEntry__17wxFileConfigGroupFPCc
+      ;wxFileConfig::Parse(wxTextBuffer&,unsigned long)
+      Parse__12wxFileConfigFR12wxTextBufferUl
       ;wxFileConfig::wxFileConfig(const wxString&,const wxString&,const wxString&,const wxString&,long)
       __ct__12wxFileConfigFRC8wxStringN31l
       ;wxFileConfigEntry::SetLine(wxFileConfigLineList*)
@@ -1907,12 +2051,12 @@ EXPORTS
       IsWild__10wxFileNameF12wxPathFormat
       ;wxFileName::Assign(const wxString&,const wxString&,const wxString&,wxPathFormat)
       Assign__10wxFileNameFRC8wxStringN2112wxPathFormat
+      ;wxFileName::GetTimes(wxDateTime*,wxDateTime*,wxDateTime*) const
+      GetTimes__10wxFileNameCFP10wxDateTimeN21
       ;wxFileName::Clear()
       Clear__10wxFileNameFv
       ;wxFileName::wxFileExists()
       wxFileExists__10wxFileNameFv
-      ;wxFileName::GetModificationTime()
-      GetModificationTime__10wxFileNameFv
       ;wxFileName::GetFullName() const
       GetFullName__10wxFileNameCFv
       ;wxFileName::AssignHomeDir()
@@ -1931,6 +2075,8 @@ EXPORTS
       IsAbsolute__10wxFileNameF12wxPathFormat
       ;wxFileName::GetFullPath(wxPathFormat) const
       GetFullPath__10wxFileNameCF12wxPathFormat
+      ;wxFileName::Touch()
+      Touch__10wxFileNameFv
       ;wxFileName::FileName(const wxString&)
       FileName__10wxFileNameFRC8wxString
       ;wxFileName::wxPathExists(const wxString&)
@@ -1957,6 +2103,8 @@ EXPORTS
       Mkdir__10wxFileNameFiUl
       ;wxFileName::IsRelative(wxPathFormat)
       IsRelative__10wxFileNameF12wxPathFormat
+      ;wxFileName::SetTimes(const wxDateTime*,const wxDateTime*,const wxDateTime*)
+      SetTimes__10wxFileNameFPC10wxDateTimeN21
       ;wxFileName::Rmdir()
       Rmdir__10wxFileNameFv
       ;wxFileName::GetLongPath() const
@@ -1995,6 +2143,8 @@ EXPORTS
       sm_classwxFileSystem__12wxFileSystem
       ;wxLocalFSHandler::FindNext()
       FindNext__16wxLocalFSHandlerFv
+      ;wxLocalFSHandler::ms_root
+      ms_root__16wxLocalFSHandler
       ;wxFileSystemHandler::GetMimeTypeFromExt(const wxString&)
       GetMimeTypeFromExt__19wxFileSystemHandlerFRC8wxString
       ;wxFileSystem::m_Handlers
@@ -2106,8 +2256,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxFrameBase::OnIdle(wxIdleEvent&)
       OnIdle__11wxFrameBaseFR11wxIdleEvent
-      ;wxFrameBase::DoScreenToClient(int*,int*) const
-      DoScreenToClient__11wxFrameBaseCFPiT1
       ;wxFrameBase::DeleteAllBars()
       DeleteAllBars__11wxFrameBaseFv
       ;wxFrameBase::SetMenuBar(wxMenuBar*)
@@ -2120,12 +2268,6 @@ EXPORTS
       OnCreateToolBar__11wxFrameBaseFliRC8wxString
       ;wxFrameBase::OnCreateStatusBar(int,long,int,const wxString&)
       OnCreateStatusBar__11wxFrameBaseFilT1RC8wxString
-      ;wxFrameBase::MakeModal(unsigned long)
-      MakeModal__11wxFrameBaseFUl
-      ;wxFrameBase::OnSize(wxSizeEvent&)
-      OnSize__11wxFrameBaseFR11wxSizeEvent
-      ;wxFrameBase::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__11wxFrameBaseFR12wxCloseEvent
       ;wxFrameBase::sm_eventTable
       sm_eventTable__11wxFrameBase
       ;wxFrameBase::GetClientAreaOrigin() const
@@ -2152,17 +2294,11 @@ EXPORTS
       GetEventTable__11wxFrameBaseCFv
       ;wxFrameBase::AttachMenuBar(wxMenuBar*)
       AttachMenuBar__11wxFrameBaseFP9wxMenuBar
-      ;wxFrameBase::SendIconizeEvent(unsigned long)
-      SendIconizeEvent__11wxFrameBaseFUl
       __vft11wxFrameBase8wxObject
-      ;wxFrameBase::DoClientToScreen(int*,int*) const
-      DoClientToScreen__11wxFrameBaseCFPiT1
-      ;wxFrameBase::sm_eventTableEntries
-      sm_eventTableEntries__11wxFrameBase
       ;wxFrameBase::SetStatusText(const wxString&,int)
       SetStatusText__11wxFrameBaseFRC8wxStringi
-      ;wxFrameBase::Destroy()
-      Destroy__11wxFrameBaseFv
+      ;wxFrameBase::sm_eventTableEntries
+      sm_eventTableEntries__11wxFrameBase
       ;wxFrameBase::New(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       New__11wxFrameBaseFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
   ;From object file:  ..\common\fs_inet.cpp
@@ -3266,6 +3402,8 @@ EXPORTS
       __ad__12wxLongLongWxCFRC12wxLongLongWx
       ;wxLongLongWx::Negate()
       Negate__12wxLongLongWxFv
+      ;wxLongLongWx::ToString() const
+      ToString__12wxLongLongWxCFv
       ;wxLongLongWx::operator-(const wxLongLongWx&) const
       __mi__12wxLongLongWxCFRC12wxLongLongWx
       ;wxLongLongWx::operator&=(const wxLongLongWx&)
@@ -3742,7 +3880,6 @@ EXPORTS
       __ct__11wxClassInfoFPCcN21iPFv_P8wxObject
       ;wxObject::Dump(ostream&)
       Dump__8wxObjectFR7ostream
-      wxTrue
       ;wxObject::LoadObject(wxObjectInputStream&)
       LoadObject__8wxObjectFR19wxObjectInputStream
       ;wxClassInfo::IsKindOf(const wxClassInfo*) const
@@ -4447,18 +4584,22 @@ EXPORTS
       __ct__16wxStaticBoxSizerFP11wxStaticBoxi
       ;wxGridSizer::wxGridSizer(int,int,int)
       __ct__11wxGridSizerFiN21
-      ;wxSizer::DoSetItemMinSize(wxWindow*,int,int)
-      DoSetItemMinSize__7wxSizerFP8wxWindowiT2
+      ;wxSizer::DeleteWindows()
+      DeleteWindows__7wxSizerFv
       ;wxStaticBoxSizer::sm_classwxStaticBoxSizer
       sm_classwxStaticBoxSizer__16wxStaticBoxSizer
       ;wxGridSizer::sm_classwxGridSizer
       sm_classwxGridSizer__11wxGridSizer
+      __vft7wxSizer21wxClientDataContainer
+      __vft15wxNotebookSizer21wxClientDataContainer
       ;wxNotebookSizer::RecalcSizes()
       RecalcSizes__15wxNotebookSizerFv
       ;wxFlexGridSizer::RecalcSizes()
       RecalcSizes__15wxFlexGridSizerFv
       ;wxGridSizer::RecalcSizes()
       RecalcSizes__11wxGridSizerFv
+      ;wxSizer::DoSetItemMinSize(wxWindow*,int,int)
+      DoSetItemMinSize__7wxSizerFP8wxWindowiT2
       ;wxStaticBoxSizer::CalcMin()
       CalcMin__16wxStaticBoxSizerFv
       ;wxFlexGridSizer::CalcMin()
@@ -4491,6 +4632,8 @@ EXPORTS
       __dt__7wxSizerFv
       ;wxSizer::sm_classwxSizer
       sm_classwxSizer__7wxSizer
+      __vft11wxGridSizer21wxClientDataContainer
+      __vft10wxBoxSizer21wxClientDataContainer
       ;wxSizerItem::~wxSizerItem()
       __dt__11wxSizerItemFv
       ;wxStaticBoxSizer::RecalcSizes()
@@ -4507,12 +4650,15 @@ EXPORTS
       Remove__7wxSizerFP8wxWindow
       ;wxSizer::FitSize(wxWindow*)
       FitSize__7wxSizerFP8wxWindow
-      __vft15wxNotebookSizer8wxObject
+      ;wxSizer::Clear(unsigned long)
+      Clear__7wxSizerFUl
       __vft7wxSizer8wxObject
+      __vft15wxNotebookSizer8wxObject
       ;wxSizer::Remove(int)
       Remove__7wxSizerFi
       ;wxSizer::GetMinSize()
       GetMinSize__7wxSizerFv
+      __vft16wxStaticBoxSizer21wxClientDataContainer
       ;wxFlexGridSizer::~wxFlexGridSizer()
       __dt__15wxFlexGridSizerFv
       ;wxSizer::wxSizer()
@@ -4543,10 +4689,13 @@ EXPORTS
       sm_classwxFlexGridSizer__15wxFlexGridSizer
       ;wxBoxSizer::sm_classwxBoxSizer
       sm_classwxBoxSizer__10wxBoxSizer
+      __vft15wxFlexGridSizer21wxClientDataContainer
       ;wxSizer::Remove(wxSizer*)
       Remove__7wxSizerFP7wxSizer
       ;wxSizer::DoSetItemMinSize(wxSizer*,int,int)
       DoSetItemMinSize__7wxSizerFP7wxSizeriT2
+      ;wxSizerItem::DeleteWindows()
+      DeleteWindows__11wxSizerItemFv
       ;wxSizerItem::wxSizerItem(wxWindow*,int,int,int,wxObject*)
       __ct__11wxSizerItemFP8wxWindowiN22P8wxObject
       __vft16wxStaticBoxSizer8wxObject
@@ -4684,51 +4833,32 @@ EXPORTS
       __dt__12wxSocketBaseFv
       ;wxSocketBase::GetLocal(wxSockAddress&) const
       GetLocal__12wxSocketBaseCFR13wxSockAddress
+  ;From object file:  ..\common\statbar.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxStatusBarBase::FreeWidths()
+      FreeWidths__15wxStatusBarBaseFv
+      __vft15wxStatusBarBase8wxObject
+      ;wxStatusBarBase::InitWidths()
+      InitWidths__15wxStatusBarBaseFv
+      ;wxStatusBar::sm_classwxStatusBar
+      sm_classwxStatusBar__11wxStatusBar
+      ;wxStatusBarBase::~wxStatusBarBase()
+      __dt__15wxStatusBarBaseFv
+      ;wxStatusBarBase::SetStatusWidths(int,const int*)
+      SetStatusWidths__15wxStatusBarBaseFiPCi
+      ;wxStatusBarBase::CalculateAbsWidths(int) const
+      CalculateAbsWidths__15wxStatusBarBaseCFi
+      ;wxStatusBarBase::wxStatusBarBase()
+      __ct__15wxStatusBarBaseFv
+      ;wxStatusBarBase::SetFieldsCount(int,const int*)
+      SetFieldsCount__15wxStatusBarBaseFiPCi
+      ;wxConstructorForwxStatusBar()
+      wxConstructorForwxStatusBar__Fv
   ;From object file:  ..\common\strconv.cpp
     ;PUBDEFs (Symbols available from object file):
-      __vft12wxMBConvUTF78wxMBConv
-      __vft8wxCSConv8wxMBConv
-      ;wxMBConv::cMB2WC(const char*) const
-      cMB2WC__8wxMBConvCFPCc
-      ;wxCSConv::SetName(const char*)
-      SetName__8wxCSConvFPCc
-      ;wxMBConvUTF7::MB2WC(wchar_t*,const char*,unsigned int) const
-      MB2WC__12wxMBConvUTF7CFPwPCcUi
-      ;wxMBConvUTF8::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__12wxMBConvUTF8CFPcPCwUi
-      ;wxMBConvUTF8::MB2WC(wchar_t*,const char*,unsigned int) const
-      MB2WC__12wxMBConvUTF8CFPwPCcUi
-      __vft12wxMBConvFile8wxMBConv
-      __vft12wxMBConvUTF88wxMBConv
       wxConvCurrent
-      ;wxMBConv::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__8wxMBConvCFPcPCwUi
-      ;wxCSConv::~wxCSConv()
-      __dt__8wxCSConvFv
-      wxConvUTF7
-      wxConvUTF8
-      wxConvLocal
-      ;wxMBConvFile::MB2WC(wchar_t*,const char*,unsigned int) const
-      MB2WC__12wxMBConvFileCFPwPCcUi
       wxConvFile
-      ;wxCSConv::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__8wxCSConvCFPcPCwUi
-      ;wxMBConvUTF7::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__12wxMBConvUTF7CFPcPCwUi
-      ;wxMBConvFile::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__12wxMBConvFileCFPcPCwUi
-      ;wxCSConv::MB2WC(wchar_t*,const char*,unsigned int) const
-      MB2WC__8wxCSConvCFPwPCcUi
-      ;wxCSConv::LoadNow()
-      LoadNow__8wxCSConvFv
-      ;wxCSConv::wxCSConv(const char*)
-      __ct__8wxCSConvFPCc
       wxConvLibc
-      ;wxMBConv::MB2WC(wchar_t*,const char*,unsigned int) const
-      MB2WC__8wxMBConvCFPwPCcUi
-      __vft8wxMBConv
-      ;wxMBConv::cWC2MB(const wchar_t*) const
-      cWC2MB__8wxMBConvCFPCw
   ;From object file:  ..\common\stream.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxStreamBuffer::SetBufferIO(void*,unsigned int,unsigned long)
@@ -4900,14 +5030,14 @@ EXPORTS
       GetFromBuffer__14wxStreamBufferFPvUi
       ;wxInputStream::AllocSpaceWBack(unsigned int)
       AllocSpaceWBack__13wxInputStreamFUi
-      ;wxStreamBuffer::ResetBuffer()
-      ResetBuffer__14wxStreamBufferFv
       ;wxOutputStream::wxOutputStream()
       __ct__14wxOutputStreamFv
       ;wxBufferedInputStream::TellI() const
       TellI__21wxBufferedInputStreamCFv
       ;wxBufferedOutputStream::Sync()
       Sync__22wxBufferedOutputStreamFv
+      ;wxStreamBuffer::ResetBuffer()
+      ResetBuffer__14wxStreamBufferFv
       ;wxStreamBuffer::Read(wxStreamBuffer*)
       Read__14wxStreamBufferFP14wxStreamBuffer
       ;wxBufferedInputStream::Peek()
@@ -4928,20 +5058,22 @@ EXPORTS
       Trim__8wxStringFUl
       ;wxArrayString::Sort(unsigned long)
       Sort__13wxArrayStringFUl
-      ;operator+(const wxString&,const wxString&)
-      __pl__FRC8wxStringT1
+      ;wxString::Truncate(unsigned int)
+      Truncate__8wxStringFUi
       ;wxString::rfind(char,unsigned int) const
       rfind__8wxStringCFcUi
       ;wxString::find_last_not_of(char,unsigned int) const
       find_last_not_of__8wxStringCFcUi
       ;wxString::find_first_of(const char*,unsigned int) const
       find_first_of__8wxStringCFPCcUi
+      ;operator+(const wxString&,const wxString&)
+      __pl__FRC8wxStringT1
       ;wxString::wxString(const void*,const void*)
       __ct__8wxStringFPCvT1
-      ;wxString::Truncate(unsigned int)
-      Truncate__8wxStringFUi
       ;wxArrayString::Sort(int(*)(const wxString&,const wxString&))
       Sort__13wxArrayStringFPFRC8wxStringT1_i
+      ;wxArrayString::SetCount(unsigned int)
+      SetCount__13wxArrayStringFUi
       ;wxArrayString::Remove(unsigned int)
       Remove__13wxArrayStringFUi
       ;wxString::Format(const char*,...)
@@ -4968,8 +5100,6 @@ EXPORTS
       FormatV__8wxStringFPCcPc
       ;wxString::Find(char,unsigned long) const
       Find__8wxStringCFcUl
-      ;wxString::ToLong(long*) const
-      ToLong__8wxStringCFPl
       ;wxString::Replace(const char*,const char*,unsigned long)
       Replace__8wxStringFPCcT1Ul
       ;wxString::Mid(unsigned int,unsigned int) const
@@ -5024,6 +5154,8 @@ EXPORTS
       find__8wxStringCFRC8wxStringUi
       ;wxString::UngetWriteBuf(unsigned int)
       UngetWriteBuf__8wxStringFUi
+      ;wxString::ToLong(long*,int) const
+      ToLong__8wxStringCFPli
       ;wxArrayString::Insert(const wxString&,unsigned int)
       Insert__13wxArrayStringFRC8wxStringUi
       ;wxString::GetWriteBuf(unsigned int)
@@ -5050,8 +5182,6 @@ EXPORTS
       __pl__FRC8wxStringPCc
       ;wxArrayString::operator==(const wxArrayString&) const
       __eq__13wxArrayStringCFRC13wxArrayString
-      ;wxString::operator=(const wchar_t*)
-      __as__8wxStringFPCw
       ;wxString::StartsWith(const char*,wxString*) const
       StartsWith__8wxStringCFPCcP8wxString
       ;wxArrayString::Remove(const char*)
@@ -5060,8 +5190,6 @@ EXPORTS
       ConcatSelf__8wxStringFiPCc
       ;wxArrayString::Add(const wxString&)
       Add__13wxArrayStringFRC8wxString
-      ;wxString::ToULong(unsigned long*) const
-      ToULong__8wxStringCFPUl
       ;wxString::erase(unsigned int,unsigned int)
       erase__8wxStringFUiT1
       ;wxString::sprintf(const char*,...)
@@ -5094,6 +5222,8 @@ EXPORTS
       __ct__8wxStringFcUi
       ;wxSnprintf(char*,unsigned int,const char*,...)
       wxSnprintf__FPcUiPCce
+      ;wxString::ToULong(unsigned long*,int) const
+      ToULong__8wxStringCFPUli
       ;wxString::Right(unsigned int) const
       Right__8wxStringCFUi
       ;wxString::CopyBeforeWrite()
@@ -5102,8 +5232,6 @@ EXPORTS
       rfind__8wxStringCFPCcUiT2
       ;wxArrayString::~wxArrayString()
       __dt__13wxArrayStringFv
-      ;wxString::wxString(const wchar_t*,wxMBConv&)
-      __ct__8wxStringFPCwR8wxMBConv
       ;wxString::Lower() const
       Lower__8wxStringCFv
       ;wxArrayString::Free()
@@ -5219,6 +5347,35 @@ EXPORTS
       __dt__13wxToolBarBaseFv
       ;wxToolBarBase::SetToolLongHelp(int,const wxString&)
       SetToolLongHelp__13wxToolBarBaseFiRC8wxString
+  ;From object file:  ..\common\textbuf.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxTextBuffer::GuessType() const
+      GuessType__12wxTextBufferCFv
+      ;wxTextBuffer::Close()
+      Close__12wxTextBufferFv
+      ;wxTextBuffer::Exists() const
+      Exists__12wxTextBufferCFv
+      __vft12wxTextBuffer
+      ;wxTextBuffer::Write(wxTextFileType,wxMBConv&)
+      Write__12wxTextBufferF14wxTextFileTypeR8wxMBConv
+      ;wxTextBuffer::Open(const wxString&,wxMBConv&)
+      Open__12wxTextBufferFRC8wxStringR8wxMBConv
+      ;wxTextBuffer::Create()
+      Create__12wxTextBufferFv
+      ;wxTextBuffer::Translate(const wxString&,wxTextFileType)
+      Translate__12wxTextBufferFRC8wxString14wxTextFileType
+      ;wxTextBuffer::~wxTextBuffer()
+      __dt__12wxTextBufferFv
+      ;wxTextBuffer::wxTextBuffer(const wxString&)
+      __ct__12wxTextBufferFRC8wxString
+      ;wxTextBuffer::typeDefault
+      typeDefault__12wxTextBuffer
+      ;wxTextBuffer::GetEOL(wxTextFileType)
+      GetEOL__12wxTextBufferF14wxTextFileType
+      ;wxTextBuffer::Open(wxMBConv&)
+      Open__12wxTextBufferFR8wxMBConv
+      ;wxTextBuffer::Create(const wxString&)
+      Create__12wxTextBufferFRC8wxString
   ;From object file:  ..\common\textcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTextCtrlBase::operator<<(double)
@@ -5247,6 +5404,8 @@ EXPORTS
       sm_classwxTextUrlEvent__14wxTextUrlEvent
       ;wxTextCtrlBase::~wxTextCtrlBase()
       __dt__14wxTextCtrlBaseFv
+      ;wxTextCtrlBase::GetStringSelection() const
+      GetStringSelection__14wxTextCtrlBaseCFv
       ;wxTextCtrlBase::GetDefaultStyle() const
       GetDefaultStyle__14wxTextCtrlBaseCFv
       ;wxTextCtrlBase::CanPaste() const
@@ -5254,6 +5413,7 @@ EXPORTS
       wxEVT_COMMAND_TEXT_UPDATED
       ;wxConstructorForwxTextUrlEvent()
       wxConstructorForwxTextUrlEvent__Fv
+      wxEVT_COMMAND_TEXT_MAXLEN
       ;wxTextCtrlBase::SelectAll()
       SelectAll__14wxTextCtrlBaseFv
       ;wxTextCtrlBase::SaveFile(const wxString&)
@@ -5265,34 +5425,19 @@ EXPORTS
       SetStyle__14wxTextCtrlBaseFlT1RC10wxTextAttr
   ;From object file:  ..\common\textfile.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxTextFile::GuessType() const
-      GuessType__10wxTextFileCFv
-      ;wxTextFile::Open(const wxString&)
-      Open__10wxTextFileFRC8wxString
-      ;wxTextFile::~wxTextFile()
-      __dt__10wxTextFileFv
-      ;wxTextFile::Open()
-      Open__10wxTextFileFv
-      ;wxTextFile::Write(wxTextFileType)
-      Write__10wxTextFileF14wxTextFileType
-      ;wxTextFile::typeDefault
-      typeDefault__10wxTextFile
-      ;wxTextFile::Exists() const
-      Exists__10wxTextFileCFv
-      ;wxTextFile::Create()
-      Create__10wxTextFileFv
-      ;wxTextFile::GetEOL(wxTextFileType)
-      GetEOL__10wxTextFileF14wxTextFileType
-      ;wxTextFile::Translate(const wxString&,wxTextFileType)
-      Translate__10wxTextFileFRC8wxString14wxTextFileType
-      ;wxTextFile::Read()
-      Read__10wxTextFileFv
-      ;wxTextFile::Close()
-      Close__10wxTextFileFv
+      ;wxTextFile::OnRead(wxMBConv&)
+      OnRead__10wxTextFileFR8wxMBConv
+      __vft10wxTextFile12wxTextBuffer
+      ;wxTextFile::OnOpen(const wxString&,wxTextBuffer::wxTextBufferOpenMode)
+      OnOpen__10wxTextFileFRC8wxStringQ2_12wxTextBuffer20wxTextBufferOpenMode
+      ;wxTextFile::OnExists() const
+      OnExists__10wxTextFileCFv
+      ;wxTextFile::OnClose()
+      OnClose__10wxTextFileFv
+      ;wxTextFile::OnWrite(wxTextFileType,wxMBConv&)
+      OnWrite__10wxTextFileF14wxTextFileTypeR8wxMBConv
       ;wxTextFile::wxTextFile(const wxString&)
       __ct__10wxTextFileFRC8wxString
-      ;wxTextFile::Create(const wxString&)
-      Create__10wxTextFileFRC8wxString
   ;From object file:  ..\common\timercmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTimerEvent::sm_classwxTimerEvent
@@ -5336,6 +5481,29 @@ EXPORTS
       CountTokens__17wxStringTokenizerCFv
       ;wxStringTokenizer::Reinit(const wxString&)
       Reinit__17wxStringTokenizerFRC8wxString
+  ;From object file:  ..\common\toplvcmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxTopLevelWindowBase::SendIconizeEvent(unsigned long)
+      SendIconizeEvent__20wxTopLevelWindowBaseFUl
+      ;wxTopLevelWindowBase::sm_eventTable
+      sm_eventTable__20wxTopLevelWindowBase
+      ;wxTopLevelWindowBase::DoClientToScreen(int*,int*) const
+      DoClientToScreen__20wxTopLevelWindowBaseCFPiT1
+      ;wxTopLevelWindowBase::GetEventTable() const
+      GetEventTable__20wxTopLevelWindowBaseCFv
+      ;wxTopLevelWindowBase::wxTopLevelWindowBase()
+      __ct__20wxTopLevelWindowBaseFv
+      ;wxTopLevelWindowBase::OnSize(wxSizeEvent&)
+      OnSize__20wxTopLevelWindowBaseFR11wxSizeEvent
+      __vft20wxTopLevelWindowBase8wxObject
+      ;wxTopLevelWindowBase::sm_eventTableEntries
+      sm_eventTableEntries__20wxTopLevelWindowBase
+      ;wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent&)
+      OnCloseWindow__20wxTopLevelWindowBaseFR12wxCloseEvent
+      ;wxTopLevelWindowBase::DoScreenToClient(int*,int*) const
+      DoScreenToClient__20wxTopLevelWindowBaseCFPiT1
+      ;wxTopLevelWindowBase::Destroy()
+      Destroy__20wxTopLevelWindowBaseFv
   ;From object file:  ..\common\treebase.cpp
     ;PUBDEFs (Symbols available from object file):
       wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT
@@ -5517,6 +5685,8 @@ EXPORTS
       wxDecToHex__Fi
       ;wxNow()
       wxNow__Fv
+      ;wxGetInstallPrefix()
+      wxGetInstallPrefix__Fv
       ;wxWindowDisabler::~wxWindowDisabler()
       __dt__16wxWindowDisablerFv
       ;copystring(const char*)
@@ -5539,6 +5709,8 @@ EXPORTS
       wxMessageBox__FRC8wxStringT1lP8wxWindowiT5
       ;wxNewId()
       wxNewId__Fv
+      ;wxYieldIfNeeded()
+      wxYieldIfNeeded__Fv
       ;wxExecute(const wxString&,wxArrayString&,wxArrayString&)
       wxExecute__FRC8wxStringR13wxArrayStringT2
       ;wxHexToDec(const wxString&)
@@ -5551,6 +5723,8 @@ EXPORTS
       LongToString__Fl
       ;wxGetCurrentId()
       wxGetCurrentId__Fv
+      ;wxYield()
+      wxYield__Fv
       ;wxGetHostName()
       wxGetHostName__Fv
       ;wxGetHomeDir()
@@ -6229,8 +6403,6 @@ EXPORTS
       UpdateWindowUI__12wxWindowBaseFv
       ;wxWindowBase::PushEventHandler(wxEvtHandler*)
       PushEventHandler__12wxWindowBaseFP12wxEvtHandler
-      ;wxWindowBase::DoGetClientObject() const
-      DoGetClientObject__12wxWindowBaseCFv
       ;wxWindowBase::DestroyChildren()
       DestroyChildren__12wxWindowBaseFv
       ;wxWindowListNode::DeleteData()
@@ -6260,16 +6432,12 @@ EXPORTS
       LayoutPhase1__12wxWindowBaseFPi
       ;wxWindowBase::GetPositionConstraint(int*,int*) const
       GetPositionConstraint__12wxWindowBaseCFPiT1
-      ;wxWindowBase::DoSetClientObject(wxClientData*)
-      DoSetClientObject__12wxWindowBaseFP12wxClientData
       ;wxWindowBase::TransferDataToWindow()
       TransferDataToWindow__12wxWindowBaseFv
       ;wxWindowBase::Layout()
       Layout__12wxWindowBaseFv
       ;wxWindowBase::InitDialog()
       InitDialog__12wxWindowBaseFv
-      ;wxWindowBase::DoSetClientData(void*)
-      DoSetClientData__12wxWindowBaseFPv
       ;wxWindowBase::FindWindow(const wxString&)
       FindWindow__12wxWindowBaseFRC8wxString
       ;wxWindowBase::SetHelpTextForId(const wxString&)
@@ -6288,6 +6456,8 @@ EXPORTS
       GetClientSizeConstraint__12wxWindowBaseCFPiT1
       ;wxWindowBase::DoHitTest(int,int) const
       DoHitTest__12wxWindowBaseCFiT1
+      ;wxWindowBase::AdjustForParentClientOrigin(int&,int&,int)
+      AdjustForParentClientOrigin__12wxWindowBaseFRiT1i
       ;wxWindowBase::DoGetBestSize() const
       DoGetBestSize__12wxWindowBaseCFv
       ;wxWindowBase::TransferDataFromWindow()
@@ -6300,8 +6470,6 @@ EXPORTS
       GetUpdateClientRect__12wxWindowBaseCFv
       ;wxWindowBase::GetHelpText() const
       GetHelpText__12wxWindowBaseCFv
-      ;wxWindowBase::DoGetClientData() const
-      DoGetClientData__12wxWindowBaseCFv
       ;wxWindowBase::SetFont(const wxFont&)
       SetFont__12wxWindowBaseFRC6wxFont
       ;wxWindowBase::MakeModal(unsigned long)
@@ -6334,13 +6502,10 @@ EXPORTS
       SetHelpText__12wxWindowBaseFRC8wxString
   ;From object file:  ..\common\wxchar.cpp
     ;PUBDEFs (Symbols available from object file):
-      wcslen
-      ;wxMB2WC(wchar_t*,const char*,unsigned int)
-      wxMB2WC__FPwPCcUi
-      ;wxWC2MB(char*,const wchar_t*,unsigned int)
-      wxWC2MB__FPcPCwUi
       ;wxOKlibc()
       wxOKlibc__Fv
+      ;wcslen(const wchar_t*)
+      wcslen__FPCw
   ;From object file:  ..\common\wxexpr.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxExpr::GetAttributeValue(const wxString&,long&) const
@@ -6553,8 +6718,8 @@ EXPORTS
       __vft10wxBusyInfo8wxObject
       ;wxInfoFrame::wxInfoFrame(wxWindow*,const wxString&)
       __ct__11wxInfoFrameFP8wxWindowRC8wxString
-      ;wxBusyInfo::wxBusyInfo(const wxString&)
-      __ct__10wxBusyInfoFRC8wxString
+      ;wxBusyInfo::wxBusyInfo(const wxString&,wxWindow*)
+      __ct__10wxBusyInfoFRC8wxStringP8wxWindow
   ;From object file:  ..\generic\calctrl.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCalendarCtrl::OnMonthChange(wxCommandEvent&)
@@ -6568,6 +6733,10 @@ EXPORTS
       __ct__15wxCalendarEventFP14wxCalendarCtrli
       ;wxCalendarCtrl::SetHoliday(unsigned int)
       SetHoliday__14wxCalendarCtrlFUi
+      ;wxCalendarCtrl::SetDateRange(const wxDateTime&,const wxDateTime&)
+      SetDateRange__14wxCalendarCtrlFRC10wxDateTimeT1
+      ;wxCalendarCtrl::ChangeMonth(wxDateTime*) const
+      ChangeMonth__14wxCalendarCtrlCFP10wxDateTime
       ;wxCalendarCtrl::Init()
       Init__14wxCalendarCtrlFv
       ;wxConstructorForwxCalendarCtrl()
@@ -6589,6 +6758,8 @@ EXPORTS
       OnDClick__14wxCalendarCtrlFR12wxMouseEvent
       ;wxCalendarCtrl::RefreshDate(const wxDateTime&)
       RefreshDate__14wxCalendarCtrlFRC10wxDateTime
+      ;wxCalendarCtrl::SetUpperDateLimit(const wxDateTime&)
+      SetUpperDateLimit__14wxCalendarCtrlFRC10wxDateTime
       ;wxCalendarCtrl::GetWeek(const wxDateTime&) const
       GetWeek__14wxCalendarCtrlCFRC10wxDateTime
       ;wxCalendarCtrl::DoSetSize(int,int,int,int,int)
@@ -6609,6 +6780,8 @@ EXPORTS
       GetYearControl__14wxCalendarCtrlCFv
       ;wxYearSpinCtrl::GetEventTable() const
       GetEventTable__14wxYearSpinCtrlCFv
+      ;wxCalendarCtrl::GetDateCoord(const wxDateTime&,int*,int*) const
+      GetDateCoord__14wxCalendarCtrlCFRC10wxDateTimePiT2
       ;wxCalendarCtrl::OnYearChange(wxSpinEvent&)
       OnYearChange__14wxCalendarCtrlFR11wxSpinEvent
       wxEVT_CALENDAR_DAY_CHANGED
@@ -6625,10 +6798,12 @@ EXPORTS
       __vft14wxCalendarCtrl8wxObject
       ;wxCalendarCtrl::OnPaint(wxPaintEvent&)
       OnPaint__14wxCalendarCtrlFR12wxPaintEvent
-      ;wxCalendarCtrl::DoGetPosition(int*,int*) const
-      DoGetPosition__14wxCalendarCtrlCFPiT1
+      ;wxCalendarCtrl::IsDateInRange(const wxDateTime&) const
+      IsDateInRange__14wxCalendarCtrlCFRC10wxDateTime
       ;wxCalendarCtrl::HitTest(const wxPoint&,wxDateTime*,wxDateTime::WeekDay*)
       HitTest__14wxCalendarCtrlFRC7wxPointP10wxDateTimePQ2_10wxDateTime7WeekDay
+      ;wxCalendarCtrl::DoGetPosition(int*,int*) const
+      DoGetPosition__14wxCalendarCtrlCFPiT1
       ;wxCalendarCtrl::Enable(unsigned long)
       Enable__14wxCalendarCtrlFUl
       wxEVT_CALENDAR_WEEKDAY_CLICKED
@@ -6644,6 +6819,8 @@ EXPORTS
       ChangeDay__14wxCalendarCtrlFRC10wxDateTime
       ;wxCalendarCtrl::SetDateAndNotify(const wxDateTime&)
       SetDateAndNotify__14wxCalendarCtrlFRC10wxDateTime
+      ;wxCalendarCtrl::ChangeYear(wxDateTime*) const
+      ChangeYear__14wxCalendarCtrlCFP10wxDateTime
       ;wxCalendarEvent::Init()
       Init__15wxCalendarEventFv
       ;wxCalendarCtrl::GetStartDate() const
@@ -6654,10 +6831,14 @@ EXPORTS
       sm_eventTable__15wxMonthComboBox
       ;wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl*)
       __ct__14wxYearSpinCtrlFP14wxCalendarCtrl
+      ;wxCalendarCtrl::HighlightRange(wxPaintDC*,const wxDateTime&,const wxDateTime&,wxPen*,wxBrush*)
+      HighlightRange__14wxCalendarCtrlFP9wxPaintDCRC10wxDateTimeT2P5wxPenP7wxBrush
       ;wxCalendarCtrl::EnableYearChange(unsigned long)
       EnableYearChange__14wxCalendarCtrlFUl
       ;wxCalendarCtrl::SetDate(const wxDateTime&)
       SetDate__14wxCalendarCtrlFRC10wxDateTime
+      ;wxCalendarCtrl::SetLowerDateLimit(const wxDateTime&)
+      SetLowerDateLimit__14wxCalendarCtrlFRC10wxDateTime
       ;wxCalendarCtrl::IsDateShown(const wxDateTime&) const
       IsDateShown__14wxCalendarCtrlCFRC10wxDateTime
       ;wxCalendarCtrl::DoMoveWindow(int,int,int,int)
@@ -8424,6 +8605,8 @@ EXPORTS
       OnRenameAccept__16wxListMainWindowFv
       ;wxListRenameTimer::Notify()
       Notify__17wxListRenameTimerFv
+      ;wxListHeaderWindow::Init()
+      Init__18wxListHeaderWindowFv
       ;wxListHeaderData::GetWidth() const
       GetWidth__16wxListHeaderDataCFv
       ;wxListCtrl::GetTopItem() const
@@ -8432,11 +8615,15 @@ EXPORTS
       GetItemCount__10wxListCtrlCFv
       ;wxListMainWindow::GetImageSize(int,int&,int&) const
       GetImageSize__16wxListMainWindowCFiRiT2
+      ;wxListCtrl::Freeze()
+      Freeze__10wxListCtrlFv
       ;wxListHeaderWindow::DoDrawRect(wxDC*,int,int,int,int)
       DoDrawRect__18wxListHeaderWindowFP4wxDCiN32
+      wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
       wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK
       ;wxListMainWindow::GetItemRect(long,wxRect&)
       GetItemRect__16wxListMainWindowFlR6wxRect
+      wxEVT_COMMAND_LIST_ITEM_FOCUSED
       wxEVT_COMMAND_LIST_ITEM_DESELECTED
       wxEVT_COMMAND_LIST_ITEM_ACTIVATED
       wxEVT_COMMAND_LIST_CACHE_HINT
@@ -8492,8 +8679,6 @@ EXPORTS
       CacheLineData__16wxListMainWindowFUi
       ;wxwxListItemDataListNode::DeleteData()
       DeleteData__24wxwxListItemDataListNodeFv
-      ;wxConstructorForwxListHeaderData()
-      wxConstructorForwxListHeaderData__Fv
       ;wxConstructorForwxListCtrl()
       wxConstructorForwxListCtrl__Fv
       list_ctrl_compare_func_2
@@ -8503,6 +8688,8 @@ EXPORTS
       __ct__18wxListHeaderWindowFv
       ;wxListLineData::SetAttr(wxListItemAttr*)
       SetAttr__14wxListLineDataFP14wxListItemAttr
+      ;wxListMainWindow::RefreshSelected()
+      RefreshSelected__16wxListMainWindowFv
       ;wxListMainWindow::OnRenameTimer()
       OnRenameTimer__16wxListMainWindowFv
       ;wxListItemData::GetX() const
@@ -8522,6 +8709,7 @@ EXPORTS
       wxEVT_COMMAND_LIST_SET_INFO
       wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK
       wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS
+      wxEVT_COMMAND_LIST_COL_DRAGGING
       ;wxListHeaderWindow::sm_eventTable
       sm_eventTable__18wxListHeaderWindow
       ;wxListHeaderWindow::sm_eventTableEntries
@@ -8583,8 +8771,6 @@ EXPORTS
       RemoveAt__19wxListLineDataArrayFUi
       ;wxListMainWindow::RefreshLines(unsigned int,unsigned int)
       RefreshLines__16wxListMainWindowFUiT1
-      ;wxListMainWindow::OnFocusLine(unsigned int)
-      OnFocusLine__16wxListMainWindowFUi
       ;wxListCtrl::InsertItem(long,int)
       InsertItem__10wxListCtrlFli
       ;wxListMainWindow::GetVisibleLinesRange(unsigned int*,unsigned int*)
@@ -8597,6 +8783,8 @@ EXPORTS
       DrawImage__16wxListMainWindowFiP4wxDCN21
       ;wxListCtrl::DeleteColumn(int)
       DeleteColumn__10wxListCtrlFi
+      ;wxListMainWindow::ChangeCurrent(unsigned int)
+      ChangeCurrent__16wxListMainWindowFUi
       ;wxListCtrl::Arrange(int)
       Arrange__10wxListCtrlFi
       ;wxListCtrl::GetNextItem(long,int,int) const
@@ -8609,6 +8797,10 @@ EXPORTS
       __vft16wxListMainWindow14wxScrollHelper
       ;wxListMainWindow::UpdateCurrent()
       UpdateCurrent__16wxListMainWindowFv
+      ;wxListMainWindow::Thaw()
+      Thaw__16wxListMainWindowFv
+      ;wxListCtrl::Thaw()
+      Thaw__10wxListCtrlFv
       ;wxListCtrl::SetItem(long,int,const wxString&,int)
       SetItem__10wxListCtrlFliRC8wxStringT2
       ;wxListMainWindow::InitScrolling()
@@ -8633,10 +8825,13 @@ EXPORTS
       GetBackgroundColour__10wxListCtrlCFv
       ;wxListLineData::GetAttr() const
       GetAttr__14wxListLineDataCFv
+      ;wxListMainWindow::Freeze()
+      Freeze__16wxListMainWindowFv
       ;wxListCtrl::CreateHeaderWindow()
       CreateHeaderWindow__10wxListCtrlFv
       ;wxListLineData::SetText(int,const wxString)
       SetText__14wxListLineDataFiC8wxString
+      wxEVT_COMMAND_LIST_COL_RIGHT_CLICK
       ;wxListMainWindow::sm_eventTable
       sm_eventTable__16wxListMainWindow
       ;wxListHeaderWindow::sm_classwxListHeaderWindow
@@ -8689,8 +8884,6 @@ EXPORTS
       RefreshItems__10wxListCtrlFlT1
       ;wxListMainWindow::RefreshAfter(unsigned int)
       RefreshAfter__16wxListMainWindowFUi
-      ;wxListMainWindow::OnUnfocusLine(unsigned int)
-      OnUnfocusLine__16wxListMainWindowFUi
       ;wxListLineData::InitItems(int)
       InitItems__14wxListLineDataFi
       ;wxListMainWindow::GetLineY(unsigned int) const
@@ -8713,8 +8906,8 @@ EXPORTS
       DeleteColumn__16wxListMainWindowFi
       ;wxListLineData::CalculateSize(wxDC*,int)
       CalculateSize__14wxListLineDataFP4wxDCi
-      ;wxListCtrl::~wxListCtrl()
-      __dt__10wxListCtrlFv
+      ;wxListItem::wxListItem()
+      __ct__10wxListItemFv
       wxSizeTCmpFn
       ;wxConstructorForwxListItem()
       wxConstructorForwxListItem__Fv
@@ -8722,14 +8915,16 @@ EXPORTS
       __dt__19wxListLineDataArrayFv
       ;wxListItemData::~wxListItemData()
       __dt__14wxListItemDataFv
-      ;wxListItem::wxListItem()
-      __ct__10wxListItemFv
+      ;wxListCtrl::~wxListCtrl()
+      __dt__10wxListCtrlFv
       ;wxListCtrl::SetItemImage(long,int,int)
       SetItemImage__10wxListCtrlFliT2
       ;wxListCtrl::SetForegroundColour(const wxColour&)
       SetForegroundColour__10wxListCtrlFRC8wxColour
       ;wxListMainWindow::Init()
       Init__16wxListMainWindowFv
+      ;wxListHeaderData::Init()
+      Init__16wxListHeaderDataFv
       ;wxListCtrl::GetSelectedItemCount() const
       GetSelectedItemCount__10wxListCtrlCFv
       ;wxListHeaderWindow::GetEventTable() const
@@ -8792,8 +8987,6 @@ EXPORTS
       DrawInReportMode__14wxListLineDataFP4wxDCRC6wxRectT2Ul
       ;wxListLineData::GetText(int) const
       GetText__14wxListLineDataCFi
-      ;wxListHeaderData::sm_classwxListHeaderData
-      sm_classwxListHeaderData__16wxListHeaderData
       __vft26wxwxListHeaderDataListNode10wxNodeBase
       __vft24wxwxListItemDataListNode10wxNodeBase
       ;wxListLineData::SetPosition(int,int,int,int)
@@ -8882,6 +9075,7 @@ EXPORTS
       ClearAll__10wxListCtrlFv
       ;wxListItemData::wxListItemData(wxListMainWindow*)
       __ct__14wxListItemDataFP16wxListMainWindow
+      wxEVT_COMMAND_LIST_COL_END_DRAG
       wxEVT_COMMAND_LIST_COL_CLICK
       wxEVT_COMMAND_LIST_BEGIN_RDRAG
       wxEVT_COMMAND_LIST_BEGIN_DRAG
@@ -8985,15 +9179,21 @@ EXPORTS
       Init__7wxPanelFv
       ;wxPanel::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__7wxPanelFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
+      ;wxPanel::SetDefaultItem(wxWindow*)
+      SetDefaultItem__7wxPanelFP8wxWindow
       __vft7wxPanel8wxObject
       ;wxPanel::GetEventTable() const
       GetEventTable__7wxPanelCFv
       ;wxPanel::InitDialog()
       InitDialog__7wxPanelFv
-      ;wxPanel::sm_classwxPanel
-      sm_classwxPanel__7wxPanel
+      ;wxPanel::OnChildFocus(wxChildFocusEvent&)
+      OnChildFocus__7wxPanelFR17wxChildFocusEvent
       ;wxPanel::sm_eventTable
       sm_eventTable__7wxPanel
+      ;wxPanel::sm_classwxPanel
+      sm_classwxPanel__7wxPanel
+      ;wxPanel::~wxPanel()
+      __dt__7wxPanelFv
       ;wxPanel::OnNavigationKey(wxNavigationKeyEvent&)
       OnNavigationKey__7wxPanelFR20wxNavigationKeyEvent
       ;wxPanel::OnFocus(wxFocusEvent&)
@@ -9004,10 +9204,8 @@ EXPORTS
       wxConstructorForwxPanel__Fv
       ;wxPanel::SetFocus()
       SetFocus__7wxPanelFv
-      ;wxPanel::SetFocusToChild()
-      SetFocusToChild__7wxPanelFv
-      ;wxSetFocusToChild(wxWindow*,wxWindow**)
-      wxSetFocusToChild__FP8wxWindowPP8wxWindow
+      ;wxPanel::GetDefaultItem() const
+      GetDefaultItem__7wxPanelCFv
   ;From object file:  ..\generic\printps.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPostScriptPrintPreview::wxPostScriptPrintPreview(wxPrintout*,wxPrintout*,wxPrintDialogData*)
@@ -9196,8 +9394,12 @@ EXPORTS
       EnableScrolling__14wxScrollHelperFUlT1
       ;wxAutoScrollTimer::Notify()
       Notify__17wxAutoScrollTimerFv
+      ;wxScrollHelper::DeleteEvtHandler()
+      DeleteEvtHandler__14wxScrollHelperFv
       ;wxScrollHelper::wxScrollHelper(wxWindow*)
       __ct__14wxScrollHelperFP8wxWindow
+      ;wxGenericScrolledWindow::sm_eventTable
+      sm_eventTable__23wxGenericScrolledWindow
       ;wxAutoScrollTimer::wxAutoScrollTimer(wxWindow*,wxScrollHelper*,int,int,int)
       __ct__17wxAutoScrollTimerFP8wxWindowP14wxScrollHelperiN23
       ;wxScrollHelper::HandleOnScroll(wxScrollWinEvent&)
@@ -9218,6 +9420,8 @@ EXPORTS
       StopAutoScrolling__14wxScrollHelperFv
       ;wxScrollHelper::AdjustScrollbars()
       AdjustScrollbars__14wxScrollHelperFv
+      ;wxGenericScrolledWindow::sm_eventTableEntries
+      sm_eventTableEntries__23wxGenericScrolledWindow
       ;wxScrollHelper::HandleOnSize(wxSizeEvent&)
       HandleOnSize__14wxScrollHelperFR11wxSizeEvent
       ;wxScrollHelper::HandleOnPaint(wxPaintEvent&)
@@ -9227,6 +9431,8 @@ EXPORTS
       ;wxScrollHelper::GetTargetWindow() const
       GetTargetWindow__14wxScrollHelperCFv
       __vft14wxScrollHelper
+      ;wxGenericScrolledWindow::GetEventTable() const
+      GetEventTable__23wxGenericScrolledWindowCFv
       ;wxGenericScrolledWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__23wxGenericScrolledWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxScrollHelper::CalcUnscrolledPosition(int,int,int*,int*) const
@@ -9256,33 +9462,51 @@ EXPORTS
       __vft24wxScrollHelperEvtHandler8wxObject
       ;wxScrollHelper::SetScrollbars(int,int,int,int,int,int,unsigned long)
       SetScrollbars__14wxScrollHelperFiN51Ul
+      ;wxGenericScrolledWindow::OnPaint(wxPaintEvent&)
+      OnPaint__23wxGenericScrolledWindowFR12wxPaintEvent
       ;wxScrollHelper::GetScrollPageSize(int) const
       GetScrollPageSize__14wxScrollHelperCFi
       ;wxScrollHelper::SetWindow(wxWindow*)
       SetWindow__14wxScrollHelperFP8wxWindow
       ;wxGenericScrolledWindow::sm_classwxGenericScrolledWindow
       sm_classwxGenericScrolledWindow__23wxGenericScrolledWindow
+      ;wxScrollHelper::DoSetTargetWindow(wxWindow*)
+      DoSetTargetWindow__14wxScrollHelperFP8wxWindow
   ;From object file:  ..\generic\spinctlg.cpp
   ;From object file:  ..\generic\splitter.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxSplitterWindow::OnSize(wxSizeEvent&)
-      OnSize__16wxSplitterWindowFR11wxSizeEvent
+      ;wxSplitterWindow::OnNavigationKey(wxNavigationKeyEvent&)
+      OnNavigationKey__16wxSplitterWindowFR20wxNavigationKeyEvent
       ;wxSplitterWindow::OnUnsplitEvent(wxSplitterEvent&)
       OnUnsplitEvent__16wxSplitterWindowFR15wxSplitterEvent
+      ;wxSplitterWindow::OnSize(wxSizeEvent&)
+      OnSize__16wxSplitterWindowFR11wxSizeEvent
+      ;wxSplitterWindow::OnChildFocus(wxChildFocusEvent&)
+      OnChildFocus__16wxSplitterWindowFR17wxChildFocusEvent
+      ;wxSplitterWindow::RemoveChild(wxWindowBase*)
+      RemoveChild__16wxSplitterWindowFP12wxWindowBase
       ;wxSplitterWindow::ReplaceWindow(wxWindow*,wxWindow*)
       ReplaceWindow__16wxSplitterWindowFP8wxWindowT1
+      ;wxSplitterWindow::GetDefaultItem() const
+      GetDefaultItem__16wxSplitterWindowCFv
       ;wxSplitterWindow::InitColours()
       InitColours__16wxSplitterWindowFv
-      ;wxSplitterWindow::OnSetCursor(wxSetCursorEvent&)
-      OnSetCursor__16wxSplitterWindowFR16wxSetCursorEvent
+      ;wxSplitterWindow::SetDefaultItem(wxWindow*)
+      SetDefaultItem__16wxSplitterWindowFP8wxWindow
+      ;wxSplitterWindow::OnFocus(wxFocusEvent&)
+      OnFocus__16wxSplitterWindowFR12wxFocusEvent
       wxEVT_COMMAND_SPLITTER_UNSPLIT
       __vft16wxSplitterWindow8wxObject
+      ;wxSplitterWindow::OnSetCursor(wxSetCursorEvent&)
+      OnSetCursor__16wxSplitterWindowFR16wxSetCursorEvent
       ;wxSplitterWindow::DrawSashTracker(int,int)
       DrawSashTracker__16wxSplitterWindowFiT1
       ;wxConstructorForwxSplitterWindow()
       wxConstructorForwxSplitterWindow__Fv
       ;wxSplitterWindow::~wxSplitterWindow()
       __dt__16wxSplitterWindowFv
+      ;wxSplitterWindow::SetFocus()
+      SetFocus__16wxSplitterWindowFv
       wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING
       ;wxSplitterWindow::OnSashPosChanged(wxSplitterEvent&)
       OnSashPosChanged__16wxSplitterWindowFR15wxSplitterEvent
@@ -9334,49 +9558,41 @@ EXPORTS
       Unsplit__16wxSplitterWindowFP8wxWindow
   ;From object file:  ..\generic\statusbr.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxStatusBarGeneric::SetMinHeight(int)
-      SetMinHeight__18wxStatusBarGenericFi
-      ;wxStatusBarGeneric::sm_eventTableEntries
-      sm_eventTableEntries__18wxStatusBarGeneric
-      ;wxStatusBarGeneric::OnPaint(wxPaintEvent&)
-      OnPaint__18wxStatusBarGenericFR12wxPaintEvent
-      ;wxStatusBarGeneric::SetStatusText(const wxString&,int)
-      SetStatusText__18wxStatusBarGenericFRC8wxStringi
-      ;wxStatusBarGeneric::GetEventTable() const
-      GetEventTable__18wxStatusBarGenericCFv
-      ;wxStatusBar::sm_classwxStatusBar
-      sm_classwxStatusBar__11wxStatusBar
-      ;wxStatusBarGeneric::sm_eventTable
-      sm_eventTable__18wxStatusBarGeneric
-      ;wxStatusBarGeneric::SetFieldsCount(int,const int*)
-      SetFieldsCount__18wxStatusBarGenericFiPCi
-      ;wxStatusBarGeneric::DrawFieldText(wxDC&,int)
-      DrawFieldText__18wxStatusBarGenericFR4wxDCi
-      ;wxStatusBarGeneric::wxStatusBarGeneric()
-      __ct__18wxStatusBarGenericFv
-      ;wxStatusBarGeneric::~wxStatusBarGeneric()
-      __dt__18wxStatusBarGenericFv
-      ;wxStatusBarGeneric::InitColours()
-      InitColours__18wxStatusBarGenericFv
-      ;wxStatusBarGeneric::GetStatusText(int) const
-      GetStatusText__18wxStatusBarGenericCFi
-      ;wxConstructorForwxStatusBarGeneric()
-      wxConstructorForwxStatusBarGeneric__Fv
-      ;wxConstructorForwxStatusBar()
-      wxConstructorForwxStatusBar__Fv
-      ;wxStatusBarGeneric::Create(wxWindow*,int,long,const wxString&)
-      Create__18wxStatusBarGenericFP8wxWindowilRC8wxString
-      ;wxStatusBarGeneric::sm_classwxStatusBarGeneric
-      sm_classwxStatusBarGeneric__18wxStatusBarGeneric
-      ;wxStatusBarGeneric::GetFieldRect(int,wxRect&) const
-      GetFieldRect__18wxStatusBarGenericCFiR6wxRect
-      __vft18wxStatusBarGeneric8wxObject
-      ;wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent&)
-      OnSysColourChanged__18wxStatusBarGenericFR23wxSysColourChangedEvent
-      ;wxStatusBarGeneric::SetStatusWidths(int,const int*)
-      SetStatusWidths__18wxStatusBarGenericFiPCi
-      ;wxStatusBarGeneric::DrawField(wxDC&,int)
-      DrawField__18wxStatusBarGenericFR4wxDCi
+      ;wxStatusBar::GetFieldRect(int,wxRect&) const
+      GetFieldRect__11wxStatusBarCFiR6wxRect
+      ;wxStatusBar::SetStatusWidths(int,const int*)
+      SetStatusWidths__11wxStatusBarFiPCi
+      ;wxStatusBar::DrawField(wxDC&,int)
+      DrawField__11wxStatusBarFR4wxDCi
+      ;wxStatusBar::DrawFieldText(wxDC&,int)
+      DrawFieldText__11wxStatusBarFR4wxDCi
+      ;wxStatusBar::InitColours()
+      InitColours__11wxStatusBarFv
+      ;wxStatusBar::Create(wxWindow*,int,long,const wxString&)
+      Create__11wxStatusBarFP8wxWindowilRC8wxString
+      ;wxStatusBar::OnPaint(wxPaintEvent&)
+      OnPaint__11wxStatusBarFR12wxPaintEvent
+      ;wxStatusBar::GetStatusText(int) const
+      GetStatusText__11wxStatusBarCFi
+      ;wxStatusBar::SetFieldsCount(int,const int*)
+      SetFieldsCount__11wxStatusBarFiPCi
+      ;wxStatusBar::SetStatusText(const wxString&,int)
+      SetStatusText__11wxStatusBarFRC8wxStringi
+      ;wxStatusBar::SetMinHeight(int)
+      SetMinHeight__11wxStatusBarFi
+      ;wxStatusBar::~wxStatusBar()
+      __dt__11wxStatusBarFv
+      ;wxStatusBar::OnSysColourChanged(wxSysColourChangedEvent&)
+      OnSysColourChanged__11wxStatusBarFR23wxSysColourChangedEvent
+      __vft11wxStatusBar8wxObject
+      ;wxStatusBar::GetEventTable() const
+      GetEventTable__11wxStatusBarCFv
+      ;wxStatusBar::sm_eventTable
+      sm_eventTable__11wxStatusBar
+      ;wxStatusBar::sm_eventTableEntries
+      sm_eventTableEntries__11wxStatusBar
+      ;wxStatusBar::wxStatusBar()
+      __ct__11wxStatusBarFv
   ;From object file:  ..\generic\tabg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTabControl::OnDraw(wxDC&,unsigned long)
@@ -9602,12 +9818,18 @@ EXPORTS
       RefreshSubtree__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem*,wxDC&,int,int&)
       PaintLevel__17wxGenericTreeCtrlFP17wxGenericTreeItemR4wxDCiRi
+      ;wxGenericTreeItem::HitTest(const wxPoint&,const wxGenericTreeCtrl*,int&,int)
+      HitTest__17wxGenericTreeItemFRC7wxPointPC17wxGenericTreeCtrlRii
       ;wxGenericTreeCtrl::OnRenameTimer()
       OnRenameTimer__17wxGenericTreeCtrlFv
       ;wxConstructorForwxGenericTreeCtrl()
       wxConstructorForwxGenericTreeCtrl__Fv
+      ;wxGenericTreeCtrl::RefreshSelected()
+      RefreshSelected__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::GetFirstVisibleItem() const
       GetFirstVisibleItem__17wxGenericTreeCtrlCFv
+      ;wxGenericTreeCtrl::CalculateLineHeight()
+      CalculateLineHeight__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::AdjustMyScrollbars()
       AdjustMyScrollbars__17wxGenericTreeCtrlFv
       ;wxGenericTreeItem::SetText(const wxString&)
@@ -9618,8 +9840,6 @@ EXPORTS
       Edit__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxTreeTextCtrl::sm_eventTableEntries
       sm_eventTableEntries__14wxTreeTextCtrl
-      ;wxTreeTextCtrl::sm_classwxTreeTextCtrl
-      sm_classwxTreeTextCtrl__14wxTreeTextCtrl
       __vft17wxGenericTreeCtrl8wxObject
       ;wxGenericTreeCtrl::SetItemBold(const wxTreeItemId&,unsigned long)
       SetItemBold__17wxGenericTreeCtrlFRC12wxTreeItemIdUl
@@ -9651,6 +9871,8 @@ EXPORTS
       __dt__17wxGenericTreeCtrlFv
       ;wxConstructorForwxTreeCtrl()
       wxConstructorForwxTreeCtrl__Fv
+      ;wxGenericTreeCtrl::SetForegroundColour(const wxColour&)
+      SetForegroundColour__17wxGenericTreeCtrlFRC8wxColour
       ;wxGenericTreeCtrl::GetStateImageList() const
       GetStateImageList__17wxGenericTreeCtrlCFv
       ;wxGenericTreeCtrl::GetImageList() const
@@ -9667,6 +9889,8 @@ EXPORTS
       SetItemFont__17wxGenericTreeCtrlFRC12wxTreeItemIdRC6wxFont
       ;wxGenericTreeCtrl::SetFont(const wxFont&)
       SetFont__17wxGenericTreeCtrlFRC6wxFont
+      ;wxGenericTreeCtrl::SetButtonsImageList(wxImageList*)
+      SetButtonsImageList__17wxGenericTreeCtrlFP11wxImageList
       ;wxGenericTreeCtrl::OnPaint(wxPaintEvent&)
       OnPaint__17wxGenericTreeCtrlFR12wxPaintEvent
       ;wxTreeTextCtrl::OnKeyUp(wxKeyEvent&)
@@ -9691,18 +9915,18 @@ EXPORTS
       DrawBorder__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeCtrl::Delete(const wxTreeItemId&)
       Delete__17wxGenericTreeCtrlFRC12wxTreeItemId
+      ;wxGenericTreeCtrl::AssignButtonsImageList(wxImageList*)
+      AssignButtonsImageList__17wxGenericTreeCtrlFP11wxImageList
       ;wxGenericTreeCtrl::HitTest(const wxPoint&,int&)
       HitTest__17wxGenericTreeCtrlFRC7wxPointRi
-      ;wxGenericTreeItem::HitTest(const wxPoint&,const wxGenericTreeCtrl*,int&)
-      HitTest__17wxGenericTreeItemFRC7wxPointPC17wxGenericTreeCtrlRi
       ;wxGenericTreeCtrl::GetItemImage(const wxTreeItemId&,wxTreeItemIcon) const
       GetItemImage__17wxGenericTreeCtrlCFRC12wxTreeItemId14wxTreeItemIcon
-      ;wxConstructorForwxTreeTextCtrl()
-      wxConstructorForwxTreeTextCtrl__Fv
       ;wxGenericTreeItem::~wxGenericTreeItem()
       __dt__17wxGenericTreeItemFv
       ;wxGenericTreeCtrl::Unselect()
       Unselect__17wxGenericTreeCtrlFv
+      ;wxGenericTreeCtrl::SetBackgroundColour(const wxColour&)
+      SetBackgroundColour__17wxGenericTreeCtrlFRC8wxColour
       ;wxGenericTreeCtrl::OnRenameAccept()
       OnRenameAccept__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::GetEventTable() const
@@ -9734,8 +9958,6 @@ EXPORTS
       OnKillFocus__14wxTreeTextCtrlFR12wxFocusEvent
       ;wxGenericTreeCtrl::OnChar(wxKeyEvent&)
       OnChar__17wxGenericTreeCtrlFR10wxKeyEvent
-      ;wxGenericTreeCtrl::GetPrev(const wxTreeItemId&) const
-      GetPrev__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::GetPrevVisible(const wxTreeItemId&) const
       GetPrevVisible__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::GetPrevSibling(const wxTreeItemId&) const
@@ -9756,8 +9978,6 @@ EXPORTS
       SetItemData__17wxGenericTreeCtrlFRC12wxTreeItemIdP14wxTreeItemData
       ;wxGenericTreeCtrl::SetIndent(unsigned int)
       SetIndent__17wxGenericTreeCtrlFUi
-      ;wxGenericTreeItem::SetCross(int,int)
-      SetCross__17wxGenericTreeItemFiT1
       ;wxGenericTreeCtrl::OnCompareItems(const wxTreeItemId&,const wxTreeItemId&)
       OnCompareItems__17wxGenericTreeCtrlFRC12wxTreeItemIdT1
       ;wxGenericTreeCtrl::InsertItem(const wxTreeItemId&,unsigned int,const wxString&,int,int,wxTreeItemData*)
@@ -9776,6 +9996,8 @@ EXPORTS
       SetItemImage__17wxGenericTreeCtrlFRC12wxTreeItemIdi14wxTreeItemIcon
       ;wxGenericTreeCtrl::SelectItem(const wxTreeItemId&,unsigned long,unsigned long)
       SelectItem__17wxGenericTreeCtrlFRC12wxTreeItemIdUlT2
+      ;wxGenericTreeCtrl::GetButtonsImageList() const
+      GetButtonsImageList__17wxGenericTreeCtrlCFv
       ;wxGenericTreeCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__17wxGenericTreeCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxGenericTreeCtrl::PaintItem(wxGenericTreeItem*,wxDC&)
@@ -9787,6 +10009,8 @@ EXPORTS
       __vft17wxTreeRenameTimer8wxObject
       ;wxGenericTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem*,wxGenericTreeItem*,unsigned long)
       TagAllChildrenUntilLast__17wxGenericTreeCtrlFP17wxGenericTreeItemT1Ul
+      ;wxGenericTreeCtrl::SetWindowStyle(const long)
+      SetWindowStyle__17wxGenericTreeCtrlFCl
       ;wxGenericTreeCtrl::GetNextVisible(const wxTreeItemId&) const
       GetNextVisible__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::GetItemData(const wxTreeItemId&) const
@@ -9799,6 +10023,8 @@ EXPORTS
       RefreshLine__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem*,wxGenericTreeItem*)
       SelectItemRange__17wxGenericTreeCtrlFP17wxGenericTreeItemT1
+      ;wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem*)
+      RefreshSelectedUnder__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::DrawDropEffect(wxGenericTreeItem*)
       DrawDropEffect__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxTreeRenameTimer::Notify()
@@ -9810,8 +10036,6 @@ EXPORTS
       SetItemTextColour__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxColour
       ;wxGenericTreeCtrl::SetItemBackgroundColour(const wxTreeItemId&,const wxColour&)
       SetItemBackgroundColour__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxColour
-      ;wxGenericTreeItem::Reset()
-      Reset__17wxGenericTreeItemFv
       ;wxTreeTextCtrl::GetEventTable() const
       GetEventTable__14wxTreeTextCtrlCFv
       ;wxGenericTreeCtrl::FillArray(wxGenericTreeItem*,wxArrayTreeItemIds&) const
@@ -10009,6 +10233,8 @@ EXPORTS
       __vft14wxHtmlFontCell8wxObject
       ;wxHtmlContainerCell::OnMouseClick(wxWindow*,int,int,const wxMouseEvent&)
       OnMouseClick__19wxHtmlContainerCellFP8wxWindowiT2RC12wxMouseEvent
+      ;wxHtmlContainerCell::GetHorizontalConstraints(int*,int*) const
+      GetHorizontalConstraints__19wxHtmlContainerCellCFPiT1
       ;wxHtmlCell::~wxHtmlCell()
       __dt__10wxHtmlCellFv
       ;wxHtmlContainerCell::Find(int,const void*) const
@@ -10042,6 +10268,8 @@ EXPORTS
       GetLink__19wxHtmlContainerCellCFiT1
       ;wxHtmlContainerCell::GetIndent(int) const
       GetIndent__19wxHtmlContainerCellCFi
+      ;wxHtmlCell::FindCellByPos(int,int) const
+      FindCellByPos__10wxHtmlCellCFiT1
       ;wxHtmlWordCell::Draw(wxDC&,int,int,int,int)
       Draw__14wxHtmlWordCellFR4wxDCiN32
       ;wxHtmlContainerCell::Draw(wxDC&,int,int,int,int)
@@ -10054,16 +10282,20 @@ EXPORTS
       __vft16wxHtmlColourCell8wxObject
       ;wxHtmlContainerCell::AdjustPagebreak(int*) const
       AdjustPagebreak__19wxHtmlContainerCellCFPi
+      ;wxHtmlContainerCell::FindCellByPos(int,int) const
+      FindCellByPos__19wxHtmlContainerCellCFiT1
       ;wxHtmlColourCell::DrawInvisible(wxDC&,int,int)
       DrawInvisible__16wxHtmlColourCellFR4wxDCiT2
       ;wxHtmlContainerCell::SetAlign(const wxHtmlTag&)
       SetAlign__19wxHtmlContainerCellFRC9wxHtmlTag
-      ;wxHtmlContainerCell::GetIndentUnits(int) const
-      GetIndentUnits__19wxHtmlContainerCellCFi
+      ;wxHtmlCell::GetHorizontalConstraints(int*,int*) const
+      GetHorizontalConstraints__10wxHtmlCellCFPiT1
       ;wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow*,int)
       __ct__16wxHtmlWidgetCellFP8wxWindowi
       ;wxHtmlWidgetCell::Layout(int)
       Layout__16wxHtmlWidgetCellFi
+      ;wxHtmlContainerCell::GetIndentUnits(int) const
+      GetIndentUnits__19wxHtmlContainerCellCFi
       ;wxHtmlCell::wxHtmlCell()
       __ct__10wxHtmlCellFv
       ;wxHtmlCell::Find(int,const void*) const
@@ -10148,12 +10380,12 @@ EXPORTS
       PopTagHandler__12wxHtmlParserFv
       ;wxHtmlParser::CreateDOMTree()
       CreateDOMTree__12wxHtmlParserFv
-      ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
-      PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
-      ;wxHtmlEntitiesParser::SetEncoding(wxFontEncoding)
-      SetEncoding__20wxHtmlEntitiesParserF14wxFontEncoding
       ;wxHtmlEntitiesParser::Parse(const wxString&)
       Parse__20wxHtmlEntitiesParserFRC8wxString
+      ;wxHtmlEntitiesParser::SetEncoding(wxFontEncoding)
+      SetEncoding__20wxHtmlEntitiesParserF14wxFontEncoding
+      ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
+      PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
       ;wxHtmlTextPieces::RemoveAt(unsigned int)
       RemoveAt__16wxHtmlTextPiecesFUi
       ;wxHtmlEntitiesParser::GetCharForCode(unsigned int)
@@ -10232,6 +10464,8 @@ EXPORTS
       __dt__18wxHtmlHistoryArrayFv
       ;wxHtmlWindow::~wxHtmlWindow()
       __dt__12wxHtmlWindowFv
+      ;wxHtmlWindow::OnCellMouseHover(wxHtmlCell*,int,int)
+      OnCellMouseHover__12wxHtmlWindowFP10wxHtmlCelliT2
       ;wxHtmlWindow::HistoryCanForward()
       HistoryCanForward__12wxHtmlWindowFv
       ;wxHtmlWindow::HistoryBack()
@@ -10273,6 +10507,8 @@ EXPORTS
       m_DefaultFilter__12wxHtmlWindow
       ;wxHtmlWindow::OnSetTitle(const wxString&)
       OnSetTitle__12wxHtmlWindowFRC8wxString
+      ;wxHtmlWindow::OnCellClicked(wxHtmlCell*,int,int,const wxMouseEvent&)
+      OnCellClicked__12wxHtmlWindowFP10wxHtmlCelliT2RC12wxMouseEvent
       ;wxHtmlWindow::OnSize(wxSizeEvent&)
       OnSize__12wxHtmlWindowFR11wxSizeEvent
       ;wxHtmlWindow::OnMouseEvent(wxMouseEvent&)
@@ -10319,6 +10555,8 @@ EXPORTS
       WriteCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
       ;wxHtmlWindow::SetRelatedFrame(wxFrame*,const wxString&)
       SetRelatedFrame__12wxHtmlWindowFP7wxFrameRC8wxString
+      ;wxHtmlWindow::AppendToPage(const wxString&)
+      AppendToPage__12wxHtmlWindowFRC8wxString
   ;From object file:  ..\html\htmprint.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlDCRenderer::SetDC(wxDC*,double)
@@ -10441,19 +10679,23 @@ EXPORTS
       GetLink__22wxHtmlImageMapAreaCellCFiT1
       ;wxHtmlImageMapCell::Find(int,const void*) const
       Find__18wxHtmlImageMapCellCFiPCv
+      ;wxHtmlImageCell::AdvanceAnimation(wxTimer*)
+      AdvanceAnimation__15wxHtmlImageCellFP7wxTimer
+      ;wxHtmlImageCell::SetImage(const wxImage&)
+      SetImage__15wxHtmlImageCellFRC7wxImage
       ;HTML_ModuleImage::sm_classHTML_ModuleImage
       sm_classHTML_ModuleImage__16HTML_ModuleImage
       ;_link_dummy_func_m_image()
       _link_dummy_func_m_image__Fv
       ;CoordArray::DoEmpty()
       DoEmpty__10CoordArrayFv
-      ;wxHtmlImageCell::wxHtmlImageCell(wxFSFile*,int,int,double,int,wxString)
-      __ct__15wxHtmlImageCellFP8wxFSFileiT2dT28wxString
       __vft18wxHtmlImageMapCell8wxObject
       ;CoordArray::DoCopy(const CoordArray&)
       DoCopy__10CoordArrayFRC10CoordArray
       ;CoordArray::CoordArray(const CoordArray&)
       __ct__10CoordArrayFRC10CoordArray
+      ;wxHtmlImageCell::Layout(int)
+      Layout__15wxHtmlImageCellFi
       ;wxHtmlImageMapCell::GetLink(int,int) const
       GetLink__18wxHtmlImageMapCellCFiT1
       ;CoordArray::Index(const int&,unsigned long) const
@@ -10464,6 +10706,10 @@ EXPORTS
       Insert__10CoordArrayFRCiUi
       ;wxHtmlImageCell::GetLink(int,int) const
       GetLink__15wxHtmlImageCellCFiT1
+      ;wxHtmlImageCell::~wxHtmlImageCell()
+      __dt__15wxHtmlImageCellFv
+      ;wxHtmlImageCell::wxHtmlImageCell(wxWindow*,wxFSFile*,int,int,double,int,const wxString&)
+      __ct__15wxHtmlImageCellFP8wxWindowP8wxFSFileiT3dT3RC8wxString
   ;From object file:  ..\html\m_layout.cpp
     ;PUBDEFs (Symbols available from object file):
       ;HTML_ModuleLayout::sm_classHTML_ModuleLayout
@@ -10513,6 +10759,8 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTableCell::ReallocRows(int)
       ReallocRows__15wxHtmlTableCellFi
+      ;wxHtmlTableCell::ComputeMinMaxWidths()
+      ComputeMinMaxWidths__15wxHtmlTableCellFv
       ;wxConstructorForHTML_ModuleTables()
       wxConstructorForHTML_ModuleTables__Fv
       __vft15wxHtmlTableCell8wxObject
@@ -10659,6 +10907,8 @@ EXPORTS
       RegisterWindowClasses__5wxAppFUl
       ;wxApp::sm_eventTableEntries
       sm_eventTableEntries__5wxApp
+      ;wxApp::Yield(unsigned long)
+      Yield__5wxAppFUl
       ;wxApp::OnIdle(wxIdleEvent&)
       OnIdle__5wxAppFR11wxIdleEvent
       ;wxMsgArray::wxMsgArray(const wxMsgArray&)
@@ -10669,8 +10919,6 @@ EXPORTS
       Insert__10wxMsgArrayFRC5_QMSGUi
       ;wxApp::HandleSockets()
       HandleSockets__5wxAppFv
-      ;wxYieldIfNeeded()
-      wxYieldIfNeeded__Fv
       wxDEFAULT_MDIPARENTFRAME_ICON
       ;wxApp::wxApp()
       __ct__5wxAppFv
@@ -10693,8 +10941,6 @@ EXPORTS
       RemoveSocketHandler__5wxAppFi
       ;wxMsgArray::DoEmpty()
       DoEmpty__10wxMsgArrayFv
-      ;wxYield()
-      wxYield__Fv
       wxSTD_FRAME_ICON
       wxDEFAULT_FRAME_ICON
       ;wxApp::ProcessIdle()
@@ -10909,6 +11155,10 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxButton::Command(wxCommandEvent&)
       Command__8wxButtonFR14wxCommandEvent
+      ;wxButton::MakeOwnerDrawn()
+      MakeOwnerDrawn__8wxButtonFv
+      ;wxButton::WindowProc(unsigned int,void*,void*)
+      WindowProc__8wxButtonFUiPvT2
       ;wxButton::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
       OnCtlColor__8wxButtonFUlT1UiT3PvT5
       ;wxButton::~wxButton()
@@ -11043,6 +11293,8 @@ EXPORTS
       sm_classwxChoice__8wxChoice
       ;wxChoice::DoGetItemClientObject(int) const
       DoGetItemClientObject__8wxChoiceCFi
+      ;wxChoice::Free()
+      Free__8wxChoiceFv
       ;wxChoice::GetCount() const
       GetCount__8wxChoiceCFv
       ;wxChoice::SetString(int,const wxString&)
@@ -11140,6 +11392,8 @@ EXPORTS
       SetEditable__10wxComboBoxFUl
       ;wxComboBox::SetInsertionPointEnd()
       SetInsertionPointEnd__10wxComboBoxFv
+      ;wxComboBox::ProcessEditMsg(unsigned int,void*,void*)
+      ProcessEditMsg__10wxComboBoxFUiPvT2
       ;wxComboBox::SetValue(const wxString&)
       SetValue__10wxComboBoxFRC8wxString
       ;wxComboBox::SetInsertionPoint(long)
@@ -11152,6 +11406,7 @@ EXPORTS
       wxConstructorForwxComboBox__Fv
       ;wxComboBox::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,int,const wxString*,long,const wxValidator&,const wxString&)
       Create__10wxComboBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizeT2PC8wxStringlRC11wxValidatorT3
+      wxComboEditWndProc
       ;wxComboBox::OS2Command(unsigned int,unsigned short)
       OS2Command__10wxComboBoxFUiUs
   ;From object file:  ..\os2\control.cpp
@@ -11185,6 +11440,8 @@ EXPORTS
       __vft9wxControl8wxObject
       ;wxControl::~wxControl()
       __dt__9wxControlFv
+      ;wxControl::OS2CreateControl(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
+      OS2CreateControl__9wxControlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
   ;From object file:  ..\os2\cursor.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCursorRefData::~wxCursorRefData()
@@ -11831,6 +12088,8 @@ EXPORTS
       GetPointSize__6wxFontCFv
       ;wxFont::Create(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       Create__6wxFontFiN31UlRC8wxString14wxFontEncoding
+      ;wxFont::wxFont(const wxNativeFontInfo&)
+      __ct__6wxFontFRC16wxNativeFontInfo
   ;From object file:  ..\os2\fontdlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxConstructorForwxFontDialog()
@@ -11879,97 +12138,99 @@ EXPORTS
       FromString__20wxNativeEncodingInfoFRC8wxString
   ;From object file:  ..\os2\frame.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxFrameOS2::OS2Create(int,wxWindow*,const char*,wxWindow*,const char*,int,int,int,int,long)
-      OS2Create__10wxFrameOS2FiP8wxWindowPCcT2T3N41l
-      ;wxFrameOS2::OnActivate(wxActivateEvent&)
-      OnActivate__10wxFrameOS2FR15wxActivateEvent
-      ;wxFrameOS2::Iconize(unsigned long)
-      Iconize__10wxFrameOS2FUl
-      ;wxFrameOS2::DoSetClientSize(int,int)
-      DoSetClientSize__10wxFrameOS2FiT1
-      ;wxFrameOS2::HandleSize(int,int,unsigned int)
-      HandleSize__10wxFrameOS2FiT1Ui
-      ;wxFrameOS2::Restore()
-      Restore__10wxFrameOS2Fv
-      ;wxFrameOS2::sm_eventTableEntries
-      sm_eventTableEntries__10wxFrameOS2
-      ;wxFrameOS2::m_bUseNativeStatusBar
-      m_bUseNativeStatusBar__10wxFrameOS2
-      ;wxFrameOS2::IsIconized() const
-      IsIconized__10wxFrameOS2CFv
-      ;wxFrameOS2::HandlePaint()
-      HandlePaint__10wxFrameOS2Fv
-      ;wxFrameOS2::DetachMenuBar()
-      DetachMenuBar__10wxFrameOS2Fv
-      ;wxFrameOS2::CreateToolBar(long,int,const wxString&)
-      CreateToolBar__10wxFrameOS2FliRC8wxString
-      ;wxFrameOS2::Maximize(unsigned long)
-      Maximize__10wxFrameOS2FUl
-      ;wxFrameOS2::OnSysColourChanged(wxSysColourChangedEvent&)
-      OnSysColourChanged__10wxFrameOS2FR23wxSysColourChangedEvent
-      ;wxFrameOS2::HandleMenuSelect(unsigned short,unsigned short,unsigned long)
-      HandleMenuSelect__10wxFrameOS2FUsT1Ul
-      ;wxFrameOS2::HandleCommand(unsigned short,unsigned short,unsigned long)
-      HandleCommand__10wxFrameOS2FUsT1Ul
-      ;wxFrameOS2::DoGetClientSize(int*,int*) const
-      DoGetClientSize__10wxFrameOS2CFPiT1
-      ;wxFrameOS2::DoGetSize(int*,int*) const
-      DoGetSize__10wxFrameOS2CFPiT1
-      ;wxFrameOS2::~wxFrameOS2()
-      __dt__10wxFrameOS2Fv
+      ;wxFrame::Show(unsigned long)
+      Show__7wxFrameFUl
+      ;wxFrame::Iconize(unsigned long)
+      Iconize__7wxFrameFUl
+      ;wxFrame::HandleMenuSelect(unsigned short,unsigned short,unsigned long)
+      HandleMenuSelect__7wxFrameFUsT1Ul
+      ;wxFrame::OS2TranslateMessage(void**)
+      OS2TranslateMessage__7wxFrameFPPv
+      ;wxFrame::HandlePaint()
+      HandlePaint__7wxFrameFv
+      ;wxFrame::OnCreateStatusBar(int,long,int,const wxString&)
+      OnCreateStatusBar__7wxFrameFilT1RC8wxString
+      ;wxFrame::OnActivate(wxActivateEvent&)
+      OnActivate__7wxFrameFR15wxActivateEvent
+      __vft7wxFrame8wxObject
+      ;wxFrame::DoSetClientSize(int,int)
+      DoSetClientSize__7wxFrameFiT1
+      ;wxFrame::HandleSize(int,int,unsigned int)
+      HandleSize__7wxFrameFiT1Ui
       ;wxConstructorForwxFrame()
       wxConstructorForwxFrame__Fv
-      ;wxFrameOS2::InternalSetMenuBar()
-      InternalSetMenuBar__10wxFrameOS2Fv
-      ;wxFrameOS2::GetClient()
-      GetClient__10wxFrameOS2Fv
-      ;wxFrameOS2::AttachMenuBar(wxMenuBar*)
-      AttachMenuBar__10wxFrameOS2FP9wxMenuBar
-      ;wxFrameOS2::SetClient(wxWindow*)
-      SetClient__10wxFrameOS2FP8wxWindow
-      ;wxFrameOS2::ShowFullScreen(unsigned long,long)
-      ShowFullScreen__10wxFrameOS2FUll
-      ;wxFrameOS2::SetClient(unsigned long)
-      SetClient__10wxFrameOS2FUl
-      ;wxFrameOS2::IconizeChildFrames(unsigned long)
-      IconizeChildFrames__10wxFrameOS2FUl
+      ;wxFrame::SetIcon(const wxIcon&)
+      SetIcon__7wxFrameFRC6wxIcon
+      ;wxFrame::Restore()
+      Restore__7wxFrameFv
+      ;wxFrame::IsMaximized() const
+      IsMaximized__7wxFrameCFv
+      ;wxFrame::IsIconized() const
+      IsIconized__7wxFrameCFv
+      ;wxFrame::GetClientAreaOrigin() const
+      GetClientAreaOrigin__7wxFrameCFv
+      ;wxFrame::AttachMenuBar(wxMenuBar*)
+      AttachMenuBar__7wxFrameFP9wxMenuBar
+      ;wxFrame::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
+      Create__7wxFrameFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
+      ;wxFrame::OnSysColourChanged(wxSysColourChangedEvent&)
+      OnSysColourChanged__7wxFrameFR23wxSysColourChangedEvent
+      ;wxFrame::ShowFullScreen(unsigned long,long)
+      ShowFullScreen__7wxFrameFUll
+      ;wxFrame::DoShowWindow(int)
+      DoShowWindow__7wxFrameFi
+      ;wxFrame::sm_eventTable
+      sm_eventTable__7wxFrame
+      ;wxFrame::sm_eventTableEntries
+      sm_eventTableEntries__7wxFrame
       ;wxFrame::sm_classwxFrame
       sm_classwxFrame__7wxFrame
-      ;wxFrameOS2::GetEventTable() const
-      GetEventTable__10wxFrameOS2CFv
-      ;wxFrameOS2::SetMenuBar(wxMenuBar*)
-      SetMenuBar__10wxFrameOS2FP9wxMenuBar
-      ;wxFrameOS2::PositionStatusBar()
-      PositionStatusBar__10wxFrameOS2Fv
-      ;wxFrameOS2::OS2WindowProc(unsigned int,void*,void*)
-      OS2WindowProc__10wxFrameOS2FUiPvT2
-      ;wxFrameOS2::OS2TranslateMessage(void**)
-      OS2TranslateMessage__10wxFrameOS2FPPv
-      ;wxFrameOS2::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
-      Create__10wxFrameOS2FP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
-      ;wxFrameOS2::Show(unsigned long)
-      Show__10wxFrameOS2FUl
-      __vft10wxFrameOS28wxObject
-      ;wxFrameOS2::DoShowWindow(int)
-      DoShowWindow__10wxFrameOS2Fi
-      ;wxFrameOS2::Init()
-      Init__10wxFrameOS2Fv
-      ;wxFrameOS2::sm_eventTable
-      sm_eventTable__10wxFrameOS2
-      ;wxFrameOS2::DoGetPosition(int*,int*) const
-      DoGetPosition__10wxFrameOS2CFPiT1
-      ;wxFrameOS2::IsMaximized() const
-      IsMaximized__10wxFrameOS2CFv
-      ;wxFrameOS2::SetIcon(const wxIcon&)
-      SetIcon__10wxFrameOS2FRC6wxIcon
-      ;wxFrameOS2::PositionToolBar()
-      PositionToolBar__10wxFrameOS2Fv
-      ;wxFrameOS2::GetClientAreaOrigin() const
-      GetClientAreaOrigin__10wxFrameOS2CFv
-      ;wxFrameOS2::OnCreateStatusBar(int,long,int,const wxString&)
-      OnCreateStatusBar__10wxFrameOS2FilT1RC8wxString
-      wxFrameWndProc
+      ;wxFrame::m_bUseNativeStatusBar
+      m_bUseNativeStatusBar__7wxFrame
+      ;wxFrame::~wxFrame()
+      __dt__7wxFrameFv
+      ;wxFrame::GetClient()
+      GetClient__7wxFrameFv
+      ;wxFrame::OS2Create(int,wxWindow*,const char*,wxWindow*,const char*,int,int,int,int,long)
+      OS2Create__7wxFrameFiP8wxWindowPCcT2T3N41l
+      ;wxFrame::HandleCommand(unsigned short,unsigned short,unsigned long)
+      HandleCommand__7wxFrameFUsT1Ul
+      ;wxFrame::DoGetSize(int*,int*) const
+      DoGetSize__7wxFrameCFPiT1
+      ;wxFrame::DoGetPosition(int*,int*) const
+      DoGetPosition__7wxFrameCFPiT1
+      ;wxFrame::PositionStatusBar()
+      PositionStatusBar__7wxFrameFv
+      ;wxFrame::PositionToolBar()
+      PositionToolBar__7wxFrameFv
+      ;wxFrame::OS2WindowProc(unsigned int,void*,void*)
+      OS2WindowProc__7wxFrameFUiPvT2
+      ;wxFrame::InternalSetMenuBar()
+      InternalSetMenuBar__7wxFrameFv
+      ;wxFrame::CreateToolBar(long,int,const wxString&)
+      CreateToolBar__7wxFrameFliRC8wxString
+      ;wxFrame::Maximize(unsigned long)
+      Maximize__7wxFrameFUl
+      ;wxFrame::SetClient(unsigned long)
+      SetClient__7wxFrameFUl
+      ;wxFrame::IconizeChildFrames(unsigned long)
+      IconizeChildFrames__7wxFrameFUl
+      ;wxFrame::DoGetClientSize(int*,int*) const
+      DoGetClientSize__7wxFrameCFPiT1
+      ;wxFrame::Init()
+      Init__7wxFrameFv
+      ;wxFrame::SetMenuBar(wxMenuBar*)
+      SetMenuBar__7wxFrameFP9wxMenuBar
+      ;wxFrame::GetEventTable() const
+      GetEventTable__7wxFrameCFv
+      ;wxFrame::DetachMenuBar()
+      DetachMenuBar__7wxFrameFv
+      ;wxFrame::AlterChildPos()
+      AlterChildPos__7wxFrameFv
       wxFrameMainWndProc
+      wxFrameWndProc
+      ;wxFrame::SetClient(wxWindow*)
+      SetClient__7wxFrameFP8wxWindow
   ;From object file:  ..\os2\gauge.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft7wxGauge8wxObject
@@ -12333,16 +12594,12 @@ EXPORTS
       DoSetItemClientData__9wxListBoxFiPv
       ;wxListBox::DoAppend(const wxString&)
       DoAppend__9wxListBoxFRC8wxString
-      ;wxListBox::SetHorizontalExtent(const wxString&)
-      SetHorizontalExtent__9wxListBoxFRC8wxString
       ;wxListBox::OS2Command(unsigned int,unsigned short)
       OS2Command__9wxListBoxFUiUs
       ;wxListBox::sm_classwxListBox
       sm_classwxListBox__9wxListBox
       ;wxListBox::DoSetFirstItem(int)
       DoSetFirstItem__9wxListBoxFi
-      ;wxListBox::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
-      OnCtlColor__9wxListBoxFUlT1UiT3PvT5
       ;wxListBox::IsSelected(int) const
       IsSelected__9wxListBoxCFi
       ;wxListBox::SetString(int,const wxString&)
@@ -13054,6 +13311,8 @@ EXPORTS
       __pp__16wxRegionIteratorFv
       ;wxRegion::Combine(const wxRegion&,wxRegionOp)
       Combine__8wxRegionFRC8wxRegion10wxRegionOp
+      ;wxRegion::wxRegion(unsigned long,unsigned long)
+      __ct__8wxRegionFUlT1
       ;wxRegion::wxRegion(const wxPoint&,const wxPoint&)
       __ct__8wxRegionFRC7wxPointT1
       ;wxRegion::Contains(int,int) const
@@ -13103,11 +13362,9 @@ EXPORTS
       __ct__16wxRegionIteratorFRC8wxRegion
       ;wxRegionIterator::GetH() const
       GetH__16wxRegionIteratorCFv
-      ;wxRegion::wxRegion(unsigned long)
-      __ct__8wxRegionFUl
-      __vft16wxRegionIterator8wxObject
       ;wxRegion::SetPS(unsigned long)
       SetPS__8wxRegionFUl
+      __vft16wxRegionIterator8wxObject
       ;wxRegion::wxRegion(int,int,int,int)
       __ct__8wxRegionFiN31
       ;wxRegion::Empty() const
@@ -13158,6 +13415,8 @@ EXPORTS
       sm_optionNames__22wxSystemSettingsModule
       ;wxSystemSettingsModule::OnExit()
       OnExit__22wxSystemSettingsModuleFv
+      ;wxSystemSettings::GetCapability(int)
+      GetCapability__16wxSystemSettingsFi
       ;wxSystemSettingsModule::sm_optionValues
       sm_optionValues__22wxSystemSettingsModule
       ;wxConstructorForwxSystemSettingsModule()
@@ -14014,10 +14273,8 @@ EXPORTS
       OS2OnMeasureItem__8wxWindowFiPPv
       ;wxWindow::OS2DestroyWindow()
       OS2DestroyWindow__8wxWindowFv
-      ;wxWindow::HandleWindowParams(_WNDPARAMS*,void*)
-      HandleWindowParams__8wxWindowFP10_WNDPARAMSPv
-      ;wxWindow::HandlePresParamChanged(void*)
-      HandlePresParamChanged__8wxWindowFPv
+      ;wxWindow::HandleKeyUp(unsigned long,void*)
+      HandleKeyUp__8wxWindowFUlPv
       ;wxWindow::HandleKeyDown(unsigned short,void*)
       HandleKeyDown__8wxWindowFUsPv
       ;wxWindow::Clear()
@@ -14054,8 +14311,6 @@ EXPORTS
       HandleSysCommand__8wxWindowFPvT1
       ;wxWindow::HandleSize(int,int,unsigned int)
       HandleSize__8wxWindowFiT1Ui
-      ;wxWindow::AdjustForParentClientOrigin(int&,int&,int)
-      AdjustForParentClientOrigin__8wxWindowFRiT1i
       ;wxWindow::Init()
       Init__8wxWindowFv
       ;wxGetMousePosition()
@@ -14156,14 +14411,14 @@ EXPORTS
       ScrollWindow__8wxWindowFiT1PC6wxRect
       ;wxWindow::OnIdle(wxIdleEvent&)
       OnIdle__8wxWindowFR11wxIdleEvent
-      ;wxWindow::HandleChar(unsigned short,void*,unsigned long)
-      HandleChar__8wxWindowFUsPvUl
       ;wxWindow::HandleActivate(int,unsigned long)
       HandleActivate__8wxWindowFiUl
       ;wxWindow::FindItemByHWND(unsigned long,unsigned long) const
       FindItemByHWND__8wxWindowCFUlT1
       ;wxWindow::OS2Create(unsigned long,char*,const char*,unsigned long,long,long,long,long,unsigned long,unsigned long,unsigned long,void*,void*,unsigned long)
       OS2Create__8wxWindowFUlPcPCcT1lN35N31PvT12_T1
+      ;wxWindow::HandleChar(unsigned long,void*,unsigned long)
+      HandleChar__8wxWindowFUlPvT1
       ;wxWindow::DoMoveWindow(int,int,int,int)
       DoMoveWindow__8wxWindowFiN31
       ;wxWindow::DoClientToScreen(int*,int*) const
@@ -14172,8 +14427,6 @@ EXPORTS
       OS2DetachWindowMenu__8wxWindowFv
       ;wxWindow::OS2OnDrawItem(int,void**)
       OS2OnDrawItem__8wxWindowFiPPv
-      ;wxWindow::HandleKeyUp(unsigned short,void*)
-      HandleKeyUp__8wxWindowFUsPv
       ;wxWindow::GetCharWidth() const
       GetCharWidth__8wxWindowCFv
       ;wxWindowBase::FindFocus()
