implemented Alex's <object_ref> symlinks in XRC

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

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index b3978ffedd4f400052b53680c86ecc28242b7626..8db2495a9a9ae878c737971c78cfcd687d30b5ae 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -120,6 +120,8 @@ EXPORTS
       __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&)
@@ -130,12 +132,12 @@ EXPORTS
       __dt__14wxArrayOptionsFv
       ;wxCmdLineParser::Usage()
       Usage__15wxCmdLineParserFv
-      ;wxCmdLineParser::Parse()
-      Parse__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
@@ -291,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*)
@@ -317,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()
@@ -333,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
@@ -759,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()
@@ -783,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)
@@ -803,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)
@@ -870,8 +888,29 @@ EXPORTS
       CreateButtonSizer__12wxDialogBaseFl
       ;wxDialogBase::Init()
       Init__12wxDialogBaseFv
+      ;wxDialogBase::GetDefaultItem() const
+      GetDefaultItem__12wxDialogBaseCFv
+      ;wxDialogBase::SetDefaultItem(wxWindow*)
+      SetDefaultItem__12wxDialogBaseFP8wxWindow
       ;wxDialogBase::CreateTextSizer(const wxString&)
       CreateTextSizer__12wxDialogBaseFRC8wxString
+      ;wxDialogBase::OnFocus(wxFocusEvent&)
+      OnFocus__12wxDialogBaseFR12wxFocusEvent
+      ;wxDialogBase::sm_eventTableEntries
+      sm_eventTableEntries__12wxDialogBase
+      ;wxDialogBase::SetFocus()
+      SetFocus__12wxDialogBaseFv
+      ;wxDialogBase::OnChildFocus(wxChildFocusEvent&)
+      OnChildFocus__12wxDialogBaseFR17wxChildFocusEvent
+      __vft12wxDialogBase8wxObject
+      ;wxDialogBase::sm_eventTable
+      sm_eventTable__12wxDialogBase
+      ;wxDialogBase::OnNavigationKey(wxNavigationKeyEvent&)
+      OnNavigationKey__12wxDialogBaseFR20wxNavigationKeyEvent
+      ;wxDialogBase::RemoveChild(wxWindowBase*)
+      RemoveChild__12wxDialogBaseFP12wxWindowBase
+      ;wxDialogBase::GetEventTable() const
+      GetEventTable__12wxDialogBaseCFv
   ;From object file:  ..\common\dobjcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDataObjectComposite::GetDataSize(const wxDataFormat&) const
@@ -928,6 +967,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
@@ -1188,12 +1229,16 @@ EXPORTS
       OnFileSave__12wxDocManagerFR14wxCommandEvent
       ;wxDocManager::OnFileNew(wxCommandEvent&)
       OnFileNew__12wxDocManagerFR14wxCommandEvent
+      ;wxDocManager::OnFileCloseAll(wxCommandEvent&)
+      OnFileCloseAll__12wxDocManagerFR14wxCommandEvent
       ;wxDocTemplate::CreateView(wxDocument*,long)
       CreateView__13wxDocTemplateFP10wxDocumentl
       ;wxDocManager::CreateView(wxDocument*,long)
       CreateView__12wxDocManagerFP10wxDocumentl
       ;wxDocTemplate::CreateDocument(const wxString&,long)
       CreateDocument__13wxDocTemplateFRC8wxStringl
+      ;wxDocManager::CloseDocuments(unsigned long)
+      CloseDocuments__12wxDocManagerFUl
       ;wxDocManager::AssociateTemplate(wxDocTemplate*)
       AssociateTemplate__12wxDocManagerFP13wxDocTemplate
       ;wxTransferFileToStream(const wxString&,ostream&)
@@ -1282,6 +1327,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)
@@ -1326,8 +1376,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()
@@ -1344,12 +1392,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
@@ -1793,10 +1844,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
@@ -1805,8 +1852,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()
@@ -1831,14 +1876,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::Flush(unsigned long)
-      Flush__12wxFileConfigFUl
+      ;wxFileConfig::DoReadLong(const wxString&,long*) const
+      DoReadLong__12wxFileConfigCFRC8wxStringPl
       ;wxFileConfig::LineListInsert(const wxString&,wxFileConfigLineList*)
       LineListInsert__12wxFileConfigFRC8wxStringP20wxFileConfigLineList
-      ;wxFileConfig::Read(const wxString&,wxString*,const wxString&) const
-      Read__12wxFileConfigCFRC8wxStringP8wxStringT1
+      ;wxFileConfig::Flush(unsigned long)
+      Flush__12wxFileConfigFUl
+      ;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()
@@ -1870,8 +1921,6 @@ 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)
@@ -1994,12 +2043,12 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxFileName::Assign(const wxString&,wxPathFormat)
       Assign__10wxFileNameFRC8wxString12wxPathFormat
+      ;wxFileName::SetPath(const wxString&,wxPathFormat)
+      SetPath__10wxFileNameFRC8wxString12wxPathFormat
       ;wxFileName::Normalize(wxPathNormalize,const wxString&,wxPathFormat)
       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()
@@ -2010,8 +2059,6 @@ EXPORTS
       GetFullName__10wxFileNameCFv
       ;wxFileName::AssignHomeDir()
       AssignHomeDir__10wxFileNameFv
-      ;wxFileName::AssignCwd()
-      AssignCwd__10wxFileNameFv
       ;wxFileName::PrependDir(const wxString&)
       PrependDir__10wxFileNameFRC8wxString
       ;wxFileName::GetPathSeparators(wxPathFormat)
@@ -2020,8 +2067,6 @@ EXPORTS
       Mkdir__10wxFileNameFRC8wxStringiUl
       ;wxFileName::IsPathSeparator(char,wxPathFormat)
       IsPathSeparator__10wxFileNameFc12wxPathFormat
-      ;wxFileName::IsAbsolute(wxPathFormat)
-      IsAbsolute__10wxFileNameF12wxPathFormat
       ;wxFileName::GetFullPath(wxPathFormat) const
       GetFullPath__10wxFileNameCF12wxPathFormat
       ;wxFileName::Touch()
@@ -2032,8 +2077,16 @@ EXPORTS
       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)
@@ -2048,10 +2101,14 @@ 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()
@@ -2072,16 +2129,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
@@ -2142,31 +2199,37 @@ EXPORTS
       New__10wxFontBaseFRC16wxNativeFontInfo
       ;wxFontBase::New(const wxString&)
       New__10wxFontBaseFRC8wxString
-      ;wxNativeFontInfo::FromString(const wxString&)
-      FromString__16wxNativeFontInfoFRC8wxString
       ;wxFont::operator=(const wxFont&)
       __as__6wxFontFRC6wxFont
       ;wxFontBase::GetNativeFontInfoDesc() const
       GetNativeFontInfoDesc__10wxFontBaseCFv
+      ;wxNativeFontInfo::ToUserString() const
+      ToUserString__16wxNativeFontInfoCFv
       ;wxFontBase::GetWeightString() const
       GetWeightString__10wxFontBaseCFv
       ;wxFontBase::GetStyleString() const
       GetStyleString__10wxFontBaseCFv
+      ;wxFontBase::GetNativeFontInfoUserDesc() const
+      GetNativeFontInfoUserDesc__10wxFontBaseCFv
       ;wxFontBase::SetNativeFontInfo(const wxNativeFontInfo&)
       SetNativeFontInfo__10wxFontBaseFRC16wxNativeFontInfo
+      ;wxFontBase::SetNativeFontInfoUserDesc(const wxString&)
+      SetNativeFontInfoUserDesc__10wxFontBaseFRC8wxString
       ;wxFontBase::ms_encodingDefault
       ms_encodingDefault__10wxFontBase
