]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/wx23.def
move wxMGL's wxTimer to src/generic
[wxWidgets.git] / src / os2 / wx23.def
index 8db2495a9a9ae878c737971c78cfcd687d30b5ae..00eaaeec51f1a27656019207e6bac3ad6cce6c25 100644 (file)
@@ -33,6 +33,8 @@ EXPORTS
       __ct__9wxAppBaseFv
       ;wxAppBase::OnInit()
       OnInit__9wxAppBaseFv
+      ;wxAppBase::~wxAppBase()
+      __dt__9wxAppBaseFv
       ;wxAppBase::ProcessPendingEvents()
       ProcessPendingEvents__9wxAppBaseFv
       ;wxAppBase::OnCmdLineError(wxCmdLineParser&)
@@ -41,6 +43,8 @@ EXPORTS
       SetActive__9wxAppBaseFUlP8wxWindow
   ;From object file:  ..\common\choiccmn.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxChoiceBase::~wxChoiceBase()
+      __dt__12wxChoiceBaseFv
       ;wxChoiceBase::SetStringSelection(const wxString&)
       SetStringSelection__12wxChoiceBaseFRC8wxString
       __vft12wxChoiceBase8wxObject
@@ -233,8 +237,6 @@ EXPORTS
       wxConstructorForwxPrintData__Fv
       ;wxPageSetupDialogData::~wxPageSetupDialogData()
       __dt__21wxPageSetupDialogDataFv
-      ;wxColourData::SetCustomColour(int,wxColour&)
-      SetCustomColour__12wxColourDataFiR8wxColour
       ;wxPrintData::operator=(const wxPrintData&)
       __as__11wxPrintDataFRC11wxPrintData
       ;wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData&)
@@ -251,6 +253,8 @@ EXPORTS
       __ct__21wxPageSetupDialogDataFv
       ;wxPrintDialogData::wxPrintDialogData()
       __ct__17wxPrintDialogDataFv
+      ;wxColourData::SetCustomColour(int,const wxColour&)
+      SetCustomColour__12wxColourDataFiRC8wxColour
   ;From object file:  ..\common\cmdproc.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCommandProcessor::UndoCommand(wxCommand&)
