X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1bcfc0e1b91dd7bc2a3144048fbbf5c809943986..5d32001b326f4c1ef1e5e34d2bc634298b14c77d:/src/os2/wx23.def

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index a3e4161816..c0dd77587d 100644
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
-;From library:  F:\DEV\WX2\WXWINDOWS\LIB\WX.lib
+;From library:  H:\Dev\Wx2\WxWindows\lib\wx.lib
   ;From object file:  dummy.cpp
     ;PUBDEFs (Symbols available from object file):
       wxDummyChar
@@ -14,7 +14,13 @@ EXPORTS
       wxOnAssert__FPCciT1
       ;wxAppBase::OnInitGui()
       OnInitGui__9wxAppBaseFv
+      ;wxAppBase::OnInitCmdLine(wxCmdLineParser&)
+      OnInitCmdLine__9wxAppBaseFR15wxCmdLineParser
+      ;wxAppBase::OnCmdLineParsed(wxCmdLineParser&)
+      OnCmdLineParsed__9wxAppBaseFR15wxCmdLineParser
       __vft9wxAppBase8wxObject
+      ;wxAppBase::OnCmdLineHelp(wxCmdLineParser&)
+      OnCmdLineHelp__9wxAppBaseFR15wxCmdLineParser
       ;wxTrap()
       wxTrap__Fv
       ;wxAppBase::OnAssert(const char*,int,const char*)
@@ -29,9 +35,10 @@ EXPORTS
       OnInit__9wxAppBaseFv
       ;wxAppBase::ProcessPendingEvents()
       ProcessPendingEvents__9wxAppBaseFv
+      ;wxAppBase::OnCmdLineError(wxCmdLineParser&)
+      OnCmdLineError__9wxAppBaseFR15wxCmdLineParser
       ;wxAppBase::SetActive(unsigned long,wxWindow*)
       SetActive__9wxAppBaseFUlP8wxWindow
-  ;From object file:  ..\common\bmpbase.cpp
   ;From object file:  ..\common\choiccmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxChoiceBase::SetStringSelection(const wxString&)
@@ -54,7 +61,111 @@ EXPORTS
       __vft17wxClipboardModule8wxObject
       ;wxConstructorForwxClipboardModule()
       wxConstructorForwxClipboardModule__Fv
+  ;From object file:  ..\common\clntdata.cpp
+    ;PUBDEFs (Symbols available from object file):
+      __vft21wxClientDataContainer
+      ;wxClientDataContainer::DoSetClientObject(wxClientData*)
+      DoSetClientObject__21wxClientDataContainerFP12wxClientData
+      ;wxClientDataContainer::DoGetClientObject() const
+      DoGetClientObject__21wxClientDataContainerCFv
+      ;wxClientDataContainer::DoGetClientData() const
+      DoGetClientData__21wxClientDataContainerCFv
+      ;wxClientDataContainer::~wxClientDataContainer()
+      __dt__21wxClientDataContainerFv
+      ;wxClientDataContainer::DoSetClientData(void*)
+      DoSetClientData__21wxClientDataContainerFPv
+      ;wxClientDataContainer::wxClientDataContainer()
+      __ct__21wxClientDataContainerFv
   ;From object file:  ..\common\cmdline.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxCmdLineParser::EnableLongOptions(unsigned long)
+      EnableLongOptions__15wxCmdLineParserFUl
+      ;wxArrayParams::Index(const wxCmdLineParam&,unsigned long) const
+      Index__13wxArrayParamsCFRC14wxCmdLineParamUl
+      ;wxCmdLineParser::Found(const wxString&,long*) const
+      Found__15wxCmdLineParserCFRC8wxStringPl
+      ;wxArrayParams::RemoveAt(unsigned int)
+      RemoveAt__13wxArrayParamsFUi
+      ;wxCmdLineParser::AddSwitch(const wxString&,const wxString&,const wxString&,int)
+      AddSwitch__15wxCmdLineParserFRC8wxStringN21i
+      ;wxArrayOptions::Add(const wxCmdLineOption&)
+      Add__14wxArrayOptionsFRC15wxCmdLineOption
+      ;wxCmdLineParser::Reset()
+      Reset__15wxCmdLineParserFv
+      ;wxCmdLineParser::SetCmdLine(int,char**)
+      SetCmdLine__15wxCmdLineParserFiPPc
+      ;wxArrayOptions::wxArrayOptions(const wxArrayOptions&)
+      __ct__14wxArrayOptionsFRC14wxArrayOptions
+      ;wxCmdLineParser::SetSwitchChars(const wxString&)
+      SetSwitchChars__15wxCmdLineParserFRC8wxString
+      ;wxCmdLineParser::SetDesc(const wxCmdLineEntryDesc*)
+      SetDesc__15wxCmdLineParserFPC18wxCmdLineEntryDesc
+      ;wxCmdLineParser::Found(const wxString&,wxString*) const
+      Found__15wxCmdLineParserCFRC8wxStringP8wxString
+      ;wxCmdLineParserData::FindOptionByLongName(const wxString&)
+      FindOptionByLongName__19wxCmdLineParserDataFRC8wxString
+      ;wxArrayOptions::Index(const wxCmdLineOption&,unsigned long) const
+      Index__14wxArrayOptionsCFRC15wxCmdLineOptionUl
+      ;wxArrayOptions::RemoveAt(unsigned int)
+      RemoveAt__14wxArrayOptionsFUi
+      ;wxArrayParams::Insert(const wxCmdLineParam&,unsigned int)
+      Insert__13wxArrayParamsFRC14wxCmdLineParamUi
+      ;wxCmdLineParserData::wxCmdLineParserData()
+      __ct__19wxCmdLineParserDataFv
+      ;wxCmdLineParser::SetCmdLine(const wxString&)
+      SetCmdLine__15wxCmdLineParserFRC8wxString
+      ;wxArrayParams::wxArrayParams(const wxArrayParams&)
+      __ct__13wxArrayParamsFRC13wxArrayParams
+      ;wxArrayOptions::operator=(const wxArrayOptions&)
+      __as__14wxArrayOptionsFRC14wxArrayOptions
+      ;wxCmdLineParserData::SetArguments(const wxString&)
+      SetArguments__19wxCmdLineParserDataFRC8wxString
+      ;wxCmdLineParser::ConvertStringToArgs(const char*)
+      ConvertStringToArgs__15wxCmdLineParserFPCc
+      ;wxArrayOptions::Insert(const wxCmdLineOption&,unsigned int)
+      Insert__14wxArrayOptionsFRC15wxCmdLineOptionUi
+      ;wxArrayParams::Add(const wxCmdLineParam&)
+      Add__13wxArrayParamsFRC14wxCmdLineParam
+      ;wxArrayParams::DoEmpty()
+      DoEmpty__13wxArrayParamsFv
+      ;wxArrayOptions::~wxArrayOptions()
+      __dt__14wxArrayOptionsFv
+      ;wxCmdLineParser::Usage()
+      Usage__15wxCmdLineParserFv
+      ;wxCmdLineParserData::SetArguments(int,char**)
+      SetArguments__19wxCmdLineParserDataFiPPc
+      ;wxCmdLineParser::Found(const wxString&) const
+      Found__15wxCmdLineParserCFRC8wxString
+      ;wxCmdLineParser::Parse(unsigned long)
+      Parse__15wxCmdLineParserFUl
+      ;wxCmdLineParser::AddParam(const wxString&,wxCmdLineParamType,int)
+      AddParam__15wxCmdLineParserFRC8wxString18wxCmdLineParamTypei
+      ;wxCmdLineParser::GetParam(unsigned int) const
+      GetParam__15wxCmdLineParserCFUi
+      ;wxCmdLineParser::Found(const wxString&,wxDateTime*) const
+      Found__15wxCmdLineParserCFRC8wxStringP10wxDateTime
+      ;wxCmdLineParser::Init()
+      Init__15wxCmdLineParserFv
+      ;wxCmdLineParser::~wxCmdLineParser()
+      __dt__15wxCmdLineParserFv
+      ;wxArrayParams::~wxArrayParams()
+      __dt__13wxArrayParamsFv
+      ;wxArrayParams::operator=(const wxArrayParams&)
+      __as__13wxArrayParamsFRC13wxArrayParams
+      ;wxCmdLineParser::AddOption(const wxString&,const wxString&,const wxString&,wxCmdLineParamType,int)
+      AddOption__15wxCmdLineParserFRC8wxStringN2118wxCmdLineParamTypei
+      ;wxArrayOptions::DoEmpty()
+      DoEmpty__14wxArrayOptionsFv
+      ;wxCmdLineParser::GetParamCount() const
+      GetParamCount__15wxCmdLineParserCFv
+      ;wxArrayOptions::DoCopy(const wxArrayOptions&)
+      DoCopy__14wxArrayOptionsFRC14wxArrayOptions
+      ;wxCmdLineParser::SetLogo(const wxString&)
+      SetLogo__15wxCmdLineParserFRC8wxString
+      ;wxCmdLineParserData::FindOption(const wxString&)
+      FindOption__19wxCmdLineParserDataFRC8wxString
+      ;wxArrayParams::DoCopy(const wxArrayParams&)
+      DoCopy__13wxArrayParamsFRC13wxArrayParams
   ;From object file:  ..\common\cmndata.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxColourData::GetCustomColour(int)
@@ -182,24 +293,24 @@ EXPORTS
       ClearCommands__18wxCommandProcessorFv
   ;From object file:  ..\common\config.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxConfigBase::Write(const wxString&,double)
-      Write__12wxConfigBaseFRC8wxStringd
-      ;wxConfigBase::Write(const wxString&,unsigned long)
-      Write__12wxConfigBaseFRC8wxStringUl
-      ;wxConfigBase::Read(const wxString&,int*,int) const
-      Read__12wxConfigBaseCFRC8wxStringPii
+      ;wxConfigBase::Read(const wxString&,long*) const
+      Read__12wxConfigBaseCFRC8wxStringPl
+      ;wxConfigBase::DoWriteDouble(const wxString&,double)
+      DoWriteDouble__12wxConfigBaseFRC8wxStringd
       ;wxConfigBase::Read(const wxString&,wxString*,const wxString&) const
       Read__12wxConfigBaseCFRC8wxStringP8wxStringT1
+      ;wxConfigBase::Read(const wxString&,int*,int) const
+      Read__12wxConfigBaseCFRC8wxStringPii
+      ;wxConfigBase::DoWriteInt(const wxString&,int)
+      DoWriteInt__12wxConfigBaseFRC8wxStringi
       ;wxConfigBase::~wxConfigBase()
       __dt__12wxConfigBaseFv
       ;wxConfigPathChanger::~wxConfigPathChanger()
       __dt__19wxConfigPathChangerFv
-      ;wxConfigBase::Read(const wxString&,unsigned long*) const
-      Read__12wxConfigBaseCFRC8wxStringPUl
       ;wxConfigBase::wxConfigBase(const wxString&,const wxString&,const wxString&,const wxString&,long)
       __ct__12wxConfigBaseFRC8wxStringN31l
-      ;wxConfigBase::Read(const wxString&,const wxString&) const
-      Read__12wxConfigBaseCFRC8wxStringT1
+      ;wxConfigBase::Read(const wxString&,unsigned long*) const
+      Read__12wxConfigBaseCFRC8wxStringPUl
       ;wxConfigBase::ExpandEnvVars(const wxString&) const
       ExpandEnvVars__12wxConfigBaseCFRC8wxString
       ;wxSplitPath(wxArrayString&,const char*)
@@ -208,12 +319,16 @@ EXPORTS
       wxExpandEnvVars__FRC8wxString
       ;wxConfigBase::Read(const wxString&,long*,long) const
       Read__12wxConfigBaseCFRC8wxStringPll
+      ;wxConfigBase::DoReadInt(const wxString&,int*) const
+      DoReadInt__12wxConfigBaseCFRC8wxStringPi
       ;wxConfigBase::ms_pConfig
       ms_pConfig__12wxConfigBase
-      ;wxConfigBase::Write(const wxString&,const char*)
-      Write__12wxConfigBaseFRC8wxStringPCc
+      ;wxConfigBase::Read(const wxString&,wxString*) const
+      Read__12wxConfigBaseCFRC8wxStringP8wxString
       ;wxConfigBase::Read(const wxString&,double*) const
       Read__12wxConfigBaseCFRC8wxStringPd
+      ;wxConfigBase::DoReadBool(const wxString&,unsigned long*) const
+      DoReadBool__12wxConfigBaseCFRC8wxStringPUl
       ;wxConfigBase::Set(wxConfigBase*)
       Set__12wxConfigBaseFP12wxConfigBase
       ;wxConfigBase::Create()
@@ -224,6 +339,10 @@ EXPORTS
       Read__12wxConfigBaseCFRC8wxStringPdd
       ;wxConfigBase::Read(const wxString&,unsigned long*,unsigned long) const
       Read__12wxConfigBaseCFRC8wxStringPUlUl
+      ;wxConfigBase::DoWriteBool(const wxString&,unsigned long)
+      DoWriteBool__12wxConfigBaseFRC8wxStringUl
+      ;wxConfigBase::DoReadDouble(const wxString&,double*) const
+      DoReadDouble__12wxConfigBaseCFRC8wxStringPd
       ;wxConfigBase::Read(const wxString&,int*) const
       Read__12wxConfigBaseCFRC8wxStringPi
       ;wxConfigBase::ms_bAutoCreate
@@ -650,6 +769,8 @@ EXPORTS
       Format__10wxTimeSpanCFPCc
   ;From object file:  ..\common\datstrm.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxDataInputStream::operator>>(wxULongLongWx&)
+      __rs__17wxDataInputStreamFR13wxULongLongWx
       ;wxDataOutputStream::operator<<(unsigned int)
       __ls__18wxDataOutputStreamFUi
       ;wxDataInputStream::Read16()
@@ -674,6 +795,10 @@ EXPORTS
       Write16__18wxDataOutputStreamFUs
       ;wxDataInputStream::operator>>(double&)
       __rs__17wxDataInputStreamFRd
+      ;wxDataOutputStream::operator<<(wxULongLongWx)
+      __ls__18wxDataOutputStreamF13wxULongLongWx
+      ;wxDataOutputStream::Write64(wxULongLongWx)
+      Write64__18wxDataOutputStreamF13wxULongLongWx
       ;wxDataOutputStream::wxDataOutputStream(wxOutputStream&)
       __ct__18wxDataOutputStreamFR14wxOutputStream
       ;wxDataOutputStream::Write32(unsigned int)
@@ -694,10 +819,12 @@ EXPORTS
       __rs__17wxDataInputStreamFRi
       ;wxDataInputStream::operator>>(unsigned int&)
       __rs__17wxDataInputStreamFRUi
-      ;wxDataOutputStream::~wxDataOutputStream()
-      __dt__18wxDataOutputStreamFv
+      ;wxDataInputStream::Read64()
+      Read64__17wxDataInputStreamFv
       ;wxDataOutputStream::operator<<(float)
       __ls__18wxDataOutputStreamFf
+      ;wxDataOutputStream::~wxDataOutputStream()
+      __dt__18wxDataOutputStreamFv
       ;wxDataInputStream::operator>>(signed char&)
       __rs__17wxDataInputStreamFRSc
       ;wxDataOutputStream::operator<<(short)
@@ -750,11 +877,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
@@ -813,6 +946,8 @@ EXPORTS
       __vft16wxTextDropTarget16wxDropTargetBase
       ;wxwxSimpleDataObjectListNode::DeleteData()
       DeleteData__28wxwxSimpleDataObjectListNodeFv
+      ;wxDataObjectComposite::wxDataObjectComposite()
+      __ct__21wxDataObjectCompositeFv
       ;wxCustomDataObject::TakeData(unsigned int,void*)
       TakeData__18wxCustomDataObjectFUiPv
       ;wxDataObjectBase::IsSupported(const wxDataFormat&,wxDataObjectBase::Direction) const
@@ -1167,6 +1302,11 @@ EXPORTS
       ActivateView__12wxDocManagerFP6wxViewUlT2
       ;wxDocument::OnOpenDocument(const wxString&)
       OnOpenDocument__10wxDocumentFRC8wxString
+  ;From object file:  ..\common\dseldlg.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxDirSelector(const wxString&,const wxString&,long,const wxPoint&,wxWindow*)
+      wxDirSelector__FRC8wxStringT1lRC7wxPointP8wxWindow
+      wxDirSelectorPromptStr
   ;From object file:  ..\common\dynarray.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxBaseArray::Add(long)
@@ -1211,8 +1351,6 @@ EXPORTS
       __dt__9wxLibraryFv
       ;wxLibraries::~wxLibraries()
       __dt__11wxLibrariesFv
-      ;wxDllLoader::GetSymbol(unsigned long,const wxString&)
-      GetSymbol__11wxDllLoaderFUlRC8wxString
       ;wxDllLoader::LoadLibrary(const wxString&,unsigned long*)
       LoadLibrary__11wxDllLoaderFRC8wxStringPUl
       ;wxLibraries::wxLibraries()
@@ -1229,12 +1367,15 @@ EXPORTS
       GetProgramHandle__11wxDllLoaderFv
       ;wxLibrary::PrepareClasses(wxClassInfo*)
       PrepareClasses__9wxLibraryFP11wxClassInfo
+      ;wxDllLoader::GetSymbol(unsigned long,const wxString&,unsigned long*)
+      GetSymbol__11wxDllLoaderFUlRC8wxStringPUl
       __vft9wxLibrary8wxObject
-      ;wxDllLoader::GetDllExt()
-      GetDllExt__11wxDllLoaderFv
+      ;wxDllLoader::ms_dllext
+      ms_dllext__11wxDllLoader
       ;wxLibraries::LoadLibrary(const wxString&)
       LoadLibrary__11wxLibrariesFRC8wxString
       wxTheLibraries
+  ;From object file:  ..\common\dynload.cpp
   ;From object file:  ..\common\effects.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxEffects::sm_classwxEffects
@@ -1253,24 +1394,18 @@ EXPORTS
       GetAllEquivalents__19wxEncodingConverterF14wxFontEncoding
       ;wxEncodingConverter::wxEncodingConverter()
       __ct__19wxEncodingConverterFv
-      ;wxEncodingConverter::Convert(const char*,wchar_t*)
-      Convert__19wxEncodingConverterFPCcPw
       ;wxEncodingConverter::Init(wxFontEncoding,wxFontEncoding,int)
       Init__19wxEncodingConverterF14wxFontEncodingT1i
-      ;wxEncodingConverter::Convert(const wchar_t*,char*)
-      Convert__19wxEncodingConverterFPCwPc
       ;wxEncodingConverter::Convert(const wxString&)
       Convert__19wxEncodingConverterFRC8wxString
       ;wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding,int)
       GetPlatformEquivalents__19wxEncodingConverterF14wxFontEncodingi
       ;wxEncodingConverter::Convert(const char*,char*)
       Convert__19wxEncodingConverterFPCcPc
-      ;wxEncodingConverter::Convert(const wchar_t*,wchar_t*)
-      Convert__19wxEncodingConverterFPCwPw
   ;From object file:  ..\common\event.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxEvent::CopyObject(wxObject&) const
-      CopyObject__7wxEventCFR8wxObject
+      ;wxSetCursorEvent::sm_classwxSetCursorEvent
+      sm_classwxSetCursorEvent__16wxSetCursorEvent
       wxEVT_SETTING_CHANGED
       wxEVT_SCROLLWIN_TOP
       wxEVT_NC_LEFT_UP
@@ -1285,13 +1420,6 @@ EXPORTS
       sm_classwxFocusEvent__12wxFocusEvent
       ;wxCloseEvent::sm_classwxCloseEvent
       sm_classwxCloseEvent__12wxCloseEvent
-      __vft16wxDropFilesEvent8wxObject
-      __vft11wxShowEvent8wxObject
-      __vft11wxMenuEvent8wxObject
-      ;wxNotifyEvent::CopyObject(wxObject&) const
-      CopyObject__13wxNotifyEventCFR8wxObject
-      ;wxCloseEvent::CopyObject(wxObject&) const
-      CopyObject__12wxCloseEventCFR8wxObject
       ;wxCommandEvent::wxCommandEvent(int,int)
       __ct__14wxCommandEventFiT1
       wxEVT_MAXIMIZE
@@ -1325,14 +1453,18 @@ EXPORTS
       wxConstructorForwxDropFilesEvent__Fv
       ;wxEvtHandler::sm_eventTableEntries
       sm_eventTableEntries__12wxEvtHandler
-      ;wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow*)
-      __ct__20wxWindowDestroyEventFP8wxWindow
+      ;wxEvtHandler::DoGetClientData() const
+      DoGetClientData__12wxEvtHandlerCFv
+      ;wxChildFocusEvent::wxChildFocusEvent(wxWindow*)
+      __ct__17wxChildFocusEventFP8wxWindow
       ;wxFindFocusDescendant(wxWindow*)
       wxFindFocusDescendant__FP8wxWindow
       wxEVT_RIGHT_DCLICK
       wxEVT_ENTER_WINDOW
       wxEVT_COMMAND_LEFT_CLICK
       wxEVT_CHAR_HOOK