+      ;wxFontBase::SetNativeFontInfo(const wxString&)
+      SetNativeFontInfo__10wxFontBaseFRC8wxString
       ;wxFontBase::operator==(const wxFont&) const
       __eq__10wxFontBaseCFRC6wxFont
       __vft10wxFontBase8wxObject
       ;wxFontBase::operator!=(const wxFont&) const
       __ne__10wxFontBaseCFRC6wxFont
-      ;wxNativeFontInfo::ToString() const
-      ToString__16wxNativeFontInfoCFv
       ;wxFontBase::GetFamilyString() const
       GetFamilyString__10wxFontBaseCFv
       ;wxFontBase::New(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       New__10wxFontBaseFiN31UlRC8wxString14wxFontEncoding
+      ;wxNativeFontInfo::FromUserString(const wxString&)
+      FromUserString__16wxNativeFontInfoFRC8wxString
   ;From object file:  ..\common\fontmap.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxFontMapper::GetConfig()
@@ -2684,6 +2747,8 @@ EXPORTS
       __ct__6wxHTTPFv
       ;wxHTTP::SendHeaders()
       SendHeaders__6wxHTTPFv
+      ;wxHTTP::ClearHeaders()
+      ClearHeaders__6wxHTTPFv
       ;wxHTTP::GetHeader(const wxString&)
       GetHeader__6wxHTTPFRC8wxString
       ;wxHTTP::Connect(const wxString&)
@@ -2724,13 +2789,20 @@ EXPORTS
       DoLoadDib__12wxBMPHandlerFP7wxImageiN42lR13wxInputStreamUlN29
       ;wxBMPHandler::sm_classwxBMPHandler
       sm_classwxBMPHandler__12wxBMPHandler
+      ;wxICOHandler::sm_classwxICOHandler
+      sm_classwxICOHandler__12wxICOHandler
+      ;wxCURHandler::sm_classwxCURHandler
+      sm_classwxCURHandler__12wxCURHandler
       __vft12wxICOHandler8wxObject
+      __vft12wxCURHandler8wxObject
       ;wxBMPHandler::LoadDib(wxImage*,wxInputStream&,unsigned long,unsigned long)
       LoadDib__12wxBMPHandlerFP7wxImageR13wxInputStreamUlT3
       ;wxBMPHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__12wxBMPHandlerFP7wxImageR14wxOutputStreamUl
       ;wxConstructorForwxBMPHandler()
       wxConstructorForwxBMPHandler__Fv
+      ;wxConstructorForwxCURHandler()
+      wxConstructorForwxCURHandler__Fv
       ;wxICOHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__12wxICOHandlerFP7wxImageR14wxOutputStreamUl
       ;wxBMPHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
@@ -2739,9 +2811,17 @@ EXPORTS
       LoadFile__12wxICOHandlerFP7wxImageR13wxInputStreamUli
       ;wxICOHandler::DoCanRead(wxInputStream&)
       DoCanRead__12wxICOHandlerFR13wxInputStream
+      ;wxCURHandler::DoCanRead(wxInputStream&)
+      DoCanRead__12wxCURHandlerFR13wxInputStream
       ;wxBMPHandler::DoCanRead(wxInputStream&)
       DoCanRead__12wxBMPHandlerFR13wxInputStream
+      ;wxBMPHandler::SaveDib(wxImage*,wxOutputStream&,unsigned long,unsigned long,unsigned long)
+      SaveDib__12wxBMPHandlerFP7wxImageR14wxOutputStreamUlN23
       __vft12wxBMPHandler8wxObject
+      ;wxICOHandler::GetImageCount(wxInputStream&)
+      GetImageCount__12wxICOHandlerFR13wxInputStream
+      ;wxConstructorForwxICOHandler()
+      wxConstructorForwxICOHandler__Fv
   ;From object file:  ..\common\image.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxImage::wxImage(int,int,unsigned char*,unsigned long)
@@ -2787,18 +2867,22 @@ EXPORTS
       ;wxImage::Mirror(unsigned long) const
       Mirror__7wxImageCFUl
       __vft14wxImageHandler8wxObject
-      ;wxImage::LoadFile(const wxString&,long)
-      LoadFile__7wxImageFRC8wxStringl
+      ;wxImage::GetImageCount(wxInputStream&,long)
+      GetImageCount__7wxImageFR13wxInputStreaml
       ;wxImage::Scale(int,int) const
       Scale__7wxImageCFiT1
       ;wxImage::sm_handlers
       sm_handlers__7wxImage
       ;wxImage::wxImage(const wxImage&)
       __ct__7wxImageFRC7wxImage
+      ;wxImage::wxImage(wxInputStream&,const wxString&,int)
+      __ct__7wxImageFR13wxInputStreamRC8wxStringi
       ;wxImage::SetPalette(const wxPalette&)
       SetPalette__7wxImageFRC9wxPalette
       ;wxImage::SaveFile(wxOutputStream&,int)
       SaveFile__7wxImageFR14wxOutputStreami
+      ;wxImage::LoadFile(const wxString&,long,int)
+      LoadFile__7wxImageFRC8wxStringli
       ;wxImageHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__14wxImageHandlerFP7wxImageR13wxInputStreamUli
       ;wxImageRefData::~wxImageRefData()
@@ -2811,22 +2895,20 @@ EXPORTS
       SetRGB__7wxImageFiT1UcN23
       ;wxImage::SaveFile(wxOutputStream&,const wxString&)
       SaveFile__7wxImageFR14wxOutputStreamRC8wxString
-      ;wxImage::LoadFile(wxInputStream&,const wxString&)
-      LoadFile__7wxImageFR13wxInputStreamRC8wxString
       ;wxImage::CanRead(const wxString&)
       CanRead__7wxImageFRC8wxString
+      ;wxImage::GetImageCount(const wxString&,long)
+      GetImageCount__7wxImageFRC8wxStringl
+      __vft7wxImage8wxObject
       ;wxImage::Rotate(double,const wxPoint&,unsigned long,wxPoint*) const
       Rotate__7wxImageCFdRC7wxPointUlP7wxPoint
-      __vft7wxImage8wxObject
-      ;wxImage::wxImage(const wxString&,const wxString&)
-      __ct__7wxImageFRC8wxStringT1
+      ;wxImage::Replace(unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char)
+      Replace__7wxImageFUcN51
       wxNullImage
       ;wxImage::SaveFile(const wxString&,int)
       SaveFile__7wxImageFRC8wxStringi
-      ;wxImage::Replace(unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char)
-      Replace__7wxImageFUcN51
-      ;wxImage::LoadFile(const wxString&,const wxString&)
-      LoadFile__7wxImageFRC8wxStringT1
+      ;wxImage::LoadFile(const wxString&,const wxString&,int)
+      LoadFile__7wxImageFRC8wxStringT1i
       ;wxImageRefData::wxImageRefData()
       __ct__14wxImageRefDataFv
       ;wxConstructorForwxImageModule()
@@ -2849,8 +2931,6 @@ EXPORTS
       FindHandler__7wxImageFRC8wxString
       ;wxImage::Create(int,int,unsigned char*,unsigned long)
       Create__7wxImageFiT1PUcUl
-      ;wxImage::wxImage(wxInputStream&,long)
-      __ct__7wxImageFR13wxInputStreaml
       ;wxImage::SetMask(unsigned long)
       SetMask__7wxImageFUl
       ;wxImage::Rotate90(unsigned long) const
@@ -2860,6 +2940,8 @@ EXPORTS
       ;wxImage::Create(int,int)
       Create__7wxImageFiT1
       __vft14wxImageRefData15wxObjectRefData
+      ;wxImage::wxImage(const wxString&,const wxString&,int)
+      __ct__7wxImageFRC8wxStringT1i
       ;wxImage::wxImage(const wxImage*)
       __ct__7wxImageFPC7wxImage
       ;wxImage::SetOption(const wxString&,const wxString&)
@@ -2882,22 +2964,26 @@ EXPORTS
       CleanUpHandlers__7wxImageFv
       ;wxImageHandler::CanRead(const wxString&)
       CanRead__14wxImageHandlerFRC8wxString
-      ;wxImage::wxImage(const wxString&,long)
-      __ct__7wxImageFRC8wxStringl
-      ;wxImage::wxImage(const wxBitmap&)
-      __ct__7wxImageFRC8wxBitmap
       ;wxImageHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__14wxImageHandlerFP7wxImageR14wxOutputStreamUl
-      ;wxImage::LoadFile(wxInputStream&,long)
-      LoadFile__7wxImageFR13wxInputStreaml
-      ;wxImage::GetBlue(int,int) const
-      GetBlue__7wxImageCFiT1
+      ;wxImage::wxImage(const wxBitmap&)
+      __ct__7wxImageFRC8wxBitmap
+      ;wxImage::wxImage(const wxString&,long,int)
+      __ct__7wxImageFRC8wxStringli
       ;wxImage::sm_classwxImage
       sm_classwxImage__7wxImage
+      ;wxImage::wxImage(wxInputStream&,long,int)
+      __ct__7wxImageFR13wxInputStreamli
       ;wxImage::SetOption(const wxString&,int)
       SetOption__7wxImageFRC8wxStringi
       ;wxImage::SaveFile(const wxString&,const wxString&)
       SaveFile__7wxImageFRC8wxStringT1
+      ;wxImage::LoadFile(wxInputStream&,long,int)
+      LoadFile__7wxImageFR13wxInputStreamli
+      ;wxImage::LoadFile(wxInputStream&,const wxString&,int)
+      LoadFile__7wxImageFR13wxInputStreamRC8wxStringi
+      ;wxImage::GetBlue(int,int) const
+      GetBlue__7wxImageCFiT1
       ;wxImage::ComputeHistogram(wxHashTable&)
       ComputeHistogram__7wxImageFR11wxHashTable
       ;wxImage::CanRead(wxInputStream&)
@@ -2908,8 +2994,6 @@ EXPORTS
       sm_classwxImageHandler__14wxImageHandler
       ;wxImage::AddHandler(wxImageHandler*)
       AddHandler__7wxImageFP14wxImageHandler
-      ;wxImage::wxImage(wxInputStream&,const wxString&)
-      __ct__7wxImageFR13wxInputStreamRC8wxString
       ;wxImage::HasOption(const wxString&) const
       HasOption__7wxImageCFRC8wxString
   ;From object file:  ..\common\imaggif.cpp
@@ -3346,14 +3430,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
@@ -3364,12 +3470,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)
@@ -3380,6 +3494,8 @@ EXPORTS
       __mm__12wxLongLongWxFv
       ;wxLongLongWx::asArray() const
       asArray__12wxLongLongWxCFv
