applied (slightly modified) wxGLApp patch for MSW

[wxWidgets.git] / src / os2 / wx23.def

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index 820825ac17837ce82c42f8bab8b59c8a4899d920..94f6c92c244ef426faeaadbd0e60090b64960eb5 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,23 +4,34 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
-;From library:  H:\DEV\WX2\WXWINDOWS\lib\wx.lib
+;From library:  F:\DEV\WX2\WXWINDOWS\LIB\wx.lib
   ;From object file:  dummy.cpp
     ;PUBDEFs (Symbols available from object file):
       wxDummyChar
   ;From object file:  ..\common\appcmn.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxOnAssert(const char*,int,const char*)
+      wxOnAssert__FPCciT1
       ;wxAppBase::OnInitGui()
       OnInitGui__9wxAppBaseFv
       __vft9wxAppBase8wxObject
+      ;wxTrap()
+      wxTrap__Fv
+      ;wxAppBase::OnAssert(const char*,int,const char*)
+      OnAssert__9wxAppBaseFPCciT1
       ;wxAppBase::OnExit()
       OnExit__9wxAppBaseFv
+      ;wxAssertIsEqual(int,int)
+      wxAssertIsEqual__FiT1
       ;wxAppBase::wxAppBase()
       __ct__9wxAppBaseFv
+      ;wxAppBase::OnInit()
+      OnInit__9wxAppBaseFv
       ;wxAppBase::ProcessPendingEvents()
       ProcessPendingEvents__9wxAppBaseFv
       ;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&)
@@ -218,6 +229,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)
@@ -721,11 +750,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
@@ -1148,6 +1183,8 @@ EXPORTS
       __dt__11wxBaseArrayFv
       ;wxBaseArray::Sort(int(*)(const void*,const void*))
       Sort__11wxBaseArrayFPFPCvT1_i
+      ;wxBaseArray::IndexForInsert(long,int(*)(const void*,const void*)) const
+      IndexForInsert__11wxBaseArrayCFlPFPCvT1_i
       ;wxBaseArray::wxBaseArray()
       __ct__11wxBaseArrayFv
       ;wxBaseArray::Clear()
@@ -1294,14 +1331,16 @@ EXPORTS
       wxConstructorForwxDropFilesEvent__Fv
       ;wxEvtHandler::sm_eventTableEntries
       sm_eventTableEntries__12wxEvtHandler
-      ;wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow*)
-      __ct__20wxWindowDestroyEventFP8wxWindow
+      ;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
@@ -1361,7 +1400,6 @@ EXPORTS
       wxEVT_MOTION
       wxEVT_KEY_DOWN
       wxEVT_JOY_BUTTON_DOWN
-      wxEVT_COMMAND_TEXT_ENTER
       ;wxConstructorForwxWindowCreateEvent()
       wxConstructorForwxWindowCreateEvent__Fv
       ;wxConstructorForwxUpdateUIEvent()
@@ -1376,6 +1414,7 @@ EXPORTS
       __dt__12wxEvtHandlerFv
       ;wxEvtHandler::GetEventTable() const
       GetEventTable__12wxEvtHandlerCFv
+      wxEVT_CHILD_FOCUS
       wxEVT_NC_LEAVE_WINDOW
       wxEVT_DROP_FILES
       wxEVT_COMMAND_RIGHT_CLICK
@@ -1400,6 +1439,8 @@ EXPORTS
       sm_classwxMoveEvent__11wxMoveEvent
       ;wxIconizeEvent::sm_classwxIconizeEvent
       sm_classwxIconizeEvent__14wxIconizeEvent
+      ;wxChildFocusEvent::sm_classwxChildFocusEvent
+      sm_classwxChildFocusEvent__17wxChildFocusEvent
       __vft16wxScrollWinEvent8wxObject
       __vft13wxNotifyEvent8wxObject
       __vft12wxMouseEvent8wxObject
@@ -1455,7 +1496,6 @@ EXPORTS
       wxEVT_NC_RIGHT_UP
       wxEVT_NC_PAINT
       wxEVT_LEFT_UP
-      wxEVT_COMMAND_TEXT_UPDATED
       wxEVT_COMMAND_RADIOBOX_SELECTED
       wxEVT_COMMAND_MENU_SELECTED
       wxEVT_COMMAND_LISTBOX_SELECTED
@@ -1598,6 +1638,8 @@ EXPORTS
       wxConstructorForwxQueryNewPaletteEvent__Fv
       ;wxConstructorForwxFocusEvent()
       wxConstructorForwxFocusEvent__Fv
+      ;wxConstructorForwxChildFocusEvent()
+      wxConstructorForwxChildFocusEvent__Fv
       ;wxEvtHandler::sm_eventTable
       sm_eventTable__12wxEvtHandler
       wxEVT_LEFT_DCLICK
@@ -1605,11 +1647,50 @@ EXPORTS
       wxEVT_NC_LEFT_DCLICK
       wxEVT_INIT_DIALOG
       wxEVT_COMMAND_SET_FOCUS
-  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\extended.c
+  ;From object file:  F:\DEV\WX2\WXWINDOWS\src\common\extended.c
     ;PUBDEFs (Symbols available from object file):
       ConvertToIeeeExtended
       ConvertFromIeeeExtended
+  ;From object file:  ..\common\fddlgcmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxFindDialogEvent::sm_classwxFindDialogEvent
+      sm_classwxFindDialogEvent__17wxFindDialogEvent
+      wxEVT_COMMAND_FIND_REPLACE_ALL
+      wxEVT_COMMAND_FIND_REPLACE
+      wxEVT_COMMAND_FIND_CLOSE
+      ;wxFindReplaceDialogBase::Send(wxFindDialogEvent&)
+      Send__23wxFindReplaceDialogBaseFR17wxFindDialogEvent
+      ;wxFindReplaceData::Init()
+      Init__17wxFindReplaceDataFv
+      ;wxConstructorForwxFindDialogEvent()
+      wxConstructorForwxFindDialogEvent__Fv
+      __vft23wxFindReplaceDialogBase8wxObject
+      wxEVT_COMMAND_FIND_NEXT
+      wxEVT_COMMAND_FIND
+      ;wxFindReplaceDialogBase::~wxFindReplaceDialogBase()
+      __dt__23wxFindReplaceDialogBaseFv
   ;From object file:  ..\common\ffile.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxFFile::Seek(long,wxSeekMode)
+      Seek__7wxFFileFl10wxSeekMode
+      ;wxFFile::Read(void*,unsigned int)
+      Read__7wxFFileFPvUi
+      ;wxFFile::Close()
+      Close__7wxFFileFv
+      ;wxFFile::Length() const
+      Length__7wxFFileCFv
+      ;wxFFile::wxFFile(const char*,const char*)
+      __ct__7wxFFileFPCcT1
+      ;wxFFile::Tell() const
+      Tell__7wxFFileCFv
+      ;wxFFile::Write(const void*,unsigned int)
+      Write__7wxFFileFPCvUi
+      ;wxFFile::Open(const char*,const char*)
+      Open__7wxFFileFPCcT1
+      ;wxFFile::Flush()
+      Flush__7wxFFileFv
+      ;wxFFile::ReadAll(wxString*)
+      ReadAll__7wxFFileFP8wxString
   ;From object file:  ..\common\file.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxFile::Tell() const
@@ -1650,12 +1731,14 @@ EXPORTS
       __ct__10wxTempFileFRC8wxString
   ;From object file:  ..\common\fileconf.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;ConfigEntry::SetValue(const wxString&,unsigned long)
-      SetValue__11ConfigEntryFRC8wxStringUl
+      ;wxFileConfigGroup::SetLine(wxFileConfigLineList*)
+      SetLine__17wxFileConfigGroupFP20wxFileConfigLineList
       ;wxFileConfig::Write(const wxString&,long)
       Write__12wxFileConfigFRC8wxStringl
       ;wxFileConfig::Read(const wxString&,long*) const
       Read__12wxFileConfigCFRC8wxStringPl
+      ;wxFileConfig::LineListRemove(wxFileConfigLineList*)
+      LineListRemove__12wxFileConfigFP20wxFileConfigLineList
       ;wxFileConfig::GetNextGroup(wxString&,long&) const
       GetNextGroup__12wxFileConfigCFR8wxStringRl
       ;wxFileConfig::GetFirstEntry(wxString&,long&) const
@@ -1664,87 +1747,87 @@ EXPORTS
       DeleteEntry__12wxFileConfigFRC8wxStringUl
       ;wxFileConfig::Write(const wxString&,const wxString&)
       Write__12wxFileConfigFRC8wxStringT1
-      ;ConfigEntry::ConfigEntry(ConfigGroup*,const wxString&,int)
-      __ct__11ConfigEntryFP11ConfigGroupRC8wxStringi
-      ;ConfigGroup::~ConfigGroup()
-      __dt__11ConfigGroupFv
-      ;ConfigGroup::GetFullName() const
-      GetFullName__11ConfigGroupCFv
-      ;ConfigGroup::FindEntry(const char*) const
-      FindEntry__11ConfigGroupCFPCc
-      ;ConfigEntry::SetLine(LineList*)
-      SetLine__11ConfigEntryFP8LineList
+      ;wxFileConfigGroup::~wxFileConfigGroup()
+      __dt__17wxFileConfigGroupFv
+      ;wxFileConfigEntry::SetDirty()
+      SetDirty__17wxFileConfigEntryFv
+      ;wxFileConfigGroup::GetFullName() const
+      GetFullName__17wxFileConfigGroupCFv
+      ;wxFileConfigGroup::wxFileConfigGroup(wxFileConfigGroup*,const wxString&,wxFileConfig*)
+      __ct__17wxFileConfigGroupFP17wxFileConfigGroupRC8wxStringP12wxFileConfig
+      ;wxFileConfigGroup::Rename(const wxString&)
+      Rename__17wxFileConfigGroupFRC8wxString
+      ;wxFileConfigGroup::FindEntry(const char*) const
+      FindEntry__17wxFileConfigGroupCFPCc
+      ;wxFileConfigEntry::SetValue(const wxString&,unsigned long)
+      SetValue__17wxFileConfigEntryFRC8wxStringUl
       ;wxFileConfig::RenameGroup(const wxString&,const wxString&)
       RenameGroup__12wxFileConfigFRC8wxStringT1
       ;wxFileConfig::Init()
       Init__12wxFileConfigFv
-      ;ConfigEntry::SetDirty()
-      SetDirty__11ConfigEntryFv
+      ;wxFileConfigGroup::GetLastGroupLine()
+      GetLastGroupLine__17wxFileConfigGroupFv
       ;wxFileConfig::LineListAppend(const wxString&)
       LineListAppend__12wxFileConfigFRC8wxString
-      ;ConfigGroup::DeleteSubgroupByName(const char*)
-      DeleteSubgroupByName__11ConfigGroupFPCc
       ;wxFileConfig::DeleteGroup(const wxString&)
       DeleteGroup__12wxFileConfigFRC8wxString
       ;wxFileConfig::Parse(wxTextFile&,unsigned long)
       Parse__12wxFileConfigFR10wxTextFileUl
-      ;ConfigGroup::SetLine(LineList*)
-      SetLine__11ConfigGroupFP8LineList
+      ;wxFileConfig::LineListInsert(const wxString&,wxFileConfigLineList*)
+      LineListInsert__12wxFileConfigFRC8wxStringP20wxFileConfigLineList
       ;wxFileConfig::Flush(unsigned long)
       Flush__12wxFileConfigFUl
-      ;ConfigGroup::AddEntry(const wxString&,int)
-      AddEntry__11ConfigGroupFRC8wxStringi
-      ;wxFileConfig::RenameEntry(const wxString&,const wxString&)
-      RenameEntry__12wxFileConfigFRC8wxStringT1
       ;wxFileConfig::Read(const wxString&,wxString*,const wxString&) const
       Read__12wxFileConfigCFRC8wxStringP8wxStringT1
+      ;wxFileConfig::RenameEntry(const wxString&,const wxString&)
+      RenameEntry__12wxFileConfigFRC8wxStringT1
       ;wxFileConfig::SetRootPath()
       SetRootPath__12wxFileConfigFv
+      ;wxFileConfigGroup::GetLastEntryLine()
+      GetLastEntryLine__17wxFileConfigGroupFv
       ;wxFileConfig::GetLocalFileName(const char*)
       GetLocalFileName__12wxFileConfigFPCc