@@ -445,10 +449,14 @@ EXPORTS
       Create__13wxControlBaseFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxControlBase::CreateControl(wxWindowBase*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       CreateControl__13wxControlBaseFP12wxWindowBaseiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
+      ;wxControlBase::~wxControlBase()
+      __dt__13wxControlBaseFv
       ;wxControlBase::InheritAttributes()
       InheritAttributes__13wxControlBaseFv
       ;wxStaticBitmapBase::DoGetBestClientSize() const
       DoGetBestClientSize__18wxStaticBitmapBaseCFv
+      ;wxStaticBitmapBase::~wxStaticBitmapBase()
+      __dt__18wxStaticBitmapBaseFv
       ;wxControlBase::InitCommandEvent(wxCommandEvent&) const
       InitCommandEvent__13wxControlBaseCFR14wxCommandEvent
   ;From object file:  ..\common\ctrlsub.cpp
@@ -459,10 +467,15 @@ EXPORTS
       GetClientObject__15wxItemContainerCFi
       ;wxItemContainer::SetClientData(int,void*)
       SetClientData__15wxItemContainerFiPv
+      ;wxItemContainer::Append(const wxArrayString&)
+      Append__15wxItemContainerFRC13wxArrayString
+      ;wxItemContainer::~wxItemContainer()
+      __dt__15wxItemContainerFv
       ;wxItemContainer::GetStringSelection() const
       GetStringSelection__15wxItemContainerCFv
       ;wxItemContainer::SetClientObject(int,wxClientData*)
       SetClientObject__15wxItemContainerFiP12wxClientData
+      __vft15wxItemContainer
   ;From object file:  ..\common\datetime.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDateTime::wxDateTime(double)
@@ -1419,6 +1432,7 @@ EXPORTS
       GetAllEquivalents__19wxEncodingConverterF14wxFontEncoding
       ;wxEncodingConverter::wxEncodingConverter()
       __ct__19wxEncodingConverterFv
+      CompareCharsetItems
       ;wxEncodingConverter::Init(wxFontEncoding,wxFontEncoding,int)
       Init__19wxEncodingConverterF14wxFontEncodingT1i
       ;wxEncodingConverter::Convert(const wxString&)
@@ -1607,6 +1621,8 @@ EXPORTS
       wxConstructorForwxPaintEvent__Fv
       ;wxConstructorForwxNotifyEvent()
       wxConstructorForwxNotifyEvent__Fv
+      ;wxConstructorForwxDisplayChangedEvent()
+      wxConstructorForwxDisplayChangedEvent__Fv
       ;wxConstructorForwxContextMenuEvent()
       wxConstructorForwxContextMenuEvent__Fv
       ;wxConstructorForwxCloseEvent()
@@ -1708,6 +1724,7 @@ EXPORTS
       wxEVT_MENU_HIGHLIGHT
       wxEVT_KEY_UP
       wxEVT_JOY_BUTTON_UP
+      wxEVT_DISPLAY_CHANGED
       wxEVT_COMMAND_SCROLLBAR_UPDATED
       wxEVT_COMMAND_RADIOBUTTON_SELECTED
       ;wxWindowCreateEvent::sm_classwxWindowCreateEvent
@@ -1722,6 +1739,8 @@ EXPORTS
       sm_classwxIdleEvent__11wxIdleEvent
       ;wxDropFilesEvent::sm_classwxDropFilesEvent
       sm_classwxDropFilesEvent__16wxDropFilesEvent
+      ;wxDisplayChangedEvent::sm_classwxDisplayChangedEvent
+      sm_classwxDisplayChangedEvent__21wxDisplayChangedEvent
       ;wxContextMenuEvent::sm_classwxContextMenuEvent
       sm_classwxContextMenuEvent__18wxContextMenuEvent
       ;wxActivateEvent::sm_classwxActivateEvent
@@ -2045,8 +2064,6 @@ EXPORTS
       Assign__10wxFileNameFRC8wxString12wxPathFormat
       ;wxFileName::SetPath(const wxString&,wxPathFormat)
       SetPath__10wxFileNameFRC8wxString12wxPathFormat
-      ;wxFileName::Normalize(wxPathNormalize,const wxString&,wxPathFormat)
-      Normalize__10wxFileNameF15wxPathNormalizeRC8wxString12wxPathFormat
       ;wxFileName::IsWild(wxPathFormat)
       IsWild__10wxFileNameF12wxPathFormat
       ;wxFileName::GetTimes(wxDateTime*,wxDateTime*,wxDateTime*) const
@@ -2103,6 +2120,8 @@ EXPORTS
       AppendDir__10wxFileNameFRC8wxString
       ;wxFileName::SplitPath(const wxString&,wxString*,wxString*,wxString*,wxString*,wxPathFormat)
       SplitPath__10wxFileNameFRC8wxStringP8wxStringN3212wxPathFormat
+      ;wxFileName::Normalize(int,const wxString&,wxPathFormat)
+      Normalize__10wxFileNameFiRC8wxString12wxPathFormat
       ;wxFileName::Mkdir(int,unsigned long)
       Mkdir__10wxFileNameFiUl
       ;wxFileName::MakeRelativeTo(const wxString&,wxPathFormat)
@@ -2153,10 +2172,12 @@ EXPORTS
       ms_root__16wxLocalFSHandler
       ;wxFileSystemHandler::GetMimeTypeFromExt(const wxString&)
       GetMimeTypeFromExt__19wxFileSystemHandlerFRC8wxString
-      ;wxFileSystem::m_Handlers
-      m_Handlers__12wxFileSystem
+      ;wxFSFile::sm_classwxFSFile
+      sm_classwxFSFile__8wxFSFile
       ;wxFileSystemModule::sm_classwxFileSystemModule
       sm_classwxFileSystemModule__18wxFileSystemModule
+      ;wxFileSystem::m_Handlers
+      m_Handlers__12wxFileSystem
       ;wxFileSystemHandler::FindNext()
       FindNext__19wxFileSystemHandlerFv
       ;wxFileSystem::CleanUpHandlers()
@@ -2201,8 +2222,8 @@ EXPORTS
       New__10wxFontBaseFRC8wxString
       ;wxFont::operator=(const wxFont&)
       __as__6wxFontFRC6wxFont
-      ;wxFontBase::GetNativeFontInfoDesc() const
-      GetNativeFontInfoDesc__10wxFontBaseCFv
+      ;wxFontBase::~wxFontBase()
+      __dt__10wxFontBaseFv
       ;wxNativeFontInfo::ToUserString() const
       ToUserString__16wxNativeFontInfoCFv
       ;wxFontBase::GetWeightString() const
@@ -2211,6 +2232,8 @@ EXPORTS
       GetStyleString__10wxFontBaseCFv
       ;wxFontBase::GetNativeFontInfoUserDesc() const
       GetNativeFontInfoUserDesc__10wxFontBaseCFv
+      ;wxFontBase::GetNativeFontInfoDesc() const
+      GetNativeFontInfoDesc__10wxFontBaseCFv
       ;wxFontBase::SetNativeFontInfo(const wxNativeFontInfo&)
       SetNativeFontInfo__10wxFontBaseFRC16wxNativeFontInfo
       ;wxFontBase::SetNativeFontInfoUserDesc(const wxString&)
@@ -2226,6 +2249,10 @@ EXPORTS
       __ne__10wxFontBaseCFRC6wxFont
       ;wxFontBase::GetFamilyString() const
       GetFamilyString__10wxFontBaseCFv
+      ;wxFontBase::SetDefaultEncoding(wxFontEncoding)
+      SetDefaultEncoding__10wxFontBaseF14wxFontEncoding
+      ;wxFontBase::IsFixedWidth() const
+      IsFixedWidth__10wxFontBaseCFv
       ;wxFontBase::New(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       New__10wxFontBaseFiN31UlRC8wxString14wxFontEncoding
       ;wxNativeFontInfo::FromUserString(const wxString&)
@@ -2304,6 +2331,8 @@ EXPORTS
       ShowMenuHelp__11wxFrameBaseFP11wxStatusBari
       ;wxFrameBase::GetEventTable() const
       GetEventTable__11wxFrameBaseCFv
+      ;wxFrameBase::~wxFrameBase()
+      __dt__11wxFrameBaseFv
       ;wxFrameBase::AttachMenuBar(wxMenuBar*)
       AttachMenuBar__11wxFrameBaseFP9wxMenuBar
       __vft11wxFrameBase8wxObject
@@ -2447,6 +2476,8 @@ EXPORTS
       __vft11wxGaugeBase8wxObject
       ;wxGaugeBase::SetValue(int)
       SetValue__11wxGaugeBaseFi
+      ;wxGaugeBase::~wxGaugeBase()
+      __dt__11wxGaugeBaseFv
   ;From object file:  ..\common\gdicmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxBrushList::AddBrush(wxBrush*)
@@ -2561,12 +2592,16 @@ EXPORTS
       ConstrainTo__11wxRect2DIntFRC11wxRect2DInt
       ;wxRect2DInt::ReadFrom(wxDataInputStream&)
       ReadFrom__11wxRect2DIntFR17wxDataInputStream
+      ;wxPoint2DDouble::GetVectorAngle() const
+      GetVectorAngle__15wxPoint2DDoubleCFv
       ;wxRect2DInt::Intersect(const wxRect2DInt&,const wxRect2DInt&,wxRect2DInt*)
       Intersect__11wxRect2DIntFRC11wxRect2DIntT1P11wxRect2DInt
       ;wxRect2DInt::operator=(const wxRect2DInt&)
       __as__11wxRect2DIntFRC11wxRect2DInt
       ;wxRect2DInt::Union(const wxPoint2DInt&)
       Union__11wxRect2DIntFRC12wxPoint2DInt
+      ;wxPoint2DDouble::SetVectorAngle(double)
+      SetVectorAngle__15wxPoint2DDoubleFd
       ;wxRect2DDouble::Intersect(const wxRect2DDouble&,const wxRect2DDouble&,wxRect2DDouble*)
       Intersect__14wxRect2DDoubleFRC14wxRect2DDoubleT1P14wxRect2DDouble
       ;wxRect2DInt::WriteTo(wxDataOutputStream&) const
@@ -2577,6 +2612,8 @@ EXPORTS
       Intersects__14wxRect2DDoubleCFRC14wxRect2DDouble
       ;wxRect2DInt::Union(const wxRect2DInt&,const wxRect2DInt&,wxRect2DInt*)
       Union__11wxRect2DIntFRC11wxRect2DIntT1P11wxRect2DInt
+      ;wxPoint2DInt::SetVectorAngle(double)
+      SetVectorAngle__12wxPoint2DIntFd
       ;wxRect2DDouble::Union(const wxPoint2DDouble&)
       Union__14wxRect2DDoubleFRC15wxPoint2DDouble
       ;wxPoint2DInt::ReadFrom(wxDataInputStream&)
@@ -2637,12 +2674,14 @@ EXPORTS
       GoNextFrame__12wxGIFDecoderFUl
       ;wxGIFDecoder::ConvertToImage(wxImage*) const
       ConvertToImage__12wxGIFDecoderCFP7wxImage
-      ;wxGIFDecoder::GetTop() const
-      GetTop__12wxGIFDecoderCFv
+      ;GIFImage::GIFImage()
+      __ct__8GIFImageFv
       ;wxGIFDecoder::IsAnimation() const
       IsAnimation__12wxGIFDecoderCFv
       ;wxGIFDecoder::GoFirstFrame()
       GoFirstFrame__12wxGIFDecoderFv
+      ;wxGIFDecoder::GetTop() const
+      GetTop__12wxGIFDecoderCFv
       ;wxGIFDecoder::GetDisposalMethod() const
       GetDisposalMethod__12wxGIFDecoderCFv
       ;wxGIFDecoder::GetDelay() const
@@ -2734,6 +2773,22 @@ EXPORTS
       Destroy__17wxStringHashTableFv
       ;wxHashTable::Get(long,const char*) const
       Get__11wxHashTableCFlPCc
+  ;From object file:  ..\common\hashmap.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;_wxHashTableBase2::CopyHashTable(_wxHashTable_NodeBase**,unsigned int,_wxHashTableBase2*,_wxHashTable_NodeBase**,unsigned long(*)(_wxHashTableBase2*,_wxHashTable_NodeBase*),_wxHashTable_NodeBase*(*)(_wxHashTable_NodeBase*))
+      CopyHashTable__17_wxHashTableBase2FPP21_wxHashTable_NodeBaseUiP17_wxHashTableBase2T1PFP17_wxHashTableBase2P21_wxHashTable_NodeBase_UlPFP21_wxHashTable_NodeBase_P21_wxHashTable_NodeBase
+      ;wxStringHash::wxCharStringHash(const char*)
+      wxCharStringHash__12wxStringHashFPCc
+      ;_wxHashTableBase2::ms_primes
+      ms_primes__17_wxHashTableBase2
+      ;_wxHashTableBase2::DummyProcessNode(_wxHashTable_NodeBase*)
+      DummyProcessNode__17_wxHashTableBase2FP21_wxHashTable_NodeBase
+      ;_wxHashTableBase2::DeleteNodes(unsigned int,_wxHashTable_NodeBase**,void(*)(_wxHashTable_NodeBase*))
+      DeleteNodes__17_wxHashTableBase2FUiPP21_wxHashTable_NodeBasePFP21_wxHashTable_NodeBase_v
+      ;_wxHashTableBase2::GetNextPrime(unsigned long)
+      GetNextPrime__17_wxHashTableBase2FUl
+      ;_wxHashTableBase2::GetPreviousPrime(unsigned long)
+      GetPreviousPrime__17_wxHashTableBase2FUl
   ;From object file:  ..\common\helpbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHelpControllerBase::sm_classwxHelpControllerBase
@@ -2795,16 +2850,23 @@ EXPORTS
       sm_classwxCURHandler__12wxCURHandler
       __vft12wxICOHandler8wxObject
       __vft12wxCURHandler8wxObject
+      ;wxANIHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
+      LoadFile__12wxANIHandlerFP7wxImageR13wxInputStreamUli
+      ;wxANIHandler::sm_classwxANIHandler
+      sm_classwxANIHandler__12wxANIHandler
       ;wxBMPHandler::LoadDib(wxImage*,wxInputStream&,unsigned long,unsigned long)
       LoadDib__12wxBMPHandlerFP7wxImageR13wxInputStreamUlT3
       ;wxBMPHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__12wxBMPHandlerFP7wxImageR14wxOutputStreamUl
+      ;wxANIHandler::GetImageCount(wxInputStream&)
+      GetImageCount__12wxANIHandlerFR13wxInputStream
       ;wxConstructorForwxBMPHandler()
       wxConstructorForwxBMPHandler__Fv
       ;wxConstructorForwxCURHandler()
       wxConstructorForwxCURHandler__Fv
       ;wxICOHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__12wxICOHandlerFP7wxImageR14wxOutputStreamUl
+      __vft12wxANIHandler8wxObject
       ;wxBMPHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__12wxBMPHandlerFP7wxImageR13wxInputStreamUli
       ;wxICOHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
@@ -2815,11 +2877,17 @@ EXPORTS
       DoCanRead__12wxCURHandlerFR13wxInputStream
       ;wxBMPHandler::DoCanRead(wxInputStream&)
       DoCanRead__12wxBMPHandlerFR13wxInputStream
+      ;wxConstructorForwxANIHandler()
+      wxConstructorForwxANIHandler__Fv
       ;wxBMPHandler::SaveDib(wxImage*,wxOutputStream&,unsigned long,unsigned long,unsigned long)
       SaveDib__12wxBMPHandlerFP7wxImageR14wxOutputStreamUlN23
       __vft12wxBMPHandler8wxObject
+      ;wxICOHandler::DoLoadFile(wxImage*,wxInputStream&,unsigned long,int)
+      DoLoadFile__12wxICOHandlerFP7wxImageR13wxInputStreamUli
       ;wxICOHandler::GetImageCount(wxInputStream&)
       GetImageCount__12wxICOHandlerFR13wxInputStream
+      ;wxANIHandler::DoCanRead(wxInputStream&)
+      DoCanRead__12wxANIHandlerFR13wxInputStream
       ;wxConstructorForwxICOHandler()
       wxConstructorForwxICOHandler__Fv
   ;From object file:  ..\common\image.cpp
@@ -2832,8 +2900,6 @@ EXPORTS
       FindHandler__7wxImageFl
       ;wxImage::FindHandler(const wxString&,long)
       FindHandler__7wxImageFRC8wxStringl
-      ;wxImage::CountColours(unsigned long)
-      CountColours__7wxImageFUl
       ;wxImage::wxImage(int,int)
       __ct__7wxImageFiT1
       ;wxImageModule::sm_classwxImageModule
@@ -2862,6 +2928,8 @@ EXPORTS
       Copy__7wxImageCFv
       ;wxImage::GetOptionInt(const wxString&) const
       GetOptionInt__7wxImageCFRC8wxString
+      ;wxImage::SaveFile(wxOutputStream&,const wxString&) const
+      SaveFile__7wxImageCFR14wxOutputStreamRC8wxString
       ;wxImage::FindHandlerMime(const wxString&)
       FindHandlerMime__7wxImageFRC8wxString
       ;wxImage::Mirror(unsigned long) const
@@ -2869,6 +2937,8 @@ EXPORTS
       __vft14wxImageHandler8wxObject
       ;wxImage::GetImageCount(wxInputStream&,long)
       GetImageCount__7wxImageFR13wxInputStreaml
+      ;wxImage::FindFirstUnusedColour(unsigned char*,unsigned char*,unsigned char*,unsigned char,unsigned char,unsigned char) const
+      FindFirstUnusedColour__7wxImageCFPUcN21UcN24
       ;wxImage::Scale(int,int) const
       Scale__7wxImageCFiT1
       ;wxImage::sm_handlers
@@ -2879,12 +2949,12 @@ EXPORTS
       __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
+      ;wxImage::ComputeHistogram(wxImageHistogram&) const
+      ComputeHistogram__7wxImageCFR16wxImageHistogram
       ;wxImageRefData::~wxImageRefData()
       __dt__14wxImageRefDataFv
       ;wxImage::HasPalette() const
@@ -2893,8 +2963,6 @@ EXPORTS
       GetMaskGreen__7wxImageCFv
       ;wxImage::SetRGB(int,int,unsigned char,unsigned char,unsigned char)
       SetRGB__7wxImageFiT1UcN23
-      ;wxImage::SaveFile(wxOutputStream&,const wxString&)
-      SaveFile__7wxImageFR14wxOutputStreamRC8wxString
       ;wxImage::CanRead(const wxString&)
       CanRead__7wxImageFRC8wxString
       ;wxImage::GetImageCount(const wxString&,long)
@@ -2905,8 +2973,8 @@ EXPORTS
       ;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::SaveFile(const wxString&,const wxString&) const
+      SaveFile__7wxImageCFRC8wxStringT1
       ;wxImage::LoadFile(const wxString&,const wxString&,int)
       LoadFile__7wxImageFRC8wxStringT1i
       ;wxImageRefData::wxImageRefData()
@@ -2935,8 +3003,6 @@ EXPORTS
       SetMask__7wxImageFUl
       ;wxImage::Rotate90(unsigned long) const
       Rotate90__7wxImageCFUl
-      ;wxImage::FindFirstUnusedColour(unsigned char*,unsigned char*,unsigned char*,unsigned char,unsigned char,unsigned char)
-      FindFirstUnusedColour__7wxImageFPUcN21UcN24
       ;wxImage::Create(int,int)
       Create__7wxImageFiT1
       __vft14wxImageRefData15wxObjectRefData
@@ -2948,6 +3014,8 @@ EXPORTS
       SetOption__7wxImageFRC8wxStringT1
       ;wxImage::SetMaskColour(unsigned char,unsigned char,unsigned char)
       SetMaskColour__7wxImageFUcN21
+      ;wxImage::SaveFile(wxOutputStream&,int) const
+      SaveFile__7wxImageCFR14wxOutputStreami
       ;wxImageHandler::GetImageCount(wxInputStream&)
       GetImageCount__14wxImageHandlerFR13wxInputStream
       ;wxImage::ConvertToMono(unsigned char,unsigned char,unsigned char) const
@@ -2968,6 +3036,8 @@ EXPORTS
       SaveFile__14wxImageHandlerFP7wxImageR14wxOutputStreamUl
       ;wxImage::wxImage(const wxBitmap&)
       __ct__7wxImageFRC8wxBitmap
+      ;wxImage::CountColours(unsigned long) const
+      CountColours__7wxImageCFUl
       ;wxImage::wxImage(const wxString&,long,int)
       __ct__7wxImageFRC8wxStringli
       ;wxImage::sm_classwxImage
@@ -2976,16 +3046,14 @@ EXPORTS
       __ct__7wxImageFR13wxInputStreamli
       ;wxImage::SetOption(const wxString&,int)
       SetOption__7wxImageFRC8wxStringi
-      ;wxImage::SaveFile(const wxString&,const wxString&)
-      SaveFile__7wxImageFRC8wxStringT1
+      ;wxImage::SaveFile(const wxString&,int) const
+      SaveFile__7wxImageCFRC8wxStringi
       ;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&)
       CanRead__7wxImageFR13wxInputStream
       ;wxImage::SetMaskFromImage(const wxImage&,unsigned char,unsigned char,unsigned char)
@@ -3009,14 +3077,55 @@ EXPORTS
       __vft12wxGIFHandler8wxObject
       ;wxGIFHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__12wxGIFHandlerFP7wxImageR13wxInputStreamUli
+  ;From object file:  ..\common\imagiff.cpp
+    ;PUBDEFs (Symbols available from object file):
+      __vft12wxIFFHandler8wxObject
+      ;wxIFFDecoder::ConvertToImage(wxImage*) const
+      ConvertToImage__12wxIFFDecoderCFP7wxImage
+      ;wxIFFHandler::DoCanRead(wxInputStream&)
+      DoCanRead__12wxIFFHandlerFR13wxInputStream
+      ;wxIFFDecoder::Destroy()
+      Destroy__12wxIFFDecoderFv
+      ;wxIFFDecoder::GetTransparentColour() const
+      GetTransparentColour__12wxIFFDecoderCFv
+      ;wxIFFDecoder::GetNumColors() const
+      GetNumColors__12wxIFFDecoderCFv
+      ;wxIFFDecoder::GetData() const
+      GetData__12wxIFFDecoderCFv
+      ;wxIFFDecoder::CanRead()
+      CanRead__12wxIFFDecoderFv
+      ;wxConstructorForwxIFFHandler()
+      wxConstructorForwxIFFHandler__Fv
+      ;wxIFFDecoder::GetWidth() const
+      GetWidth__12wxIFFDecoderCFv
+      ;wxIFFDecoder::ReadIFF()
+      ReadIFF__12wxIFFDecoderFv
+      ;wxIFFDecoder::GetPalette() const
+      GetPalette__12wxIFFDecoderCFv
+      ;wxIFFDecoder::wxIFFDecoder(wxInputStream*)
+      __ct__12wxIFFDecoderFP13wxInputStream
+      ;wxIFFHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
+      SaveFile__12wxIFFHandlerFP7wxImageR14wxOutputStreamUl
+      ;wxIFFHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
+      LoadFile__12wxIFFHandlerFP7wxImageR13wxInputStreamUli
+      ;wxIFFDecoder::GetHeight() const
+      GetHeight__12wxIFFDecoderCFv
+      ;wxIFFHandler::sm_classwxIFFHandler
+      sm_classwxIFFHandler__12wxIFFHandler
   ;From object file:  ..\common\imagjpeg.cpp
     ;PUBDEFs (Symbols available from object file):
+      my_error_exit
       ;wxJPEGHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__13wxJPEGHandlerFP7wxImageR14wxOutputStreamUl
+      my_skip_input_data
       ;jpeg_wxio_dest(jpeg_compress_struct*,wxOutputStream&)
       jpeg_wxio_dest__FP20jpeg_compress_structR14wxOutputStream
+      my_fill_input_buffer
       ;wxJPEGHandler::sm_classwxJPEGHandler
       sm_classwxJPEGHandler__13wxJPEGHandler
+      empty_output_buffer
+      my_term_source
+      term_destination
       ;jpeg_wxio_src(jpeg_decompress_struct*,wxInputStream&)
       jpeg_wxio_src__FP22jpeg_decompress_structR13wxInputStream
       ;wxJPEGHandler::DoCanRead(wxInputStream&)
@@ -3024,8 +3133,10 @@ EXPORTS
       ;wxConstructorForwxJPEGHandler()
       wxConstructorForwxJPEGHandler__Fv
       __vft13wxJPEGHandler8wxObject
+      my_init_source
       ;wxJPEGHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__13wxJPEGHandlerFP7wxImageR13wxInputStreamUli
+      init_destination
   ;From object file:  ..\common\imagpcx.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPCXHandler::sm_classwxPCXHandler
@@ -3052,16 +3163,18 @@ EXPORTS
       __vft12wxPNGHandler8wxObject
       ;wxConstructorForwxPNGHandler()
       wxConstructorForwxPNGHandler__Fv
+      wx_png_error
+      wx_png_warning
+      _PNG_stream_reader
       ;wxPNGHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__12wxPNGHandlerFP7wxImageR14wxOutputStreamUl
       ;wxPNGHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__12wxPNGHandlerFP7wxImageR13wxInputStreamUli
       ;wxPNGHandler::DoCanRead(wxInputStream&)
       DoCanRead__12wxPNGHandlerFR13wxInputStream
-      png_silent_error
+      _PNG_stream_writer
       ;wxPNGHandler::sm_classwxPNGHandler
       sm_classwxPNGHandler__12wxPNGHandler
-      png_silent_warning
   ;From object file:  ..\common\imagpnm.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPNMHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
@@ -3079,16 +3192,23 @@ EXPORTS
       DoCanRead__12wxPNMHandlerFR13wxInputStream
   ;From object file:  ..\common\imagtiff.cpp
     ;PUBDEFs (Symbols available from object file):
+      _tiffCloseProc
+      _tiffUnmapProc
       ;wxTIFFHandler::DoCanRead(wxInputStream&)
       DoCanRead__13wxTIFFHandlerFR13wxInputStream
       ;TIFFwxOpen(wxOutputStream&,const char*,const char*)
       TIFFwxOpen__FR14wxOutputStreamPCcT2
+      _tiffWriteProc
       ;wxTIFFHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__13wxTIFFHandlerFP7wxImageR13wxInputStreamUli
       ;wxTIFFHandler::GetImageCount(wxInputStream&)
       GetImageCount__13wxTIFFHandlerFR13wxInputStream
       ;TIFFwxOpen(wxInputStream&,const char*,const char*)
       TIFFwxOpen__FR13wxInputStreamPCcT2
+      _tiffNullProc
+      _tiffSizeProc
+      _tiffSeekOProc
+      _tiffReadProc
       ;wxTIFFHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__13wxTIFFHandlerFP7wxImageR14wxOutputStreamUl
       __vft13wxTIFFHandler8wxObject
@@ -3096,6 +3216,8 @@ EXPORTS
       wxConstructorForwxTIFFHandler__Fv
       ;wxTIFFHandler::sm_classwxTIFFHandler
       sm_classwxTIFFHandler__13wxTIFFHandler
+      _tiffSeekIProc
+      _tiffMapProc
   ;From object file:  ..\common\imagxpm.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxConstructorForwxXPMHandler()
@@ -3257,14 +3379,20 @@ EXPORTS
       Set__13wxListBoxBaseFiPC8wxStringPPv
       ;wxListBoxBase::Command(wxCommandEvent&)
       Command__13wxListBoxBaseFR14wxCommandEvent
+      ;wxListBoxBase::~wxListBoxBase()
+      __dt__13wxListBoxBaseFv
   ;From object file:  ..\common\list.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft10wxListBase8wxObject
+      ;wxList::sm_classwxList
+      sm_classwxList__6wxList
       ;wxListBase::LastThat(int(*)(void*))
       LastThat__10wxListBaseFPFPv_i
       __vft16wxStringListNode10wxNodeBase
       ;wxListBase::Clear()
       Clear__10wxListBaseFv
+      ;wxConstructorForwxStringList()
+      wxConstructorForwxStringList__Fv
       ;wxListBase::DeleteObject(void*)
       DeleteObject__10wxListBaseFPv
       ;wxObjectListNode::DeleteData()
@@ -3293,6 +3421,8 @@ EXPORTS
       FirstThat__10wxListBaseFPFPv_i
       ;wxNodeBase::~wxNodeBase()
       __dt__10wxNodeBaseFv
+      ;wxConstructorForwxList()
+      wxConstructorForwxList__Fv
       ;wxStringList::Sort()
       Sort__12wxStringListFv
       ;wxListBase::Find(void*) const
@@ -3301,6 +3431,8 @@ EXPORTS
       Delete__12wxStringListFPCc
       ;wxStringList::Member(const char*) const
       Member__12wxStringListCFPCc
+      ;wxStringList::sm_classwxStringList
+      sm_classwxStringList__12wxStringList
       ;wxNodeBase::wxNodeBase(wxListBase*,wxNodeBase*,wxNodeBase*,void*,const wxListKey&)
       __ct__10wxNodeBaseFP10wxListBaseP10wxNodeBaseT2PvRC9wxListKey
       __vft10wxNodeBase
@@ -3320,6 +3452,7 @@ EXPORTS
       IndexOf__10wxListBaseCFPv
       ;wxStringListNode::DeleteData()
       DeleteData__16wxStringListNodeFv
+      wx_comparestrings
       ;wxStringList::DoCopy(const wxStringList&)
       DoCopy__12wxStringListFRC12wxStringList
       ;wxStringList::ListToArray(unsigned long) const
@@ -3350,10 +3483,12 @@ EXPORTS
       Flush__5wxLogFv
       ;wxLogChain::Flush()
       Flush__10wxLogChainFv
-      ;wxLog::SetActiveTarget(wxLog*)
-      SetActiveTarget__5wxLogFP5wxLog
+      ;wxVLogTrace(const char*,char*)
+      wxVLogTrace__FPCcPc
       ;wxLog::ms_doLog
       ms_doLog__5wxLog
+      ;wxLog::SetActiveTarget(wxLog*)
+      SetActiveTarget__5wxLogFP5wxLog
       ;wxLogWarning(const char*,...)
       wxLogWarning__FPCce
       ;wxLogVerbose(const char*,...)
@@ -3364,10 +3499,18 @@ EXPORTS
       wxLogStatus__FPCce
       ;wxLog::ClearTraceMasks()
       ClearTraceMasks__5wxLogFv
-      ;wxLog::RemoveTraceMask(const wxString&)
-      RemoveTraceMask__5wxLogFRC8wxString
+      ;wxVLogError(const char*,char*)
+      wxVLogError__FPCcPc
+      ;wxVLogTrace(unsigned long,const char*,char*)
+      wxVLogTrace__FUlPCcPc
+      ;wxVLogTrace(const char*,const char*,char*)
+      wxVLogTrace__FPCcT1Pc
+      ;wxVLogDebug(const char*,char*)
+      wxVLogDebug__FPCcPc
       ;wxLog::ms_bVerbose
       ms_bVerbose__5wxLog
+      ;wxLog::RemoveTraceMask(const wxString&)
+      RemoveTraceMask__5wxLogFRC8wxString
       ;wxSysErrorMsg(unsigned long)
       wxSysErrorMsg__FUl
       ;wxLog::DoLogString(const char*,long)
@@ -3380,11 +3523,17 @@ EXPORTS
       wxLogSysError__FPCce
       ;wxLog::DontCreateOnDemand()
       DontCreateOnDemand__5wxLogFv
-      ;wxLog::TimeStamp(wxString*)
-      TimeStamp__5wxLogFP8wxString
+      ;wxVLogWarning(const char*,char*)
+      wxVLogWarning__FPCcPc
+      ;wxVLogStatus(const char*,char*)
+      wxVLogStatus__FPCcPc
+      ;wxVLogMessage(const char*,char*)
+      wxVLogMessage__FPCcPc
       __vft10wxLogChain5wxLog
       ;wxLogChain::wxLogChain(wxLog*)
       __ct__10wxLogChainFP5wxLog
+      ;wxLog::TimeStamp(wxString*)
+      TimeStamp__5wxLogFP8wxString
       ;wxLogInfo(const char*,...)
       wxLogInfo__FPCce
       ;wxLogSysError(long,const char*,...)
@@ -3393,14 +3542,20 @@ EXPORTS
       __ct__11wxLogStreamFP7ostream
       ;wxLogPassThrough::wxLogPassThrough()
       __ct__16wxLogPassThroughFv
-      ;wxLogChain::SetLog(wxLog*)
-      SetLog__10wxLogChainFP5wxLog
+      ;wxVLogFatalError(const char*,char*)
+      wxVLogFatalError__FPCcPc
+      ;wxVLogSysError(const char*,char*)
+      wxVLogSysError__FPCcPc
+      ;wxVLogInfo(const char*,char*)
+      wxVLogInfo__FPCcPc
       ;wxLog::ms_suspendCount
       ms_suspendCount__5wxLog
       ;wxLog::ms_bAutoCreate
       ms_bAutoCreate__5wxLog
       __vft11wxLogStream5wxLog
       __vft11wxLogStderr5wxLog
+      ;wxLogChain::SetLog(wxLog*)
+      SetLog__10wxLogChainFP5wxLog
       ;wxLogStderr::DoLogString(const char*,long)
       DoLogString__11wxLogStderrFPCcl
       ;wxLogChain::DoLog(unsigned long,const char*,long)
@@ -3417,6 +3572,12 @@ EXPORTS
       GetActiveTarget__5wxLogFv
       ;wxSysErrorCode()
       wxSysErrorCode__Fv
+      ;wxVLogGeneric(unsigned long,const char*,char*)
+      wxVLogGeneric__FUlPCcPc
+      ;wxVLogVerbose(const char*,char*)
+      wxVLogVerbose__FPCcPc
+      ;wxVLogSysError(long,const char*,char*)
+      wxVLogSysError__FlPCcPc
       ;wxLog::ms_ulTraceMask
       ms_ulTraceMask__5wxLog
       ;wxLog::ms_timestamp
@@ -3985,8 +4146,12 @@ EXPORTS
       wxCreateDynamicObject__FPCc
       ;wxObject::Dump(ostream&)
       Dump__8wxObjectFR7ostream
+      ;wxObject::CreateRefData() const
+      CreateRefData__8wxObjectCFv
       ;wxClassInfo::sm_classTable
       sm_classTable__11wxClassInfo
+      ;wxObject::CloneRefData(const wxObjectRefData*) const
+      CloneRefData__8wxObjectCFPC15wxObjectRefData
       ;wxClassInfo::sm_first
       sm_first__11wxClassInfo
       ;wxObject::Ref(const wxObject&)
@@ -3996,6 +4161,8 @@ EXPORTS
       UnRef__8wxObjectFv
       ;wxClassInfo::CleanUpClasses()
       CleanUpClasses__11wxClassInfoFv
+      ;wxObject::AllocExclusive()
+      AllocExclusive__8wxObjectFv
       ;wxObject::IsKindOf(wxClassInfo*) const
       IsKindOf__8wxObjectCFP11wxClassInfo
       ;wxClassInfo::FindClass(const char*)
@@ -4816,6 +4983,7 @@ EXPORTS
       Destroy__12wxSocketBaseFv
       ;wxSocketBase::Close()
       Close__12wxSocketBaseFv
+      wx_socket_callback
       __vft14wxSocketClient8wxObject
       ;wxSocketBase::_Write(const void*,unsigned int)
       _Write__12wxSocketBaseFPCvUi
@@ -5156,8 +5324,6 @@ EXPORTS
       BeforeFirst__8wxStringCFc
       ;wxString::AfterLast(char) const
       AfterLast__8wxStringCFc
-      ;wxArrayString::wxArrayString(unsigned long)
-      __ct__13wxArrayStringFUl
       ;wxString::find(char,unsigned int) const
       find__8wxStringCFcUi
       ;wxVsnprintf(char*,unsigned int,const char*,char*)
@@ -5186,6 +5352,7 @@ EXPORTS
       AllocBeforeWrite__8wxStringFUi
       ;wxString::InitWith(const char*,unsigned int,unsigned int)
       InitWith__8wxStringFPCcUiT2
+      wxStringCompareFunction
       ;wxString::Shrink()
       Shrink__8wxStringFv
       ;wxArrayString::Shrink()
@@ -5236,6 +5403,8 @@ EXPORTS
       __pl__FRC8wxStringc
       ;wxString::Freq(char) const
       Freq__8wxStringCFc
+      ;wxArrayString::Init(unsigned long)
+      Init__13wxArrayStringFUl
       ;wxString::ToDouble(double*) const
       ToDouble__8wxStringCFPd
       ;wxString::wxString(char,unsigned int)
@@ -5409,6 +5578,8 @@ EXPORTS
       __ls__14wxTextCtrlBaseFRC8wxString
       ;wxTextCtrlBase::operator<<(int)
       __ls__14wxTextCtrlBaseFi
+      ;wxTextCtrlBase::GetRange(long,long) const
+      GetRange__14wxTextCtrlBaseCFlT1
       ;wxTextCtrlBase::wxTextCtrlBase()
       __ct__14wxTextCtrlBaseFv
       wxEVT_COMMAND_TEXT_ENTER
@@ -5477,6 +5648,8 @@ EXPORTS
       Start__11wxStopWatchFl
       ;wxGetElapsedTime(unsigned long)
       wxGetElapsedTime__FUl
+      ;wxTimerBase::~wxTimerBase()
+      __dt__11wxTimerBaseFv
       ;wxGetLocalTime()
       wxGetLocalTime__Fv
       ;wxTimerBase::Start(int,unsigned long)
@@ -5522,6 +5695,8 @@ EXPORTS
       __vft20wxTopLevelWindowBase8wxObject
       ;wxTopLevelWindowBase::sm_eventTableEntries
       sm_eventTableEntries__20wxTopLevelWindowBase
+      ;wxTopLevelWindowBase::~wxTopLevelWindowBase()
+      __dt__20wxTopLevelWindowBaseFv
       ;wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__20wxTopLevelWindowBaseFR12wxCloseEvent
       ;wxTopLevelWindowBase::DoScreenToClient(int*,int*) const
@@ -5741,6 +5916,8 @@ EXPORTS
       wxExecute__FRC8wxStringR13wxArrayString
       ;LongToString(long)
       LongToString__Fl
+      ;wxGetFontFromUser(wxWindow*,const wxFont&)
+      wxGetFontFromUser__FP8wxWindowRC6wxFont
       ;wxGetCurrentId()
       wxGetCurrentId__Fv
       ;wxYield()
@@ -5930,6 +6107,8 @@ EXPORTS
       ClearList__9wxVariantFv
       ;wxVariantDataChar::Write(wxString&) const
       Write__17wxVariantDataCharCFR8wxString
+      ;wxVariant::operator!=(const wxArrayString&) const
+      __ne__9wxVariantCFRC13wxArrayString
       ;wxVariant::wxVariant(const wxDate&,const wxString&)
       __ct__9wxVariantFRC6wxDateRC8wxString
       ;wxVariant::operator=(char)
@@ -5944,6 +6123,7 @@ EXPORTS
       Read__17wxVariantDataDateFR8wxString
       ;wxVariantDataList::wxVariantDataList(const wxList&)
       __ct__17wxVariantDataListFRC6wxList
+      __vft24wxVariantDataArrayString8wxObject
       __vft17wxVariantDataReal8wxObject
       __vft17wxVariantDataList8wxObject
       ;wxVariant::operator!=(const wxStringList&) const
@@ -5968,6 +6148,8 @@ EXPORTS
       Write__17wxVariantDataLongCFR14wxOutputStream
       ;wxVariantDataChar::Write(wxOutputStream&) const
       Write__17wxVariantDataCharCFR14wxOutputStream
+      ;wxVariantDataArrayString::Read(istream&)
+      Read__24wxVariantDataArrayStringFR7istream
       ;wxVariantDataString::Read(wxInputStream&)
       Read__19wxVariantDataStringFR13wxInputStream
       ;wxVariantDataTime::Read(istream&)
@@ -5978,12 +6160,16 @@ EXPORTS
       Read__17wxVariantDataLongFR13wxInputStream
       ;wxVariantDataLong::Eq(wxVariantData&) const
       Eq__17wxVariantDataLongCFR13wxVariantData
+      ;wxVariantDataArrayString::Copy(wxVariantData&)
+      Copy__24wxVariantDataArrayStringFR13wxVariantData
       ;wxVariant::MakeString() const
       MakeString__9wxVariantCFv
       ;wxConstructorForwxVariant()
       wxConstructorForwxVariant__Fv
       ;wxConstructorForwxVariantDataChar()
       wxConstructorForwxVariantDataChar__Fv
+      ;wxConstructorForwxVariantDataArrayString()
+      wxConstructorForwxVariantDataArrayString__Fv
       ;wxConstructorForwxTime()
       wxConstructorForwxTime__Fv
       ;wxVariant::operator!=(void*) const
@@ -6006,12 +6192,16 @@ EXPORTS
       __ct__9wxVariantFUlRC8wxString
       ;wxVariant::wxVariant(const wxList&,const wxString&)
       __ct__9wxVariantFRC6wxListRC8wxString
+      ;wxVariant::wxVariant(const wxArrayString&,const wxString&)
+      __ct__9wxVariantFRC13wxArrayStringRC8wxString
       ;wxVariant::wxVariant(const _DATE_STRUCT*,const wxString&)
       __ct__9wxVariantFPC12_DATE_STRUCTRC8wxString
       ;wxVariant::wxVariant(wxVariantData*,const wxString&)
       __ct__9wxVariantFP13wxVariantDataRC8wxString
       ;wxVariant::operator=(const wxString&)
       __as__9wxVariantFRC8wxString
+      ;wxVariant::operator=(const wxArrayString&)
+      __as__9wxVariantFRC13wxArrayString
       ;wxVariant::operator=(const char*)
       __as__9wxVariantFPCc
       ;wxVariantDataReal::Read(wxString&)
@@ -6040,6 +6230,8 @@ EXPORTS
       __vc__9wxVariantFUi
       ;wxVariant::operator!=(const wxTime&) const
       __ne__9wxVariantCFRC6wxTime
+      ;wxVariantDataArrayString::Write(ostream&) const
+      Write__24wxVariantDataArrayStringCFR7ostream
       ;wxVariantDataDateTime::Write(ostream&) const
       Write__21wxVariantDataDateTimeCFR7ostream
       ;wxVariantDataString::Write(ostream&) const
@@ -6102,6 +6294,8 @@ EXPORTS
       Write__17wxVariantDataDateCFR8wxString
       ;wxVariantDataBool::Write(wxString&) const
       Write__17wxVariantDataBoolCFR8wxString
+      ;wxVariantDataArrayString::Read(wxString&)
+      Read__24wxVariantDataArrayStringFR8wxString
       ;wxVariantDataTime::Read(wxString&)
       Read__17wxVariantDataTimeFR8wxString
       ;wxVariantDataChar::Read(wxString&)
@@ -6175,18 +6369,24 @@ EXPORTS
       __dt__9wxVariantFv
       ;wxVariantDataList::~wxVariantDataList()
       __dt__17wxVariantDataListFv
+      ;wxVariant::GetArrayString() const
+      GetArrayString__9wxVariantCFv
       ;wxVariantDataList::Clear()
       Clear__17wxVariantDataListFv
       ;wxVariantDataStringList::Write(wxString&) const
       Write__23wxVariantDataStringListCFR8wxString
       ;wxVariant::operator==(const wxString&) const
       __eq__9wxVariantCFRC8wxString
+      ;wxVariant::operator==(const wxArrayString&) const
+      __eq__9wxVariantCFRC13wxArrayString
       ;wxVariant::wxVariant(long,const wxString&)
       __ct__9wxVariantFlRC8wxString
       ;wxVariant::wxVariant(double,const wxString&)
       __ct__9wxVariantFdRC8wxString
       ;wxVariant::wxVariant(const _TIME_STRUCT*,const wxString&)
       __ct__9wxVariantFPC12_TIME_STRUCTRC8wxString
+      ;wxVariantDataArrayString::Write(wxString&) const
+      Write__24wxVariantDataArrayStringCFR8wxString
       ;wxVariantDataReal::Write(wxString&) const
       Write__17wxVariantDataRealCFR8wxString
       ;wxVariantDataVoidPtr::Read(wxString&)
@@ -6244,6 +6444,8 @@ EXPORTS
       Read__17wxVariantDataListFR7istream
       ;wxVariantDataBool::Read(wxInputStream&)
       Read__17wxVariantDataBoolFR13wxInputStream
+      ;wxVariantDataArrayString::Eq(wxVariantData&) const
+      Eq__24wxVariantDataArrayStringCFR13wxVariantData
       ;wxVariantDataStringList::Eq(wxVariantData&) const
       Eq__23wxVariantDataStringListCFR13wxVariantData
       ;wxVariantDataBool::Eq(wxVariantData&) const
@@ -6274,6 +6476,8 @@ EXPORTS
       GetStringList__9wxVariantCFv
       ;wxVariantDataList::Write(wxString&) const
       Write__17wxVariantDataListCFR8wxString
+      ;wxVariantDataArrayString::sm_classwxVariantDataArrayString
+      sm_classwxVariantDataArrayString__24wxVariantDataArrayString
       ;wxVariant::operator!=(const wxString&) const
       __ne__9wxVariantCFRC8wxString
       ;wxVariant::operator==(char) const
@@ -6407,6 +6611,8 @@ EXPORTS
       SetForegroundColour__12wxWindowBaseFRC8wxColour
       ;wxWindowBase::SetBackgroundColour(const wxColour&)
       SetBackgroundColour__12wxWindowBaseFRC8wxColour
+      ;wxWindowBase::RemoveEventHandler(wxEvtHandler*)
+      RemoveEventHandler__12wxWindowBaseFP12wxEvtHandler
       ;wxWindowBase::Destroy()
       Destroy__12wxWindowBaseFv
       ;wxWindowBase::SetConstraints(wxLayoutConstraints*)
@@ -6417,8 +6623,12 @@ EXPORTS
       OnInitDialog__12wxWindowBaseFR17wxInitDialogEvent
       ;wxWindowBase::AddChild(wxWindowBase*)
       AddChild__12wxWindowBaseFP12wxWindowBase
+      ;wxWindowBase::ms_winCaptureNext
+      ms_winCaptureNext__12wxWindowBase
       ;wxWindowBase::ms_lastControlId
       ms_lastControlId__12wxWindowBase
+      ;wxWindowBase::SetPalette(const wxPalette&)
+      SetPalette__12wxWindowBaseFRC9wxPalette
       ;wxWindowBase::RemoveConstraintReference(wxWindowBase*)
       RemoveConstraintReference__12wxWindowBaseFP12wxWindowBase
       ;wxWindowBase::LayoutPhase2(int*)
@@ -6462,10 +6672,14 @@ EXPORTS
       GetPositionConstraint__12wxWindowBaseCFPiT1
       ;wxWindowBase::TransferDataToWindow()
       TransferDataToWindow__12wxWindowBaseFv
+      ;wxWindowBase::ReleaseMouse()
+      ReleaseMouse__12wxWindowBaseFv
       ;wxWindowBase::Layout()
       Layout__12wxWindowBaseFv
       ;wxWindowBase::InitDialog()
       InitDialog__12wxWindowBaseFv
+      ;wxWindowBase::CaptureMouse()
+      CaptureMouse__12wxWindowBaseFv
       ;wxWindowBase::FindWindow(const wxString&)
       FindWindow__12wxWindowBaseFRC8wxString
       ;wxWindowBase::SetHelpTextForId(const wxString&)
@@ -6498,6 +6712,8 @@ EXPORTS
       GetUpdateClientRect__12wxWindowBaseCFv
       ;wxWindowBase::GetHelpText() const
       GetHelpText__12wxWindowBaseCFv
+      ;wxWindowBase::GetAncestorWithCustomPalette() const
+      GetAncestorWithCustomPalette__12wxWindowBaseCFv
       ;wxWindowBase::SetFont(const wxFont&)
       SetFont__12wxWindowBaseFRC6wxFont
       ;wxWindowBase::MakeModal(unsigned long)
@@ -6851,6 +7067,7 @@ EXPORTS
       ChangeYear__14wxCalendarCtrlCFP10wxDateTime
       ;wxCalendarEvent::Init()
       Init__15wxCalendarEventFv
+      __vft15wxMonthComboBox15wxItemContainer
       ;wxCalendarCtrl::GetStartDate() const
       GetStartDate__14wxCalendarCtrlCFv
       ;wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl*)