+      ;wxULongLongWx::operator++()
+      __pp__13wxULongLongWxFv
       ;wxLongLongWx::operator-() const
       __mi__12wxLongLongWxCFv
       ;wxLongLongWx::operator~() const
@@ -3388,28 +3504,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&)
@@ -3779,6 +3923,8 @@ EXPORTS
       InitializeModules__8wxModuleFv
       ;wxModule::m_modules
       m_modules__8wxModule
+      ;wxModule::UnregisterModule(wxModule*)
+      UnregisterModule__8wxModuleFP8wxModule
       ;wxModule::CleanUpModules()
       CleanUpModules__8wxModuleFv
       ;wxModule::RegisterModule(wxModule*)
@@ -3835,40 +3981,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
-      ;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
@@ -3879,48 +4004,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):
@@ -4372,6 +4457,8 @@ EXPORTS
       Service__13wxIPV4addressFUs
       ;wxIPV4address::Service(const wxString&)
       Service__13wxIPV4addressFRC8wxString
+      ;wxIPV4address::wxIPV4address(const wxIPV4address&)
+      __ct__13wxIPV4addressFRC13wxIPV4address
       ;wxIPV4address::Hostname(unsigned long)
       Hostname__13wxIPV4addressFUl
       ;wxSockAddress::~wxSockAddress()
@@ -4388,8 +4475,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
@@ -4507,30 +4594,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*)
@@ -4822,8 +4885,6 @@ EXPORTS
     ;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&)
@@ -4889,11 +4950,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&)
@@ -4904,8 +4967,6 @@ EXPORTS
       TellO__22wxBufferedOutputStreamCFv
       ;wxInputStream::TellI() const
       TellI__13wxInputStreamCFv
-      ;wxStreamBuffer::SetError(wxStreamError)
-      SetError__14wxStreamBufferF13wxStreamError
       ;wxInputStream::Peek()
       Peek__13wxInputStreamFv
       ;wxCountingOutputStream::OnSysTell() const
@@ -4928,10 +4989,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*)
@@ -4968,8 +5029,6 @@ EXPORTS
       GetInputStream__14wxStreamBufferCFv
       ;wxStreamBuffer::PutChar(char)
       PutChar__14wxStreamBufferFc
-      ;wxInputStream::operator>>(wxObject*&)
-      __rs__13wxInputStreamFRP8wxObject
       ;wxInputStream::Read(wxOutputStream&)
       Read__13wxInputStreamFR14wxOutputStream
       __vft22wxCountingOutputStream12wxStreamBase
@@ -5077,6 +5136,8 @@ EXPORTS
       Upper__8wxStringCFv
       ;wxString::IsNumber() const
       IsNumber__8wxStringCFv
+      ;wxArrayString::GetStringArray() const
+      GetStringArray__13wxArrayStringCFv
       ;wxArrayString::Empty()
       Empty__13wxArrayStringFv
       ;wxArrayString::Copy(const wxArrayString&)
@@ -5380,6 +5441,8 @@ 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
@@ -5446,12 +5509,14 @@ EXPORTS
       SendIconizeEvent__20wxTopLevelWindowBaseFUl
       ;wxTopLevelWindowBase::sm_eventTable
       sm_eventTable__20wxTopLevelWindowBase
+      ;wxConstructorForwxTopLevelWindow()
+      wxConstructorForwxTopLevelWindow__Fv
       ;wxTopLevelWindowBase::DoClientToScreen(int*,int*) const
       DoClientToScreen__20wxTopLevelWindowBaseCFPiT1
-      ;wxTopLevelWindowBase::GetEventTable() const
-      GetEventTable__20wxTopLevelWindowBaseCFv
       ;wxTopLevelWindowBase::wxTopLevelWindowBase()
       __ct__20wxTopLevelWindowBaseFv
+      ;wxTopLevelWindowBase::GetEventTable() const
+      GetEventTable__20wxTopLevelWindowBaseCFv
       ;wxTopLevelWindowBase::OnSize(wxSizeEvent&)
       OnSize__20wxTopLevelWindowBaseFR11wxSizeEvent
       __vft20wxTopLevelWindowBase8wxObject
@@ -5463,6 +5528,8 @@ EXPORTS
       DoScreenToClient__20wxTopLevelWindowBaseCFPiT1
       ;wxTopLevelWindowBase::Destroy()
       Destroy__20wxTopLevelWindowBaseFv
+      ;wxTopLevelWindow::sm_classwxTopLevelWindow
+      sm_classwxTopLevelWindow__16wxTopLevelWindow
   ;From object file:  ..\common\treebase.cpp
     ;PUBDEFs (Symbols available from object file):
       wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT
@@ -5684,6 +5751,8 @@ EXPORTS
       wxGetHomeDir__Fv
       ;wxGetFullHostName()
       wxGetFullHostName__Fv
+      ;wxGetDataDir()
+      wxGetDataDir__Fv
       ;wxFindWindowByName(const wxString&,wxWindow*)
       wxFindWindowByName__FRC8wxStringP8wxWindow
       ;StringToDouble(const char*,double*)