-      ;ConfigGroup::ConfigGroup(ConfigGroup*,const wxString&,wxFileConfig*)
-      __ct__11ConfigGroupFP11ConfigGroupRC8wxStringP12wxFileConfig
+      ;wxFileConfigGroup::FindSubgroup(const char*) const
+      FindSubgroup__17wxFileConfigGroupCFPCc
+      ;wxFileConfigGroup::DeleteSubgroupByName(const char*)
+      DeleteSubgroupByName__17wxFileConfigGroupFPCc
       ;wxFileConfig::GetFirstGroup(wxString&,long&) const
       GetFirstGroup__12wxFileConfigCFR8wxStringRl
       ;wxFileConfig::GetNumberOfGroups(unsigned long) const
       GetNumberOfGroups__12wxFileConfigCFUl
+      ;wxFileConfigGroup::AddEntry(const wxString&,int)
+      AddEntry__17wxFileConfigGroupFRC8wxStringi
       __vft12wxFileConfig12wxConfigBase
+      ;wxFileConfigEntry::wxFileConfigEntry(wxFileConfigGroup*,const wxString&,int)
+      __ct__17wxFileConfigEntryFP17wxFileConfigGroupRC8wxStringi
       ;wxFileConfig::~wxFileConfig()
       __dt__12wxFileConfigFv
+      ;wxFileConfigGroup::SetDirty()
+      SetDirty__17wxFileConfigGroupFv
       ;wxFileConfig::LineListIsEmpty()
       LineListIsEmpty__12wxFileConfigFv
-      ;ConfigGroup::GetLastGroupLine()
-      GetLastGroupLine__11ConfigGroupFv
-      ;ConfigGroup::GetGroupLine()
-      GetGroupLine__11ConfigGroupFv
-      ;ConfigGroup::FindSubgroup(const char*) const
-      FindSubgroup__11ConfigGroupCFPCc
-      ;wxFileConfig::Read(const wxString&,wxString*) const
-      Read__12wxFileConfigCFRC8wxStringP8wxString
+      ;wxFileConfigGroup::GetGroupLine()
+      GetGroupLine__17wxFileConfigGroupFv
       ;wxFileConfig::HasEntry(const wxString&) const
       HasEntry__12wxFileConfigCFRC8wxString
-      ;ConfigGroup::AddSubgroup(const wxString&)
-      AddSubgroup__11ConfigGroupFRC8wxString
+      ;wxFileConfig::Read(const wxString&,wxString*) const
+      Read__12wxFileConfigCFRC8wxStringP8wxString
+      ;wxFileConfigGroup::DeleteEntry(const char*)
+      DeleteEntry__17wxFileConfigGroupFPCc
       ;wxFileConfig::wxFileConfig(const wxString&,const wxString&,const wxString&,const wxString&,long)
       __ct__12wxFileConfigFRC8wxStringN31l
-      ;wxFileConfig::LineListRemove(LineList*)
-      LineListRemove__12wxFileConfigFP8LineList
-      ;wxFileConfig::LineListInsert(const wxString&,LineList*)
-      LineListInsert__12wxFileConfigFRC8wxStringP8LineList
+      ;wxFileConfigEntry::SetLine(wxFileConfigLineList*)
+      SetLine__17wxFileConfigEntryFP20wxFileConfigLineList
       ;wxFileConfig::GetNumberOfEntries(unsigned long) const
       GetNumberOfEntries__12wxFileConfigCFUl
       ;wxFileConfig::GetNextEntry(wxString&,long&) const
       GetNextEntry__12wxFileConfigCFR8wxStringRl
-      ;ConfigGroup::DeleteSubgroup(ConfigGroup*)
-      DeleteSubgroup__11ConfigGroupFP11ConfigGroup
+      ;wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup*)
+      DeleteSubgroup__17wxFileConfigGroupFP17wxFileConfigGroup
       ;wxFileConfig::GetGlobalDir()
       GetGlobalDir__12wxFileConfigFv
-      ;ConfigGroup::SetDirty()
-      SetDirty__11ConfigGroupFv
       ;wxFileConfig::GetLocalDir()
       GetLocalDir__12wxFileConfigFv
-      ;ConfigGroup::GetLastEntryLine()
-      GetLastEntryLine__11ConfigGroupFv
       ;wxFileConfig::DeleteAll()
       DeleteAll__12wxFileConfigFv
       ;wxFileConfig::CleanUp()
@@ -1753,12 +1836,10 @@ EXPORTS
       GetGlobalFileName__12wxFileConfigFPCc
       ;wxFileConfig::SetPath(const wxString&)
       SetPath__12wxFileConfigFRC8wxString
-      ;ConfigGroup::Rename(const wxString&)
-      Rename__11ConfigGroupFRC8wxString
       ;wxFileConfig::HasGroup(const wxString&) const
       HasGroup__12wxFileConfigCFRC8wxString
-      ;ConfigGroup::DeleteEntry(const char*)
-      DeleteEntry__11ConfigGroupFPCc
+      ;wxFileConfigGroup::AddSubgroup(const wxString&)
+      AddSubgroup__17wxFileConfigGroupFRC8wxString
   ;From object file:  ..\common\filefn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCopyFile(const wxString&,const wxString&,unsigned long)
@@ -1945,6 +2026,8 @@ EXPORTS
       sm_classwxFileSystem__12wxFileSystem
       ;wxLocalFSHandler::FindNext()
       FindNext__16wxLocalFSHandlerFv
+      ;wxLocalFSHandler::ms_root
+      ms_root__16wxLocalFSHandler
       ;wxFileSystemHandler::GetMimeTypeFromExt(const wxString&)
       GetMimeTypeFromExt__19wxFileSystemHandlerFRC8wxString
       ;wxFileSystem::m_Handlers
@@ -2056,22 +2139,18 @@ 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*)
+      SetMenuBar__11wxFrameBaseFP9wxMenuBar
+      ;wxFrameBase::DetachMenuBar()
+      DetachMenuBar__11wxFrameBaseFv
       ;wxFrameBase::CreateStatusBar(int,long,int,const wxString&)
       CreateStatusBar__11wxFrameBaseFilT1RC8wxString
       ;wxFrameBase::OnCreateToolBar(long,int,const wxString&)
       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
@@ -2096,17 +2175,13 @@ EXPORTS
       ShowMenuHelp__11wxFrameBaseFP11wxStatusBari
       ;wxFrameBase::GetEventTable() const
       GetEventTable__11wxFrameBaseCFv
-      ;wxFrameBase::SendIconizeEvent(unsigned long)
-      SendIconizeEvent__11wxFrameBaseFUl
+      ;wxFrameBase::AttachMenuBar(wxMenuBar*)
+      AttachMenuBar__11wxFrameBaseFP9wxMenuBar
       __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
@@ -2933,12 +3008,12 @@ EXPORTS
       GetString__12wxMsgCatalogCFPCc
       ;wxLocale::FindCatalog(const char*) const
       FindCatalog__8wxLocaleCFPCc
-      ;wxLanguageInfoArray::RemoveAt(unsigned int)
-      RemoveAt__19wxLanguageInfoArrayFUi
-      ;wxLanguageInfoArray::operator=(const wxLanguageInfoArray&)
-      __as__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
       ;wxLanguageInfoArray::DoCopy(const wxLanguageInfoArray&)
       DoCopy__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
+      ;wxLanguageInfoArray::operator=(const wxLanguageInfoArray&)
+      __as__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
+      ;wxLanguageInfoArray::RemoveAt(unsigned int)
+      RemoveAt__19wxLanguageInfoArrayFUi
       ;wxMsgCatalog::GetHash(const char*)
       GetHash__12wxMsgCatalogFPCc
       ;wxLocale::IsLoaded(const char*) const
@@ -3100,8 +3175,6 @@ EXPORTS
       DoLog__5wxLogFUlPCcl
       ;wxLogStream::DoLogString(const char*,long)
       DoLogString__11wxLogStreamFPCcl
-      ;wxOnAssert(const char*,int,const char*)
-      wxOnAssert__FPCciT1
       ;wxLogGeneric(unsigned long,const char*,...)
       wxLogGeneric__FUlPCce
       ;wxLogDebug(const char*,...)
@@ -3110,6 +3183,8 @@ EXPORTS
       __ct__5wxLogFv
       ;wxLog::Flush()
       Flush__5wxLogFv
+      ;wxLogChain::Flush()
+      Flush__10wxLogChainFv
       ;wxLog::SetActiveTarget(wxLog*)
       SetActiveTarget__5wxLogFP5wxLog
       ;wxLog::ms_doLog
@@ -3124,10 +3199,10 @@ EXPORTS
       wxLogStatus__FPCce
       ;wxLog::ClearTraceMasks()
       ClearTraceMasks__5wxLogFv
-      ;wxTrap()
-      wxTrap__Fv
       ;wxLog::RemoveTraceMask(const wxString&)
       RemoveTraceMask__5wxLogFRC8wxString
+      ;wxLog::ms_bVerbose
+      ms_bVerbose__5wxLog
       ;wxSysErrorMsg(unsigned long)
       wxSysErrorMsg__FUl
       ;wxLog::DoLogString(const char*,long)
@@ -3142,14 +3217,19 @@ EXPORTS
       DontCreateOnDemand__5wxLogFv
       ;wxLog::TimeStamp(wxString*)
       TimeStamp__5wxLogFP8wxString
+      __vft10wxLogChain5wxLog
+      ;wxLogChain::wxLogChain(wxLog*)
+      __ct__10wxLogChainFP5wxLog
       ;wxLogInfo(const char*,...)
       wxLogInfo__FPCce
       ;wxLogSysError(long,const char*,...)
       wxLogSysError__FlPCce
-      ;wxAssertIsEqual(int,int)
-      wxAssertIsEqual__FiT1
       ;wxLogStream::wxLogStream(ostream*)
       __ct__11wxLogStreamFP7ostream
+      ;wxLogPassThrough::wxLogPassThrough()
+      __ct__16wxLogPassThroughFv
+      ;wxLogChain::SetLog(wxLog*)
+      SetLog__10wxLogChainFP5wxLog
       ;wxLog::ms_suspendCount
       ms_suspendCount__5wxLog
       ;wxLog::ms_bAutoCreate
@@ -3158,6 +3238,8 @@ EXPORTS
       __vft11wxLogStderr5wxLog
       ;wxLogStderr::DoLogString(const char*,long)
       DoLogString__11wxLogStderrFPCcl
+      ;wxLogChain::DoLog(unsigned long,const char*,long)
+      DoLog__10wxLogChainFUlPCcl
       ;wxLogError(const char*,...)
       wxLogError__FPCce
       ;wxLogTrace(const char*,...)
@@ -3203,6 +3285,8 @@ EXPORTS
       __ad__12wxLongLongWxCFRC12wxLongLongWx
       ;wxLongLongWx::Negate()
       Negate__12wxLongLongWxFv
+      ;wxLongLongWx::ToString() const
+      ToString__12wxLongLongWxCFv
       ;wxLongLongWx::operator-(const wxLongLongWx&) const
       __mi__12wxLongLongWxCFRC12wxLongLongWx
       ;wxLongLongWx::operator&=(const wxLongLongWx&)
@@ -4038,6 +4122,36 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxRadioBoxBase::GetNextItem(int,wxDirection,long) const
       GetNextItem__14wxRadioBoxBaseCFi11wxDirectionl
+  ;From object file:  ..\common\regex.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxRegEx::Replace(wxString*,const wxString&,unsigned int) const
+      Replace__7wxRegExCFP8wxStringRC8wxStringUi
+      ;wxRegEx::~wxRegEx()
+      __dt__7wxRegExFv
+      ;wxRegEx::Compile(const wxString&,int)
+      Compile__7wxRegExFRC8wxStringi
+      ;wxRegExImpl::GetErrorMsg(int) const
+      GetErrorMsg__11wxRegExImplCFi
+      ;wxRegExImpl::Replace(wxString*,const wxString&,unsigned int) const
+      Replace__11wxRegExImplCFP8wxStringRC8wxStringUi
+      ;wxRegExImpl::~wxRegExImpl()
+      __dt__11wxRegExImplFv
+      ;wxRegExImpl::Compile(const wxString&,int)
+      Compile__11wxRegExImplFRC8wxStringi
+      ;wxRegEx::Matches(const char*,int) const
+      Matches__7wxRegExCFPCci
+      ;wxRegEx::GetMatch(const wxString&,unsigned int) const
+      GetMatch__7wxRegExCFRC8wxStringUi
+      ;wxRegEx::GetMatch(unsigned int*,unsigned int*,unsigned int) const
+      GetMatch__7wxRegExCFPUiT1Ui
+      ;wxRegExImpl::wxRegExImpl()
+      __ct__11wxRegExImplFv
+      ;wxRegExImpl::Matches(const char*,int) const
+      Matches__11wxRegExImplCFPCci
+      ;wxRegExImpl::GetMatch(unsigned int*,unsigned int*,unsigned int) const
+      GetMatch__11wxRegExImplCFPUiT1Ui
+      ;wxRegEx::Init()
+      Init__7wxRegExFv
   ;From object file:  ..\common\resource.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxResourceTable::ParseResourceFile(wxInputStream*)