+      ;wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow*)
+      __ct__20wxWindowDestroyEventFP8wxWindow
       ;wxEvtHandler::Connect(int,int,int,void( wxObject::*)(wxEvent&),wxObject*)
       Connect__12wxEvtHandlerFiN21M8wxObjectFR7wxEvent_vP8wxObject
       wxEVT_SOCKET
@@ -1362,15 +1494,6 @@ EXPORTS
       sm_classwxJoystickEvent__15wxJoystickEvent
       ;wxCommandEvent::sm_classwxCommandEvent
       sm_classwxCommandEvent__14wxCommandEvent
-      __vft22wxQueryNewPaletteEvent8wxObject
-      __vft15wxActivateEvent8wxObject
-      __vft12wxEraseEvent8wxObject
-      ;wxQueryNewPaletteEvent::CopyObject(wxObject&) const
-      CopyObject__22wxQueryNewPaletteEventCFR8wxObject
-      ;wxScrollWinEvent::CopyObject(wxObject&) const
-      CopyObject__16wxScrollWinEventCFR8wxObject
-      ;wxMouseEvent::CopyObject(wxObject&) const
-      CopyObject__12wxMouseEventCFR8wxObject
       ;wxEvtHandler::AddPendingEvent(wxEvent&)
       AddPendingEvent__12wxEvtHandlerFR7wxEvent
       ;wxMouseEvent::Button(int) const
@@ -1385,6 +1508,8 @@ EXPORTS
       wxEVT_DRAW_ITEM
       ;wxKeyEvent::wxKeyEvent(int)
       __ct__10wxKeyEventFi
+      ;wxEvtHandler::DoSetClientObject(wxClientData*)
+      DoSetClientObject__12wxEvtHandlerFP12wxClientData
       ;wxEvtHandler::wxEvtHandler()
       __ct__12wxEvtHandlerFv
       wxEVT_POWER
@@ -1406,6 +1531,7 @@ EXPORTS
       __dt__12wxEvtHandlerFv
       ;wxEvtHandler::GetEventTable() const
       GetEventTable__12wxEvtHandlerCFv
+      wxEVT_CHILD_FOCUS
       wxEVT_NC_LEAVE_WINDOW
       wxEVT_DROP_FILES
       wxEVT_COMMAND_RIGHT_CLICK
@@ -1430,23 +1556,11 @@ EXPORTS
       sm_classwxMoveEvent__11wxMoveEvent
       ;wxIconizeEvent::sm_classwxIconizeEvent
       sm_classwxIconizeEvent__14wxIconizeEvent
-      __vft16wxScrollWinEvent8wxObject
-      __vft13wxNotifyEvent8wxObject
-      __vft12wxMouseEvent8wxObject
+      ;wxChildFocusEvent::sm_classwxChildFocusEvent
+      sm_classwxChildFocusEvent__17wxChildFocusEvent
       __vft12wxEvtHandler8wxObject
-      __vft11wxMoveEvent8wxObject
-      ;wxDropFilesEvent::CopyObject(wxObject&) const
-      CopyObject__16wxDropFilesEventCFR8wxObject
-      ;wxJoystickEvent::CopyObject(wxObject&) const
-      CopyObject__15wxJoystickEventCFR8wxObject
-      ;wxActivateEvent::CopyObject(wxObject&) const
-      CopyObject__15wxActivateEventCFR8wxObject
-      ;wxSizeEvent::CopyObject(wxObject&) const
-      CopyObject__11wxSizeEventCFR8wxObject
-      ;wxMenuEvent::CopyObject(wxObject&) const
-      CopyObject__11wxMenuEventCFR8wxObject
-      ;wxIdleEvent::CopyObject(wxObject&) const
-      CopyObject__11wxIdleEventCFR8wxObject
+      ;wxEvent::wxEvent(int,int)
+      __ct__7wxEventFiT1
       wxEVT_SIZE
       wxEVT_SCROLL_BOTTOM
       wxEVT_SCROLLWIN_BOTTOM
@@ -1460,6 +1574,8 @@ EXPORTS
       wxEVT_NC_MOTION
       wxEVT_LEFT_DOWN
       wxEVT_COMMAND_TOOL_ENTER
+      ;wxConstructorForwxSetCursorEvent()
+      wxConstructorForwxSetCursorEvent__Fv
       ;wxConstructorForwxScrollWinEvent()
       wxConstructorForwxScrollWinEvent__Fv
       ;wxConstructorForwxPaintEvent()
@@ -1472,13 +1588,15 @@ EXPORTS
       wxConstructorForwxCloseEvent__Fv
       ;wxEvtHandler::sm_classwxEvtHandler
       sm_classwxEvtHandler__12wxEvtHandler
+      ;wxEvtHandler::DoGetClientObject() const
+      DoGetClientObject__12wxEvtHandlerCFv
       wxEVT_LEAVE_WINDOW
       wxEVT_NC_RIGHT_DCLICK
       wxEVT_KILL_FOCUS
       wxEVT_COMMAND_RIGHT_DCLICK
       wxEVT_CLOSE_WINDOW
-      ;wxCommandEvent::CopyObject(wxObject&) const
-      CopyObject__14wxCommandEventCFR8wxObject
+      ;wxEvtHandler::ProcessEvent(wxEvent&)
+      ProcessEvent__12wxEvtHandlerFR7wxEvent
       wxEVT_SCROLL_LINEUP
       wxEVT_PAINT
       wxEVT_NULL
@@ -1504,25 +1622,8 @@ EXPORTS
       sm_classwxEvent__7wxEvent
       ;wxEraseEvent::sm_classwxEraseEvent
       sm_classwxEraseEvent__12wxEraseEvent
-      __vft7wxEvent8wxObject
-      __vft21wxPaletteChangedEvent8wxObject
-      __vft14wxCommandEvent8wxObject
-      __vft11wxSizeEvent8wxObject
-      __vft10wxKeyEvent8wxObject
       ;wxEvtHandler::SearchEventTable(wxEventTable&,wxEvent&)
       SearchEventTable__12wxEvtHandlerFR12wxEventTableR7wxEvent
-      ;wxEvtHandler::ProcessEvent(wxEvent&)
-      ProcessEvent__12wxEvtHandlerFR7wxEvent
-      ;wxUpdateUIEvent::CopyObject(wxObject&) const
-      CopyObject__15wxUpdateUIEventCFR8wxObject
-      ;wxEraseEvent::CopyObject(wxObject&) const
-      CopyObject__12wxEraseEventCFR8wxObject
-      ;wxShowEvent::CopyObject(wxObject&) const
-      CopyObject__11wxShowEventCFR8wxObject
-      ;wxMoveEvent::CopyObject(wxObject&) const
-      CopyObject__11wxMoveEventCFR8wxObject
-      ;wxKeyEvent::CopyObject(wxObject&) const
-      CopyObject__10wxKeyEventCFR8wxObject
       ;wxMouseEvent::wxMouseEvent(int)
       __ct__12wxMouseEventFi
       wxEVT_JOY_ZMOVE
@@ -1573,8 +1674,8 @@ EXPORTS
       wxEVT_COMMAND_LEFT_DCLICK
       ;wxMouseEvent::GetLogicalPosition(const wxDC&) const
       GetLogicalPosition__12wxMouseEventCFRC4wxDC
-      ;wxPaletteChangedEvent::CopyObject(wxObject&) const
-      CopyObject__21wxPaletteChangedEventCFR8wxObject
+      ;wxEvent::wxEvent(const wxEvent&)
+      __ct__7wxEventFRC7wxEvent
       wxEVT_RIGHT_UP
       wxEVT_POPUP_MENU_INIT
       wxEVT_PALETTE_CHANGED
@@ -1600,19 +1701,13 @@ EXPORTS
       sm_classwxContextMenuEvent__18wxContextMenuEvent
       ;wxActivateEvent::sm_classwxActivateEvent
       sm_classwxActivateEvent__15wxActivateEvent
-      __vft15wxUpdateUIEvent8wxObject
-      __vft15wxJoystickEvent8wxObject
-      __vft12wxCloseEvent8wxObject
-      __vft11wxIdleEvent8wxObject
       ;wxEvtHandler::SearchDynamicEventTable(wxEvent&)
       SearchDynamicEventTable__12wxEvtHandlerFR7wxEvent
       ;wxEvtHandler::ProcessThreadEvent(wxEvent&)
       ProcessThreadEvent__12wxEvtHandlerFR7wxEvent
-      ;wxEvent::wxEvent(int)
-      __ct__7wxEventFi
-      wxEVT_UPDATE_UI
       ;wxScrollEvent::wxScrollEvent(int,int,int,int)
       __ct__13wxScrollEventFiN31
+      wxEVT_UPDATE_UI
       ;wxConstructorForwxIdleEvent()
       wxConstructorForwxIdleEvent__Fv
       wxEVT_SCROLL_PAGEDOWN
@@ -1627,14 +1722,18 @@ EXPORTS
       wxConstructorForwxQueryNewPaletteEvent__Fv
       ;wxConstructorForwxFocusEvent()
       wxConstructorForwxFocusEvent__Fv
+      ;wxConstructorForwxChildFocusEvent()
+      wxConstructorForwxChildFocusEvent__Fv
       ;wxEvtHandler::sm_eventTable
       sm_eventTable__12wxEvtHandler
+      ;wxEvtHandler::DoSetClientData(void*)
+      DoSetClientData__12wxEvtHandlerFPv
       wxEVT_LEFT_DCLICK
       wxEVT_SET_FOCUS
       wxEVT_NC_LEFT_DCLICK
       wxEVT_INIT_DIALOG
       wxEVT_COMMAND_SET_FOCUS
-  ;From object file:  F:\DEV\WX2\WXWINDOWS\src\common\extended.c
+  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\extended.c
     ;PUBDEFs (Symbols available from object file):
       ConvertToIeeeExtended
       ConvertFromIeeeExtended
@@ -1720,10 +1819,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;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
@@ -1732,8 +1827,6 @@ EXPORTS
       GetFirstEntry__12wxFileConfigCFR8wxStringRl
       ;wxFileConfig::DeleteEntry(const wxString&,unsigned long)
       DeleteEntry__12wxFileConfigFRC8wxStringUl
-      ;wxFileConfig::Write(const wxString&,const wxString&)
-      Write__12wxFileConfigFRC8wxStringT1
       ;wxFileConfigGroup::~wxFileConfigGroup()
       __dt__17wxFileConfigGroupFv
       ;wxFileConfigEntry::SetDirty()
@@ -1748,6 +1841,8 @@ EXPORTS
       FindEntry__17wxFileConfigGroupCFPCc
       ;wxFileConfigEntry::SetValue(const wxString&,unsigned long)
       SetValue__17wxFileConfigEntryFRC8wxStringUl
+      ;wxFileConfig::wxFileConfig(wxInputStream&)
+      __ct__12wxFileConfigFR13wxInputStream
       ;wxFileConfig::RenameGroup(const wxString&,const wxString&)
       RenameGroup__12wxFileConfigFRC8wxStringT1
       ;wxFileConfig::Init()
@@ -1756,16 +1851,20 @@ EXPORTS
       GetLastGroupLine__17wxFileConfigGroupFv
       ;wxFileConfig::LineListAppend(const wxString&)
       LineListAppend__12wxFileConfigFRC8wxString
+      ;wxFileConfig::DoReadString(const wxString&,wxString*) const
+      DoReadString__12wxFileConfigCFRC8wxStringP8wxString
       ;wxFileConfig::DeleteGroup(const wxString&)
       DeleteGroup__12wxFileConfigFRC8wxString
-      ;wxFileConfig::Parse(wxTextFile&,unsigned long)
-      Parse__12wxFileConfigFR10wxTextFileUl
+      ;wxFileConfig::DoReadLong(const wxString&,long*) const
+      DoReadLong__12wxFileConfigCFRC8wxStringPl
       ;wxFileConfig::LineListInsert(const wxString&,wxFileConfigLineList*)
       LineListInsert__12wxFileConfigFRC8wxStringP20wxFileConfigLineList
       ;wxFileConfig::Flush(unsigned long)
       Flush__12wxFileConfigFUl
-      ;wxFileConfig::Read(const wxString&,wxString*,const wxString&) const
-      Read__12wxFileConfigCFRC8wxStringP8wxStringT1
+      ;wxFileConfig::DoWriteLong(const wxString&,long)
+      DoWriteLong__12wxFileConfigFRC8wxStringl
+      ;wxFileConfig::DoWriteString(const wxString&,const wxString&)
+      DoWriteString__12wxFileConfigFRC8wxStringT1
       ;wxFileConfig::RenameEntry(const wxString&,const wxString&)
       RenameEntry__12wxFileConfigFRC8wxStringT1
       ;wxFileConfig::SetRootPath()
@@ -1797,10 +1896,10 @@ EXPORTS
       GetGroupLine__17wxFileConfigGroupFv
       ;wxFileConfig::HasEntry(const wxString&) const
       HasEntry__12wxFileConfigCFRC8wxString
-      ;wxFileConfig::Read(const wxString&,wxString*) const
-      Read__12wxFileConfigCFRC8wxStringP8wxString
       ;wxFileConfigGroup::DeleteEntry(const char*)
       DeleteEntry__17wxFileConfigGroupFPCc
+      ;wxFileConfig::Parse(wxTextBuffer&,unsigned long)
+      Parse__12wxFileConfigFR12wxTextBufferUl
       ;wxFileConfig::wxFileConfig(const wxString&,const wxString&,const wxString&,const wxString&,long)
       __ct__12wxFileConfigFRC8wxStringN31l
       ;wxFileConfigEntry::SetLine(wxFileConfigLineList*)
@@ -1923,20 +2022,16 @@ EXPORTS
       Normalize__10wxFileNameF15wxPathNormalizeRC8wxString12wxPathFormat
       ;wxFileName::IsWild(wxPathFormat)
       IsWild__10wxFileNameF12wxPathFormat
-      ;wxFileName::Assign(const wxString&,const wxString&,const wxString&,wxPathFormat)
-      Assign__10wxFileNameFRC8wxStringN2112wxPathFormat
+      ;wxFileName::GetTimes(wxDateTime*,wxDateTime*,wxDateTime*) const
+      GetTimes__10wxFileNameCFP10wxDateTimeN21
       ;wxFileName::Clear()
       Clear__10wxFileNameFv
       ;wxFileName::wxFileExists()
       wxFileExists__10wxFileNameFv
-      ;wxFileName::GetModificationTime()
-      GetModificationTime__10wxFileNameFv
       ;wxFileName::GetFullName() const
       GetFullName__10wxFileNameCFv
       ;wxFileName::AssignHomeDir()
       AssignHomeDir__10wxFileNameFv
-      ;wxFileName::AssignCwd()
-      AssignCwd__10wxFileNameFv
       ;wxFileName::PrependDir(const wxString&)
       PrependDir__10wxFileNameFRC8wxString
       ;wxFileName::GetPathSeparators(wxPathFormat)
@@ -1945,18 +2040,26 @@ EXPORTS
       Mkdir__10wxFileNameFRC8wxStringiUl
       ;wxFileName::IsPathSeparator(char,wxPathFormat)
       IsPathSeparator__10wxFileNameFc12wxPathFormat
-      ;wxFileName::IsAbsolute(wxPathFormat)
-      IsAbsolute__10wxFileNameF12wxPathFormat
       ;wxFileName::GetFullPath(wxPathFormat) const
       GetFullPath__10wxFileNameCF12wxPathFormat
+      ;wxFileName::Touch()
+      Touch__10wxFileNameFv
       ;wxFileName::FileName(const wxString&)
       FileName__10wxFileNameFRC8wxString
       ;wxFileName::wxPathExists(const wxString&)
       wxPathExists__10wxFileNameFRC8wxString
       ;wxFileName::SetFullName(const wxString&)
       SetFullName__10wxFileNameFRC8wxString
+      ;wxFileName::GetCwd(const wxString&)
+      GetCwd__10wxFileNameFRC8wxString
+      ;wxFileName::AssignCwd(const wxString&)
+      AssignCwd__10wxFileNameFRC8wxString
+      ;wxFileName::Assign(const wxString&,const wxString&,const wxString&,const wxString&,wxPathFormat)
+      Assign__10wxFileNameFRC8wxStringN3112wxPathFormat
       ;wxFileName::SameAs(const wxFileName&,wxPathFormat)
       SameAs__10wxFileNameFRC10wxFileName12wxPathFormat
+      ;wxFileName::GetVolumeSeparator(wxPathFormat)
+      GetVolumeSeparator__10wxFileNameF12wxPathFormat
       ;wxFileName::GetPath(unsigned long,wxPathFormat) const
       GetPath__10wxFileNameCFUl12wxPathFormat
       ;wxFileName::RemoveDir(int)
@@ -1971,10 +2074,16 @@ EXPORTS
       GetHomeDir__10wxFileNameFv
       ;wxFileName::AppendDir(const wxString&)
       AppendDir__10wxFileNameFRC8wxString
+      ;wxFileName::SplitPath(const wxString&,wxString*,wxString*,wxString*,wxString*,wxPathFormat)
+      SplitPath__10wxFileNameFRC8wxStringP8wxStringN3212wxPathFormat
       ;wxFileName::Mkdir(int,unsigned long)
       Mkdir__10wxFileNameFiUl
-      ;wxFileName::IsRelative(wxPathFormat)
-      IsRelative__10wxFileNameF12wxPathFormat
+      ;wxFileName::MakeRelativeTo(const wxString&,wxPathFormat)
+      MakeRelativeTo__10wxFileNameFRC8wxString12wxPathFormat
+      ;wxFileName::AssignDir(const wxString&,wxPathFormat)
+      AssignDir__10wxFileNameFRC8wxString12wxPathFormat
+      ;wxFileName::SetTimes(const wxDateTime*,const wxDateTime*,const wxDateTime*)
+      SetTimes__10wxFileNameFPC10wxDateTimeN21
       ;wxFileName::Rmdir()
       Rmdir__10wxFileNameFv
       ;wxFileName::GetLongPath() const
@@ -1993,16 +2102,16 @@ EXPORTS
       GetFormat__10wxFileNameF12wxPathFormat
       ;wxFileName::Assign(const wxFileName&)
       Assign__10wxFileNameFRC10wxFileName
-      ;wxFileName::GetCwd()
-      GetCwd__10wxFileNameFv
+      ;wxFileName::CreateTempFileName(const wxString&,wxFile*)
+      CreateTempFileName__10wxFileNameFRC8wxStringP6wxFile
+      ;wxFileName::AssignTempFileName(const wxString&,wxFile*)
+      AssignTempFileName__10wxFileNameFRC8wxStringP6wxFile
       ;wxFileName::DirName(const wxString&)
       DirName__10wxFileNameFRC8wxString
       ;wxFileName::SetCwd(const wxString&)
       SetCwd__10wxFileNameFRC8wxString
       ;wxFileName::Rmdir(const wxString&)
       Rmdir__10wxFileNameFRC8wxString
-      ;wxFileName::AssignTempFileName(const wxString&)
-      AssignTempFileName__10wxFileNameFRC8wxString
   ;From object file:  ..\common\filesys.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft19wxFileSystemHandler8wxObject
@@ -2013,6 +2122,8 @@ EXPORTS
       sm_classwxFileSystem__12wxFileSystem
       ;wxLocalFSHandler::FindNext()
       FindNext__16wxLocalFSHandlerFv
+      ;wxLocalFSHandler::ms_root
+      ms_root__16wxLocalFSHandler
       ;wxFileSystemHandler::GetMimeTypeFromExt(const wxString&)
       GetMimeTypeFromExt__19wxFileSystemHandlerFRC8wxString
       ;wxFileSystem::m_Handlers
@@ -2124,8 +2235,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxFrameBase::OnIdle(wxIdleEvent&)
       OnIdle__11wxFrameBaseFR11wxIdleEvent
-      ;wxFrameBase::DoScreenToClient(int*,int*) const
-      DoScreenToClient__11wxFrameBaseCFPiT1
       ;wxFrameBase::DeleteAllBars()
       DeleteAllBars__11wxFrameBaseFv
       ;wxFrameBase::SetMenuBar(wxMenuBar*)
@@ -2138,12 +2247,6 @@ EXPORTS
       OnCreateToolBar__11wxFrameBaseFliRC8wxString
       ;wxFrameBase::OnCreateStatusBar(int,long,int,const wxString&)
       OnCreateStatusBar__11wxFrameBaseFilT1RC8wxString