@@ -7122,8 +7191,8 @@ EXPORTS
       ms_PSScaleFactor__14wxPostScriptDC
   ;From object file:  ..\generic\dirctrlg.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxGenericDirDialog::OnOK(wxCommandEvent&)
-      OnOK__18wxGenericDirDialogFR14wxCommandEvent
+      ;wxDirItemData::wxDirItemData(const wxString&,const wxString&,unsigned long)
+      __ct__13wxDirItemDataFRC8wxStringT1Ul
       ;wxGenericDirCtrl::sm_eventTableEntries
       sm_eventTableEntries__16wxGenericDirCtrl
       ;wxGenericDirCtrl::sm_classwxGenericDirCtrl
@@ -7132,8 +7201,6 @@ EXPORTS
       sm_classwxDirFilterListCtrl__19wxDirFilterListCtrl
       __vft19wxDirFilterListCtrl8wxObject
       __vft16wxGenericDirCtrl8wxObject
-      ;wxGenericDirDialog::OnTreeSelected(wxTreeEvent&)
-      OnTreeSelected__18wxGenericDirDialogFR11wxTreeEvent
       ;setdrive(int)
       setdrive__Fi
       ;wxDirFilterListCtrl::Init()
@@ -7142,6 +7209,8 @@ EXPORTS
       wxConstructorForwxGenericDirCtrl__Fv
       ;wxGenericDirCtrl::wxGenericDirCtrl()
       __ct__16wxGenericDirCtrlFv
+      ;wxDirItemData::SetNewDirName(const wxString&)
+      SetNewDirName__13wxDirItemDataFRC8wxString
       ;wxGenericDirCtrl::ExpandPath(const wxString&)
       ExpandPath__16wxGenericDirCtrlFRC8wxString
       ;wxDirFilterListCtrl::Create(wxGenericDirCtrl*,const int,const wxPoint&,const wxSize&,long)
@@ -7152,10 +7221,11 @@ EXPORTS
       OnSize__16wxGenericDirCtrlFR11wxSizeEvent
       ;wxGenericDirCtrl::OnEndEditItem(wxTreeEvent&)
       OnEndEditItem__16wxGenericDirCtrlFR11wxTreeEvent
+      __vft13wxDirItemData12wxClientData
       ;wxGenericDirCtrl::Init()
       Init__16wxGenericDirCtrlFv
-      ;wxDirItemDataEx::~wxDirItemDataEx()
-      __dt__15wxDirItemDataExFv
+      ;wxDirItemData::~wxDirItemData()
+      __dt__13wxDirItemDataFv
       ;wxGenericDirCtrl::ParseFilter(const wxString&,wxArrayString&,wxArrayString&)
       ParseFilter__16wxGenericDirCtrlFRC8wxStringR13wxArrayStringT2
       ;wxDirFilterListCtrl::GetEventTable() const
@@ -7172,36 +7242,16 @@ EXPORTS
       FillFilterList__19wxDirFilterListCtrlFRC8wxStringi
       ;wxGenericDirCtrl::SetupSections()
       SetupSections__16wxGenericDirCtrlFv
-      ;wxGenericDirDialog::GetPath() const
-      GetPath__18wxGenericDirDialogCFv
-      ;wxGenericDirDialog::GetEventTable() const
-      GetEventTable__18wxGenericDirDialogCFv
-      ;wxDirItemDataEx::SetNewDirName(wxString)
-      SetNewDirName__15wxDirItemDataExF8wxString
-      ;wxDirItemDataEx::wxDirItemDataEx(const wxString&,const wxString&,unsigned long)
-      __ct__15wxDirItemDataExFRC8wxStringT1Ul
-      __vft18wxGenericDirDialog8wxObject
-      ;wxGenericDirDialog::OnNew(wxCommandEvent&)
-      OnNew__18wxGenericDirDialogFR14wxCommandEvent
       ;wxGenericDirCtrl::OnCollapseItem(wxTreeEvent&)
       OnCollapseItem__16wxGenericDirCtrlFR11wxTreeEvent
-      __vft15wxDirItemDataEx12wxClientData
+      ;wxDirItemData::HasSubDirs() const
+      HasSubDirs__13wxDirItemDataCFv
       ;wxGenericDirCtrl::GetPath() const
       GetPath__16wxGenericDirCtrlCFv
-      ;wxGenericDirDialog::wxGenericDirDialog(wxWindow*,const wxString&,const wxString&,long,const wxPoint&,const wxSize&,const wxString&)
-      __ct__18wxGenericDirDialogFP8wxWindowRC8wxStringT2lRC7wxPointRC6wxSizeT2
-      ;wxGenericDirDialog::ShowModal()
-      ShowModal__18wxGenericDirDialogFv
       ;wxGenericDirCtrl::GetFilePath() const
       GetFilePath__16wxGenericDirCtrlCFv
       ;wxGenericDirCtrl::Create(wxWindow*,const int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&,int,const wxString&)
       Create__16wxGenericDirCtrlFP8wxWindowCiRC8wxStringRC7wxPointRC6wxSizelT3iT3
-      ;wxGenericDirDialog::sm_eventTable
-      sm_eventTable__18wxGenericDirDialog
-      ;wxGenericDirDialog::sm_eventTableEntries
-      sm_eventTableEntries__18wxGenericDirDialog
-      ;wxGenericDirDialog::SetPath(const wxString&)
-      SetPath__18wxGenericDirDialogFRC8wxString
       ;wxGenericDirCtrl::SetPath(const wxString&)
       SetPath__16wxGenericDirCtrlFRC8wxString
       ;wxGenericDirCtrl::SetFilter(const wxString&)
@@ -7210,12 +7260,8 @@ EXPORTS
       OnBeginEditItem__16wxGenericDirCtrlFR11wxTreeEvent
       ;wxDirFilterListCtrl::sm_eventTable
       sm_eventTable__19wxDirFilterListCtrl
-      ;wxGenericDirDialog::OnTreeKeyDown(wxTreeEvent&)
-      OnTreeKeyDown__18wxGenericDirDialogFR11wxTreeEvent
       ;wxGenericDirCtrl::OnExpandItem(wxTreeEvent&)
       OnExpandItem__16wxGenericDirCtrlFR11wxTreeEvent
-      ;wxGenericDirDialog::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__18wxGenericDirDialogFR12wxCloseEvent
       ;wxGenericDirCtrl::FindChild(wxTreeItemId,const wxString&,unsigned long&)
       FindChild__16wxGenericDirCtrlF12wxTreeItemIdRC8wxStringRUl
       ;wxGenericDirCtrl::AddSection(const wxString&,const wxString&,int)
@@ -7226,6 +7272,8 @@ EXPORTS
       __dt__16wxGenericDirCtrlFv
       ;wxGenericDirCtrl::DoResize()
       DoResize__16wxGenericDirCtrlFv
+      ;wxDirItemData::HasFiles(const wxString&) const
+      HasFiles__13wxDirItemDataCFRC8wxString
       ;wxGenericDirCtrl::ExtractWildcard(const wxString&,int,wxString&,wxString&)
       ExtractWildcard__16wxGenericDirCtrlFRC8wxStringiR8wxStringT3
   ;From object file:  ..\generic\dragimgg.cpp
@@ -7391,8 +7439,8 @@ EXPORTS
       DeselectCol__6wxGridFi
       ;wxGridTableBase::AppendCols(unsigned int)
       AppendCols__15wxGridTableBaseFUi
-      ;wxGridStringArray::DoEmpty()
-      DoEmpty__17wxGridStringArrayFv
+      ;wxGridCellAttr::Init(wxGridCellAttr*)
+      Init__14wxGridCellAttrFP14wxGridCellAttr
       wxEVT_GRID_EDITOR_SHOWN
       ;wxConstructorForwxGridEditorCreatedEvent()
       wxConstructorForwxGridEditorCreatedEvent__Fv