@@ -7189,6 +7406,35 @@ EXPORTS
       DoDrawText__14wxPostScriptDCFRC8wxStringiT2
       ;wxPostScriptDC::ms_PSScaleFactor
       ms_PSScaleFactor__14wxPostScriptDC
+  ;From object file:  ..\generic\dirdlgg.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxGenericDirDialog::OnOK(wxCommandEvent&)
+      OnOK__18wxGenericDirDialogFR14wxCommandEvent
+      ;wxGenericDirDialog::OnTreeSelected(wxTreeEvent&)
+      OnTreeSelected__18wxGenericDirDialogFR11wxTreeEvent
+      ;wxGenericDirDialog::OnShowHidden(wxCommandEvent&)
+      OnShowHidden__18wxGenericDirDialogFR14wxCommandEvent
+      ;wxGenericDirDialog::GetEventTable() const
+      GetEventTable__18wxGenericDirDialogCFv
+      ;wxGenericDirDialog::GetPath() const
+      GetPath__18wxGenericDirDialogCFv
+      ;wxGenericDirDialog::OnNew(wxCommandEvent&)
+      OnNew__18wxGenericDirDialogFR14wxCommandEvent
+      __vft18wxGenericDirDialog8wxObject
+      ;wxGenericDirDialog::wxGenericDirDialog(wxWindow*,const wxString&,const wxString&,long,const wxPoint&,const wxSize&,const wxString&)
+      __ct__18wxGenericDirDialogFP8wxWindowRC8wxStringT2lRC7wxPointRC6wxSizeT2
+      ;wxGenericDirDialog::ShowModal()
+      ShowModal__18wxGenericDirDialogFv
+      ;wxGenericDirDialog::SetPath(const wxString&)
+      SetPath__18wxGenericDirDialogFRC8wxString
+      ;wxGenericDirDialog::sm_eventTable
+      sm_eventTable__18wxGenericDirDialog
+      ;wxGenericDirDialog::sm_eventTableEntries
+      sm_eventTableEntries__18wxGenericDirDialog
+      ;wxGenericDirDialog::OnCloseWindow(wxCloseEvent&)
+      OnCloseWindow__18wxGenericDirDialogFR12wxCloseEvent
+      ;wxGenericDirDialog::OnTreeKeyDown(wxTreeEvent&)
+      OnTreeKeyDown__18wxGenericDirDialogFR11wxTreeEvent
   ;From object file:  ..\generic\dirctrlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDirItemData::wxDirItemData(const wxString&,const wxString&,unsigned long)