-      ;wxFrameBase::MakeModal(unsigned long)
-      MakeModal__11wxFrameBaseFUl
-      ;wxFrameBase::OnSize(wxSizeEvent&)
-      OnSize__11wxFrameBaseFR11wxSizeEvent
-      ;wxFrameBase::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__11wxFrameBaseFR12wxCloseEvent
       ;wxFrameBase::sm_eventTable
       sm_eventTable__11wxFrameBase
       ;wxFrameBase::GetClientAreaOrigin() const
@@ -2170,17 +2273,11 @@ EXPORTS
       GetEventTable__11wxFrameBaseCFv
       ;wxFrameBase::AttachMenuBar(wxMenuBar*)
       AttachMenuBar__11wxFrameBaseFP9wxMenuBar
-      ;wxFrameBase::SendIconizeEvent(unsigned long)
-      SendIconizeEvent__11wxFrameBaseFUl
       __vft11wxFrameBase8wxObject
-      ;wxFrameBase::DoClientToScreen(int*,int*) const
-      DoClientToScreen__11wxFrameBaseCFPiT1
-      ;wxFrameBase::sm_eventTableEntries
-      sm_eventTableEntries__11wxFrameBase
       ;wxFrameBase::SetStatusText(const wxString&,int)
       SetStatusText__11wxFrameBaseFRC8wxStringi
-      ;wxFrameBase::Destroy()
-      Destroy__11wxFrameBaseFv
+      ;wxFrameBase::sm_eventTableEntries
+      sm_eventTableEntries__11wxFrameBase
       ;wxFrameBase::New(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       New__11wxFrameBaseFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
   ;From object file:  ..\common\fs_inet.cpp
@@ -2653,16 +2750,29 @@ EXPORTS
       wxInitAllImageHandlers__Fv
   ;From object file:  ..\common\imagbmp.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxBMPHandler::DoLoadDib(wxImage*,int,int,int,int,int,long,wxInputStream&,unsigned long,unsigned long,unsigned long)
+      DoLoadDib__12wxBMPHandlerFP7wxImageiN42lR13wxInputStreamUlN29
       ;wxBMPHandler::sm_classwxBMPHandler
       sm_classwxBMPHandler__12wxBMPHandler
+      __vft12wxICOHandler8wxObject
+      ;wxBMPHandler::LoadDib(wxImage*,wxInputStream&,unsigned long,unsigned long)
+      LoadDib__12wxBMPHandlerFP7wxImageR13wxInputStreamUlT3
       ;wxBMPHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__12wxBMPHandlerFP7wxImageR14wxOutputStreamUl
       ;wxConstructorForwxBMPHandler()
       wxConstructorForwxBMPHandler__Fv
+      ;wxICOHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
+      SaveFile__12wxICOHandlerFP7wxImageR14wxOutputStreamUl
       ;wxBMPHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__12wxBMPHandlerFP7wxImageR13wxInputStreamUli
+      ;wxICOHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
+      LoadFile__12wxICOHandlerFP7wxImageR13wxInputStreamUli
+      ;wxICOHandler::DoCanRead(wxInputStream&)
+      DoCanRead__12wxICOHandlerFR13wxInputStream
       ;wxBMPHandler::DoCanRead(wxInputStream&)
       DoCanRead__12wxBMPHandlerFR13wxInputStream
+      ;wxBMPHandler::SaveDib(wxImage*,wxOutputStream&,unsigned long,unsigned long,unsigned long)
+      SaveDib__12wxBMPHandlerFP7wxImageR14wxOutputStreamUlN23
       __vft12wxBMPHandler8wxObject
   ;From object file:  ..\common\image.cpp
     ;PUBDEFs (Symbols available from object file):
@@ -2777,6 +2887,8 @@ EXPORTS
       SetMask__7wxImageFUl
       ;wxImage::Rotate90(unsigned long) const
       Rotate90__7wxImageCFUl
+      ;wxImage::FindFirstUnusedColour(unsigned char*,unsigned char*,unsigned char*,unsigned char,unsigned char,unsigned char)
+      FindFirstUnusedColour__7wxImageFPUcN21UcN24
       ;wxImage::Create(int,int)
       Create__7wxImageFiT1
       __vft14wxImageRefData15wxObjectRefData
@@ -2822,10 +2934,12 @@ EXPORTS
       ComputeHistogram__7wxImageFR11wxHashTable
       ;wxImage::CanRead(wxInputStream&)
       CanRead__7wxImageFR13wxInputStream
-      ;wxImage::AddHandler(wxImageHandler*)
-      AddHandler__7wxImageFP14wxImageHandler
+      ;wxImage::SetMaskFromImage(const wxImage&,unsigned char,unsigned char,unsigned char)
+      SetMaskFromImage__7wxImageFRC7wxImageUcN22
       ;wxImageHandler::sm_classwxImageHandler
       sm_classwxImageHandler__14wxImageHandler
+      ;wxImage::AddHandler(wxImageHandler*)
+      AddHandler__7wxImageFP14wxImageHandler
       ;wxImage::wxImage(wxInputStream&,const wxString&)
       __ct__7wxImageFR13wxInputStreamRC8wxString
       ;wxImage::HasOption(const wxString&) const
@@ -3264,14 +3378,36 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxLongLongWx::operator<(const wxLongLongWx&) const
       __lt__12wxLongLongWxCFRC12wxLongLongWx
+      ;wxULongLongWx::operator-(const wxULongLongWx&) const
+      __mi__13wxULongLongWxCFRC13wxULongLongWx
       ;wxLongLongWx::operator%(const wxLongLongWx&) const
       __md__12wxLongLongWxCFRC12wxLongLongWx
+      ;wxULongLongWx::operator>(const wxULongLongWx&) const
+      __gt__13wxULongLongWxCFRC13wxULongLongWx
       ;wxLongLongWx::operator>(const wxLongLongWx&) const
       __gt__12wxLongLongWxCFRC12wxLongLongWx
+      ;wxULongLongWx::operator/(const wxULongLongWx&) const
+      __dv__13wxULongLongWxCFRC13wxULongLongWx
+      ;wxULongLongWx::operator+=(unsigned long)
+      __apl__13wxULongLongWxFUl
+      ;wxULongLongWx::operator-=(const wxULongLongWx&)
+      __ami__13wxULongLongWxFRC13wxULongLongWx
+      ;wxULongLongWx::operator^=(const wxULongLongWx&)
+      __aer__13wxULongLongWxFRC13wxULongLongWx
+      ;wxULongLongWx::operator&(const wxULongLongWx&) const
+      __ad__13wxULongLongWxCFRC13wxULongLongWx
       ;wxLongLongWx::operator<<(int) const
       __ls__12wxLongLongWxCFi
+      ;wxULongLongWx::operator--()
+      __mm__13wxULongLongWxFv
+      ;wxULongLongWx::asArray() const
+      asArray__13wxULongLongWxCFv
+      ;wxULongLongWx::ToString() const
+      ToString__13wxULongLongWxCFv
       ;wxLongLongWx::operator+=(const wxLongLongWx&)
       __apl__12wxLongLongWxFRC12wxLongLongWx
+      ;wxULongLongWx::operator|(const wxULongLongWx&) const
+      __or__13wxULongLongWxCFRC13wxULongLongWx
       ;wxLongLongWx::operator|(const wxLongLongWx&) const
       __or__12wxLongLongWxCFRC12wxLongLongWx
       ;wxLongLongWx::operator^(const wxLongLongWx&) const
@@ -3282,10 +3418,20 @@ EXPORTS
       __adv__12wxLongLongWxFRC12wxLongLongWx
       ;wxLongLongWx::operator&(const wxLongLongWx&) const
       __ad__12wxLongLongWxCFRC12wxLongLongWx
+      ;wxULongLongWx::operator<<=(int)
+      __als__13wxULongLongWxFi
+      ;wxULongLongWx::operator>>=(int)
+      __ars__13wxULongLongWxFi
       ;wxLongLongWx::Negate()
       Negate__12wxLongLongWxFv
+      ;wxLongLongWx::ToString() const
+      ToString__12wxLongLongWxCFv
       ;wxLongLongWx::operator-(const wxLongLongWx&) const
       __mi__12wxLongLongWxCFRC12wxLongLongWx
+      ;wxULongLongWx::operator+(const wxULongLongWx&) const
+      __pl__13wxULongLongWxCFRC13wxULongLongWx
+      ;wxULongLongWx::operator*=(const wxULongLongWx&)
+      __amu__13wxULongLongWxFRC13wxULongLongWx
       ;wxLongLongWx::operator&=(const wxLongLongWx&)
       __aad__12wxLongLongWxFRC12wxLongLongWx
       ;wxLongLongWx::Assign(double)
@@ -3296,6 +3442,8 @@ EXPORTS
       __mm__12wxLongLongWxFv
       ;wxLongLongWx::asArray() const
       asArray__12wxLongLongWxCFv
+      ;wxULongLongWx::operator++()
+      __pp__13wxULongLongWxFv
       ;wxLongLongWx::operator-() const
       __mi__12wxLongLongWxCFv
       ;wxLongLongWx::operator~() const
@@ -3304,28 +3452,56 @@ EXPORTS
       Divide__12wxLongLongWxCFRC12wxLongLongWxR12wxLongLongWxT2
       ;wxLongLongWx::operator+(const wxLongLongWx&) const
       __pl__12wxLongLongWxCFRC12wxLongLongWx
+      ;wxULongLongWx::operator*(const wxULongLongWx&) const
+      __ml__13wxULongLongWxCFRC13wxULongLongWx
       ;wxLongLongWx::operator*(const wxLongLongWx&) const
       __ml__12wxLongLongWxCFRC12wxLongLongWx
+      ;wxULongLongWx::operator^(const wxULongLongWx&) const
+      __er__13wxULongLongWxCFRC13wxULongLongWx
       ;wxLongLongWx::operator+=(long)
       __apl__12wxLongLongWxFl
       ;wxLongLongWx::operator|=(const wxLongLongWx&)
       __aor__12wxLongLongWxFRC12wxLongLongWx
       ;wxLongLongWx::operator*=(const wxLongLongWx&)
       __amu__12wxLongLongWxFRC12wxLongLongWx
+      ;wxULongLongWx::operator&=(const wxULongLongWx&)
+      __aad__13wxULongLongWxFRC13wxULongLongWx
+      ;wxULongLongWx::operator<<(int) const
+      __ls__13wxULongLongWxCFi
+      ;wxULongLongWx::operator>>(int) const
+      __rs__13wxULongLongWxCFi
+      ;wxULongLongWx::operator<(const wxULongLongWx&) const
+      __lt__13wxULongLongWxCFRC13wxULongLongWx
+      ;wxULongLongWx::operator+(unsigned long) const
+      __pl__13wxULongLongWxCFUl
       ;wxLongLongWx::operator+(long) const
       __pl__12wxLongLongWxCFl
+      ;wxULongLongWx::operator%(const wxULongLongWx&) const
+      __md__13wxULongLongWxCFRC13wxULongLongWx
+      ;operator<<(ostream&,const wxULongLongWx&)
+      __ls__FR7ostreamRC13wxULongLongWx
       ;operator<<(ostream&,const wxLongLongWx&)
       __ls__FR7ostreamRC12wxLongLongWx
       ;wxLongLongWx::operator/(const wxLongLongWx&) const
       __dv__12wxLongLongWxCFRC12wxLongLongWx
+      ;wxULongLongWx::operator+=(const wxULongLongWx&)
+      __apl__13wxULongLongWxFRC13wxULongLongWx
+      ;wxULongLongWx::operator|=(const wxULongLongWx&)
+      __aor__13wxULongLongWxFRC13wxULongLongWx
       ;wxLongLongWx::operator^=(const wxLongLongWx&)
       __aer__12wxLongLongWxFRC12wxLongLongWx
+      ;wxULongLongWx::operator/=(const wxULongLongWx&)
+      __adv__13wxULongLongWxFRC13wxULongLongWx
       ;wxLongLongWx::operator<<=(int)
       __als__12wxLongLongWxFi
       ;wxLongLongWx::operator>>=(int)
       __ars__12wxLongLongWxFi
       ;wxLongLongWx::operator++()
       __pp__12wxLongLongWxFv
+      ;wxULongLongWx::operator~() const
+      __co__13wxULongLongWxCFv
+      ;wxULongLongWx::Divide(const wxULongLongWx&,wxULongLongWx&,wxULongLongWx&) const
+      Divide__13wxULongLongWxCFRC13wxULongLongWxR13wxULongLongWxT2
   ;From object file:  ..\common\matrix.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTransformMatrix::wxTransformMatrix(const wxTransformMatrix&)
@@ -3695,6 +3871,8 @@ EXPORTS
       InitializeModules__8wxModuleFv
       ;wxModule::m_modules
       m_modules__8wxModule
+      ;wxModule::UnregisterModule(wxModule*)
+      UnregisterModule__8wxModuleFP8wxModule
       ;wxModule::CleanUpModules()
       CleanUpModules__8wxModuleFv
       ;wxModule::RegisterModule(wxModule*)
@@ -3751,41 +3929,19 @@ EXPORTS
   ;From object file:  ..\common\object.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft8wxObject
-      ;wxCreateStoredObject(wxInputStream&)
-      wxCreateStoredObject__FR13wxInputStream
-      __vft15wxObjectRefData
       ;wxCreateDynamicObject(const char*)
       wxCreateDynamicObject__FPCc
-      ;wxClassInfo::wxClassInfo(const char*,const char*,const char*,int,wxObject*(*)())
-      __ct__11wxClassInfoFPCcN21iPFv_P8wxObject
       ;wxObject::Dump(ostream&)
       Dump__8wxObjectFR7ostream
-      wxTrue
-      ;wxObject::LoadObject(wxObjectInputStream&)
-      LoadObject__8wxObjectFR19wxObjectInputStream
-      ;wxClassInfo::IsKindOf(const wxClassInfo*) const
-      IsKindOf__11wxClassInfoCFPC11wxClassInfo
       ;wxClassInfo::sm_classTable
       sm_classTable__11wxClassInfo
-      ;wxObject::CopyObject(wxObject&) const
-      CopyObject__8wxObjectCFR8wxObject
-      ;wxObject::StoreObject(wxObjectOutputStream&)
-      StoreObject__8wxObjectFR20wxObjectOutputStream
-      ;wxObjectRefData::~wxObjectRefData()
-      __dt__15wxObjectRefDataFv
-      ;wxObject::Clone() const
-      Clone__8wxObjectCFv
       ;wxClassInfo::sm_first
       sm_first__11wxClassInfo
       ;wxObject::Ref(const wxObject&)
       Ref__8wxObjectFRC8wxObject
       wxFalse
-      ;wxObjectRefData::wxObjectRefData()
-      __ct__15wxObjectRefDataFv
       ;wxObject::UnRef()
       UnRef__8wxObjectFv
-      ;wxClassInfo::CreateObject()
-      CreateObject__11wxClassInfoFv
       ;wxClassInfo::CleanUpClasses()
       CleanUpClasses__11wxClassInfoFv
       ;wxObject::IsKindOf(wxClassInfo*) const
@@ -3796,48 +3952,8 @@ EXPORTS
       sm_classwxObject__8wxObject
       ;wxObject::operator new(unsigned int,char*,int)
       __nw__8wxObjectFUiPci
-      ;wxObject::wxObject()
-      __ct__8wxObjectFv
-      ;wxObject::~wxObject()
-      __dt__8wxObjectFv
       ;wxClassInfo::InitializeClasses()
       InitializeClasses__11wxClassInfoFv
-  ;From object file:  ..\common\objstrm.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxObjectOutputStream::AddChild(wxObject*)
-      AddChild__20wxObjectOutputStreamFP8wxObject
-      ;wxObjectOutputStream::SaveObject(wxObject&)
-      SaveObject__20wxObjectOutputStreamFR8wxObject
-      ;wxObjectInputStream::LoadObject()
-      LoadObject__19wxObjectInputStreamFv
-      ;wxObjectOutputStream::WriteObjectDef(wxObjectStreamInfo&)
-      WriteObjectDef__20wxObjectOutputStreamFR18wxObjectStreamInfo
-      ;wxObjectInputStream::ProcessObjectData(wxObjectStreamInfo*)
-      ProcessObjectData__19wxObjectInputStreamFP18wxObjectStreamInfo
-      ;wxObjectOutputStream::wxObjectOutputStream(wxOutputStream&)
-      __ct__20wxObjectOutputStreamFR14wxOutputStream
-      ;wxObjectInputStream::wxObjectInputStream(wxInputStream&)
-      __ct__19wxObjectInputStreamFR13wxInputStream
-      ;wxObjectInputStream::GetChild(int) const
-      GetChild__19wxObjectInputStreamCFi
-      ;wxObjectInputStream::GetParent() const
-      GetParent__19wxObjectInputStreamCFv
-      ;wxObjectOutputStream::ProcessObjectDef(wxObjectStreamInfo*)
-      ProcessObjectDef__20wxObjectOutputStreamFP18wxObjectStreamInfo
-      ;wxObjectInputStream::ProcessObjectDef(wxObjectStreamInfo*)
-      ProcessObjectDef__19wxObjectInputStreamFP18wxObjectStreamInfo
-      ;wxObjectOutputStream::GetObjectName(wxObject*)
-      GetObjectName__20wxObjectOutputStreamFP8wxObject
-      ;wxObjectInputStream::GetChild()
-      GetChild__19wxObjectInputStreamFv
-      ;wxObjectOutputStream::ProcessObjectData(wxObjectStreamInfo*)
-      ProcessObjectData__20wxObjectOutputStreamFP18wxObjectStreamInfo
-      ;wxObjectInputStream::SolveName(const wxString&) const
-      SolveName__19wxObjectInputStreamCFRC8wxString
-      ;wxObjectInputStream::ReadObjectDef(wxObjectStreamInfo*)
-      ReadObjectDef__19wxObjectInputStreamFP18wxObjectStreamInfo
-      ;wxObjectInputStream::RemoveChildren(int)
-      RemoveChildren__19wxObjectInputStreamFi
   ;From object file:  ..\common\odbc.cpp
   ;From object file:  ..\common\paper.cpp
     ;PUBDEFs (Symbols available from object file):
@@ -4289,6 +4405,8 @@ EXPORTS
       Service__13wxIPV4addressFUs
       ;wxIPV4address::Service(const wxString&)
       Service__13wxIPV4addressFRC8wxString
+      ;wxIPV4address::wxIPV4address(const wxIPV4address&)
+      __ct__13wxIPV4addressFRC13wxIPV4address
       ;wxIPV4address::Hostname(unsigned long)
       Hostname__13wxIPV4addressFUl
       ;wxSockAddress::~wxSockAddress()
@@ -4305,8 +4423,8 @@ EXPORTS
       __ct__13wxIPV4addressFv
       ;wxIPV4address::Service()
       Service__13wxIPV4addressFv
-      ;wxSockAddress::CopyObject(wxObject&) const
-      CopyObject__13wxSockAddressCFR8wxObject
+      ;wxSockAddress::wxSockAddress(const wxSockAddress&)
+      __ct__13wxSockAddressFRC13wxSockAddress
       __vft13wxIPV4address8wxObject
       ;wxSockAddress::Clear()
       Clear__13wxSockAddressFv
@@ -4424,30 +4542,6 @@ EXPORTS
       __vft14wxSocketStream13wxInputStream12wxStreamBase
       ;wxSocketOutputStream::~wxSocketOutputStream()
       __dt__20wxSocketOutputStreamFv
-  ;From object file:  ..\common\serbase.cpp
-    ;PUBDEFs (Symbols available from object file):
-      __vft21wxHashTable_Serialize8wxObject
-      __vft16wxList_Serialize8wxObject
-      ;wxObject_Serialize::sm_classwxObject_Serialize
-      sm_classwxObject_Serialize__18wxObject_Serialize
-      ;wxList_Serialize::sm_classwxList_Serialize
-      sm_classwxList_Serialize__16wxList_Serialize
-      ;wxConstructorForwxList_Serialize()
-      wxConstructorForwxList_Serialize__Fv
-      ;wxList_Serialize::StoreObject(wxObjectOutputStream&)
-      StoreObject__16wxList_SerializeFR20wxObjectOutputStream
-      ;wxHashTable_Serialize::sm_classwxHashTable_Serialize
-      sm_classwxHashTable_Serialize__21wxHashTable_Serialize
-      ;wxHashTable_Serialize::LoadObject(wxObjectInputStream&)
-      LoadObject__21wxHashTable_SerializeFR19wxObjectInputStream
-      ;wxConstructorForwxObject_Serialize()
-      wxConstructorForwxObject_Serialize__Fv
-      ;wxList_Serialize::LoadObject(wxObjectInputStream&)
-      LoadObject__16wxList_SerializeFR19wxObjectInputStream
-      ;wxConstructorForwxHashTable_Serialize()
-      wxConstructorForwxHashTable_Serialize__Fv
-      ;wxHashTable_Serialize::StoreObject(wxObjectOutputStream&)
-      StoreObject__21wxHashTable_SerializeFR20wxObjectOutputStream
   ;From object file:  ..\common\sizer.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSizerItem::wxSizerItem(int,int,int,int,int,wxObject*)
@@ -4465,18 +4559,22 @@ EXPORTS
       __ct__16wxStaticBoxSizerFP11wxStaticBoxi
       ;wxGridSizer::wxGridSizer(int,int,int)
       __ct__11wxGridSizerFiN21
-      ;wxSizer::DoSetItemMinSize(wxWindow*,int,int)
-      DoSetItemMinSize__7wxSizerFP8wxWindowiT2
+      ;wxSizer::DeleteWindows()
+      DeleteWindows__7wxSizerFv
       ;wxStaticBoxSizer::sm_classwxStaticBoxSizer
       sm_classwxStaticBoxSizer__16wxStaticBoxSizer
       ;wxGridSizer::sm_classwxGridSizer
       sm_classwxGridSizer__11wxGridSizer
+      __vft7wxSizer21wxClientDataContainer
+      __vft15wxNotebookSizer21wxClientDataContainer
       ;wxNotebookSizer::RecalcSizes()
       RecalcSizes__15wxNotebookSizerFv
       ;wxFlexGridSizer::RecalcSizes()
       RecalcSizes__15wxFlexGridSizerFv
       ;wxGridSizer::RecalcSizes()
       RecalcSizes__11wxGridSizerFv
+      ;wxSizer::DoSetItemMinSize(wxWindow*,int,int)
+      DoSetItemMinSize__7wxSizerFP8wxWindowiT2
       ;wxStaticBoxSizer::CalcMin()
       CalcMin__16wxStaticBoxSizerFv
       ;wxFlexGridSizer::CalcMin()
@@ -4509,6 +4607,8 @@ EXPORTS
       __dt__7wxSizerFv
       ;wxSizer::sm_classwxSizer
       sm_classwxSizer__7wxSizer
+      __vft11wxGridSizer21wxClientDataContainer
+      __vft10wxBoxSizer21wxClientDataContainer
       ;wxSizerItem::~wxSizerItem()
       __dt__11wxSizerItemFv
       ;wxStaticBoxSizer::RecalcSizes()
@@ -4525,12 +4625,15 @@ EXPORTS
       Remove__7wxSizerFP8wxWindow
       ;wxSizer::FitSize(wxWindow*)
       FitSize__7wxSizerFP8wxWindow
-      __vft15wxNotebookSizer8wxObject
+      ;wxSizer::Clear(unsigned long)
+      Clear__7wxSizerFUl
       __vft7wxSizer8wxObject
+      __vft15wxNotebookSizer8wxObject
       ;wxSizer::Remove(int)
       Remove__7wxSizerFi
       ;wxSizer::GetMinSize()
       GetMinSize__7wxSizerFv
+      __vft16wxStaticBoxSizer21wxClientDataContainer
       ;wxFlexGridSizer::~wxFlexGridSizer()
       __dt__15wxFlexGridSizerFv
       ;wxSizer::wxSizer()
@@ -4561,10 +4664,13 @@ EXPORTS
       sm_classwxFlexGridSizer__15wxFlexGridSizer
       ;wxBoxSizer::sm_classwxBoxSizer
       sm_classwxBoxSizer__10wxBoxSizer
+      __vft15wxFlexGridSizer21wxClientDataContainer
       ;wxSizer::Remove(wxSizer*)
       Remove__7wxSizerFP7wxSizer
       ;wxSizer::DoSetItemMinSize(wxSizer*,int,int)
       DoSetItemMinSize__7wxSizerFP7wxSizeriT2
+      ;wxSizerItem::DeleteWindows()
+      DeleteWindows__11wxSizerItemFv
       ;wxSizerItem::wxSizerItem(wxWindow*,int,int,int,wxObject*)
       __ct__11wxSizerItemFP8wxWindowiN22P8wxObject
       __vft16wxStaticBoxSizer8wxObject
@@ -4597,8 +4703,6 @@ EXPORTS
       SetTimeout__12wxSocketBaseFl
       ;wxSocketEvent::sm_classwxSocketEvent
       sm_classwxSocketEvent__13wxSocketEvent
-      ;wxSocketEvent::CopyObject(wxObject&) const
-      CopyObject__13wxSocketEventCFR8wxObject
       ;wxSocketClient::Connect(wxSockAddress&,unsigned long)
       Connect__14wxSocketClientFR13wxSockAddressUl
       ;wxSocketServer::AcceptWith(wxSocketBase&,unsigned long)
@@ -4633,15 +4737,12 @@ EXPORTS
       sm_classwxSocketClient__14wxSocketClient
       ;wxDatagramSocket::sm_classwxDatagramSocket
       sm_classwxDatagramSocket__16wxDatagramSocket
-      ;wxSocketEvent::wxSocketEvent(int)
-      __ct__13wxSocketEventFi
-      ;wxSocketModule::sm_classwxSocketModule
-      sm_classwxSocketModule__14wxSocketModule
       ;wxSocketBase::wxSocketBase(int,wxSocketType)
       __ct__12wxSocketBaseFi12wxSocketType
+      ;wxSocketModule::sm_classwxSocketModule
+      sm_classwxSocketModule__14wxSocketModule
       ;wxSocketBase::SaveState()
       SaveState__12wxSocketBaseFv
-      __vft13wxSocketEvent8wxObject
       __vft12wxSocketBase8wxObject
       ;wxSocketBase::WaitForRead(long,long)
       WaitForRead__12wxSocketBaseFlT1
@@ -4702,57 +4803,36 @@ EXPORTS
       __dt__12wxSocketBaseFv
       ;wxSocketBase::GetLocal(wxSockAddress&) const
       GetLocal__12wxSocketBaseCFR13wxSockAddress
+  ;From object file:  ..\common\statbar.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxStatusBarBase::FreeWidths()
+      FreeWidths__15wxStatusBarBaseFv
+      __vft15wxStatusBarBase8wxObject
+      ;wxStatusBarBase::InitWidths()
+      InitWidths__15wxStatusBarBaseFv
+      ;wxStatusBar::sm_classwxStatusBar
+      sm_classwxStatusBar__11wxStatusBar
+      ;wxStatusBarBase::~wxStatusBarBase()
+      __dt__15wxStatusBarBaseFv
+      ;wxStatusBarBase::SetStatusWidths(int,const int*)
+      SetStatusWidths__15wxStatusBarBaseFiPCi
+      ;wxStatusBarBase::CalculateAbsWidths(int) const
+      CalculateAbsWidths__15wxStatusBarBaseCFi
+      ;wxStatusBarBase::wxStatusBarBase()
+      __ct__15wxStatusBarBaseFv
+      ;wxStatusBarBase::SetFieldsCount(int,const int*)
+      SetFieldsCount__15wxStatusBarBaseFiPCi
+      ;wxConstructorForwxStatusBar()
+      wxConstructorForwxStatusBar__Fv
   ;From object file:  ..\common\strconv.cpp
     ;PUBDEFs (Symbols available from object file):
-      __vft12wxMBConvUTF78wxMBConv
-      __vft8wxCSConv8wxMBConv
-      ;wxMBConv::cMB2WC(const char*) const
-      cMB2WC__8wxMBConvCFPCc
-      ;wxCSConv::SetName(const char*)
-      SetName__8wxCSConvFPCc
-      ;wxMBConvUTF7::MB2WC(wchar_t*,const char*,unsigned int) const
-      MB2WC__12wxMBConvUTF7CFPwPCcUi
-      ;wxMBConvUTF8::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__12wxMBConvUTF8CFPcPCwUi
-      ;wxMBConvUTF8::MB2WC(wchar_t*,const char*,unsigned int) const
-      MB2WC__12wxMBConvUTF8CFPwPCcUi
-      __vft12wxMBConvFile8wxMBConv
-      __vft12wxMBConvUTF88wxMBConv
       wxConvCurrent
-      ;wxMBConv::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__8wxMBConvCFPcPCwUi
-      ;wxCSConv::~wxCSConv()
-      __dt__8wxCSConvFv
-      wxConvUTF7
-      wxConvUTF8
-      wxConvLocal
-      ;wxMBConvFile::MB2WC(wchar_t*,const char*,unsigned int) const
-      MB2WC__12wxMBConvFileCFPwPCcUi
       wxConvFile
-      ;wxCSConv::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__8wxCSConvCFPcPCwUi
-      ;wxMBConvUTF7::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__12wxMBConvUTF7CFPcPCwUi
-      ;wxMBConvFile::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__12wxMBConvFileCFPcPCwUi
-      ;wxCSConv::MB2WC(wchar_t*,const char*,unsigned int) const
-      MB2WC__8wxCSConvCFPwPCcUi
-      ;wxCSConv::LoadNow()
-      LoadNow__8wxCSConvFv
-      ;wxCSConv::wxCSConv(const char*)
-      __ct__8wxCSConvFPCc
       wxConvLibc
-      ;wxMBConv::MB2WC(wchar_t*,const char*,unsigned int) const
-      MB2WC__8wxMBConvCFPwPCcUi
-      __vft8wxMBConv
-      ;wxMBConv::cWC2MB(const wchar_t*) const
-      cWC2MB__8wxMBConvCFPCw
   ;From object file:  ..\common\stream.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxStreamBuffer::SetBufferIO(void*,unsigned int,unsigned long)
       SetBufferIO__14wxStreamBufferFPvUiUl
-      ;wxOutputStream::operator<<(wxObject&)
-      __ls__14wxOutputStreamFR8wxObject
       ;wxStreamBuffer::wxStreamBuffer(wxStreamBase&,wxStreamBuffer::BufMode)
       __ct__14wxStreamBufferFR12wxStreamBaseQ2_14wxStreamBuffer7BufMode
       ;wxEndL(wxOutputStream&)
@@ -4818,11 +4898,13 @@ EXPORTS
       OnSysSeek__21wxBufferedInputStreamFl10wxSeekMode
       ;wxInputStream::GetWBack(void*,unsigned int)
       GetWBack__13wxInputStreamFPvUi
-      ;wxFilterOutputStream::~wxFilterOutputStream()
-      __dt__20wxFilterOutputStreamFv
+      ;wxStreamBuffer::SetError(wxStreamError)
+      SetError__14wxStreamBufferF13wxStreamError
       __vft14wxStreamBuffer
       ;wxBufferedOutputStream::~wxBufferedOutputStream()
       __dt__22wxBufferedOutputStreamFv
+      ;wxFilterOutputStream::~wxFilterOutputStream()
+      __dt__20wxFilterOutputStreamFv
       ;wxBufferedInputStream::wxBufferedInputStream(wxInputStream&,wxStreamBuffer*)
       __ct__21wxBufferedInputStreamFR13wxInputStreamP14wxStreamBuffer
       ;wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer&)