@@ -7431,6 +7479,8 @@ EXPORTS
       GetDefaultCellBackgroundColour__6wxGridFv
       ;wxGrid::DoGetBestSize() const
       DoGetBestSize__6wxGridCFv
+      ;wxGridStringArray::DoEmpty()
+      DoEmpty__17wxGridStringArrayFv
       ;wxGridCellTextEditor::Create(wxWindow*,int,wxEvtHandler*)
       Create__20wxGridCellTextEditorFP8wxWindowiP12wxEvtHandler
       ;wxGridCellEditor::Create(wxWindow*,int,wxEvtHandler*)
@@ -9705,41 +9755,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*)
@@ -9811,8 +9826,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*)
@@ -9973,12 +9986,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()
@@ -10430,10 +10445,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)
@@ -10485,11 +10502,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
@@ -10501,14 +10520,12 @@ 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
@@ -10867,8 +10884,6 @@ EXPORTS
       OnIdle__5wxAppFR11wxIdleEvent
       ;wxMsgArray::wxMsgArray(const wxMsgArray&)
       __ct__10wxMsgArrayFRC10wxMsgArray
-      wxPanelClassName
-      wxMDIFrameClassName
       ;wxMsgArray::Insert(const _QMSG&,unsigned int)
       Insert__10wxMsgArrayFRC5_QMSGUi
       ;wxApp::HandleSockets()
@@ -10905,14 +10920,11 @@ EXPORTS
       Initialized__5wxAppFv
       ;wxApp::GetEventTable() const
       GetEventTable__5wxAppCFv
-      wxFrameClassNameNoRedraw
       ;wxSetInstance(unsigned long)
       wxSetInstance__FUl
       ;wxMsgArray::RemoveAt(unsigned int)
       RemoveAt__10wxMsgArrayFUi
-      wxMDIChildFrameClassName
       wxGetInstance
-      wxFrameClassName
       ;wxApp::GetStdIcon(int) const
       GetStdIcon__5wxAppCFi
       ;wxMsgArray::~wxMsgArray()
@@ -10924,7 +10936,6 @@ EXPORTS
       ;wxApp::CleanUp()
       CleanUp__5wxAppFv
       svCurrentMsg
-      wxMDIChildFrameClassNameNoRedraw
       ;wxMsgArray::Index(const _QMSG&,unsigned long) const
       Index__10wxMsgArrayCFRC5_QMSGUl
       wxDisableButtonBrush
@@ -10934,7 +10945,6 @@ EXPORTS
       Initialize__5wxAppFUl
       ;wxAppBase::m_appInitFn
       m_appInitFn__9wxAppBase
-      wxCanvasClassName
       ;wxApp::DoMessage()
       DoMessage__5wxAppFv
       ;wxExit()
@@ -10945,7 +10955,6 @@ EXPORTS
       Dispatch__5wxAppFv
       ;wxEntry(int,char**)
       wxEntry__FiPPc
-      wxMDIFrameClassNameNoRedraw
       ;wxApp::SendIdleEvents(wxWindow*)
       SendIdleEvents__5wxAppFP8wxWindow
   ;From object file:  ..\os2\bitmap.cpp
@@ -11152,8 +11161,6 @@ EXPORTS
       ;wxCheckBox::SetValue(unsigned long)
       SetValue__10wxCheckBoxFUl
       __vft16wxBitmapCheckBox8wxObject
-      ;wxCheckBox::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
-      OnCtlColor__10wxCheckBoxFUlT1UiT3PvT5
       ;wxCheckBox::DoGetBestSize() const
       DoGetBestSize__10wxCheckBoxCFv
       ;wxCheckBox::GetValue() const
@@ -11448,12 +11455,15 @@ EXPORTS
       wxDialogNameStr
       wxCheckBoxNameStr
       wxCanvasNameStr
+      wxCanvasClassNameNR
       wxCYAN_PEN
       wxButtonBarNameStr
       wxNullBitmap
       wxNORMAL_FONT
       wxMEDIUM_GREY_BRUSH
       wxTheColourDatabase
+      wxPanelClassName
+      wxMDIFrameClassName
       wxLIGHT_GREY
       wxDefaultSize
       wxBLUE
@@ -11463,6 +11473,7 @@ EXPORTS
       wxStaticBoxNameStr
       wxSliderNameStr
       wxRED_PEN
+      wxPanelClassNameNR
       wxMultiTextNameStr
       wxMEDIUM_GREY_PEN
       wxGaugeNameStr
@@ -11487,9 +11498,12 @@ EXPORTS
       wxComboBoxNameStr
       wxCROSS_CURSOR
       wxTopLevelWindows
+      wxFrameClassNameNoRedraw
       wxTRANSPARENT_BRUSH
       wxWHITE_BRUSH
       wxRED_BRUSH
+      wxFrameClassName
+      wxMDIChildFrameClassName
       wxNullColour
       wxTRANSPARENT_PEN
       wxStaticNameStr
@@ -11503,11 +11517,13 @@ EXPORTS
       wxBLACK_DASHED_PEN
       g_globalCursor
       wxNullNativeFontInfo
+      wxMDIChildFrameClassNameNoRedraw
       wxBLUE_BRUSH
       wxLIGHT_GREY_BRUSH
       wxBLACK_BRUSH
       wxPendingDelete
       wxNullAcceleratorTable
+      wxCanvasClassName
       wxGREEN_PEN
       wxVirtListBoxNameStr
       wxStatusLineNameStr
@@ -11522,6 +11538,7 @@ EXPORTS
       wxChoiceNameStr
       wxCYAN
       wxBLACK
+      wxMDIFrameClassNameNoRedraw
   ;From object file:  ..\os2\dataobj.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDataFormat::wxDataFormat()
@@ -11835,10 +11852,6 @@ EXPORTS
       SetModal__8wxDialogFUl
       ;wxDialog::OnCancel(wxCommandEvent&)
       OnCancel__8wxDialogFR14wxCommandEvent
-      ;wxDialog::DoGetPosition(int*,int*) const
-      DoGetPosition__8wxDialogCFPiT1
-      ;wxDialog::IsIconized() const
-      IsIconized__8wxDialogCFv
       ;wxDialog::IsModal() const
       IsModal__8wxDialogCFv
       ;wxDialog::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
@@ -11852,8 +11865,6 @@ EXPORTS
       OnOK__8wxDialogFR14wxCommandEvent
       ;wxDialog::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__8wxDialogFR12wxCloseEvent
-      ;wxDialog::DoSetClientSize(int,int)
-      DoSetClientSize__8wxDialogFiT1
       ;wxDialog::Init()
       Init__8wxDialogFv
       ;wxDialog::ShowModal()
@@ -11867,10 +11878,6 @@ EXPORTS
       OnSysColourChanged__8wxDialogFR23wxSysColourChangedEvent
       ;wxDialog::DoShowModal()
       DoShowModal__8wxDialogFv
-      ;wxDialog::Destroy()
-      Destroy__8wxDialogFv
-      ;wxDialog::Iconize(unsigned long)
-      Iconize__8wxDialogFUl
       ;wxDialog::Show(unsigned long)
       Show__8wxDialogFUl
       ;wxDialog::OnApply(wxCommandEvent&)
@@ -11885,7 +11892,6 @@ EXPORTS
       OS2WindowProc__8wxDialogFUiPvT2
       ;wxDialog::GetEventTable() const
       GetEventTable__8wxDialogCFv
-      wxModelessWindows
       ;wxDialog::sm_eventTable
       sm_eventTable__8wxDialog
   ;From object file:  ..\os2\dir.cpp