@@ -4807,14 +4921,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()
@@ -5034,6 +5148,7 @@ EXPORTS
       AssignCopy__8wxStringFUiPCc
       ;wxString::AfterFirst(char) const
       AfterFirst__8wxStringCFc
+  ;From object file:  ..\common\sysopt.cpp
   ;From object file:  ..\common\tbarbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxToolBarBase::EnableTool(int,unsigned long)
@@ -5129,6 +5244,7 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxTextCtrlBase::operator<<(double)
       __ls__14wxTextCtrlBaseFd
+      wxEVT_COMMAND_TEXT_URL
       ;wxTextCtrlBase::operator<<(float)
       __ls__14wxTextCtrlBaseFf
       ;wxTextCtrlBase::LoadFile(const wxString&)
@@ -5139,6 +5255,7 @@ EXPORTS
       __ls__14wxTextCtrlBaseFi
       ;wxTextCtrlBase::wxTextCtrlBase()
       __ct__14wxTextCtrlBaseFv
+      wxEVT_COMMAND_TEXT_ENTER
       ;wxTextCtrlBase::SetDefaultStyle(const wxTextAttr&)
       SetDefaultStyle__14wxTextCtrlBaseFRC10wxTextAttr
       ;wxTextCtrlBase::CanCut() const
@@ -5147,12 +5264,18 @@ EXPORTS
       CanCopy__14wxTextCtrlBaseCFv
       ;wxTextCtrlBase::operator<<(long)
       __ls__14wxTextCtrlBaseFl
+      ;wxTextUrlEvent::sm_classwxTextUrlEvent
+      sm_classwxTextUrlEvent__14wxTextUrlEvent
       ;wxTextCtrlBase::~wxTextCtrlBase()
       __dt__14wxTextCtrlBaseFv
       ;wxTextCtrlBase::GetDefaultStyle() const
       GetDefaultStyle__14wxTextCtrlBaseCFv
       ;wxTextCtrlBase::CanPaste() const
       CanPaste__14wxTextCtrlBaseCFv
+      wxEVT_COMMAND_TEXT_UPDATED
+      ;wxConstructorForwxTextUrlEvent()
+      wxConstructorForwxTextUrlEvent__Fv
+      wxEVT_COMMAND_TEXT_MAXLEN
       ;wxTextCtrlBase::SelectAll()
       SelectAll__14wxTextCtrlBaseFv
       ;wxTextCtrlBase::SaveFile(const wxString&)
@@ -5164,16 +5287,12 @@ EXPORTS
       SetStyle__14wxTextCtrlBaseFlT1RC10wxTextAttr
   ;From object file:  ..\common\textfile.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxTextFile::Read(wxMBConv&)
+      Read__10wxTextFileFR8wxMBConv
       ;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
@@ -5184,8 +5303,12 @@ EXPORTS
       GetEOL__10wxTextFileF14wxTextFileType
       ;wxTextFile::Translate(const wxString&,wxTextFileType)
       Translate__10wxTextFileFRC8wxString14wxTextFileType
-      ;wxTextFile::Read()
-      Read__10wxTextFileFv
+      ;wxTextFile::Open(const wxString&,wxMBConv&)
+      Open__10wxTextFileFRC8wxStringR8wxMBConv
+      ;wxTextFile::Write(wxTextFileType,wxMBConv&)
+      Write__10wxTextFileF14wxTextFileTypeR8wxMBConv
+      ;wxTextFile::Open(wxMBConv&)
+      Open__10wxTextFileFR8wxMBConv
       ;wxTextFile::Close()
       Close__10wxTextFileFv
       ;wxTextFile::wxTextFile(const wxString&)
@@ -5194,18 +5317,27 @@ EXPORTS
       Create__10wxTextFileFRC8wxString
   ;From object file:  ..\common\timercmn.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxTimerEvent::sm_classwxTimerEvent
+      sm_classwxTimerEvent__12wxTimerEvent
       ;wxGetLocalTimeMillis()
       wxGetLocalTimeMillis__Fv
+      __vft11wxTimerBase8wxObject
       ;wxStopWatch::GetElapsedTime() const
       GetElapsedTime__11wxStopWatchCFv
       ;wxStopWatch::Time() const
       Time__11wxStopWatchCFv
+      ;wxTimerBase::Notify()
+      Notify__11wxTimerBaseFv
       ;wxStopWatch::Start(long)
       Start__11wxStopWatchFl
       ;wxGetElapsedTime(unsigned long)
       wxGetElapsedTime__FUl
       ;wxGetLocalTime()
       wxGetLocalTime__Fv
+      ;wxTimerBase::Start(int,unsigned long)
+      Start__11wxTimerBaseFiUl
+      ;wxConstructorForwxTimerEvent()
+      wxConstructorForwxTimerEvent__Fv
       ;wxStartTimer()
       wxStartTimer__Fv
       ;wxGetUTCTime()
@@ -5226,6 +5358,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
@@ -5331,7 +5486,7 @@ EXPORTS
       Read32__17wxTextInputStreamFv
       ;wxTextInputStream::SkipIfEndOfLine(char)
       SkipIfEndOfLine__17wxTextInputStreamFc
-  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\unzip.c
+  ;From object file:  F:\DEV\WX2\WXWINDOWS\src\common\unzip.c
     ;PUBDEFs (Symbols available from object file):
       unzReadCurrentFile
       unzGetCurrentFileInfo
@@ -6178,6 +6333,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()
@@ -6813,6 +6970,8 @@ EXPORTS
       DoCrossHair__14wxPostScriptDCFiT1
       ;wxPostScriptDC::DoDrawArc(int,int,int,int,int,int)
       DoDrawArc__14wxPostScriptDCFiN51
+      ;wxPostScriptDC::DoBlit(int,int,int,int,wxDC*,int,int,int,unsigned long,int,int)
+      DoBlit__14wxPostScriptDCFiN31P4wxDCN31UlN21
       ;wxPostScriptDC::~wxPostScriptDC()
       __dt__14wxPostScriptDCFv
       ;wxGetPrinterOptions()
@@ -6848,8 +7007,6 @@ EXPORTS
       __vft16wxPrintSetupData8wxObject
       ;wxPostScriptDC::SetBrush(const wxBrush&)
       SetBrush__14wxPostScriptDCFRC7wxBrush
-      ;wxPostScriptDC::DoBlit(int,int,int,int,wxDC*,int,int,int,unsigned long)
-      DoBlit__14wxPostScriptDCFiN31P4wxDCN31Ul
       ;wxPostScriptDC::DoGetSize(int*,int*) const
       DoGetSize__14wxPostScriptDCCFPiT1
       ;wxSetPrinterTranslation(int,int)
@@ -7028,6 +7185,37 @@ EXPORTS
       PaintFont__19wxGenericFontDialogFR4wxDC
       ;wxGenericFontDialog::sm_classwxGenericFontDialog
       sm_classwxGenericFontDialog__19wxGenericFontDialog
+  ;From object file:  ..\generic\fdrepdlg.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxFindReplaceDialog::OnFind(wxCommandEvent&)
+      OnFind__19wxFindReplaceDialogFR14wxCommandEvent
+      ;wxFindReplaceDialog::OnUpdateFindUI(wxUpdateUIEvent&)
+      OnUpdateFindUI__19wxFindReplaceDialogFR15wxUpdateUIEvent
+      ;wxFindReplaceDialog::OnReplaceAll(wxCommandEvent&)
+      OnReplaceAll__19wxFindReplaceDialogFR14wxCommandEvent
+      ;wxFindReplaceDialog::sm_classwxFindReplaceDialog
+      sm_classwxFindReplaceDialog__19wxFindReplaceDialog
+      ;wxFindReplaceDialog::sm_eventTable
+      sm_eventTable__19wxFindReplaceDialog
+      __vft19wxFindReplaceDialog8wxObject
+      ;wxConstructorForwxGenericFindReplaceDialog()
+      wxConstructorForwxGenericFindReplaceDialog__Fv
+      ;wxFindReplaceDialog::OnCancel(wxCommandEvent&)
+      OnCancel__19wxFindReplaceDialogFR14wxCommandEvent
+      ;wxFindReplaceDialog::Create(wxWindow*,wxFindReplaceData*,const wxString&,int)
+      Create__19wxFindReplaceDialogFP8wxWindowP17wxFindReplaceDataRC8wxStringi
+      ;wxFindReplaceDialog::SendEvent(const int&)
+      SendEvent__19wxFindReplaceDialogFRCi
+      ;wxFindReplaceDialog::Init()
+      Init__19wxFindReplaceDialogFv
+      ;wxFindReplaceDialog::sm_eventTableEntries
+      sm_eventTableEntries__19wxFindReplaceDialog
+      ;wxFindReplaceDialog::OnReplace(wxCommandEvent&)
+      OnReplace__19wxFindReplaceDialogFR14wxCommandEvent
+      ;wxFindReplaceDialog::OnCloseWindow(wxCloseEvent&)
+      OnCloseWindow__19wxFindReplaceDialogFR12wxCloseEvent
+      ;wxFindReplaceDialog::GetEventTable() const
+      GetEventTable__19wxFindReplaceDialogCFv
   ;From object file:  ..\generic\grid.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxGrid::EnableDragColSize(unsigned long)
@@ -7068,8 +7256,8 @@ EXPORTS
       ChangeCursorMode__6wxGridFQ2_6wxGrid10CursorModeP8wxWindowUl
       ;wxGridCellTextEditor::BeginEdit(int,int,wxGrid*)
       BeginEdit__20wxGridCellTextEditorFiT1P6wxGrid
-      ;wxGridStringArray::RemoveAt(unsigned int)
-      RemoveAt__17wxGridStringArrayFUi
+      ;wxGrid::SetOrCalcRowSizes(unsigned long,unsigned long)
+      SetOrCalcRowSizes__6wxGridFUlT1
       ;wxGridCellFloatRenderer::wxGridCellFloatRenderer(int,int)
       __ct__23wxGridCellFloatRendererFiT1
       ;wxGrid::XToEdgeOfCol(int)
@@ -7080,12 +7268,12 @@ EXPORTS
       SetRowAttr__22wxGridCellAttrProviderFP14wxGridCellAttri
       ;wxGridTableBase::SetRowAttr(wxGridCellAttr*,int)
       SetRowAttr__15wxGridTableBaseFP14wxGridCellAttri
-      ;wxGrid::SetOrCalcRowSizes(unsigned long,unsigned long)
-      SetOrCalcRowSizes__6wxGridFUlT1
       ;wxGrid::SetColMinimalWidth(int,int)
       SetColMinimalWidth__6wxGridFiT1
       ;wxGridCellWithAttrArray::RemoveAt(unsigned int)
       RemoveAt__23wxGridCellWithAttrArrayFUi
+      ;wxGridStringArray::RemoveAt(unsigned int)
+      RemoveAt__17wxGridStringArrayFUi
       ;wxGrid::ProcessTableMessage(wxGridTableMessage&)
       ProcessTableMessage__6wxGridFR18wxGridTableMessage
       ;wxGridCellCoordsArray::Insert(const wxGridCellCoords&,unsigned int)
@@ -8212,8 +8400,8 @@ EXPORTS
       sm_eventTableEntries__18wxSashLayoutWindow
   ;From object file:  ..\generic\listctrl.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxListItemData::SetData(long)
-      SetData__14wxListItemDataFl
+      ;wxSelectionStore::SelectItem(unsigned int,unsigned long)
+      SelectItem__16wxSelectionStoreFUiUl
       wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT
       ;wxListTextCtrl::sm_eventTable
       sm_eventTable__14wxListTextCtrl