@@ -4833,8 +4915,6 @@ EXPORTS
       TellO__22wxBufferedOutputStreamCFv
       ;wxInputStream::TellI() const
       TellI__13wxInputStreamCFv
-      ;wxStreamBuffer::SetError(wxStreamError)
-      SetError__14wxStreamBufferF13wxStreamError
       ;wxInputStream::Peek()
       Peek__13wxInputStreamFv
       ;wxCountingOutputStream::OnSysTell() const
@@ -4857,10 +4937,10 @@ EXPORTS
       Ungetch__13wxInputStreamFPCvUi
       ;wxBufferedInputStream::Read(void*,unsigned int)
       Read__21wxBufferedInputStreamFPvUi
-      ;wxFilterInputStream::~wxFilterInputStream()
-      __dt__19wxFilterInputStreamFv
       ;wxStreamBuffer::~wxStreamBuffer()
       __dt__14wxStreamBufferFv
+      ;wxFilterInputStream::~wxFilterInputStream()
+      __dt__19wxFilterInputStreamFv
       ;wxOutputStream::Sync()
       Sync__14wxOutputStreamFv
       ;wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer*)
@@ -4897,8 +4977,6 @@ EXPORTS
       GetInputStream__14wxStreamBufferCFv
       ;wxStreamBuffer::PutChar(char)
       PutChar__14wxStreamBufferFc
-      ;wxInputStream::operator>>(wxObject*&)
-      __rs__13wxInputStreamFRP8wxObject
       ;wxInputStream::Read(wxOutputStream&)
       Read__13wxInputStreamFR14wxOutputStream
       __vft22wxCountingOutputStream12wxStreamBase
@@ -4918,14 +4996,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()
@@ -4946,20 +5024,22 @@ EXPORTS
       Trim__8wxStringFUl
       ;wxArrayString::Sort(unsigned long)
       Sort__13wxArrayStringFUl
-      ;operator+(const wxString&,const wxString&)
-      __pl__FRC8wxStringT1
+      ;wxString::Truncate(unsigned int)
+      Truncate__8wxStringFUi
       ;wxString::rfind(char,unsigned int) const
       rfind__8wxStringCFcUi
       ;wxString::find_last_not_of(char,unsigned int) const
       find_last_not_of__8wxStringCFcUi
       ;wxString::find_first_of(const char*,unsigned int) const
       find_first_of__8wxStringCFPCcUi
+      ;operator+(const wxString&,const wxString&)
+      __pl__FRC8wxStringT1
       ;wxString::wxString(const void*,const void*)
       __ct__8wxStringFPCvT1
-      ;wxString::Truncate(unsigned int)
-      Truncate__8wxStringFUi
       ;wxArrayString::Sort(int(*)(const wxString&,const wxString&))
       Sort__13wxArrayStringFPFRC8wxStringT1_i
+      ;wxArrayString::SetCount(unsigned int)
+      SetCount__13wxArrayStringFUi
       ;wxArrayString::Remove(unsigned int)
       Remove__13wxArrayStringFUi
       ;wxString::Format(const char*,...)
@@ -4986,8 +5066,6 @@ EXPORTS
       FormatV__8wxStringFPCcPc
       ;wxString::Find(char,unsigned long) const
       Find__8wxStringCFcUl
-      ;wxString::ToLong(long*) const
-      ToLong__8wxStringCFPl
       ;wxString::Replace(const char*,const char*,unsigned long)
       Replace__8wxStringFPCcT1Ul
       ;wxString::Mid(unsigned int,unsigned int) const
@@ -5042,6 +5120,8 @@ EXPORTS
       find__8wxStringCFRC8wxStringUi
       ;wxString::UngetWriteBuf(unsigned int)
       UngetWriteBuf__8wxStringFUi
+      ;wxString::ToLong(long*,int) const
+      ToLong__8wxStringCFPli
       ;wxArrayString::Insert(const wxString&,unsigned int)
       Insert__13wxArrayStringFRC8wxStringUi
       ;wxString::GetWriteBuf(unsigned int)
@@ -5068,8 +5148,6 @@ EXPORTS
       __pl__FRC8wxStringPCc
       ;wxArrayString::operator==(const wxArrayString&) const
       __eq__13wxArrayStringCFRC13wxArrayString
-      ;wxString::operator=(const wchar_t*)
-      __as__8wxStringFPCw
       ;wxString::StartsWith(const char*,wxString*) const
       StartsWith__8wxStringCFPCcP8wxString
       ;wxArrayString::Remove(const char*)
@@ -5078,8 +5156,6 @@ EXPORTS
       ConcatSelf__8wxStringFiPCc
       ;wxArrayString::Add(const wxString&)
       Add__13wxArrayStringFRC8wxString
-      ;wxString::ToULong(unsigned long*) const
-      ToULong__8wxStringCFPUl
       ;wxString::erase(unsigned int,unsigned int)
       erase__8wxStringFUiT1
       ;wxString::sprintf(const char*,...)
@@ -5112,6 +5188,8 @@ EXPORTS
       __ct__8wxStringFcUi
       ;wxSnprintf(char*,unsigned int,const char*,...)
       wxSnprintf__FPcUiPCce
+      ;wxString::ToULong(unsigned long*,int) const
+      ToULong__8wxStringCFPUli
       ;wxString::Right(unsigned int) const
       Right__8wxStringCFUi
       ;wxString::CopyBeforeWrite()
@@ -5120,8 +5198,6 @@ EXPORTS
       rfind__8wxStringCFPCcUiT2
       ;wxArrayString::~wxArrayString()
       __dt__13wxArrayStringFv
-      ;wxString::wxString(const wchar_t*,wxMBConv&)
-      __ct__8wxStringFPCwR8wxMBConv
       ;wxString::Lower() const
       Lower__8wxStringCFv
       ;wxArrayString::Free()
@@ -5237,6 +5313,35 @@ EXPORTS
       __dt__13wxToolBarBaseFv
       ;wxToolBarBase::SetToolLongHelp(int,const wxString&)
       SetToolLongHelp__13wxToolBarBaseFiRC8wxString
+  ;From object file:  ..\common\textbuf.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxTextBuffer::GuessType() const
+      GuessType__12wxTextBufferCFv
+      ;wxTextBuffer::Close()
+      Close__12wxTextBufferFv
+      ;wxTextBuffer::Exists() const
+      Exists__12wxTextBufferCFv
+      __vft12wxTextBuffer
+      ;wxTextBuffer::Write(wxTextFileType,wxMBConv&)
+      Write__12wxTextBufferF14wxTextFileTypeR8wxMBConv
+      ;wxTextBuffer::Open(const wxString&,wxMBConv&)
+      Open__12wxTextBufferFRC8wxStringR8wxMBConv
+      ;wxTextBuffer::Create()
+      Create__12wxTextBufferFv
+      ;wxTextBuffer::Translate(const wxString&,wxTextFileType)
+      Translate__12wxTextBufferFRC8wxString14wxTextFileType
+      ;wxTextBuffer::~wxTextBuffer()
+      __dt__12wxTextBufferFv
+      ;wxTextBuffer::wxTextBuffer(const wxString&)
+      __ct__12wxTextBufferFRC8wxString
+      ;wxTextBuffer::typeDefault
+      typeDefault__12wxTextBuffer
+      ;wxTextBuffer::GetEOL(wxTextFileType)
+      GetEOL__12wxTextBufferF14wxTextFileType
+      ;wxTextBuffer::Open(wxMBConv&)
+      Open__12wxTextBufferFR8wxMBConv
+      ;wxTextBuffer::Create(const wxString&)
+      Create__12wxTextBufferFRC8wxString
   ;From object file:  ..\common\textcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTextCtrlBase::operator<<(double)
@@ -5265,6 +5370,8 @@ EXPORTS
       sm_classwxTextUrlEvent__14wxTextUrlEvent
       ;wxTextCtrlBase::~wxTextCtrlBase()
       __dt__14wxTextCtrlBaseFv
+      ;wxTextCtrlBase::GetStringSelection() const
+      GetStringSelection__14wxTextCtrlBaseCFv
       ;wxTextCtrlBase::GetDefaultStyle() const
       GetDefaultStyle__14wxTextCtrlBaseCFv
       ;wxTextCtrlBase::CanPaste() const
@@ -5272,6 +5379,7 @@ EXPORTS
       wxEVT_COMMAND_TEXT_UPDATED
       ;wxConstructorForwxTextUrlEvent()
       wxConstructorForwxTextUrlEvent__Fv
+      wxEVT_COMMAND_TEXT_MAXLEN
       ;wxTextCtrlBase::SelectAll()
       SelectAll__14wxTextCtrlBaseFv
       ;wxTextCtrlBase::SaveFile(const wxString&)
@@ -5279,38 +5387,25 @@ EXPORTS
       ;wxTextCtrlBase::operator<<(const char)
       __ls__14wxTextCtrlBaseFCc
       __vft14wxTextCtrlBase8wxObject
+      ;wxTextAttr::Combine(const wxTextAttr&,const wxTextAttr&,const wxTextCtrlBase*)
+      Combine__10wxTextAttrFRC10wxTextAttrT1PC14wxTextCtrlBase
       ;wxTextCtrlBase::SetStyle(long,long,const wxTextAttr&)
       SetStyle__14wxTextCtrlBaseFlT1RC10wxTextAttr
   ;From object file:  ..\common\textfile.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxTextFile::GuessType() const
-      GuessType__10wxTextFileCFv
-      ;wxTextFile::Open(const wxString&)
-      Open__10wxTextFileFRC8wxString
-      ;wxTextFile::~wxTextFile()
-      __dt__10wxTextFileFv
-      ;wxTextFile::Open()
-      Open__10wxTextFileFv
-      ;wxTextFile::Write(wxTextFileType)
-      Write__10wxTextFileF14wxTextFileType
-      ;wxTextFile::typeDefault
-      typeDefault__10wxTextFile
-      ;wxTextFile::Exists() const
-      Exists__10wxTextFileCFv
-      ;wxTextFile::Create()
-      Create__10wxTextFileFv
-      ;wxTextFile::GetEOL(wxTextFileType)
-      GetEOL__10wxTextFileF14wxTextFileType
-      ;wxTextFile::Translate(const wxString&,wxTextFileType)
-      Translate__10wxTextFileFRC8wxString14wxTextFileType
-      ;wxTextFile::Read()
-      Read__10wxTextFileFv
-      ;wxTextFile::Close()
-      Close__10wxTextFileFv
+      ;wxTextFile::OnRead(wxMBConv&)
+      OnRead__10wxTextFileFR8wxMBConv
+      __vft10wxTextFile12wxTextBuffer
+      ;wxTextFile::OnOpen(const wxString&,wxTextBuffer::wxTextBufferOpenMode)
+      OnOpen__10wxTextFileFRC8wxStringQ2_12wxTextBuffer20wxTextBufferOpenMode
+      ;wxTextFile::OnExists() const
+      OnExists__10wxTextFileCFv
+      ;wxTextFile::OnClose()
+      OnClose__10wxTextFileFv
+      ;wxTextFile::OnWrite(wxTextFileType,wxMBConv&)
+      OnWrite__10wxTextFileF14wxTextFileTypeR8wxMBConv
       ;wxTextFile::wxTextFile(const wxString&)
       __ct__10wxTextFileFRC8wxString