@@ -7224,6 +7470,7 @@ EXPORTS
       __vft13wxDirItemData12wxClientData
       ;wxGenericDirCtrl::Init()
       Init__16wxGenericDirCtrlFv
+      __vft19wxDirFilterListCtrl15wxItemContainer
       ;wxDirItemData::~wxDirItemData()
       __dt__13wxDirItemDataFv
       ;wxGenericDirCtrl::ParseFilter(const wxString&,wxArrayString&,wxArrayString&)
@@ -7242,6 +7489,8 @@ EXPORTS
       FillFilterList__19wxDirFilterListCtrlFRC8wxStringi
       ;wxGenericDirCtrl::SetupSections()
       SetupSections__16wxGenericDirCtrlFv
+      ;wxGenericDirCtrl::ShowHidden(unsigned long)
+      ShowHidden__16wxGenericDirCtrlFUl
       ;wxGenericDirCtrl::OnCollapseItem(wxTreeEvent&)
       OnCollapseItem__16wxGenericDirCtrlFR11wxTreeEvent
       ;wxDirItemData::HasSubDirs() const
@@ -7252,6 +7501,8 @@ EXPORTS
       GetFilePath__16wxGenericDirCtrlCFv
       ;wxGenericDirCtrl::Create(wxWindow*,const int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&,int,const wxString&)
       Create__16wxGenericDirCtrlFP8wxWindowCiRC8wxStringRC7wxPointRC6wxSizelT3iT3