@@ -8223,6 +8411,10 @@ EXPORTS
       SortItems__10wxListCtrlFPFlN21_il
       ;wxListCtrl::SetItemPosition(long,const wxPoint&)
       SetItemPosition__10wxListCtrlFlRC7wxPoint
+      ;wxListMainWindow::SendNotify(unsigned int,int,wxPoint)
+      SendNotify__16wxListMainWindowFUii7wxPoint
+      ;wxSelectionStore::SelectRange(unsigned int,unsigned int,unsigned long,wxArrayInt*)
+      SelectRange__16wxSelectionStoreFUiT1UlP10wxArrayInt
       ;wxListHeaderWindow::OnSetFocus(wxFocusEvent&)
       OnSetFocus__18wxListHeaderWindowFR12wxFocusEvent
       ;wxListMainWindow::OnPaint(wxPaintEvent&)
@@ -8231,6 +8423,8 @@ EXPORTS
       OnKillFocus__14wxListTextCtrlFR12wxFocusEvent
       ;wxListCtrl::OnIdle(wxIdleEvent&)
       OnIdle__10wxListCtrlFR11wxIdleEvent
+      ;wxListMainWindow::HighlightAll(unsigned long)
+      HighlightAll__16wxListMainWindowFUl
       ;wxListMainWindow::DeleteItem(long)
       DeleteItem__16wxListMainWindowFl
       ;wxListLineDataArray::wxListLineDataArray(const wxListLineDataArray&)
@@ -8241,73 +8435,79 @@ EXPORTS
       SetSize__14wxListItemDataFiT1
       ;wxListLineData::SetItem(int,const wxListItem&)
       SetItem__14wxListLineDataFiRC10wxListItem
-      ;wxListMainWindow::RefreshLine(wxListLineData*)
-      RefreshLine__16wxListMainWindowFP14wxListLineData
+      ;wxListMainWindow::RefreshLine(unsigned int)
+      RefreshLine__16wxListMainWindowFUi
+      ;wxSelectionStore::OnItemDelete(unsigned int)
+      OnItemDelete__16wxSelectionStoreFUi
       ;wxListMainWindow::InsertColumn(long,wxListItem&)
       InsertColumn__16wxListMainWindowFlR10wxListItem
-      ;wxListLineData::GetLabelExtent(int&,int&,int&,int&)
-      GetLabelExtent__14wxListLineDataFRiN31
+      ;wxListMainWindow::GetLineRect(unsigned int) const
+      GetLineRect__16wxListMainWindowCFUi
+      ;wxListMainWindow::GetLineLabelRect(unsigned int) const
+      GetLineLabelRect__16wxListMainWindowCFUi
       ;wxListMainWindow::GetItem(wxListItem&)
       GetItem__16wxListMainWindowFR10wxListItem
       ;wxListItemData::GetItem(wxListItem&) const
       GetItem__14wxListItemDataCFR10wxListItem
-      ;wxListMainWindow::GetColumn(int,wxListItem&)
-      GetColumn__16wxListMainWindowFiR10wxListItem
-      ;wxListMainWindow::GetColumnWidth(int)
-      GetColumnWidth__16wxListMainWindowFi
       ;wxListCtrl::FindItem(long,long)
       FindItem__10wxListCtrlFlT1
-      ;wxListHeaderData::wxListHeaderData()
-      __ct__16wxListHeaderDataFv
+      ;wxListItemData::Init()
+      Init__14wxListItemDataFv
       ;wxConstructorForwxListTextCtrl()
       wxConstructorForwxListTextCtrl__Fv
       ;wxListHeaderWindow::~wxListHeaderWindow()
       __dt__18wxListHeaderWindowFv
       ;wxListMainWindow::wxListMainWindow()
       __ct__16wxListMainWindowFv
+      ;wxListHeaderData::wxListHeaderData()
+      __ct__16wxListHeaderDataFv
       ;wxListCtrl::SetFocus()
       SetFocus__10wxListCtrlFv
       ;wxListCtrl::SetCursor(const wxCursor&)
       SetCursor__10wxListCtrlFRC8wxCursor
-      ;wxListMainWindow::RealizeChanges()
-      RealizeChanges__16wxListMainWindowFv
+      ;wxListLineData::ReverseHighlight()
+      ReverseHighlight__14wxListLineDataFv
       ;wxListMainWindow::OnRenameAccept()
       OnRenameAccept__16wxListMainWindowFv
       ;wxListRenameTimer::Notify()
       Notify__17wxListRenameTimerFv
-      ;wxListMainWindow::MoveToFocus()
-      MoveToFocus__16wxListMainWindowFv
+      ;wxListHeaderWindow::Init()
+      Init__18wxListHeaderWindowFv
       ;wxListHeaderData::GetWidth() const
       GetWidth__16wxListHeaderDataCFv
       ;wxListCtrl::GetTopItem() const
       GetTopItem__10wxListCtrlCFv
       ;wxListCtrl::GetItemCount() const
       GetItemCount__10wxListCtrlCFv
+      ;wxListMainWindow::GetImageSize(int,int&,int&) const
+      GetImageSize__16wxListMainWindowCFiRiT2
       ;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_DESELECTED
       wxEVT_COMMAND_LIST_ITEM_ACTIVATED
+      wxEVT_COMMAND_LIST_CACHE_HINT
       __vft14wxListTextCtrl8wxObject
-      ;wxListMainWindow::SetMode(long)
-      SetMode__16wxListMainWindowFl
       ;wxListCtrl::SetItemSpacing(int,unsigned long)
       SetItemSpacing__10wxListCtrlFiUl
       ;wxListMainWindow::SetItemCount(long)
       SetItemCount__16wxListMainWindowFl
       ;wxListCtrl::SetDropTarget(wxDropTarget*)
       SetDropTarget__10wxListCtrlFP12wxDropTarget
+      ;wxListMainWindow::RecalculatePositions(unsigned long)
+      RecalculatePositions__16wxListMainWindowFUl
       ;wxListMainWindow::OnKeyDown(wxKeyEvent&)
       OnKeyDown__16wxListMainWindowFR10wxKeyEvent
+      ;wxListMainWindow::OnArrowChar(unsigned int,const wxKeyEvent&)
+      OnArrowChar__16wxListMainWindowFUiRC10wxKeyEvent
       ;wxListEvent::CopyObject(wxObject&) const
       CopyObject__11wxListEventCFR8wxObject
       ;wxListLineDataArray::operator=(const wxListLineDataArray&)
       __as__19wxListLineDataArrayFRC19wxListLineDataArray
       wxEVT_COMMAND_LIST_INSERT_ITEM
-      ;wxListLineData::sm_classwxListLineData
-      sm_classwxListLineData__14wxListLineData
       ;wxListItem::sm_classwxListItem
       sm_classwxListItem__10wxListItem
       list_ctrl_compare_func_1
@@ -8322,10 +8522,10 @@ EXPORTS
       SetImageList__16wxListMainWindowFP11wxImageListi
       ;wxListMainWindow::SetColumnWidth(int,int)
       SetColumnWidth__16wxListMainWindowFiT1
-      ;wxListMainWindow::SelectLine(wxListLineData*)
-      SelectLine__16wxListMainWindowFP14wxListLineData
       ;wxListCtrl::OnGetItemText(long,long) const
       OnGetItemText__10wxListCtrlCFlT1
+      ;wxListMainWindow::MoveToItem(unsigned int)
+      MoveToItem__16wxListMainWindowFUi
       ;wxListHeaderData::IsHit(int,int) const
       IsHit__16wxListHeaderDataCFiT1
       ;wxListItemData::IsHit(int,int) const
@@ -8336,14 +8536,12 @@ EXPORTS
       HitTest__16wxListMainWindowFiT1Ri
       ;wxListCtrl::HitTest(const wxPoint&,int&)
       HitTest__10wxListCtrlFRC7wxPointRi
-      ;wxListMainWindow::FocusLine(wxListLineData*)
-      FocusLine__16wxListMainWindowFP14wxListLineData
-      ;wxListMainWindow::DeselectLine(wxListLineData*)
-      DeselectLine__16wxListMainWindowFP14wxListLineData
+      ;wxListMainWindow::GetColumn(int,wxListItem&) const
+      GetColumn__16wxListMainWindowCFiR10wxListItem
+      ;wxListMainWindow::CacheLineData(unsigned int)
+      CacheLineData__16wxListMainWindowFUi
       ;wxwxListItemDataListNode::DeleteData()
       DeleteData__24wxwxListItemDataListNodeFv
-      ;wxConstructorForwxListHeaderData()
-      wxConstructorForwxListHeaderData__Fv
       ;wxConstructorForwxListCtrl()
       wxConstructorForwxListCtrl__Fv
       list_ctrl_compare_func_2
@@ -8351,37 +8549,42 @@ EXPORTS
       __dt__16wxListMainWindowFv
       ;wxListHeaderWindow::wxListHeaderWindow()
       __ct__18wxListHeaderWindowFv
-      ;wxListLineData::SetPosition(wxDC*,int,int,int)
-      SetPosition__14wxListLineDataFP4wxDCiN22
+      ;wxListLineData::SetAttr(wxListItemAttr*)
+      SetAttr__14wxListLineDataFP14wxListItemAttr
+      ;wxListMainWindow::RefreshSelected()
+      RefreshSelected__16wxListMainWindowFv
       ;wxListMainWindow::OnRenameTimer()
       OnRenameTimer__16wxListMainWindowFv
       ;wxListItemData::GetX() const
       GetX__14wxListItemDataCFv
       ;wxListCtrl::GetTextColour() const
       GetTextColour__10wxListCtrlCFv
+      ;wxListMainWindow::GetHeaderWidth() const
+      GetHeaderWidth__16wxListMainWindowCFv
       ;wxListTextCtrl::GetEventTable() const
       GetEventTable__14wxListTextCtrlCFv
-      ;wxListMainWindow::GetCountPerPage()
-      GetCountPerPage__16wxListMainWindowFv
-      ;wxListLineData::DoDraw(wxDC*,unsigned long,unsigned long)
-      DoDraw__14wxListLineDataFP4wxDCUlT2
+      ;wxListMainWindow::DoDeleteAllItems()
+      DoDeleteAllItems__16wxListMainWindowFv
       ;wxListItem::ClearAttributes()
       ClearAttributes__10wxListItemFv
-      ;wxListRenameTimer::wxListRenameTimer(wxListMainWindow*)
-      __ct__17wxListRenameTimerFP16wxListMainWindow
+      ;wxListLineData::wxListLineData(wxListMainWindow*)
+      __ct__14wxListLineDataFP16wxListMainWindow
       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
       sm_eventTableEntries__18wxListHeaderWindow
+      ;wxListView::sm_classwxListView
+      sm_classwxListView__10wxListView
       ;wxListMainWindow::sm_classwxListMainWindow
       sm_classwxListMainWindow__16wxListMainWindow
+      ;wxListRenameTimer::wxListRenameTimer(wxListMainWindow*)
+      __ct__17wxListRenameTimerFP16wxListMainWindow
       ;wxListCtrl::InsertColumn(long,const wxString&,int,int)
       InsertColumn__10wxListCtrlFlRC8wxStringiT3
-      ;wxListMainWindow::GetTextLength(wxString&)
-      GetTextLength__16wxListMainWindowFR8wxString
       ;wxListCtrl::Edit(long)
       Edit__10wxListCtrlFl
       ;wxListEvent::sm_classwxListEvent
@@ -8399,26 +8602,18 @@ EXPORTS
       SetItemSpacing__16wxListMainWindowFiUl
       ;wxListCtrl::SetItemCount(long)
       SetItemCount__10wxListCtrlFl
-      ;wxListMainWindow::SendNotify(wxListLineData*,int,wxPoint)
-      SendNotify__16wxListMainWindowFP14wxListLineDatai7wxPoint
       ;wxListCtrl::OnSize(wxSizeEvent&)
       OnSize__10wxListCtrlFR11wxSizeEvent
       ;wxListHeaderWindow::OnMouse(wxMouseEvent&)
       OnMouse__18wxListHeaderWindowFR12wxMouseEvent
       ;wxListTextCtrl::OnChar(wxKeyEvent&)
       OnChar__14wxListTextCtrlFR10wxKeyEvent