@@ -11976,12 +11982,18 @@ EXPORTS
       sm_classwxFileDialog__12wxFileDialog
   ;From object file:  ..\os2\font.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxFont::Create(const wxNativeFontInfo&,unsigned long)
+      Create__6wxFontFRC16wxNativeFontInfoUl
+      ;wxNativeFontInfo::SetUnderlined(unsigned long)
+      SetUnderlined__16wxNativeFontInfoFUl
       ;wxFont::SetStyle(int)
       SetStyle__6wxFontFi
-      ;wxFont::OS2SelectMatchingFontByName()
-      OS2SelectMatchingFontByName__6wxFontFv
+      ;wxFontRefData::Init(const wxNativeFontInfo&,unsigned long,unsigned long)
+      Init__13wxFontRefDataFRC16wxNativeFontInfoUlT2
       ;wxFont::IsFree() const
       IsFree__6wxFontCFv
+      ;wxNativeFontInfo::GetUnderlined() const
+      GetUnderlined__16wxNativeFontInfoCFv
       ;wxFont::GetHFONT() const
       GetHFONT__6wxFontCFv
       ;wxFont::GetFamily() const
@@ -11990,9 +12002,15 @@ EXPORTS
       GetFaceName__6wxFontCFv
       ;wxFontRefData::Init(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       Init__13wxFontRefDataFiN31UlRC8wxString14wxFontEncoding
+      ;wxFont::wxFont(const wxString&)
+      __ct__6wxFontFRC8wxString
+      ;wxNativeFontInfo::FromString(const wxString&)
+      FromString__16wxNativeFontInfoFRC8wxString
+      ;wxNativeFontInfo::SetFamily(wxFontFamily)
+      SetFamily__16wxNativeFontInfoF12wxFontFamily
+      __vft13wxFontRefData15wxObjectRefData
       ;wxFont::SetFamily(int)
       SetFamily__6wxFontFi
-      __vft13wxFontRefData15wxObjectRefData
       ;wxConstructorForwxFont()
       wxConstructorForwxFont__Fv
       ;wxFontRefData::~wxFontRefData()
@@ -12001,6 +12019,8 @@ EXPORTS
       GetUnderlined__6wxFontCFv
       ;wxFont::GetStyle() const
       GetStyle__6wxFontCFv
+      ;wxFont::GetNativeFontInfo() const
+      GetNativeFontInfo__6wxFontCFv
       ;wxFont::SetEncoding(wxFontEncoding)
       SetEncoding__6wxFontF14wxFontEncoding
       ;wxFont::FreeResource(unsigned long)
@@ -12009,27 +12029,51 @@ EXPORTS
       SetUnderlined__6wxFontFUl
       ;wxFont::SetPS(unsigned long)
       SetPS__6wxFontFUl
-      ;wxFont::GetFontId() const
-      GetFontId__6wxFontCFv
-      ;wxFont::GetPS() const
-      GetPS__6wxFontCFv
+      ;wxNativeFontInfo::SetStyle(wxFontStyle)
+      SetStyle__16wxNativeFontInfoF11wxFontStyle
+      ;wxNativeFontInfo::GetPointSize() const
+      GetPointSize__16wxNativeFontInfoCFv
+      ;wxNativeFontInfo::GetStyle() const
+      GetStyle__16wxNativeFontInfoCFv
+      ;wxNativeFontInfo::GetFamily() const
+      GetFamily__16wxNativeFontInfoCFv
+      ;wxNativeFontInfo::GetFaceName() const
+      GetFaceName__16wxNativeFontInfoCFv
       ;wxFont::GetEncoding() const
       GetEncoding__6wxFontCFv
+      ;wxNativeFontInfo::SetEncoding(wxFontEncoding)
+      SetEncoding__16wxNativeFontInfoF14wxFontEncoding
+      ;wxFont::SetNativeFontInfo(const wxNativeFontInfo&)
+      SetNativeFontInfo__6wxFontFRC16wxNativeFontInfo
       ;wxFont::SetFaceName(const wxString&)
       SetFaceName__6wxFontFRC8wxString
-      __vft6wxFont8wxObject
+      ;wxNativeFontInfo::SetWeight(wxFontWeight)
+      SetWeight__16wxNativeFontInfoF12wxFontWeight
       ;wxFont::sm_classwxFont
       sm_classwxFont__6wxFont
+      __vft6wxFont8wxObject
+      ;wxNativeFontInfo::SetPointSize(int)
+      SetPointSize__16wxNativeFontInfoFi
       ;wxFont::Init()
       Init__6wxFontFv
+      ;wxNativeFontInfo::ToString() const
+      ToString__16wxNativeFontInfoCFv
       ;wxFont::GetResourceHandle()
       GetResourceHandle__6wxFontFv
+      ;wxNativeFontInfo::GetEncoding() const
+      GetEncoding__16wxNativeFontInfoCFv
+      ;wxFontRefData::Free()
+      Free__13wxFontRefDataFv
+      ;wxFontRefData::Alloc(wxFont*)
+      Alloc__13wxFontRefDataFP6wxFont
       ;wxFont::SetPointSize(int)
       SetPointSize__6wxFontFi
       ;wxFont::SetWeight(int)
       SetWeight__6wxFontFi
       ;wxFont::SetFM(_FONTMETRICS*,int)
       SetFM__6wxFontFP12_FONTMETRICSi
+      ;wxNativeFontInfo::Init()
+      Init__16wxNativeFontInfoFv
       ;wxFont::~wxFont()
       __dt__6wxFontFv
       ;wxFont::Unshare()
@@ -12038,12 +12082,14 @@ EXPORTS
       RealizeResource__6wxFontFv
       ;wxFont::GetWeight() const
       GetWeight__6wxFontCFv
+      ;wxNativeFontInfo::GetWeight() const
+      GetWeight__16wxNativeFontInfoCFv
       ;wxFont::GetPointSize() const
       GetPointSize__6wxFontCFv
       ;wxFont::Create(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       Create__6wxFontFiN31UlRC8wxString14wxFontEncoding
-      ;wxFont::wxFont(const wxNativeFontInfo&)
-      __ct__6wxFontFRC16wxNativeFontInfo
+      ;wxNativeFontInfo::SetFaceName(wxString)
+      SetFaceName__16wxNativeFontInfoF8wxString
   ;From object file:  ..\os2\fontdlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxConstructorForwxFontDialog()
@@ -12076,6 +12122,8 @@ EXPORTS
       SetEncoding__22wxFontEnumeratorHelperF14wxFontEncoding
   ;From object file:  ..\os2\fontutil.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxGetFontEncFromCharSet(int)
+      wxGetFontEncFromCharSet__Fi
       ;wxNativeEncodingInfo::ToString() const
       ToString__20wxNativeEncodingInfoCFv
       ;wxTestFontEncoding(const wxNativeEncodingInfo&)
@@ -12084,20 +12132,20 @@ EXPORTS
       wxCreateFontFromLogFont__FPC7_FATTRSCP12_FONTMETRICSP13_FACENAMEDESC
       ;wxGetNativeFontEncoding(wxFontEncoding,wxNativeEncodingInfo*)
       wxGetNativeFontEncoding__F14wxFontEncodingP20wxNativeEncodingInfo
-      ;wxFillLogFont(_FATTRS*,_FACENAMEDESC*,const wxFont*)
-      wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCPC6wxFont
+      ;wxOS2SelectMatchingFontByName(_FATTRS*,_FACENAMEDESC*,_FONTMETRICS*,int,const wxFont*)
+      wxOS2SelectMatchingFontByName__FP7_FATTRSP13_FACENAMEDESCP12_FONTMETRICSiPC6wxFont
+      ;wxFillLogFont(_FATTRS*,_FACENAMEDESC*,unsigned long,long*,wxString&,wxFont*)
+      wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCUlPlR8wxStringP6wxFont
       ;wxGpiStrcmp(char*,char*)
       wxGpiStrcmp__FPcT1
       ;wxNativeEncodingInfo::FromString(const wxString&)
       FromString__20wxNativeEncodingInfoFRC8wxString
   ;From object file:  ..\os2\frame.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxFrame::Show(unsigned long)
-      Show__7wxFrameFUl
-      ;wxFrame::Iconize(unsigned long)
-      Iconize__7wxFrameFUl
       ;wxFrame::HandleMenuSelect(unsigned short,unsigned short,unsigned long)
       HandleMenuSelect__7wxFrameFUsT1Ul
+      ;wxFrame::SendSizeEvent()
+      SendSizeEvent__7wxFrameFv
       ;wxFrame::OS2TranslateMessage(void**)
       OS2TranslateMessage__7wxFrameFPPv
       ;wxFrame::HandlePaint()
@@ -12113,14 +12161,8 @@ EXPORTS
       HandleSize__7wxFrameFiT1Ui
       ;wxConstructorForwxFrame()
       wxConstructorForwxFrame__Fv
-      ;wxFrame::SetIcon(const wxIcon&)
-      SetIcon__7wxFrameFRC6wxIcon
-      ;wxFrame::Restore()
-      Restore__7wxFrameFv
-      ;wxFrame::IsMaximized() const
-      IsMaximized__7wxFrameCFv
-      ;wxFrame::IsIconized() const
-      IsIconized__7wxFrameCFv
+      ;wxFrame::Raise()
+      Raise__7wxFrameFv
       ;wxFrame::GetClientAreaOrigin() const
       GetClientAreaOrigin__7wxFrameCFv
       ;wxFrame::AttachMenuBar(wxMenuBar*)
@@ -12131,28 +12173,20 @@ EXPORTS
       OnSysColourChanged__7wxFrameFR23wxSysColourChangedEvent
       ;wxFrame::ShowFullScreen(unsigned long,long)
       ShowFullScreen__7wxFrameFUll
-      ;wxFrame::DoShowWindow(int)
-      DoShowWindow__7wxFrameFi
+      ;wxFrame::m_bUseNativeStatusBar
+      m_bUseNativeStatusBar__7wxFrame
       ;wxFrame::sm_eventTable
       sm_eventTable__7wxFrame
       ;wxFrame::sm_eventTableEntries
       sm_eventTableEntries__7wxFrame
       ;wxFrame::sm_classwxFrame
       sm_classwxFrame__7wxFrame
-      ;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()
@@ -12161,14 +12195,14 @@ EXPORTS
       OS2WindowProc__7wxFrameFUiPvT2
       ;wxFrame::InternalSetMenuBar()
       InternalSetMenuBar__7wxFrameFv
+      ;wxFrame::GetDefaultIcon() const
+      GetDefaultIcon__7wxFrameCFv
       ;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::SetClient(unsigned long)
+      SetClient__7wxFrameFUl
       ;wxFrame::DoGetClientSize(int*,int*) const
       DoGetClientSize__7wxFrameCFPiT1
       ;wxFrame::Init()
@@ -12179,8 +12213,6 @@ EXPORTS
       GetEventTable__7wxFrameCFv
       ;wxFrame::DetachMenuBar()
       DetachMenuBar__7wxFrameFv
-      ;wxFrame::AlterChildPos()
-      AlterChildPos__7wxFrameFv
       wxFrameMainWndProc
       wxFrameWndProc
       ;wxFrame::SetClient(wxWindow*)
@@ -12194,6 +12226,7 @@ EXPORTS
       sm_classwxGauge__7wxGauge
       ;wxGauge::SetForegroundColour(const wxColour&)
       SetForegroundColour__7wxGaugeFRC8wxColour
+      wxGaugeWndProc
       ;wxConstructorForwxGauge()
       wxConstructorForwxGauge__Fv
       ;wxGauge::SetBackgroundColour(const wxColour&)
@@ -12202,16 +12235,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
@@ -13164,38 +13197,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
@@ -13211,31 +13246,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
@@ -13360,25 +13400,27 @@ EXPORTS
       sm_classwxSystemSettingsModule__22wxSystemSettingsModule
       ;wxSystemSettingsModule::OnInit()
       OnInit__22wxSystemSettingsModuleFv
+      ;wxSystemSettingsNative::GetFont(wxSystemFont)
+      GetFont__22wxSystemSettingsNativeF12wxSystemFont
       __vft22wxSystemSettingsModule8wxObject
-      ;wxSystemSettings::GetSystemColour(int)
-      GetSystemColour__16wxSystemSettingsFi
-      ;wxSystemSettings::GetSystemMetric(int)
-      GetSystemMetric__16wxSystemSettingsFi
+      ;wxSystemSettingsNative::HasFeature(wxSystemFeature)
+      HasFeature__22wxSystemSettingsNativeF15wxSystemFeature
       ;wxSystemSettingsModule::sm_optionNames
       sm_optionNames__22wxSystemSettingsModule
+      ;wxSystemSettingsNative::GetColour(wxSystemColour)
+      GetColour__22wxSystemSettingsNativeF14wxSystemColour
       ;wxSystemSettingsModule::OnExit()
       OnExit__22wxSystemSettingsModuleFv
-      ;wxSystemSettings::GetCapability(int)
-      GetCapability__16wxSystemSettingsFi
       ;wxSystemSettingsModule::sm_optionValues
       sm_optionValues__22wxSystemSettingsModule
       ;wxConstructorForwxSystemSettingsModule()
       wxConstructorForwxSystemSettingsModule__Fv
-      ;wxSystemSettings::GetSystemFont(int)
-      GetSystemFont__16wxSystemSettingsFi
+      ;wxSystemSettingsNative::GetMetric(wxSystemMetric)
+      GetMetric__22wxSystemSettingsNativeF14wxSystemMetric
   ;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)
@@ -13389,8 +13431,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
@@ -13414,6 +13454,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()
@@ -13430,10 +13472,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
@@ -13448,13 +13490,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()
@@ -13469,27 +13509,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&)
@@ -13515,31 +13572,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&)
@@ -13856,8 +13907,6 @@ EXPORTS
       GetId__8wxThreadCFv
       ;wxThread::Delete(void**)
       Delete__8wxThreadFPPv