+      ;wxIsDriveAvailable(const wxString&)
+      wxIsDriveAvailable__FRC8wxString
       ;wxGenericDirCtrl::SetPath(const wxString&)
       SetPath__16wxGenericDirCtrlFRC8wxString
       ;wxGenericDirCtrl::SetFilter(const wxString&)
@@ -7281,8 +7532,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxGenericFontDialog::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__19wxGenericFontDialogFR12wxCloseEvent
-      ;wxGenericFontDialog::OnPaint(wxPaintEvent&)
-      OnPaint__19wxGenericFontDialogFR12wxPaintEvent
       ;wxGenericFontDialog::wxGenericFontDialog(wxWindow*,wxFontData*)
       __ct__19wxGenericFontDialogFP8wxWindowP10wxFontData
       ;wxFontStyleIntToString(int)
@@ -7291,15 +7540,18 @@ EXPORTS
       Create__19wxGenericFontDialogFP8wxWindowP10wxFontData
       ;wxGenericFontDialog::GetEventTable() const
       GetEventTable__19wxGenericFontDialogCFv
+      ;wxFontPreviewer::sm_eventTable
+      sm_eventTable__15wxFontPreviewer
       ;wxGenericFontDialog::~wxGenericFontDialog()
       __dt__19wxGenericFontDialogFv
       ;wxFontWeightStringToInt(char*)
       wxFontWeightStringToInt__FPc