-      ;wxTextFile::Create(const wxString&)
-      Create__10wxTextFileFRC8wxString
   ;From object file:  ..\common\timercmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTimerEvent::sm_classwxTimerEvent
@@ -5354,6 +5449,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
@@ -5459,7 +5577,7 @@ EXPORTS
       Read32__17wxTextInputStreamFv
       ;wxTextInputStream::SkipIfEndOfLine(char)
       SkipIfEndOfLine__17wxTextInputStreamFc
-  ;From object file:  F:\DEV\WX2\WXWINDOWS\src\common\unzip.c
+  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\unzip.c
     ;PUBDEFs (Symbols available from object file):
       unzReadCurrentFile
       unzGetCurrentFileInfo
@@ -5529,12 +5647,12 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;IntToString(int)
       IntToString__Fi
-      ;wxStripMenuCodes(char*,char*)
-      wxStripMenuCodes__FPcT1
       ;wxDecToHex(int)
       wxDecToHex__Fi
       ;wxNow()
       wxNow__Fv
+      ;wxGetInstallPrefix()
+      wxGetInstallPrefix__Fv
       ;wxWindowDisabler::~wxWindowDisabler()
       __dt__16wxWindowDisablerFv
       ;copystring(const char*)
@@ -5549,60 +5667,68 @@ EXPORTS
       wxGetTextFromUser__FRC8wxStringN21P8wxWindowiT5Ul
       ;wxFindWindowAtPoint(wxWindow*,const wxPoint&)
       wxFindWindowAtPoint__FP8wxWindowRC7wxPoint
-      ;StringToDouble(char*,double*)
-      StringToDouble__FPcPd
-      ;StringToInt(char*,int*)
-      StringToInt__FPcPi
+      ;StringToLong(const char*,long*)
+      StringToLong__FPCcPl
       ;wxMessageBox(const wxString&,const wxString&,long,wxWindow*,int,int)
       wxMessageBox__FRC8wxStringT1lP8wxWindowiT5
       ;wxNewId()
       wxNewId__Fv
+      ;wxYieldIfNeeded()
+      wxYieldIfNeeded__Fv
       ;wxExecute(const wxString&,wxArrayString&,wxArrayString&)
       wxExecute__FRC8wxStringR13wxArrayStringT2
       ;wxHexToDec(const wxString&)
       wxHexToDec__FRC8wxString
       ;wxExecute(const wxString&,wxArrayString&)
       wxExecute__FRC8wxStringR13wxArrayString
-      ;StringToLong(char*,long*)
-      StringToLong__FPcPl
       ;LongToString(long)
       LongToString__Fl
       ;wxGetCurrentId()
       wxGetCurrentId__Fv
+      ;wxYield()
+      wxYield__Fv
       ;wxGetHostName()
       wxGetHostName__Fv
       ;wxGetHomeDir()
       wxGetHomeDir__Fv
       ;wxGetFullHostName()
       wxGetFullHostName__Fv
+      ;wxGetDataDir()
+      wxGetDataDir__Fv
       ;wxFindWindowByName(const wxString&,wxWindow*)
       wxFindWindowByName__FRC8wxStringP8wxWindow
+      ;StringToDouble(const char*,double*)
+      StringToDouble__FPCcPd
       ;wxGenericFindWindowAtPoint(const wxPoint&)
       wxGenericFindWindowAtPoint__FRC7wxPoint
       ;wxEnableTopLevelWindows(unsigned long)
       wxEnableTopLevelWindows__FUl
+      ;StringToInt(const char*,int*)
+      StringToInt__FPCcPi
       ;wxGetEmailAddress(char*,int)
       wxGetEmailAddress__FPci
+      ;StringToFloat(const char*,float*)
+      StringToFloat__FPCcPf
       ;wxGetUserId()
       wxGetUserId__Fv
       ;DoubleToString(double,const char*)
       DoubleToString__FdPCc
       ;wxStripMenuCodes(const wxString&)
       wxStripMenuCodes__FRC8wxString
+      ;wxStripMenuCodes(const char*,char*)
+      wxStripMenuCodes__FPCcPc
       ;wxSafeYield(wxWindow*)
       wxSafeYield__FP8wxWindow
-      ;StringMatch(char*,char*,unsigned long,unsigned long)
-      StringMatch__FPcT1UlT3
-      ;StringToFloat(char*,float*)
-      StringToFloat__FPcPf
+      ;StringMatch(const char*,const char*,unsigned long,unsigned long)
+      StringMatch__FPCcT1UlT3
+      ;wxFindMenuItemId(wxFrame*,const wxString&,const wxString&)
+      wxFindMenuItemId__FP7wxFrameRC8wxStringT2
       ;wxGetUserName()
       wxGetUserName__Fv
       ;wxGetEmailAddress()
       wxGetEmailAddress__Fv
       ;wxGetColourFromUser(wxWindow*,const wxColour&)
       wxGetColourFromUser__FP8wxWindowRC8wxColour
-      ;wxFindMenuItemId(wxFrame*,const wxString&,const wxString&)
-      wxFindMenuItemId__FP7wxFrameRC8wxStringT2
       ;FloatToString(float,const char*)
       FloatToString__FfPCc
       ;wxFindWindowByLabel(const wxString&,wxWindow*)
@@ -6247,8 +6373,6 @@ EXPORTS
       UpdateWindowUI__12wxWindowBaseFv
       ;wxWindowBase::PushEventHandler(wxEvtHandler*)
       PushEventHandler__12wxWindowBaseFP12wxEvtHandler
-      ;wxWindowBase::DoGetClientObject() const
-      DoGetClientObject__12wxWindowBaseCFv
       ;wxWindowBase::DestroyChildren()
       DestroyChildren__12wxWindowBaseFv
       ;wxWindowListNode::DeleteData()
@@ -6278,16 +6402,12 @@ EXPORTS
       LayoutPhase1__12wxWindowBaseFPi
       ;wxWindowBase::GetPositionConstraint(int*,int*) const
       GetPositionConstraint__12wxWindowBaseCFPiT1
-      ;wxWindowBase::DoSetClientObject(wxClientData*)
-      DoSetClientObject__12wxWindowBaseFP12wxClientData
       ;wxWindowBase::TransferDataToWindow()
       TransferDataToWindow__12wxWindowBaseFv
       ;wxWindowBase::Layout()
       Layout__12wxWindowBaseFv
       ;wxWindowBase::InitDialog()
       InitDialog__12wxWindowBaseFv
-      ;wxWindowBase::DoSetClientData(void*)
-      DoSetClientData__12wxWindowBaseFPv
       ;wxWindowBase::FindWindow(const wxString&)
       FindWindow__12wxWindowBaseFRC8wxString
       ;wxWindowBase::SetHelpTextForId(const wxString&)
@@ -6306,6 +6426,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()
@@ -6318,8 +6440,6 @@ EXPORTS
       GetUpdateClientRect__12wxWindowBaseCFv
       ;wxWindowBase::GetHelpText() const
       GetHelpText__12wxWindowBaseCFv
-      ;wxWindowBase::DoGetClientData() const
-      DoGetClientData__12wxWindowBaseCFv
       ;wxWindowBase::SetFont(const wxFont&)
       SetFont__12wxWindowBaseFRC6wxFont
       ;wxWindowBase::MakeModal(unsigned long)
@@ -6352,13 +6472,10 @@ EXPORTS
       SetHelpText__12wxWindowBaseFRC8wxString
   ;From object file:  ..\common\wxchar.cpp
     ;PUBDEFs (Symbols available from object file):
-      wcslen
-      ;wxMB2WC(wchar_t*,const char*,unsigned int)
-      wxMB2WC__FPwPCcUi
-      ;wxWC2MB(char*,const wchar_t*,unsigned int)
-      wxWC2MB__FPcPCwUi
       ;wxOKlibc()
       wxOKlibc__Fv
+      ;wcslen(const wchar_t*)
+      wcslen__FPCw
   ;From object file:  ..\common\wxexpr.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxExpr::GetAttributeValue(const wxString&,long&) const
@@ -6571,8 +6688,8 @@ EXPORTS
       __vft10wxBusyInfo8wxObject
       ;wxInfoFrame::wxInfoFrame(wxWindow*,const wxString&)
       __ct__11wxInfoFrameFP8wxWindowRC8wxString
-      ;wxBusyInfo::wxBusyInfo(const wxString&)
-      __ct__10wxBusyInfoFRC8wxString
+      ;wxBusyInfo::wxBusyInfo(const wxString&,wxWindow*)
+      __ct__10wxBusyInfoFRC8wxStringP8wxWindow
   ;From object file:  ..\generic\calctrl.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCalendarCtrl::OnMonthChange(wxCommandEvent&)
@@ -6586,6 +6703,10 @@ EXPORTS
       __ct__15wxCalendarEventFP14wxCalendarCtrli
       ;wxCalendarCtrl::SetHoliday(unsigned int)
       SetHoliday__14wxCalendarCtrlFUi
+      ;wxCalendarCtrl::SetDateRange(const wxDateTime&,const wxDateTime&)
+      SetDateRange__14wxCalendarCtrlFRC10wxDateTimeT1
+      ;wxCalendarCtrl::ChangeMonth(wxDateTime*) const
+      ChangeMonth__14wxCalendarCtrlCFP10wxDateTime
       ;wxCalendarCtrl::Init()
       Init__14wxCalendarCtrlFv
       ;wxConstructorForwxCalendarCtrl()
@@ -6607,6 +6728,8 @@ EXPORTS
       OnDClick__14wxCalendarCtrlFR12wxMouseEvent
       ;wxCalendarCtrl::RefreshDate(const wxDateTime&)
       RefreshDate__14wxCalendarCtrlFRC10wxDateTime
+      ;wxCalendarCtrl::SetUpperDateLimit(const wxDateTime&)
+      SetUpperDateLimit__14wxCalendarCtrlFRC10wxDateTime
       ;wxCalendarCtrl::GetWeek(const wxDateTime&) const
       GetWeek__14wxCalendarCtrlCFRC10wxDateTime
       ;wxCalendarCtrl::DoSetSize(int,int,int,int,int)
@@ -6627,6 +6750,8 @@ EXPORTS
       GetYearControl__14wxCalendarCtrlCFv
       ;wxYearSpinCtrl::GetEventTable() const
       GetEventTable__14wxYearSpinCtrlCFv
+      ;wxCalendarCtrl::GetDateCoord(const wxDateTime&,int*,int*) const
+      GetDateCoord__14wxCalendarCtrlCFRC10wxDateTimePiT2
       ;wxCalendarCtrl::OnYearChange(wxSpinEvent&)
       OnYearChange__14wxCalendarCtrlFR11wxSpinEvent
       wxEVT_CALENDAR_DAY_CHANGED
@@ -6643,10 +6768,12 @@ EXPORTS
       __vft14wxCalendarCtrl8wxObject
       ;wxCalendarCtrl::OnPaint(wxPaintEvent&)
       OnPaint__14wxCalendarCtrlFR12wxPaintEvent
-      ;wxCalendarCtrl::DoGetPosition(int*,int*) const
-      DoGetPosition__14wxCalendarCtrlCFPiT1
+      ;wxCalendarCtrl::IsDateInRange(const wxDateTime&) const
+      IsDateInRange__14wxCalendarCtrlCFRC10wxDateTime
       ;wxCalendarCtrl::HitTest(const wxPoint&,wxDateTime*,wxDateTime::WeekDay*)
       HitTest__14wxCalendarCtrlFRC7wxPointP10wxDateTimePQ2_10wxDateTime7WeekDay
+      ;wxCalendarCtrl::DoGetPosition(int*,int*) const
+      DoGetPosition__14wxCalendarCtrlCFPiT1
       ;wxCalendarCtrl::Enable(unsigned long)
       Enable__14wxCalendarCtrlFUl
       wxEVT_CALENDAR_WEEKDAY_CLICKED
@@ -6662,6 +6789,8 @@ EXPORTS
       ChangeDay__14wxCalendarCtrlFRC10wxDateTime
       ;wxCalendarCtrl::SetDateAndNotify(const wxDateTime&)
       SetDateAndNotify__14wxCalendarCtrlFRC10wxDateTime
+      ;wxCalendarCtrl::ChangeYear(wxDateTime*) const
+      ChangeYear__14wxCalendarCtrlCFP10wxDateTime
       ;wxCalendarEvent::Init()
       Init__15wxCalendarEventFv
       ;wxCalendarCtrl::GetStartDate() const
@@ -6672,10 +6801,14 @@ EXPORTS
       sm_eventTable__15wxMonthComboBox
       ;wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl*)
       __ct__14wxYearSpinCtrlFP14wxCalendarCtrl
+      ;wxCalendarCtrl::HighlightRange(wxPaintDC*,const wxDateTime&,const wxDateTime&,wxPen*,wxBrush*)
+      HighlightRange__14wxCalendarCtrlFP9wxPaintDCRC10wxDateTimeT2P5wxPenP7wxBrush
       ;wxCalendarCtrl::EnableYearChange(unsigned long)
       EnableYearChange__14wxCalendarCtrlFUl
       ;wxCalendarCtrl::SetDate(const wxDateTime&)
       SetDate__14wxCalendarCtrlFRC10wxDateTime
+      ;wxCalendarCtrl::SetLowerDateLimit(const wxDateTime&)
+      SetLowerDateLimit__14wxCalendarCtrlFRC10wxDateTime
       ;wxCalendarCtrl::IsDateShown(const wxDateTime&) const
       IsDateShown__14wxCalendarCtrlCFRC10wxDateTime
       ;wxCalendarCtrl::DoMoveWindow(int,int,int,int)
@@ -8400,8 +8533,6 @@ EXPORTS
       DeleteItem__16wxListMainWindowFl
       ;wxListLineDataArray::wxListLineDataArray(const wxListLineDataArray&)
       __ct__19wxListLineDataArrayFRC19wxListLineDataArray
-      ;wxListEvent::wxListEvent(int,int)
-      __ct__11wxListEventFiT1
       ;wxListItemData::SetSize(int,int)
       SetSize__14wxListItemDataFiT1
       ;wxListLineData::SetItem(int,const wxListItem&)
@@ -8442,6 +8573,8 @@ EXPORTS
       OnRenameAccept__16wxListMainWindowFv
       ;wxListRenameTimer::Notify()
       Notify__17wxListRenameTimerFv
+      ;wxListHeaderWindow::Init()
+      Init__18wxListHeaderWindowFv
       ;wxListHeaderData::GetWidth() const
       GetWidth__16wxListHeaderDataCFv
       ;wxListCtrl::GetTopItem() const
@@ -8450,11 +8583,15 @@ EXPORTS
       GetItemCount__10wxListCtrlCFv
       ;wxListMainWindow::GetImageSize(int,int&,int&) const
       GetImageSize__16wxListMainWindowCFiRiT2
+      ;wxListCtrl::Freeze()
+      Freeze__10wxListCtrlFv
       ;wxListHeaderWindow::DoDrawRect(wxDC*,int,int,int,int)
       DoDrawRect__18wxListHeaderWindowFP4wxDCiN32
+      wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
       wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK
       ;wxListMainWindow::GetItemRect(long,wxRect&)
       GetItemRect__16wxListMainWindowFlR6wxRect
+      wxEVT_COMMAND_LIST_ITEM_FOCUSED
       wxEVT_COMMAND_LIST_ITEM_DESELECTED
       wxEVT_COMMAND_LIST_ITEM_ACTIVATED
       wxEVT_COMMAND_LIST_CACHE_HINT
@@ -8471,8 +8608,6 @@ EXPORTS
       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
@@ -8510,8 +8645,6 @@ EXPORTS
       CacheLineData__16wxListMainWindowFUi
       ;wxwxListItemDataListNode::DeleteData()
       DeleteData__24wxwxListItemDataListNodeFv
-      ;wxConstructorForwxListHeaderData()
-      wxConstructorForwxListHeaderData__Fv
       ;wxConstructorForwxListCtrl()
       wxConstructorForwxListCtrl__Fv
       list_ctrl_compare_func_2
@@ -8521,6 +8654,8 @@ EXPORTS
       __ct__18wxListHeaderWindowFv
       ;wxListLineData::SetAttr(wxListItemAttr*)
       SetAttr__14wxListLineDataFP14wxListItemAttr
+      ;wxListMainWindow::RefreshSelected()
+      RefreshSelected__16wxListMainWindowFv
       ;wxListMainWindow::OnRenameTimer()
       OnRenameTimer__16wxListMainWindowFv
       ;wxListItemData::GetX() const
@@ -8540,6 +8675,7 @@ EXPORTS
       wxEVT_COMMAND_LIST_SET_INFO
       wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK
       wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS
+      wxEVT_COMMAND_LIST_COL_DRAGGING
       ;wxListHeaderWindow::sm_eventTable
       sm_eventTable__18wxListHeaderWindow
       ;wxListHeaderWindow::sm_eventTableEntries
@@ -8560,7 +8696,6 @@ EXPORTS
       sm_classwxListCtrl__10wxListCtrl
       __vft18wxListHeaderWindow8wxObject
       __vft17wxListRenameTimer8wxObject
-      __vft11wxListEvent8wxObject
       ;wxListMainWindow::SortItems(int(*)(long,long,long),long)
       SortItems__16wxListMainWindowFPFlN21_il
       ;wxListCtrl::SetSingleStyle(long,unsigned long)
@@ -8601,8 +8736,6 @@ EXPORTS
       RemoveAt__19wxListLineDataArrayFUi
       ;wxListMainWindow::RefreshLines(unsigned int,unsigned int)
       RefreshLines__16wxListMainWindowFUiT1
-      ;wxListMainWindow::OnFocusLine(unsigned int)
-      OnFocusLine__16wxListMainWindowFUi
       ;wxListCtrl::InsertItem(long,int)
       InsertItem__10wxListCtrlFli
       ;wxListMainWindow::GetVisibleLinesRange(unsigned int*,unsigned int*)
@@ -8615,6 +8748,8 @@ EXPORTS
       DrawImage__16wxListMainWindowFiP4wxDCN21
       ;wxListCtrl::DeleteColumn(int)
       DeleteColumn__10wxListCtrlFi
+      ;wxListMainWindow::ChangeCurrent(unsigned int)
+      ChangeCurrent__16wxListMainWindowFUi
       ;wxListCtrl::Arrange(int)
       Arrange__10wxListCtrlFi
       ;wxListCtrl::GetNextItem(long,int,int) const
@@ -8627,6 +8762,10 @@ EXPORTS
       __vft16wxListMainWindow14wxScrollHelper
       ;wxListMainWindow::UpdateCurrent()
       UpdateCurrent__16wxListMainWindowFv
+      ;wxListMainWindow::Thaw()
+      Thaw__16wxListMainWindowFv
+      ;wxListCtrl::Thaw()
+      Thaw__10wxListCtrlFv
       ;wxListCtrl::SetItem(long,int,const wxString&,int)
       SetItem__10wxListCtrlFliRC8wxStringT2
       ;wxListMainWindow::InitScrolling()
@@ -8651,10 +8790,13 @@ EXPORTS
       GetBackgroundColour__10wxListCtrlCFv
       ;wxListLineData::GetAttr() const
       GetAttr__14wxListLineDataCFv
+      ;wxListMainWindow::Freeze()
+      Freeze__16wxListMainWindowFv
       ;wxListCtrl::CreateHeaderWindow()
       CreateHeaderWindow__10wxListCtrlFv
       ;wxListLineData::SetText(int,const wxString)
       SetText__14wxListLineDataFiC8wxString
+      wxEVT_COMMAND_LIST_COL_RIGHT_CLICK
       ;wxListMainWindow::sm_eventTable
       sm_eventTable__16wxListMainWindow
       ;wxListHeaderWindow::sm_classwxListHeaderWindow
@@ -8707,8 +8849,6 @@ EXPORTS
       RefreshItems__10wxListCtrlFlT1
       ;wxListMainWindow::RefreshAfter(unsigned int)
       RefreshAfter__16wxListMainWindowFUi