-      ;wxListLineData::IsInRect(int,int,const wxRect&)
-      IsInRect__14wxListLineDataFiT1RC6wxRect
       ;wxListLineDataArray::Index(const wxListLineData&,unsigned long) const
       Index__19wxListLineDataArrayCFRC14wxListLineDataUl
-      ;wxListLineData::Hilight(unsigned long)
-      Hilight__14wxListLineDataFUl
       ;wxListCtrl::FindItem(long,const wxString&,unsigned long)
       FindItem__10wxListCtrlFlRC8wxStringUl
-      ;wxListLineData::DrawRubberBand(wxDC*,unsigned long)
-      DrawRubberBand__14wxListLineDataFP4wxDCUl
-      ;wxListLineDataArray::RemoveAt(unsigned int)
-      RemoveAt__19wxListLineDataArrayFUi
+      ;wxListCtrl::SetItemState(long,long,long)
+      SetItemState__10wxListCtrlFlN21
       ;wxListHeaderData::wxListHeaderData(const wxListItem&)
       __ct__16wxListHeaderDataFRC10wxListItem
       ;wxListHeaderData::SetWidth(int)
@@ -8427,22 +8622,26 @@ EXPORTS
       SetPosition__16wxListHeaderDataFiT1
       ;wxListItemData::SetPosition(int,int)
       SetPosition__14wxListItemDataFiT1
-      ;wxListCtrl::SetItemState(long,long,long)
-      SetItemState__10wxListCtrlFlN21
+      ;wxListLineData::SetImage(int,int)
+      SetImage__14wxListLineDataFiT1
       ;wxListHeaderData::SetHeight(int)
       SetHeight__16wxListHeaderDataFi
       ;wxListHeaderData::SetFormat(int)
       SetFormat__16wxListHeaderDataFi
       ;wxListCtrl::SetColumnWidth(int,int)
       SetColumnWidth__10wxListCtrlFiT1
+      ;wxListLineDataArray::RemoveAt(unsigned int)
+      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*)
+      GetVisibleLinesRange__16wxListMainWindowFPUiT1
       ;wxListCtrl::GetItem(wxListItem&) const
       GetItem__10wxListCtrlCFR10wxListItem
-      ;wxListMainWindow::GetIndexOfLine(const wxListLineData*)
-      GetIndexOfLine__16wxListMainWindowFPC14wxListLineData
-      ;wxListLineData::GetExtent(int&,int&,int&,int&)
-      GetExtent__14wxListLineDataFRiN31
       ;wxListMainWindow::FindItem(long,long)
       FindItem__16wxListMainWindowFlT1
       ;wxListMainWindow::DrawImage(int,wxDC*,int,int)
@@ -8451,28 +8650,28 @@ EXPORTS
       DeleteColumn__10wxListCtrlFi
       ;wxListCtrl::Arrange(int)
       Arrange__10wxListCtrlFi
-      ;wxListMainWindow::GetItemCount() const
-      GetItemCount__16wxListMainWindowCFv
+      ;wxListCtrl::GetNextItem(long,int,int) const
+      GetNextItem__10wxListCtrlCFliT2
       wxEVT_COMMAND_LIST_KEY_DOWN
       ;wxConstructorForwxListMainWindow()
       wxConstructorForwxListMainWindow__Fv
-      ;wxConstructorForwxListLineData()
-      wxConstructorForwxListLineData__Fv
       ;wxConstructorForwxListEvent()
       wxConstructorForwxListEvent__Fv
       __vft16wxListMainWindow14wxScrollHelper
+      ;wxListMainWindow::UpdateCurrent()
+      UpdateCurrent__16wxListMainWindowFv
       ;wxListCtrl::SetItem(long,int,const wxString&,int)
       SetItem__10wxListCtrlFliRC8wxStringT2
-      ;wxListLineData::ReverseHilight()
-      ReverseHilight__14wxListLineDataFv
-      ;wxListItemData::HasImage() const
-      HasImage__14wxListItemDataCFv
+      ;wxListMainWindow::InitScrolling()
+      InitScrolling__16wxListMainWindowFv
       ;wxListItemData::GetY() const
       GetY__14wxListItemDataCFv
       ;wxListMainWindow::GetSelectedItemCount()
       GetSelectedItemCount__16wxListMainWindowFv
-      ;wxListCtrl::GetNextItem(long,int,int) const
-      GetNextItem__10wxListCtrlCFliT2
+      ;wxListMainWindow::GetLineHeight() const
+      GetLineHeight__16wxListMainWindowCFv
+      ;wxListMainWindow::GetItemCount() const
+      GetItemCount__16wxListMainWindowCFv
       ;wxListItemData::GetHeight() const
       GetHeight__14wxListItemDataCFv
       ;wxListHeaderData::GetFormat() const
@@ -8481,14 +8680,15 @@ EXPORTS
       GetEventTable__10wxListCtrlCFv
       ;wxListCtrl::GetCountPerPage() const
       GetCountPerPage__10wxListCtrlCFv
-      ;wxListMainWindow::GetColumnCount()
-      GetColumnCount__16wxListMainWindowFv
       ;wxListCtrl::GetBackgroundColour() const
       GetBackgroundColour__10wxListCtrlCFv
-      ;wxListLineData::AssignRect(wxRect&,int,int,int,int)
-      AssignRect__14wxListLineDataFR6wxRectiN32
+      ;wxListLineData::GetAttr() const
+      GetAttr__14wxListLineDataCFv
+      ;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
@@ -8499,27 +8699,27 @@ EXPORTS
       InsertItem__10wxListCtrlFlRC8wxString
       ;wxListLineData::Draw(wxDC*)
       Draw__14wxListLineDataFP4wxDC
-      ;wxListMainWindow::EditLabel(long)
-      EditLabel__16wxListMainWindowFl
+      ;wxListLineData::SetAttributes(wxDC*,const wxListItemAttr*,unsigned long)
+      SetAttributes__14wxListLineDataFP4wxDCPC14wxListItemAttrUl
       ;wxListCtrl::sm_eventTable
       sm_eventTable__10wxListCtrl
       __vft16wxListMainWindow8wxObject
-      ;wxListLineData::wxListLineData(wxListMainWindow*,int,wxBrush*)
-      __ct__14wxListLineDataFP16wxListMainWindowiP7wxBrush
       ;wxListCtrl::SetFont(const wxFont&)
       SetFont__10wxListCtrlFRC6wxFont
-      ;wxListMainWindow::OnSize(wxSizeEvent&)
-      OnSize__16wxListMainWindowFR11wxSizeEvent
+      ;wxListCtrl::ResizeReportView(unsigned long)
+      ResizeReportView__10wxListCtrlFUl
       ;wxListMainWindow::OnSetFocus(wxFocusEvent&)
       OnSetFocus__16wxListMainWindowFR12wxFocusEvent
       ;wxListMainWindow::OnKillFocus(wxFocusEvent&)
       OnKillFocus__16wxListMainWindowFR12wxFocusEvent
       ;wxListCtrl::OnGetItemImage(long) const
       OnGetItemImage__10wxListCtrlCFl
-      ;wxListMainWindow::OnArrowChar(wxListLineData*,unsigned long)
-      OnArrowChar__16wxListMainWindowFP14wxListLineDataUl
-      ;wxListLineData::GetRect(wxRect&)
-      GetRect__14wxListLineDataFR6wxRect
+      ;wxListCtrl::OnGetItemAttr(long) const
+      OnGetItemAttr__10wxListCtrlCFl
+      ;wxListLineData::Highlight(unsigned long)
+      Highlight__14wxListLineDataFUl
+      ;wxListMainWindow::HighlightLines(unsigned int,unsigned int,unsigned long)
+      HighlightLines__16wxListMainWindowFUiT1Ul
       ;wxListMainWindow::GetItemSpacing(unsigned long)
       GetItemSpacing__16wxListMainWindowFUl
       ;wxListMainWindow::GetItemPosition(long,wxPoint&)
@@ -8528,61 +8728,68 @@ EXPORTS
       GetItemPosition__10wxListCtrlCFlR7wxPoint
       ;wxListMainWindow::FindItem(long,const wxString&,unsigned long)
       FindItem__16wxListMainWindowFlRC8wxStringUl
+      ;wxListMainWindow::EditLabel(long)
+      EditLabel__16wxListMainWindowFl
       ;wxListCtrl::DeleteItem(long)
       DeleteItem__10wxListCtrlFl
-      ;wxListLineData::AssignRect(wxRect&,const wxRect&)
-      AssignRect__14wxListLineDataFR6wxRectRC6wxRect
-      ;wxListLineDataArray::DoCopy(const wxListLineDataArray&)
-      DoCopy__19wxListLineDataArrayFRC19wxListLineDataArray
+      ;wxListCtrl::GetItemState(long,long) const
+      GetItemState__10wxListCtrlCFlT1
       wxEVT_COMMAND_LIST_DELETE_ITEM
-      ;wxListMainWindow::UnfocusLine(wxListLineData*)
-      UnfocusLine__16wxListMainWindowFP14wxListLineData
-      ;wxListItemData::SetImage(int)
-      SetImage__14wxListItemDataFi
       ;wxListCtrl::SetColumn(int,wxListItem&)
       SetColumn__10wxListCtrlFiR10wxListItem
+      ;wxListCtrl::RefreshItems(long,long)
+      RefreshItems__10wxListCtrlFlT1
+      ;wxListMainWindow::RefreshAfter(unsigned int)
+      RefreshAfter__16wxListMainWindowFUi
+      ;wxListMainWindow::OnUnfocusLine(unsigned int)
+      OnUnfocusLine__16wxListMainWindowFUi
       ;wxListLineData::InitItems(int)
       InitItems__14wxListLineDataFi
+      ;wxListMainWindow::GetLineY(unsigned int) const
+      GetLineY__16wxListMainWindowCFUi
+      ;wxListMainWindow::GetLineHighlightRect(unsigned int) const
+      GetLineHighlightRect__16wxListMainWindowCFUi
       ;wxListHeaderData::GetItem(wxListItem&)
       GetItem__16wxListHeaderDataFR10wxListItem
       ;wxListLineData::GetItem(int,wxListItem&)
       GetItem__14wxListLineDataFiR10wxListItem
-      ;wxListCtrl::GetItemState(long,long) const
-      GetItemState__10wxListCtrlCFlT1
-      ;wxListLineData::GetImage(int)
-      GetImage__14wxListLineDataFi
+      ;wxListLineData::GetImage(int) const
+      GetImage__14wxListLineDataCFi
       ;wxListCtrl::GetImageList(int) const
       GetImageList__10wxListCtrlCFi
       ;wxListCtrl::GetColumn(int,wxListItem&) const
       GetColumn__10wxListCtrlCFiR10wxListItem
+      ;wxListLineDataArray::DoCopy(const wxListLineDataArray&)
+      DoCopy__19wxListLineDataArrayFRC19wxListLineDataArray
       ;wxListMainWindow::DeleteColumn(int)
       DeleteColumn__16wxListMainWindowFi
       ;wxListLineData::CalculateSize(wxDC*,int)
       CalculateSize__14wxListLineDataFP4wxDCi
-      ;wxListLineDataArray::~wxListLineDataArray()
-      __dt__19wxListLineDataArrayFv
+      ;wxListItem::wxListItem()
+      __ct__10wxListItemFv
+      wxSizeTCmpFn
       ;wxConstructorForwxListItem()
       wxConstructorForwxListItem__Fv
+      ;wxListLineDataArray::~wxListLineDataArray()
+      __dt__19wxListLineDataArrayFv
+      ;wxListItemData::~wxListItemData()
+      __dt__14wxListItemDataFv
       ;wxListCtrl::~wxListCtrl()
       __dt__10wxListCtrlFv
-      ;wxListItem::wxListItem()
-      __ct__10wxListItemFv
       ;wxListCtrl::SetItemImage(long,int,int)
       SetItemImage__10wxListCtrlFliT2
       ;wxListCtrl::SetForegroundColour(const wxColour&)
       SetForegroundColour__10wxListCtrlFRC8wxColour
-      ;wxListLineData::IsHilighted()
-      IsHilighted__14wxListLineDataFv
       ;wxListMainWindow::Init()
       Init__16wxListMainWindowFv
+      ;wxListHeaderData::Init()
+      Init__16wxListHeaderDataFv
       ;wxListCtrl::GetSelectedItemCount() const
       GetSelectedItemCount__10wxListCtrlCFv