+      __vft15wxFontPreviewer8wxObject
       __vft19wxGenericFontDialog8wxObject
       ;wxFontFamilyIntToString(int)
       wxFontFamilyIntToString__Fi
-      ;wxGenericFontDialog::PaintFontBackground(wxDC&)
-      PaintFontBackground__19wxGenericFontDialogFR4wxDC
+      ;wxFontPreviewer::OnPaint(wxPaintEvent&)
+      OnPaint__15wxFontPreviewerFR12wxPaintEvent
       ;wxGenericFontDialog::OnChangeFont(wxCommandEvent&)
       OnChangeFont__19wxGenericFontDialogFR14wxCommandEvent
       ;wxGenericFontDialog::ShowModal()
@@ -7310,6 +7562,8 @@ EXPORTS
       sm_eventTable__19wxGenericFontDialog
       ;wxFontWeightIntToString(int)
       wxFontWeightIntToString__Fi
+      ;wxFontPreviewer::GetEventTable() const
+      GetEventTable__15wxFontPreviewerCFv
       ;wxConstructorForwxGenericFontDialog()
       wxConstructorForwxGenericFontDialog__Fv
       ;wxFontFamilyStringToInt(char*)
@@ -7318,12 +7572,12 @@ EXPORTS
       wxFontStyleStringToInt__FPc
       ;wxGenericFontDialog::wxGenericFontDialog()
       __ct__19wxGenericFontDialogFv
+      ;wxFontPreviewer::sm_eventTableEntries
+      sm_eventTableEntries__15wxFontPreviewer
       ;wxGenericFontDialog::InitializeFont()
       InitializeFont__19wxGenericFontDialogFv
       ;wxGenericFontDialog::CreateWidgets()
       CreateWidgets__19wxGenericFontDialogFv
-      ;wxGenericFontDialog::PaintFont(wxDC&)
-      PaintFont__19wxGenericFontDialogFR4wxDC
       ;wxGenericFontDialog::sm_classwxGenericFontDialog
       sm_classwxGenericFontDialog__19wxGenericFontDialog
   ;From object file:  ..\generic\fdrepdlg.cpp
@@ -8435,42 +8689,6 @@ EXPORTS
       sm_eventTableEntries__11wxHelpFrame
       ;wxHelpFrame::~wxHelpFrame()
       __dt__11wxHelpFrameFv
-  ;From object file:  ..\generic\helpxlp.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxXLPHelpController::DisplayContents()
-      DisplayContents__19wxXLPHelpControllerFv
-      ;wxXLPHelpController::Quit()
-      Quit__19wxXLPHelpControllerFv
-      ;wxXLPHelpController::DisplayBlock(long)
-      DisplayBlock__19wxXLPHelpControllerFl
-      __vft19wxXLPHelpController8wxObject
-      __vft19wxXLPHelpConnection8wxObject
-      ;wxXLPHelpController::DisplaySection(int)
-      DisplaySection__19wxXLPHelpControllerFi
-      ;wxXLPHelpConnection::wxXLPHelpConnection(wxXLPHelpController*)
-      __ct__19wxXLPHelpConnectionFP19wxXLPHelpController
-      ;wxXLPHelpController::OnQuit()
-      OnQuit__19wxXLPHelpControllerFv
-      ;wxXLPHelpClient::sm_classwxXLPHelpClient
-      sm_classwxXLPHelpClient__15wxXLPHelpClient
-      ;wxXLPHelpController::Initialize(const wxString&,int)
-      Initialize__19wxXLPHelpControllerFRC8wxStringi
-      ;wxXLPHelpController::~wxXLPHelpController()
-      __dt__19wxXLPHelpControllerFv
-      ;wxXLPHelpController::Run()
-      Run__19wxXLPHelpControllerFv
-      ;wxXLPHelpConnection::OnDisconnect()
-      OnDisconnect__19wxXLPHelpConnectionFv
-      ;wxXLPHelpController::LoadFile(const wxString&)
-      LoadFile__19wxXLPHelpControllerFRC8wxString
-      ;wxXLPHelpController::KeywordSearch(const wxString&)
-      KeywordSearch__19wxXLPHelpControllerFRC8wxString
-      ;wxXLPHelpController::wxXLPHelpController()
-      __ct__19wxXLPHelpControllerFv
-      ;wxXLPHelpController::sm_classwxXLPHelpController
-      sm_classwxXLPHelpController__19wxXLPHelpController
-      ;wxXLPHelpConnection::sm_classwxXLPHelpConnection
-      sm_classwxXLPHelpConnection__19wxXLPHelpConnection
   ;From object file:  ..\generic\imaglist.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft11wxImageList8wxObject