-      ;wxListMainWindow::OnUnfocusLine(unsigned int)
-      OnUnfocusLine__16wxListMainWindowFUi
       ;wxListLineData::InitItems(int)
       InitItems__14wxListLineDataFi
       ;wxListMainWindow::GetLineY(unsigned int) const
@@ -8731,8 +8871,8 @@ EXPORTS
       DeleteColumn__16wxListMainWindowFi
       ;wxListLineData::CalculateSize(wxDC*,int)
       CalculateSize__14wxListLineDataFP4wxDCi
-      ;wxListCtrl::~wxListCtrl()
-      __dt__10wxListCtrlFv
+      ;wxListItem::wxListItem()
+      __ct__10wxListItemFv
       wxSizeTCmpFn
       ;wxConstructorForwxListItem()
       wxConstructorForwxListItem__Fv
@@ -8740,14 +8880,16 @@ EXPORTS
       __dt__19wxListLineDataArrayFv
       ;wxListItemData::~wxListItemData()
       __dt__14wxListItemDataFv
-      ;wxListItem::wxListItem()
-      __ct__10wxListItemFv
+      ;wxListCtrl::~wxListCtrl()
+      __dt__10wxListCtrlFv
       ;wxListCtrl::SetItemImage(long,int,int)
       SetItemImage__10wxListCtrlFliT2
       ;wxListCtrl::SetForegroundColour(const wxColour&)
       SetForegroundColour__10wxListCtrlFRC8wxColour
       ;wxListMainWindow::Init()
       Init__16wxListMainWindowFv
+      ;wxListHeaderData::Init()
+      Init__16wxListHeaderDataFv
       ;wxListCtrl::GetSelectedItemCount() const
       GetSelectedItemCount__10wxListCtrlCFv
       ;wxListHeaderWindow::GetEventTable() const
@@ -8810,8 +8952,6 @@ EXPORTS
       DrawInReportMode__14wxListLineDataFP4wxDCRC6wxRectT2Ul
       ;wxListLineData::GetText(int) const
       GetText__14wxListLineDataCFi
-      ;wxListHeaderData::sm_classwxListHeaderData
-      sm_classwxListHeaderData__16wxListHeaderData
       __vft26wxwxListHeaderDataListNode10wxNodeBase
       __vft24wxwxListItemDataListNode10wxNodeBase
       ;wxListLineData::SetPosition(int,int,int,int)
@@ -8900,6 +9040,7 @@ EXPORTS
       ClearAll__10wxListCtrlFv
       ;wxListItemData::wxListItemData(wxListMainWindow*)
       __ct__14wxListItemDataFP16wxListMainWindow
+      wxEVT_COMMAND_LIST_COL_END_DRAG
       wxEVT_COMMAND_LIST_COL_CLICK
       wxEVT_COMMAND_LIST_BEGIN_RDRAG
       wxEVT_COMMAND_LIST_BEGIN_DRAG
@@ -9003,15 +9144,21 @@ EXPORTS
       Init__7wxPanelFv
       ;wxPanel::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__7wxPanelFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
+      ;wxPanel::SetDefaultItem(wxWindow*)
+      SetDefaultItem__7wxPanelFP8wxWindow
       __vft7wxPanel8wxObject
       ;wxPanel::GetEventTable() const
       GetEventTable__7wxPanelCFv
       ;wxPanel::InitDialog()
       InitDialog__7wxPanelFv
-      ;wxPanel::sm_classwxPanel
-      sm_classwxPanel__7wxPanel
+      ;wxPanel::OnChildFocus(wxChildFocusEvent&)
+      OnChildFocus__7wxPanelFR17wxChildFocusEvent
       ;wxPanel::sm_eventTable
       sm_eventTable__7wxPanel
+      ;wxPanel::sm_classwxPanel
+      sm_classwxPanel__7wxPanel
+      ;wxPanel::~wxPanel()
+      __dt__7wxPanelFv
       ;wxPanel::OnNavigationKey(wxNavigationKeyEvent&)
       OnNavigationKey__7wxPanelFR20wxNavigationKeyEvent
       ;wxPanel::OnFocus(wxFocusEvent&)
@@ -9022,6 +9169,8 @@ EXPORTS
       wxConstructorForwxPanel__Fv
       ;wxPanel::SetFocus()
       SetFocus__7wxPanelFv
+      ;wxPanel::GetDefaultItem() const
+      GetDefaultItem__7wxPanelCFv
   ;From object file:  ..\generic\printps.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPostScriptPrintPreview::wxPostScriptPrintPreview(wxPrintout*,wxPrintout*,wxPrintDialogData*)
@@ -9210,8 +9359,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&)
@@ -9232,6 +9385,8 @@ EXPORTS
       StopAutoScrolling__14wxScrollHelperFv
       ;wxScrollHelper::AdjustScrollbars()
       AdjustScrollbars__14wxScrollHelperFv
+      ;wxGenericScrolledWindow::sm_eventTableEntries
+      sm_eventTableEntries__23wxGenericScrolledWindow
       ;wxScrollHelper::HandleOnSize(wxSizeEvent&)
       HandleOnSize__14wxScrollHelperFR11wxSizeEvent
       ;wxScrollHelper::HandleOnPaint(wxPaintEvent&)
@@ -9241,6 +9396,8 @@ EXPORTS
       ;wxScrollHelper::GetTargetWindow() const
       GetTargetWindow__14wxScrollHelperCFv
       __vft14wxScrollHelper
+      ;wxGenericScrolledWindow::GetEventTable() const
+      GetEventTable__23wxGenericScrolledWindowCFv
       ;wxGenericScrolledWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__23wxGenericScrolledWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxScrollHelper::CalcUnscrolledPosition(int,int,int*,int*) const
@@ -9270,33 +9427,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
@@ -9348,49 +9523,41 @@ EXPORTS
       Unsplit__16wxSplitterWindowFP8wxWindow
   ;From object file:  ..\generic\statusbr.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxStatusBarGeneric::SetMinHeight(int)
-      SetMinHeight__18wxStatusBarGenericFi
-      ;wxStatusBarGeneric::sm_eventTableEntries
-      sm_eventTableEntries__18wxStatusBarGeneric
-      ;wxStatusBarGeneric::OnPaint(wxPaintEvent&)
-      OnPaint__18wxStatusBarGenericFR12wxPaintEvent
-      ;wxStatusBarGeneric::SetStatusText(const wxString&,int)
-      SetStatusText__18wxStatusBarGenericFRC8wxStringi
-      ;wxStatusBarGeneric::GetEventTable() const
-      GetEventTable__18wxStatusBarGenericCFv
-      ;wxStatusBar::sm_classwxStatusBar
-      sm_classwxStatusBar__11wxStatusBar
-      ;wxStatusBarGeneric::sm_eventTable
-      sm_eventTable__18wxStatusBarGeneric
-      ;wxStatusBarGeneric::SetFieldsCount(int,const int*)
-      SetFieldsCount__18wxStatusBarGenericFiPCi
-      ;wxStatusBarGeneric::DrawFieldText(wxDC&,int)
-      DrawFieldText__18wxStatusBarGenericFR4wxDCi
-      ;wxStatusBarGeneric::wxStatusBarGeneric()
-      __ct__18wxStatusBarGenericFv
-      ;wxStatusBarGeneric::~wxStatusBarGeneric()
-      __dt__18wxStatusBarGenericFv
-      ;wxStatusBarGeneric::InitColours()
-      InitColours__18wxStatusBarGenericFv
-      ;wxStatusBarGeneric::GetStatusText(int) const
-      GetStatusText__18wxStatusBarGenericCFi
-      ;wxConstructorForwxStatusBarGeneric()
-      wxConstructorForwxStatusBarGeneric__Fv
-      ;wxConstructorForwxStatusBar()
-      wxConstructorForwxStatusBar__Fv
-      ;wxStatusBarGeneric::Create(wxWindow*,int,long,const wxString&)
-      Create__18wxStatusBarGenericFP8wxWindowilRC8wxString
-      ;wxStatusBarGeneric::sm_classwxStatusBarGeneric
-      sm_classwxStatusBarGeneric__18wxStatusBarGeneric
-      ;wxStatusBarGeneric::GetFieldRect(int,wxRect&) const
-      GetFieldRect__18wxStatusBarGenericCFiR6wxRect
-      __vft18wxStatusBarGeneric8wxObject
-      ;wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent&)
-      OnSysColourChanged__18wxStatusBarGenericFR23wxSysColourChangedEvent
-      ;wxStatusBarGeneric::SetStatusWidths(int,const int*)
-      SetStatusWidths__18wxStatusBarGenericFiPCi
-      ;wxStatusBarGeneric::DrawField(wxDC&,int)
-      DrawField__18wxStatusBarGenericFR4wxDCi
+      ;wxStatusBar::GetFieldRect(int,wxRect&) const
+      GetFieldRect__11wxStatusBarCFiR6wxRect
+      ;wxStatusBar::SetStatusWidths(int,const int*)
+      SetStatusWidths__11wxStatusBarFiPCi
+      ;wxStatusBar::DrawField(wxDC&,int)
+      DrawField__11wxStatusBarFR4wxDCi
+      ;wxStatusBar::DrawFieldText(wxDC&,int)
+      DrawFieldText__11wxStatusBarFR4wxDCi
+      ;wxStatusBar::InitColours()
+      InitColours__11wxStatusBarFv
+      ;wxStatusBar::Create(wxWindow*,int,long,const wxString&)
+      Create__11wxStatusBarFP8wxWindowilRC8wxString
+      ;wxStatusBar::OnPaint(wxPaintEvent&)
+      OnPaint__11wxStatusBarFR12wxPaintEvent
+      ;wxStatusBar::GetStatusText(int) const
+      GetStatusText__11wxStatusBarCFi
+      ;wxStatusBar::SetFieldsCount(int,const int*)
+      SetFieldsCount__11wxStatusBarFiPCi
+      ;wxStatusBar::SetStatusText(const wxString&,int)
+      SetStatusText__11wxStatusBarFRC8wxStringi
+      ;wxStatusBar::SetMinHeight(int)
+      SetMinHeight__11wxStatusBarFi
+      ;wxStatusBar::~wxStatusBar()
+      __dt__11wxStatusBarFv
+      ;wxStatusBar::OnSysColourChanged(wxSysColourChangedEvent&)
+      OnSysColourChanged__11wxStatusBarFR23wxSysColourChangedEvent
+      __vft11wxStatusBar8wxObject
+      ;wxStatusBar::GetEventTable() const
+      GetEventTable__11wxStatusBarCFv
+      ;wxStatusBar::sm_eventTable
+      sm_eventTable__11wxStatusBar
+      ;wxStatusBar::sm_eventTableEntries
+      sm_eventTableEntries__11wxStatusBar
+      ;wxStatusBar::wxStatusBar()
+      __ct__11wxStatusBarFv
   ;From object file:  ..\generic\tabg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTabControl::OnDraw(wxDC&,unsigned long)
@@ -9549,41 +9716,6 @@ EXPORTS
       ;wxTipDialog::wxTipDialog(wxWindow*,wxTipProvider*,unsigned long)
       __ct__11wxTipDialogFP8wxWindowP13wxTipProviderUl
   ;From object file:  ..\generic\tipwin.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxTipWindow::OnKillFocus(wxFocusEvent&)
-      OnKillFocus__11wxTipWindowFR12wxFocusEvent
-      ;wxTipWindow::wxTipWindow(wxWindow*,const wxString&,int,wxTipWindow**)
-      __ct__11wxTipWindowFP8wxWindowRC8wxStringiPP11wxTipWindow
-      ;wxTipWindowView::sm_eventTable
-      sm_eventTable__15wxTipWindowView
-      ;wxTipWindowView::OnMouseClick(wxMouseEvent&)
-      OnMouseClick__15wxTipWindowViewFR12wxMouseEvent
-      __vft11wxTipWindow8wxObject
-      ;wxTipWindowView::GetEventTable() const
-      GetEventTable__15wxTipWindowViewCFv
-      ;wxTipWindow::OnMouseClick(wxMouseEvent&)
-      OnMouseClick__11wxTipWindowFR12wxMouseEvent
-      ;wxTipWindowView::OnKillFocus(wxFocusEvent&)
-      OnKillFocus__15wxTipWindowViewFR12wxFocusEvent
-      ;wxTipWindow::GetEventTable() const
-      GetEventTable__11wxTipWindowCFv
-      ;wxTipWindow::~wxTipWindow()
-      __dt__11wxTipWindowFv
-      ;wxTipWindow::sm_eventTable
-      sm_eventTable__11wxTipWindow
-      ;wxTipWindowView::OnPaint(wxPaintEvent&)
-      OnPaint__15wxTipWindowViewFR12wxPaintEvent
-      __vft15wxTipWindowView8wxObject
-      ;wxTipWindowView::wxTipWindowView(wxWindow*)
-      __ct__15wxTipWindowViewFP8wxWindow
-      ;wxTipWindow::sm_eventTableEntries
-      sm_eventTableEntries__11wxTipWindow
-      ;wxTipWindow::OnActivate(wxActivateEvent&)
-      OnActivate__11wxTipWindowFR15wxActivateEvent
-      ;wxTipWindowView::Adjust(const wxString&,int)
-      Adjust__15wxTipWindowViewFRC8wxStringi
-      ;wxTipWindowView::sm_eventTableEntries
-      sm_eventTableEntries__15wxTipWindowView
   ;From object file:  ..\generic\treectlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTreeRenameTimer::wxTreeRenameTimer(wxGenericTreeCtrl*)
@@ -9616,12 +9748,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&)
@@ -9632,8 +9770,6 @@ EXPORTS
       Edit__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxTreeTextCtrl::sm_eventTableEntries
       sm_eventTableEntries__14wxTreeTextCtrl
-      ;wxTreeTextCtrl::sm_classwxTreeTextCtrl
-      sm_classwxTreeTextCtrl__14wxTreeTextCtrl
       __vft17wxGenericTreeCtrl8wxObject
       ;wxGenericTreeCtrl::SetItemBold(const wxTreeItemId&,unsigned long)
       SetItemBold__17wxGenericTreeCtrlFRC12wxTreeItemIdUl
@@ -9651,8 +9787,6 @@ EXPORTS
       DeleteChildren__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeCtrl::Collapse(const wxTreeItemId&)
       Collapse__17wxGenericTreeCtrlFRC12wxTreeItemId
-      ;wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem*,const wxString&,wxDC&,int,int,wxTreeItemData*)
-      __ct__17wxGenericTreeItemFP17wxGenericTreeItemRC8wxStringR4wxDCiT4P14wxTreeItemData
       ;wxGenericTreeCtrl::SetSpacing(unsigned int)
       SetSpacing__17wxGenericTreeCtrlFUi
       ;wxGenericTreeCtrl::PrependItem(const wxTreeItemId&,const wxString&,int,int,wxTreeItemData*)
@@ -9665,6 +9799,8 @@ EXPORTS
       __dt__17wxGenericTreeCtrlFv
       ;wxConstructorForwxTreeCtrl()
       wxConstructorForwxTreeCtrl__Fv
+      ;wxGenericTreeCtrl::SetForegroundColour(const wxColour&)
+      SetForegroundColour__17wxGenericTreeCtrlFRC8wxColour
       ;wxGenericTreeCtrl::GetStateImageList() const
       GetStateImageList__17wxGenericTreeCtrlCFv
       ;wxGenericTreeCtrl::GetImageList() const
@@ -9681,6 +9817,8 @@ EXPORTS
       SetItemFont__17wxGenericTreeCtrlFRC12wxTreeItemIdRC6wxFont
       ;wxGenericTreeCtrl::SetFont(const wxFont&)
       SetFont__17wxGenericTreeCtrlFRC6wxFont
+      ;wxGenericTreeCtrl::SetButtonsImageList(wxImageList*)
+      SetButtonsImageList__17wxGenericTreeCtrlFP11wxImageList
       ;wxGenericTreeCtrl::OnPaint(wxPaintEvent&)
       OnPaint__17wxGenericTreeCtrlFR12wxPaintEvent
       ;wxTreeTextCtrl::OnKeyUp(wxKeyEvent&)
@@ -9705,18 +9843,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
@@ -9748,8 +9886,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
@@ -9770,8 +9906,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*)
@@ -9790,6 +9924,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&)
@@ -9801,6 +9937,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
@@ -9809,10 +9947,14 @@ EXPORTS
       EnsureVisible__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeCtrl::CollapseAndReset(const wxTreeItemId&)
       CollapseAndReset__17wxGenericTreeCtrlFRC12wxTreeItemId
-      ;wxGenericTreeCtrl::RefreshLine(wxGenericTreeItem*)
-      RefreshLine__17wxGenericTreeCtrlFP17wxGenericTreeItem
+      ;wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem*,const wxString&,int,int,wxTreeItemData*)
+      __ct__17wxGenericTreeItemFP17wxGenericTreeItemRC8wxStringiT3P14wxTreeItemData
       ;wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem*,wxGenericTreeItem*)
       SelectItemRange__17wxGenericTreeCtrlFP17wxGenericTreeItemT1
+      ;wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem*)
+      RefreshSelectedUnder__17wxGenericTreeCtrlFP17wxGenericTreeItem
+      ;wxGenericTreeCtrl::RefreshLine(wxGenericTreeItem*)
+      RefreshLine__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::DrawDropEffect(wxGenericTreeItem*)
       DrawDropEffect__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxTreeRenameTimer::Notify()
@@ -9824,8 +9966,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
@@ -10023,6 +10163,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
@@ -10056,6 +10198,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)
@@ -10068,16 +10212,20 @@ EXPORTS
       __vft16wxHtmlColourCell8wxObject
       ;wxHtmlContainerCell::AdjustPagebreak(int*) const
       AdjustPagebreak__19wxHtmlContainerCellCFPi
+      ;wxHtmlContainerCell::FindCellByPos(int,int) const
+      FindCellByPos__19wxHtmlContainerCellCFiT1
       ;wxHtmlColourCell::DrawInvisible(wxDC&,int,int)
       DrawInvisible__16wxHtmlColourCellFR4wxDCiT2
       ;wxHtmlContainerCell::SetAlign(const wxHtmlTag&)
       SetAlign__19wxHtmlContainerCellFRC9wxHtmlTag
-      ;wxHtmlContainerCell::GetIndentUnits(int) const
-      GetIndentUnits__19wxHtmlContainerCellCFi
+      ;wxHtmlCell::GetHorizontalConstraints(int*,int*) const
+      GetHorizontalConstraints__10wxHtmlCellCFPiT1
       ;wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow*,int)
       __ct__16wxHtmlWidgetCellFP8wxWindowi
       ;wxHtmlWidgetCell::Layout(int)
       Layout__16wxHtmlWidgetCellFi
+      ;wxHtmlContainerCell::GetIndentUnits(int) const
+      GetIndentUnits__19wxHtmlContainerCellCFi
       ;wxHtmlCell::wxHtmlCell()
       __ct__10wxHtmlCellFv
       ;wxHtmlCell::Find(int,const void*) const
@@ -10162,12 +10310,12 @@ EXPORTS
       PopTagHandler__12wxHtmlParserFv
       ;wxHtmlParser::CreateDOMTree()
       CreateDOMTree__12wxHtmlParserFv
-      ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
-      PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
-      ;wxHtmlEntitiesParser::SetEncoding(wxFontEncoding)
-      SetEncoding__20wxHtmlEntitiesParserF14wxFontEncoding
       ;wxHtmlEntitiesParser::Parse(const wxString&)
       Parse__20wxHtmlEntitiesParserFRC8wxString
+      ;wxHtmlEntitiesParser::SetEncoding(wxFontEncoding)
+      SetEncoding__20wxHtmlEntitiesParserF14wxFontEncoding
+      ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
+      PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
       ;wxHtmlTextPieces::RemoveAt(unsigned int)
       RemoveAt__16wxHtmlTextPiecesFUi
       ;wxHtmlEntitiesParser::GetCharForCode(unsigned int)
@@ -10246,6 +10394,8 @@ EXPORTS
       __dt__18wxHtmlHistoryArrayFv
       ;wxHtmlWindow::~wxHtmlWindow()
       __dt__12wxHtmlWindowFv
+      ;wxHtmlWindow::OnCellMouseHover(wxHtmlCell*,int,int)
+      OnCellMouseHover__12wxHtmlWindowFP10wxHtmlCelliT2
       ;wxHtmlWindow::HistoryCanForward()
       HistoryCanForward__12wxHtmlWindowFv
       ;wxHtmlWindow::HistoryBack()
@@ -10256,10 +10406,12 @@ EXPORTS
       AddGlobalProcessor__12wxHtmlWindowFP15wxHtmlProcessor
       ;wxHtmlWindow::AddFilter(wxHtmlFilter*)
       AddFilter__12wxHtmlWindowFP12wxHtmlFilter
-      ;wxHtmlWindow::OnDraw(wxDC&)
-      OnDraw__12wxHtmlWindowFR4wxDC
+      ;wxHtmlWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
+      Create__12wxHtmlWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxHtmlWindow::m_Filters
       m_Filters__12wxHtmlWindow