-      ;wxThread::Create()
-      Create__8wxThreadFv
       ;wxThreadInternal::OS2ThreadStart(wxThread*)
       OS2ThreadStart__16wxThreadInternalFP8wxThread
       ;wxMutex::Lock()
@@ -13897,13 +13946,11 @@ EXPORTS
       TryLock__7wxMutexFv
       ;wxThread::This()
       This__8wxThreadFv
-      ;wxThreadInternal::Create(wxThread*)
-      Create__16wxThreadInternalFP8wxThread
+      ;wxThread::Sleep(unsigned long)
+      Sleep__8wxThreadFUl
       __vft8wxThread
       ;wxThread::wxThread(wxThreadKind)
       __ct__8wxThreadF12wxThreadKind
-      ;wxThread::Sleep(unsigned long)
-      Sleep__8wxThreadFUl
       ;wxMutex::Unlock()
       Unlock__7wxMutexFv
       ;wxMutexGuiLeaveOrEnter()
@@ -13923,6 +13970,10 @@ EXPORTS
       SetPriority__16wxThreadInternalFUi
       ;wxThread::SetPriority(unsigned int)
       SetPriority__8wxThreadFUi
+      ;wxThread::Create(unsigned int)
+      Create__8wxThreadFUi
+      ;wxThreadInternal::Create(wxThread*,unsigned int)
+      Create__16wxThreadInternalFP8wxThreadUi
       ;wxMutexGuiLeave()
       wxMutexGuiLeave__Fv
       ;wxThread::~wxThread()
@@ -14037,6 +14088,51 @@ EXPORTS
       Remove__9wxToolTipFv
       ;wxToolTip::hwndTT
       hwndTT__9wxToolTip