-      ;wxListMainWindow::GetMode() const
-      GetMode__16wxListMainWindowCFv
-      ;wxListMainWindow::GetImageSize(int,int&,int&)
-      GetImageSize__16wxListMainWindowFiRiT2
       ;wxListHeaderWindow::GetEventTable() const
       GetEventTable__18wxListHeaderWindowCFv
+      ;wxListMainWindow::GetDummyLine() const
+      GetDummyLine__16wxListMainWindowCFv
       ;wxListCtrl::GetDropTarget() const
       GetDropTarget__10wxListCtrlCFv
       ;wxListCtrl::GetColumnCount() const
@@ -8595,15 +8802,15 @@ EXPORTS
       DeleteAllItems__16wxListMainWindowFv
       ;wxListCtrl::DeleteAllColumns()
       DeleteAllColumns__10wxListCtrlFv
-      ;wxListMainWindow::CalculatePositions()
-      CalculatePositions__16wxListMainWindowFv
       ;wxListCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__10wxListCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       wxEVT_COMMAND_LIST_GET_INFO
       ;wxListMainWindow::sm_eventTableEntries
       sm_eventTableEntries__16wxListMainWindow
-      ;wxListLineData::SetAttributes(wxDC*,const wxListItemAttr*,const wxColour&,const wxFont&,unsigned long)
-      SetAttributes__14wxListLineDataFP4wxDCPC14wxListItemAttrRC8wxColourRC6wxFontUl
+      ;wxListMainWindow::GetTextLength(const wxString&) const
+      GetTextLength__16wxListMainWindowCFRC8wxString
+      ;wxListCtrl::EnsureVisible(long)
+      EnsureVisible__10wxListCtrlFl
       wxEVT_COMMAND_LIST_ITEM_SELECTED
       wxEVT_COMMAND_LIST_END_LABEL_EDIT
       ;wxListTextCtrl::sm_eventTableEntries
@@ -8613,6 +8820,8 @@ EXPORTS
       __vft10wxListCtrl8wxObject
       ;wxListCtrl::SetWindowStyleFlag(long)
       SetWindowStyleFlag__10wxListCtrlFl
+      ;wxListCtrl::RefreshItem(long)
+      RefreshItem__10wxListCtrlFl
       ;wxListMainWindow::OnScroll(wxScrollWinEvent&)
       OnScroll__16wxListMainWindowFR16wxScrollWinEvent
       ;wxListHeaderWindow::OnPaint(wxPaintEvent&)
@@ -8623,8 +8832,8 @@ EXPORTS
       OnKeyUp__14wxListTextCtrlFR10wxKeyEvent
       ;wxListMainWindow::OnChar(wxKeyEvent&)
       OnChar__16wxListMainWindowFR10wxKeyEvent
-      ;wxListMainWindow::HilightAll(unsigned long)
-      HilightAll__16wxListMainWindowFUl
+      ;wxListMainWindow::HighlightLine(unsigned int,unsigned long)
+      HighlightLine__16wxListMainWindowFUiUl
       ;wxListCtrl::GetItemText(long) const
       GetItemText__10wxListCtrlCFl
       ;wxListCtrl::GetItemSpacing(unsigned long) const
@@ -8633,18 +8842,14 @@ EXPORTS
       GetItemData__10wxListCtrlCFl
       ;wxListMainWindow::EnsureVisible(long)
       EnsureVisible__16wxListMainWindowFl
-      ;wxListCtrl::EnsureVisible(long)
-      EnsureVisible__10wxListCtrlFl
-      ;wxListLineDataArray::Add(const wxListLineData&)
-      Add__19wxListLineDataArrayFRC14wxListLineData
-      ;wxListItemData::sm_classwxListItemData
-      sm_classwxListItemData__14wxListItemData
-      ;wxListHeaderData::sm_classwxListHeaderData
-      sm_classwxListHeaderData__16wxListHeaderData
+      ;wxListLineData::DrawInReportMode(wxDC*,const wxRect&,const wxRect&,unsigned long)
+      DrawInReportMode__14wxListLineDataFP4wxDCRC6wxRectT2Ul
+      ;wxListLineData::GetText(int) const
+      GetText__14wxListLineDataCFi
       __vft26wxwxListHeaderDataListNode10wxNodeBase
       __vft24wxwxListItemDataListNode10wxNodeBase
-      ;wxListItemData::wxListItemData(const wxListItem&)
-      __ct__14wxListItemDataFRC10wxListItem
+      ;wxListLineData::SetPosition(int,int,int,int)
+      SetPosition__14wxListLineDataFiN31
       ;wxListMainWindow::SetItem(wxListItem&)
       SetItem__16wxListMainWindowFR10wxListItem
       ;wxListItemData::SetItem(const wxListItem&)
@@ -8655,12 +8860,12 @@ EXPORTS
       SetImageList__10wxListCtrlFP11wxImageListi
       ;wxListMainWindow::SetColumn(int,wxListItem&)
       SetColumn__16wxListMainWindowFiR10wxListItem
-      ;wxListLineData::SetColumnPosition(int,int)
-      SetColumnPosition__14wxListLineDataFiT1
       ;wxListCtrl::ScrollList(int,int)
       ScrollList__10wxListCtrlFiT1
-      ;wxListLineData::IsHit(int,int)
-      IsHit__14wxListLineDataFiT1
+      ;wxSelectionStore::IsSelected(unsigned int) const
+      IsSelected__16wxSelectionStoreCFUi
+      ;wxListMainWindow::IsHighlighted(unsigned int) const
+      IsHighlighted__16wxListMainWindowCFUi
       ;wxListLineDataArray::Insert(const wxListLineData&,unsigned int)
       Insert__19wxListLineDataArrayFRC14wxListLineDataUi
       ;wxListMainWindow::InsertItem(wxListItem&)
@@ -8669,38 +8874,38 @@ EXPORTS
       InsertItem__10wxListCtrlFlRC8wxStringi
       ;wxListCtrl::InsertColumn(long,wxListItem&)
       InsertColumn__10wxListCtrlFlR10wxListItem
-      ;wxListLineData::GetText(int) const
-      GetText__14wxListLineDataCFi
-      ;wxListLineData::GetSize(int&,int&)
-      GetSize__14wxListLineDataFRiT1
+      ;wxListMainWindow::GetLineIconRect(unsigned int) const
+      GetLineIconRect__16wxListMainWindowCFUi
       ;wxListMainWindow::GetItemState(long,long)
       GetItemState__16wxListMainWindowFlT1
       ;wxListCtrl::GetItemRect(long,wxRect&,int) const
       GetItemRect__10wxListCtrlCFlR6wxRecti
+      ;wxListMainWindow::GetColumnWidth(int) const
+      GetColumnWidth__16wxListMainWindowCFi
       ;wxListCtrl::GetColumnWidth(int) const
       GetColumnWidth__10wxListCtrlCFi
       ;wxListCtrl::FindItem(long,const wxPoint&,int)
       FindItem__10wxListCtrlFlRC7wxPointi
-      ;wxListMainWindow::DeleteLine(wxListLineData*)
-      DeleteLine__16wxListMainWindowFP14wxListLineData
       ;wxListCtrl::AssignImageList(wxImageList*,int)
       AssignImageList__10wxListCtrlFP11wxImageListi
-      ;wxListLineDataArray::DoEmpty()
-      DoEmpty__19wxListLineDataArrayFv
-      ;wxConstructorForwxListItemData()
-      wxConstructorForwxListItemData__Fv
+      ;wxListLineDataArray::Add(const wxListLineData&)
+      Add__19wxListLineDataArrayFRC14wxListLineData
+      ;wxListCtrl::wxListCtrl()
+      __ct__10wxListCtrlFv
+      ;wxConstructorForwxListView()
+      wxConstructorForwxListView__Fv
       ;wxConstructorForwxListHeaderWindow()
       wxConstructorForwxListHeaderWindow__Fv
       ;wxListTextCtrl::wxListTextCtrl(wxWindow*,const int,unsigned long*,wxString*,wxListMainWindow*,const wxString&,const wxPoint&,const wxSize&,int,const wxValidator&,const wxString&)
       __ct__14wxListTextCtrlFP8wxWindowCiPUlP8wxStringP16wxListMainWindowRC8wxStringRC7wxPointRC6wxSizeiRC11wxValidatorT6
-      ;wxListItemData::wxListItemData()
-      __ct__14wxListItemDataFv
-      ;wxListCtrl::wxListCtrl()
-      __ct__10wxListCtrlFv
       ;wxListCtrl::SetTextColour(const wxColour&)
       SetTextColour__10wxListCtrlFRC8wxColour
       ;wxListCtrl::SetBackgroundColour(const wxColour&)
       SetBackgroundColour__10wxListCtrlFRC8wxColour
+      ;wxListMainWindow::RefreshAll()
+      RefreshAll__16wxListMainWindowFv
+      ;wxListMainWindow::HitTestLine(unsigned int,int,int) const
+      HitTestLine__16wxListMainWindowCFUiiT2
       ;wxListHeaderData::HasImage() const
       HasImage__16wxListHeaderDataCFv
       ;wxListItemData::GetWidth() const
@@ -8709,27 +8914,32 @@ EXPORTS
       GetNextItem__16wxListMainWindowFliT2
       ;wxListHeaderData::GetImage() const
       GetImage__16wxListHeaderDataCFv
-      ;wxListItemData::GetImage() const
-      GetImage__14wxListItemDataCFv
       ;wxListCtrl::GetForegroundColour() const
       GetForegroundColour__10wxListCtrlCFv
       ;wxListMainWindow::GetEventTable() const
       GetEventTable__16wxListMainWindowCFv
+      ;wxListMainWindow::GetCountPerPage() const
+      GetCountPerPage__16wxListMainWindowCFv
       ;wxListHeaderWindow::DrawCurrent()
       DrawCurrent__18wxListHeaderWindowFv
       ;wxListCtrl::DoPopupMenu(wxMenu*,int,int)
       DoPopupMenu__10wxListCtrlFP6wxMenuiT2
+      ;wxListLineDataArray::DoEmpty()
+      DoEmpty__19wxListLineDataArrayFv
       ;wxListCtrl::DeleteAllItems()
       DeleteAllItems__10wxListCtrlFv
       ;wxListItem::Clear()
       Clear__10wxListItemFv
       ;wxListCtrl::ClearAll()
       ClearAll__10wxListCtrlFv
-      ;wxListHeaderWindow::wxListHeaderWindow(wxWindow*,int,wxListMainWindow*,const wxPoint&,const wxSize&,long,const wxString&)
-      __ct__18wxListHeaderWindowFP8wxWindowiP16wxListMainWindowRC7wxPointRC6wxSizelRC8wxString
+      ;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
+      ;wxListHeaderWindow::wxListHeaderWindow(wxWindow*,int,wxListMainWindow*,const wxPoint&,const wxSize&,long,const wxString&)
+      __ct__18wxListHeaderWindowFP8wxWindowiP16wxListMainWindowRC7wxPointRC6wxSizelRC8wxString
       ;wxListMainWindow::wxListMainWindow(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       __ct__16wxListMainWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxListHeaderWindow::AdjustDC(wxDC&)
@@ -8811,8 +9021,6 @@ EXPORTS
       OnFrameDelete__11wxLogWindowFP7wxFrame
       ;wxLogDialog::~wxLogDialog()
       __dt__11wxLogDialogFv
-      ;wxLogWindow::Flush()
-      Flush__11wxLogWindowFv
       ;wxLogFrame::wxLogFrame(wxFrame*,wxLogWindow*,const char*)
       __ct__10wxLogFrameFP7wxFrameP11wxLogWindowPCc
       ;wxLogWindow::wxLogWindow(wxFrame*,const char*,unsigned long,unsigned long)
@@ -8830,15 +9038,19 @@ 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&)
@@ -8849,10 +9061,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*)
@@ -9041,8 +9251,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&)
@@ -9063,15 +9277,19 @@ EXPORTS
       StopAutoScrolling__14wxScrollHelperFv
       ;wxScrollHelper::AdjustScrollbars()
       AdjustScrollbars__14wxScrollHelperFv
-      ;wxScrollHelper::HandleOnPaint(wxPaintEvent&)
-      HandleOnPaint__14wxScrollHelperFR12wxPaintEvent
+      ;wxGenericScrolledWindow::sm_eventTableEntries
+      sm_eventTableEntries__23wxGenericScrolledWindow
       ;wxScrollHelper::HandleOnSize(wxSizeEvent&)
       HandleOnSize__14wxScrollHelperFR11wxSizeEvent