+      ;wxHtmlWindow::OnDraw(wxDC&)
+      OnDraw__12wxHtmlWindowFR4wxDC
       ;wxHtmlHistoryArray::Index(const wxHtmlHistoryItem&,unsigned long) const
       Index__18wxHtmlHistoryArrayCFRC17wxHtmlHistoryItemUl
       ;wxHtmlHistoryArray::Insert(const wxHtmlHistoryItem&,unsigned int)
@@ -10287,6 +10439,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&)
@@ -10309,11 +10463,13 @@ EXPORTS
       ReadCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
       ;wxHtmlWindow::OnIdle(wxIdleEvent&)
       OnIdle__12wxHtmlWindowFR11wxIdleEvent
-      ;wxHtmlWindow::CreateLayout()
-      CreateLayout__12wxHtmlWindowFv
+      ;wxHtmlWindow::Init()
+      Init__12wxHtmlWindowFv
       ;wxConstructorForwxHtmlWindow()
       wxConstructorForwxHtmlWindow__Fv
       __vft12wxHtmlWindow14wxScrollHelper
+      ;wxHtmlWindow::CreateLayout()
+      CreateLayout__12wxHtmlWindowFv
       ;wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo&)
       OnLinkClicked__12wxHtmlWindowFRC14wxHtmlLinkInfo
       ;wxHtmlWindow::m_GlobalProcessors
@@ -10325,14 +10481,14 @@ EXPORTS
       HistoryForward__12wxHtmlWindowFv
       ;wxHtmlWindow::AddProcessor(wxHtmlProcessor*)
       AddProcessor__12wxHtmlWindowFP15wxHtmlProcessor
-      ;wxHtmlWindow::wxHtmlWindow(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
-      __ct__12wxHtmlWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
+      ;wxHtmlWindow::SetRelatedFrame(wxFrame*,const wxString&)
+      SetRelatedFrame__12wxHtmlWindowFP7wxFrameRC8wxString
       ;wxHtmlWindow::sm_eventTableEntries
       sm_eventTableEntries__12wxHtmlWindow
       ;wxHtmlWindow::WriteCustomization(wxConfigBase*,wxString)
       WriteCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
-      ;wxHtmlWindow::SetRelatedFrame(wxFrame*,const wxString&)
-      SetRelatedFrame__12wxHtmlWindowFP7wxFrameRC8wxString
+      ;wxHtmlWindow::AppendToPage(const wxString&)
+      AppendToPage__12wxHtmlWindowFRC8wxString
   ;From object file:  ..\html\htmprint.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlDCRenderer::SetDC(wxDC*,double)
@@ -10455,19 +10611,23 @@ EXPORTS
       GetLink__22wxHtmlImageMapAreaCellCFiT1
       ;wxHtmlImageMapCell::Find(int,const void*) const
       Find__18wxHtmlImageMapCellCFiPCv
+      ;wxHtmlImageCell::AdvanceAnimation(wxTimer*)
+      AdvanceAnimation__15wxHtmlImageCellFP7wxTimer
+      ;wxHtmlImageCell::SetImage(const wxImage&)
+      SetImage__15wxHtmlImageCellFRC7wxImage
       ;HTML_ModuleImage::sm_classHTML_ModuleImage
       sm_classHTML_ModuleImage__16HTML_ModuleImage
       ;_link_dummy_func_m_image()
       _link_dummy_func_m_image__Fv
       ;CoordArray::DoEmpty()
       DoEmpty__10CoordArrayFv
-      ;wxHtmlImageCell::wxHtmlImageCell(wxFSFile*,int,int,double,int,wxString)
-      __ct__15wxHtmlImageCellFP8wxFSFileiT2dT28wxString
       __vft18wxHtmlImageMapCell8wxObject
       ;CoordArray::DoCopy(const CoordArray&)
       DoCopy__10CoordArrayFRC10CoordArray
       ;CoordArray::CoordArray(const CoordArray&)
       __ct__10CoordArrayFRC10CoordArray
+      ;wxHtmlImageCell::Layout(int)
+      Layout__15wxHtmlImageCellFi
       ;wxHtmlImageMapCell::GetLink(int,int) const
       GetLink__18wxHtmlImageMapCellCFiT1
       ;CoordArray::Index(const int&,unsigned long) const
@@ -10478,6 +10638,10 @@ EXPORTS
       Insert__10CoordArrayFRCiUi
       ;wxHtmlImageCell::GetLink(int,int) const
       GetLink__15wxHtmlImageCellCFiT1
+      ;wxHtmlImageCell::~wxHtmlImageCell()
+      __dt__15wxHtmlImageCellFv
+      ;wxHtmlImageCell::wxHtmlImageCell(wxWindow*,wxFSFile*,int,int,double,int,const wxString&)
+      __ct__15wxHtmlImageCellFP8wxWindowP8wxFSFileiT3dT3RC8wxString
   ;From object file:  ..\html\m_layout.cpp
     ;PUBDEFs (Symbols available from object file):
       ;HTML_ModuleLayout::sm_classHTML_ModuleLayout
@@ -10527,6 +10691,8 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTableCell::ReallocRows(int)
       ReallocRows__15wxHtmlTableCellFi
+      ;wxHtmlTableCell::ComputeMinMaxWidths()
+      ComputeMinMaxWidths__15wxHtmlTableCellFv
       ;wxConstructorForHTML_ModuleTables()
       wxConstructorForHTML_ModuleTables__Fv
       __vft15wxHtmlTableCell8wxObject
@@ -10673,6 +10839,8 @@ EXPORTS
       RegisterWindowClasses__5wxAppFUl
       ;wxApp::sm_eventTableEntries
       sm_eventTableEntries__5wxApp
+      ;wxApp::Yield(unsigned long)
+      Yield__5wxAppFUl
       ;wxApp::OnIdle(wxIdleEvent&)
       OnIdle__5wxAppFR11wxIdleEvent
       ;wxMsgArray::wxMsgArray(const wxMsgArray&)
@@ -10683,8 +10851,6 @@ EXPORTS
       Insert__10wxMsgArrayFRC5_QMSGUi
       ;wxApp::HandleSockets()
       HandleSockets__5wxAppFv
-      ;wxYieldIfNeeded()
-      wxYieldIfNeeded__Fv
       wxDEFAULT_MDIPARENTFRAME_ICON
       ;wxApp::wxApp()
       __ct__5wxAppFv
@@ -10707,8 +10873,6 @@ EXPORTS
       RemoveSocketHandler__5wxAppFi
       ;wxMsgArray::DoEmpty()
       DoEmpty__10wxMsgArrayFv
-      ;wxYield()
-      wxYield__Fv
       wxSTD_FRAME_ICON
       wxDEFAULT_FRAME_ICON
       ;wxApp::ProcessIdle()
@@ -10923,6 +11087,10 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxButton::Command(wxCommandEvent&)
       Command__8wxButtonFR14wxCommandEvent
+      ;wxButton::MakeOwnerDrawn()
+      MakeOwnerDrawn__8wxButtonFv
+      ;wxButton::WindowProc(unsigned int,void*,void*)
+      WindowProc__8wxButtonFUiPvT2
       ;wxButton::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
       OnCtlColor__8wxButtonFUlT1UiT3PvT5
       ;wxButton::~wxButton()
@@ -11057,6 +11225,8 @@ EXPORTS
       sm_classwxChoice__8wxChoice
       ;wxChoice::DoGetItemClientObject(int) const
       DoGetItemClientObject__8wxChoiceCFi
+      ;wxChoice::Free()
+      Free__8wxChoiceFv
       ;wxChoice::GetCount() const
       GetCount__8wxChoiceCFv
       ;wxChoice::SetString(int,const wxString&)
@@ -11154,6 +11324,8 @@ EXPORTS
       SetEditable__10wxComboBoxFUl
       ;wxComboBox::SetInsertionPointEnd()
       SetInsertionPointEnd__10wxComboBoxFv
+      ;wxComboBox::ProcessEditMsg(unsigned int,void*,void*)
+      ProcessEditMsg__10wxComboBoxFUiPvT2
       ;wxComboBox::SetValue(const wxString&)
       SetValue__10wxComboBoxFRC8wxString
       ;wxComboBox::SetInsertionPoint(long)
@@ -11166,6 +11338,7 @@ EXPORTS
       wxConstructorForwxComboBox__Fv
       ;wxComboBox::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,int,const wxString*,long,const wxValidator&,const wxString&)
       Create__10wxComboBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizeT2PC8wxStringlRC11wxValidatorT3
+      wxComboEditWndProc
       ;wxComboBox::OS2Command(unsigned int,unsigned short)
       OS2Command__10wxComboBoxFUiUs
   ;From object file:  ..\os2\control.cpp
@@ -11199,6 +11372,8 @@ EXPORTS
       __vft9wxControl8wxObject
       ;wxControl::~wxControl()
       __dt__9wxControlFv