+  ;From object file:  ..\os2\toplevel.cpp
+    ;PUBDEFs (Symbols available from object file):
+      __vft19wxTopLevelWindowOS28wxObject
+      ;wxTopLevelWindowOS2::CreateFrame(const wxString&,const wxPoint&,const wxSize&)
+      CreateFrame__19wxTopLevelWindowOS2FRC8wxStringRC7wxPointRC6wxSize
+      ;wxTopLevelWindowOS2::~wxTopLevelWindowOS2()
+      __dt__19wxTopLevelWindowOS2Fv
+      ;wxTopLevelWindowOS2::ShowFullScreen(unsigned long,long)
+      ShowFullScreen__19wxTopLevelWindowOS2FUll
+      ;wxTopLevelWindowOS2::CreateDialog(unsigned long,const wxString&,const wxPoint&,const wxSize&)
+      CreateDialog__19wxTopLevelWindowOS2FUlRC8wxStringRC7wxPointRC6wxSize
+      ;wxTopLevelWindowOS2::DoShowWindow(int)
+      DoShowWindow__19wxTopLevelWindowOS2Fi
+      ;wxTopLevelWindowOS2::Init()
+      Init__19wxTopLevelWindowOS2Fv
+      ;wxTopLevelWindowOS2::OS2GetCreateWindowFlags(long*) const
+      OS2GetCreateWindowFlags__19wxTopLevelWindowOS2CFPl
+      ;wxTopLevelWindowOS2::Iconize(unsigned long)
+      Iconize__19wxTopLevelWindowOS2FUl
+      ;wxTopLevelWindowOS2::DoSetClientSize(int,int)
+      DoSetClientSize__19wxTopLevelWindowOS2FiT1
+      ;wxTopLevelWindowOS2::AlterChildPos()
+      AlterChildPos__19wxTopLevelWindowOS2Fv
+      ;wxTopLevelWindowOS2::SetIcon(const wxIcon&)
+      SetIcon__19wxTopLevelWindowOS2FRC6wxIcon
+      ;wxTopLevelWindowOS2::Restore()
+      Restore__19wxTopLevelWindowOS2Fv
+      ;wxTopLevelWindowOS2::IsMaximized() const
+      IsMaximized__19wxTopLevelWindowOS2CFv
+      ;wxTopLevelWindowOS2::Maximize(unsigned long)
+      Maximize__19wxTopLevelWindowOS2FUl
+      ;wxTopLevelWindowOS2::EnableCloseButton(unsigned long)
+      EnableCloseButton__19wxTopLevelWindowOS2FUl
+      ;wxTopLevelWindowOS2::UpdateInternalSize(wxWindow*,int)
+      UpdateInternalSize__19wxTopLevelWindowOS2FP8wxWindowi
+      ;wxTopLevelWindowOS2::DoGetClientSize(int*,int*) const
+      DoGetClientSize__19wxTopLevelWindowOS2CFPiT1
+      ;wxTopLevelWindowOS2::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
+      Create__19wxTopLevelWindowOS2FP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
+      ;wxTopLevelWindowOS2::Show(unsigned long)
+      Show__19wxTopLevelWindowOS2FUl
+      ;wxTopLevelWindowOS2::IsIconized() const
+      IsIconized__19wxTopLevelWindowOS2CFv
+      wxDlgProc
+      wxModelessWindows
   ;From object file:  ..\os2\utils.cpp
     ;PUBDEFs (Symbols available from object file):
       gs_wxBusyCursorOld
@@ -14095,6 +14191,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&)
@@ -14177,6 +14275,10 @@ EXPORTS
       HandleMouseMove__8wxWindowFiT1Ui
       ;wxWindow::Raise()
       Raise__8wxWindowFv
+      ;wxWindowCreationHook::~wxWindowCreationHook()
+      __dt__20wxWindowCreationHookFv
+      ;wxWindow::Update()
+      Update__8wxWindowFv
       ;wxWindow::UnsubclassWin()
       UnsubclassWin__8wxWindowFv
       ;wxWindow::Lower()
@@ -14185,6 +14287,8 @@ EXPORTS
       HandleMaximize__8wxWindowFv
       ;wxWindow::HandleDestroy()
       HandleDestroy__8wxWindowFv
+      ;wxWindow::Freeze()
+      Freeze__8wxWindowFv
       ;wxWindow::DoPopupMenu(wxMenu*,int,int)
       DoPopupMenu__8wxWindowFP6wxMenuiT2
       ;wxWindow::UnpackCommand(void*,void*,unsigned short*,unsigned long*,unsigned short*)
@@ -14195,6 +14299,8 @@ EXPORTS
       sm_eventTable__8wxWindow
       ;wxWindow::sm_classwxWindow
       sm_classwxWindow__8wxWindow
+      ;wxWindowCreationHook::wxWindowCreationHook(wxWindow*)
+      __ct__20wxWindowCreationHookFP8wxWindow
       ;wxWindow::SetScrollPos(int,int,unsigned long)
       SetScrollPos__8wxWindowFiT1Ul
       ;wxCharCodeWXToOS2(int,unsigned long*)
@@ -14227,6 +14333,8 @@ EXPORTS
       OS2OnMeasureItem__8wxWindowFiPPv
       ;wxWindow::OS2DestroyWindow()
       OS2DestroyWindow__8wxWindowFv
+      ;wxWindow::IsMouseInWindow() const
+      IsMouseInWindow__8wxWindowCFv
       ;wxWindow::HandleKeyUp(unsigned long,void*)
       HandleKeyUp__8wxWindowFUlPv
       ;wxWindow::HandleKeyDown(unsigned short,void*)
@@ -14240,6 +14348,8 @@ EXPORTS
       wxWndHook
       ;wxWindow::Reparent(wxWindow*)
       Reparent__8wxWindowFP8wxWindow
+      ;wxWindow::OS2GetCreateWindowCoords(const wxPoint&,const wxSize&,int&,int&,int&,int&) const
+      OS2GetCreateWindowCoords__8wxWindowCFRC7wxPointRC6wxSizeRiN33
       ;wxWindow::Enable(unsigned long)
       Enable__8wxWindowFUl
       wxWinHandleList
@@ -14292,6 +14402,10 @@ EXPORTS
       ;wxAssociateWinWithHandle(unsigned long,wxWindow*)
       wxAssociateWinWithHandle__FUlP8wxWindow
       s_currentMsg
+      ;wxWindow::OS2Create(char*,const char*,unsigned long,const wxPoint&,const wxSize&,void*,unsigned long,unsigned long)
+      OS2Create__8wxWindowFPcPCcUlRC7wxPointRC6wxSizePvN23
+      ;wxWindow::GetOS2ParentHeight(wxWindow*)
+      GetOS2ParentHeight__8wxWindowFP8wxWindow
       ;wxWindow::Refresh(unsigned long,const wxRect*)
       Refresh__8wxWindowFUlPC6wxRect
       ;wxWindow::SetScrollbar(int,int,int,int,unsigned long)
@@ -14317,6 +14431,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)
@@ -14335,6 +14451,10 @@ EXPORTS
       __dt__8wxWindowFv
       ;wxGetActiveWindow()
       wxGetActiveWindow__Fv
+      ;wxCheckWindowWndProc(unsigned long,void*(*)(unsigned long,unsigned long,void*,void*))
+      wxCheckWindowWndProc__FUlPFUlT1PvT3_Pv
+      ;wxWindow::Thaw()
+      Thaw__8wxWindowFv
       ;wxWindow::OS2WindowProc(unsigned int,void*,void*)
       OS2WindowProc__8wxWindowFUiPvT2
       ;wxWindow::OS2TranslateMessage(void**)
@@ -14369,8 +14489,6 @@ EXPORTS
       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)