+      ;wxScrollHelper::HandleOnPaint(wxPaintEvent&)
+      HandleOnPaint__14wxScrollHelperFR12wxPaintEvent
       ;wxScrollHelper::GetVirtualSize(int*,int*) const
       GetVirtualSize__14wxScrollHelperCFPiT1
       ;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
@@ -9101,33 +9319,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
@@ -9447,12 +9683,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&)
@@ -9463,8 +9705,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
@@ -9496,6 +9736,8 @@ EXPORTS
       __dt__17wxGenericTreeCtrlFv
       ;wxConstructorForwxTreeCtrl()
       wxConstructorForwxTreeCtrl__Fv
+      ;wxGenericTreeCtrl::SetForegroundColour(const wxColour&)
+      SetForegroundColour__17wxGenericTreeCtrlFRC8wxColour
       ;wxGenericTreeCtrl::GetStateImageList() const
       GetStateImageList__17wxGenericTreeCtrlCFv
       ;wxGenericTreeCtrl::GetImageList() const
@@ -9512,6 +9754,8 @@ EXPORTS
       SetItemFont__17wxGenericTreeCtrlFRC12wxTreeItemIdRC6wxFont
       ;wxGenericTreeCtrl::SetFont(const wxFont&)
       SetFont__17wxGenericTreeCtrlFRC6wxFont
+      ;wxGenericTreeCtrl::SetButtonsImageList(wxImageList*)
+      SetButtonsImageList__17wxGenericTreeCtrlFP11wxImageList
       ;wxGenericTreeCtrl::OnPaint(wxPaintEvent&)
       OnPaint__17wxGenericTreeCtrlFR12wxPaintEvent
       ;wxTreeTextCtrl::OnKeyUp(wxKeyEvent&)
@@ -9536,18 +9780,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
@@ -9579,8 +9823,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
@@ -9601,8 +9843,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*)
@@ -9621,6 +9861,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&)
@@ -9632,6 +9874,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
@@ -9644,6 +9888,8 @@ EXPORTS
       RefreshLine__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem*,wxGenericTreeItem*)
       SelectItemRange__17wxGenericTreeCtrlFP17wxGenericTreeItemT1
+      ;wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem*)
+      RefreshSelectedUnder__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::DrawDropEffect(wxGenericTreeItem*)
       DrawDropEffect__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxTreeRenameTimer::Notify()
@@ -9655,8 +9901,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
@@ -9718,16 +9962,16 @@ EXPORTS
       Index__18wxHtmlBookRecArrayCFRC16wxHtmlBookRecordUl
       __vft14wxHtmlHelpData8wxObject
       __vft13HP_TagHandler8wxObject
-      ;wxHtmlBookRecArray::RemoveAt(unsigned int)
-      RemoveAt__18wxHtmlBookRecArrayFUi
+      ;wxHtmlBookRecArray::operator=(const wxHtmlBookRecArray&)
+      __as__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray
       ;wxHtmlHelpData::sm_classwxHtmlHelpData
       sm_classwxHtmlHelpData__14wxHtmlHelpData
       ;wxHtmlBookRecArray::wxHtmlBookRecArray(const wxHtmlBookRecArray&)
       __ct__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray
-      ;wxHtmlBookRecArray::operator=(const wxHtmlBookRecArray&)
-      __as__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray
       ;HP_TagHandler::WriteOut(wxHtmlContentsItem*&,int&)
       WriteOut__13HP_TagHandlerFRP18wxHtmlContentsItemRi
+      ;wxHtmlBookRecArray::RemoveAt(unsigned int)
+      RemoveAt__18wxHtmlBookRecArrayFUi
       ;wxHtmlBookRecArray::DoEmpty()
       DoEmpty__18wxHtmlBookRecArrayFv
       ;wxHtmlBookRecArray::Add(const wxHtmlBookRecord&)
@@ -9854,6 +10098,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
@@ -9887,6 +10133,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)
@@ -9899,28 +10147,28 @@ 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
       Find__10wxHtmlCellCFiPCv
       ;wxHtmlFontCell::Draw(wxDC&,int,int,int,int)
       Draw__14wxHtmlFontCellFR4wxDCiN32
-      ;wxHtmlCell::Draw(wxDC&,int,int,int,int)
-      Draw__10wxHtmlCellFR4wxDCiN32
       ;wxHtmlWidgetCell::DrawInvisible(wxDC&,int,int)
       DrawInvisible__16wxHtmlWidgetCellFR4wxDCiT2
-      ;wxHtmlCell::DrawInvisible(wxDC&,int,int)
-      DrawInvisible__10wxHtmlCellFR4wxDCiT2
   ;From object file:  ..\html\htmlfilt.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft21wxHtmlFilterPlainText8wxObject
@@ -9958,40 +10206,68 @@ EXPORTS
       sm_classwxHtmlFilter__12wxHtmlFilter
   ;From object file:  ..\html\htmlpars.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxHtmlParser::DoneParser()
-      DoneParser__12wxHtmlParserFv
+      ;wxHtmlTextPieces::~wxHtmlTextPieces()
+      __dt__16wxHtmlTextPiecesFv
       ;wxHtmlEntitiesParser::~wxHtmlEntitiesParser()
       __dt__20wxHtmlEntitiesParserFv
+      ;wxHtmlParser::DoneParser()
+      DoneParser__12wxHtmlParserFv
+      ;wxHtmlParser::DestroyDOMTree()
+      DestroyDOMTree__12wxHtmlParserFv
+      ;wxHtmlTextPieces::DoCopy(const wxHtmlTextPieces&)
+      DoCopy__16wxHtmlTextPiecesFRC16wxHtmlTextPieces
       ;wxHtmlEntitiesParser::GetEntityChar(const wxString&)
       GetEntityChar__20wxHtmlEntitiesParserFRC8wxString
+      ;wxHtmlTextPieces::Index(const wxHtmlTextPiece&,unsigned long) const
+      Index__16wxHtmlTextPiecesCFRC15wxHtmlTextPieceUl
       __vft20wxHtmlEntitiesParser8wxObject
+      ;wxHtmlTextPieces::Insert(const wxHtmlTextPiece&,unsigned int)
+      Insert__16wxHtmlTextPiecesFRC15wxHtmlTextPieceUi
+      ;wxHtmlParser::DoParsing()
+      DoParsing__12wxHtmlParserFv
+      ;wxHtmlParser::RestoreState()
+      RestoreState__12wxHtmlParserFv
       ;wxHtmlParser::AddTagHandler(wxHtmlTagHandler*)
       AddTagHandler__12wxHtmlParserFP16wxHtmlTagHandler
+      ;wxHtmlTextPieces::wxHtmlTextPieces(const wxHtmlTextPieces&)
+      __ct__16wxHtmlTextPiecesFRC16wxHtmlTextPieces
       ;wxHtmlParser::SetSource(const wxString&)
       SetSource__12wxHtmlParserFRC8wxString
-      ;wxHtmlParser::wxHtmlParser()
-      __ct__12wxHtmlParserFv
+      ;wxHtmlTextPieces::DoEmpty()
+      DoEmpty__16wxHtmlTextPiecesFv
       ;wxConstructorForwxHtmlEntitiesParser()
       wxConstructorForwxHtmlEntitiesParser__Fv
       ;wxHtmlTagHandler::sm_classwxHtmlTagHandler
       sm_classwxHtmlTagHandler__16wxHtmlTagHandler
+      ;wxHtmlParser::wxHtmlParser()
+      __ct__12wxHtmlParserFv
       ;wxHtmlParser::PopTagHandler()
       PopTagHandler__12wxHtmlParserFv
-      ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
-      PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
-      ;wxHtmlEntitiesParser::SetEncoding(wxFontEncoding)
-      SetEncoding__20wxHtmlEntitiesParserF14wxFontEncoding
+      ;wxHtmlParser::CreateDOMTree()
+      CreateDOMTree__12wxHtmlParserFv
       ;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)
       GetCharForCode__20wxHtmlEntitiesParserFUi
+      ;wxHtmlParser::CreateDOMSubTree(wxHtmlTag*,int,int,wxHtmlTagsCache*)
+      CreateDOMSubTree__12wxHtmlParserFP9wxHtmlTagiT2P15wxHtmlTagsCache
       ;wxHtmlParser::~wxHtmlParser()
       __dt__12wxHtmlParserFv
+      ;wxHtmlTextPieces::operator=(const wxHtmlTextPieces&)
+      __as__16wxHtmlTextPiecesFRC16wxHtmlTextPieces
       ;wxHtmlParser::AddTag(const wxHtmlTag&)
       AddTag__12wxHtmlParserFRC9wxHtmlTag
       __vft12wxHtmlParser8wxObject
       ;wxHtmlParser::DoParsing(int,int)
       DoParsing__12wxHtmlParserFiT1
+      ;wxHtmlTextPieces::Add(const wxHtmlTextPiece&)
+      Add__16wxHtmlTextPiecesFRC15wxHtmlTextPiece
       ;wxHtmlEntitiesParser::wxHtmlEntitiesParser()
       __ct__20wxHtmlEntitiesParserFv
       ;wxHtmlParser::sm_classwxHtmlParser
@@ -10000,48 +10276,61 @@ EXPORTS
       sm_classwxHtmlEntitiesParser__20wxHtmlEntitiesParser
       ;wxHtmlParser::Parse(const wxString&)
       Parse__12wxHtmlParserFRC8wxString
+      ;wxHtmlParser::SetSourceAndSaveState(const wxString&)
+      SetSourceAndSaveState__12wxHtmlParserFRC8wxString
       ;wxHtmlParser::InitParser(const wxString&)
       InitParser__12wxHtmlParserFRC8wxString
   ;From object file:  ..\html\htmltag.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTag::GetParam(const wxString&,unsigned long) const
       GetParam__9wxHtmlTagCFRC8wxStringUl
+      __vft9wxHtmlTag8wxObject
       ;wxHtmlTag::ScanParam(const wxString&,char*,void*) const
       ScanParam__9wxHtmlTagCFRC8wxStringPcPv
+      ;wxHtmlTag::GetNextTag() const
+      GetNextTag__9wxHtmlTagCFv
       ;wxHtmlTagsCache::wxHtmlTagsCache(const wxString&)
       __ct__15wxHtmlTagsCacheFRC8wxString
       ;wxHtmlTag::HasParam(const wxString&) const
       HasParam__9wxHtmlTagCFRC8wxString
       ;wxHtmlTagsCache::QueryTag(int,int*,int*)
       QueryTag__15wxHtmlTagsCacheFiPiT2
+      ;wxHtmlTag::~wxHtmlTag()
+      __dt__9wxHtmlTagFv
+      ;wxHtmlTag::GetFirstSibling() const
+      GetFirstSibling__9wxHtmlTagCFv
       ;wxHtmlTag::GetParamAsInt(const wxString&,int*) const
       GetParamAsInt__9wxHtmlTagCFRC8wxStringPi
       ;wxHtmlTagsCache::sm_classwxHtmlTagsCache
       sm_classwxHtmlTagsCache__15wxHtmlTagsCache
-      ;wxHtmlTag::wxHtmlTag(const wxString&,int,int,wxHtmlTagsCache*,wxHtmlEntitiesParser*)
-      __ct__9wxHtmlTagFRC8wxStringiT2P15wxHtmlTagsCacheP20wxHtmlEntitiesParser
+      ;wxHtmlTag::wxHtmlTag(wxHtmlTag*,const wxString&,int,int,wxHtmlTagsCache*,wxHtmlEntitiesParser*)
+      __ct__9wxHtmlTagFP9wxHtmlTagRC8wxStringiT3P15wxHtmlTagsCacheP20wxHtmlEntitiesParser
       ;wxHtmlTag::GetParamAsColour(const wxString&,wxColour*) const
       GetParamAsColour__9wxHtmlTagCFRC8wxStringP8wxColour
+      ;wxHtmlTag::GetLastSibling() const
+      GetLastSibling__9wxHtmlTagCFv
       ;wxHtmlTag::GetAllParams() const
       GetAllParams__9wxHtmlTagCFv
       ;wxHtmlTag::sm_classwxHtmlTag
       sm_classwxHtmlTag__9wxHtmlTag
   ;From object file:  ..\html\htmlwin.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxHtmlHistoryArray::RemoveAt(unsigned int)