@@ -9151,6 +9369,8 @@ EXPORTS
       __dt__11wxLogWindowFv
       ;wxLogGui::Clear()
       Clear__8wxLogGuiFv
+      ;wxVLogStatus(wxFrame*,const char*,char*)
+      wxVLogStatus__FP7wxFramePCcPc
       __vft8wxLogGui5wxLog
       ;wxLogDialog::OnOk(wxCommandEvent&)
       OnOk__11wxLogDialogFR14wxCommandEvent
@@ -9171,6 +9391,22 @@ EXPORTS
       ;wxLogWindow::wxLogWindow(wxFrame*,const char*,unsigned long,unsigned long)
       __ct__11wxLogWindowFP7wxFramePCcUlT3
   ;From object file:  ..\generic\numdlgg.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxGetNumberFromUser(const wxString&,const wxString&,const wxString&,long,long,long,wxWindow*,const wxPoint&)
+      wxGetNumberFromUser__FRC8wxStringN21lN24P8wxWindowRC7wxPoint
+      ;wxNumberEntryDialog::GetEventTable() const
+      GetEventTable__19wxNumberEntryDialogCFv
+      ;wxNumberEntryDialog::sm_eventTableEntries
+      sm_eventTableEntries__19wxNumberEntryDialog
+      ;wxNumberEntryDialog::OnOK(wxCommandEvent&)
+      OnOK__19wxNumberEntryDialogFR14wxCommandEvent
+      ;wxNumberEntryDialog::wxNumberEntryDialog(wxWindow*,const wxString&,const wxString&,const wxString&,long,long,long,const wxPoint&)
+      __ct__19wxNumberEntryDialogFP8wxWindowRC8wxStringN22lN25RC7wxPoint
+      ;wxNumberEntryDialog::OnCancel(wxCommandEvent&)
+      OnCancel__19wxNumberEntryDialogFR14wxCommandEvent
+      __vft19wxNumberEntryDialog8wxObject
+      ;wxNumberEntryDialog::sm_eventTable
+      sm_eventTable__19wxNumberEntryDialog
   ;From object file:  ..\generic\panelg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPanel::OnSysColourChanged(wxSysColourChangedEvent&)
@@ -9491,6 +9727,8 @@ EXPORTS
       RemoveChild__16wxSplitterWindowFP12wxWindowBase
       ;wxSplitterWindow::ReplaceWindow(wxWindow*,wxWindow*)
       ReplaceWindow__16wxSplitterWindowFP8wxWindowT1
+      ;wxSplitterWindow::AdjustSashPosition(int) const
+      AdjustSashPosition__16wxSplitterWindowCFi
       ;wxSplitterWindow::GetDefaultItem() const
       GetDefaultItem__16wxSplitterWindowCFv
       ;wxSplitterWindow::InitColours()
@@ -9503,6 +9741,8 @@ EXPORTS
       __vft16wxSplitterWindow8wxObject
       ;wxSplitterWindow::OnSetCursor(wxSetCursorEvent&)
       OnSetCursor__16wxSplitterWindowFR16wxSetCursorEvent
+      ;wxSplitterWindow::DoSplit(wxSplitMode,wxWindow*,wxWindow*,int)
+      DoSplit__16wxSplitterWindowF11wxSplitModeP8wxWindowT2i
       ;wxSplitterWindow::DrawSashTracker(int,int)
       DrawSashTracker__16wxSplitterWindowFiT1
       ;wxConstructorForwxSplitterWindow()
@@ -9516,8 +9756,8 @@ EXPORTS
       OnSashPosChanged__16wxSplitterWindowFR15wxSplitterEvent
       ;wxSplitterEvent::sm_classwxSplitterEvent
       sm_classwxSplitterEvent__15wxSplitterEvent
-      ;wxSplitterWindow::SplitHorizontally(wxWindow*,wxWindow*,int)
-      SplitHorizontally__16wxSplitterWindowFP8wxWindowT1i
+      ;wxSplitterWindow::GetWindowSize() const
+      GetWindowSize__16wxSplitterWindowCFv
       ;wxSplitterWindow::SizeWindows()
       SizeWindows__16wxSplitterWindowFv
       ;wxSplitterWindow::SendUnsplitEvent(wxWindow*)
@@ -9552,8 +9792,6 @@ EXPORTS
       SetSashPosition__16wxSplitterWindowFiUl
       ;wxSplitterWindow::SashHitTest(int,int,int)
       SashHitTest__16wxSplitterWindowFiN21
-      ;wxSplitterWindow::SplitVertically(wxWindow*,wxWindow*,int)
-      SplitVertically__16wxSplitterWindowFP8wxWindowT1i
       ;wxConstructorForwxSplitterEvent()
       wxConstructorForwxSplitterEvent__Fv
       ;wxSplitterWindow::DrawSash(wxDC&)
@@ -10101,6 +10339,7 @@ EXPORTS
       Insert__18wxHtmlBookRecArrayFRC16wxHtmlBookRecordUi
       ;wxHtmlBookRecArray::~wxHtmlBookRecArray()
       __dt__18wxHtmlBookRecArrayFv
+      wxHtmlHelpIndexCompareFunc
       ;wxHtmlHelpData::SetTempDir(const wxString&)
       SetTempDir__14wxHtmlHelpDataFRC8wxString
       ;wxHtmlHelpData::FindPageByName(const wxString&)
@@ -10355,8 +10594,11 @@ EXPORTS
       SetEncoding__20wxHtmlEntitiesParserF14wxFontEncoding
       ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
       PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
+      ;wxHtmlParser::OpenURL(wxHtmlURLType,const wxString&) const
+      OpenURL__12wxHtmlParserCF13wxHtmlURLTypeRC8wxString
       ;wxHtmlTextPieces::RemoveAt(unsigned int)
       RemoveAt__16wxHtmlTextPiecesFUi
+      wxHtmlEntityCompare
       ;wxHtmlEntitiesParser::GetCharForCode(unsigned int)
       GetCharForCode__20wxHtmlEntitiesParserFUi
       ;wxHtmlParser::CreateDOMSubTree(wxHtmlTag*,int,int,wxHtmlTagsCache*)
@@ -10389,8 +10631,8 @@ EXPORTS
       ;wxHtmlTag::GetParam(const wxString&,unsigned long) const
       GetParam__9wxHtmlTagCFRC8wxStringUl
       __vft9wxHtmlTag8wxObject
-      ;wxHtmlTag::ScanParam(const wxString&,char*,void*) const
-      ScanParam__9wxHtmlTagCFRC8wxStringPcPv
+      ;wxHtmlTag::ScanParam(const wxString&,const char*,void*) const
+      ScanParam__9wxHtmlTagCFRC8wxStringPCcPv
       ;wxHtmlTag::GetNextTag() const
       GetNextTag__9wxHtmlTagCFv
       ;wxHtmlTagsCache::wxHtmlTagsCache(const wxString&)
@@ -10726,6 +10968,14 @@ EXPORTS
       _link_dummy_func_m_pre__Fv
       ;wxConstructorForHTML_ModulePre()
       wxConstructorForHTML_ModulePre__Fv
+  ;From object file:  ..\html\m_style.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;HTML_ModuleStyleTag::sm_classHTML_ModuleStyleTag
+      sm_classHTML_ModuleStyleTag__19HTML_ModuleStyleTag
+      ;_link_dummy_func_m_style()
+      _link_dummy_func_m_style__Fv
+      ;wxConstructorForHTML_ModuleStyleTag()
+      wxConstructorForHTML_ModuleStyleTag__Fv
   ;From object file:  ..\html\m_tables.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTableCell::ReallocRows(int)
@@ -10755,6 +11005,8 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTagsModule::sm_classwxHtmlTagsModule
       sm_classwxHtmlTagsModule__16wxHtmlTagsModule
+      ;wxHtmlWinParser::wxHtmlWinParser(wxHtmlWindow*)
+      __ct__15wxHtmlWinParserFP12wxHtmlWindow
       ;wxHtmlWinParser::AddText(const char*)
       AddText__15wxHtmlWinParserFPCc
       ;wxHtmlWinParser::SetFonts(wxString,wxString,const int*)
@@ -10797,8 +11049,8 @@ EXPORTS
       OnInit__16wxHtmlTagsModuleFv
       ;wxHtmlWinParser::CreateCurrentFont()
       CreateCurrentFont__15wxHtmlWinParserFv
-      ;wxHtmlWinParser::wxHtmlWinParser(wxWindow*)
-      __ct__15wxHtmlWinParserFP8wxWindow
+      ;wxHtmlWinParser::OpenURL(wxHtmlURLType,const wxString&) const
+      OpenURL__15wxHtmlWinParserCF13wxHtmlURLTypeRC8wxString
       ;wxHtmlWinParser::SetFontFace(const wxString&)
       SetFontFace__15wxHtmlWinParserFRC8wxString
   ;From object file:  ..\generic\msgdlgg.cpp
@@ -11324,12 +11576,12 @@ EXPORTS
       __vft8wxColour8wxObject
       ;wxColour::wxColour(unsigned char,unsigned char,unsigned char)
       __ct__8wxColourFUcN21
-      ;wxColour::wxColour(const wxColour&)
-      __ct__8wxColourFRC8wxColour
-      ;wxColour::sm_classwxColour
-      sm_classwxColour__8wxColour
       ;wxColour::~wxColour()
       __dt__8wxColourFv
+      ;wxColour::sm_classwxColour
+      sm_classwxColour__8wxColour
+      ;wxColour::wxColour(const wxColour&)
+      __ct__8wxColourFRC8wxColour
   ;From object file:  ..\os2\combobox.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxComboBox::sm_classwxComboBox
@@ -11347,6 +11599,7 @@ EXPORTS
       DoSetSize__10wxComboBoxFiN41
       ;wxComboBox::Paste()
       Paste__10wxComboBoxFv
+      __vft10wxComboBox15wxItemContainer
       ;wxComboBox::GetInsertionPoint() const
       GetInsertionPoint__10wxComboBoxCFv
       ;wxComboBox::SetEditable(unsigned long)