+      ;wxControl::OS2CreateControl(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
+      OS2CreateControl__9wxControlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
   ;From object file:  ..\os2\cursor.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCursorRefData::~wxCursorRefData()
@@ -11845,6 +12020,8 @@ EXPORTS
       GetPointSize__6wxFontCFv
       ;wxFont::Create(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       Create__6wxFontFiN31UlRC8wxString14wxFontEncoding
+      ;wxFont::wxFont(const wxNativeFontInfo&)
+      __ct__6wxFontFRC16wxNativeFontInfo
   ;From object file:  ..\os2\fontdlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxConstructorForwxFontDialog()
@@ -11893,97 +12070,99 @@ EXPORTS
       FromString__20wxNativeEncodingInfoFRC8wxString
   ;From object file:  ..\os2\frame.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxFrameOS2::OS2Create(int,wxWindow*,const char*,wxWindow*,const char*,int,int,int,int,long)
-      OS2Create__10wxFrameOS2FiP8wxWindowPCcT2T3N41l
-      ;wxFrameOS2::OnActivate(wxActivateEvent&)
-      OnActivate__10wxFrameOS2FR15wxActivateEvent
-      ;wxFrameOS2::Iconize(unsigned long)
-      Iconize__10wxFrameOS2FUl
-      ;wxFrameOS2::DoSetClientSize(int,int)
-      DoSetClientSize__10wxFrameOS2FiT1
-      ;wxFrameOS2::HandleSize(int,int,unsigned int)
-      HandleSize__10wxFrameOS2FiT1Ui
-      ;wxFrameOS2::Restore()
-      Restore__10wxFrameOS2Fv
-      ;wxFrameOS2::sm_eventTableEntries
-      sm_eventTableEntries__10wxFrameOS2
-      ;wxFrameOS2::m_bUseNativeStatusBar
-      m_bUseNativeStatusBar__10wxFrameOS2
-      ;wxFrameOS2::IsIconized() const
-      IsIconized__10wxFrameOS2CFv
-      ;wxFrameOS2::HandlePaint()
-      HandlePaint__10wxFrameOS2Fv
-      ;wxFrameOS2::DetachMenuBar()
-      DetachMenuBar__10wxFrameOS2Fv
-      ;wxFrameOS2::CreateToolBar(long,int,const wxString&)
-      CreateToolBar__10wxFrameOS2FliRC8wxString
-      ;wxFrameOS2::Maximize(unsigned long)
-      Maximize__10wxFrameOS2FUl
-      ;wxFrameOS2::OnSysColourChanged(wxSysColourChangedEvent&)
-      OnSysColourChanged__10wxFrameOS2FR23wxSysColourChangedEvent
-      ;wxFrameOS2::HandleMenuSelect(unsigned short,unsigned short,unsigned long)
-      HandleMenuSelect__10wxFrameOS2FUsT1Ul
-      ;wxFrameOS2::HandleCommand(unsigned short,unsigned short,unsigned long)
-      HandleCommand__10wxFrameOS2FUsT1Ul
-      ;wxFrameOS2::DoGetClientSize(int*,int*) const
-      DoGetClientSize__10wxFrameOS2CFPiT1
-      ;wxFrameOS2::DoGetSize(int*,int*) const
-      DoGetSize__10wxFrameOS2CFPiT1
-      ;wxFrameOS2::~wxFrameOS2()
-      __dt__10wxFrameOS2Fv
+      ;wxFrame::Show(unsigned long)
+      Show__7wxFrameFUl
+      ;wxFrame::Iconize(unsigned long)
+      Iconize__7wxFrameFUl
+      ;wxFrame::HandleMenuSelect(unsigned short,unsigned short,unsigned long)
+      HandleMenuSelect__7wxFrameFUsT1Ul
+      ;wxFrame::OS2TranslateMessage(void**)
+      OS2TranslateMessage__7wxFrameFPPv
+      ;wxFrame::HandlePaint()
+      HandlePaint__7wxFrameFv
+      ;wxFrame::OnCreateStatusBar(int,long,int,const wxString&)
+      OnCreateStatusBar__7wxFrameFilT1RC8wxString
+      ;wxFrame::OnActivate(wxActivateEvent&)
+      OnActivate__7wxFrameFR15wxActivateEvent
+      __vft7wxFrame8wxObject
+      ;wxFrame::DoSetClientSize(int,int)
+      DoSetClientSize__7wxFrameFiT1
+      ;wxFrame::HandleSize(int,int,unsigned int)
+      HandleSize__7wxFrameFiT1Ui
       ;wxConstructorForwxFrame()
       wxConstructorForwxFrame__Fv
-      ;wxFrameOS2::InternalSetMenuBar()
-      InternalSetMenuBar__10wxFrameOS2Fv
-      ;wxFrameOS2::GetClient()
-      GetClient__10wxFrameOS2Fv
-      ;wxFrameOS2::AttachMenuBar(wxMenuBar*)
-      AttachMenuBar__10wxFrameOS2FP9wxMenuBar
-      ;wxFrameOS2::SetClient(wxWindow*)
-      SetClient__10wxFrameOS2FP8wxWindow
-      ;wxFrameOS2::ShowFullScreen(unsigned long,long)
-      ShowFullScreen__10wxFrameOS2FUll
-      ;wxFrameOS2::SetClient(unsigned long)
-      SetClient__10wxFrameOS2FUl
-      ;wxFrameOS2::IconizeChildFrames(unsigned long)
-      IconizeChildFrames__10wxFrameOS2FUl
+      ;wxFrame::SetIcon(const wxIcon&)
+      SetIcon__7wxFrameFRC6wxIcon
+      ;wxFrame::Restore()
+      Restore__7wxFrameFv
+      ;wxFrame::IsMaximized() const
+      IsMaximized__7wxFrameCFv
+      ;wxFrame::IsIconized() const
+      IsIconized__7wxFrameCFv
+      ;wxFrame::GetClientAreaOrigin() const
+      GetClientAreaOrigin__7wxFrameCFv
+      ;wxFrame::AttachMenuBar(wxMenuBar*)
+      AttachMenuBar__7wxFrameFP9wxMenuBar
+      ;wxFrame::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
+      Create__7wxFrameFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
+      ;wxFrame::OnSysColourChanged(wxSysColourChangedEvent&)
+      OnSysColourChanged__7wxFrameFR23wxSysColourChangedEvent
+      ;wxFrame::ShowFullScreen(unsigned long,long)
+      ShowFullScreen__7wxFrameFUll
+      ;wxFrame::DoShowWindow(int)
+      DoShowWindow__7wxFrameFi
+      ;wxFrame::sm_eventTable
+      sm_eventTable__7wxFrame
+      ;wxFrame::sm_eventTableEntries
+      sm_eventTableEntries__7wxFrame
       ;wxFrame::sm_classwxFrame
       sm_classwxFrame__7wxFrame
-      ;wxFrameOS2::GetEventTable() const
-      GetEventTable__10wxFrameOS2CFv
-      ;wxFrameOS2::SetMenuBar(wxMenuBar*)
-      SetMenuBar__10wxFrameOS2FP9wxMenuBar
-      ;wxFrameOS2::PositionStatusBar()
-      PositionStatusBar__10wxFrameOS2Fv
-      ;wxFrameOS2::OS2WindowProc(unsigned int,void*,void*)
-      OS2WindowProc__10wxFrameOS2FUiPvT2
-      ;wxFrameOS2::OS2TranslateMessage(void**)
-      OS2TranslateMessage__10wxFrameOS2FPPv
-      ;wxFrameOS2::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
-      Create__10wxFrameOS2FP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
-      ;wxFrameOS2::Show(unsigned long)
-      Show__10wxFrameOS2FUl
-      __vft10wxFrameOS28wxObject
-      ;wxFrameOS2::DoShowWindow(int)
-      DoShowWindow__10wxFrameOS2Fi
-      ;wxFrameOS2::Init()
-      Init__10wxFrameOS2Fv
-      ;wxFrameOS2::sm_eventTable
-      sm_eventTable__10wxFrameOS2
-      ;wxFrameOS2::DoGetPosition(int*,int*) const
-      DoGetPosition__10wxFrameOS2CFPiT1
-      ;wxFrameOS2::IsMaximized() const
-      IsMaximized__10wxFrameOS2CFv
-      ;wxFrameOS2::SetIcon(const wxIcon&)
-      SetIcon__10wxFrameOS2FRC6wxIcon
-      ;wxFrameOS2::PositionToolBar()
-      PositionToolBar__10wxFrameOS2Fv
-      ;wxFrameOS2::GetClientAreaOrigin() const
-      GetClientAreaOrigin__10wxFrameOS2CFv
-      ;wxFrameOS2::OnCreateStatusBar(int,long,int,const wxString&)
-      OnCreateStatusBar__10wxFrameOS2FilT1RC8wxString
-      wxFrameWndProc
+      ;wxFrame::m_bUseNativeStatusBar
+      m_bUseNativeStatusBar__7wxFrame
+      ;wxFrame::~wxFrame()
+      __dt__7wxFrameFv
+      ;wxFrame::GetClient()
+      GetClient__7wxFrameFv
+      ;wxFrame::OS2Create(int,wxWindow*,const char*,wxWindow*,const char*,int,int,int,int,long)
+      OS2Create__7wxFrameFiP8wxWindowPCcT2T3N41l
+      ;wxFrame::HandleCommand(unsigned short,unsigned short,unsigned long)
+      HandleCommand__7wxFrameFUsT1Ul
+      ;wxFrame::DoGetSize(int*,int*) const
+      DoGetSize__7wxFrameCFPiT1
+      ;wxFrame::DoGetPosition(int*,int*) const
+      DoGetPosition__7wxFrameCFPiT1
+      ;wxFrame::PositionStatusBar()
+      PositionStatusBar__7wxFrameFv
+      ;wxFrame::PositionToolBar()
+      PositionToolBar__7wxFrameFv
+      ;wxFrame::OS2WindowProc(unsigned int,void*,void*)
+      OS2WindowProc__7wxFrameFUiPvT2
+      ;wxFrame::InternalSetMenuBar()
+      InternalSetMenuBar__7wxFrameFv
+      ;wxFrame::CreateToolBar(long,int,const wxString&)
+      CreateToolBar__7wxFrameFliRC8wxString
+      ;wxFrame::Maximize(unsigned long)
+      Maximize__7wxFrameFUl
+      ;wxFrame::SetClient(unsigned long)
+      SetClient__7wxFrameFUl
+      ;wxFrame::IconizeChildFrames(unsigned long)
+      IconizeChildFrames__7wxFrameFUl
+      ;wxFrame::DoGetClientSize(int*,int*) const
+      DoGetClientSize__7wxFrameCFPiT1
+      ;wxFrame::Init()
+      Init__7wxFrameFv
+      ;wxFrame::SetMenuBar(wxMenuBar*)
+      SetMenuBar__7wxFrameFP9wxMenuBar
+      ;wxFrame::GetEventTable() const
+      GetEventTable__7wxFrameCFv
+      ;wxFrame::DetachMenuBar()
+      DetachMenuBar__7wxFrameFv
+      ;wxFrame::AlterChildPos()
+      AlterChildPos__7wxFrameFv
       wxFrameMainWndProc
+      wxFrameWndProc
+      ;wxFrame::SetClient(wxWindow*)
+      SetClient__7wxFrameFP8wxWindow
   ;From object file:  ..\os2\gauge.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft7wxGauge8wxObject
@@ -11993,6 +12172,7 @@ EXPORTS
       sm_classwxGauge__7wxGauge
       ;wxGauge::SetForegroundColour(const wxColour&)
       SetForegroundColour__7wxGaugeFRC8wxColour
+      wxGaugeWndProc
       ;wxConstructorForwxGauge()
       wxConstructorForwxGauge__Fv
       ;wxGauge::SetBackgroundColour(const wxColour&)
@@ -12001,16 +12181,16 @@ EXPORTS
       GetRange__7wxGaugeCFv
       ;wxGauge::Create(wxWindow*,int,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__7wxGaugeFP8wxWindowiT2RC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
+      ;wxGauge::SetBezelFace(int)
+      SetBezelFace__7wxGaugeFi
       ;wxGauge::SetShadowWidth(int)
       SetShadowWidth__7wxGaugeFi
       ;wxGauge::SetRange(int)
       SetRange__7wxGaugeFi
-      ;wxGauge::SetBezelFace(int)
-      SetBezelFace__7wxGaugeFi
-      ;wxGauge::GetShadowWidth() const
-      GetShadowWidth__7wxGaugeCFv
       ;wxGauge::GetValue() const
       GetValue__7wxGaugeCFv
+      ;wxGauge::GetShadowWidth() const
+      GetShadowWidth__7wxGaugeCFv
       ;wxGauge::GetBezelFace() const
       GetBezelFace__7wxGaugeCFv
   ;From object file:  ..\os2\gdiimage.cpp
@@ -12347,16 +12527,12 @@ EXPORTS
       DoSetItemClientData__9wxListBoxFiPv
       ;wxListBox::DoAppend(const wxString&)
       DoAppend__9wxListBoxFRC8wxString
-      ;wxListBox::SetHorizontalExtent(const wxString&)
-      SetHorizontalExtent__9wxListBoxFRC8wxString
       ;wxListBox::OS2Command(unsigned int,unsigned short)
       OS2Command__9wxListBoxFUiUs
       ;wxListBox::sm_classwxListBox
       sm_classwxListBox__9wxListBox
       ;wxListBox::DoSetFirstItem(int)
       DoSetFirstItem__9wxListBoxFi
-      ;wxListBox::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
-      OnCtlColor__9wxListBoxFUlT1UiT3PvT5
       ;wxListBox::IsSelected(int) const
       IsSelected__9wxListBoxCFi
       ;wxListBox::SetString(int,const wxString&)
@@ -12967,38 +13143,40 @@ EXPORTS
       sm_classwxPrinter__9wxPrinter
   ;From object file:  ..\os2\radiobox.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxRadioBox::Show(unsigned long)
-      Show__10wxRadioBoxFUl
       ;wxRadioBox::ContainsHWND(unsigned long) const
       ContainsHWND__10wxRadioBoxCFUl
+      ;wxRadioBox::Show(unsigned long)
+      Show__10wxRadioBoxFUl
       ;wxRadioBox::GetString(int) const
       GetString__10wxRadioBoxCFi
       ;wxRadioBox::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
       OnCtlColor__10wxRadioBoxFUlT1UiT3PvT5
-      ;wxRadioBox::GetSelection() const
-      GetSelection__10wxRadioBoxCFv
+      ;wxRadioBox::GetMaxButtonSize() const
+      GetMaxButtonSize__10wxRadioBoxCFv
       ;wxRadioBox::GetStringSelection() const
       GetStringSelection__10wxRadioBoxCFv
+      ;wxRadioBox::GetSelection() const
+      GetSelection__10wxRadioBoxCFv
+      ;wxRadioBox::DoGetBestSize() const
+      DoGetBestSize__10wxRadioBoxCFv
       ;wxRadioBox::SetStringSelection(const wxString&)
       SetStringSelection__10wxRadioBoxFRC8wxString
       ;wxRadioBox::Enable(int,unsigned long)
       Enable__10wxRadioBoxFiUl
       ;wxRadioBox::Enable(unsigned long)
       Enable__10wxRadioBoxFUl
-      ;wxRadioBox::GetLabel(int) const
-      GetLabel__10wxRadioBoxCFi
-      ;wxRadioBox::GetSize(int*,int*) const
-      GetSize__10wxRadioBoxCFPiT1
       ;wxRadioBox::GetPosition(int*,int*) const
       GetPosition__10wxRadioBoxCFPiT1
+      ;wxRadioBox::GetSize(int*,int*) const
+      GetSize__10wxRadioBoxCFPiT1
+      ;wxRadioBox::GetLabel(int) const
+      GetLabel__10wxRadioBoxCFi
       ;wxRadioBox::GetColumnCount() const
       GetColumnCount__10wxRadioBoxCFv
       ;wxRadioBox::SetFocus()
       SetFocus__10wxRadioBoxFv
       ;wxRadioBox::OS2Command(unsigned int,unsigned short)
       OS2Command__10wxRadioBoxFUiUs
-      ;wxRadioBox::SetLabel(int,wxBitmap*)
-      SetLabel__10wxRadioBoxFiP8wxBitmap
       ;wxRadioBox::SubclassRadioButton(unsigned long)
       SubclassRadioButton__10wxRadioBoxFUl
       __vft10wxRadioBox14wxRadioBoxBase
@@ -13014,31 +13192,36 @@ EXPORTS
       Create__10wxRadioBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizeT2PC8wxStringT2lRC11wxValidatorT3
       ;wxRadioBox::FindString(const wxString&) const
       FindString__10wxRadioBoxCFRC8wxString
+      __vft10wxRadioBox8wxObject
       ;wxRadioBox::sm_classwxRadioBox
       sm_classwxRadioBox__10wxRadioBox
-      __vft10wxRadioBox8wxObject
+      ;wxRadioBox::AdjustButtons(int,int,int,int,int)
+      AdjustButtons__10wxRadioBoxFiN41
       ;wxRadioBox::SetSelection(int)
       SetSelection__10wxRadioBoxFi
-      ;wxRadioBox::GetCount() const
-      GetCount__10wxRadioBoxCFv
       ;wxRadioBox::~wxRadioBox()
       __dt__10wxRadioBoxFv
       ;wxRadioBox::GetNumVer() const
       GetNumVer__10wxRadioBoxCFv
-      ;wxRadioBtnWndProc(unsigned long,unsigned int,void*,void*)
-      wxRadioBtnWndProc__FUlUiPvT3
-      ;wxRadioBox::Show(int,unsigned long)
-      Show__10wxRadioBoxFiUl
+      ;wxRadioBox::GetCount() const
+      GetCount__10wxRadioBoxCFv
       ;wxRadioBox::Command(wxCommandEvent&)
       Command__10wxRadioBoxFR14wxCommandEvent
+      ;wxRadioBox::Show(int,unsigned long)
+      Show__10wxRadioBoxFiUl
+      ;wxRadioBox::SetFont(const wxFont&)
+      SetFont__10wxRadioBoxFRC6wxFont
+      ;wxRadioBox::GetTotalButtonSize(const wxSize&) const
+      GetTotalButtonSize__10wxRadioBoxCFRC6wxSize
       ;wxRadioBox::DoSetSize(int,int,int,int,int)
       DoSetSize__10wxRadioBoxFiN41
       ;wxRadioBox::GetNumHor() const
       GetNumHor__10wxRadioBoxCFv
+      ;wxRadioBox::WindowProc(unsigned int,void*,void*)
+      WindowProc__10wxRadioBoxFUiPvT2
       ;wxRadioBox::SetString(int,const wxString&)
       SetString__10wxRadioBoxFiRC8wxString
-      ;wxRadioBox::SetLabel(int,const wxString&)
-      SetLabel__10wxRadioBoxFiRC8wxString
+      wxRadioBtnWndProc
   ;From object file:  ..\os2\radiobut.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxRadioButton::sm_classwxRadioButton
@@ -13068,6 +13251,8 @@ EXPORTS
       __pp__16wxRegionIteratorFv
       ;wxRegion::Combine(const wxRegion&,wxRegionOp)
       Combine__8wxRegionFRC8wxRegion10wxRegionOp
+      ;wxRegion::wxRegion(unsigned long,unsigned long)
+      __ct__8wxRegionFUlT1
       ;wxRegion::wxRegion(const wxPoint&,const wxPoint&)
       __ct__8wxRegionFRC7wxPointT1
       ;wxRegion::Contains(int,int) const
@@ -13117,11 +13302,9 @@ EXPORTS
       __ct__16wxRegionIteratorFRC8wxRegion
       ;wxRegionIterator::GetH() const
       GetH__16wxRegionIteratorCFv
-      ;wxRegion::wxRegion(unsigned long)
-      __ct__8wxRegionFUl
-      __vft16wxRegionIterator8wxObject
       ;wxRegion::SetPS(unsigned long)
       SetPS__8wxRegionFUl
+      __vft16wxRegionIterator8wxObject
       ;wxRegion::wxRegion(int,int,int,int)
       __ct__8wxRegionFiN31
       ;wxRegion::Empty() const
@@ -13172,6 +13355,8 @@ EXPORTS
       sm_optionNames__22wxSystemSettingsModule
       ;wxSystemSettingsModule::OnExit()
       OnExit__22wxSystemSettingsModuleFv
+      ;wxSystemSettings::GetCapability(int)
+      GetCapability__16wxSystemSettingsFi
       ;wxSystemSettingsModule::sm_optionValues
       sm_optionValues__22wxSystemSettingsModule
       ;wxConstructorForwxSystemSettingsModule()
@@ -13180,6 +13365,8 @@ EXPORTS
       GetSystemFont__16wxSystemSettingsFi
   ;From object file:  ..\os2\slider.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxSlider::DoSetSize(int,int,int,int,int)
+      DoSetSize__8wxSliderFiN41
       ;wxSlider::SetValue(int)
       SetValue__8wxSliderFi
       ;wxSlider::SetTick(int)
@@ -13190,8 +13377,6 @@ EXPORTS
       SetPageSize__8wxSliderFi
       ;wxSlider::SetLineSize(int)
       SetLineSize__8wxSliderFi
-      ;wxSlider::DoSetSize(int,int,int,int,int)
-      DoSetSize__8wxSliderFiN41
       ;wxSlider::GetValue() const
       GetValue__8wxSliderCFv
       ;wxSlider::ContainsHWND(unsigned long) const
@@ -13215,6 +13400,8 @@ EXPORTS
       ;wxSlider::Create(wxWindow*,int,int,int,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__8wxSliderFP8wxWindowiN32RC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       __vft8wxSlider8wxObject
+      ;wxSlider::AdjustSubControls(int,int,int,int,int)
+      AdjustSubControls__8wxSliderFiN41
       ;wxSlider::SetRange(int,int)
       SetRange__8wxSliderFiT1
       ;wxSlider::~wxSlider()
@@ -13231,10 +13418,10 @@ EXPORTS
       ClearSel__8wxSliderFv
       ;wxSlider::GetLineSize() const
       GetLineSize__8wxSliderCFv
-      ;wxSlider::OS2OnScroll(int,unsigned short,unsigned short,unsigned long)
-      OS2OnScroll__8wxSliderFiUsT2Ul
       ;wxSlider::Command(wxCommandEvent&)
       Command__8wxSliderFR14wxCommandEvent
+      ;wxSlider::OS2OnScroll(int,unsigned short,unsigned short,unsigned long)
+      OS2OnScroll__8wxSliderFiUsT2Ul
       ;wxSlider::SetSelection(int,int)
       SetSelection__8wxSliderFiT1
       ;wxSlider::sm_classwxSlider
@@ -13249,13 +13436,11 @@ EXPORTS
       sm_classwxSpinButton__12wxSpinButton
       ;wxSpinButton::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__12wxSpinButtonFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
-      ;wxSpinButton::OS2OnNotify(int,void*,void**)
-      OS2OnNotify__12wxSpinButtonFiPvPPv
       __vft12wxSpinButton8wxObject
-      ;wxSpinButton::SetValue(int)
-      SetValue__12wxSpinButtonFi
       ;wxSpinButton::SetRange(int,int)
       SetRange__12wxSpinButtonFiT1
+      ;wxSpinButton::SetValue(int)
+      SetValue__12wxSpinButtonFi
       ;wxConstructorForwxSpinEvent()
       wxConstructorForwxSpinEvent__Fv
       ;wxConstructorForwxSpinButton()
@@ -13270,27 +13455,44 @@ EXPORTS
       OS2Command__12wxSpinButtonFUiUs
   ;From object file:  ..\os2\spinctrl.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxSpinCtrl::GetSpinForTextCtrl(unsigned long)
+      GetSpinForTextCtrl__10wxSpinCtrlFUl
+      __vft10wxSpinCtrl8wxObject
       ;wxSpinCtrl::SetFont(const wxFont&)
       SetFont__10wxSpinCtrlFRC6wxFont
-      __vft10wxSpinCtrl8wxObject
+      ;wxSpinCtrl::SetFocus()
+      SetFocus__10wxSpinCtrlFv
       ;wxSpinCtrl::SetValue(const wxString&)
       SetValue__10wxSpinCtrlFRC8wxString
       ;wxSpinCtrl::sm_classwxSpinCtrl
       sm_classwxSpinCtrl__10wxSpinCtrl
+      ;wxSpinCtrl::m_svAllSpins
+      m_svAllSpins__10wxSpinCtrl
+      ;wxSpinCtrl::DoGetPosition(int*,int*) const
+      DoGetPosition__10wxSpinCtrlCFPiT1
       ;wxSpinCtrl::DoMoveWindow(int,int,int,int)
       DoMoveWindow__10wxSpinCtrlFiN31
-      ;wxSpinCtrl::Show(unsigned long)
-      Show__10wxSpinCtrlFUl
+      wxSpinCtrlWndProc
+      ;wxSpinCtrl::OnChar(wxKeyEvent&)
+      OnChar__10wxSpinCtrlFR10wxKeyEvent
       ;wxSpinCtrl::sm_eventTable
       sm_eventTable__10wxSpinCtrl
       ;wxSpinCtrl::sm_eventTableEntries
       sm_eventTableEntries__10wxSpinCtrl
+      ;wxSpinCtrl::Show(unsigned long)
+      Show__10wxSpinCtrlFUl
       ;wxSpinCtrl::OnSpinChange(wxSpinEvent&)
       OnSpinChange__10wxSpinCtrlFR11wxSpinEvent
+      ;wxSpinCtrl::DoGetSize(int*,int*) const
+      DoGetSize__10wxSpinCtrlCFPiT1
+      ;wxSpinCtrl::~wxSpinCtrl()
+      __dt__10wxSpinCtrlFv
       ;wxSpinCtrl::DoGetBestSize() const
       DoGetBestSize__10wxSpinCtrlCFv
       ;wxSpinCtrl::Enable(unsigned long)
       Enable__10wxSpinCtrlFUl
+      ;wxSpinCtrl::ProcessTextCommand(unsigned short,unsigned short)
+      ProcessTextCommand__10wxSpinCtrlFUsT1
       ;wxSpinCtrl::GetEventTable() const
       GetEventTable__10wxSpinCtrlCFv
       ;wxSpinCtrl::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,int,int,int,const wxString&)
@@ -13316,31 +13518,25 @@ EXPORTS
       ImageIsOk__14wxStaticBitmapCFv
       ;wxStaticBitmap::DoGetBestSize() const
       DoGetBestSize__14wxStaticBitmapCFv
+      ;wxStaticBitmap::OS2WindowProc(unsigned int,void*,void*)
+      OS2WindowProc__14wxStaticBitmapFUiPvT2
   ;From object file:  ..\os2\statbox.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxStaticBox::OnEraseBackground(wxEraseEvent&)
-      OnEraseBackground__11wxStaticBoxFR12wxEraseEvent
       ;wxConstructorForwxStaticBox()
       wxConstructorForwxStaticBox__Fv
-      ;wxStaticBox::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
-      OnCtlColor__11wxStaticBoxFUlT1UiT3PvT5
-      ;wxStaticBox::GetEventTable() const
-      GetEventTable__11wxStaticBoxCFv
-      ;wxStaticBox::OS2WindowProc(unsigned int,void*,void*)
-      OS2WindowProc__11wxStaticBoxFUiPvT2
       ;wxStaticBox::DoGetBestSize() const
       DoGetBestSize__11wxStaticBoxCFv
+      ;wxStaticBox::OS2WindowProc(unsigned int,void*,void*)
+      OS2WindowProc__11wxStaticBoxFUiPvT2
       ;wxStaticBox::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       Create__11wxStaticBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
       ;wxStaticBox::sm_classwxStaticBox
       sm_classwxStaticBox__11wxStaticBox
-      ;wxStaticBox::sm_eventTable
-      sm_eventTable__11wxStaticBox
       __vft11wxStaticBox8wxObject
-      ;wxStaticBox::sm_eventTableEntries
-      sm_eventTableEntries__11wxStaticBox
   ;From object file:  ..\os2\stattext.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxStaticText::DoSetSize(int,int,int,int,int)
+      DoSetSize__12wxStaticTextFiN41
       ;wxStaticText::OS2WindowProc(unsigned int,void*,void*)
       OS2WindowProc__12wxStaticTextFUiPvT2
       ;wxStaticText::SetLabel(const wxString&)
@@ -13896,6 +14092,8 @@ EXPORTS
       wxUsleep__FUl
       ;wxPMErrorToStr(unsigned long)
       wxPMErrorToStr__FUl
+      ;wxOS2SetFont(unsigned long,const wxFont&)
+      wxOS2SetFont__FUlRC6wxFont
       ;wxGetHostName(char*,int)
       wxGetHostName__FPci
       ;wxGetResource(const wxString&,const wxString&,int*,const wxString&)
@@ -14028,10 +14226,8 @@ EXPORTS
       OS2OnMeasureItem__8wxWindowFiPPv
       ;wxWindow::OS2DestroyWindow()
       OS2DestroyWindow__8wxWindowFv
-      ;wxWindow::HandleWindowParams(_WNDPARAMS*,void*)
-      HandleWindowParams__8wxWindowFP10_WNDPARAMSPv
-      ;wxWindow::HandlePresParamChanged(void*)
-      HandlePresParamChanged__8wxWindowFPv
+      ;wxWindow::HandleKeyUp(unsigned long,void*)
+      HandleKeyUp__8wxWindowFUlPv
       ;wxWindow::HandleKeyDown(unsigned short,void*)
       HandleKeyDown__8wxWindowFUsPv
       ;wxWindow::Clear()
@@ -14068,8 +14264,6 @@ EXPORTS
       HandleSysCommand__8wxWindowFPvT1
       ;wxWindow::HandleSize(int,int,unsigned int)
       HandleSize__8wxWindowFiT1Ui
-      ;wxWindow::AdjustForParentClientOrigin(int&,int&,int)
-      AdjustForParentClientOrigin__8wxWindowFRiT1i
       ;wxWindow::Init()
       Init__8wxWindowFv
       ;wxGetMousePosition()
@@ -14097,6 +14291,8 @@ EXPORTS
       ;wxAssociateWinWithHandle(unsigned long,wxWindow*)
       wxAssociateWinWithHandle__FUlP8wxWindow
       s_currentMsg
+      ;wxWindow::GetOS2ParentHeight(wxWindow*)
+      GetOS2ParentHeight__8wxWindowFP8wxWindow
       ;wxWindow::Refresh(unsigned long,const wxRect*)
       Refresh__8wxWindowFUlPC6wxRect
       ;wxWindow::SetScrollbar(int,int,int,int,unsigned long)
@@ -14122,6 +14318,8 @@ EXPORTS
       ;wxWindow::WarpPointer(int,int)
       WarpPointer__8wxWindowFiT1
       wxCurrentPopupMenu
+      ;wxWindow::MoveChildren(int)
+      MoveChildren__8wxWindowFi
       ;wxWindow::HandleShow(unsigned long,int)
       HandleShow__8wxWindowFUli
       ;wxWindow::HandleMove(int,int)
@@ -14170,14 +14368,14 @@ EXPORTS
       ScrollWindow__8wxWindowFiT1PC6wxRect
       ;wxWindow::OnIdle(wxIdleEvent&)
       OnIdle__8wxWindowFR11wxIdleEvent
-      ;wxWindow::HandleChar(unsigned short,void*,unsigned long)
-      HandleChar__8wxWindowFUsPvUl
       ;wxWindow::HandleActivate(int,unsigned long)
       HandleActivate__8wxWindowFiUl
       ;wxWindow::FindItemByHWND(unsigned long,unsigned long) const
       FindItemByHWND__8wxWindowCFUlT1
       ;wxWindow::OS2Create(unsigned long,char*,const char*,unsigned long,long,long,long,long,unsigned long,unsigned long,unsigned long,void*,void*,unsigned long)
       OS2Create__8wxWindowFUlPcPCcT1lN35N31PvT12_T1
+      ;wxWindow::HandleChar(unsigned long,void*,unsigned long)
+      HandleChar__8wxWindowFUlPvT1
       ;wxWindow::DoMoveWindow(int,int,int,int)
       DoMoveWindow__8wxWindowFiN31
       ;wxWindow::DoClientToScreen(int*,int*) const
@@ -14186,8 +14384,6 @@ EXPORTS
       OS2DetachWindowMenu__8wxWindowFv
       ;wxWindow::OS2OnDrawItem(int,void**)
       OS2OnDrawItem__8wxWindowFiPPv
-      ;wxWindow::HandleKeyUp(unsigned short,void*)
-      HandleKeyUp__8wxWindowFUsPv
       ;wxWindow::GetCharWidth() const
       GetCharWidth__8wxWindowCFv
       ;wxWindowBase::FindFocus()