-      RemoveAt__18wxHtmlHistoryArrayFUi
+      ;wxHtmlHistoryArray::DoCopy(const wxHtmlHistoryArray&)
+      DoCopy__18wxHtmlHistoryArrayFRC18wxHtmlHistoryArray
       ;wxHtmlWinModule::sm_classwxHtmlWinModule
       sm_classwxHtmlWinModule__15wxHtmlWinModule
       ;wxHtmlWindow::SetFonts(wxString,wxString,const int*)
       SetFonts__12wxHtmlWindowF8wxStringT1PCi
-      ;wxHtmlHistoryArray::DoCopy(const wxHtmlHistoryArray&)
-      DoCopy__18wxHtmlHistoryArrayFRC18wxHtmlHistoryArray
+      ;wxHtmlHistoryArray::RemoveAt(unsigned int)
+      RemoveAt__18wxHtmlHistoryArrayFUi
       ;wxHtmlHistoryArray::Add(const wxHtmlHistoryItem&)
       Add__18wxHtmlHistoryArrayFRC17wxHtmlHistoryItem
       ;wxHtmlHistoryArray::~wxHtmlHistoryArray()
       __dt__18wxHtmlHistoryArrayFv
       ;wxHtmlWindow::~wxHtmlWindow()
       __dt__12wxHtmlWindowFv
+      ;wxHtmlWindow::OnCellMouseHover(wxHtmlCell*,int,int)
+      OnCellMouseHover__12wxHtmlWindowFP10wxHtmlCelliT2
       ;wxHtmlWindow::HistoryCanForward()
       HistoryCanForward__12wxHtmlWindowFv
       ;wxHtmlWindow::HistoryBack()
@@ -10083,6 +10372,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&)
@@ -10323,6 +10614,8 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTableCell::ReallocRows(int)
       ReallocRows__15wxHtmlTableCellFi
+      ;wxHtmlTableCell::ComputeMinMaxWidths()
+      ComputeMinMaxWidths__15wxHtmlTableCellFv
       ;wxConstructorForHTML_ModuleTables()
       wxConstructorForHTML_ModuleTables__Fv
       __vft15wxHtmlTableCell8wxObject
@@ -10501,6 +10794,8 @@ EXPORTS
       __as__10wxMsgArrayFRC10wxMsgArray
       ;wxApp::RemoveSocketHandler(int)
       RemoveSocketHandler__5wxAppFi
+      ;wxMsgArray::DoEmpty()
+      DoEmpty__10wxMsgArrayFv
       ;wxYield()
       wxYield__Fv
       wxSTD_FRAME_ICON
@@ -10513,8 +10808,6 @@ EXPORTS
       Initialized__5wxAppFv
       ;wxApp::GetEventTable() const
       GetEventTable__5wxAppCFv
-      ;wxMsgArray::DoEmpty()
-      DoEmpty__10wxMsgArrayFv
       wxFrameClassNameNoRedraw
       ;wxSetInstance(unsigned long)
       wxSetInstance__FUl
@@ -11239,8 +11532,6 @@ EXPORTS
       ;wxDC::DoGetTextExtent(const wxString&,int*,int*,int*,int*,wxFont*) const
       DoGetTextExtent__4wxDCCFRC8wxStringPiN32P6wxFont
       __vft4wxDC8wxObject
-      ;wxDC::DoBlit(int,int,int,int,wxDC*,int,int,int,unsigned long)
-      DoBlit__4wxDCFiN31P4wxDCN31Ul
       ;wxDC::DoFloodFill(int,int,const wxColour&,int)
       DoFloodFill__4wxDCFiT1RC8wxColourT1
       ;wxDC::SetLogicalFunction(int)
@@ -11277,6 +11568,8 @@ EXPORTS
       DoDrawLine__4wxDCFiN31
       ;wxDC::DoDrawEllipticArc(int,int,int,int,double,double)
       DoDrawEllipticArc__4wxDCFiN31dT5
+      ;wxDC::DoBlit(int,int,int,int,wxDC*,int,int,int,unsigned long,int,int)
+      DoBlit__4wxDCFiN31P4wxDCN31UlN21
       ;wxDCBase::DeviceToLogicalY(int) const
       DeviceToLogicalY__8wxDCBaseCFi
       ;wxDCBase::DeviceToLogicalXRel(int) const
@@ -11317,6 +11610,8 @@ EXPORTS
       wxConstructorForwxPaintDC__Fv
       ;wxWindowDC::InitDC()
       InitDC__10wxWindowDCFv
+      ;wxClientDC::InitDC()
+      InitDC__10wxClientDCFv
       ;wxArrayDCInfo::DoCopy(const wxArrayDCInfo&)
       DoCopy__13wxArrayDCInfoFRC13wxArrayDCInfo
       ;wxArrayDCInfo::Add(const wxPaintDCInfo&)
@@ -11347,10 +11642,13 @@ EXPORTS
       FindInCache__9wxPaintDCCFPUi
       ;wxArrayDCInfo::DoEmpty()
       DoEmpty__13wxArrayDCInfoFv
+      ;wxClientDC::~wxClientDC()
+      __dt__10wxClientDCFv
       ;wxClientDC::sm_classwxClientDC
       sm_classwxClientDC__10wxClientDC
       ;wxPaintDC::sm_classwxPaintDC
       sm_classwxPaintDC__9wxPaintDC
+      __vft10wxClientDC8wxObject
       __vft9wxPaintDC8wxObject
       ;wxArrayDCInfo::~wxArrayDCInfo()
       __dt__13wxArrayDCInfoFv
@@ -11390,12 +11688,12 @@ EXPORTS
       CreateCompatible__10wxMemoryDCFP4wxDC
   ;From object file:  ..\os2\dcprint.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxPrinterDC::DoBlit(int,int,int,int,wxDC*,int,int,int,unsigned long,int,int)
+      DoBlit__11wxPrinterDCFiN31P4wxDCN31UlN21
       ;wxPrinterDC::EndDoc()
       EndDoc__11wxPrinterDCFv
       ;wxPrinterDC::EndPage()
       EndPage__11wxPrinterDCFv
-      ;wxPrinterDC::DoBlit(int,int,int,int,wxDC*,int,int,int,unsigned long)
-      DoBlit__11wxPrinterDCFiN31P4wxDCN31Ul
       ;wxGetPrinterDC(const wxPrintData&)
       wxGetPrinterDC__FRC11wxPrintData
       ;wxPrinterDC::sm_classwxPrinterDC
@@ -11722,10 +12020,14 @@ EXPORTS
       DoGetSize__10wxFrameOS2CFPiT1
       ;wxFrameOS2::~wxFrameOS2()
       __dt__10wxFrameOS2Fv
+      ;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)
@@ -11734,6 +12036,8 @@ EXPORTS
       SetClient__10wxFrameOS2FUl
       ;wxFrameOS2::IconizeChildFrames(unsigned long)
       IconizeChildFrames__10wxFrameOS2FUl
+      ;wxFrame::sm_classwxFrame
+      sm_classwxFrame__7wxFrame
       ;wxFrameOS2::GetEventTable() const
       GetEventTable__10wxFrameOS2CFv
       ;wxFrameOS2::SetMenuBar(wxMenuBar*)
@@ -11755,18 +12059,14 @@ EXPORTS
       Init__10wxFrameOS2Fv
       ;wxFrameOS2::sm_eventTable
       sm_eventTable__10wxFrameOS2
-      ;wxFrameOS2::sm_classwxFrameOS2
-      sm_classwxFrameOS2__10wxFrameOS2
       ;wxFrameOS2::DoGetPosition(int*,int*) const
       DoGetPosition__10wxFrameOS2CFPiT1
-      ;wxConstructorForwxFrameOS2()
-      wxConstructorForwxFrameOS2__Fv
+      ;wxFrameOS2::IsMaximized() const
+      IsMaximized__10wxFrameOS2CFv
       ;wxFrameOS2::SetIcon(const wxIcon&)
       SetIcon__10wxFrameOS2FRC6wxIcon
       ;wxFrameOS2::PositionToolBar()
       PositionToolBar__10wxFrameOS2Fv
-      ;wxFrameOS2::IsMaximized() const
-      IsMaximized__10wxFrameOS2CFv
       ;wxFrameOS2::GetClientAreaOrigin() const
       GetClientAreaOrigin__10wxFrameOS2CFv
       ;wxFrameOS2::OnCreateStatusBar(int,long,int,const wxString&)
@@ -12521,6 +12821,8 @@ EXPORTS
       ChangePage__10wxNotebookFiT1
       ;wxNotebook::SetTabSize(const wxSize&)
       SetTabSize__10wxNotebookFRC6wxSize
+      ;wxNotebook::SetPageSize(const wxSize&)
+      SetPageSize__10wxNotebookFRC6wxSize
       ;wxNotebook::AddPage(wxWindow*,const wxString&,unsigned long,int)
       AddPage__10wxNotebookFP8wxWindowRC8wxStringUli
       ;wxNotebook::OnSize(wxSizeEvent&)
@@ -12547,6 +12849,8 @@ EXPORTS
       OnNavigationKey__10wxNotebookFR20wxNavigationKeyEvent
       ;wxNotebook::GetPageText(int) const
       GetPageText__10wxNotebookCFi
+      ;wxNotebook::SetPadding(const wxSize&)
+      SetPadding__10wxNotebookFRC6wxSize
       ;wxConstructorForwxNotebook()
       wxConstructorForwxNotebook__Fv
       ;wxConstructorForwxNotebookEvent()
@@ -12944,21 +13248,15 @@ EXPORTS
       sm_eventTable__11wxScrollBar
   ;From object file:  ..\os2\settings.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxSystemSettings::SetOption(const wxString&,const wxString&)
-      SetOption__16wxSystemSettingsFRC8wxStringT1
       ;wxSystemSettingsModule::sm_classwxSystemSettingsModule
       sm_classwxSystemSettingsModule__22wxSystemSettingsModule
       ;wxSystemSettingsModule::OnInit()
       OnInit__22wxSystemSettingsModuleFv
-      ;wxSystemSettings::GetOption(const wxString&)
-      GetOption__16wxSystemSettingsFRC8wxString
       __vft22wxSystemSettingsModule8wxObject
       ;wxSystemSettings::GetSystemColour(int)
       GetSystemColour__16wxSystemSettingsFi
       ;wxSystemSettings::GetSystemMetric(int)
       GetSystemMetric__16wxSystemSettingsFi
-      ;wxSystemSettings::HasOption(const wxString&)
-      HasOption__16wxSystemSettingsFRC8wxString
       ;wxSystemSettingsModule::sm_optionNames
       sm_optionNames__22wxSystemSettingsModule
       ;wxSystemSettingsModule::OnExit()
@@ -12967,12 +13265,8 @@ EXPORTS
       sm_optionValues__22wxSystemSettingsModule
       ;wxConstructorForwxSystemSettingsModule()
       wxConstructorForwxSystemSettingsModule__Fv
-      ;wxSystemSettings::GetOptionInt(const wxString&)
-      GetOptionInt__16wxSystemSettingsFRC8wxString
       ;wxSystemSettings::GetSystemFont(int)
       GetSystemFont__16wxSystemSettingsFi
-      ;wxSystemSettings::SetOption(const wxString&,int)
-      SetOption__16wxSystemSettingsFRC8wxStringi
   ;From object file:  ..\os2\slider.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSlider::SetValue(int)
@@ -13813,6 +14107,8 @@ EXPORTS
       GetScrollThumb__8wxWindowCFi
       ;wxWindow::DoGetClientSize(int*,int*) const
       DoGetClientSize__8wxWindowCFPiT1
+      ;wxWindowBase::GetCapture()
+      GetCapture__12wxWindowBaseFv
       ;wxWindow::SetFocus()
       SetFocus__8wxWindowFv
       ;wxWindow::ReleaseMouse()
@@ -13861,8 +14157,6 @@ EXPORTS
       HandleSysCommand__8wxWindowFPvT1
       ;wxWindow::HandleSize(int,int,unsigned int)
       HandleSize__8wxWindowFiT1Ui
-      ;wxWindow::AdjustForParentClientOrigin(int&,int&,int)
-      AdjustForParentClientOrigin__8wxWindowFRiT1i
       ;wxWindow::Init()
       Init__8wxWindowFv
       ;wxGetMousePosition()