@@ -11922,15 +12175,6 @@ EXPORTS
       Open__5wxDirFRC8wxString
       ;wxDir::GetName() const
       GetName__5wxDirCFv
-  ;From object file:  ..\os2\dirdlg.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxDirDialog::sm_classwxDirDialog
-      sm_classwxDirDialog__11wxDirDialog
-      __vft11wxDirDialog8wxObject
-      ;wxDirDialog::ShowModal()
-      ShowModal__11wxDirDialogFv
-      ;wxDirDialog::wxDirDialog(wxWindow*,const wxString&,const wxString&,long,const wxPoint&)
-      __ct__11wxDirDialogFP8wxWindowRC8wxStringT2lRC7wxPoint
   ;From object file:  ..\os2\dnd.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDropTarget::OnData(int,int,wxDragResult)
@@ -12031,10 +12275,10 @@ EXPORTS
       SetPS__6wxFontFUl
       ;wxNativeFontInfo::SetStyle(wxFontStyle)
       SetStyle__16wxNativeFontInfoF11wxFontStyle
-      ;wxNativeFontInfo::GetPointSize() const
-      GetPointSize__16wxNativeFontInfoCFv
       ;wxNativeFontInfo::GetStyle() const
       GetStyle__16wxNativeFontInfoCFv
+      ;wxNativeFontInfo::GetPointSize() const
+      GetPointSize__16wxNativeFontInfoCFv
       ;wxNativeFontInfo::GetFamily() const
       GetFamily__16wxNativeFontInfoCFv
       ;wxNativeFontInfo::GetFaceName() const
@@ -12130,12 +12374,12 @@ EXPORTS
       wxTestFontEncoding__FRC20wxNativeEncodingInfo
       ;wxCreateFontFromLogFont(const _FATTRS*,_FONTMETRICS* const,_FACENAMEDESC*)
       wxCreateFontFromLogFont__FPC7_FATTRSCP12_FONTMETRICSP13_FACENAMEDESC
+      ;wxFillLogFont(_FATTRS*,_FACENAMEDESC*,unsigned long*,unsigned long*,long*,wxString&,wxFont*)
+      wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCPUlT3PlR8wxStringP6wxFont
       ;wxGetNativeFontEncoding(wxFontEncoding,wxNativeEncodingInfo*)
       wxGetNativeFontEncoding__F14wxFontEncodingP20wxNativeEncodingInfo
       ;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&)
@@ -12144,8 +12388,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxFrame::HandleMenuSelect(unsigned short,unsigned short,unsigned long)
       HandleMenuSelect__7wxFrameFUsT1Ul
-      ;wxFrame::SendSizeEvent()
-      SendSizeEvent__7wxFrameFv
       ;wxFrame::OS2TranslateMessage(void**)
       OS2TranslateMessage__7wxFrameFPPv
       ;wxFrame::HandlePaint()
@@ -13278,12 +13520,18 @@ EXPORTS
       wxRadioBtnWndProc
   ;From object file:  ..\os2\radiobut.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxRadioButton::SetFocus()
+      SetFocus__13wxRadioButtonFv
       ;wxRadioButton::sm_classwxRadioButton
       sm_classwxRadioButton__13wxRadioButton
       ;wxRadioButton::OS2Command(unsigned int,unsigned short)
       OS2Command__13wxRadioButtonFUiUs
+      ;wxRadioButton::Init()
+      Init__13wxRadioButtonFv
       ;wxConstructorForwxRadioButton()
       wxConstructorForwxRadioButton__Fv
+      ;wxRadioButton::DoGetBestSize() const
+      DoGetBestSize__13wxRadioButtonCFv
       ;wxRadioButton::Command(wxCommandEvent&)
       Command__13wxRadioButtonFR14wxCommandEvent
       __vft13wxRadioButton8wxObject
@@ -13299,6 +13547,8 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxRegion::Combine(const wxRect&,wxRegionOp)
       Combine__8wxRegionFRC6wxRect10wxRegionOp
+      ;wxRegion::Offset(int,int)
+      Offset__8wxRegionFiT1
       ;wxRegion::GetBox() const
       GetBox__8wxRegionCFv
       ;wxRegionIterator::operator++()
@@ -13311,6 +13561,8 @@ EXPORTS
       __ct__8wxRegionFRC7wxPointT1
       ;wxRegion::Contains(int,int) const
       Contains__8wxRegionCFiT1
+      ;wxRegion::CloneData(const wxObjectRefData*) const
+      CloneData__8wxRegionCFPC15wxObjectRefData
       ;wxRegionIterator::GetY() const
       GetY__16wxRegionIteratorCFv
       ;wxConstructorForwxRegion()
@@ -13356,6 +13608,8 @@ EXPORTS
       __ct__16wxRegionIteratorFRC8wxRegion
       ;wxRegionIterator::GetH() const
       GetH__16wxRegionIteratorCFv
+      ;wxRegion::CreateData() const
+      CreateData__8wxRegionCFv
       ;wxRegion::SetPS(unsigned long)
       SetPS__8wxRegionFUl
       __vft16wxRegionIterator8wxObject
@@ -13826,6 +14080,8 @@ EXPORTS
       Cut__10wxTextCtrlFv
       ;wxTextCtrl::SetInsertionPointEnd()
       SetInsertionPointEnd__10wxTextCtrlFv
+      ;wxTextCtrl::OS2ShouldPreProcessMessage(void**)
+      OS2ShouldPreProcessMessage__10wxTextCtrlFPPv
       ;wxTextCtrl::DiscardEdits()
       DiscardEdits__10wxTextCtrlFv
       ;wxTextCtrl::CanUndo() const
@@ -14103,26 +14359,24 @@ EXPORTS
       DoShowWindow__19wxTopLevelWindowOS2Fi
       ;wxTopLevelWindowOS2::Init()
       Init__19wxTopLevelWindowOS2Fv
+      ;wxTopLevelWindowOS2::m_sbInitialized
+      m_sbInitialized__19wxTopLevelWindowOS2
       ;wxTopLevelWindowOS2::OS2GetCreateWindowFlags(long*) const
       OS2GetCreateWindowFlags__19wxTopLevelWindowOS2CFPl
       ;wxTopLevelWindowOS2::Iconize(unsigned long)
       Iconize__19wxTopLevelWindowOS2FUl
       ;wxTopLevelWindowOS2::DoSetClientSize(int,int)
       DoSetClientSize__19wxTopLevelWindowOS2FiT1
-      ;wxTopLevelWindowOS2::AlterChildPos()
-      AlterChildPos__19wxTopLevelWindowOS2Fv
+      ;wxTopLevelWindowOS2::IsMaximized() const
+      IsMaximized__19wxTopLevelWindowOS2CFv
       ;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&)
@@ -14131,6 +14385,8 @@ EXPORTS
       Show__19wxTopLevelWindowOS2FUl
       ;wxTopLevelWindowOS2::IsIconized() const
       IsIconized__19wxTopLevelWindowOS2CFv
+      ;wxTopLevelWindowOS2::SendSizeEvent()
+      SendSizeEvent__19wxTopLevelWindowOS2Fv
       wxDlgProc
       wxModelessWindows
   ;From object file:  ..\os2\utils.cpp
@@ -14291,6 +14547,8 @@ EXPORTS
       Freeze__8wxWindowFv
       ;wxWindow::DoPopupMenu(wxMenu*,int,int)
       DoPopupMenu__8wxWindowFP6wxMenuiT2
+      ;wxWindow::DoCaptureMouse()
+      DoCaptureMouse__8wxWindowFv
       ;wxWindow::UnpackCommand(void*,void*,unsigned short*,unsigned long*,unsigned short*)
       UnpackCommand__8wxWindowFPvT1PUsPUlT3
       ;wxDlgProc(unsigned long,unsigned int,void*,void*)
@@ -14327,8 +14585,6 @@ EXPORTS
       GetCapture__12wxWindowBaseFv
       ;wxWindow::SetFocus()
       SetFocus__8wxWindowFv
-      ;wxWindow::ReleaseMouse()
-      ReleaseMouse__8wxWindowFv
       ;wxWindow::OS2OnMeasureItem(int,void**)
       OS2OnMeasureItem__8wxWindowFiPPv
       ;wxWindow::OS2DestroyWindow()
@@ -14341,8 +14597,6 @@ EXPORTS
       HandleKeyDown__8wxWindowFUsPv
       ;wxWindow::Clear()
       Clear__8wxWindowFv
-      ;wxWindow::CaptureMouse()
-      CaptureMouse__8wxWindowFv
       ;wxRemoveHandleAssociation(wxWindow*)
       wxRemoveHandleAssociation__FP8wxWindow
       wxWndHook
@@ -14459,6 +14713,8 @@ EXPORTS
       OS2WindowProc__8wxWindowFUiPvT2
       ;wxWindow::OS2TranslateMessage(void**)
       OS2TranslateMessage__8wxWindowFPPv
+      ;wxWindow::OS2ShouldPreProcessMessage(void**)
+      OS2ShouldPreProcessMessage__8wxWindowFPPv
       ;wxWindow::OS2DefWindowProc(unsigned int,void*,void*)
       OS2DefWindowProc__8wxWindowFUiPvT2
       ;wxWindow::HandleMinimize()
@@ -14495,14 +14751,14 @@ EXPORTS
       DoMoveWindow__8wxWindowFiN31
       ;wxWindow::DoClientToScreen(int*,int*) const
       DoClientToScreen__8wxWindowCFPiT1
-      ;wxWindow::OS2DetachWindowMenu()
-      OS2DetachWindowMenu__8wxWindowFv
+      ;wxWindowBase::FindFocus()
+      FindFocus__12wxWindowBaseFv
       ;wxWindow::OS2OnDrawItem(int,void**)
       OS2OnDrawItem__8wxWindowFiPPv
       ;wxWindow::GetCharWidth() const
       GetCharWidth__8wxWindowCFv
-      ;wxWindowBase::FindFocus()
-      FindFocus__12wxWindowBaseFv
+      ;wxWindow::DoReleaseMouse()
+      DoReleaseMouse__8wxWindowFv
       ;wxWindow::SetTitle(const wxString&)
       SetTitle__8wxWindowFRC8wxString
       ;wxWindow::sm_eventTableEntries