]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/wx23.def
Weekly catch up and slider fixes.
[wxWidgets.git] / src / os2 / wx23.def
index b95b899bfca6fb53e7dd246c7d267fab1ba0b8f8..5c32c68ba282876146a53726743ffad67cbd9a04 100644 (file)
@@ -4,35 +4,84 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
-;From library:  H:\Dev\Wx2\WxWindows\lib\wx.lib
+;From library:  H:\DEV\WX2\WXWINDOWS\LIB\wx.lib
   ;From object file:  dummy.cpp
     ;PUBDEFs (Symbols available from object file):
       wxDummyChar
+  ;From object file:  ..\common\artprov.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxArtProviderCache::GetBitmap(const wxString&,wxBitmap*)
+      GetBitmap__18wxArtProviderCacheFRC8wxStringP8wxBitmap
+      ;wxArtProviderCache::Clear()
+      Clear__18wxArtProviderCacheFv
+      ;wxConstructorForwxArtProviderModule()
+      wxConstructorForwxArtProviderModule__Fv
+      ;wxArtProvider::PopProvider()
+      PopProvider__13wxArtProviderFv
+      ;wxArtProvider::CleanUpProviders()
+      CleanUpProviders__13wxArtProviderFv
+      ;wxArtProviderCache::ConstructHashID(const wxString&,const wxString&,const wxSize&)
+      ConstructHashID__18wxArtProviderCacheFRC8wxStringT1RC6wxSize
+      __vft24wxwxArtProvidersListNode10wxNodeBase
+      ;wxArtProvider::GetBitmap(const wxString&,const wxString&,const wxSize&)
+      GetBitmap__13wxArtProviderFRC8wxStringT1RC6wxSize
+      ;wxArtProvider::RemoveProvider(wxArtProvider*)
+      RemoveProvider__13wxArtProviderFP13wxArtProvider
+      ;wxArtProvider::GetIcon(const wxString&,const wxString&,const wxSize&)
+      GetIcon__13wxArtProviderFRC8wxStringT1RC6wxSize
+      ;wxArtProviderModule::sm_classwxArtProviderModule
+      sm_classwxArtProviderModule__19wxArtProviderModule
+      ;wxArtProvider::PushProvider(wxArtProvider*)
+      PushProvider__13wxArtProviderFP13wxArtProvider
+      ;wxArtProvider::sm_providers
+      sm_providers__13wxArtProvider
+      ;wxArtProvider::sm_classwxArtProvider
+      sm_classwxArtProvider__13wxArtProvider
+      ;wxwxArtProvidersListNode::DeleteData()
+      DeleteData__24wxwxArtProvidersListNodeFv
+      ;wxArtProvider::sm_cache
+      sm_cache__13wxArtProvider
+  ;From object file:  ..\common\artstd.cpp
+    ;PUBDEFs (Symbols available from object file):
+      g_ArtProviderModule
+      ;wxDefaultArtProviderModule::sm_classwxDefaultArtProviderModule
+      sm_classwxDefaultArtProviderModule__26wxDefaultArtProviderModule
+      __vft20wxDefaultArtProvider8wxObject
+      ;wxDefaultArtProvider::CreateBitmap(const wxString&,const wxString&,const wxSize&)
+      CreateBitmap__20wxDefaultArtProviderFRC8wxStringT1RC6wxSize
+      ;wxConstructorForwxDefaultArtProviderModule()
+      wxConstructorForwxDefaultArtProviderModule__Fv
   ;From object file:  ..\common\appcmn.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxOnAssert(const char*,int,const char*)
-      wxOnAssert__FPCciT1
       ;wxAppBase::OnInitGui()
       OnInitGui__9wxAppBaseFv
       ;wxAppBase::OnInitCmdLine(wxCmdLineParser&)
       OnInitCmdLine__9wxAppBaseFR15wxCmdLineParser
       ;wxAppBase::OnCmdLineParsed(wxCmdLineParser&)
       OnCmdLineParsed__9wxAppBaseFR15wxCmdLineParser
+      ;wxAppBase::CheckBuildOptions(const wxBuildOptions&)
+      CheckBuildOptions__9wxAppBaseFRC14wxBuildOptions
+      ;wxAppBase::FilterEvent(wxEvent&)
+      FilterEvent__9wxAppBaseFR7wxEvent
       __vft9wxAppBase8wxObject
       ;wxAppBase::OnCmdLineHelp(wxCmdLineParser&)
       OnCmdLineHelp__9wxAppBaseFR15wxCmdLineParser
       ;wxTrap()
       wxTrap__Fv
-      ;wxAppBase::OnAssert(const char*,int,const char*)
-      OnAssert__9wxAppBaseFPCciT1
       ;wxAppBase::OnExit()
       OnExit__9wxAppBaseFv
       ;wxAssertIsEqual(int,int)
       wxAssertIsEqual__FiT1
+      ;wxAppBase::OnAssert(const char*,int,const char*,const char*)
+      OnAssert__9wxAppBaseFPCciN21
       ;wxAppBase::wxAppBase()
       __ct__9wxAppBaseFv
       ;wxAppBase::OnInit()
       OnInit__9wxAppBaseFv
+      ;wxOnAssert(const char*,int,const char*,const char*)
+      wxOnAssert__FPCciN21
+      ;wxAppBase::~wxAppBase()
+      __dt__9wxAppBaseFv
       ;wxAppBase::ProcessPendingEvents()
       ProcessPendingEvents__9wxAppBaseFv
       ;wxAppBase::OnCmdLineError(wxCmdLineParser&)
@@ -41,6 +90,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
@@ -84,12 +135,10 @@ EXPORTS
       Index__13wxArrayParamsCFRC14wxCmdLineParamUl
       ;wxCmdLineParser::Found(const wxString&,long*) const
       Found__15wxCmdLineParserCFRC8wxStringPl
-      ;wxArrayParams::RemoveAt(unsigned int)
-      RemoveAt__13wxArrayParamsFUi
+      ;wxArrayParams::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__13wxArrayParamsFUiT1
       ;wxCmdLineParser::AddSwitch(const wxString&,const wxString&,const wxString&,int)
       AddSwitch__15wxCmdLineParserFRC8wxStringN21i
-      ;wxArrayOptions::Add(const wxCmdLineOption&)
-      Add__14wxArrayOptionsFRC15wxCmdLineOption
       ;wxCmdLineParser::Reset()
       Reset__15wxCmdLineParserFv
       ;wxCmdLineParser::SetCmdLine(int,char**)
@@ -106,12 +155,12 @@ EXPORTS
       FindOptionByLongName__19wxCmdLineParserDataFRC8wxString
       ;wxArrayOptions::Index(const wxCmdLineOption&,unsigned long) const
       Index__14wxArrayOptionsCFRC15wxCmdLineOptionUl
-      ;wxArrayOptions::RemoveAt(unsigned int)
-      RemoveAt__14wxArrayOptionsFUi
-      ;wxArrayParams::Insert(const wxCmdLineParam&,unsigned int)
-      Insert__13wxArrayParamsFRC14wxCmdLineParamUi
+      ;wxArrayOptions::Insert(const wxCmdLineOption&,unsigned int,unsigned int)
+      Insert__14wxArrayOptionsFRC15wxCmdLineOptionUiT2
       ;wxCmdLineParserData::wxCmdLineParserData()
       __ct__19wxCmdLineParserDataFv
+      ;wxCmdLineParser::AreLongOptionsEnabled()
+      AreLongOptionsEnabled__15wxCmdLineParserFv
       ;wxCmdLineParser::SetCmdLine(const wxString&)
       SetCmdLine__15wxCmdLineParserFRC8wxString
       ;wxArrayParams::wxArrayParams(const wxArrayParams&)
@@ -122,28 +171,30 @@ EXPORTS
       SetArguments__19wxCmdLineParserDataFRC8wxString
       ;wxCmdLineParser::ConvertStringToArgs(const char*)
       ConvertStringToArgs__15wxCmdLineParserFPCc
-      ;wxArrayOptions::Insert(const wxCmdLineOption&,unsigned int)
-      Insert__14wxArrayOptionsFRC15wxCmdLineOptionUi
-      ;wxArrayParams::Add(const wxCmdLineParam&)
-      Add__13wxArrayParamsFRC14wxCmdLineParam
+      ;wxArrayOptions::Add(const wxCmdLineOption&,unsigned int)
+      Add__14wxArrayOptionsFRC15wxCmdLineOptionUi
       ;wxArrayParams::DoEmpty()
       DoEmpty__13wxArrayParamsFv
       ;wxArrayOptions::~wxArrayOptions()
       __dt__14wxArrayOptionsFv
       ;wxCmdLineParser::Usage()
       Usage__15wxCmdLineParserFv
+      ;wxArrayParams::Insert(const wxCmdLineParam&,unsigned int,unsigned int)
+      Insert__13wxArrayParamsFRC14wxCmdLineParamUiT2
       ;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
+      ;wxArrayParams::Add(const wxCmdLineParam&,unsigned int)
+      Add__13wxArrayParamsFRC14wxCmdLineParamUi
       ;wxCmdLineParser::GetParam(unsigned int) const
       GetParam__15wxCmdLineParserCFUi
       ;wxCmdLineParser::Found(const wxString&,wxDateTime*) const
       Found__15wxCmdLineParserCFRC8wxStringP10wxDateTime
+      ;wxCmdLineParser::AddParam(const wxString&,wxCmdLineParamType,int)
+      AddParam__15wxCmdLineParserFRC8wxString18wxCmdLineParamTypei
       ;wxCmdLineParser::Init()
       Init__15wxCmdLineParserFv
       ;wxCmdLineParser::~wxCmdLineParser()
@@ -152,6 +203,8 @@ EXPORTS
       __dt__13wxArrayParamsFv
       ;wxArrayParams::operator=(const wxArrayParams&)
       __as__13wxArrayParamsFRC13wxArrayParams
+      ;wxArrayOptions::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__14wxArrayOptionsFUiT1
       ;wxCmdLineParser::AddOption(const wxString&,const wxString&,const wxString&,wxCmdLineParamType,int)
       AddOption__15wxCmdLineParserFRC8wxStringN2118wxCmdLineParamTypei
       ;wxArrayOptions::DoEmpty()
@@ -178,14 +231,16 @@ EXPORTS
       __ct__21wxPageSetupDialogDataFRC11wxPrintData
       ;wxPageSetupDialogData::operator=(const wxPageSetupDialogData&)
       __as__21wxPageSetupDialogDataFRC21wxPageSetupDialogData
-      ;wxPrintData::wxPrintData()
-      __ct__11wxPrintDataFv
+      ;wxFontDialogBase::~wxFontDialogBase()
+      __dt__16wxFontDialogBaseFv
       ;wxConstructorForwxPageSetupDialogData()
       wxConstructorForwxPageSetupDialogData__Fv
       ;wxPrintDialogData::~wxPrintDialogData()
       __dt__17wxPrintDialogDataFv
       ;wxColourData::wxColourData()
       __ct__12wxColourDataFv
+      ;wxPrintData::wxPrintData()
+      __ct__11wxPrintDataFv
       ;wxPageSetupDialogData::CalculatePaperSizeFromId()
       CalculatePaperSizeFromId__21wxPageSetupDialogDataFv
       ;wxPageSetupDialogData::CalculateIdFromPaperSize()
@@ -198,12 +253,12 @@ EXPORTS
       sm_classwxFontData__10wxFontData
       ;wxPageSetupDialogData::SetPaperSize(wxPaperSize)
       SetPaperSize__21wxPageSetupDialogDataF11wxPaperSize
+      ;wxFontData::~wxFontData()
+      __dt__10wxFontDataFv
       ;wxConstructorForwxColourData()
       wxConstructorForwxColourData__Fv
       ;wxColourData::~wxColourData()
       __dt__12wxColourDataFv
-      ;wxFontData::~wxFontData()
-      __dt__10wxFontDataFv
       ;wxPrintData::wxPrintData(const wxPrintData&)
       __ct__11wxPrintDataFRC11wxPrintData
       ;wxPrintDialogData::sm_classwxPrintDialogData
@@ -218,23 +273,24 @@ EXPORTS
       __as__17wxPrintDialogDataFRC17wxPrintDialogData
       ;wxPrintDialogData::operator=(const wxPrintData&)
       __as__17wxPrintDialogDataFRC11wxPrintData
-      ;wxConstructorForwxFontData()
-      wxConstructorForwxFontData__Fv
       ;wxFontData::wxFontData()
       __ct__10wxFontDataFv
-      __vft12wxColourData8wxObject
-      __vft17wxPrintDialogData8wxObject
+      ;wxConstructorForwxFontData()
+      wxConstructorForwxFontData__Fv
       __vft10wxFontData8wxObject
+      __vft17wxPrintDialogData8wxObject
+      __vft16wxFontDialogBase8wxObject
+      __vft12wxColourData8wxObject
       ;wxColourData::operator=(const wxColourData&)
       __as__12wxColourDataFRC12wxColourData
       ;wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData&)
       __ct__17wxPrintDialogDataFRC17wxPrintDialogData
+      ;wxPrintData::Ok() const
+      Ok__11wxPrintDataCFv
       ;wxConstructorForwxPrintData()
       wxConstructorForwxPrintData__Fv
       ;wxPageSetupDialogData::~wxPageSetupDialogData()
       __dt__21wxPageSetupDialogDataFv
-      ;wxColourData::SetCustomColour(int,wxColour&)
-      SetCustomColour__12wxColourDataFiR8wxColour
       ;wxPrintData::operator=(const wxPrintData&)
       __as__11wxPrintDataFRC11wxPrintData
       ;wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData&)
@@ -251,6 +307,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&)
@@ -386,10 +444,12 @@ EXPORTS
       OnInit__20wxHelpProviderModuleFv
       ;wxContextHelpEvtHandler::ProcessEvent(wxEvent&)
       ProcessEvent__23wxContextHelpEvtHandlerFR7wxEvent
-      ;wxSimpleHelpProvider::ShowHelp(wxWindowBase*)
-      ShowHelp__20wxSimpleHelpProviderFP12wxWindowBase
+      ;wxSimpleHelpProvider::RemoveHelp(wxWindowBase*)
+      RemoveHelp__20wxSimpleHelpProviderFP12wxWindowBase
       ;wxHelpProviderModule::sm_classwxHelpProviderModule
       sm_classwxHelpProviderModule__20wxHelpProviderModule
+      ;wxSimpleHelpProvider::ShowHelp(wxWindowBase*)
+      ShowHelp__20wxSimpleHelpProviderFP12wxWindowBase
       ;wxContextHelpButton::sm_eventTableEntries
       sm_eventTableEntries__19wxContextHelpButton
       ;wxHelpProvider::AddHelp(int,const wxString&)
@@ -424,6 +484,8 @@ EXPORTS
       __vft23wxContextHelpEvtHandler8wxObject
       __vft20wxHelpProviderModule8wxObject
       __vft13wxContextHelp8wxObject
+      ;wxHelpProvider::RemoveHelp(wxWindowBase*)
+      RemoveHelp__14wxHelpProviderFP12wxWindowBase
       ;wxContextHelpButton::GetEventTable() const
       GetEventTable__19wxContextHelpButtonCFv
       ;wxContextHelpButton::sm_classwxContextHelpButton
@@ -445,10 +507,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 +525,19 @@ EXPORTS
       GetClientObject__15wxItemContainerCFi
       ;wxItemContainer::SetClientData(int,void*)
       SetClientData__15wxItemContainerFiPv
+      __vft18wxControlWithItems8wxObject
+      ;wxItemContainer::Append(const wxArrayString&)
+      Append__15wxItemContainerFRC13wxArrayString
+      ;wxItemContainer::~wxItemContainer()
+      __dt__15wxItemContainerFv
+      ;wxControlWithItems::~wxControlWithItems()
+      __dt__18wxControlWithItemsFv
       ;wxItemContainer::GetStringSelection() const
       GetStringSelection__15wxItemContainerCFv
       ;wxItemContainer::SetClientObject(int,wxClientData*)
       SetClientObject__15wxItemContainerFiP12wxClientData
+      __vft15wxItemContainer
+      __vft18wxControlWithItems15wxItemContainer
   ;From object file:  ..\common\datetime.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDateTime::wxDateTime(double)
@@ -487,8 +562,6 @@ EXPORTS
       Multiply__10wxDateSpanFi
       ;wxDateTime::IsWorkDay(wxDateTime::Country) const
       IsWorkDay__10wxDateTimeCFQ2_10wxDateTime7Country
-      ;wxDateTimeArray::Insert(const wxDateTime&,unsigned int)
-      Insert__15wxDateTimeArrayFRC10wxDateTimeUi
       ;wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags,const wxDateTime::TimeZone&) const
       GetWeekOfYear__10wxDateTimeCFQ2_10wxDateTime9WeekFlagsRCQ2_10wxDateTime8TimeZone
       ;wxDateTime::GetLastMonthDay(wxDateTime::Month,int) const
@@ -591,6 +664,8 @@ EXPORTS
       Set__10wxDateTimeFUsN31
       ;wxDateTime::SetToLastWeekDay(wxDateTime::WeekDay,wxDateTime::Month,int)
       SetToLastWeekDay__10wxDateTimeFQ2_10wxDateTime7WeekDayQ2_10wxDateTime5Monthi
+      ;wxDateTimeArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__15wxDateTimeArrayFUiT1
       ;wxDateTime::ParseFormat(const char*,const char*,const wxDateTime&)
       ParseFormat__10wxDateTimeFPCcT1RC10wxDateTime
       ;wxDateSpan::Multiply(int) const
@@ -615,8 +690,8 @@ EXPORTS
       DoGetHolidaysInRange__18wxDateTimeWorkDaysCFRC10wxDateTimeT1R15wxDateTimeArray
       ;wxDateTime::ConvertYearToBC(int)
       ConvertYearToBC__10wxDateTimeFi
-      ;wxDateTimeArray::Add(const wxDateTime&)
-      Add__15wxDateTimeArrayFRC10wxDateTime
+      ;wxDateTimeArray::Add(const wxDateTime&,unsigned int)
+      Add__15wxDateTimeArrayFRC10wxDateTimeUi
       ;wxDateTime::Tm::AddMonths(int)
       AddMonths__Q2_10wxDateTime2TmFi
       ;wxDateTime::TimeZone::TimeZone(wxDateTime::TZ)
@@ -627,6 +702,8 @@ EXPORTS
       IsLeapYear__10wxDateTimeFiQ2_10wxDateTime8Calendar
       ;wxTimeSpan::IsEqualTo(const wxTimeSpan&) const
       IsEqualTo__10wxTimeSpanCFRC10wxTimeSpan
+      ;wxDateTimeArray::Insert(const wxDateTime&,unsigned int,unsigned int)
+      Insert__15wxDateTimeArrayFRC10wxDateTimeUiT2
       ;wxTimeSpan::GetWeeks() const
       GetWeeks__10wxTimeSpanCFv
       ;wxDateTime::GetTicks() const
@@ -654,8 +731,6 @@ EXPORTS
       SetToTheWeek__10wxDateTimeFUsQ2_10wxDateTime7WeekDay
       ;wxDateTime::SetToPrevWeekDay(wxDateTime::WeekDay)
       SetToPrevWeekDay__10wxDateTimeFQ2_10wxDateTime7WeekDay
-      ;wxDateTimeArray::RemoveAt(unsigned int)
-      RemoveAt__15wxDateTimeArrayFUi
       ;wxDateTime::IsSameTime(const wxDateTime&) const
       IsSameTime__10wxDateTimeCFRC10wxDateTime
       ;wxDateTime::IsSameDate(const wxDateTime&) const
@@ -911,6 +986,8 @@ EXPORTS
       RemoveChild__12wxDialogBaseFP12wxWindowBase
       ;wxDialogBase::GetEventTable() const
       GetEventTable__12wxDialogBaseCFv
+      ;wxDialogBase::SetTmpDefaultItem(wxWindow*)
+      SetTmpDefaultItem__12wxDialogBaseFP8wxWindow
   ;From object file:  ..\common\dobjcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDataObjectComposite::GetDataSize(const wxDataFormat&) const
@@ -1078,6 +1155,8 @@ EXPORTS
       OnNewDocument__10wxDocumentFv
       ;wxView::OnCreatePrintout()
       OnCreatePrintout__6wxViewFv
+      ;wxDocument::NotifyClosing()
+      NotifyClosing__10wxDocumentFv
       ;wxDocManager::GetNoHistoryFiles() const
       GetNoHistoryFiles__12wxDocManagerCFv
       ;wxFileHistory::AddFilesToMenu()
@@ -1334,40 +1413,142 @@ EXPORTS
       wxDirSelectorPromptStr
   ;From object file:  ..\common\dynarray.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxBaseArray::Add(long)
-      Add__11wxBaseArrayFl
-      ;wxBaseArray::Remove(long)
-      Remove__11wxBaseArrayFl
-      ;wxBaseArray::~wxBaseArray()
-      __dt__11wxBaseArrayFv
-      ;wxBaseArray::Sort(int(*)(const void*,const void*))
-      Sort__11wxBaseArrayFPFPCvT1_i
-      ;wxBaseArray::IndexForInsert(long,int(*)(const void*,const void*)) const
-      IndexForInsert__11wxBaseArrayCFlPFPCvT1_i
-      ;wxBaseArray::wxBaseArray()
-      __ct__11wxBaseArrayFv
-      ;wxBaseArray::Clear()
-      Clear__11wxBaseArrayFv
-      ;wxBaseArray::Insert(long,unsigned int)
-      Insert__11wxBaseArrayFlUi
-      ;wxBaseArray::wxBaseArray(const wxBaseArray&)
-      __ct__11wxBaseArrayFRC11wxBaseArray
-      ;wxBaseArray::Add(long,int(*)(const void*,const void*))
-      Add__11wxBaseArrayFlPFPCvT1_i
-      ;wxBaseArray::Shrink()
-      Shrink__11wxBaseArrayFv
-      ;wxBaseArray::operator=(const wxBaseArray&)
-      __as__11wxBaseArrayFRC11wxBaseArray
-      ;wxBaseArray::RemoveAt(unsigned int)
-      RemoveAt__11wxBaseArrayFUi
-      ;wxBaseArray::Index(long,int(*)(const void*,const void*)) const
-      Index__11wxBaseArrayCFlPFPCvT1_i
-      ;wxBaseArray::Grow()
-      Grow__11wxBaseArrayFv
-      ;wxBaseArray::Index(long,unsigned long) const
-      Index__11wxBaseArrayCFlUl
-      ;wxBaseArray::Alloc(unsigned int)
-      Alloc__11wxBaseArrayFUi
+      ;wxBaseArrayPtrVoid::Index(const void*,unsigned long) const
+      Index__18wxBaseArrayPtrVoidCFPCvUl
+      ;wxBaseArrayPtrVoid::Alloc(unsigned int)
+      Alloc__18wxBaseArrayPtrVoidFUi
+      ;wxBaseArrayLong::Index(long,int(*)(const void*,const void*)) const
+      Index__15wxBaseArrayLongCFlPFPCvT1_i
+      ;wxBaseArrayInt::Index(int,int(*)(const void*,const void*)) const
+      Index__14wxBaseArrayIntCFiPFPCvT1_i
+      ;wxBaseArrayPtrVoid::Add(const void*,int(*)(const void*,const void*))
+      Add__18wxBaseArrayPtrVoidFPCvPFPCvT1_i
+      ;wxBaseArrayShort::~wxBaseArrayShort()
+      __dt__16wxBaseArrayShortFv
+      ;wxBaseArrayPtrVoid::~wxBaseArrayPtrVoid()
+      __dt__18wxBaseArrayPtrVoidFv
+      ;wxBaseArrayInt::~wxBaseArrayInt()
+      __dt__14wxBaseArrayIntFv
+      ;wxBaseArrayShort::Shrink()
+      Shrink__16wxBaseArrayShortFv
+      ;wxBaseArrayInt::Shrink()
+      Shrink__14wxBaseArrayIntFv
+      ;wxBaseArrayLong::Insert(long,unsigned int,unsigned int)
+      Insert__15wxBaseArrayLongFlUiT2
+      ;wxBaseArrayInt::Insert(int,unsigned int,unsigned int)
+      Insert__14wxBaseArrayIntFiUiT2
+      ;wxBaseArrayPtrVoid::Clear()
+      Clear__18wxBaseArrayPtrVoidFv
+      ;wxBaseArrayShort::Remove(short)
+      Remove__16wxBaseArrayShortFs
+      ;wxBaseArrayPtrVoid::operator=(const wxBaseArrayPtrVoid&)
+      __as__18wxBaseArrayPtrVoidFRC18wxBaseArrayPtrVoid
+      ;wxBaseArrayShort::Add(short,unsigned int)
+      Add__16wxBaseArrayShortFsUi
+      ;wxBaseArrayShort::Index(short,int(*)(const void*,const void*)) const
+      Index__16wxBaseArrayShortCFsPFPCvT1_i
+      ;wxBaseArrayShort::IndexForInsert(short,int(*)(const void*,const void*)) const
+      IndexForInsert__16wxBaseArrayShortCFsPFPCvT1_i
+      ;wxBaseArrayLong::IndexForInsert(long,int(*)(const void*,const void*)) const
+      IndexForInsert__15wxBaseArrayLongCFlPFPCvT1_i
+      ;wxBaseArrayShort::Grow(unsigned int)
+      Grow__16wxBaseArrayShortFUi
+      ;wxBaseArrayInt::Grow(unsigned int)
+      Grow__14wxBaseArrayIntFUi
+      ;wxBaseArrayLong::Alloc(unsigned int)
+      Alloc__15wxBaseArrayLongFUi
+      ;wxBaseArrayInt::Add(int,int(*)(const void*,const void*))
+      Add__14wxBaseArrayIntFiPFPCvT1_i
+      ;wxBaseArrayShort::wxBaseArrayShort()
+      __ct__16wxBaseArrayShortFv
+      ;wxBaseArrayPtrVoid::wxBaseArrayPtrVoid()
+      __ct__18wxBaseArrayPtrVoidFv
+      ;wxBaseArrayInt::Clear()
+      Clear__14wxBaseArrayIntFv
+      ;wxBaseArrayInt::operator=(const wxBaseArrayInt&)
+      __as__14wxBaseArrayIntFRC14wxBaseArrayInt
+      ;wxBaseArrayInt::wxBaseArrayInt(const wxBaseArrayInt&)
+      __ct__14wxBaseArrayIntFRC14wxBaseArrayInt
+      ;wxBaseArrayLong::Remove(long)
+      Remove__15wxBaseArrayLongFl
+      ;wxBaseArrayShort::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__16wxBaseArrayShortFUiT1
+      ;wxBaseArrayPtrVoid::Sort(int(*)(const void*,const void*))
+      Sort__18wxBaseArrayPtrVoidFPFPCvT1_i
+      ;wxBaseArrayShort::Sort(int(*)(const void*,const void*))
+      Sort__16wxBaseArrayShortFPFPCvT1_i
+      ;wxBaseArrayLong::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__15wxBaseArrayLongFUiT1
+      ;wxBaseArrayInt::IndexForInsert(int,int(*)(const void*,const void*)) const
+      IndexForInsert__14wxBaseArrayIntCFiPFPCvT1_i
+      ;wxBaseArrayShort::Alloc(unsigned int)
+      Alloc__16wxBaseArrayShortFUi
+      ;wxBaseArrayPtrVoid::Insert(const void*,unsigned int,unsigned int)
+      Insert__18wxBaseArrayPtrVoidFPCvUiT2
+      ;wxBaseArrayPtrVoid::Shrink()
+      Shrink__18wxBaseArrayPtrVoidFv
+      ;wxBaseArrayPtrVoid::Remove(const void*)
+      Remove__18wxBaseArrayPtrVoidFPCv
+      ;wxBaseArrayShort::operator=(const wxBaseArrayShort&)
+      __as__16wxBaseArrayShortFRC16wxBaseArrayShort
+      ;wxBaseArrayPtrVoid::wxBaseArrayPtrVoid(const wxBaseArrayPtrVoid&)
+      __ct__18wxBaseArrayPtrVoidFRC18wxBaseArrayPtrVoid
+      ;wxBaseArrayShort::Index(short,unsigned long) const
+      Index__16wxBaseArrayShortCFsUl
+      ;wxBaseArrayInt::Index(int,unsigned long) const
+      Index__14wxBaseArrayIntCFiUl
+      ;wxBaseArrayInt::Sort(int(*)(const void*,const void*))
+      Sort__14wxBaseArrayIntFPFPCvT1_i
+      ;wxBaseArrayLong::Sort(int(*)(const void*,const void*))
+      Sort__15wxBaseArrayLongFPFPCvT1_i
+      ;wxBaseArrayPtrVoid::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__18wxBaseArrayPtrVoidFUiT1
+      ;wxBaseArrayPtrVoid::Index(const void*,int(*)(const void*,const void*)) const
+      Index__18wxBaseArrayPtrVoidCFPCvPFPCvT1_i
+      ;wxBaseArrayPtrVoid::IndexForInsert(const void*,int(*)(const void*,const void*)) const
+      IndexForInsert__18wxBaseArrayPtrVoidCFPCvPFPCvT1_i
+      ;wxBaseArrayPtrVoid::Grow(unsigned int)
+      Grow__18wxBaseArrayPtrVoidFUi
+      ;wxBaseArrayLong::Grow(unsigned int)
+      Grow__15wxBaseArrayLongFUi
+      ;wxBaseArrayInt::Alloc(unsigned int)
+      Alloc__14wxBaseArrayIntFUi
+      ;wxBaseArrayLong::Add(long,unsigned int)
+      Add__15wxBaseArrayLongFlUi
+      ;wxBaseArrayLong::Add(long,int(*)(const void*,const void*))
+      Add__15wxBaseArrayLongFlPFPCvT1_i
+      ;wxBaseArrayLong::wxBaseArrayLong()
+      __ct__15wxBaseArrayLongFv
+      ;wxBaseArrayShort::Clear()
+      Clear__16wxBaseArrayShortFv
+      ;wxBaseArrayLong::Index(long,unsigned long) const
+      Index__15wxBaseArrayLongCFlUl
+      ;wxBaseArrayShort::wxBaseArrayShort(const wxBaseArrayShort&)
+      __ct__16wxBaseArrayShortFRC16wxBaseArrayShort
+      ;wxBaseArrayInt::Add(int,unsigned int)
+      Add__14wxBaseArrayIntFiUi
+      ;wxBaseArrayInt::Remove(int)
+      Remove__14wxBaseArrayIntFi
+      ;wxBaseArrayInt::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__14wxBaseArrayIntFUiT1
+      ;wxBaseArrayPtrVoid::Add(const void*,unsigned int)
+      Add__18wxBaseArrayPtrVoidFPCvUi
+      ;wxBaseArrayShort::Add(short,int(*)(const void*,const void*))
+      Add__16wxBaseArrayShortFsPFPCvT1_i
+      ;wxBaseArrayShort::Insert(short,unsigned int,unsigned int)
+      Insert__16wxBaseArrayShortFsUiT2
+      ;wxBaseArrayLong::~wxBaseArrayLong()
+      __dt__15wxBaseArrayLongFv
+      ;wxBaseArrayInt::wxBaseArrayInt()
+      __ct__14wxBaseArrayIntFv
+      ;wxBaseArrayLong::Shrink()
+      Shrink__15wxBaseArrayLongFv
+      ;wxBaseArrayLong::Clear()
+      Clear__15wxBaseArrayLongFv
+      ;wxBaseArrayLong::operator=(const wxBaseArrayLong&)
+      __as__15wxBaseArrayLongFRC15wxBaseArrayLong
+      ;wxBaseArrayLong::wxBaseArrayLong(const wxBaseArrayLong&)
+      __ct__15wxBaseArrayLongFRC15wxBaseArrayLong
   ;From object file:  ..\common\dynlib.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxLibrary::wxLibrary(unsigned long)
@@ -1419,6 +1600,7 @@ EXPORTS
       GetAllEquivalents__19wxEncodingConverterF14wxFontEncoding
       ;wxEncodingConverter::wxEncodingConverter()
       __ct__19wxEncodingConverterFv
+      CompareCharsetItems
       ;wxEncodingConverter::Init(wxFontEncoding,wxFontEncoding,int)
       Init__19wxEncodingConverterF14wxFontEncodingT1i
       ;wxEncodingConverter::Convert(const wxString&)
@@ -1447,6 +1629,7 @@ EXPORTS
       sm_classwxCloseEvent__12wxCloseEvent
       ;wxCommandEvent::wxCommandEvent(int,int)
       __ct__14wxCommandEventFiT1
+      wxEVT_MENU_CLOSE
       wxEVT_MAXIMIZE
       wxEVT_ACTIVATE
       ;wxScrollWinEvent::wxScrollWinEvent(int,int,int)
@@ -1459,7 +1642,7 @@ EXPORTS
       wxConstructorForwxNcPaintEvent__Fv
       wxEVT_SET_CURSOR
       wxEVT_SCROLLWIN_LINEDOWN
-      wxEVT_MENU_CHAR
+      wxEVT_MENU_OPEN
       wxEVT_END_SESSION
       wxEVT_COMMAND_ENTER
       ;wxConstructorForwxShowEvent()
@@ -1496,7 +1679,6 @@ EXPORTS
       wxEVT_SCROLLWIN_PAGEUP
       wxEVT_MOUSEWHEEL
       wxEVT_MIDDLE_UP
-      wxEVT_MENU_INIT
       wxEVT_HELP
       wxEVT_ERASE_BACKGROUND
       wxEVT_DETAILED_HELP
@@ -1550,6 +1732,8 @@ EXPORTS
       wxConstructorForwxSysColourChangedEvent__Fv
       ;wxConstructorForwxNavigationKeyEvent()
       wxConstructorForwxNavigationKeyEvent__Fv
+      ;wxConstructorForwxMouseCaptureChangedEvent()
+      wxConstructorForwxMouseCaptureChangedEvent__Fv
       ;wxConstructorForwxHelpEvent()
       wxConstructorForwxHelpEvent__Fv
       ;wxEvtHandler::~wxEvtHandler()
@@ -1607,6 +1791,8 @@ EXPORTS
       wxConstructorForwxPaintEvent__Fv
       ;wxConstructorForwxNotifyEvent()
       wxConstructorForwxNotifyEvent__Fv
+      ;wxConstructorForwxDisplayChangedEvent()
+      wxConstructorForwxDisplayChangedEvent__Fv
       ;wxConstructorForwxContextMenuEvent()
       wxConstructorForwxContextMenuEvent__Fv
       ;wxConstructorForwxCloseEvent()
@@ -1620,9 +1806,10 @@ EXPORTS
       wxEVT_KILL_FOCUS
       wxEVT_COMMAND_RIGHT_DCLICK
       wxEVT_CLOSE_WINDOW
-      ;wxEvtHandler::ProcessEvent(wxEvent&)
-      ProcessEvent__12wxEvtHandlerFR7wxEvent
+      ;wxMouseEvent::Assign(const wxMouseEvent&)
+      Assign__12wxMouseEventFRC12wxMouseEvent
       wxEVT_SCROLL_LINEUP
+      wxEVT_SCROLL_ENDSCROLL
       wxEVT_PAINT
       wxEVT_NULL
       wxEVT_NC_RIGHT_UP
@@ -1649,6 +1836,8 @@ EXPORTS
       sm_classwxEraseEvent__12wxEraseEvent
       ;wxEvtHandler::SearchEventTable(wxEventTable&,wxEvent&)
       SearchEventTable__12wxEvtHandlerFR12wxEventTableR7wxEvent
+      ;wxEvtHandler::ProcessEvent(wxEvent&)
+      ProcessEvent__12wxEvtHandlerFR7wxEvent
       ;wxMouseEvent::wxMouseEvent(int)
       __ct__12wxMouseEventFi
       wxEVT_JOY_ZMOVE
@@ -1702,12 +1891,12 @@ EXPORTS
       ;wxEvent::wxEvent(const wxEvent&)
       __ct__7wxEventFRC7wxEvent
       wxEVT_RIGHT_UP
-      wxEVT_POPUP_MENU_INIT
       wxEVT_PALETTE_CHANGED
       wxEVT_NC_MIDDLE_UP
       wxEVT_MENU_HIGHLIGHT
       wxEVT_KEY_UP
       wxEVT_JOY_BUTTON_UP
+      wxEVT_DISPLAY_CHANGED
       wxEVT_COMMAND_SCROLLBAR_UPDATED
       wxEVT_COMMAND_RADIOBUTTON_SELECTED
       ;wxWindowCreateEvent::sm_classwxWindowCreateEvent
@@ -1718,10 +1907,14 @@ EXPORTS
       sm_classwxScrollWinEvent__16wxScrollWinEvent
       ;wxNcPaintEvent::sm_classwxNcPaintEvent
       sm_classwxNcPaintEvent__14wxNcPaintEvent
+      ;wxMouseCaptureChangedEvent::sm_classwxMouseCaptureChangedEvent
+      sm_classwxMouseCaptureChangedEvent__26wxMouseCaptureChangedEvent
       ;wxIdleEvent::sm_classwxIdleEvent
       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,10 +2238,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
       GetTimes__10wxFileNameCFP10wxDateTimeN21
       ;wxFileName::Clear()
@@ -2063,12 +2252,12 @@ EXPORTS
       PrependDir__10wxFileNameFRC8wxString
       ;wxFileName::GetPathSeparators(wxPathFormat)
       GetPathSeparators__10wxFileNameF12wxPathFormat
-      ;wxFileName::Mkdir(const wxString&,int,unsigned long)
-      Mkdir__10wxFileNameFRC8wxStringiUl
       ;wxFileName::IsPathSeparator(char,wxPathFormat)
       IsPathSeparator__10wxFileNameFc12wxPathFormat
       ;wxFileName::GetFullPath(wxPathFormat) const
       GetFullPath__10wxFileNameCF12wxPathFormat
+      ;wxFileName::Mkdir(const wxString&,int,int)
+      Mkdir__10wxFileNameFRC8wxStringiT2
       ;wxFileName::Touch()
       Touch__10wxFileNameFv
       ;wxFileName::FileName(const wxString&)
@@ -2085,10 +2274,10 @@ EXPORTS
       Assign__10wxFileNameFRC8wxStringN3112wxPathFormat
       ;wxFileName::SameAs(const wxFileName&,wxPathFormat)
       SameAs__10wxFileNameFRC10wxFileName12wxPathFormat
+      ;wxFileName::IsAbsolute(wxPathFormat) const
+      IsAbsolute__10wxFileNameCF12wxPathFormat
       ;wxFileName::GetVolumeSeparator(wxPathFormat)
       GetVolumeSeparator__10wxFileNameF12wxPathFormat
-      ;wxFileName::GetPath(unsigned long,wxPathFormat) const
-      GetPath__10wxFileNameCFUl12wxPathFormat
       ;wxFileName::RemoveDir(int)
       RemoveDir__10wxFileNameFi
       ;wxFileName::wxPathExists()
@@ -2103,12 +2292,14 @@ EXPORTS
       AppendDir__10wxFileNameFRC8wxString
       ;wxFileName::SplitPath(const wxString&,wxString*,wxString*,wxString*,wxString*,wxPathFormat)
       SplitPath__10wxFileNameFRC8wxStringP8wxStringN3212wxPathFormat
-      ;wxFileName::Mkdir(int,unsigned long)
-      Mkdir__10wxFileNameFiUl
+      ;wxFileName::Normalize(int,const wxString&,wxPathFormat)
+      Normalize__10wxFileNameFiRC8wxString12wxPathFormat
       ;wxFileName::MakeRelativeTo(const wxString&,wxPathFormat)
       MakeRelativeTo__10wxFileNameFRC8wxString12wxPathFormat
       ;wxFileName::AssignDir(const wxString&,wxPathFormat)
       AssignDir__10wxFileNameFRC8wxString12wxPathFormat
+      ;wxFileName::Mkdir(int,int)
+      Mkdir__10wxFileNameFiT1
       ;wxFileName::SetTimes(const wxDateTime*,const wxDateTime*,const wxDateTime*)
       SetTimes__10wxFileNameFPC10wxDateTimeN21
       ;wxFileName::Rmdir()
@@ -2125,6 +2316,8 @@ EXPORTS
       SplitPath__10wxFileNameFRC8wxStringP8wxStringN2212wxPathFormat
       ;wxFileName::IsCaseSensitive(wxPathFormat)
       IsCaseSensitive__10wxFileNameF12wxPathFormat
+      ;wxFileName::GetPath(int,wxPathFormat) const
+      GetPath__10wxFileNameCFi12wxPathFormat
       ;wxFileName::GetFormat(wxPathFormat)
       GetFormat__10wxFileNameF12wxPathFormat
       ;wxFileName::Assign(const wxFileName&)
@@ -2153,10 +2346,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()
@@ -2193,24 +2388,16 @@ EXPORTS
       OpenFile__12wxFileSystemFRC8wxString
   ;From object file:  ..\common\fontcmn.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxNativeFontInfo::SetUnderlined(unsigned long)
-      SetUnderlined__16wxNativeFontInfoFUl
       ;wxFontBase::GetNativeFontInfo() const
       GetNativeFontInfo__10wxFontBaseCFv
-      ;wxNativeFontInfo::GetUnderlined() const
-      GetUnderlined__16wxNativeFontInfoCFv
       ;wxFontBase::New(const wxNativeFontInfo&)
       New__10wxFontBaseFRC16wxNativeFontInfo
       ;wxFontBase::New(const wxString&)
       New__10wxFontBaseFRC8wxString
-      ;wxNativeFontInfo::FromString(const wxString&)
-      FromString__16wxNativeFontInfoFRC8wxString
       ;wxFont::operator=(const wxFont&)
       __as__6wxFontFRC6wxFont
-      ;wxNativeFontInfo::SetFamily(wxFontFamily)
-      SetFamily__16wxNativeFontInfoF12wxFontFamily
-      ;wxFontBase::GetNativeFontInfoDesc() const
-      GetNativeFontInfoDesc__10wxFontBaseCFv
+      ;wxFontBase::~wxFontBase()
+      __dt__10wxFontBaseFv
       ;wxNativeFontInfo::ToUserString() const
       ToUserString__16wxNativeFontInfoCFv
       ;wxFontBase::GetWeightString() const
@@ -2219,56 +2406,38 @@ EXPORTS
       GetStyleString__10wxFontBaseCFv
       ;wxFontBase::GetNativeFontInfoUserDesc() const
       GetNativeFontInfoUserDesc__10wxFontBaseCFv
+      ;wxFontBase::GetNativeFontInfoDesc() const
+      GetNativeFontInfoDesc__10wxFontBaseCFv
       ;wxFontBase::SetNativeFontInfo(const wxNativeFontInfo&)
       SetNativeFontInfo__10wxFontBaseFRC16wxNativeFontInfo
       ;wxFontBase::SetNativeFontInfoUserDesc(const wxString&)
       SetNativeFontInfoUserDesc__10wxFontBaseFRC8wxString
-      ;wxNativeFontInfo::SetStyle(wxFontStyle)
-      SetStyle__16wxNativeFontInfoF11wxFontStyle
       ;wxFontBase::ms_encodingDefault
       ms_encodingDefault__10wxFontBase
-      ;wxNativeFontInfo::GetPointSize() const
-      GetPointSize__16wxNativeFontInfoCFv
-      ;wxNativeFontInfo::GetStyle() const
-      GetStyle__16wxNativeFontInfoCFv
-      ;wxNativeFontInfo::GetFamily() const
-      GetFamily__16wxNativeFontInfoCFv
-      ;wxNativeFontInfo::GetFaceName() const
-      GetFaceName__16wxNativeFontInfoCFv
-      ;wxNativeFontInfo::SetEncoding(wxFontEncoding)
-      SetEncoding__16wxNativeFontInfoF14wxFontEncoding
       ;wxFontBase::SetNativeFontInfo(const wxString&)
       SetNativeFontInfo__10wxFontBaseFRC8wxString
-      ;wxNativeFontInfo::SetWeight(wxFontWeight)
-      SetWeight__16wxNativeFontInfoF12wxFontWeight
+      ;wxFontBase::operator==(const wxFont&) const
+      __eq__10wxFontBaseCFRC6wxFont
       __vft10wxFontBase8wxObject
       ;wxFontBase::operator!=(const wxFont&) const
       __ne__10wxFontBaseCFRC6wxFont
-      ;wxFontBase::operator==(const wxFont&) const
-      __eq__10wxFontBaseCFRC6wxFont
-      ;wxNativeFontInfo::SetPointSize(int)
-      SetPointSize__16wxNativeFontInfoFi
-      ;wxNativeFontInfo::ToString() const
-      ToString__16wxNativeFontInfoCFv
       ;wxFontBase::GetFamilyString() const
       GetFamilyString__10wxFontBaseCFv
-      ;wxNativeFontInfo::GetEncoding() const
-      GetEncoding__16wxNativeFontInfoCFv
-      ;wxNativeFontInfo::Init()
-      Init__16wxNativeFontInfoFv
-      ;wxNativeFontInfo::GetWeight() const
-      GetWeight__16wxNativeFontInfoCFv
+      ;wxFontBase::SetDefaultEncoding(wxFontEncoding)
+      SetDefaultEncoding__10wxFontBaseF14wxFontEncoding
+      ;wxFontBase::IsFixedWidth() const
+      IsFixedWidth__10wxFontBaseCFv
       ;wxFontBase::New(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       New__10wxFontBaseFiN31UlRC8wxString14wxFontEncoding
-      ;wxNativeFontInfo::SetFaceName(wxString)
-      SetFaceName__16wxNativeFontInfoF8wxString
       ;wxNativeFontInfo::FromUserString(const wxString&)
       FromUserString__16wxNativeFontInfoFRC8wxString
   ;From object file:  ..\common\fontmap.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxConstructorForwxFontMapperModule()
+      wxConstructorForwxFontMapperModule__Fv
+      __vft12wxFontMapper
       ;wxFontMapper::GetConfig()
       GetConfig__12wxFontMapperFv
-      __vft12wxFontMapper
       ;wxFontMapper::GetConfigPath()
       GetConfigPath__12wxFontMapperFv
       ;wxFontMapper::RestorePath(const wxString&)
@@ -2279,13 +2448,20 @@ EXPORTS
       CharsetToEncoding__12wxFontMapperFRC8wxStringUl
       ;wxFontMapper::GetAltForEncoding(wxFontEncoding,wxFontEncoding*,const wxString&,unsigned long)
       GetAltForEncoding__12wxFontMapperF14wxFontEncodingP14wxFontEncodingRC8wxStringUl
+      ;wxFontMapperModule::sm_classwxFontMapperModule
+      sm_classwxFontMapperModule__18wxFontMapperModule
       ;wxFontMapper::ChangePath(const wxString&,wxString*)
       ChangePath__12wxFontMapperFRC8wxStringP8wxString
       ;wxFontMapper::GetEncodingName(wxFontEncoding)
       GetEncodingName__12wxFontMapperF14wxFontEncoding
       ;wxFontMapper::~wxFontMapper()
       __dt__12wxFontMapperFv
-      wxTheFontMapper
+      ;wxFontMapper::sm_instance
+      sm_instance__12wxFontMapper
+      ;wxFontMapper::Set(wxFontMapper*)
+      Set__12wxFontMapperFP12wxFontMapper
+      ;wxFontMapper::Get()
+      Get__12wxFontMapperFv
       ;wxFontMapper::GetDefaultConfigPath()
       GetDefaultConfigPath__12wxFontMapperFv
       ;wxFontMapper::GetEncodingDescription(wxFontEncoding)
@@ -2302,6 +2478,8 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxFrameBase::OnIdle(wxIdleEvent&)
       OnIdle__11wxFrameBaseFR11wxIdleEvent
+      ;wxFrameBase::PushStatusText(const wxString&,int)
+      PushStatusText__11wxFrameBaseFRC8wxStringi
       ;wxFrameBase::DeleteAllBars()
       DeleteAllBars__11wxFrameBaseFv
       ;wxFrameBase::SetMenuBar(wxMenuBar*)
@@ -2328,6 +2506,8 @@ EXPORTS
       ProcessCommand__11wxFrameBaseFi
       ;wxFrameBase::SetStatusWidths(int,const int*)
       SetStatusWidths__11wxFrameBaseFiPCi
+      ;wxFrameBase::PopStatusText(int)
+      PopStatusText__11wxFrameBaseFi
       ;wxFrameBase::wxFrameBase()
       __ct__11wxFrameBaseFv
       ;wxFrameBase::CreateToolBar(long,int,const wxString&)
@@ -2338,8 +2518,12 @@ EXPORTS
       ShowMenuHelp__11wxFrameBaseFP11wxStatusBari
       ;wxFrameBase::GetEventTable() const
       GetEventTable__11wxFrameBaseCFv
+      ;wxFrameBase::~wxFrameBase()
+      __dt__11wxFrameBaseFv
       ;wxFrameBase::AttachMenuBar(wxMenuBar*)
       AttachMenuBar__11wxFrameBaseFP9wxMenuBar
+      ;wxFrameBase::DoGiveHelp(const wxString&,unsigned long)
+      DoGiveHelp__11wxFrameBaseFRC8wxStringUl
       __vft11wxFrameBase8wxObject
       ;wxFrameBase::SetStatusText(const wxString&,int)
       SetStatusText__11wxFrameBaseFRC8wxStringi
@@ -2481,6 +2665,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*)
@@ -2595,12 +2781,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
@@ -2611,6 +2801,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&)
@@ -2671,12 +2863,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
@@ -2706,6 +2900,8 @@ EXPORTS
       Put__11wxHashTableFlP8wxObject
       ;wxHashTable::Get(long) const
       Get__11wxHashTableCFl
+      ;wxStringHashTable::Delete(long) const
+      Delete__17wxStringHashTableCFl
       ;wxHashTable::DeleteContents(unsigned long)
       DeleteContents__11wxHashTableFUl
       ;wxHashTableLong::Create(unsigned int)
@@ -2768,6 +2964,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
@@ -2813,6 +3025,36 @@ EXPORTS
       GetContentType__6wxHTTPFv
       ;wxHTTP::Abort()
       Abort__6wxHTTPFv
+  ;From object file:  ..\common\iconbndl.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxIconArray::DoCopy(const wxIconArray&)
+      DoCopy__11wxIconArrayFRC11wxIconArray
+      ;wxIconArray::~wxIconArray()
+      __dt__11wxIconArrayFv
+      ;wxIconArray::Add(const wxIcon&,unsigned int)
+      Add__11wxIconArrayFRC6wxIconUi
+      ;wxIconArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__11wxIconArrayFUiT1
+      ;wxIconBundle::DeleteIcons()
+      DeleteIcons__12wxIconBundleFv
+      ;wxIconArray::Index(const wxIcon&,unsigned long) const
+      Index__11wxIconArrayCFRC6wxIconUl
+      ;wxIconBundle::operator=(const wxIconBundle&)
+      __as__12wxIconBundleFRC12wxIconBundle
+      ;wxIconArray::Insert(const wxIcon&,unsigned int,unsigned int)
+      Insert__11wxIconArrayFRC6wxIconUiT2
+      ;wxIconArray::DoEmpty()
+      DoEmpty__11wxIconArrayFv
+      ;wxIconBundle::AddIcon(const wxIcon&)
+      AddIcon__12wxIconBundleFRC6wxIcon
+      ;wxIconBundle::AddIcon(const wxString&,long)
+      AddIcon__12wxIconBundleFRC8wxStringl
+      ;wxIconBundle::GetIcon(const wxSize&) const
+      GetIcon__12wxIconBundleCFRC6wxSize
+      ;wxIconArray::wxIconArray(const wxIconArray&)
+      __ct__11wxIconArrayFRC11wxIconArray
+      ;wxIconArray::operator=(const wxIconArray&)
+      __as__11wxIconArrayFRC11wxIconArray
   ;From object file:  ..\common\imagall.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxInitAllImageHandlers()
@@ -2829,16 +3071,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)
@@ -2849,11 +3098,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
@@ -2866,8 +3121,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
@@ -2896,6 +3149,10 @@ EXPORTS
       Copy__7wxImageCFv
       ;wxImage::GetOptionInt(const wxString&) const
       GetOptionInt__7wxImageCFRC8wxString
+      ;wxImage::SaveFile(const wxString&) const
+      SaveFile__7wxImageCFRC8wxString
+      ;wxImage::SaveFile(wxOutputStream&,const wxString&) const
+      SaveFile__7wxImageCFR14wxOutputStreamRC8wxString
       ;wxImage::FindHandlerMime(const wxString&)
       FindHandlerMime__7wxImageFRC8wxString
       ;wxImage::Mirror(unsigned long) const
@@ -2903,8 +3160,10 @@ EXPORTS
       __vft14wxImageHandler8wxObject
       ;wxImage::GetImageCount(wxInputStream&,long)
       GetImageCount__7wxImageFR13wxInputStreaml
-      ;wxImage::Scale(int,int) const
-      Scale__7wxImageCFiT1
+      ;wxImage::FindFirstUnusedColour(unsigned char*,unsigned char*,unsigned char*,unsigned char,unsigned char,unsigned char) const
+      FindFirstUnusedColour__7wxImageCFPUcN21UcN24
+      ;wxImageHandler::CallDoCanRead(wxInputStream&)
+      CallDoCanRead__14wxImageHandlerFR13wxInputStream
       ;wxImage::sm_handlers
       sm_handlers__7wxImage
       ;wxImage::wxImage(const wxImage&)
@@ -2913,12 +3172,14 @@ EXPORTS
       __ct__7wxImageFR13wxInputStreamRC8wxStringi
       ;wxImage::SetPalette(const wxPalette&)
       SetPalette__7wxImageFRC9wxPalette
-      ;wxImage::SaveFile(wxOutputStream&,int)
-      SaveFile__7wxImageFR14wxOutputStreami
+      ;wxImage::Scale(int,int) const
+      Scale__7wxImageCFiT1
       ;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
@@ -2927,8 +3188,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)
@@ -2939,8 +3198,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()
@@ -2969,8 +3228,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
@@ -2982,6 +3239,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
@@ -2992,16 +3251,14 @@ EXPORTS
       SetData__7wxImageFPUciT2
       ;wxImage::GetMaskBlue() const
       GetMaskBlue__7wxImageCFv
-      ;wxImage::ConvertToBitmap() const
-      ConvertToBitmap__7wxImageCFv
       ;wxImage::CleanUpHandlers()
       CleanUpHandlers__7wxImageFv
       ;wxImageHandler::CanRead(const wxString&)
       CanRead__14wxImageHandlerFRC8wxString
       ;wxImageHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       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
@@ -3010,16 +3267,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)
@@ -3030,6 +3285,10 @@ EXPORTS
       AddHandler__7wxImageFP14wxImageHandler
       ;wxImage::HasOption(const wxString&) const
       HasOption__7wxImageCFRC8wxString
+  ;From object file:  ..\common\imagfill.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxDoFloodFill(wxDC*,int,int,const wxColour&,int)
+      wxDoFloodFill__FP4wxDCiT2RC8wxColourT2
   ;From object file:  ..\common\imaggif.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxGIFHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
@@ -3043,14 +3302,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&)
@@ -3058,8 +3358,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
@@ -3086,16 +3388,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)
@@ -3113,16 +3417,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
@@ -3130,6 +3441,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()
@@ -3145,48 +3458,50 @@ EXPORTS
       LoadFile__12wxXPMHandlerFP7wxImageR13wxInputStreamUli
   ;From object file:  ..\common\intl.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxMsgCatalogFile::FillHash(wxMessagesHash&,unsigned long) const
+      FillHash__16wxMsgCatalogFileCFR14wxMessagesHashUl
       ;wxLocale::Init(int,int)
       Init__8wxLocaleFiT1
       ;wxLocaleModule::sm_classwxLocaleModule
       sm_classwxLocaleModule__14wxLocaleModule
-      ;wxLanguageInfoArray::Insert(const wxLanguageInfo&,unsigned int)
-      Insert__19wxLanguageInfoArrayFRC14wxLanguageInfoUi
-      ;wxMsgCatalog::wxMsgCatalog()
-      __ct__12wxMsgCatalogFv
+      ;wxLanguageInfoArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__19wxLanguageInfoArrayFUiT1
+      ;wxLocale::GetSystemEncoding()
+      GetSystemEncoding__8wxLocaleFv
       ;wxLocale::~wxLocale()
       __dt__8wxLocaleFv
       ;wxLocale::GetSystemLanguage()
       GetSystemLanguage__8wxLocaleFv
-      ;wxLocale::GetSystemEncoding()
-      GetSystemEncoding__8wxLocaleFv
       ;wxLocale::CreateLanguagesDB()
       CreateLanguagesDB__8wxLocaleFv
       ;wxLanguageInfoArray::Index(const wxLanguageInfo&,unsigned long) const
       Index__19wxLanguageInfoArrayCFRC14wxLanguageInfoUl
       ;wxLanguageInfoArray::wxLanguageInfoArray(const wxLanguageInfoArray&)
       __ct__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
-      ;wxMsgCatalog::~wxMsgCatalog()
-      __dt__12wxMsgCatalogFv
+      ;wxMsgCatalogFile::~wxMsgCatalogFile()
+      __dt__16wxMsgCatalogFileFv
       ;wxConstructorForwxLocaleModule()
       wxConstructorForwxLocaleModule__Fv
       ;wxLocale::GetSysName() const
       GetSysName__8wxLocaleCFv
       ;wxLanguageInfoArray::DoEmpty()
       DoEmpty__19wxLanguageInfoArrayFv
-      ;wxMsgCatalog::ConvertEncoding()
-      ConvertEncoding__12wxMsgCatalogFv
       ;wxLocale::AddCatalog(const char*)
       AddCatalog__8wxLocaleFPCc
       ;wxMsgCatalog::Load(const char*,const char*,unsigned long)
       Load__12wxMsgCatalogFPCcT1Ul
-      ;wxLocale::InitLanguagesDB()
-      InitLanguagesDB__8wxLocaleFv
+      ;wxLanguageInfoArray::Add(const wxLanguageInfo&,unsigned int)
+      Add__19wxLanguageInfoArrayFRC14wxLanguageInfoUi
+      ;wxMsgCatalogFile::wxMsgCatalogFile()
+      __ct__16wxMsgCatalogFileFv
       ;wxLocale::wxLocale()
       __ct__8wxLocaleFv
+      ;wxLanguageInfoArray::Insert(const wxLanguageInfo&,unsigned int,unsigned int)
+      Insert__19wxLanguageInfoArrayFRC14wxLanguageInfoUiT2
+      ;wxLocale::InitLanguagesDB()
+      InitLanguagesDB__8wxLocaleFv
       ;wxLocale::GetSystemEncodingName()
       GetSystemEncodingName__8wxLocaleFv
-      ;wxLanguageInfoArray::Add(const wxLanguageInfo&)
-      Add__19wxLanguageInfoArrayFRC14wxLanguageInfo
       ;wxLocale::AddLanguage(const wxLanguageInfo&)
       AddLanguage__8wxLocaleFRC14wxLanguageInfo
       ;wxLocale::Init(const char*,const char*,const char*,unsigned long,unsigned long)
@@ -3195,12 +3510,16 @@ EXPORTS
       GetString__8wxLocaleCFPCcT1
       ;wxLocale::ms_languagesDB
       ms_languagesDB__8wxLocale
+      ;wxMsgCatalogFile::Load(const char*,const char*)
+      Load__16wxMsgCatalogFileFPCcT1
       ;wxGetLocale()
       wxGetLocale__Fv
       ;NoTransErr::ms_suppressCount
       ms_suppressCount__10NoTransErr
       ;wxLanguageInfoArray::~wxLanguageInfoArray()
       __dt__19wxLanguageInfoArrayFv
+      ;wxMsgCatalogFile::GetCharset() const
+      GetCharset__16wxMsgCatalogFileCFv
       ;wxLocale::DestroyLanguagesDB()
       DestroyLanguagesDB__8wxLocaleFv
       ;wxMsgCatalog::GetString(const char*) const
@@ -3211,14 +3530,10 @@ EXPORTS
       DoCopy__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
       ;wxLanguageInfoArray::operator=(const wxLanguageInfoArray&)
       __as__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
-      ;wxLanguageInfoArray::RemoveAt(unsigned int)
-      RemoveAt__19wxLanguageInfoArrayFUi
-      ;wxMsgCatalog::GetHash(const char*)
-      GetHash__12wxMsgCatalogFPCc
-      ;wxLocale::IsLoaded(const char*) const
-      IsLoaded__8wxLocaleCFPCc
       ;wxLocale::AddCatalogLookupPathPrefix(const wxString&)
       AddCatalogLookupPathPrefix__8wxLocaleFRC8wxString
+      ;wxLocale::IsLoaded(const char*) const
+      IsLoaded__8wxLocaleCFPCc
   ;From object file:  ..\common\ipcbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxConnectionBase::sm_classwxConnectionBase
@@ -3291,14 +3606,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()
@@ -3327,6 +3648,8 @@ EXPORTS
       FirstThat__10wxListBaseFPFPv_i
       ;wxNodeBase::~wxNodeBase()
       __dt__10wxNodeBaseFv
+      ;wxConstructorForwxList()
+      wxConstructorForwxList__Fv
       ;wxStringList::Sort()
       Sort__12wxStringListFv
       ;wxListBase::Find(void*) const
@@ -3335,6 +3658,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
@@ -3354,6 +3679,7 @@ EXPORTS
       IndexOf__10wxListBaseCFPv
       ;wxStringListNode::DeleteData()
       DeleteData__16wxStringListNodeFv
+      wx_comparestrings
       ;wxStringList::DoCopy(const wxStringList&)
       DoCopy__12wxStringListFRC12wxStringList
       ;wxStringList::ListToArray(unsigned long) const
@@ -3384,24 +3710,38 @@ 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
+      ;wxSafeShowMessage(const wxString&,const wxString&)
+      wxSafeShowMessage__FRC8wxStringT1
       ;wxLogVerbose(const char*,...)
       wxLogVerbose__FPCce
       ;wxLogTrace(unsigned long,const char*,...)
       wxLogTrace__FUlPCce
       ;wxLogStatus(const char*,...)
       wxLogStatus__FPCce
+      ;wxLogChain::~wxLogChain()
+      __dt__10wxLogChainFv
       ;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)
@@ -3414,27 +3754,41 @@ 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*,...)
       wxLogSysError__FlPCce
       ;wxLogStream::wxLogStream(ostream*)
       __ct__11wxLogStreamFP7ostream
+      ;wxLog::SetLogBuffer(char*,unsigned int)
+      SetLogBuffer__5wxLogFPcUi
       ;wxLogPassThrough::wxLogPassThrough()
       __ct__16wxLogPassThroughFv
-      ;wxLogChain::SetLog(wxLog*)
-      SetLog__10wxLogChainFP5wxLog
+      ;wxVLogInfo(const char*,char*)
+      wxVLogInfo__FPCcPc
+      ;wxVLogSysError(const char*,char*)
+      wxVLogSysError__FPCcPc
+      ;wxVLogFatalError(const char*,char*)
+      wxVLogFatalError__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)
@@ -3451,6 +3805,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
@@ -3768,6 +4128,8 @@ EXPORTS
       SetHelpString__13wxMenuBarBaseFiRC8wxString
       ;wxMenuBase::Insert(unsigned int,wxMenuItem*)
       Insert__10wxMenuBaseFUiP10wxMenuItem
+      ;wxMenuItemBase::wxMenuItemBase(wxMenu*,int,const wxString&,const wxString&,wxItemKind,wxMenu*)
+      __ct__14wxMenuItemBaseFP6wxMenuiRC8wxStringT310wxItemKindT1
       ;wxMenuBase::Remove(wxMenuItem*)
       Remove__10wxMenuBaseFP10wxMenuItem
       ;wxMenuBase::IsChecked(int) const
@@ -3861,8 +4223,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxFileType::GetIcon(wxIcon*,wxString*,int*) const
       GetIcon__10wxFileTypeCFP6wxIconP8wxStringPi
-      ;wxArrayFileTypeInfo::Add(const wxFileTypeInfo&)
-      Add__19wxArrayFileTypeInfoFRC14wxFileTypeInfo
       ;wxFileTypeInfo::wxFileTypeInfo(const wxArrayString&)
       __ct__14wxFileTypeInfoFRC13wxArrayString
       ;wxMimeTypesManager::Initialize(int,const wxString&)
@@ -3879,16 +4239,20 @@ EXPORTS
       __ct__14wxFileTypeInfoFPCcN31e
       ;wxFileType::SetDefaultIcon(const wxString&,int)
       SetDefaultIcon__10wxFileTypeFRC8wxStringi
+      ;wxArrayFileTypeInfo::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__19wxArrayFileTypeInfoFUiT1
       ;wxArrayFileTypeInfo::DoCopy(const wxArrayFileTypeInfo&)
       DoCopy__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo
       ;wxMimeTypesManager::ReadMimeTypes(const wxString&)
       ReadMimeTypes__18wxMimeTypesManagerFRC8wxString
       ;wxFileType::ExpandCommand(const wxString&,const wxFileType::MessageParameters&)
       ExpandCommand__10wxFileTypeFRC8wxStringRCQ2_10wxFileType17MessageParameters
-      ;wxMimeTypesManager::IsOfType(const wxString&,const wxString&)
-      IsOfType__18wxMimeTypesManagerFRC8wxStringT1
+      ;wxArrayFileTypeInfo::Add(const wxFileTypeInfo&,unsigned int)
+      Add__19wxArrayFileTypeInfoFRC14wxFileTypeInfoUi
       ;wxMimeTypesManager::Unassociate(wxFileType*)
       Unassociate__18wxMimeTypesManagerFP10wxFileType
+      ;wxMimeTypesManager::IsOfType(const wxString&,const wxString&)
+      IsOfType__18wxMimeTypesManagerFRC8wxStringT1
       ;wxArrayFileTypeInfo::DoEmpty()
       DoEmpty__19wxArrayFileTypeInfoFv
       wxTheMimeTypesManager
@@ -3910,8 +4274,6 @@ EXPORTS
       SetCommand__10wxFileTypeFRC8wxStringT1Ul
       ;wxMimeTypesManager::ReadMailcap(const wxString&,unsigned long)
       ReadMailcap__18wxMimeTypesManagerFRC8wxStringUl
-      ;wxArrayFileTypeInfo::Insert(const wxFileTypeInfo&,unsigned int)
-      Insert__19wxArrayFileTypeInfoFRC14wxFileTypeInfoUi
       ;wxFileType::~wxFileType()
       __dt__10wxFileTypeFv
       ;wxFileType::GetExtensions(wxArrayString&)
@@ -3920,18 +4282,18 @@ EXPORTS
       GetMimeTypes__10wxFileTypeCFR13wxArrayString
       ;wxMimeTypesManager::AddFallbacks(const wxFileTypeInfo*)
       AddFallbacks__18wxMimeTypesManagerFPC14wxFileTypeInfo
-      ;wxArrayFileTypeInfo::RemoveAt(unsigned int)
-      RemoveAt__19wxArrayFileTypeInfoFUi
       ;wxMimeTypeCmnModule::sm_classwxMimeTypeCmnModule
       sm_classwxMimeTypeCmnModule__19wxMimeTypeCmnModule
-      ;wxFileType::Unassociate()
-      Unassociate__10wxFileTypeFv
+      ;wxArrayFileTypeInfo::Insert(const wxFileTypeInfo&,unsigned int,unsigned int)
+      Insert__19wxArrayFileTypeInfoFRC14wxFileTypeInfoUiT2
       ;wxConstructorForwxMimeTypeCmnModule()
       wxConstructorForwxMimeTypeCmnModule__Fv
       ;wxMimeTypesManager::~wxMimeTypesManager()
       __dt__18wxMimeTypesManagerFv
       ;wxMimeTypesManager::wxMimeTypesManager()
       __ct__18wxMimeTypesManagerFv
+      ;wxFileType::Unassociate()
+      Unassociate__10wxFileTypeFv
       ;wxMimeTypesManager::ClearData()
       ClearData__18wxMimeTypesManagerFv
       ;wxArrayFileTypeInfo::operator=(const wxArrayFileTypeInfo&)
@@ -3995,8 +4357,8 @@ EXPORTS
       OnSysTell__20wxMemoryOutputStreamCFv
   ;From object file:  ..\common\nbkbase.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxNotebookBase::AssignImageList(wxImageList*)
-      AssignImageList__14wxNotebookBaseFP11wxImageList
+      ;wxNotebookBase::SetImageList(wxGenericImageList*)
+      SetImageList__14wxNotebookBaseFP18wxGenericImageList
       __vft14wxNotebookBase8wxObject
       ;wxNotebookBase::DoRemovePage(int)
       DoRemovePage__14wxNotebookBaseFi
@@ -4004,8 +4366,8 @@ EXPORTS
       __dt__14wxNotebookBaseFv
       ;wxNotebookBase::GetNextPage(unsigned long) const
       GetNextPage__14wxNotebookBaseCFUl
-      ;wxNotebookBase::SetImageList(wxImageList*)
-      SetImageList__14wxNotebookBaseFP11wxImageList
+      ;wxNotebookBase::AssignImageList(wxGenericImageList*)
+      AssignImageList__14wxNotebookBaseFP18wxGenericImageList
       ;wxNotebookBase::DeletePage(int)
       DeletePage__14wxNotebookBaseFi
       ;wxNotebookBase::CalcSizeFromPage(const wxSize&)
@@ -4019,8 +4381,16 @@ EXPORTS
       wxCreateDynamicObject__FPCc
       ;wxObject::Dump(ostream&)
       Dump__8wxObjectFR7ostream
+      ;wxObject::CreateRefData() const
+      CreateRefData__8wxObjectCFv
       ;wxClassInfo::sm_classTable
       sm_classTable__11wxClassInfo
+      ;wxObject::InitFrom(const wxObject&)
+      InitFrom__8wxObjectFRC8wxObject
+      ;wxObject::operator new(unsigned int,const char*,int)
+      __nw__8wxObjectFUiPCci
+      ;wxObject::CloneRefData(const wxObjectRefData*) const
+      CloneRefData__8wxObjectCFPC15wxObjectRefData
       ;wxClassInfo::sm_first
       sm_first__11wxClassInfo
       ;wxObject::Ref(const wxObject&)
@@ -4030,14 +4400,14 @@ EXPORTS
       UnRef__8wxObjectFv
       ;wxClassInfo::CleanUpClasses()
       CleanUpClasses__11wxClassInfoFv
+      ;wxObject::AllocExclusive()
+      AllocExclusive__8wxObjectFv
       ;wxObject::IsKindOf(wxClassInfo*) const
       IsKindOf__8wxObjectCFP11wxClassInfo
       ;wxClassInfo::FindClass(const char*)
       FindClass__11wxClassInfoFPCc
       ;wxObject::sm_classwxObject
       sm_classwxObject__8wxObject
-      ;wxObject::operator new(unsigned int,char*,int)
-      __nw__8wxObjectFUiPci
       ;wxClassInfo::InitializeClasses()
       InitializeClasses__11wxClassInfoFv
   ;From object file:  ..\common\odbc.cpp
@@ -4094,6 +4464,57 @@ EXPORTS
       ;wxPrintPaperDatabase::AddPaperType(wxPaperSize,const wxString&,int,int)
       AddPaperType__20wxPrintPaperDatabaseF11wxPaperSizeRC8wxStringiT3
   ;From object file:  ..\common\popupcmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxPopupWindowHandler::OnLeftDown(wxMouseEvent&)
+      OnLeftDown__20wxPopupWindowHandlerFR12wxMouseEvent
+      __vft20wxPopupWindowHandler8wxObject
+      __vft19wxPopupFocusHandler8wxObject
+      __vft17wxPopupWindowBase8wxObject
+      ;wxPopupWindowHandler::sm_eventTableEntries
+      sm_eventTableEntries__20wxPopupWindowHandler
+      ;wxConstructorForwxPopupTransientWindow()
+      wxConstructorForwxPopupTransientWindow__Fv
+      ;wxPopupWindowHandler::sm_eventTable
+      sm_eventTable__20wxPopupWindowHandler
+      ;wxPopupWindowHandler::GetEventTable() const
+      GetEventTable__20wxPopupWindowHandlerCFv
+      ;wxPopupTransientWindow::Dismiss()
+      Dismiss__22wxPopupTransientWindowFv
+      ;wxPopupTransientWindow::sm_classwxPopupTransientWindow
+      sm_classwxPopupTransientWindow__22wxPopupTransientWindow
+      __vft22wxPopupTransientWindow8wxObject
+      ;wxPopupFocusHandler::GetEventTable() const
+      GetEventTable__19wxPopupFocusHandlerCFv
+      ;wxPopupFocusHandler::sm_eventTable
+      sm_eventTable__19wxPopupFocusHandler
+      ;wxPopupFocusHandler::sm_eventTableEntries
+      sm_eventTableEntries__19wxPopupFocusHandler
+      ;wxPopupTransientWindow::Popup(wxWindow*)
+      Popup__22wxPopupTransientWindowFP8wxWindow
+      ;wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent&)
+      ProcessLeftDown__22wxPopupTransientWindowFR12wxMouseEvent
+      ;wxPopupFocusHandler::OnKillFocus(wxFocusEvent&)
+      OnKillFocus__19wxPopupFocusHandlerFR12wxFocusEvent
+      ;wxPopupFocusHandler::OnKeyDown(wxKeyEvent&)
+      OnKeyDown__19wxPopupFocusHandlerFR10wxKeyEvent
+      ;wxPopupWindowBase::Create(wxWindow*,int)
+      Create__17wxPopupWindowBaseFP8wxWindowi
+      ;wxPopupWindowBase::~wxPopupWindowBase()
+      __dt__17wxPopupWindowBaseFv
+      ;wxPopupTransientWindow::OnDismiss()
+      OnDismiss__22wxPopupTransientWindowFv
+      ;wxPopupTransientWindow::DismissAndNotify()
+      DismissAndNotify__22wxPopupTransientWindowFv
+      ;wxPopupWindowBase::Position(const wxPoint&,const wxSize&)
+      Position__17wxPopupWindowBaseFRC7wxPointRC6wxSize
+      ;wxPopupTransientWindow::wxPopupTransientWindow(wxWindow*,int)
+      __ct__22wxPopupTransientWindowFP8wxWindowi
+      ;wxPopupTransientWindow::Init()
+      Init__22wxPopupTransientWindowFv
+      ;wxPopupTransientWindow::~wxPopupTransientWindow()
+      __dt__22wxPopupTransientWindowFv
+      ;wxPopupTransientWindow::PopHandlers()
+      PopHandlers__22wxPopupTransientWindowFv
   ;From object file:  ..\common\prntbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPreviewControlBar::OnZoom(wxCommandEvent&)
@@ -4242,12 +4663,14 @@ EXPORTS
       Exists__9wxProcessFi
       ;wxConstructorForwxProcess()
       wxConstructorForwxProcess__Fv
-      ;wxProcess::Init(wxEvtHandler*,int,unsigned long)
-      Init__9wxProcessFP12wxEvtHandleriUl
-      __vft9wxProcess8wxObject
       ;wxProcess::Kill(int,wxSignal)
       Kill__9wxProcessFi8wxSignal
+      __vft9wxProcess8wxObject
+      ;wxProcess::Open(const wxString&,int)
+      Open__9wxProcessFRC8wxStringi
       wxEVT_END_PROCESS
+      ;wxProcess::Init(wxEvtHandler*,int,int)
+      Init__9wxProcessFP12wxEvtHandleriT2
       ;wxProcess::~wxProcess()
       __dt__9wxProcessFv
       ;wxConstructorForwxProcessEvent()
@@ -4479,10 +4902,12 @@ EXPORTS
   ;From object file:  ..\common\sckaddr.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft13wxSockAddress8wxObject
-      ;wxIPV4address::AnyAddress()
-      AnyAddress__13wxIPV4addressFv
+      ;wxSockAddress::Init()
+      Init__13wxSockAddressFv
       ;wxIPV4address::Hostname()
       Hostname__13wxIPV4addressFv
+      ;wxIPV4address::AnyAddress()
+      AnyAddress__13wxIPV4addressFv
       ;wxSockAddress::SetAddress(_GAddress*)
       SetAddress__13wxSockAddressFP9_GAddress
       ;wxSockAddress::operator=(const wxSockAddress&)
@@ -4509,6 +4934,8 @@ EXPORTS
       __ct__13wxIPV4addressFv
       ;wxIPV4address::Service()
       Service__13wxIPV4addressFv
+      ;wxIPV4address::Clone() const
+      Clone__13wxIPV4addressCFv
       ;wxSockAddress::wxSockAddress(const wxSockAddress&)
       __ct__13wxSockAddressFRC13wxSockAddress
       __vft13wxIPV4address8wxObject
@@ -4628,6 +5055,14 @@ EXPORTS
       __vft14wxSocketStream13wxInputStream12wxStreamBase
       ;wxSocketOutputStream::~wxSocketOutputStream()
       __dt__20wxSocketOutputStreamFv
+  ;From object file:  ..\common\settcmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxSystemSettings::ms_screen
+      ms_screen__16wxSystemSettings
+      ;wxSystemSettings::GetScreenType()
+      GetScreenType__16wxSystemSettingsFv
+      ;wxSystemSettings::SetScreenType(wxSystemScreenType)
+      SetScreenType__16wxSystemSettingsF18wxSystemScreenType
   ;From object file:  ..\common\sizer.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSizerItem::wxSizerItem(int,int,int,int,int,wxObject*)
@@ -4671,6 +5106,8 @@ EXPORTS
       Fit__7wxSizerFP8wxWindow
       ;wxSizer::GetMinWindowSize(wxWindow*)
       GetMinWindowSize__7wxSizerFP8wxWindow
+      ;wxSizer::FitInside(wxWindow*)
+      FitInside__7wxSizerFP8wxWindow
       ;wxSizer::Prepend(wxWindow*,int,int,int,wxObject*)
       Prepend__7wxSizerFP8wxWindowiN22P8wxObject
       __vft15wxFlexGridSizer8wxObject
@@ -4757,6 +5194,10 @@ EXPORTS
       DoSetItemMinSize__7wxSizerFP7wxSizeriT2
       ;wxSizerItem::DeleteWindows()
       DeleteWindows__11wxSizerItemFv
+      ;wxSizer::GetMinClientSize(wxWindow*)
+      GetMinClientSize__7wxSizerFP8wxWindow
+      ;wxSizer::GetMaxClientSize(wxWindow*)
+      GetMaxClientSize__7wxSizerFP8wxWindow
       ;wxSizerItem::wxSizerItem(wxWindow*,int,int,int,wxObject*)
       __ct__11wxSizerItemFP8wxWindowiN22P8wxObject
       __vft16wxStaticBoxSizer8wxObject
@@ -4781,8 +5222,12 @@ EXPORTS
       SetItemBounds__11wxGridSizerFP11wxSizerItemiN32
       ;wxGridSizer::CalcMin()
       CalcMin__11wxGridSizerFv
+      ;wxSizer::VirtualFitSize(wxWindow*)
+      VirtualFitSize__7wxSizerFP8wxWindow
       ;wxNotebookSizer::wxNotebookSizer(wxNotebook*)
       __ct__15wxNotebookSizerFP10wxNotebook
+      ;wxSizer::SetVirtualSizeHints(wxWindow*)
+      SetVirtualSizeHints__7wxSizerFP8wxWindow
   ;From object file:  ..\common\socket.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSocketBase::SetTimeout(long)
@@ -4813,6 +5258,8 @@ EXPORTS
       __dt__14wxSocketClientFv
       ;wxSocketBase::RestoreState()
       RestoreState__12wxSocketBaseFv
+      ;wxSocketBase::IsInitialized()
+      IsInitialized__12wxSocketBaseFv
       ;wxSocketBase::Init()
       Init__12wxSocketBaseFv
       ;wxSocketBase::Discard()
@@ -4832,6 +5279,8 @@ EXPORTS
       __vft12wxSocketBase8wxObject
       ;wxSocketBase::WaitForRead(long,long)
       WaitForRead__12wxSocketBaseFlT1
+      ;wxSocketBase::m_countInit
+      m_countInit__12wxSocketBase
       ;wxSocketBase::_Read(void*,unsigned int)
       _Read__12wxSocketBaseFPvUi
       ;wxSocketBase::Write(const void*,unsigned int)
@@ -4850,6 +5299,7 @@ EXPORTS
       Destroy__12wxSocketBaseFv
       ;wxSocketBase::Close()
       Close__12wxSocketBaseFv
+      wx_socket_callback
       __vft14wxSocketClient8wxObject
       ;wxSocketBase::_Write(const void*,unsigned int)
       _Write__12wxSocketBaseFPCvUi
@@ -4861,10 +5311,14 @@ EXPORTS
       Unread__12wxSocketBaseFPCvUi
       ;wxSocketBase::OnRequest(wxSocketNotify)
       OnRequest__12wxSocketBaseF14wxSocketNotify
-      ;wxSocketBase::wxSocketBase()
-      __ct__12wxSocketBaseFv
+      ;wxSocketBase::Initialize()
+      Initialize__12wxSocketBaseFv
       ;wxConstructorForwxSocketModule()
       wxConstructorForwxSocketModule__Fv
+      ;wxSocketBase::wxSocketBase()
+      __ct__12wxSocketBaseFv
+      ;wxSocketBase::Shutdown()
+      Shutdown__12wxSocketBaseFv
       ;wxSocketBase::GetPeer(wxSockAddress&) const
       GetPeer__12wxSocketBaseCFR13wxSockAddress
       ;wxSocketBase::Notify(unsigned long)
@@ -4891,30 +5345,49 @@ EXPORTS
       GetLocal__12wxSocketBaseCFR13wxSockAddress
   ;From object file:  ..\common\statbar.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxStatusBarBase::PopStatusText(int)
+      PopStatusText__15wxStatusBarBaseFi
       ;wxStatusBarBase::FreeWidths()
       FreeWidths__15wxStatusBarBaseFv
       __vft15wxStatusBarBase8wxObject
+      ;wxStatusBarBase::GetStatusStack(int) const
+      GetStatusStack__15wxStatusBarBaseCFi
       ;wxStatusBarBase::InitWidths()
       InitWidths__15wxStatusBarBaseFv
       ;wxStatusBar::sm_classwxStatusBar
       sm_classwxStatusBar__11wxStatusBar
       ;wxStatusBarBase::~wxStatusBarBase()
       __dt__15wxStatusBarBaseFv
+      ;wxStatusBarBase::InitStacks()
+      InitStacks__15wxStatusBarBaseFv
+      ;wxwxListStringNode::DeleteData()
+      DeleteData__18wxwxListStringNodeFv
       ;wxStatusBarBase::SetStatusWidths(int,const int*)
       SetStatusWidths__15wxStatusBarBaseFiPCi
+      ;wxStatusBarBase::GetOrCreateStatusStack(int)
+      GetOrCreateStatusStack__15wxStatusBarBaseFi
       ;wxStatusBarBase::CalculateAbsWidths(int) const
       CalculateAbsWidths__15wxStatusBarBaseCFi
       ;wxStatusBarBase::wxStatusBarBase()
       __ct__15wxStatusBarBaseFv
       ;wxStatusBarBase::SetFieldsCount(int,const int*)
       SetFieldsCount__15wxStatusBarBaseFiPCi
+      ;wxStatusBarBase::PushStatusText(const wxString&,int)
+      PushStatusText__15wxStatusBarBaseFRC8wxStringi
+      ;wxStatusBarBase::FreeStacks()
+      FreeStacks__15wxStatusBarBaseFv
       ;wxConstructorForwxStatusBar()
       wxConstructorForwxStatusBar__Fv
+      __vft18wxwxListStringNode10wxNodeBase
   ;From object file:  ..\common\strconv.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxStrConvModule::sm_classwxStrConvModule
+      sm_classwxStrConvModule__15wxStrConvModule
       wxConvCurrent
       wxConvFile
       wxConvLibc
+      ;wxConstructorForwxStrConvModule()
+      wxConstructorForwxStrConvModule__Fv
   ;From object file:  ..\common\stream.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxStreamBuffer::SetBufferIO(void*,unsigned int,unsigned long)
@@ -5126,8 +5599,10 @@ EXPORTS
       Sort__13wxArrayStringFPFRC8wxStringT1_i
       ;wxArrayString::SetCount(unsigned int)
       SetCount__13wxArrayStringFUi
-      ;wxArrayString::Remove(unsigned int)
-      Remove__13wxArrayStringFUi
+      ;wxArrayString::Remove(unsigned int,unsigned int)
+      Remove__13wxArrayStringFUiT1
+      ;wxArrayString::Grow(unsigned int)
+      Grow__13wxArrayStringFUi
       ;wxString::Format(const char*,...)
       Format__8wxStringFPCce
       ;wxString::Alloc(unsigned int)
@@ -5136,8 +5611,6 @@ EXPORTS
       IsAscii__8wxStringCFv
       ;wxString::IsWord() const
       IsWord__8wxStringCFv
-      ;wxArrayString::Grow()
-      Grow__13wxArrayStringFv
       ;wxArrayString::DoSort()
       DoSort__13wxArrayStringFv
       ;operator+(char,const wxString&)
@@ -5190,8 +5663,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*)
@@ -5210,16 +5681,17 @@ EXPORTS
       UngetWriteBuf__8wxStringFUi
       ;wxString::ToLong(long*,int) const
       ToLong__8wxStringCFPli
-      ;wxArrayString::Insert(const wxString&,unsigned int)
-      Insert__13wxArrayStringFRC8wxStringUi
       ;wxString::GetWriteBuf(unsigned int)
       GetWriteBuf__8wxStringFUi
       ;wxString::AllocBuffer(unsigned int)
       AllocBuffer__8wxStringFUi
       ;wxString::AllocBeforeWrite(unsigned int)
       AllocBeforeWrite__8wxStringFUi
+      ;wxArrayString::Add(const wxString&,unsigned int)
+      Add__13wxArrayStringFRC8wxStringUi
       ;wxString::InitWith(const char*,unsigned int,unsigned int)
       InitWith__8wxStringFPCcUiT2
+      wxStringCompareFunction
       ;wxString::Shrink()
       Shrink__8wxStringFv
       ;wxArrayString::Shrink()
@@ -5242,8 +5714,6 @@ EXPORTS
       Remove__13wxArrayStringFPCc
       ;wxString::ConcatSelf(int,const char*)
       ConcatSelf__8wxStringFiPCc
-      ;wxArrayString::Add(const wxString&)
-      Add__13wxArrayStringFRC8wxString
       ;wxString::erase(unsigned int,unsigned int)
       erase__8wxStringFUiT1
       ;wxString::sprintf(const char*,...)
@@ -5270,6 +5740,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)
@@ -5288,6 +5760,8 @@ EXPORTS
       __dt__13wxArrayStringFv
       ;wxString::Lower() const
       Lower__8wxStringCFv
+      ;wxArrayString::Insert(const wxString&,unsigned int,unsigned int)
+      Insert__13wxArrayStringFRC8wxStringUiT2
       ;wxArrayString::Free()
       Free__13wxArrayStringFv
       ;wxArrayString::Clear()
@@ -5326,8 +5800,6 @@ EXPORTS
       __dt__17wxToolBarToolBaseFv
       ;wxToolBarBase::ClearTools()
       ClearTools__13wxToolBarBaseFv
-      ;wxToolBarBase::InsertTool(unsigned int,int,const wxBitmap&,const wxBitmap&,unsigned long,wxObject*,const wxString&,const wxString&)
-      InsertTool__13wxToolBarBaseFUiiRC8wxBitmapT3UlP8wxObjectRC8wxStringT7
       ;wxToolBarToolBase::Enable(unsigned long)
       Enable__17wxToolBarToolBaseFUl
       ;wxToolBarBase::SetToolClientData(int,wxObject*)
@@ -5346,14 +5818,18 @@ EXPORTS
       Toggle__17wxToolBarToolBaseFUl
       __vft17wxToolBarToolBase8wxObject
       __vft13wxToolBarBase8wxObject
+      ;wxToolBarBase::InsertTool(unsigned int,int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,const wxString&,const wxString&,wxObject*)
+      InsertTool__13wxToolBarBaseFUiiRC8wxStringRC8wxBitmapT410wxItemKindN23P8wxObject
       ;wxToolBarBase::InsertControl(unsigned int,wxControl*)
       InsertControl__13wxToolBarBaseFUiP9wxControl
-      ;wxToolBarBase::SetMargins(int,int)
-      SetMargins__13wxToolBarBaseFiT1
+      ;wxToolBarBase::FindControl(int)
+      FindControl__13wxToolBarBaseFi
       ;wxToolBarBase::sm_eventTableEntries
       sm_eventTableEntries__13wxToolBarBase
       ;wxToolBarBase::SetRows(int)
       SetRows__13wxToolBarBaseFi
+      ;wxToolBarBase::SetMargins(int,int)
+      SetMargins__13wxToolBarBaseFiT1
       ;wxToolBarToolBase::SetLongHelp(const wxString&)
       SetLongHelp__17wxToolBarToolBaseFRC8wxString
       ;wxToolBarBase::SetToolShortHelp(int,const wxString&)
@@ -5364,6 +5840,8 @@ EXPORTS
       OnIdle__13wxToolBarBaseFR11wxIdleEvent
       ;wxToolBarBase::AddControl(wxControl*)
       AddControl__13wxToolBarBaseFP9wxControl
+      ;wxToolBarBase::DoAddTool(int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,const wxString&,const wxString&,wxObject*,int,int)
+      DoAddTool__13wxToolBarBaseFiRC8wxStringRC8wxBitmapT310wxItemKindN22P8wxObjectN21
       ;wxToolBarBase::InsertSeparator(unsigned int)
       InsertSeparator__13wxToolBarBaseFUi
       ;wxToolBarBase::GetToolState(int) const
@@ -5382,14 +5860,14 @@ EXPORTS
       GetEventTable__13wxToolBarBaseCFv
       ;wxToolBarBase::DoToolbarUpdates()
       DoToolbarUpdates__13wxToolBarBaseFv
-      ;wxToolBarBase::AddTool(int,const wxBitmap&,const wxBitmap&,unsigned long,int,int,wxObject*,const wxString&,const wxString&)
-      AddTool__13wxToolBarBaseFiRC8wxBitmapT2UlN21P8wxObjectRC8wxStringT8
       ;wxToolBarBase::ToggleTool(int,unsigned long)
       ToggleTool__13wxToolBarBaseFiUl
       ;wxToolBarBase::SetToggle(int,unsigned long)
       SetToggle__13wxToolBarBaseFiUl
       ;wxToolBarBase::GetToolShortHelp(int) const
       GetToolShortHelp__13wxToolBarBaseCFi
+      ;wxCreateGreyedImage(const wxImage&,wxImage&)
+      wxCreateGreyedImage__FRC7wxImageR7wxImage
       ;wxToolBarBase::sm_eventTable
       sm_eventTable__13wxToolBarBase
       ;wxToolBarBase::sm_classwxToolBarBase
@@ -5443,6 +5921,8 @@ EXPORTS
       __ls__14wxTextCtrlBaseFRC8wxString
       ;wxTextCtrlBase::operator<<(int)
       __ls__14wxTextCtrlBaseFi
+      ;wxTextCtrlBase::GetRange(long,long) const
+      GetRange__14wxTextCtrlBaseCFlT1
       ;wxTextCtrlBase::wxTextCtrlBase()
       __ct__14wxTextCtrlBaseFv
       wxEVT_COMMAND_TEXT_ENTER
@@ -5474,6 +5954,8 @@ EXPORTS
       SaveFile__14wxTextCtrlBaseFRC8wxString
       ;wxTextCtrlBase::operator<<(const char)
       __ls__14wxTextCtrlBaseFCc
+      ;wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent&)
+      EmulateKeyPress__14wxTextCtrlBaseFRC10wxKeyEvent
       __vft14wxTextCtrlBase8wxObject
       ;wxTextAttr::Combine(const wxTextAttr&,const wxTextAttr&,const wxTextCtrlBase*)
       Combine__10wxTextAttrFRC10wxTextAttrT1PC14wxTextCtrlBase
@@ -5511,6 +5993,8 @@ EXPORTS
       Start__11wxStopWatchFl
       ;wxGetElapsedTime(unsigned long)
       wxGetElapsedTime__FUl
+      ;wxTimerBase::~wxTimerBase()
+      __dt__11wxTimerBaseFv
       ;wxGetLocalTime()
       wxGetLocalTime__Fv
       ;wxTimerBase::Start(int,unsigned long)
@@ -5556,12 +6040,16 @@ EXPORTS
       __vft20wxTopLevelWindowBase8wxObject
       ;wxTopLevelWindowBase::sm_eventTableEntries
       sm_eventTableEntries__20wxTopLevelWindowBase
+      ;wxTopLevelWindowBase::~wxTopLevelWindowBase()
+      __dt__20wxTopLevelWindowBaseFv
       ;wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__20wxTopLevelWindowBaseFR12wxCloseEvent
       ;wxTopLevelWindowBase::DoScreenToClient(int*,int*) const
       DoScreenToClient__20wxTopLevelWindowBaseCFPiT1
       ;wxTopLevelWindowBase::Destroy()
       Destroy__20wxTopLevelWindowBaseFv
+      ;wxTopLevelWindowBase::GetMaxSize() const
+      GetMaxSize__20wxTopLevelWindowBaseCFv
       ;wxTopLevelWindow::sm_classwxTopLevelWindow
       sm_classwxTopLevelWindow__16wxTopLevelWindow
   ;From object file:  ..\common\treebase.cpp
@@ -5775,6 +6263,8 @@ EXPORTS
       wxExecute__FRC8wxStringR13wxArrayString
       ;LongToString(long)
       LongToString__Fl
+      ;wxGetFontFromUser(wxWindow*,const wxFont&)
+      wxGetFontFromUser__FP8wxWindowRC6wxFont
       ;wxGetCurrentId()
       wxGetCurrentId__Fv
       ;wxYield()
@@ -5880,6 +6370,8 @@ EXPORTS
       __ct__15wxTextValidatorFlP8wxString
       ;wxTextValidator::Validate(wxWindow*)
       Validate__15wxTextValidatorFP8wxWindow
+      ;wxTextValidator::IsNotInCharExcludeList(const wxString&)
+      IsNotInCharExcludeList__15wxTextValidatorFRC8wxString
       ;wxConstructorForwxTextValidator()
       wxConstructorForwxTextValidator__Fv
       ;wxTextValidator::sm_eventTable
@@ -5889,6 +6381,8 @@ EXPORTS
       ;wxTextValidator::SetIncludeList(const wxStringList&)
       SetIncludeList__15wxTextValidatorFRC12wxStringList
       __vft15wxTextValidator8wxObject
+      ;wxTextValidator::IsInCharIncludeList(const wxString&)
+      IsInCharIncludeList__15wxTextValidatorFRC8wxString
       ;wxTextValidator::SetExcludeList(const wxStringList&)
       SetExcludeList__15wxTextValidatorFRC12wxStringList
       ;wxTextValidator::OnChar(wxKeyEvent&)
@@ -5964,6 +6458,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)
@@ -5978,6 +6474,7 @@ EXPORTS
       Read__17wxVariantDataDateFR8wxString
       ;wxVariantDataList::wxVariantDataList(const wxList&)
       __ct__17wxVariantDataListFRC6wxList
+      __vft24wxVariantDataArrayString8wxObject
       __vft17wxVariantDataReal8wxObject
       __vft17wxVariantDataList8wxObject
       ;wxVariant::operator!=(const wxStringList&) const
@@ -6002,6 +6499,8 @@ EXPORTS
       Write__17wxVariantDataLongCFR14wxOutputStream
       ;wxVariantDataChar::Write(wxOutputStream&) const
       Write__17wxVariantDataCharCFR14wxOutputStream
+      ;wxVariantDataArrayString::Read(istream&)
+      Read__24wxVariantDataArrayStringFR7istream
       ;wxVariantDataString::Read(wxInputStream&)
       Read__19wxVariantDataStringFR13wxInputStream
       ;wxVariantDataTime::Read(istream&)
@@ -6012,12 +6511,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
@@ -6040,12 +6543,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&)
@@ -6074,6 +6581,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
@@ -6114,6 +6623,8 @@ EXPORTS
       sm_classwxVariantDataChar__17wxVariantDataChar
       ;wxVariant::operator==(void*) const
       __eq__9wxVariantCFPv
+      ;wxVariant::NullList()
+      NullList__9wxVariantFv
       ;wxVariant::GetList() const
       GetList__9wxVariantCFv
       ;wxVariant::GetCount() const
@@ -6136,6 +6647,8 @@ EXPORTS
       Write__17wxVariantDataDateCFR8wxString
       ;wxVariantDataBool::Write(wxString&) const
       Write__17wxVariantDataBoolCFR8wxString
+      ;wxVariantDataArrayString::Read(wxString&)
+      Read__24wxVariantDataArrayStringFR8wxString
       ;wxVariantDataTime::Read(wxString&)
       Read__17wxVariantDataTimeFR8wxString
       ;wxVariantDataChar::Read(wxString&)
@@ -6209,18 +6722,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&)
@@ -6278,6 +6797,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
@@ -6308,6 +6829,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
@@ -6441,6 +6964,8 @@ EXPORTS
       SetForegroundColour__12wxWindowBaseFRC8wxColour
       ;wxWindowBase::SetBackgroundColour(const wxColour&)
       SetBackgroundColour__12wxWindowBaseFRC8wxColour
+      ;wxWindowBase::RemoveEventHandler(wxEvtHandler*)
+      RemoveEventHandler__12wxWindowBaseFP12wxEvtHandler
       ;wxWindowBase::Destroy()
       Destroy__12wxWindowBaseFv
       ;wxWindowBase::SetConstraints(wxLayoutConstraints*)
@@ -6451,8 +6976,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*)
@@ -6477,6 +7006,10 @@ EXPORTS
       SetToolTip__12wxWindowBaseFRC8wxString
       ;wxWindowBase::ConvertPixelsToDialog(const wxPoint&)
       ConvertPixelsToDialog__12wxWindowBaseFRC7wxPoint
+      ;wxWindowBase::SetSizer(wxSizer*,unsigned long)
+      SetSizer__12wxWindowBaseFP7wxSizerUl
+      ;wxWindowBase::SetSizerAndFit(wxSizer*,unsigned long)
+      SetSizerAndFit__12wxWindowBaseFP7wxSizerUl
       ;wxWindowBase::FindWindow(long)
       FindWindow__12wxWindowBaseFl
       ;wxWindowBase::IsExposed(int,int) const
@@ -6486,6 +7019,8 @@ EXPORTS
       ;wxWindowBase::sm_classwxWindowBase
       sm_classwxWindowBase__12wxWindowBase
       __vft16wxWindowListNode10wxNodeBase
+      ;wxWindowBase::SetVirtualSizeHints(int,int,int,int)
+      SetVirtualSizeHints__12wxWindowBaseFiN31
       ;wxWindowBase::SetSizeHints(int,int,int,int,int,int)
       SetSizeHints__12wxWindowBaseFiN51
       ;wxWindowBase::MoveConstraint(int,int)
@@ -6494,12 +7029,18 @@ EXPORTS
       LayoutPhase1__12wxWindowBaseFPi
       ;wxWindowBase::GetPositionConstraint(int*,int*) const
       GetPositionConstraint__12wxWindowBaseCFPiT1
+      ;wxWindowBase::AdjustForParentClientOrigin(int&,int&,int) const
+      AdjustForParentClientOrigin__12wxWindowBaseCFRiT1i
       ;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&)
@@ -6516,22 +7057,28 @@ EXPORTS
       SetSizeConstraint__12wxWindowBaseFiN31
       ;wxWindowBase::GetClientSizeConstraint(int*,int*) const
       GetClientSizeConstraint__12wxWindowBaseCFPiT1
+      ;wxWindowBase::DoSetVirtualSize(int,int)
+      DoSetVirtualSize__12wxWindowBaseFiT1
       ;wxWindowBase::DoHitTest(int,int) const
       DoHitTest__12wxWindowBaseCFiT1
-      ;wxWindowBase::AdjustForParentClientOrigin(int&,int&,int)
-      AdjustForParentClientOrigin__12wxWindowBaseFRiT1i
       ;wxWindowBase::DoGetBestSize() const
       DoGetBestSize__12wxWindowBaseCFv
       ;wxWindowBase::TransferDataFromWindow()
       TransferDataFromWindow__12wxWindowBaseFv
-      ;wxWindowBase::SetSizer(wxSizer*)
-      SetSizer__12wxWindowBaseFP7wxSizer
       ;wxWindowBase::IsTopLevel() const
       IsTopLevel__12wxWindowBaseCFv
       ;wxWindowBase::GetUpdateClientRect() const
       GetUpdateClientRect__12wxWindowBaseCFv
       ;wxWindowBase::GetHelpText() const
       GetHelpText__12wxWindowBaseCFv
+      ;wxWindowBase::GetAncestorWithCustomPalette() const
+      GetAncestorWithCustomPalette__12wxWindowBaseCFv
+      ;wxWindowBase::FindWindowByLabel(const wxString&,const wxWindow*)
+      FindWindowByLabel__12wxWindowBaseFRC8wxStringPC8wxWindow
+      ;wxWindowBase::FindWindowByName(const wxString&,const wxWindow*)
+      FindWindowByName__12wxWindowBaseFRC8wxStringPC8wxWindow
+      ;wxWindowBase::FindWindowById(long,const wxWindow*)
+      FindWindowById__12wxWindowBaseFlPC8wxWindow
       ;wxWindowBase::SetFont(const wxFont&)
       SetFont__12wxWindowBaseFRC6wxFont
       ;wxWindowBase::MakeModal(unsigned long)
@@ -6548,6 +7095,8 @@ EXPORTS
       InitBase__12wxWindowBaseFv
       ;wxWindowBase::SetCursor(const wxCursor&)
       SetCursor__12wxWindowBaseFRC8wxCursor
+      ;wxWindowBase::SatisfyConstraints()
+      SatisfyConstraints__12wxWindowBaseFv
       ;wxWindowBase::ResetConstraints()
       ResetConstraints__12wxWindowBaseFv
       ;wxWindowBase::GetDefaultBorder() const
@@ -6558,10 +7107,14 @@ EXPORTS
       GetBorder__12wxWindowBaseCFv
       ;wxWindowBase::Fit()
       Fit__12wxWindowBaseFv
+      ;wxWindowBase::DoGetVirtualSize() const
+      DoGetVirtualSize__12wxWindowBaseCFv
       ;wxWindowBase::DeleteRelatedConstraints()
       DeleteRelatedConstraints__12wxWindowBaseFv
       ;wxWindowBase::SetHelpText(const wxString&)
       SetHelpText__12wxWindowBaseFRC8wxString
+      ;wxGetTopLevelParent(wxWindow*)
+      wxGetTopLevelParent__FP8wxWindow
   ;From object file:  ..\common\wxchar.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxOKlibc()
@@ -6844,8 +7397,8 @@ EXPORTS
       GetEventTable__14wxYearSpinCtrlCFv
       ;wxCalendarCtrl::GetDateCoord(const wxDateTime&,int*,int*) const
       GetDateCoord__14wxCalendarCtrlCFRC10wxDateTimePiT2
-      ;wxCalendarCtrl::OnYearChange(wxSpinEvent&)
-      OnYearChange__14wxCalendarCtrlFR11wxSpinEvent
+      ;wxCalendarCtrl::OnPaint(wxPaintEvent&)
+      OnPaint__14wxCalendarCtrlFR12wxPaintEvent
       wxEVT_CALENDAR_DAY_CHANGED
       ;wxYearSpinCtrl::sm_eventTable
       sm_eventTable__14wxYearSpinCtrl
@@ -6858,8 +7411,6 @@ EXPORTS
       ;wxCalendarCtrl::sm_classwxCalendarCtrl
       sm_classwxCalendarCtrl__14wxCalendarCtrl
       __vft14wxCalendarCtrl8wxObject
-      ;wxCalendarCtrl::OnPaint(wxPaintEvent&)
-      OnPaint__14wxCalendarCtrlFR12wxPaintEvent
       ;wxCalendarCtrl::IsDateInRange(const wxDateTime&) const
       IsDateInRange__14wxCalendarCtrlCFRC10wxDateTime
       ;wxCalendarCtrl::HitTest(const wxPoint&,wxDateTime*,wxDateTime::WeekDay*)
@@ -6885,12 +7436,15 @@ EXPORTS
       ChangeYear__14wxCalendarCtrlCFP10wxDateTime
       ;wxCalendarEvent::Init()
       Init__15wxCalendarEventFv
+      __vft15wxMonthComboBox15wxItemContainer
       ;wxCalendarCtrl::GetStartDate() const
       GetStartDate__14wxCalendarCtrlCFv
-      ;wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl*)
-      __ct__15wxMonthComboBoxFP14wxCalendarCtrl
+      ;wxCalendarCtrl::OnYearChange(wxCommandEvent&)
+      OnYearChange__14wxCalendarCtrlFR14wxCommandEvent
       ;wxMonthComboBox::sm_eventTable
       sm_eventTable__15wxMonthComboBox
+      ;wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl*)
+      __ct__15wxMonthComboBoxFP14wxCalendarCtrl
       ;wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl*)
       __ct__14wxYearSpinCtrlFP14wxCalendarCtrl
       ;wxCalendarCtrl::HighlightRange(wxPaintDC*,const wxDateTime&,const wxDateTime&,wxPen*,wxBrush*)
@@ -6911,6 +7465,8 @@ EXPORTS
       GetEventTable__14wxCalendarCtrlCFv
       ;wxCalendarCtrl::GetMonthControl() const
       GetMonthControl__14wxCalendarCtrlCFv
+      ;wxCalendarCtrl::Destroy()
+      Destroy__14wxCalendarCtrlFv
   ;From object file:  ..\generic\caret.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCaret::Blink()
@@ -7052,6 +7608,26 @@ EXPORTS
       CalculateMeasurements__21wxGenericColourDialogFv
       ;wxGenericColourDialog::sm_classwxGenericColourDialog
       sm_classwxGenericColourDialog__21wxGenericColourDialog
+  ;From object file:  ..\generic\dcbuffer.cpp
+    ;PUBDEFs (Symbols available from object file):
+      __vft17wxBufferedPaintDC8wxObject
+      ;wxBufferedDC::wxBufferedDC(wxDC*,const wxBitmap&)
+      __ct__12wxBufferedDCFP4wxDCRC8wxBitmap
+      ;wxBufferedPaintDC::wxBufferedPaintDC(wxWindow*,const wxBitmap&)
+      __ct__17wxBufferedPaintDCFP8wxWindowRC8wxBitmap
+      ;wxBufferedDC::~wxBufferedDC()
+      __dt__12wxBufferedDCFv
+      __vft12wxBufferedDC8wxObject
+      ;wxBufferedDC::wxBufferedDC(wxDC*,const wxSize&)
+      __ct__12wxBufferedDCFP4wxDCRC6wxSize
+      ;wxBufferedDC::UnMask()
+      UnMask__12wxBufferedDCFv
+      ;wxBufferedDC::Init(wxDC*,const wxBitmap&)
+      Init__12wxBufferedDCFP4wxDCRC8wxBitmap
+      ;wxBufferedDC::Init(wxDC*,const wxSize&)
+      Init__12wxBufferedDCFP4wxDCRC6wxSize
+      ;wxBufferedPaintDC::~wxBufferedPaintDC()
+      __dt__17wxBufferedPaintDCFv
   ;From object file:  ..\generic\dcpsg.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft23wxPostScriptPrintDialog8wxObject
@@ -7223,6 +7799,37 @@ 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::OnGoHome(wxCommandEvent&)
+      OnGoHome__18wxGenericDirDialogFR14wxCommandEvent
+      ;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)
@@ -7258,6 +7865,7 @@ EXPORTS
       __vft13wxDirItemData12wxClientData
       ;wxGenericDirCtrl::Init()
       Init__16wxGenericDirCtrlFv
+      __vft19wxDirFilterListCtrl15wxItemContainer
       ;wxDirItemData::~wxDirItemData()
       __dt__13wxDirItemDataFv
       ;wxGenericDirCtrl::ParseFilter(const wxString&,wxArrayString&,wxArrayString&)
@@ -7274,10 +7882,16 @@ EXPORTS
       SetFilterIndex__16wxGenericDirCtrlFi
       ;wxDirFilterListCtrl::FillFilterList(const wxString&,int)
       FillFilterList__19wxDirFilterListCtrlFRC8wxStringi
+      ;wxGenericDirCtrl::ReCreateTree()
+      ReCreateTree__16wxGenericDirCtrlFv
       ;wxGenericDirCtrl::SetupSections()
       SetupSections__16wxGenericDirCtrlFv
+      ;wxGenericDirCtrl::ShowHidden(unsigned long)
+      ShowHidden__16wxGenericDirCtrlFUl
       ;wxGenericDirCtrl::OnCollapseItem(wxTreeEvent&)
       OnCollapseItem__16wxGenericDirCtrlFR11wxTreeEvent
+      ;wxGenericDirCtrl::CollapseDir(wxTreeItemId)
+      CollapseDir__16wxGenericDirCtrlF12wxTreeItemId
       ;wxDirItemData::HasSubDirs() const
       HasSubDirs__13wxDirItemDataCFv
       ;wxGenericDirCtrl::GetPath() const
@@ -7286,6 +7900,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&)
@@ -7311,55 +7927,6 @@ EXPORTS
       ;wxGenericDirCtrl::ExtractWildcard(const wxString&,int,wxString&,wxString&)
       ExtractWildcard__16wxGenericDirCtrlFRC8wxStringiR8wxStringT3
   ;From object file:  ..\generic\dragimgg.cpp
-  ;From object file:  ..\generic\fontdlgg.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxGenericFontDialog::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__19wxGenericFontDialogFR12wxCloseEvent
-      ;wxGenericFontDialog::OnPaint(wxPaintEvent&)
-      OnPaint__19wxGenericFontDialogFR12wxPaintEvent
-      ;wxGenericFontDialog::wxGenericFontDialog(wxWindow*,wxFontData*)
-      __ct__19wxGenericFontDialogFP8wxWindowP10wxFontData
-      ;wxFontStyleIntToString(int)
-      wxFontStyleIntToString__Fi
-      ;wxGenericFontDialog::Create(wxWindow*,wxFontData*)
-      Create__19wxGenericFontDialogFP8wxWindowP10wxFontData
-      ;wxGenericFontDialog::GetEventTable() const
-      GetEventTable__19wxGenericFontDialogCFv
-      ;wxGenericFontDialog::~wxGenericFontDialog()
-      __dt__19wxGenericFontDialogFv
-      ;wxFontWeightStringToInt(char*)
-      wxFontWeightStringToInt__FPc
-      __vft19wxGenericFontDialog8wxObject
-      ;wxFontFamilyIntToString(int)
-      wxFontFamilyIntToString__Fi
-      ;wxGenericFontDialog::PaintFontBackground(wxDC&)
-      PaintFontBackground__19wxGenericFontDialogFR4wxDC
-      ;wxGenericFontDialog::OnChangeFont(wxCommandEvent&)
-      OnChangeFont__19wxGenericFontDialogFR14wxCommandEvent
-      ;wxGenericFontDialog::ShowModal()
-      ShowModal__19wxGenericFontDialogFv
-      ;wxGenericFontDialog::sm_eventTableEntries
-      sm_eventTableEntries__19wxGenericFontDialog
-      ;wxGenericFontDialog::sm_eventTable
-      sm_eventTable__19wxGenericFontDialog
-      ;wxFontWeightIntToString(int)
-      wxFontWeightIntToString__Fi
-      ;wxConstructorForwxGenericFontDialog()
-      wxConstructorForwxGenericFontDialog__Fv
-      ;wxFontFamilyStringToInt(char*)
-      wxFontFamilyStringToInt__FPc
-      ;wxFontStyleStringToInt(char*)
-      wxFontStyleStringToInt__FPc
-      ;wxGenericFontDialog::wxGenericFontDialog()
-      __ct__19wxGenericFontDialogFv
-      ;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
     ;PUBDEFs (Symbols available from object file):
       ;wxFindReplaceDialog::OnFind(wxCommandEvent&)
@@ -7445,14 +8012,8 @@ EXPORTS
       SetRowAttr__15wxGridTableBaseFP14wxGridCellAttri
       ;wxGrid::SetColMinimalWidth(int,int)
       SetColMinimalWidth__6wxGridFiT1
-      ;wxGridCellWithAttrArray::RemoveAt(unsigned int)
-      RemoveAt__23wxGridCellWithAttrArrayFUi
-      ;wxGridStringArray::RemoveAt(unsigned int)
-      RemoveAt__17wxGridStringArrayFUi
       ;wxGrid::ProcessTableMessage(wxGridTableMessage&)
       ProcessTableMessage__6wxGridFR18wxGridTableMessage
-      ;wxGridCellCoordsArray::Insert(const wxGridCellCoords&,unsigned int)
-      Insert__21wxGridCellCoordsArrayFRC16wxGridCellCoordsUi
       ;wxGridStringTable::InsertRows(unsigned int,unsigned int)
       InsertRows__17wxGridStringTableFUiT1
       ;wxGridTableBase::GetValueAsBool(int,int)
@@ -7473,6 +8034,8 @@ EXPORTS
       DeselectCol__6wxGridFi
       ;wxGridTableBase::AppendCols(unsigned int)
       AppendCols__15wxGridTableBaseFUi
+      ;wxGridCellWithAttrArray::Add(const wxGridCellWithAttr&,unsigned int)
+      Add__23wxGridCellWithAttrArrayFRC18wxGridCellWithAttrUi
       ;wxGridCellAttr::Init(wxGridCellAttr*)
       Init__14wxGridCellAttrFP14wxGridCellAttr
       wxEVT_GRID_EDITOR_SHOWN
@@ -7480,7 +8043,8 @@ EXPORTS
       wxConstructorForwxGridEditorCreatedEvent__Fv
       ;wxConstructorForwxGridCornerLabelWindow()
       wxConstructorForwxGridCornerLabelWindow__Fv
-      __vft24wxGridCellStringRenderer16wxGridCellWorker
+      __vft22wxGridCellNumberEditor21wxClientDataContainer
+      __vft22wxGridCellBoolRenderer21wxClientDataContainer
       ;wxGrid::~wxGrid()
       __dt__6wxGridFv
       ;wxGridCellWithAttrArray::~wxGridCellWithAttrArray()
@@ -7617,14 +8181,12 @@ EXPORTS
       SetColAttr__15wxGridTableBaseFP14wxGridCellAttri
       ;wxGridRowOrColAttrData::SetAttr(wxGridCellAttr*,int)
       SetAttr__22wxGridRowOrColAttrDataFP14wxGridCellAttri
-      ;wxGridCellCoordsArray::RemoveAt(unsigned int)
-      RemoveAt__21wxGridCellCoordsArrayFUi
+      ;wxGridCellWithAttrArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__23wxGridCellWithAttrArrayFUiT1
       ;wxGrid::MakeCellVisible(int,int)
       MakeCellVisible__6wxGridFiT1
       ;wxGrid::IsInSelection(int,int)
       IsInSelection__6wxGridFiT1
-      ;wxGridStringArray::Insert(const wxArrayString&,unsigned int)
-      Insert__17wxGridStringArrayFRC13wxArrayStringUi
       ;wxGridTableBase::InsertRows(unsigned int,unsigned int)
       InsertRows__15wxGridTableBaseFUiT1
       ;wxGridStringTable::GetValue(int,int)
@@ -7659,6 +8221,8 @@ EXPORTS
       AppendRows__15wxGridTableBaseFUi
       ;wxGridStringTable::AppendCols(unsigned int)
       AppendCols__17wxGridStringTableFUi
+      ;wxGridStringArray::Add(const wxArrayString&,unsigned int)
+      Add__17wxGridStringArrayFRC13wxArrayStringUi
       ;wxGrid::SetDefaultCellBackgroundColour(const wxColour&)
       SetDefaultCellBackgroundColour__6wxGridFRC8wxColour
       wxEVT_GRID_EDITOR_HIDDEN
@@ -7671,9 +8235,11 @@ EXPORTS
       ;wxGridCellBoolRenderer::ms_sizeCheckMark
       ms_sizeCheckMark__22wxGridCellBoolRenderer
       __vft6wxGrid14wxScrollHelper
-      __vft24wxGridCellNumberRenderer16wxGridCellWorker
-      __vft22wxGridCellBoolRenderer16wxGridCellWorker
-      __vft20wxGridCellTextEditor16wxGridCellWorker
+      __vft22wxGridCellChoiceEditor21wxClientDataContainer
+      __vft22wxGridCellAttrProvider21wxClientDataContainer
+      __vft21wxGridCellFloatEditor21wxClientDataContainer
+      __vft20wxGridCellTextEditor21wxClientDataContainer
+      __vft15wxGridTableBase21wxClientDataContainer
       ;wxGridCellAttrProvider::~wxGridCellAttrProvider()
       __dt__22wxGridCellAttrProviderFv
       ;wxGridTypeRegistry::~wxGridTypeRegistry()
@@ -7700,6 +8266,12 @@ EXPORTS
       MergeWith__14wxGridCellAttrFP14wxGridCellAttr
       ;wxGrid::IsCurrentCellReadOnly() const
       IsCurrentCellReadOnly__6wxGridCFv
+      ;wxGridCellWithAttrArray::Insert(const wxGridCellWithAttr&,unsigned int,unsigned int)
+      Insert__23wxGridCellWithAttrArrayFRC18wxGridCellWithAttrUiT2
+      ;wxGridCellCoordsArray::Insert(const wxGridCellCoords&,unsigned int,unsigned int)
+      Insert__21wxGridCellCoordsArrayFRC16wxGridCellCoordsUiT2
+      ;wxGridStringArray::Insert(const wxArrayString&,unsigned int,unsigned int)
+      Insert__17wxGridStringArrayFRC13wxArrayStringUiT2
       ;wxGridCellAttr::GetTextColour() const
       GetTextColour__14wxGridCellAttrCFv
       ;wxGridCellNumberRenderer::GetString(wxGrid&,int,int)
@@ -7724,8 +8296,6 @@ EXPORTS
       CalcWindowSizes__6wxGridFv
       ;wxGrid::CalcRowLabelsExposed(const wxRegion&)
       CalcRowLabelsExposed__6wxGridFRC8wxRegion
-      ;wxGridCellWithAttrArray::Add(const wxGridCellWithAttr&)
-      Add__23wxGridCellWithAttrArrayFRC18wxGridCellWithAttr
       ;wxGrid::SetCurrentCell(const wxGridCellCoords&)
       SetCurrentCell__6wxGridFRC16wxGridCellCoords
       wxGridNoCellCoords
@@ -7746,10 +8316,6 @@ EXPORTS
       DrawCellBorder__6wxGridFR4wxDCRC16wxGridCellCoords
       ;wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr&,wxDC&,const wxString&)
       DoGetBestSize__24wxGridCellStringRendererFR14wxGridCellAttrR4wxDCRC8wxString
-      ;wxGridCellCoordsArray::Add(const wxGridCellCoords&)
-      Add__21wxGridCellCoordsArrayFRC16wxGridCellCoords
-      ;wxGridStringArray::Add(const wxArrayString&)
-      Add__17wxGridStringArrayFRC13wxArrayString
       ;wxGrid::EnableCellEditControl(unsigned long)
       EnableCellEditControl__6wxGridFUl
       wxEVT_GRID_EDITOR_CREATED
@@ -7838,6 +8404,8 @@ EXPORTS
       SetRowLabelSize__6wxGridFi
       ;wxGrid::SetCellHighlightROPenWidth(int)
       SetCellHighlightROPenWidth__6wxGridFi
+      ;wxGridStringArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__17wxGridStringArrayFUiT1
       ;wxGrid::Redimension(wxGridTableMessage&)
       Redimension__6wxGridFR18wxGridTableMessage
       ;wxGrid::IsReadOnly(int,int) const
@@ -7868,11 +8436,9 @@ EXPORTS
       wxConstructorForwxGridRowLabelWindow__Fv
       ;wxGridCellEditorEvtHandler::sm_classwxGridCellEditorEvtHandler
       sm_classwxGridCellEditorEvtHandler__26wxGridCellEditorEvtHandler
-      __vft22wxGridCellNumberEditor16wxGridCellWorker
-      __vft22wxGridCellAttrProvider
-      __vft21wxGridCellFloatEditor16wxGridCellWorker
-      __vft20wxGridCellBoolEditor16wxGridCellWorker
-      __vft16wxGridCellWorker
+      __vft24wxGridCellStringRenderer21wxClientDataContainer
+      __vft24wxGridCellNumberRenderer21wxClientDataContainer
+      __vft20wxGridCellBoolEditor21wxClientDataContainer
       ;wxGridStringTable::~wxGridStringTable()
       __dt__17wxGridStringTableFv
       ;wxGridWindow::~wxGridWindow()
@@ -8052,11 +8618,14 @@ EXPORTS
       GetCellFont__6wxGridFiT1
       ;wxGrid::DeselectRow(int)
       DeselectRow__6wxGridFi
+      ;wxGridCellCoordsArray::Add(const wxGridCellCoords&,unsigned int)
+      Add__21wxGridCellCoordsArrayFRC16wxGridCellCoordsUi
       ;wxGridCellEditor::~wxGridCellEditor()
       __dt__16wxGridCellEditorFv
       ;wxConstructorForwxGridStringTable()
       wxConstructorForwxGridStringTable__Fv
-      __vft16wxGridCellEditor16wxGridCellWorker
+      __vft17wxGridStringTable21wxClientDataContainer
+      __vft16wxGridCellEditor21wxClientDataContainer
       ;wxGridStringTable::wxGridStringTable()
       __ct__17wxGridStringTableFv
       ;wxGrid::ShowCellEditControl()
@@ -8194,8 +8763,8 @@ EXPORTS
       SetColFormatNumber__6wxGridFi
       ;wxGrid::SetCellHighlightPenWidth(int)
       SetCellHighlightPenWidth__6wxGridFi
-      ;wxGridCellWithAttrArray::Insert(const wxGridCellWithAttr&,unsigned int)
-      Insert__23wxGridCellWithAttrArrayFRC18wxGridCellWithAttrUi
+      ;wxGridCellCoordsArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__21wxGridCellCoordsArrayFUiT1
       ;wxGridStringTable::InsertCols(unsigned int,unsigned int)
       InsertCols__17wxGridStringTableFUiT1
       ;wxGridTableBase::GetValueAsDouble(int,int)
@@ -8242,8 +8811,8 @@ EXPORTS
       wxConstructorForwxGridColLabelWindow__Fv
       ;wxGridCellEditorEvtHandler::sm_eventTableEntries
       sm_eventTableEntries__26wxGridCellEditorEvtHandler
-      __vft23wxGridCellFloatRenderer16wxGridCellWorker
-      __vft22wxGridCellChoiceEditor16wxGridCellWorker
+      __vft23wxGridCellFloatRenderer21wxClientDataContainer
+      __vft16wxGridCellWorker21wxClientDataContainer
       ;wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
       __dt__22wxGridRowOrColAttrDataFv
       ;wxGridCellCoordsArray::~wxGridCellCoordsArray()
@@ -8332,11 +8901,12 @@ EXPORTS
       Draw__22wxGridCellEnumRendererFR6wxGridR14wxGridCellAttrR4wxDCRC6wxRectiT5Ul
       ;wxGridCellDateTimeRenderer::wxGridCellDateTimeRenderer(wxString,wxString)
       __ct__26wxGridCellDateTimeRendererF8wxStringT1
+      __vft20wxGridCellEnumEditor21wxClientDataContainer
       ;wxGridCellDateTimeRenderer::Draw(wxGrid&,wxGridCellAttr&,wxDC&,const wxRect&,int,int,unsigned long)
       Draw__26wxGridCellDateTimeRendererFR6wxGridR14wxGridCellAttrR4wxDCRC6wxRectiT5Ul
       ;wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid&,wxGridCellAttr&,wxDC&,int,int)
       GetBestSize__32wxGridCellAutoWrapStringRendererFR6wxGridR14wxGridCellAttrR4wxDCiT4
-      __vft32wxGridCellAutoWrapStringRenderer16wxGridCellWorker
+      __vft22wxGridCellEnumRenderer21wxClientDataContainer
       ;wxGridCellDateTimeRenderer::SetParameters(const wxString&)
       SetParameters__26wxGridCellDateTimeRendererFRC8wxString
       ;wxGridCellEnumRenderer::SetParameters(const wxString&)
@@ -8349,8 +8919,8 @@ EXPORTS
       Draw__32wxGridCellAutoWrapStringRendererFR6wxGridR14wxGridCellAttrR4wxDCRC6wxRectiT5Ul
       ;wxGridCellDateTimeRenderer::Clone() const
       Clone__26wxGridCellDateTimeRendererCFv
-      __vft22wxGridCellEnumRenderer16wxGridCellWorker
-      __vft20wxGridCellEnumEditor16wxGridCellWorker
+      __vft30wxGridCellAutoWrapStringEditor21wxClientDataContainer
+      __vft26wxGridCellDateTimeRenderer21wxClientDataContainer
       ;wxGridCellDateTimeRenderer::GetString(wxGrid&,int,int)
       GetString__26wxGridCellDateTimeRendererFR6wxGridiT2
       ;wxGridCellEnumRenderer::GetString(wxGrid&,int,int)
@@ -8367,8 +8937,7 @@ EXPORTS
       GetTextLines__32wxGridCellAutoWrapStringRendererFR6wxGridR4wxDCR14wxGridCellAttrRC6wxRectiT5
       ;wxGridCellEnumRenderer::Clone() const
       Clone__22wxGridCellEnumRendererCFv
-      __vft30wxGridCellAutoWrapStringEditor16wxGridCellWorker
-      __vft26wxGridCellDateTimeRenderer16wxGridCellWorker
+      __vft32wxGridCellAutoWrapStringRenderer21wxClientDataContainer
   ;From object file:  ..\generic\gridsel.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxGridSelection::SelectBlock(int,int,int,int,unsigned long,unsigned long,unsigned long,unsigned long,unsigned long)
@@ -8439,107 +9008,41 @@ EXPORTS
       LoadFile__24wxHTMLHelpControllerBaseFRC8wxString
       ;wxHTMLHelpControllerBase::KeywordSearch(const wxString&)
       KeywordSearch__24wxHTMLHelpControllerBaseFRC8wxString
-  ;From object file:  ..\generic\helpwxht.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxHelpControllerHtml::GetFrameParameters(wxSize*,wxPoint*,unsigned long*)
-      GetFrameParameters__20wxHelpControllerHtmlFP6wxSizeP7wxPointPUl
-      __vft20wxHelpControllerHtml8wxObject
-      ;wxHelpFrame::sm_eventTable
-      sm_eventTable__11wxHelpFrame
-      ;wxHelpFrame::OnButton(wxCommandEvent&)
-      OnButton__11wxHelpFrameFR14wxCommandEvent
-      ;wxHelpControllerHtml::sm_classwxHelpControllerHtml
-      sm_classwxHelpControllerHtml__20wxHelpControllerHtml
-      __vft11wxHelpFrame8wxObject
-      ;wxHelpFrame::OnClose(wxCloseEvent&)
-      OnClose__11wxHelpFrameFR12wxCloseEvent
-      ;wxHelpControllerHtml::wxHelpControllerHtml()
-      __ct__20wxHelpControllerHtmlFv
-      ;wxHelpControllerHtml::~wxHelpControllerHtml()
-      __dt__20wxHelpControllerHtmlFv
-      ;wxHelpControllerHtml::DisplayHelp(const wxString&)
-      DisplayHelp__20wxHelpControllerHtmlFRC8wxString
-      ;wxHelpFrame::wxHelpFrame(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,wxHelpControllerHtml*)
-      __ct__11wxHelpFrameFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizeP20wxHelpControllerHtml
-      ;wxHelpFrame::GetEventTable() const
-      GetEventTable__11wxHelpFrameCFv
-      ;wxHelpControllerHtml::SetFrameParameters(const wxString&,const wxSize&,const wxPoint&,unsigned long)
-      SetFrameParameters__20wxHelpControllerHtmlFRC8wxStringRC6wxSizeRC7wxPointUl
-      ;wxHelpFrame::sm_eventTableEntries
-      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
-      ;wxImageList::Add(const wxBitmap&,const wxColour&)
-      Add__11wxImageListFRC8wxBitmapRC8wxColour
-      ;wxImageList::Add(const wxBitmap&,const wxBitmap&)
-      Add__11wxImageListFRC8wxBitmapT1
-      ;wxImageList::Remove(int)
-      Remove__11wxImageListFi
-      ;wxImageList::Create()
-      Create__11wxImageListFv
-      ;wxImageList::Add(const wxBitmap&)
-      Add__11wxImageListFRC8wxBitmap
-      ;wxImageList::sm_classwxImageList
-      sm_classwxImageList__11wxImageList
-      ;wxImageList::Replace(int,const wxBitmap&)
-      Replace__11wxImageListFiRC8wxBitmap
-      ;wxImageList::wxImageList(int,int,unsigned long,int)
-      __ct__11wxImageListFiT1UlT1
-      ;wxImageList::Create(int,int,unsigned long,int)
-      Create__11wxImageListFiT1UlT1
-      ;wxImageList::~wxImageList()
-      __dt__11wxImageListFv
-      ;wxImageList::GetSize(int,int&,int&) const
-      GetSize__11wxImageListCFiRiT2
-      ;wxImageList::Draw(int,wxDC&,int,int,int,unsigned long)
-      Draw__11wxImageListFiR4wxDCN31Ul
-      ;wxImageList::GetImageCount() const
-      GetImageCount__11wxImageListCFv
-      ;wxImageList::GetBitmap(int) const
-      GetBitmap__11wxImageListCFi
-      ;wxConstructorForwxImageList()
-      wxConstructorForwxImageList__Fv
-      ;wxImageList::RemoveAll()
-      RemoveAll__11wxImageListFv
+      ;wxGenericImageList::sm_classwxGenericImageList
+      sm_classwxGenericImageList__18wxGenericImageList
+      ;wxGenericImageList::Create()
+      Create__18wxGenericImageListFv
+      ;wxGenericImageList::GetSize(int,int&,int&) const
+      GetSize__18wxGenericImageListCFiRiT2
+      ;wxGenericImageList::Draw(int,wxDC&,int,int,int,unsigned long)
+      Draw__18wxGenericImageListFiR4wxDCN31Ul
+      ;wxGenericImageList::GetImageCount() const
+      GetImageCount__18wxGenericImageListCFv
+      ;wxGenericImageList::RemoveAll()
+      RemoveAll__18wxGenericImageListFv
+      ;wxGenericImageList::Replace(int,const wxBitmap&)
+      Replace__18wxGenericImageListFiRC8wxBitmap
+      ;wxGenericImageList::Remove(int)
+      Remove__18wxGenericImageListFi
+      ;wxConstructorForwxGenericImageList()
+      wxConstructorForwxGenericImageList__Fv
+      ;wxGenericImageList::~wxGenericImageList()
+      __dt__18wxGenericImageListFv
+      __vft18wxGenericImageList8wxObject
+      ;wxGenericImageList::Add(const wxBitmap&,const wxBitmap&)
+      Add__18wxGenericImageListFRC8wxBitmapT1
+      ;wxGenericImageList::Add(const wxBitmap&,const wxColour&)
+      Add__18wxGenericImageListFRC8wxBitmapRC8wxColour
+      ;wxGenericImageList::Add(const wxBitmap&)
+      Add__18wxGenericImageListFRC8wxBitmap
+      ;wxGenericImageList::wxGenericImageList(int,int,unsigned long,int)
+      __ct__18wxGenericImageListFiT1UlT1
+      ;wxGenericImageList::GetBitmap(int) const
+      GetBitmap__18wxGenericImageListCFi
+      ;wxGenericImageList::Create(int,int,unsigned long,int)
+      Create__18wxGenericImageListFiT1UlT1
   ;From object file:  ..\generic\laywin.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent&)
@@ -8582,34 +9085,40 @@ EXPORTS
       wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT
       ;wxListTextCtrl::sm_eventTable
       sm_eventTable__14wxListTextCtrl
-      ;wxListCtrl::sm_eventTableEntries
-      sm_eventTableEntries__10wxListCtrl
-      ;wxListCtrl::SortItems(int(*)(long,long,long),long)
-      SortItems__10wxListCtrlFPFlN21_il
-      ;wxListCtrl::SetItemPosition(long,const wxPoint&)
-      SetItemPosition__10wxListCtrlFlRC7wxPoint
+      ;wxGenericListCtrl::SetSingleStyle(long,unsigned long)
+      SetSingleStyle__17wxGenericListCtrlFlUl
       ;wxListMainWindow::SendNotify(unsigned int,int,wxPoint)
       SendNotify__16wxListMainWindowFUii7wxPoint
       ;wxSelectionStore::SelectRange(unsigned int,unsigned int,unsigned long,wxArrayInt*)
       SelectRange__16wxSelectionStoreFUiT1UlP10wxArrayInt
+      ;wxGenericListCtrl::RefreshItem(long)
+      RefreshItem__17wxGenericListCtrlFl
       ;wxListHeaderWindow::OnSetFocus(wxFocusEvent&)
       OnSetFocus__18wxListHeaderWindowFR12wxFocusEvent
       ;wxListMainWindow::OnPaint(wxPaintEvent&)
       OnPaint__16wxListMainWindowFR12wxPaintEvent
       ;wxListTextCtrl::OnKillFocus(wxFocusEvent&)
       OnKillFocus__14wxListTextCtrlFR12wxFocusEvent
-      ;wxListCtrl::OnIdle(wxIdleEvent&)
-      OnIdle__10wxListCtrlFR11wxIdleEvent
       ;wxListMainWindow::HighlightAll(unsigned long)
       HighlightAll__16wxListMainWindowFUl
       ;wxListMainWindow::DeleteItem(long)
       DeleteItem__16wxListMainWindowFl
       ;wxListLineDataArray::wxListLineDataArray(const wxListLineDataArray&)
       __ct__19wxListLineDataArrayFRC19wxListLineDataArray
+      ;wxListTextCtrl::wxListTextCtrl(wxListMainWindow*,unsigned int)
+      __ct__14wxListTextCtrlFP16wxListMainWindowUi
       ;wxListItemData::SetSize(int,int)
       SetSize__14wxListItemDataFiT1
+      ;wxGenericListCtrl::SetItem(wxListItem&)
+      SetItem__17wxGenericListCtrlFR10wxListItem
       ;wxListLineData::SetItem(int,const wxListItem&)
       SetItem__14wxListLineDataFiRC10wxListItem
+      ;wxGenericListCtrl::SetImageList(wxGenericImageList*,int)
+      SetImageList__17wxGenericListCtrlFP18wxGenericImageListi
+      ;wxGenericListCtrl::SetColumnWidth(int,int)
+      SetColumnWidth__17wxGenericListCtrlFiT1
+      ;wxGenericListCtrl::ScrollList(int,int)
+      ScrollList__17wxGenericListCtrlFiT1
       ;wxListMainWindow::RefreshLine(unsigned int)
       RefreshLine__16wxListMainWindowFUi
       ;wxSelectionStore::OnItemDelete(unsigned int)
@@ -8620,129 +9129,147 @@ EXPORTS
       GetLineRect__16wxListMainWindowCFUi
       ;wxListMainWindow::GetLineLabelRect(unsigned int) const
       GetLineLabelRect__16wxListMainWindowCFUi
-      ;wxListMainWindow::GetItem(wxListItem&)
-      GetItem__16wxListMainWindowFR10wxListItem
       ;wxListItemData::GetItem(wxListItem&) const
       GetItem__14wxListItemDataCFR10wxListItem
-      ;wxListCtrl::FindItem(long,long)
-      FindItem__10wxListCtrlFlT1
       ;wxListItemData::Init()
       Init__14wxListItemDataFv
-      ;wxConstructorForwxListTextCtrl()
-      wxConstructorForwxListTextCtrl__Fv
       ;wxListHeaderWindow::~wxListHeaderWindow()
       __dt__18wxListHeaderWindowFv
       ;wxListMainWindow::wxListMainWindow()
       __ct__16wxListMainWindowFv
       ;wxListHeaderData::wxListHeaderData()
       __ct__16wxListHeaderDataFv
-      ;wxListCtrl::SetFocus()
-      SetFocus__10wxListCtrlFv
-      ;wxListCtrl::SetCursor(const wxCursor&)
-      SetCursor__10wxListCtrlFRC8wxCursor
+      ;wxGenericListCtrl::Thaw()
+      Thaw__17wxGenericListCtrlFv
+      ;wxGenericListCtrl::SetTextColour(const wxColour&)
+      SetTextColour__17wxGenericListCtrlFRC8wxColour
+      ;wxGenericListCtrl::SetForegroundColour(const wxColour&)
+      SetForegroundColour__17wxGenericListCtrlFRC8wxColour
       ;wxListLineData::ReverseHighlight()
       ReverseHighlight__14wxListLineDataFv
-      ;wxListMainWindow::OnRenameAccept()
-      OnRenameAccept__16wxListMainWindowFv
       ;wxListRenameTimer::Notify()
       Notify__17wxListRenameTimerFv
       ;wxListHeaderWindow::Init()
       Init__18wxListHeaderWindowFv
       ;wxListHeaderData::GetWidth() const
       GetWidth__16wxListHeaderDataCFv
-      ;wxListCtrl::GetTopItem() const
-      GetTopItem__10wxListCtrlCFv
-      ;wxListCtrl::GetItemCount() const
-      GetItemCount__10wxListCtrlCFv
+      ;wxGenericListCtrl::GetTopItem() const
+      GetTopItem__17wxGenericListCtrlCFv
+      ;wxListMainWindow::GetNextItem(long,int,int) const
+      GetNextItem__16wxListMainWindowCFliT2
       ;wxListMainWindow::GetImageSize(int,int&,int&) const
       GetImageSize__16wxListMainWindowCFiRiT2
-      ;wxListCtrl::Freeze()
-      Freeze__10wxListCtrlFv
+      ;wxGenericListCtrl::GetEventTable() const
+      GetEventTable__17wxGenericListCtrlCFv
+      ;wxGenericListCtrl::GetDropTarget() const
+      GetDropTarget__17wxGenericListCtrlCFv
       ;wxListHeaderWindow::DoDrawRect(wxDC*,int,int,int,int)
       DoDrawRect__18wxListHeaderWindowFP4wxDCiN32
-      wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
+      ;wxGenericListCtrl::ClearAll()
+      ClearAll__17wxGenericListCtrlFv
+      ;wxListMainWindow::OnRenameAccept(unsigned int,const wxString&)
+      OnRenameAccept__16wxListMainWindowFUiRC8wxString
       wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK
-      ;wxListMainWindow::GetItemRect(long,wxRect&)
-      GetItemRect__16wxListMainWindowFlR6wxRect
+      wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
+      ;wxGenericListCtrl::SetItemText(long,const wxString&)
+      SetItemText__17wxGenericListCtrlFlRC8wxString
+      ;wxGenericListCtrl::Edit(long)
+      Edit__17wxGenericListCtrlFl
       wxEVT_COMMAND_LIST_ITEM_FOCUSED
       wxEVT_COMMAND_LIST_ITEM_DESELECTED
       wxEVT_COMMAND_LIST_ITEM_ACTIVATED
       wxEVT_COMMAND_LIST_CACHE_HINT
+      ;wxGenericListCtrl::sm_eventTable
+      sm_eventTable__17wxGenericListCtrl
       __vft14wxListTextCtrl8wxObject
-      ;wxListCtrl::SetItemSpacing(int,unsigned long)
-      SetItemSpacing__10wxListCtrlFiUl
+      ;wxGenericListCtrl::SetItemCount(long)
+      SetItemCount__17wxGenericListCtrlFl
       ;wxListMainWindow::SetItemCount(long)
       SetItemCount__16wxListMainWindowFl
-      ;wxListCtrl::SetDropTarget(wxDropTarget*)
-      SetDropTarget__10wxListCtrlFP12wxDropTarget
       ;wxListMainWindow::RecalculatePositions(unsigned long)
       RecalculatePositions__16wxListMainWindowFUl
       ;wxListMainWindow::OnKeyDown(wxKeyEvent&)
       OnKeyDown__16wxListMainWindowFR10wxKeyEvent
       ;wxListMainWindow::OnArrowChar(unsigned int,const wxKeyEvent&)
       OnArrowChar__16wxListMainWindowFUiRC10wxKeyEvent
-      ;wxListLineDataArray::operator=(const wxListLineDataArray&)
-      __as__19wxListLineDataArrayFRC19wxListLineDataArray
+      ;wxGenericListCtrl::GetItemData(long) const
+      GetItemData__17wxGenericListCtrlCFl
+      ;wxGenericListCtrl::GetItemState(long,long) const
+      GetItemState__17wxGenericListCtrlCFlT1
       wxEVT_COMMAND_LIST_INSERT_ITEM
       ;wxListItem::sm_classwxListItem
       sm_classwxListItem__10wxListItem
       list_ctrl_compare_func_1
       list_ctrl_compare_data
+      ;wxListLineDataArray::operator=(const wxListLineDataArray&)
+      __as__19wxListLineDataArrayFRC19wxListLineDataArray
       ;wxListHeaderData::SetItem(const wxListItem&)
       SetItem__16wxListHeaderDataFRC10wxListItem
-      ;wxListCtrl::SetItem(wxListItem&)
-      SetItem__10wxListCtrlFR10wxListItem
       ;wxListMainWindow::SetItemState(long,long,long)
       SetItemState__16wxListMainWindowFlN21
-      ;wxListMainWindow::SetImageList(wxImageList*,int)
-      SetImageList__16wxListMainWindowFP11wxImageListi
+      ;wxListMainWindow::SetImageList(wxGenericImageList*,int)
+      SetImageList__16wxListMainWindowFP18wxGenericImageListi
+      ;wxGenericListCtrl::SetColumn(int,wxListItem&)
+      SetColumn__17wxGenericListCtrlFiR10wxListItem
       ;wxListMainWindow::SetColumnWidth(int,int)
       SetColumnWidth__16wxListMainWindowFiT1
-      ;wxListCtrl::OnGetItemText(long,long) const
-      OnGetItemText__10wxListCtrlCFlT1
+      ;wxGenericListCtrl::RefreshItems(long,long)
+      RefreshItems__17wxGenericListCtrlFlT1
+      ;wxGenericListCtrl::OnGetItemText(long,long) const
+      OnGetItemText__17wxGenericListCtrlCFlT1
       ;wxListMainWindow::MoveToItem(unsigned int)
       MoveToItem__16wxListMainWindowFUi
       ;wxListHeaderData::IsHit(int,int) const
       IsHit__16wxListHeaderDataCFiT1
       ;wxListItemData::IsHit(int,int) const
       IsHit__14wxListItemDataCFiT1
-      ;wxListCtrl::InsertItem(wxListItem&)
-      InsertItem__10wxListCtrlFR10wxListItem
+      ;wxGenericListCtrl::InsertItem(long,int)
+      InsertItem__17wxGenericListCtrlFli
       ;wxListMainWindow::HitTest(int,int,int&)
       HitTest__16wxListMainWindowFiT1Ri
-      ;wxListCtrl::HitTest(const wxPoint&,int&)
-      HitTest__10wxListCtrlFRC7wxPointRi
+      ;wxGenericListCtrl::GetImageList(int) const
+      GetImageList__17wxGenericListCtrlCFi
+      ;wxGenericListCtrl::GetColumn(int,wxListItem&) const
+      GetColumn__17wxGenericListCtrlCFiR10wxListItem
       ;wxListMainWindow::GetColumn(int,wxListItem&) const
       GetColumn__16wxListMainWindowCFiR10wxListItem
+      ;wxGenericListCtrl::DeleteColumn(int)
+      DeleteColumn__17wxGenericListCtrlFi
       ;wxListMainWindow::CacheLineData(unsigned int)
       CacheLineData__16wxListMainWindowFUi
-      ;wxwxListItemDataListNode::DeleteData()
-      DeleteData__24wxwxListItemDataListNodeFv
-      ;wxConstructorForwxListCtrl()
-      wxConstructorForwxListCtrl__Fv
+      ;wxGenericListCtrl::GetNextItem(long,int,int) const
+      GetNextItem__17wxGenericListCtrlCFliT2
       list_ctrl_compare_func_2
       ;wxListMainWindow::~wxListMainWindow()
       __dt__16wxListMainWindowFv
       ;wxListHeaderWindow::wxListHeaderWindow()
       __ct__18wxListHeaderWindowFv
+      ;wxGenericListCtrl::SetItem(long,int,const wxString&,int)
+      SetItem__17wxGenericListCtrlFliRC8wxStringT2
       ;wxListLineData::SetAttr(wxListItemAttr*)
       SetAttr__14wxListLineDataFP14wxListItemAttr
       ;wxListMainWindow::RefreshSelected()
       RefreshSelected__16wxListMainWindowFv
       ;wxListMainWindow::OnRenameTimer()
       OnRenameTimer__16wxListMainWindowFv
+      ;wxListLineDataArray::Insert(const wxListLineData&,unsigned int,unsigned int)
+      Insert__19wxListLineDataArrayFRC14wxListLineDataUiT2
       ;wxListItemData::GetX() const
       GetX__14wxListItemDataCFv
-      ;wxListCtrl::GetTextColour() const
-      GetTextColour__10wxListCtrlCFv
+      ;wxGenericListCtrl::GetTextColour() const
+      GetTextColour__17wxGenericListCtrlCFv
       ;wxListMainWindow::GetHeaderWidth() const
       GetHeaderWidth__16wxListMainWindowCFv
+      ;wxGenericListCtrl::GetForegroundColour() const
+      GetForegroundColour__17wxGenericListCtrlCFv
       ;wxListTextCtrl::GetEventTable() const
       GetEventTable__14wxListTextCtrlCFv
+      ;wxGenericListCtrl::DoPopupMenu(wxMenu*,int,int)
+      DoPopupMenu__17wxGenericListCtrlFP6wxMenuiT2
       ;wxListMainWindow::DoDeleteAllItems()
       DoDeleteAllItems__16wxListMainWindowFv
-      ;wxListItem::ClearAttributes()
-      ClearAttributes__10wxListItemFv
+      ;wxwxListItemDataListNode::DeleteData()
+      DeleteData__24wxwxListItemDataListNodeFv
       ;wxListLineData::wxListLineData(wxListMainWindow*)
       __ct__14wxListLineDataFP16wxListMainWindow
       wxEVT_COMMAND_LIST_SET_INFO
@@ -8759,36 +9286,44 @@ EXPORTS
       sm_classwxListMainWindow__16wxListMainWindow
       ;wxListRenameTimer::wxListRenameTimer(wxListMainWindow*)
       __ct__17wxListRenameTimerFP16wxListMainWindow
-      ;wxListCtrl::InsertColumn(long,const wxString&,int,int)
-      InsertColumn__10wxListCtrlFlRC8wxStringiT3
-      ;wxListCtrl::Edit(long)
-      Edit__10wxListCtrlFl
+      ;wxGenericListCtrl::InsertColumn(long,const wxString&,int,int)
+      InsertColumn__17wxGenericListCtrlFlRC8wxStringiT3
+      ;wxListLineDataArray::Index(const wxListLineData&,unsigned long) const
+      Index__19wxListLineDataArrayCFRC14wxListLineDataUl
+      ;wxGenericListCtrl::sm_eventTableEntries
+      sm_eventTableEntries__17wxGenericListCtrl
       ;wxListEvent::sm_classwxListEvent
       sm_classwxListEvent__11wxListEvent
-      ;wxListCtrl::sm_classwxListCtrl
-      sm_classwxListCtrl__10wxListCtrl
       __vft18wxListHeaderWindow8wxObject
       __vft17wxListRenameTimer8wxObject
+      ;wxGenericListCtrl::SortItems(int(*)(long,long,long),long)
+      SortItems__17wxGenericListCtrlFPFlN21_il
       ;wxListMainWindow::SortItems(int(*)(long,long,long),long)
       SortItems__16wxListMainWindowFPFlN21_il
-      ;wxListCtrl::SetSingleStyle(long,unsigned long)
-      SetSingleStyle__10wxListCtrlFlUl
+      ;wxGenericListCtrl::SetWindowStyleFlag(long)
+      SetWindowStyleFlag__17wxGenericListCtrlFl
+      ;wxGenericListCtrl::SetItemSpacing(int,unsigned long)
+      SetItemSpacing__17wxGenericListCtrlFiUl
       ;wxListMainWindow::SetItemSpacing(int,unsigned long)
       SetItemSpacing__16wxListMainWindowFiUl
-      ;wxListCtrl::SetItemCount(long)
-      SetItemCount__10wxListCtrlFl
-      ;wxListCtrl::OnSize(wxSizeEvent&)
-      OnSize__10wxListCtrlFR11wxSizeEvent
+      ;wxGenericListCtrl::SetItemPosition(long,const wxPoint&)
+      SetItemPosition__17wxGenericListCtrlFlRC7wxPoint
       ;wxListHeaderWindow::OnMouse(wxMouseEvent&)
       OnMouse__18wxListHeaderWindowFR12wxMouseEvent
+      ;wxGenericListCtrl::OnIdle(wxIdleEvent&)
+      OnIdle__17wxGenericListCtrlFR11wxIdleEvent
+      ;wxGenericListCtrl::OnGetItemAttr(long) const
+      OnGetItemAttr__17wxGenericListCtrlCFl
       ;wxListTextCtrl::OnChar(wxKeyEvent&)
       OnChar__14wxListTextCtrlFR10wxKeyEvent
-      ;wxListLineDataArray::Index(const wxListLineData&,unsigned long) const
-      Index__19wxListLineDataArrayCFRC14wxListLineDataUl
-      ;wxListCtrl::FindItem(long,const wxString&,unsigned long)
-      FindItem__10wxListCtrlFlRC8wxStringUl
-      ;wxListCtrl::SetItemState(long,long,long)
-      SetItemState__10wxListCtrlFlN21
+      ;wxGenericListCtrl::GetItemText(long) const
+      GetItemText__17wxGenericListCtrlCFl
+      ;wxListMainWindow::GetItemRect(long,wxRect&) const
+      GetItemRect__16wxListMainWindowCFlR6wxRect
+      ;wxGenericListCtrl::GetItemPosition(long,wxPoint&) const
+      GetItemPosition__17wxGenericListCtrlCFlR7wxPoint
+      ;wxListLineData::SetImage(int,int)
+      SetImage__14wxListLineDataFiT1
       ;wxListHeaderData::wxListHeaderData(const wxListItem&)
       __ct__16wxListHeaderDataFRC10wxListItem
       ;wxListHeaderData::SetWidth(int)
@@ -8797,155 +9332,154 @@ EXPORTS
       SetPosition__16wxListHeaderDataFiT1
       ;wxListItemData::SetPosition(int,int)
       SetPosition__14wxListItemDataFiT1
-      ;wxListLineData::SetImage(int,int)
-      SetImage__14wxListLineDataFiT1
       ;wxListHeaderData::SetHeight(int)
       SetHeight__16wxListHeaderDataFi
       ;wxListHeaderData::SetFormat(int)
       SetFormat__16wxListHeaderDataFi
-      ;wxListCtrl::SetColumnWidth(int,int)
-      SetColumnWidth__10wxListCtrlFiT1
-      ;wxListLineDataArray::RemoveAt(unsigned int)
-      RemoveAt__19wxListLineDataArrayFUi
       ;wxListMainWindow::RefreshLines(unsigned int,unsigned int)
       RefreshLines__16wxListMainWindowFUiT1
-      ;wxListCtrl::InsertItem(long,int)
-      InsertItem__10wxListCtrlFli
+      ;wxGenericListCtrl::InsertColumn(long,wxListItem&)
+      InsertColumn__17wxGenericListCtrlFlR10wxListItem
+      ;wxGenericListCtrl::HitTest(const wxPoint&,int&)
+      HitTest__17wxGenericListCtrlFRC7wxPointRi
       ;wxListMainWindow::GetVisibleLinesRange(unsigned int*,unsigned int*)
       GetVisibleLinesRange__16wxListMainWindowFPUiT1
-      ;wxListCtrl::GetItem(wxListItem&) const
-      GetItem__10wxListCtrlCFR10wxListItem
+      ;wxGenericListCtrl::GetColumnWidth(int) const
+      GetColumnWidth__17wxGenericListCtrlCFi
+      ;wxGenericListCtrl::FindItem(long,const wxPoint&,int)
+      FindItem__17wxGenericListCtrlFlRC7wxPointi
       ;wxListMainWindow::FindItem(long,long)
       FindItem__16wxListMainWindowFlT1
       ;wxListMainWindow::DrawImage(int,wxDC*,int,int)
       DrawImage__16wxListMainWindowFiP4wxDCN21
-      ;wxListCtrl::DeleteColumn(int)
-      DeleteColumn__10wxListCtrlFi
       ;wxListMainWindow::ChangeCurrent(unsigned int)
       ChangeCurrent__16wxListMainWindowFUi
-      ;wxListCtrl::Arrange(int)
-      Arrange__10wxListCtrlFi
-      ;wxListCtrl::GetNextItem(long,int,int) const
-      GetNextItem__10wxListCtrlCFliT2
+      ;wxGenericListCtrl::AssignImageList(wxGenericImageList*,int)
+      AssignImageList__17wxGenericListCtrlFP18wxGenericImageListi
+      ;wxGenericListCtrl::~wxGenericListCtrl()
+      __dt__17wxGenericListCtrlFv
       wxEVT_COMMAND_LIST_KEY_DOWN
       ;wxConstructorForwxListMainWindow()
       wxConstructorForwxListMainWindow__Fv
       ;wxConstructorForwxListEvent()
       wxConstructorForwxListEvent__Fv
+      ;wxConstructorForwxGenericListCtrl()
+      wxConstructorForwxGenericListCtrl__Fv
       __vft16wxListMainWindow14wxScrollHelper
       ;wxListMainWindow::UpdateCurrent()
       UpdateCurrent__16wxListMainWindowFv
       ;wxListMainWindow::Thaw()
       Thaw__16wxListMainWindowFv
-      ;wxListCtrl::Thaw()
-      Thaw__10wxListCtrlFv
-      ;wxListCtrl::SetItem(long,int,const wxString&,int)
-      SetItem__10wxListCtrlFliRC8wxStringT2
+      ;wxGenericListCtrl::SetItemBackgroundColour(long,const wxColour&)
+      SetItemBackgroundColour__17wxGenericListCtrlFlRC8wxColour
+      ;wxListMainWindow::SetFocus()
+      SetFocus__16wxListMainWindowFv
       ;wxListMainWindow::InitScrolling()
       InitScrolling__16wxListMainWindowFv
       ;wxListItemData::GetY() const
       GetY__14wxListItemDataCFv
-      ;wxListMainWindow::GetSelectedItemCount()
-      GetSelectedItemCount__16wxListMainWindowFv
+      ;wxGenericListCtrl::GetSelectedItemCount() const
+      GetSelectedItemCount__17wxGenericListCtrlCFv
       ;wxListMainWindow::GetLineHeight() const
       GetLineHeight__16wxListMainWindowCFv
+      ;wxGenericListCtrl::GetItemCount() const
+      GetItemCount__17wxGenericListCtrlCFv
       ;wxListMainWindow::GetItemCount() const
       GetItemCount__16wxListMainWindowCFv
       ;wxListItemData::GetHeight() const
       GetHeight__14wxListItemDataCFv
       ;wxListHeaderData::GetFormat() const
       GetFormat__16wxListHeaderDataCFv
-      ;wxListCtrl::GetEventTable() const
-      GetEventTable__10wxListCtrlCFv
-      ;wxListCtrl::GetCountPerPage() const
-      GetCountPerPage__10wxListCtrlCFv
-      ;wxListCtrl::GetBackgroundColour() const
-      GetBackgroundColour__10wxListCtrlCFv
       ;wxListLineData::GetAttr() const
       GetAttr__14wxListLineDataCFv
+      ;wxGenericListCtrl::Freeze()
+      Freeze__17wxGenericListCtrlFv
       ;wxListMainWindow::Freeze()
       Freeze__16wxListMainWindowFv
-      ;wxListCtrl::CreateHeaderWindow()
-      CreateHeaderWindow__10wxListCtrlFv
-      ;wxListLineData::SetText(int,const wxString)
-      SetText__14wxListLineDataFiC8wxString
+      ;wxGenericListCtrl::DeleteAllItems()
+      DeleteAllItems__17wxGenericListCtrlFv
+      ;wxGenericListCtrl::DeleteAllColumns()
+      DeleteAllColumns__17wxGenericListCtrlFv
+      ;wxGenericListCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
+      Create__17wxGenericListCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       wxEVT_COMMAND_LIST_COL_RIGHT_CLICK
       ;wxListMainWindow::sm_eventTable
       sm_eventTable__16wxListMainWindow
       ;wxListHeaderWindow::sm_classwxListHeaderWindow
       sm_classwxListHeaderWindow__18wxListHeaderWindow
-      ;wxListCtrl::SetItemText(long,const wxString&)
-      SetItemText__10wxListCtrlFlRC8wxString
-      ;wxListCtrl::InsertItem(long,const wxString&)
-      InsertItem__10wxListCtrlFlRC8wxString
+      ;wxListLineData::SetText(int,const wxString)
+      SetText__14wxListLineDataFiC8wxString
       ;wxListLineData::Draw(wxDC*)
       Draw__14wxListLineDataFP4wxDC
+      ;wxGenericListCtrl::EnsureVisible(long)
+      EnsureVisible__17wxGenericListCtrlFl
+      ;wxGenericListCtrl::sm_classwxGenericListCtrl
+      sm_classwxGenericListCtrl__17wxGenericListCtrl
+      __vft17wxGenericListCtrl8wxObject
+      __vft16wxListMainWindow8wxObject
       ;wxListLineData::SetAttributes(wxDC*,const wxListItemAttr*,unsigned long)
       SetAttributes__14wxListLineDataFP4wxDCPC14wxListItemAttrUl
-      ;wxListCtrl::sm_eventTable
-      sm_eventTable__10wxListCtrl
-      __vft16wxListMainWindow8wxObject
-      ;wxListCtrl::SetFont(const wxFont&)
-      SetFont__10wxListCtrlFRC6wxFont
-      ;wxListCtrl::ResizeReportView(unsigned long)
-      ResizeReportView__10wxListCtrlFUl
+      ;wxListHeaderWindow::SendListEvent(int,wxPoint)
+      SendListEvent__18wxListHeaderWindowFi7wxPoint
+      ;wxGenericListCtrl::ResizeReportView(unsigned long)
+      ResizeReportView__17wxGenericListCtrlFUl
       ;wxListMainWindow::OnSetFocus(wxFocusEvent&)
       OnSetFocus__16wxListMainWindowFR12wxFocusEvent
       ;wxListMainWindow::OnKillFocus(wxFocusEvent&)
       OnKillFocus__16wxListMainWindowFR12wxFocusEvent
-      ;wxListCtrl::OnGetItemImage(long) const
-      OnGetItemImage__10wxListCtrlCFl
-      ;wxListCtrl::OnGetItemAttr(long) const
-      OnGetItemAttr__10wxListCtrlCFl
+      ;wxGenericListCtrl::OnGetItemImage(long) const
+      OnGetItemImage__17wxGenericListCtrlCFl
       ;wxListLineData::Highlight(unsigned long)
       Highlight__14wxListLineDataFUl
       ;wxListMainWindow::HighlightLines(unsigned int,unsigned int,unsigned long)
       HighlightLines__16wxListMainWindowFUiT1Ul
+      ;wxGenericListCtrl::GetItemSpacing(unsigned long) const
+      GetItemSpacing__17wxGenericListCtrlCFUl
       ;wxListMainWindow::GetItemSpacing(unsigned long)
       GetItemSpacing__16wxListMainWindowFUl
-      ;wxListMainWindow::GetItemPosition(long,wxPoint&)
-      GetItemPosition__16wxListMainWindowFlR7wxPoint
-      ;wxListCtrl::GetItemPosition(long,wxPoint&) const
-      GetItemPosition__10wxListCtrlCFlR7wxPoint
       ;wxListMainWindow::FindItem(long,const wxString&,unsigned long)
       FindItem__16wxListMainWindowFlRC8wxStringUl
       ;wxListMainWindow::EditLabel(long)
       EditLabel__16wxListMainWindowFl
-      ;wxListCtrl::DeleteItem(long)
-      DeleteItem__10wxListCtrlFl
-      ;wxListCtrl::GetItemState(long,long) const
-      GetItemState__10wxListCtrlCFlT1
+      ;wxGenericListCtrl::SetItemState(long,long,long)
+      SetItemState__17wxGenericListCtrlFlN21
       wxEVT_COMMAND_LIST_DELETE_ITEM
-      ;wxListCtrl::SetColumn(int,wxListItem&)
-      SetColumn__10wxListCtrlFiR10wxListItem
-      ;wxListCtrl::RefreshItems(long,long)
-      RefreshItems__10wxListCtrlFlT1
+      ;wxGenericListCtrl::SetItemData(long,long)
+      SetItemData__17wxGenericListCtrlFlT1
       ;wxListMainWindow::RefreshAfter(unsigned int)
       RefreshAfter__16wxListMainWindowFUi
+      ;wxGenericListCtrl::InsertItem(long,const wxString&,int)
+      InsertItem__17wxGenericListCtrlFlRC8wxStringi
       ;wxListLineData::InitItems(int)
       InitItems__14wxListLineDataFi
       ;wxListMainWindow::GetLineY(unsigned int) const
       GetLineY__16wxListMainWindowCFUi
       ;wxListMainWindow::GetLineHighlightRect(unsigned int) const
       GetLineHighlightRect__16wxListMainWindowCFUi
+      ;wxGenericListCtrl::GetItem(wxListItem&) const
+      GetItem__17wxGenericListCtrlCFR10wxListItem
+      ;wxListMainWindow::GetItem(wxListItem&) const
+      GetItem__16wxListMainWindowCFR10wxListItem
       ;wxListHeaderData::GetItem(wxListItem&)
       GetItem__16wxListHeaderDataFR10wxListItem
       ;wxListLineData::GetItem(int,wxListItem&)
       GetItem__14wxListLineDataFiR10wxListItem
+      ;wxGenericListCtrl::GetItemRect(long,wxRect&,int) const
+      GetItemRect__17wxGenericListCtrlCFlR6wxRecti
       ;wxListLineData::GetImage(int) const
       GetImage__14wxListLineDataCFi
-      ;wxListCtrl::GetImageList(int) const
-      GetImageList__10wxListCtrlCFi
-      ;wxListCtrl::GetColumn(int,wxListItem&) const
-      GetColumn__10wxListCtrlCFiR10wxListItem
+      ;wxGenericListCtrl::FindItem(long,long)
+      FindItem__17wxGenericListCtrlFlT1
       ;wxListLineDataArray::DoCopy(const wxListLineDataArray&)
       DoCopy__19wxListLineDataArrayFRC19wxListLineDataArray
       ;wxListMainWindow::DeleteColumn(int)
       DeleteColumn__16wxListMainWindowFi
       ;wxListLineData::CalculateSize(wxDC*,int)
       CalculateSize__14wxListLineDataFP4wxDCi
-      ;wxListItem::wxListItem()
-      __ct__10wxListItemFv
+      ;wxGenericListCtrl::Arrange(int)
+      Arrange__17wxGenericListCtrlFi
+      ;wxGenericListCtrl::wxGenericListCtrl()
+      __ct__17wxGenericListCtrlFv
       wxSizeTCmpFn
       ;wxConstructorForwxListItem()
       wxConstructorForwxListItem__Fv
@@ -8953,54 +9487,55 @@ EXPORTS
       __dt__19wxListLineDataArrayFv
       ;wxListItemData::~wxListItemData()
       __dt__14wxListItemDataFv
-      ;wxListCtrl::~wxListCtrl()
-      __dt__10wxListCtrlFv
-      ;wxListCtrl::SetItemImage(long,int,int)
-      SetItemImage__10wxListCtrlFliT2
-      ;wxListCtrl::SetForegroundColour(const wxColour&)
-      SetForegroundColour__10wxListCtrlFRC8wxColour
+      ;wxGenericListCtrl::SetItemTextColour(long,const wxColour&)
+      SetItemTextColour__17wxGenericListCtrlFlRC8wxColour
+      ;wxGenericListCtrl::SetCursor(const wxCursor&)
+      SetCursor__17wxGenericListCtrlFRC8wxCursor
       ;wxListMainWindow::Init()
       Init__16wxListMainWindowFv
       ;wxListHeaderData::Init()
       Init__16wxListHeaderDataFv
-      ;wxListCtrl::GetSelectedItemCount() const
-      GetSelectedItemCount__10wxListCtrlCFv
+      ;wxListMainWindow::GetSelectedItemCount() const
+      GetSelectedItemCount__16wxListMainWindowCFv
       ;wxListHeaderWindow::GetEventTable() const
       GetEventTable__18wxListHeaderWindowCFv
       ;wxListMainWindow::GetDummyLine() const
       GetDummyLine__16wxListMainWindowCFv
-      ;wxListCtrl::GetDropTarget() const
-      GetDropTarget__10wxListCtrlCFv
-      ;wxListCtrl::GetColumnCount() const
-      GetColumnCount__10wxListCtrlCFv
+      ;wxGenericListCtrl::GetColumnCount() const
+      GetColumnCount__17wxGenericListCtrlCFv
+      ;wxGenericListCtrl::GetBackgroundColour() const
+      GetBackgroundColour__17wxGenericListCtrlCFv
+      ;wxListTextCtrl::Finish()
+      Finish__14wxListTextCtrlFv
       ;wxListMainWindow::DeleteEverything()
       DeleteEverything__16wxListMainWindowFv
       ;wxwxListHeaderDataListNode::DeleteData()
       DeleteData__26wxwxListHeaderDataListNodeFv
       ;wxListMainWindow::DeleteAllItems()
       DeleteAllItems__16wxListMainWindowFv
-      ;wxListCtrl::DeleteAllColumns()
-      DeleteAllColumns__10wxListCtrlFv
-      ;wxListCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
-      Create__10wxListCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
+      ;wxGenericListCtrl::CreateHeaderWindow()
+      CreateHeaderWindow__17wxGenericListCtrlFv
+      ;wxListTextCtrl::AcceptChanges()
+      AcceptChanges__14wxListTextCtrlFv
+      ;wxListMainWindow::GetTextLength(const wxString&) const
+      GetTextLength__16wxListMainWindowCFRC8wxString
       wxEVT_COMMAND_LIST_GET_INFO
       ;wxListMainWindow::sm_eventTableEntries
       sm_eventTableEntries__16wxListMainWindow
-      ;wxListMainWindow::GetTextLength(const wxString&) const
-      GetTextLength__16wxListMainWindowCFRC8wxString
-      ;wxListCtrl::EnsureVisible(long)
-      EnsureVisible__10wxListCtrlFl
+      ;wxGenericListCtrl::InsertItem(long,const wxString&)
+      InsertItem__17wxGenericListCtrlFlRC8wxString
+      ;wxListMainWindow::HighlightLine(unsigned int,unsigned long)
+      HighlightLine__16wxListMainWindowFUiUl
       wxEVT_COMMAND_LIST_ITEM_SELECTED
       wxEVT_COMMAND_LIST_END_LABEL_EDIT
       ;wxListTextCtrl::sm_eventTableEntries
       sm_eventTableEntries__14wxListTextCtrl
-      ;wxListTextCtrl::sm_classwxListTextCtrl
-      sm_classwxListTextCtrl__14wxListTextCtrl
-      __vft10wxListCtrl8wxObject
-      ;wxListCtrl::SetWindowStyleFlag(long)
-      SetWindowStyleFlag__10wxListCtrlFl
-      ;wxListCtrl::RefreshItem(long)
-      RefreshItem__10wxListCtrlFl
+      ;wxGenericListCtrl::SetFont(const wxFont&)
+      SetFont__17wxGenericListCtrlFRC6wxFont
+      ;wxGenericListCtrl::SetDropTarget(wxDropTarget*)
+      SetDropTarget__17wxGenericListCtrlFP12wxDropTarget
+      ;wxGenericListCtrl::OnSize(wxSizeEvent&)
+      OnSize__17wxGenericListCtrlFR11wxSizeEvent
       ;wxListMainWindow::OnScroll(wxScrollWinEvent&)
       OnScroll__16wxListMainWindowFR16wxScrollWinEvent
       ;wxListHeaderWindow::OnPaint(wxPaintEvent&)
@@ -9011,18 +9546,20 @@ EXPORTS
       OnKeyUp__14wxListTextCtrlFR10wxKeyEvent
       ;wxListMainWindow::OnChar(wxKeyEvent&)
       OnChar__16wxListMainWindowFR10wxKeyEvent
-      ;wxListMainWindow::HighlightLine(unsigned int,unsigned long)
-      HighlightLine__16wxListMainWindowFUiUl
-      ;wxListCtrl::GetItemText(long) const
-      GetItemText__10wxListCtrlCFl
-      ;wxListCtrl::GetItemSpacing(unsigned long) const
-      GetItemSpacing__10wxListCtrlCFUl
-      ;wxListCtrl::GetItemData(long) const
-      GetItemData__10wxListCtrlCFl
+      ;wxGenericListCtrl::GetItemTextColour(long) const
+      GetItemTextColour__17wxGenericListCtrlCFl
+      ;wxListMainWindow::GetItemPosition(long,wxPoint&) const
+      GetItemPosition__16wxListMainWindowCFlR7wxPoint
+      ;wxGenericListCtrl::GetItemBackgroundColour(long) const
+      GetItemBackgroundColour__17wxGenericListCtrlCFl
+      ;wxGenericListCtrl::FindItem(long,const wxString&,unsigned long)
+      FindItem__17wxGenericListCtrlFlRC8wxStringUl
       ;wxListMainWindow::EnsureVisible(long)
       EnsureVisible__16wxListMainWindowFl
       ;wxListLineData::DrawInReportMode(wxDC*,const wxRect&,const wxRect&,unsigned long)
       DrawInReportMode__14wxListLineDataFP4wxDCRC6wxRectT2Ul
+      ;wxGenericListCtrl::DeleteItem(long)
+      DeleteItem__17wxGenericListCtrlFl
       ;wxListLineData::GetText(int) const
       GetText__14wxListLineDataCFi
       __vft26wxwxListHeaderDataListNode10wxNodeBase
@@ -9033,54 +9570,38 @@ EXPORTS
       SetItem__16wxListMainWindowFR10wxListItem
       ;wxListItemData::SetItem(const wxListItem&)
       SetItem__14wxListItemDataFRC10wxListItem
-      ;wxListCtrl::SetItemData(long,long)
-      SetItemData__10wxListCtrlFlT1
-      ;wxListCtrl::SetImageList(wxImageList*,int)
-      SetImageList__10wxListCtrlFP11wxImageListi
       ;wxListMainWindow::SetColumn(int,wxListItem&)
       SetColumn__16wxListMainWindowFiR10wxListItem
-      ;wxListCtrl::ScrollList(int,int)
-      ScrollList__10wxListCtrlFiT1
+      ;wxListLineDataArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__19wxListLineDataArrayFUiT1
       ;wxSelectionStore::IsSelected(unsigned int) const
       IsSelected__16wxSelectionStoreCFUi
       ;wxListMainWindow::IsHighlighted(unsigned int) const
       IsHighlighted__16wxListMainWindowCFUi
-      ;wxListLineDataArray::Insert(const wxListLineData&,unsigned int)
-      Insert__19wxListLineDataArrayFRC14wxListLineDataUi
+      ;wxGenericListCtrl::InsertItem(wxListItem&)
+      InsertItem__17wxGenericListCtrlFR10wxListItem
       ;wxListMainWindow::InsertItem(wxListItem&)
       InsertItem__16wxListMainWindowFR10wxListItem
-      ;wxListCtrl::InsertItem(long,const wxString&,int)
-      InsertItem__10wxListCtrlFlRC8wxStringi
-      ;wxListCtrl::InsertColumn(long,wxListItem&)
-      InsertColumn__10wxListCtrlFlR10wxListItem
       ;wxListMainWindow::GetLineIconRect(unsigned int) const
       GetLineIconRect__16wxListMainWindowCFUi
-      ;wxListMainWindow::GetItemState(long,long)
-      GetItemState__16wxListMainWindowFlT1
-      ;wxListCtrl::GetItemRect(long,wxRect&,int) const
-      GetItemRect__10wxListCtrlCFlR6wxRecti
+      ;wxListMainWindow::GetItemState(long,long) const
+      GetItemState__16wxListMainWindowCFlT1
       ;wxListMainWindow::GetColumnWidth(int) const
       GetColumnWidth__16wxListMainWindowCFi
-      ;wxListCtrl::GetColumnWidth(int) const
-      GetColumnWidth__10wxListCtrlCFi
-      ;wxListCtrl::FindItem(long,const wxPoint&,int)
-      FindItem__10wxListCtrlFlRC7wxPointi
-      ;wxListCtrl::AssignImageList(wxImageList*,int)
-      AssignImageList__10wxListCtrlFP11wxImageListi
-      ;wxListLineDataArray::Add(const wxListLineData&)
-      Add__19wxListLineDataArrayFRC14wxListLineData
-      ;wxListCtrl::wxListCtrl()
-      __ct__10wxListCtrlFv
+      ;wxListLineDataArray::Add(const wxListLineData&,unsigned int)
+      Add__19wxListLineDataArrayFRC14wxListLineDataUi
+      ;wxListLineDataArray::DoEmpty()
+      DoEmpty__19wxListLineDataArrayFv
       ;wxConstructorForwxListView()
       wxConstructorForwxListView__Fv
       ;wxConstructorForwxListHeaderWindow()
       wxConstructorForwxListHeaderWindow__Fv
-      ;wxListTextCtrl::wxListTextCtrl(wxWindow*,const int,unsigned long*,wxString*,wxListMainWindow*,const wxString&,const wxPoint&,const wxSize&,int,const wxValidator&,const wxString&)
-      __ct__14wxListTextCtrlFP8wxWindowCiPUlP8wxStringP16wxListMainWindowRC8wxStringRC7wxPointRC6wxSizeiRC11wxValidatorT6
-      ;wxListCtrl::SetTextColour(const wxColour&)
-      SetTextColour__10wxListCtrlFRC8wxColour
-      ;wxListCtrl::SetBackgroundColour(const wxColour&)
-      SetBackgroundColour__10wxListCtrlFRC8wxColour
+      ;wxGenericListCtrl::SetItemImage(long,int,int)
+      SetItemImage__17wxGenericListCtrlFliT2
+      ;wxGenericListCtrl::SetFocus()
+      SetFocus__17wxGenericListCtrlFv
+      ;wxGenericListCtrl::SetBackgroundColour(const wxColour&)
+      SetBackgroundColour__17wxGenericListCtrlFRC8wxColour
       ;wxListMainWindow::RefreshAll()
       RefreshAll__16wxListMainWindowFv
       ;wxListMainWindow::HitTestLine(unsigned int,int,int) const
@@ -9089,28 +9610,16 @@ EXPORTS
       HasImage__16wxListHeaderDataCFv
       ;wxListItemData::GetWidth() const
       GetWidth__14wxListItemDataCFv
-      ;wxListMainWindow::GetNextItem(long,int,int)
-      GetNextItem__16wxListMainWindowFliT2
       ;wxListHeaderData::GetImage() const
       GetImage__16wxListHeaderDataCFv
-      ;wxListCtrl::GetForegroundColour() const
-      GetForegroundColour__10wxListCtrlCFv
       ;wxListMainWindow::GetEventTable() const
       GetEventTable__16wxListMainWindowCFv
+      ;wxGenericListCtrl::GetCountPerPage() const
+      GetCountPerPage__17wxGenericListCtrlCFv
       ;wxListMainWindow::GetCountPerPage() const
       GetCountPerPage__16wxListMainWindowCFv
       ;wxListHeaderWindow::DrawCurrent()
       DrawCurrent__18wxListHeaderWindowFv
-      ;wxListCtrl::DoPopupMenu(wxMenu*,int,int)
-      DoPopupMenu__10wxListCtrlFP6wxMenuiT2
-      ;wxListLineDataArray::DoEmpty()
-      DoEmpty__19wxListLineDataArrayFv
-      ;wxListCtrl::DeleteAllItems()
-      DeleteAllItems__10wxListCtrlFv
-      ;wxListItem::Clear()
-      Clear__10wxListItemFv
-      ;wxListCtrl::ClearAll()
-      ClearAll__10wxListCtrlFv
       ;wxListItemData::wxListItemData(wxListMainWindow*)
       __ct__14wxListItemDataFP16wxListMainWindow
       wxEVT_COMMAND_LIST_COL_END_DRAG
@@ -9185,6 +9694,8 @@ EXPORTS
       __dt__11wxLogWindowFv
       ;wxLogGui::Clear()
       Clear__8wxLogGuiFv
+      ;wxVLogStatus(wxFrame*,const char*,char*)
+      wxVLogStatus__FP7wxFramePCcPc
       __vft8wxLogGui5wxLog
       ;wxLogDialog::OnOk(wxCommandEvent&)
       OnOk__11wxLogDialogFR14wxCommandEvent
@@ -9205,6 +9716,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&)
@@ -9217,6 +9744,8 @@ EXPORTS
       Init__7wxPanelFv
       ;wxPanel::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__7wxPanelFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
+      ;wxPanel::SetTmpDefaultItem(wxWindow*)
+      SetTmpDefaultItem__7wxPanelFP8wxWindow
       ;wxPanel::SetDefaultItem(wxWindow*)
       SetDefaultItem__7wxPanelFP8wxWindow
       __vft7wxPanel8wxObject
@@ -9353,8 +9882,6 @@ EXPORTS
       __ct__16wxProgressDialogFRC8wxStringT1iP8wxWindowT3
       ;wxProgressDialog::CreateLabel(const wxString&,wxWindow**)
       CreateLabel__16wxProgressDialogFRC8wxStringPP8wxWindow
-      ;wxProgressDialog::OnShow(wxShowEvent&)
-      OnShow__16wxProgressDialogFR11wxShowEvent
       __vft16wxProgressDialog8wxObject
       ;wxProgressDialog::GetEventTable() const
       GetEventTable__16wxProgressDialogCFv
@@ -9362,6 +9889,8 @@ EXPORTS
       Update__16wxProgressDialogFiRC8wxString
       ;wxProgressDialog::OnClose(wxCloseEvent&)
       OnClose__16wxProgressDialogFR12wxCloseEvent
+      ;wxProgressDialog::Resume()
+      Resume__16wxProgressDialogFv
       ;wxProgressDialog::sm_classwxProgressDialog
       sm_classwxProgressDialog__16wxProgressDialog
       ;wxProgressDialog::sm_eventTable
@@ -9440,6 +9969,8 @@ EXPORTS
       sm_eventTable__23wxGenericScrolledWindow
       ;wxAutoScrollTimer::wxAutoScrollTimer(wxWindow*,wxScrollHelper*,int,int,int)
       __ct__17wxAutoScrollTimerFP8wxWindowP14wxScrollHelperiN23
+      ;wxScrollHelper::DoCalcUnscrolledPosition(int,int,int*,int*) const
+      DoCalcUnscrolledPosition__14wxScrollHelperCFiT1PiT3
       ;wxScrollHelper::HandleOnScroll(wxScrollWinEvent&)
       HandleOnScroll__14wxScrollHelperFR16wxScrollWinEvent
       __vft17wxAutoScrollTimer8wxObject
@@ -9464,19 +9995,19 @@ EXPORTS
       HandleOnSize__14wxScrollHelperFR11wxSizeEvent
       ;wxScrollHelper::HandleOnPaint(wxPaintEvent&)
       HandleOnPaint__14wxScrollHelperFR12wxPaintEvent
-      ;wxScrollHelper::GetVirtualSize(int*,int*) const
-      GetVirtualSize__14wxScrollHelperCFPiT1
+      ;wxScrollHelper::SetScrollRate(int,int)
+      SetScrollRate__14wxScrollHelperFiT1
       ;wxScrollHelper::GetTargetWindow() const
       GetTargetWindow__14wxScrollHelperCFv
       __vft14wxScrollHelper
+      ;wxGenericScrolledWindow::Layout()
+      Layout__23wxGenericScrolledWindowFv
       ;wxGenericScrolledWindow::GetEventTable() const
       GetEventTable__23wxGenericScrolledWindowCFv
       ;wxGenericScrolledWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__23wxGenericScrolledWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
-      ;wxScrollHelper::CalcUnscrolledPosition(int,int,int*,int*) const
-      CalcUnscrolledPosition__14wxScrollHelperCFiT1PiT3
-      ;wxScrollHelper::CalcScrolledPosition(int,int,int*,int*) const
-      CalcScrolledPosition__14wxScrollHelperCFiT1PiT3
+      ;wxScrollHelper::DoCalcScrolledPosition(int,int,int*,int*) const
+      DoCalcScrolledPosition__14wxScrollHelperCFiT1PiT3
       ;wxScrollHelper::HandleOnMouseEnter(wxMouseEvent&)
       HandleOnMouseEnter__14wxScrollHelperFR12wxMouseEvent
       ;wxScrollHelper::HandleOnMouseLeave(wxMouseEvent&)
@@ -9515,8 +10046,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxSplitterWindow::OnNavigationKey(wxNavigationKeyEvent&)
       OnNavigationKey__16wxSplitterWindowFR20wxNavigationKeyEvent
-      ;wxSplitterWindow::OnUnsplitEvent(wxSplitterEvent&)
-      OnUnsplitEvent__16wxSplitterWindowFR15wxSplitterEvent
       ;wxSplitterWindow::OnSize(wxSizeEvent&)
       OnSize__16wxSplitterWindowFR11wxSizeEvent
       ;wxSplitterWindow::OnChildFocus(wxChildFocusEvent&)
@@ -9525,18 +10054,28 @@ EXPORTS
       RemoveChild__16wxSplitterWindowFP12wxWindowBase
       ;wxSplitterWindow::ReplaceWindow(wxWindow*,wxWindow*)
       ReplaceWindow__16wxSplitterWindowFP8wxWindowT1
+      ;wxSplitterWindow::AdjustSashPosition(int) const
+      AdjustSashPosition__16wxSplitterWindowCFi
       ;wxSplitterWindow::GetDefaultItem() const
       GetDefaultItem__16wxSplitterWindowCFv
       ;wxSplitterWindow::InitColours()
       InitColours__16wxSplitterWindowFv
       ;wxSplitterWindow::SetDefaultItem(wxWindow*)
       SetDefaultItem__16wxSplitterWindowFP8wxWindow
+      ;wxSplitterWindow::SetTmpDefaultItem(wxWindow*)
+      SetTmpDefaultItem__16wxSplitterWindowFP8wxWindow
       ;wxSplitterWindow::OnFocus(wxFocusEvent&)
       OnFocus__16wxSplitterWindowFR12wxFocusEvent
       wxEVT_COMMAND_SPLITTER_UNSPLIT
       __vft16wxSplitterWindow8wxObject
-      ;wxSplitterWindow::OnSetCursor(wxSetCursorEvent&)
-      OnSetCursor__16wxSplitterWindowFR16wxSetCursorEvent
+      ;wxSplitterWindow::DoSplit(wxSplitMode,wxWindow*,wxWindow*,int)
+      DoSplit__16wxSplitterWindowF11wxSplitModeP8wxWindowT2i
+      ;wxSplitterWindow::SetSashPositionAndNotify(int)
+      SetSashPositionAndNotify__16wxSplitterWindowFi
+      ;wxSplitterWindow::SetMinimumPaneSize(int)
+      SetMinimumPaneSize__16wxSplitterWindowFi
+      ;wxSplitterWindow::OnSashPositionChange(int)
+      OnSashPositionChange__16wxSplitterWindowFi
       ;wxSplitterWindow::DrawSashTracker(int,int)
       DrawSashTracker__16wxSplitterWindowFiT1
       ;wxConstructorForwxSplitterWindow()
@@ -9546,16 +10085,14 @@ EXPORTS
       ;wxSplitterWindow::SetFocus()
       SetFocus__16wxSplitterWindowFv
       wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING
-      ;wxSplitterWindow::OnSashPosChanged(wxSplitterEvent&)
-      OnSashPosChanged__16wxSplitterWindowFR15wxSplitterEvent
       ;wxSplitterEvent::sm_classwxSplitterEvent
       sm_classwxSplitterEvent__15wxSplitterEvent
-      ;wxSplitterWindow::SplitHorizontally(wxWindow*,wxWindow*,int)
-      SplitHorizontally__16wxSplitterWindowFP8wxWindowT1i
+      ;wxSplitterWindow::OnDoubleClickSash(int,int)
+      OnDoubleClickSash__16wxSplitterWindowFiT1
+      ;wxSplitterWindow::GetWindowSize() const
+      GetWindowSize__16wxSplitterWindowCFv
       ;wxSplitterWindow::SizeWindows()
       SizeWindows__16wxSplitterWindowFv
-      ;wxSplitterWindow::SendUnsplitEvent(wxWindow*)
-      SendUnsplitEvent__16wxSplitterWindowFP8wxWindow
       ;wxSplitterWindow::sm_eventTableEntries
       sm_eventTableEntries__16wxSplitterWindow
       ;wxSplitterWindow::OnPaint(wxPaintEvent&)
@@ -9563,10 +10100,14 @@ EXPORTS
       wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED
       ;wxSplitterWindow::OnIdle(wxIdleEvent&)
       OnIdle__16wxSplitterWindowFR11wxIdleEvent
-      ;wxSplitterWindow::OnDoubleClick(wxSplitterEvent&)
-      OnDoubleClick__16wxSplitterWindowFR15wxSplitterEvent
+      ;wxSplitterWindow::DoSetSashPosition(int)
+      DoSetSashPosition__16wxSplitterWindowFi
+      ;wxSplitterWindow::ConvertSashPosition(int) const
+      ConvertSashPosition__16wxSplitterWindowCFi
       ;wxSplitterWindow::Init()
       Init__16wxSplitterWindowFv
+      ;wxSplitterWindow::SetResizeCursor()
+      SetResizeCursor__16wxSplitterWindowFv
       ;wxSplitterWindow::GetEventTable() const
       GetEventTable__16wxSplitterWindowCFv
       ;wxSplitterWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
@@ -9586,14 +10127,16 @@ EXPORTS
       SetSashPosition__16wxSplitterWindowFiUl
       ;wxSplitterWindow::SashHitTest(int,int,int)
       SashHitTest__16wxSplitterWindowFiN21
-      ;wxSplitterWindow::SplitVertically(wxWindow*,wxWindow*,int)
-      SplitVertically__16wxSplitterWindowFP8wxWindowT1i
+      ;wxSplitterWindow::OnSashPositionChanging(int)
+      OnSashPositionChanging__16wxSplitterWindowFi
       ;wxConstructorForwxSplitterEvent()
       wxConstructorForwxSplitterEvent__Fv
       ;wxSplitterWindow::DrawSash(wxDC&)
       DrawSash__16wxSplitterWindowFR4wxDC
       ;wxSplitterWindow::Unsplit(wxWindow*)
       Unsplit__16wxSplitterWindowFP8wxWindow
+      ;wxSplitterWindow::OnUnsplit(wxWindow*)
+      OnUnsplit__16wxSplitterWindowFP8wxWindow
   ;From object file:  ..\generic\statusbr.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxStatusBar::GetFieldRect(int,wxRect&) const
@@ -9757,8 +10300,12 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxTextEntryDialog::OnOK(wxCommandEvent&)
       OnOK__17wxTextEntryDialogFR14wxCommandEvent
+      ;wxTextEntryDialog::SetTextValidator(long)
+      SetTextValidator__17wxTextEntryDialogFl
       ;wxTextEntryDialog::sm_classwxTextEntryDialog
       sm_classwxTextEntryDialog__17wxTextEntryDialog
+      ;wxTextEntryDialog::SetValue(const wxString&)
+      SetValue__17wxTextEntryDialogFRC8wxString
       ;wxTextEntryDialog::GetEventTable() const
       GetEventTable__17wxTextEntryDialogCFv
       ;wxTextEntryDialog::sm_eventTableEntries
@@ -9766,6 +10313,8 @@ EXPORTS
       ;wxTextEntryDialog::wxTextEntryDialog(wxWindow*,const wxString&,const wxString&,const wxString&,long,const wxPoint&)
       __ct__17wxTextEntryDialogFP8wxWindowRC8wxStringN22lRC7wxPoint
       __vft17wxTextEntryDialog8wxObject
+      ;wxTextEntryDialog::SetTextValidator(wxTextValidator&)
+      SetTextValidator__17wxTextEntryDialogFR15wxTextValidator
       ;wxTextEntryDialog::sm_eventTable
       sm_eventTable__17wxTextEntryDialog
   ;From object file:  ..\generic\tipdlg.cpp
@@ -9789,6 +10338,43 @@ EXPORTS
       ;wxTipDialog::wxTipDialog(wxWindow*,wxTipProvider*,unsigned long)
       __ct__11wxTipDialogFP8wxWindowP13wxTipProviderUl
   ;From object file:  ..\generic\tipwin.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxTipWindow::SetBoundingRect(const wxRect&)
+      SetBoundingRect__11wxTipWindowFRC6wxRect
+      ;wxTipWindowView::OnMouseMove(wxMouseEvent&)
+      OnMouseMove__15wxTipWindowViewFR12wxMouseEvent
+      ;wxTipWindow::OnDismiss()
+      OnDismiss__11wxTipWindowFv
+      ;wxTipWindowView::sm_eventTable
+      sm_eventTable__15wxTipWindowView
+      ;wxTipWindowView::OnMouseClick(wxMouseEvent&)
+      OnMouseClick__15wxTipWindowViewFR12wxMouseEvent
+      __vft11wxTipWindow8wxObject
+      ;wxTipWindowView::GetEventTable() const
+      GetEventTable__15wxTipWindowViewCFv
+      ;wxTipWindow::Close()
+      Close__11wxTipWindowFv
+      ;wxTipWindow::OnMouseClick(wxMouseEvent&)
+      OnMouseClick__11wxTipWindowFR12wxMouseEvent
+      ;wxTipWindow::GetEventTable() const
+      GetEventTable__11wxTipWindowCFv
+      ;wxTipWindow::~wxTipWindow()
+      __dt__11wxTipWindowFv
+      ;wxTipWindow::sm_eventTable
+      sm_eventTable__11wxTipWindow
+      ;wxTipWindow::wxTipWindow(wxWindow*,const wxString&,int,wxTipWindow**,wxRect*)
+      __ct__11wxTipWindowFP8wxWindowRC8wxStringiPP11wxTipWindowP6wxRect
+      __vft15wxTipWindowView8wxObject
+      ;wxTipWindowView::OnPaint(wxPaintEvent&)
+      OnPaint__15wxTipWindowViewFR12wxPaintEvent
+      ;wxTipWindowView::wxTipWindowView(wxWindow*)
+      __ct__15wxTipWindowViewFP8wxWindow
+      ;wxTipWindow::sm_eventTableEntries
+      sm_eventTableEntries__11wxTipWindow
+      ;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*)
@@ -9799,6 +10385,8 @@ EXPORTS
       sm_classwxGenericTreeCtrl__17wxGenericTreeCtrl
       ;wxGenericTreeCtrl::TagNextChildren(wxGenericTreeItem*,wxGenericTreeItem*,unsigned long)
       TagNextChildren__17wxGenericTreeCtrlFP17wxGenericTreeItemT1Ul
+      ;wxGenericTreeCtrl::SetStateImageList(wxGenericImageList*)
+      SetStateImageList__17wxGenericTreeCtrlFP18wxGenericImageList
       ;wxGenericTreeCtrl::SetItemHasChildren(const wxTreeItemId&,unsigned long)
       SetItemHasChildren__17wxGenericTreeCtrlFRC12wxTreeItemIdUl
       ;wxGenericTreeCtrl::ScrollTo(const wxTreeItemId&)
@@ -9813,8 +10401,6 @@ EXPORTS
       GetBoundingRect__17wxGenericTreeCtrlCFRC12wxTreeItemIdR6wxRectUl
       ;wxGenericTreeCtrl::DrawLine(const wxTreeItemId&,unsigned long)
       DrawLine__17wxGenericTreeCtrlFRC12wxTreeItemIdUl
-      ;wxGenericTreeCtrl::AssignImageList(wxImageList*)
-      AssignImageList__17wxGenericTreeCtrlFP11wxImageList
       ;wxGenericTreeCtrl::GetLineHeight(wxGenericTreeItem*) const
       GetLineHeight__17wxGenericTreeCtrlCFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::RefreshSubtree(wxGenericTreeItem*)
@@ -9839,6 +10425,8 @@ EXPORTS
       SetText__17wxGenericTreeItemFRC8wxString
       ;wxGenericTreeCtrl::GetSelections(wxArrayTreeItemIds&) const
       GetSelections__17wxGenericTreeCtrlCFR18wxArrayTreeItemIds
+      ;wxGenericTreeCtrl::FindItem(const wxTreeItemId&,const wxString&) const
+      FindItem__17wxGenericTreeCtrlCFRC12wxTreeItemIdRC8wxString
       ;wxGenericTreeCtrl::Edit(const wxTreeItemId&)
       Edit__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxTreeTextCtrl::sm_eventTableEntries
@@ -9846,6 +10434,8 @@ EXPORTS
       __vft17wxGenericTreeCtrl8wxObject
       ;wxGenericTreeCtrl::SetItemBold(const wxTreeItemId&,unsigned long)
       SetItemBold__17wxGenericTreeCtrlFRC12wxTreeItemIdUl
+      ;wxGenericTreeCtrl::SetButtonsImageList(wxGenericImageList*)
+      SetButtonsImageList__17wxGenericTreeCtrlFP18wxGenericImageList
       ;wxGenericTreeCtrl::OnKillFocus(wxFocusEvent&)
       OnKillFocus__17wxGenericTreeCtrlFR12wxFocusEvent
       ;wxGenericTreeCtrl::IsExpanded(const wxTreeItemId&) const
@@ -9888,10 +10478,10 @@ EXPORTS
       sm_eventTableEntries__17wxGenericTreeCtrl
       ;wxGenericTreeCtrl::SetItemFont(const wxTreeItemId&,const wxFont&)
       SetItemFont__17wxGenericTreeCtrlFRC12wxTreeItemIdRC6wxFont
+      ;wxGenericTreeCtrl::SetImageList(wxGenericImageList*)
+      SetImageList__17wxGenericTreeCtrlFP18wxGenericImageList
       ;wxGenericTreeCtrl::SetFont(const wxFont&)
       SetFont__17wxGenericTreeCtrlFRC6wxFont
-      ;wxGenericTreeCtrl::SetButtonsImageList(wxImageList*)
-      SetButtonsImageList__17wxGenericTreeCtrlFP11wxImageList
       ;wxGenericTreeCtrl::OnPaint(wxPaintEvent&)
       OnPaint__17wxGenericTreeCtrlFR12wxPaintEvent
       ;wxTreeTextCtrl::OnKeyUp(wxKeyEvent&)
@@ -9916,10 +10506,10 @@ EXPORTS
       DrawBorder__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeCtrl::Delete(const wxTreeItemId&)
       Delete__17wxGenericTreeCtrlFRC12wxTreeItemId
-      ;wxGenericTreeCtrl::AssignButtonsImageList(wxImageList*)
-      AssignButtonsImageList__17wxGenericTreeCtrlFP11wxImageList
       ;wxGenericTreeCtrl::HitTest(const wxPoint&,int&)
       HitTest__17wxGenericTreeCtrlFRC7wxPointRi
+      ;wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl*,wxGenericTreeItem*)
+      __ct__14wxTreeTextCtrlFP17wxGenericTreeCtrlP17wxGenericTreeItem
       ;wxGenericTreeCtrl::GetItemImage(const wxTreeItemId&,wxTreeItemIcon) const
       GetItemImage__17wxGenericTreeCtrlCFRC12wxTreeItemId14wxTreeItemIcon
       ;wxGenericTreeItem::~wxGenericTreeItem()
@@ -9928,8 +10518,6 @@ EXPORTS
       Unselect__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::SetBackgroundColour(const wxColour&)
       SetBackgroundColour__17wxGenericTreeCtrlFRC8wxColour
-      ;wxGenericTreeCtrl::OnRenameAccept()
-      OnRenameAccept__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::GetEventTable() const
       GetEventTable__17wxGenericTreeCtrlCFv
       ;wxGenericTreeItem::GetCurrentImage() const
@@ -9938,6 +10526,8 @@ EXPORTS
       DeleteAllItems__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::CalculatePositions()
       CalculatePositions__17wxGenericTreeCtrlFv
+      ;wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem*,const wxString&)
+      OnRenameAccept__17wxGenericTreeCtrlFP17wxGenericTreeItemRC8wxString
       ;wxGenericTreeCtrl::SetItemText(const wxTreeItemId&,const wxString&)
       SetItemText__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxString
       ;wxGenericTreeCtrl::ItemHasChildren(const wxTreeItemId&) const
@@ -9949,10 +10539,6 @@ EXPORTS
       Toggle__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeCtrl::SortChildren(const wxTreeItemId&)
       SortChildren__17wxGenericTreeCtrlFRC12wxTreeItemId
-      ;wxGenericTreeCtrl::SetStateImageList(wxImageList*)
-      SetStateImageList__17wxGenericTreeCtrlFP11wxImageList
-      ;wxGenericTreeCtrl::SetImageList(wxImageList*)
-      SetImageList__17wxGenericTreeCtrlFP11wxImageList
       ;wxGenericTreeCtrl::OnMouse(wxMouseEvent&)
       OnMouse__17wxGenericTreeCtrlFR12wxMouseEvent
       ;wxTreeTextCtrl::OnKillFocus(wxFocusEvent&)
@@ -9969,8 +10555,8 @@ EXPORTS
       Expand__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeItem::DeleteChildren(wxGenericTreeCtrl*)
       DeleteChildren__17wxGenericTreeItemFP17wxGenericTreeCtrl
-      ;wxGenericTreeCtrl::AssignStateImageList(wxImageList*)
-      AssignStateImageList__17wxGenericTreeCtrlFP11wxImageList
+      ;wxGenericTreeCtrl::AssignButtonsImageList(wxGenericImageList*)
+      AssignButtonsImageList__17wxGenericTreeCtrlFP18wxGenericImageList
       ;wxGenericTreeCtrl::SendDeleteEvent(wxGenericTreeItem*)
       SendDeleteEvent__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::UnselectAllChildren(wxGenericTreeItem*)
@@ -9991,14 +10577,14 @@ EXPORTS
       AddRoot__17wxGenericTreeCtrlFRC8wxStringiT2P14wxTreeItemData
       ;wxGenericTreeCtrl::Init()
       Init__17wxGenericTreeCtrlFv
-      ;wxTreeTextCtrl::wxTreeTextCtrl(wxWindow*,const int,unsigned long*,wxString*,wxGenericTreeCtrl*,const wxString&,const wxPoint&,const wxSize&,int,const wxValidator&,const wxString&)
-      __ct__14wxTreeTextCtrlFP8wxWindowCiPUlP8wxStringP17wxGenericTreeCtrlRC8wxStringRC7wxPointRC6wxSizeiRC11wxValidatorT6
       ;wxGenericTreeCtrl::SetItemImage(const wxTreeItemId&,int,wxTreeItemIcon)
       SetItemImage__17wxGenericTreeCtrlFRC12wxTreeItemIdi14wxTreeItemIcon
       ;wxGenericTreeCtrl::SelectItem(const wxTreeItemId&,unsigned long,unsigned long)
       SelectItem__17wxGenericTreeCtrlFRC12wxTreeItemIdUlT2
       ;wxGenericTreeCtrl::GetButtonsImageList() const
       GetButtonsImageList__17wxGenericTreeCtrlCFv
+      ;wxTreeTextCtrl::AcceptChanges()
+      AcceptChanges__14wxTreeTextCtrlFv
       ;wxGenericTreeCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__17wxGenericTreeCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxGenericTreeCtrl::PaintItem(wxGenericTreeItem*,wxDC&)
@@ -10020,6 +10606,10 @@ EXPORTS
       EnsureVisible__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeCtrl::CollapseAndReset(const wxTreeItemId&)
       CollapseAndReset__17wxGenericTreeCtrlFRC12wxTreeItemId
+      ;wxGenericTreeCtrl::AssignStateImageList(wxGenericImageList*)
+      AssignStateImageList__17wxGenericTreeCtrlFP18wxGenericImageList
+      ;wxGenericTreeCtrl::AssignImageList(wxGenericImageList*)
+      AssignImageList__17wxGenericTreeCtrlFP18wxGenericImageList
       ;wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem*,const wxString&,int,int,wxTreeItemData*)
       __ct__17wxGenericTreeItemFP17wxGenericTreeItemRC8wxStringiT3P14wxTreeItemData
       ;wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem*,wxGenericTreeItem*)
@@ -10041,6 +10631,8 @@ EXPORTS
       SetItemBackgroundColour__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxColour
       ;wxTreeTextCtrl::GetEventTable() const
       GetEventTable__14wxTreeTextCtrlCFv
+      ;wxTreeTextCtrl::Finish()
+      Finish__14wxTreeTextCtrlFv
       ;wxGenericTreeCtrl::FillArray(wxGenericTreeItem*,wxArrayTreeItemIds&) const
       FillArray__17wxGenericTreeCtrlCFP17wxGenericTreeItemR18wxArrayTreeItemIds
   ;From object file:  ..\generic\treelay.cpp
@@ -10057,6 +10649,8 @@ EXPORTS
       DisplaySection__20wxHtmlHelpControllerFi
       ;wxHtmlHelpController::DestroyHelpWindow()
       DestroyHelpWindow__20wxHtmlHelpControllerFv
+      ;wxHtmlHelpController::AddGrabIfNeeded()
+      AddGrabIfNeeded__20wxHtmlHelpControllerFv
       ;wxHtmlHelpController::AddBook(const wxString&,unsigned long)
       AddBook__20wxHtmlHelpControllerFRC8wxStringUl
       __vft20wxHtmlHelpController8wxObject
@@ -10066,8 +10660,14 @@ EXPORTS
       Quit__20wxHtmlHelpControllerFv
       ;wxHtmlHelpController::ReadCustomization(wxConfigBase*,const wxString&)
       ReadCustomization__20wxHtmlHelpControllerFP12wxConfigBaseRC8wxString
+      ;wxHtmlHelpController::KeywordSearch(const wxString&)
+      KeywordSearch__20wxHtmlHelpControllerFRC8wxString
+      ;wxHtmlHelpController::Display(int)
+      Display__20wxHtmlHelpControllerFi
       ;wxHtmlHelpController::sm_classwxHtmlHelpController
       sm_classwxHtmlHelpController__20wxHtmlHelpController
+      ;wxHtmlHelpController::Display(const wxString&)
+      Display__20wxHtmlHelpControllerFRC8wxString
       ;wxHtmlHelpController::WriteCustomization(wxConfigBase*,const wxString&)
       WriteCustomization__20wxHtmlHelpControllerFP12wxConfigBaseRC8wxString
       ;wxHtmlHelpController::UseConfig(wxConfigBase*,const wxString&)
@@ -10084,12 +10684,20 @@ EXPORTS
       OnCloseFrame__20wxHtmlHelpControllerFR12wxCloseEvent
       ;wxHtmlHelpController::wxHtmlHelpController(int)
       __ct__20wxHtmlHelpControllerFi
+      ;wxHtmlHelpController::DisplayContents()
+      DisplayContents__20wxHtmlHelpControllerFv
+      ;wxHtmlHelpController::DisplayIndex()
+      DisplayIndex__20wxHtmlHelpControllerFv
       ;wxHtmlHelpController::SetTitleFormat(const wxString&)
       SetTitleFormat__20wxHtmlHelpControllerFRC8wxString
       ;wxHtmlHelpController::LoadFile(const wxString&)
       LoadFile__20wxHtmlHelpControllerFRC8wxString
   ;From object file:  ..\html\helpdata.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxHtmlBookRecArray::Add(const wxHtmlBookRecord&,unsigned int)
+      Add__18wxHtmlBookRecArrayFRC16wxHtmlBookRecordUi
+      ;wxHtmlBookRecArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__18wxHtmlBookRecArrayFUiT1
       ;wxHtmlHelpData::wxHtmlHelpData()
       __ct__14wxHtmlHelpDataFv
       ;wxSearchEngine::LookFor(const wxString&,unsigned long,unsigned long)
@@ -10108,12 +10716,10 @@ EXPORTS
       __ct__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray
       ;HP_TagHandler::WriteOut(wxHtmlContentsItem*&,int&)
       WriteOut__13HP_TagHandlerFRP18wxHtmlContentsItemRi
-      ;wxHtmlBookRecArray::RemoveAt(unsigned int)
-      RemoveAt__18wxHtmlBookRecArrayFUi
       ;wxHtmlBookRecArray::DoEmpty()
       DoEmpty__18wxHtmlBookRecArrayFv
-      ;wxHtmlBookRecArray::Add(const wxHtmlBookRecord&)
-      Add__18wxHtmlBookRecArrayFRC16wxHtmlBookRecord
+      ;wxHtmlBookRecArray::Insert(const wxHtmlBookRecord&,unsigned int,unsigned int)
+      Insert__18wxHtmlBookRecArrayFRC16wxHtmlBookRecordUiT2
       ;wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord*,wxOutputStream*)
       SaveCachedBook__14wxHtmlHelpDataFP16wxHtmlBookRecordP14wxOutputStream
       ;wxSearchEngine::Scan(wxInputStream*)
@@ -10131,10 +10737,9 @@ EXPORTS
       __vft14wxSearchEngine8wxObject
       ;wxHtmlBookRecArray::DoCopy(const wxHtmlBookRecArray&)
       DoCopy__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray
-      ;wxHtmlBookRecArray::Insert(const wxHtmlBookRecord&,unsigned int)
-      Insert__18wxHtmlBookRecArrayFRC16wxHtmlBookRecordUi
       ;wxHtmlBookRecArray::~wxHtmlBookRecArray()
       __dt__18wxHtmlBookRecArrayFv
+      wxHtmlHelpIndexCompareFunc
       ;wxHtmlHelpData::SetTempDir(const wxString&)
       SetTempDir__14wxHtmlHelpDataFRC8wxString
       ;wxHtmlHelpData::FindPageByName(const wxString&)
@@ -10185,18 +10790,20 @@ EXPORTS
       WriteCustomization__15wxHtmlHelpFrameFP12wxConfigBaseRC8wxString
       ;wxHtmlHelpFrameOptionsDialog::sm_eventTable
       sm_eventTable__28wxHtmlHelpFrameOptionsDialog
-      ;wxHtmlHelpFrame::OnIndexAll(wxCommandEvent&)
-      OnIndexAll__15wxHtmlHelpFrameFR14wxCommandEvent
+      ;wxHtmlHelpFrame::OnActivate(wxActivateEvent&)
+      OnActivate__15wxHtmlHelpFrameFR15wxActivateEvent
       __vft28wxHtmlHelpFrameOptionsDialog8wxObject
       __vft15wxHtmlHelpFrame8wxObject
+      ;wxHtmlHelpFrame::OnIndexAll(wxCommandEvent&)
+      OnIndexAll__15wxHtmlHelpFrameFR14wxCommandEvent
       ;wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow*,int,const wxString&,int,wxHtmlHelpData*)
       __ct__15wxHtmlHelpFrameFP8wxWindowiRC8wxStringT2P14wxHtmlHelpData
-      ;wxHtmlHelpFrame::DisplayContents()
-      DisplayContents__15wxHtmlHelpFrameFv
-      ;wxHtmlHelpFrame::OptionsDialog()
-      OptionsDialog__15wxHtmlHelpFrameFv
       ;wxHtmlHelpFrame::Create(wxWindow*,int,const wxString&,int)
       Create__15wxHtmlHelpFrameFP8wxWindowiRC8wxStringT2
+      ;wxHtmlHelpFrame::OptionsDialog()
+      OptionsDialog__15wxHtmlHelpFrameFv
+      ;wxHtmlHelpFrame::DisplayContents()
+      DisplayContents__15wxHtmlHelpFrameFv
       ;wxHtmlHelpFrame::CreateIndex()
       CreateIndex__15wxHtmlHelpFrameFv
       ;wxHtmlHelpFrameOptionsDialog::sm_eventTableEntries
@@ -10207,18 +10814,18 @@ EXPORTS
       OnSearch__15wxHtmlHelpFrameFR14wxCommandEvent
       ;wxHtmlHelpFrame::Init(wxHtmlHelpData*)
       Init__15wxHtmlHelpFrameFP14wxHtmlHelpData
-      ;wxHtmlHelpFrame::DisplayIndex()
-      DisplayIndex__15wxHtmlHelpFrameFv
+      ;wxHtmlHelpFrame::NotifyPageChanged()
+      NotifyPageChanged__15wxHtmlHelpFrameFv
       ;wxConstructorForwxHtmlHelpFrame()
       wxConstructorForwxHtmlHelpFrame__Fv
       ;wxHtmlHelpFrame::~wxHtmlHelpFrame()
       __dt__15wxHtmlHelpFrameFv
-      ;wxHtmlHelpFrame::NotifyPageChanged()
-      NotifyPageChanged__15wxHtmlHelpFrameFv
       ;wxHtmlHelpFrameOptionsDialog::GetEventTable() const
       GetEventTable__28wxHtmlHelpFrameOptionsDialogCFv
       ;wxHtmlHelpFrame::GetEventTable() const
       GetEventTable__15wxHtmlHelpFrameCFv
+      ;wxHtmlHelpFrame::DisplayIndex()
+      DisplayIndex__15wxHtmlHelpFrameFv
       ;wxHtmlHelpFrame::CreateSearch()
       CreateSearch__15wxHtmlHelpFrameFv
       ;wxHtmlHelpFrame::ReadCustomization(wxConfigBase*,const wxString&)
@@ -10322,6 +10929,8 @@ EXPORTS
       wxConstructorForwxHtmlFilterHTML__Fv
       ;wxHtmlFilterHTML::sm_classwxHtmlFilterHTML
       sm_classwxHtmlFilterHTML__16wxHtmlFilterHTML
+      ;wxPrivate_ReadString(wxString&,wxInputStream*)
+      wxPrivate_ReadString__FR8wxStringP13wxInputStream
       ;wxHtmlFilterPlainText::ReadFile(const wxFSFile&) const
       ReadFile__21wxHtmlFilterPlainTextCFRC8wxFSFile
       ;wxHtmlFilterHTML::ReadFile(const wxFSFile&) const
@@ -10359,8 +10968,6 @@ EXPORTS
       ;wxHtmlTextPieces::Index(const wxHtmlTextPiece&,unsigned long) const
       Index__16wxHtmlTextPiecesCFRC15wxHtmlTextPieceUl
       __vft20wxHtmlEntitiesParser8wxObject
-      ;wxHtmlTextPieces::Insert(const wxHtmlTextPiece&,unsigned int)
-      Insert__16wxHtmlTextPiecesFRC15wxHtmlTextPieceUi
       ;wxHtmlParser::DoParsing()
       DoParsing__12wxHtmlParserFv
       ;wxHtmlParser::RestoreState()
@@ -10371,6 +10978,8 @@ EXPORTS
       __ct__16wxHtmlTextPiecesFRC16wxHtmlTextPieces
       ;wxHtmlParser::SetSource(const wxString&)
       SetSource__12wxHtmlParserFRC8wxString
+      ;wxHtmlTextPieces::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__16wxHtmlTextPiecesFUiT1
       ;wxHtmlTextPieces::DoEmpty()
       DoEmpty__16wxHtmlTextPiecesFv
       ;wxConstructorForwxHtmlEntitiesParser()
@@ -10389,12 +10998,15 @@ EXPORTS
       SetEncoding__20wxHtmlEntitiesParserF14wxFontEncoding
       ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
       PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
-      ;wxHtmlTextPieces::RemoveAt(unsigned int)
-      RemoveAt__16wxHtmlTextPiecesFUi
-      ;wxHtmlEntitiesParser::GetCharForCode(unsigned int)
-      GetCharForCode__20wxHtmlEntitiesParserFUi
+      ;wxHtmlParser::OpenURL(wxHtmlURLType,const wxString&) const
+      OpenURL__12wxHtmlParserCF13wxHtmlURLTypeRC8wxString
       ;wxHtmlParser::CreateDOMSubTree(wxHtmlTag*,int,int,wxHtmlTagsCache*)
       CreateDOMSubTree__12wxHtmlParserFP9wxHtmlTagiT2P15wxHtmlTagsCache
+      wxHtmlEntityCompare
+      ;wxHtmlEntitiesParser::GetCharForCode(unsigned int)
+      GetCharForCode__20wxHtmlEntitiesParserFUi
+      ;wxHtmlTextPieces::Insert(const wxHtmlTextPiece&,unsigned int,unsigned int)
+      Insert__16wxHtmlTextPiecesFRC15wxHtmlTextPieceUiT2
       ;wxHtmlParser::~wxHtmlParser()
       __dt__12wxHtmlParserFv
       ;wxHtmlTextPieces::operator=(const wxHtmlTextPieces&)
@@ -10404,8 +11016,8 @@ EXPORTS
       __vft12wxHtmlParser8wxObject
       ;wxHtmlParser::DoParsing(int,int)
       DoParsing__12wxHtmlParserFiT1
-      ;wxHtmlTextPieces::Add(const wxHtmlTextPiece&)
-      Add__16wxHtmlTextPiecesFRC15wxHtmlTextPiece
+      ;wxHtmlTextPieces::Add(const wxHtmlTextPiece&,unsigned int)
+      Add__16wxHtmlTextPiecesFRC15wxHtmlTextPieceUi
       ;wxHtmlEntitiesParser::wxHtmlEntitiesParser()
       __ct__20wxHtmlEntitiesParserFv
       ;wxHtmlParser::sm_classwxHtmlParser
@@ -10423,8 +11035,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&)
@@ -10459,16 +11071,14 @@ EXPORTS
       sm_classwxHtmlWinModule__15wxHtmlWinModule
       ;wxHtmlWindow::SetFonts(wxString,wxString,const int*)
       SetFonts__12wxHtmlWindowF8wxStringT1PCi
-      ;wxHtmlHistoryArray::RemoveAt(unsigned int)
-      RemoveAt__18wxHtmlHistoryArrayFUi
-      ;wxHtmlHistoryArray::Add(const wxHtmlHistoryItem&)
-      Add__18wxHtmlHistoryArrayFRC17wxHtmlHistoryItem
       ;wxHtmlHistoryArray::~wxHtmlHistoryArray()
       __dt__18wxHtmlHistoryArrayFv
       ;wxHtmlWindow::~wxHtmlWindow()
       __dt__12wxHtmlWindowFv
       ;wxHtmlWindow::OnCellMouseHover(wxHtmlCell*,int,int)
       OnCellMouseHover__12wxHtmlWindowFP10wxHtmlCelliT2
+      ;wxHtmlHistoryArray::Insert(const wxHtmlHistoryItem&,unsigned int,unsigned int)
+      Insert__18wxHtmlHistoryArrayFRC17wxHtmlHistoryItemUiT2
       ;wxHtmlWindow::HistoryCanForward()
       HistoryCanForward__12wxHtmlWindowFv
       ;wxHtmlWindow::HistoryBack()
@@ -10487,8 +11097,6 @@ EXPORTS
       OnDraw__12wxHtmlWindowFR4wxDC
       ;wxHtmlHistoryArray::Index(const wxHtmlHistoryItem&,unsigned long) const
       Index__18wxHtmlHistoryArrayCFRC17wxHtmlHistoryItemUl
-      ;wxHtmlHistoryArray::Insert(const wxHtmlHistoryItem&,unsigned int)
-      Insert__18wxHtmlHistoryArrayFRC17wxHtmlHistoryItemUi
       __vft25wxwxHtmlProcessorListNode10wxNodeBase
       ;wxHtmlHistoryArray::DoEmpty()
       DoEmpty__18wxHtmlHistoryArrayFv
@@ -10518,10 +11126,12 @@ EXPORTS
       OnSize__12wxHtmlWindowFR11wxSizeEvent
       ;wxHtmlWindow::OnMouseEvent(wxMouseEvent&)
       OnMouseEvent__12wxHtmlWindowFR12wxMouseEvent
-      ;wxHtmlHistoryArray::operator=(const wxHtmlHistoryArray&)
-      __as__18wxHtmlHistoryArrayFRC18wxHtmlHistoryArray
+      ;wxHtmlHistoryArray::Add(const wxHtmlHistoryItem&,unsigned int)
+      Add__18wxHtmlHistoryArrayFRC17wxHtmlHistoryItemUi
       ;wxHtmlHistoryArray::wxHtmlHistoryArray(const wxHtmlHistoryArray&)
       __ct__18wxHtmlHistoryArrayFRC18wxHtmlHistoryArray
+      ;wxHtmlHistoryArray::operator=(const wxHtmlHistoryArray&)
+      __as__18wxHtmlHistoryArrayFRC18wxHtmlHistoryArray
       ;wxHtmlWindow::SetRelatedStatusBar(int)
       SetRelatedStatusBar__12wxHtmlWindowFi
       ;wxHtmlWindow::CleanUpStatics()
@@ -10536,6 +11146,8 @@ EXPORTS
       ReadCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
       ;wxHtmlWindow::OnIdle(wxIdleEvent&)
       OnIdle__12wxHtmlWindowFR11wxIdleEvent
+      ;wxHtmlHistoryArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__18wxHtmlHistoryArrayFUiT1
       ;wxHtmlWindow::Init()
       Init__12wxHtmlWindowFv
       ;wxConstructorForwxHtmlWindow()
@@ -10666,8 +11278,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       __vft22wxHtmlImageMapAreaCell8wxObject
       __vft15wxHtmlImageCell8wxObject
-      ;CoordArray::Add(const int&)
-      Add__10CoordArrayFRCi
       ;CoordArray::operator=(const CoordArray&)
       __as__10CoordArrayFRC10CoordArray
       ;CoordArray::~CoordArray()
@@ -10692,6 +11302,8 @@ EXPORTS
       sm_classHTML_ModuleImage__16HTML_ModuleImage
       ;_link_dummy_func_m_image()
       _link_dummy_func_m_image__Fv
+      ;CoordArray::Insert(const int&,unsigned int,unsigned int)
+      Insert__10CoordArrayFRCiUiT2
       ;CoordArray::DoEmpty()
       DoEmpty__10CoordArrayFv
       __vft18wxHtmlImageMapCell8wxObject
@@ -10699,16 +11311,16 @@ EXPORTS
       DoCopy__10CoordArrayFRC10CoordArray
       ;CoordArray::CoordArray(const CoordArray&)
       __ct__10CoordArrayFRC10CoordArray
+      ;CoordArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__10CoordArrayFUiT1
       ;wxHtmlImageCell::Layout(int)
       Layout__15wxHtmlImageCellFi
       ;wxHtmlImageMapCell::GetLink(int,int) const
       GetLink__18wxHtmlImageMapCellCFiT1
+      ;CoordArray::Add(const int&,unsigned int)
+      Add__10CoordArrayFRCiUi
       ;CoordArray::Index(const int&,unsigned long) const
       Index__10CoordArrayCFRCiUl
-      ;CoordArray::RemoveAt(unsigned int)
-      RemoveAt__10CoordArrayFUi
-      ;CoordArray::Insert(const int&,unsigned int)
-      Insert__10CoordArrayFRCiUi
       ;wxHtmlImageCell::GetLink(int,int) const
       GetLink__15wxHtmlImageCellCFiT1
       ;wxHtmlImageCell::~wxHtmlImageCell()
@@ -10760,6 +11372,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)
@@ -10789,6 +11409,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*)
@@ -10831,8 +11453,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
@@ -10864,12 +11486,12 @@ EXPORTS
       wxConstructorForwxAcceleratorTable__Fv
       ;wxAcceleratorTable::SetHACCEL(unsigned long)
       SetHACCEL__18wxAcceleratorTableFUl
-      ;wxAcceleratorTable::wxAcceleratorTable(int,wxAcceleratorEntry*)
-      __ct__18wxAcceleratorTableFiP18wxAcceleratorEntry
       ;wxAcceleratorTable::~wxAcceleratorTable()
       __dt__18wxAcceleratorTableFv
       ;wxAcceleratorTable::Ok() const
       Ok__18wxAcceleratorTableCFv
+      ;wxAcceleratorTable::wxAcceleratorTable(int,const wxAcceleratorEntry*)
+      __ct__18wxAcceleratorTableFiPC18wxAcceleratorEntry
       __vft20wxAcceleratorRefData15wxObjectRefData
       ;wxAcceleratorTable::wxAcceleratorTable()
       __ct__18wxAcceleratorTableFv
@@ -10918,12 +11540,8 @@ EXPORTS
       OnIdle__5wxAppFR11wxIdleEvent
       ;wxMsgArray::wxMsgArray(const wxMsgArray&)
       __ct__10wxMsgArrayFRC10wxMsgArray
-      wxPanelClassName
-      wxMDIFrameClassName
-      ;wxMsgArray::Insert(const _QMSG&,unsigned int)
-      Insert__10wxMsgArrayFRC5_QMSGUi
-      ;wxApp::HandleSockets()
-      HandleSockets__5wxAppFv
+      ;wxMsgArray::Insert(const _QMSG&,unsigned int,unsigned int)
+      Insert__10wxMsgArrayFRC5_QMSGUiT2
       wxDEFAULT_MDIPARENTFRAME_ICON
       ;wxApp::wxApp()
       __ct__5wxAppFv
@@ -10933,8 +11551,8 @@ EXPORTS
       ProcessMessage__5wxAppFPPv
       ;wxApp::OnInitGui()
       OnInitGui__5wxAppFv
-      ;wxMsgArray::Add(const _QMSG&)
-      Add__10wxMsgArrayFRC5_QMSG
+      ;wxApp::HandleSockets()
+      HandleSockets__5wxAppFv
       ;wxApp::OnQueryEndSession(wxCloseEvent&)
       OnQueryEndSession__5wxAppFR12wxCloseEvent
       __vft5wxApp8wxObject
@@ -10956,16 +11574,11 @@ EXPORTS
       Initialized__5wxAppFv
       ;wxApp::GetEventTable() const
       GetEventTable__5wxAppCFv
-      wxFrameClassNameNoRedraw
       ;wxSetInstance(unsigned long)
       wxSetInstance__FUl
-      ;wxMsgArray::RemoveAt(unsigned int)
-      RemoveAt__10wxMsgArrayFUi
-      wxMDIChildFrameClassName
+      ;wxMsgArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__10wxMsgArrayFUiT1
       wxGetInstance
-      wxFrameClassName
-      ;wxApp::GetStdIcon(int) const
-      GetStdIcon__5wxAppCFi
       ;wxMsgArray::~wxMsgArray()
       __dt__10wxMsgArrayFv
       wxSTD_MDIPARENTFRAME_ICON
@@ -10975,7 +11588,6 @@ EXPORTS
       ;wxApp::CleanUp()
       CleanUp__5wxAppFv
       svCurrentMsg
-      wxMDIChildFrameClassNameNoRedraw
       ;wxMsgArray::Index(const _QMSG&,unsigned long) const
       Index__10wxMsgArrayCFRC5_QMSGUl
       wxDisableButtonBrush
@@ -10983,9 +11595,10 @@ EXPORTS
       sm_eventTable__5wxApp
       ;wxApp::Initialize(unsigned long)
       Initialize__5wxAppFUl
+      ;wxMsgArray::Add(const _QMSG&,unsigned int)
+      Add__10wxMsgArrayFRC5_QMSGUi
       ;wxAppBase::m_appInitFn
       m_appInitFn__9wxAppBase
-      wxCanvasClassName
       ;wxApp::DoMessage()
       DoMessage__5wxAppFv
       ;wxExit()
@@ -10996,7 +11609,6 @@ EXPORTS
       Dispatch__5wxAppFv
       ;wxEntry(int,char**)
       wxEntry__FiPPc
-      wxMDIFrameClassNameNoRedraw
       ;wxApp::SendIdleEvents(wxWindow*)
       SendIdleEvents__5wxAppFP8wxWindow
   ;From object file:  ..\os2\bitmap.cpp
@@ -11024,12 +11636,10 @@ EXPORTS
       Create__8wxBitmapFPvliN23
       ;wxBitmap::GetBitmapForDC(wxDC&) const
       GetBitmapForDC__8wxBitmapCFR4wxDC
-      ;wxBitmap::wxBitmap(const wxString&,long)
-      __ct__8wxBitmapFRC8wxStringl
-      ;wxMask::wxMask(const wxBitmap&)
-      __ct__6wxMaskFRC8wxBitmap
       ;wxBitmap::GetSubBitmap(const wxRect&) const
       GetSubBitmap__8wxBitmapCFRC6wxRect
+      ;wxMask::wxMask(const wxBitmap&)
+      __ct__6wxMaskFRC8wxBitmap
       ;wxMask::Create(const wxBitmap&)
       Create__6wxMaskFRC8wxBitmap
       ;wxBitmapHandler::Create(wxBitmap*,void*,long,int,int,int)
@@ -11047,8 +11657,6 @@ EXPORTS
       wxInvertMask__FUliT2
       ;wxMask::wxMask()
       __ct__6wxMaskFv
-      ;wxBitmap::wxBitmap(const char**)
-      __ct__8wxBitmapFPPCc
       ;wxMask::sm_classwxMask
       sm_classwxMask__6wxMask
       __vft8wxBitmap8wxObject
@@ -11063,36 +11671,38 @@ EXPORTS
       __ct__8wxBitmapFPCciN22
       ;wxBitmapRefData::wxBitmapRefData()
       __ct__15wxBitmapRefDataFv
+      ;wxBitmapHandler::Load(wxGDIImage*,int,long,int,int)
+      Load__15wxBitmapHandlerFP10wxGDIImageilN22
       ;wxMask::Create(const wxBitmap&,const wxColour&)
       Create__6wxMaskFRC8wxBitmapRC8wxColour
       ;wxBitmap::ConvertToImage() const
       ConvertToImage__8wxBitmapCFv
       ;wxBitmap::wxBitmap(void*,long,int,int,int)
       __ct__8wxBitmapFPvliN23
-      ;wxBitmap::LoadFile(const wxString&,long)
-      LoadFile__8wxBitmapFRC8wxStringl
+      ;wxBitmap::LoadFile(int,long)
+      LoadFile__8wxBitmapFil
       ;wxBitmap::CreateFromImage(const wxImage&,int)
       CreateFromImage__8wxBitmapFRC7wxImagei
       ;wxBitmap::SetPalette(const wxPalette&)
       SetPalette__8wxBitmapFRC9wxPalette
       ;wxBitmapHandler::Save(wxGDIImage*,const wxString&,int)
       Save__15wxBitmapHandlerFP10wxGDIImageRC8wxStringi
-      ;wxBitmapHandler::LoadFile(wxBitmap*,const wxString&,unsigned long,long,int,int)
-      LoadFile__15wxBitmapHandlerFP8wxBitmapRC8wxStringUlliT5
       ;wxConstructorForwxBitmapHandler()
       wxConstructorForwxBitmapHandler__Fv
+      ;wxBitmapHandler::LoadFile(wxBitmap*,int,long,int,int)
+      LoadFile__15wxBitmapHandlerFP8wxBitmapilN22
       ;wxBitmapRefData::Free()
       Free__15wxBitmapRefDataFv
+      ;wxBitmap::wxBitmap(int,long)
+      __ct__8wxBitmapFil
       ;wxBitmap::sm_classwxBitmap
       sm_classwxBitmap__8wxBitmap
-      ;wxBitmapHandler::Load(wxGDIImage*,const wxString&,unsigned long,long,int,int)
-      Load__15wxBitmapHandlerFP10wxGDIImageRC8wxStringUlliT5
       ;wxConstructorForwxBitmap()
       wxConstructorForwxBitmap__Fv
       ;wxConstructorForwxMask()
       wxConstructorForwxMask__Fv
-      ;wxBitmap::wxBitmap(char**)
-      __ct__8wxBitmapFPPc
+      ;wxBitmap::CreateFromXpm(const char**)
+      CreateFromXpm__8wxBitmapFPPCc
       ;wxBitmap::SetMask(wxMask*)
       SetMask__8wxBitmapFP6wxMask
   ;From object file:  ..\os2\bmpbuttn.cpp
@@ -11160,16 +11770,24 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxButton::Command(wxCommandEvent&)
       Command__8wxButtonFR14wxCommandEvent
-      ;wxButton::MakeOwnerDrawn()
-      MakeOwnerDrawn__8wxButtonFv
+      ;wxButton::SetTmpDefault()
+      SetTmpDefault__8wxButtonFv
       ;wxButton::WindowProc(unsigned int,void*,void*)
       WindowProc__8wxButtonFUiPvT2
+      ;wxButton::MakeOwnerDrawn()
+      MakeOwnerDrawn__8wxButtonFv
+      ;wxButton::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__8wxButtonCFlPUl
       ;wxButton::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
       OnCtlColor__8wxButtonFUlT1UiT3PvT5
+      ;wxButton::UnsetTmpDefault()
+      UnsetTmpDefault__8wxButtonFv
       ;wxButton::~wxButton()
       __dt__8wxButtonFv
       ;wxButton::SendClickEvent()
       SendClickEvent__8wxButtonFv
+      ;wxButton::UpdateDefaultStyle(wxWindow*,wxWindow*)
+      UpdateDefaultStyle__8wxButtonFP8wxWindowT1
       ;wxConstructorForwxButton()
       wxConstructorForwxButton__Fv
       ;wxButton::GetDefaultSize()
@@ -11355,10 +11973,10 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxColour::Set(unsigned char,unsigned char,unsigned char)
       Set__8wxColourFUcN21
-      ;wxColour::wxColour()
-      __ct__8wxColourFv
       ;wxColour::operator=(const wxColour&)
       __as__8wxColourFRC8wxColour
+      ;wxColour::wxColour()
+      __ct__8wxColourFv
       ;wxColour::InitFromName(const wxString&)
       InitFromName__8wxColourFRC8wxString
       ;wxConstructorForwxColour()
@@ -11389,6 +12007,7 @@ EXPORTS
       DoSetSize__10wxComboBoxFiN41
       ;wxComboBox::Paste()
       Paste__10wxComboBoxFv
+      __vft10wxComboBox15wxItemContainer
       ;wxComboBox::GetInsertionPoint() const
       GetInsertionPoint__10wxComboBoxCFv
       ;wxComboBox::SetEditable(unsigned long)
@@ -11416,16 +12035,16 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxControl::OnEraseBackground(wxEraseEvent&)
       OnEraseBackground__9wxControlFR12wxEraseEvent
+      ;wxControl::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__9wxControlCFlPUl
       ;wxControl::sm_eventTable
       sm_eventTable__9wxControl
       ;wxControl::OS2CreateControl(const char*,unsigned long,const wxPoint&,const wxSize&,const wxString&,unsigned long)
       OS2CreateControl__9wxControlFPCcUlRC7wxPointRC6wxSizeRC8wxStringT2
-      ;wxControl::GetExStyle(unsigned long&) const
-      GetExStyle__9wxControlCFRUl
-      ;wxControl::sm_eventTableEntries
-      sm_eventTableEntries__9wxControl
       ;wxControl::sm_classwxControl
       sm_classwxControl__9wxControl
+      ;wxControl::sm_eventTableEntries
+      sm_eventTableEntries__9wxControl
       ;wxControl::DoGetBestSize() const
       DoGetBestSize__9wxControlCFv
       ;wxControl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
@@ -11438,15 +12057,17 @@ EXPORTS
       __ct__9wxControlFv
       ;wxControl::GetEventTable() const
       GetEventTable__9wxControlCFv
+      ;wxControl::OS2CreateControl(const char*,const wxString&,const wxPoint&,const wxSize&,long)
+      OS2CreateControl__9wxControlFPCcRC8wxStringRC7wxPointRC6wxSizel
       ;wxFindMaxSize(unsigned long,_RECTL*)
       wxFindMaxSize__FUlP6_RECTL
       __vft9wxControl8wxObject
       ;wxControl::~wxControl()
       __dt__9wxControlFv
-      ;wxControl::OS2CreateControl(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
-      OS2CreateControl__9wxControlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
   ;From object file:  ..\os2\cursor.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxCursor::wxCursor(const wxImage&)
+      __ct__8wxCursorFRC7wxImage
       ;wxCursorRefData::~wxCursorRefData()
       __dt__15wxCursorRefDataFv
       ;wxCursor::wxCursor(const wxString&,long,int,int)
@@ -11497,12 +12118,15 @@ EXPORTS
       wxDialogNameStr
       wxCheckBoxNameStr
       wxCanvasNameStr
+      wxCanvasClassNameNR
       wxCYAN_PEN
       wxButtonBarNameStr
       wxNullBitmap
       wxNORMAL_FONT
       wxMEDIUM_GREY_BRUSH
       wxTheColourDatabase
+      wxPanelClassName
+      wxMDIFrameClassName
       wxLIGHT_GREY
       wxDefaultSize
       wxBLUE
@@ -11512,12 +12136,12 @@ EXPORTS
       wxStaticBoxNameStr
       wxSliderNameStr
       wxRED_PEN
+      wxPanelClassNameNR
       wxMultiTextNameStr
       wxMEDIUM_GREY_PEN
       wxGaugeNameStr
       wxGREEN
       wxFrameNameStr
-      wxFatalErrorStr
       wxDefaultPosition
       wxBitmapRadioButtonNameStr
       wxTheBitmapList
@@ -11536,9 +12160,12 @@ EXPORTS
       wxComboBoxNameStr
       wxCROSS_CURSOR
       wxTopLevelWindows
+      wxFrameClassNameNoRedraw
       wxTRANSPARENT_BRUSH
       wxWHITE_BRUSH
       wxRED_BRUSH
+      wxFrameClassName
+      wxMDIChildFrameClassName
       wxNullColour
       wxTRANSPARENT_PEN
       wxStaticNameStr
@@ -11552,17 +12179,18 @@ EXPORTS
       wxBLACK_DASHED_PEN
       g_globalCursor
       wxNullNativeFontInfo
+      wxMDIChildFrameClassNameNoRedraw
       wxBLUE_BRUSH
       wxLIGHT_GREY_BRUSH
       wxBLACK_BRUSH
       wxPendingDelete
       wxNullAcceleratorTable
+      wxCanvasClassName
       wxGREEN_PEN
       wxVirtListBoxNameStr
       wxStatusLineNameStr
       wxRadioBoxNameStr
       wxLIGHT_GREY_PEN
-      wxInternalErrorStr
       wxGREY_PEN
       wxFileSelectorDefaultWildcardStr
       wxDoubleToStringStr
@@ -11571,6 +12199,7 @@ EXPORTS
       wxChoiceNameStr
       wxCYAN
       wxBLACK
+      wxMDIFrameClassNameNoRedraw
   ;From object file:  ..\os2\dataobj.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDataFormat::wxDataFormat()
@@ -11713,6 +12342,8 @@ EXPORTS
       QueryTextBkColor__FUl
       ;wxDC::SelectOldObjects(unsigned long)
       SelectOldObjects__4wxDCFUl
+      ;wxDC::DoSelectPalette(unsigned long)
+      DoSelectPalette__4wxDCFUl
       ;SetBkMode(unsigned long,int)
       SetBkMode__FUli
       ;wxDC::DoSetClippingRegion(int,int,int,int)
@@ -11735,6 +12366,8 @@ EXPORTS
       DoDrawIcon__4wxDCFRC6wxIconiT2
       ;wxDC::StartPage()
       StartPage__4wxDCFv
+      ;wxDC::InitializePalette()
+      InitializePalette__4wxDCFv
       ;wxDC::GetCharWidth() const
       GetCharWidth__4wxDCCFv
       ;wxDC::DoDrawRotatedText(const wxString&,int,int,double)
@@ -11771,8 +12404,10 @@ EXPORTS
       InitDC__10wxClientDCFv
       ;wxArrayDCInfo::DoCopy(const wxArrayDCInfo&)
       DoCopy__13wxArrayDCInfoFRC13wxArrayDCInfo
-      ;wxArrayDCInfo::Add(const wxPaintDCInfo&)
-      Add__13wxArrayDCInfoFRC13wxPaintDCInfo
+      ;wxArrayDCInfo::Add(const wxPaintDCInfo&,unsigned int)
+      Add__13wxArrayDCInfoFRC13wxPaintDCInfoUi
+      ;wxWindowDC::DoGetSize(int*,int*) const
+      DoGetSize__10wxWindowDCCFPiT1
       ;wxPaintDC::wxPaintDC()
       __ct__9wxPaintDCFv
       ;wxArrayDCInfo::operator=(const wxArrayDCInfo&)
@@ -11781,8 +12416,9 @@ EXPORTS
       __ct__10wxClientDCFP8wxWindow
       ;wxPaintDC::FindDCInCache(wxWindow*)
       FindDCInCache__9wxPaintDCFP8wxWindow
-      ;wxArrayDCInfo::Insert(const wxPaintDCInfo&,unsigned int)
-      Insert__13wxArrayDCInfoFRC13wxPaintDCInfoUi
+      __vft10wxWindowDC8wxObject
+      ;wxArrayDCInfo::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__13wxArrayDCInfoFUiT1
       ;wxConstructorForwxWindowDC()
       wxConstructorForwxWindowDC__Fv
       ;wxPaintDC::~wxPaintDC()
@@ -11793,20 +12429,22 @@ EXPORTS
       __ct__9wxPaintDCFP8wxWindow
       ;wxArrayDCInfo::Index(const wxPaintDCInfo&,unsigned long) const
       Index__13wxArrayDCInfoCFRC13wxPaintDCInfoUl
-      ;wxArrayDCInfo::RemoveAt(unsigned int)
-      RemoveAt__13wxArrayDCInfoFUi
       ;wxPaintDC::FindInCache(unsigned int*) const
       FindInCache__9wxPaintDCCFPUi
       ;wxArrayDCInfo::DoEmpty()
       DoEmpty__13wxArrayDCInfoFv
       ;wxClientDC::~wxClientDC()
       __dt__10wxClientDCFv
+      ;wxArrayDCInfo::Insert(const wxPaintDCInfo&,unsigned int,unsigned int)
+      Insert__13wxArrayDCInfoFRC13wxPaintDCInfoUiT2
       ;wxClientDC::sm_classwxClientDC
       sm_classwxClientDC__10wxClientDC
       ;wxPaintDC::sm_classwxPaintDC
       sm_classwxPaintDC__9wxPaintDC
       __vft10wxClientDC8wxObject
       __vft9wxPaintDC8wxObject
+      ;wxClientDC::DoGetSize(int*,int*) const
+      DoGetSize__10wxClientDCCFPiT1
       ;wxArrayDCInfo::~wxArrayDCInfo()
       __dt__13wxArrayDCInfoFv
       ;wxConstructorForwxClientDC()
@@ -11833,8 +12471,6 @@ EXPORTS
       DoGetSize__10wxMemoryDCCFPiT1
       ;wxMemoryDC::wxMemoryDC(wxDC*)
       __ct__10wxMemoryDCFP4wxDC
-      ;wxMemoryDC::DoDrawRectangle(int,int,int,int)
-      DoDrawRectangle__10wxMemoryDCFiN31
       ;wxMemoryDC::wxMemoryDC()
       __ct__10wxMemoryDCFv
       ;wxMemoryDC::sm_classwxMemoryDC
@@ -11874,6 +12510,9 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxConstructorForwxScreenDC()
       wxConstructorForwxScreenDC__Fv
+      __vft10wxScreenDC8wxObject
+      ;wxScreenDC::DoGetSize(int*,int*) const
+      DoGetSize__10wxScreenDCCFPiT1
       ;wxScreenDC::sm_classwxScreenDC
       sm_classwxScreenDC__10wxScreenDC
       ;wxScreenDC::wxScreenDC()
@@ -11954,15 +12593,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)
@@ -11977,8 +12607,6 @@ EXPORTS
       Revoke__12wxDropTargetFUl
       ;wxDropTarget::Register(unsigned long)
       Register__12wxDropTargetFUl
-      ;wxDropSource::DoDragDrop(unsigned long)
-      DoDragDrop__12wxDropSourceFUl
       ;wxDropTarget::OnDrop(int,int)
       OnDrop__12wxDropTargetFiT1
       ;wxDropTarget::GetData()
@@ -11991,6 +12619,8 @@ EXPORTS
       OnDragOver__12wxDropTargetFiT112wxDragResult
       ;wxDropTarget::~wxDropTarget()
       __dt__12wxDropTargetFv
+      ;wxDropSource::DoDragDrop(int)
+      DoDragDrop__12wxDropSourceFi
       ;wxDropSource::Init()
       Init__12wxDropSourceFv
       ;wxDropTarget::IsAcceptable(_DRAGINFO*)
@@ -12014,12 +12644,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
@@ -12028,9 +12664,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()
@@ -12039,6 +12681,8 @@ EXPORTS
       GetUnderlined__6wxFontCFv
       ;wxFont::GetStyle() const
       GetStyle__6wxFontCFv
+      ;wxFont::GetNativeFontInfo() const
+      GetNativeFontInfo__6wxFontCFv
       ;wxFont::SetEncoding(wxFontEncoding)
       SetEncoding__6wxFontF14wxFontEncoding
       ;wxFont::FreeResource(unsigned long)
@@ -12047,27 +12691,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::GetStyle() const
+      GetStyle__16wxNativeFontInfoCFv
+      ;wxNativeFontInfo::GetPointSize() const
+      GetPointSize__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()
@@ -12076,27 +12744,29 @@ 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()
       wxConstructorForwxFontDialog__Fv
       __vft12wxFontDialog8wxObject
-      ;wxFontDialog::wxFontDialog(wxWindow*,wxFontData*)
-      __ct__12wxFontDialogFP8wxWindowP10wxFontData
+      ;wxFontDialog::Create(wxWindow*,const wxFontData&)
+      Create__12wxFontDialogFP8wxWindowRC10wxFontData
+      ;wxFontDialog::wxFontDialog(wxWindow*,const wxFontData&)
+      __ct__12wxFontDialogFP8wxWindowRC10wxFontData
       ;wxFontDialog::wxFontDialog()
       __ct__12wxFontDialogFv
       ;wxFontDialog::ShowModal()
       ShowModal__12wxFontDialogFv
       ;wxFontDialog::sm_classwxFontDialog
       sm_classwxFontDialog__12wxFontDialog
-      ;wxFontDialog::Create(wxWindow*,wxFontData*)
-      Create__12wxFontDialogFP8wxWindowP10wxFontData
   ;From object file:  ..\os2\fontenum.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxFontEnumerator::EnumerateFacenames(wxFontEncoding,unsigned long)
@@ -12114,16 +12784,20 @@ 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&)
       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
-      ;wxFillLogFont(_FATTRS*,_FACENAMEDESC*,const wxFont*)
-      wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCPC6wxFont
+      ;wxOS2SelectMatchingFontByName(_FATTRS*,_FACENAMEDESC*,_FONTMETRICS*,int,const wxFont*)
+      wxOS2SelectMatchingFontByName__FP7_FATTRSP13_FACENAMEDESCP12_FONTMETRICSiPC6wxFont
       ;wxGpiStrcmp(char*,char*)
       wxGpiStrcmp__FPcT1
       ;wxNativeEncodingInfo::FromString(const wxString&)
@@ -12132,16 +12806,12 @@ 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()
       HandlePaint__7wxFrameFv
       ;wxFrame::OnCreateStatusBar(int,long,int,const wxString&)
       OnCreateStatusBar__7wxFrameFilT1RC8wxString
-      ;wxFrame::OnActivate(wxActivateEvent&)
-      OnActivate__7wxFrameFR15wxActivateEvent
       __vft7wxFrame8wxObject
       ;wxFrame::DoSetClientSize(int,int)
       DoSetClientSize__7wxFrameFiT1
@@ -12201,8 +12871,10 @@ EXPORTS
       GetEventTable__7wxFrameCFv
       ;wxFrame::DetachMenuBar()
       DetachMenuBar__7wxFrameFv
-      wxFrameMainWndProc
+      ;wxFrame::OnCreateToolBar(long,int,const wxString&)
+      OnCreateToolBar__7wxFrameFliRC8wxString
       wxFrameWndProc
+      wxFrameMainWndProc
       ;wxFrame::SetClient(wxWindow*)
       SetClient__7wxFrameFP8wxWindow
   ;From object file:  ..\os2\gauge.cpp
@@ -12256,6 +12928,8 @@ EXPORTS
       wxConstructorForwxICOResourceHandler__Fv
       ;wxBMPFileHandler::sm_classwxBMPFileHandler
       sm_classwxBMPFileHandler__16wxBMPFileHandler
+      ;wxBMPResourceHandler::LoadFile(wxBitmap*,int,long,int,int)
+      LoadFile__20wxBMPResourceHandlerFP8wxBitmapilN22
       ;wxGDIImage::CleanUpHandlers()
       CleanUpHandlers__10wxGDIImageFv
       ;wxGDIImage::AddHandler(wxGDIImageHandler*)
@@ -12263,8 +12937,6 @@ EXPORTS
       ;wxGDIImage::FindHandler(long)
       FindHandler__10wxGDIImageFl
       __vft20wxBMPResourceHandler8wxObject
-      ;wxBMPResourceHandler::LoadFile(wxBitmap*,const wxString&,unsigned long,long,int,int)
-      LoadFile__20wxBMPResourceHandlerFP8wxBitmapRC8wxStringUlliT5
       ;wxICOResourceHandler::LoadIcon(wxIcon*,const wxString&,unsigned long,long,int,int)
       LoadIcon__20wxICOResourceHandlerFP6wxIconRC8wxStringUlliT5
       ;wxConstructorForwxBMPResourceHandler()
@@ -12775,14 +13447,18 @@ EXPORTS
       sm_classwxMenuBar__9wxMenuBar
       ;wxMenuBar::RebuildAccelTable()
       RebuildAccelTable__9wxMenuBarFv
+      ;wxMenu::EndRadioGroup()
+      EndRadioGroup__6wxMenuFv
       ;wxMenu::OS2Command(unsigned int,unsigned short)
       OS2Command__6wxMenuFUiUs
       ;wxMenuBar::EnableTop(unsigned int,unsigned long)
       EnableTop__9wxMenuBarFUiUl
-      ;wxMenu::DoAppend(wxMenuItem*)
-      DoAppend__6wxMenuFP10wxMenuItem
+      ;wxMenu::Attach(wxMenuBarBase*)
+      Attach__6wxMenuFP13wxMenuBarBase
       ;wxMenu::DoRemove(wxMenuItem*)
       DoRemove__6wxMenuFP10wxMenuItem
+      ;wxMenu::DoAppend(wxMenuItem*)
+      DoAppend__6wxMenuFP10wxMenuItem
       ;wxMenu::CopyAccels(wxAcceleratorEntry*) const
       CopyAccels__6wxMenuCFP18wxAcceleratorEntry
       ;wxMenuBar::Refresh()
@@ -12813,25 +13489,35 @@ EXPORTS
       GetRealId__10wxMenuItemCFv
       ;wxMenuItem::SetCheckable(unsigned long)
       SetCheckable__10wxMenuItemFUl
-      ;wxMenuItemBase::New(wxMenu*,int,const wxString&,const wxString&,unsigned long,wxMenu*)
-      New__14wxMenuItemBaseFP6wxMenuiRC8wxStringT3UlT1
+      ;wxMenuItem::SetRadioGroupEnd(int)
+      SetRadioGroupEnd__10wxMenuItemFi
       ;wxMenuItem::IsChecked() const
       IsChecked__10wxMenuItemCFv
+      ;wxMenuItem::SetAsRadioGroupStart()
+      SetAsRadioGroupStart__10wxMenuItemFv
       ;wxMenuItemBase::GetLabelFromText(const wxString&)
       GetLabelFromText__14wxMenuItemBaseFRC8wxString
       ;wxMenuItem::SetText(const wxString&)
       SetText__10wxMenuItemFRC8wxString
+      ;wxMenuItemBase::New(wxMenu*,int,const wxString&,const wxString&,wxItemKind,wxMenu*)
+      New__14wxMenuItemBaseFP6wxMenuiRC8wxStringT310wxItemKindT1
+      ;wxMenuItem::wxMenuItem(wxMenu*,int,const wxString&,const wxString&,wxItemKind,wxMenu*)
+      __ct__10wxMenuItemFP6wxMenuiRC8wxStringT310wxItemKindT1
       ;wxMenuItem::Check(unsigned long)
       Check__10wxMenuItemFUl
       __vft10wxMenuItem8wxObject
       ;wxMenuItem::wxMenuItem(wxMenu*,int,const wxString&,const wxString&,unsigned long,wxMenu*)
       __ct__10wxMenuItemFP6wxMenuiRC8wxStringT3UlT1
+      ;wxMenuItem::SetRadioGroupStart(int)
+      SetRadioGroupStart__10wxMenuItemFi
       ;wxConstructorForwxMenuItem()
       wxConstructorForwxMenuItem__Fv
       ;wxMenuItem::~wxMenuItem()
       __dt__10wxMenuItemFv
       ;wxMenuItem::Enable(unsigned long)
       Enable__10wxMenuItemFUl
+      ;wxMenuItem::Init()
+      Init__10wxMenuItemFv
       __vft10wxMenuItem12wxOwnerDrawn
   ;From object file:  ..\os2\metafile.cpp
     ;PUBDEFs (Symbols available from object file):
@@ -12931,12 +13617,10 @@ EXPORTS
       CreateWindowFromHWND__8wxWindowFP8wxWindowUl
   ;From object file:  ..\os2\notebook.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxNotebook::SetImageList(wxImageList*)
-      SetImageList__10wxNotebookFP11wxImageList
-      ;wxNotebookEvent::sm_classwxNotebookEvent
-      sm_classwxNotebookEvent__15wxNotebookEvent
       ;wxNotebook::OnSelChange(wxNotebookEvent&)
       OnSelChange__10wxNotebookFR15wxNotebookEvent
+      ;wxNotebookEvent::sm_classwxNotebookEvent
+      sm_classwxNotebookEvent__15wxNotebookEvent
       ;wxNotebook::wxNotebook()
       __ct__10wxNotebookFv
       ;wxNotebook::DeleteAllPages()
@@ -12970,10 +13654,12 @@ EXPORTS
       __ct__10wxNotebookFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxNotebook::sm_eventTableEntries
       sm_eventTableEntries__10wxNotebook
-      ;wxNotebook::OnSetFocus(wxFocusEvent&)
-      OnSetFocus__10wxNotebookFR12wxFocusEvent
+      ;wxNotebook::SetImageList(wxGenericImageList*)
+      SetImageList__10wxNotebookFP18wxGenericImageList
       ;wxNotebook::SetConstraintSizes(unsigned long)
       SetConstraintSizes__10wxNotebookFUl
+      ;wxNotebook::OnSetFocus(wxFocusEvent&)
+      OnSetFocus__10wxNotebookFR12wxFocusEvent
       ;wxNotebook::OnNavigationKey(wxNavigationKeyEvent&)
       OnNavigationKey__10wxNotebookFR20wxNavigationKeyEvent
       ;wxNotebook::GetPageText(int) const
@@ -13103,58 +13789,21 @@ EXPORTS
       __dt__12wxPenRefDataFv
       ;wxPen::SetColour(const wxColour&)
       SetColour__5wxPenFRC8wxColour
-  ;From object file:  ..\os2\pnghand.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxPNGReader::Create(int,int,int,int)
-      Create__11wxPNGReaderFiN31
-      ;wxCopyPalette(const wxPalette*)
-      wxCopyPalette__FPC9wxPalette
-      ;wxPNGFileHandler::SaveFile(wxBitmap*,const wxString&,int,const wxPalette*)
-      SaveFile__16wxPNGFileHandlerFP8wxBitmapRC8wxStringiPC9wxPalette
-      ;wxPNGReader::GetIndex(int,int)
-      GetIndex__11wxPNGReaderFiT1
-      ;wxPNGReader::~wxPNGReader()
-      __dt__11wxPNGReaderFv
-      ;wxPNGReader::ReadFile(char*)
-      ReadFile__11wxPNGReaderFPc
-      ;wxPNGReader::SetRGB(int,int,unsigned char,unsigned char,unsigned char)
-      SetRGB__11wxPNGReaderFiT1UcN23
-      ;wxPNGReader::SetPalette(int,rgb_color_struct*)
-      SetPalette__11wxPNGReaderFiP16rgb_color_struct
-      ;wxPNGReader::InstantiateBitmap(wxBitmap*)
-      InstantiateBitmap__11wxPNGReaderFP8wxBitmap
-      ;wxPNGReader::SetPalette(int,unsigned char*,unsigned char*,unsigned char*)
-      SetPalette__11wxPNGReaderFiPUcN22
-      ;wxConstructorForwxPNGFileHandler()
-      wxConstructorForwxPNGFileHandler__Fv
-      ;wxPNGReader::NullData()
-      NullData__11wxPNGReaderFv
-      ;wxPNGReader::SaveFile(char*)
-      SaveFile__11wxPNGReaderFPc
-      ;wxPNGReader::SetIndex(int,int,int)
-      SetIndex__11wxPNGReaderFiN21
-      ;wxPNGReader::SaveXPM(char*,char*)
-      SaveXPM__11wxPNGReaderFPcT1
-      ;wxPNGFileHandler::LoadFile(wxBitmap*,const wxString&,unsigned long,long,int,int)
-      LoadFile__16wxPNGFileHandlerFP8wxBitmapRC8wxStringUlliT5
-      __vft11wxPNGReader
-      ;ima_png_error(png_struct_def*,char*)
-      ima_png_error__FP14png_struct_defPc
-      ;wxPNGReader::wxPNGReader(char*)
-      __ct__11wxPNGReaderFPc
-      ;wxPNGReader::GetRGB(int,int,unsigned char*,unsigned char*,unsigned char*)
-      GetRGB__11wxPNGReaderFiT1PUcN23
-      __vft16wxPNGFileHandler8wxObject
-      ;wxPNGReader::SetPalette(wxPalette*)
-      SetPalette__11wxPNGReaderFP9wxPalette
-      ;wxPNGReader::wxPNGReader()
-      __ct__11wxPNGReaderFv
-      ;wxPNGFileHandler::sm_classwxPNGFileHandler
-      sm_classwxPNGFileHandler__16wxPNGFileHandler
-      ;wxPNGReader::GetBitmap()
-      GetBitmap__11wxPNGReaderFv
-      ;wxPNGReader::CreateMask()
-      CreateMask__11wxPNGReaderFv
+  ;From object file:  ..\os2\popupwin.cpp
+    ;PUBDEFs (Symbols available from object file):
+      __vft13wxPopupWindow8wxObject
+      ;wxPopupWindow::DoGetPosition(int*,int*) const
+      DoGetPosition__13wxPopupWindowCFPiT1
+      ;wxConstructorForwxPopupWindow()
+      wxConstructorForwxPopupWindow__Fv
+      ;wxPopupWindow::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__13wxPopupWindowCFlPUl
+      ;wxPopupWindow::Create(wxWindow*,int)
+      Create__13wxPopupWindowFP8wxWindowi
+      ;wxPopupWindow::OS2GetParent() const
+      OS2GetParent__13wxPopupWindowCFv
+      ;wxPopupWindow::sm_classwxPopupWindow
+      sm_classwxPopupWindow__13wxPopupWindow
   ;From object file:  ..\os2\print.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPrintPreview::Print(unsigned long)
@@ -13266,12 +13915,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
@@ -13283,10 +13938,14 @@ EXPORTS
       SetValue__13wxRadioButtonFUl
       ;wxRadioButton::GetValue() const
       GetValue__13wxRadioButtonCFv
+      ;wxRadioButton::OS2WindowProc(unsigned int,void*,void*)
+      OS2WindowProc__13wxRadioButtonFUiPvT2
   ;From object file:  ..\os2\region.cpp
     ;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++()
@@ -13299,6 +13958,8 @@ EXPORTS
       __ct__8wxRegionFRC7wxPointT1
       ;wxRegion::Contains(int,int) const
       Contains__8wxRegionCFiT1
+      ;wxRegion::CloneData(const wxObjectRefData*) const
+      CloneData__8wxRegionCFPC15wxObjectRefData
       ;wxRegionIterator::GetY() const
       GetY__16wxRegionIteratorCFv
       ;wxConstructorForwxRegion()
@@ -13344,6 +14005,8 @@ EXPORTS
       __ct__16wxRegionIteratorFRC8wxRegion
       ;wxRegionIterator::GetH() const
       GetH__16wxRegionIteratorCFv
+      ;wxRegion::CreateData() const
+      CreateData__8wxRegionCFv
       ;wxRegion::SetPS(unsigned long)
       SetPS__8wxRegionFUl
       __vft16wxRegionIterator8wxObject
@@ -13429,6 +14092,8 @@ EXPORTS
       GetPosition__8wxSliderCFPiT1
       ;wxSlider::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
       OnCtlColor__8wxSliderFUlT1UiT3PvT5
+      ;wxSlider::DoGetSize(int*,int*) const
+      DoGetSize__8wxSliderCFPiT1
       ;wxConstructorForwxSlider()
       wxConstructorForwxSlider__Fv
       ;wxSlider::wxSlider()
@@ -13598,8 +14263,11 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxStaticLine::sm_classwxStaticLine
       sm_classwxStaticLine__12wxStaticLine
+      ;wxStaticLine::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__12wxStaticLineCFlPUl
       ;wxConstructorForwxStaticLine()
       wxConstructorForwxStaticLine__Fv
+      __vft12wxStaticLine8wxObject
       ;wxStaticLine::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__12wxStaticLineFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
   ;From object file:  ..\os2\tabctrl.cpp
@@ -13771,19 +14439,25 @@ EXPORTS
       SetStyle__10wxTextCtrlFlT1RC10wxTextAttr
       ;wxTextCtrl::CanRedo() const
       CanRedo__10wxTextCtrlCFv
-      ;wxTextCtrl::SetEditable(unsigned long)
-      SetEditable__10wxTextCtrlFUl
+      ;wxTextCtrl::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__10wxTextCtrlCFlPUl
       ;wxTextCtrl::sm_classwxTextCtrl
       sm_classwxTextCtrl__10wxTextCtrl
       __vft10wxTextCtrl8wxObject
       ;wxTextCtrl::ShowPosition(long)
       ShowPosition__10wxTextCtrlFl
+      ;wxTextCtrl::SetWindowStyleFlag(long)
+      SetWindowStyleFlag__10wxTextCtrlFl
+      ;wxTextCtrl::SetEditable(unsigned long)
+      SetEditable__10wxTextCtrlFUl
       ;wxTextCtrl::OnUpdateCopy(wxUpdateUIEvent&)
       OnUpdateCopy__10wxTextCtrlFR15wxUpdateUIEvent
       ;wxTextCtrl::OnCut(wxCommandEvent&)
       OnCut__10wxTextCtrlFR14wxCommandEvent
       ;wxTextCtrl::OnCopy(wxCommandEvent&)
       OnCopy__10wxTextCtrlFR14wxCommandEvent
+      ;wxTextCtrl::EmulateKeyPress(const wxKeyEvent&)
+      EmulateKeyPress__10wxTextCtrlFRC10wxKeyEvent
       ;wxConstructorForwxTextCtrl()
       wxConstructorForwxTextCtrl__Fv
       ;wxTextCtrl::wxTextCtrl()
@@ -13814,6 +14488,8 @@ EXPORTS
       Cut__10wxTextCtrlFv
       ;wxTextCtrl::SetInsertionPointEnd()
       SetInsertionPointEnd__10wxTextCtrlFv
+      ;wxTextCtrl::OS2ShouldPreProcessMessage(void**)
+      OS2ShouldPreProcessMessage__10wxTextCtrlFPPv
       ;wxTextCtrl::DiscardEdits()
       DiscardEdits__10wxTextCtrlFv
       ;wxTextCtrl::CanUndo() const
@@ -13877,14 +14553,12 @@ EXPORTS
   ;From object file:  ..\os2\thread.cpp
     ;PUBDEFs (Symbols available from object file):
       p_wxMainMutex
-      ;wxCondition::Wait(unsigned long,unsigned long)
-      Wait__11wxConditionFUlT1
+      ;wxMutex::wxMutex(wxMutexType)
+      __ct__7wxMutexF11wxMutexType
       ;wxCriticalSection::Leave()
       Leave__17wxCriticalSectionFv
       ;wxMutex::~wxMutex()
       __dt__7wxMutexFv
-      ;wxMutex::wxMutex()
-      __ct__7wxMutexFv
       ;wxThread::Pause()
       Pause__8wxThreadFv
       ;wxThread::Kill()
@@ -13895,6 +14569,8 @@ EXPORTS
       GetId__8wxThreadCFv
       ;wxThread::Delete(void**)
       Delete__8wxThreadFPPv
+      ;wxCondition::wxCondition(wxMutex&)
+      __ct__11wxConditionFR7wxMutex
       ;wxThreadInternal::OS2ThreadStart(wxThread*)
       OS2ThreadStart__16wxThreadInternalFP8wxThread
       ;wxMutex::Lock()
@@ -13926,19 +14602,19 @@ EXPORTS
       wxGuiOwnedByMainThread__Fv
       ;wxCriticalSection::~wxCriticalSection()
       __dt__17wxCriticalSectionFv
-      ;wxCondition::wxCondition()
-      __ct__11wxConditionFv
       ;wxThread::Yield()
       Yield__8wxThreadFv
       ;wxMutex::TryLock()
       TryLock__7wxMutexFv
       ;wxThread::This()
       This__8wxThreadFv
-      ;wxThread::Sleep(unsigned long)
-      Sleep__8wxThreadFUl
+      ;wxCondition::WaitTimeout(unsigned long)
+      WaitTimeout__11wxConditionFUl
       __vft8wxThread
       ;wxThread::wxThread(wxThreadKind)
       __ct__8wxThreadF12wxThreadKind
+      ;wxThread::Sleep(unsigned long)
+      Sleep__8wxThreadFUl
       ;wxMutex::Unlock()
       Unlock__7wxMutexFv
       ;wxMutexGuiLeaveOrEnter()
@@ -13990,6 +14666,8 @@ EXPORTS
       wxTimerList
       ;wxTimer::Init()
       Init__7wxTimerFv
+      ;wxTimer::Notify()
+      Notify__7wxTimerFv
       ;wxTimer::Start(int,unsigned long)
       Start__7wxTimerFiUl
       ;wxTimer::~wxTimer()
@@ -14004,18 +14682,24 @@ EXPORTS
       CreateTool__9wxToolBarFP9wxControl
       ;wxToolBar::DoToggleTool(wxToolBarToolBase*,unsigned long)
       DoToggleTool__9wxToolBarFP17wxToolBarToolBaseUl
+      ;wxToolBar::DeleteToolByPos(unsigned int)
+      DeleteToolByPos__9wxToolBarFUi
+      ;wxToolBar::SpringUpButton(int)
+      SpringUpButton__9wxToolBarFi
       ;wxToolBar::Init()
       Init__9wxToolBarFv
       ;wxToolBar::sm_eventTable
       sm_eventTable__9wxToolBar
-      ;wxToolBar::GetToolSize() const
-      GetToolSize__9wxToolBarCFv
-      ;wxToolBar::CreateTool(int,const wxBitmap&,const wxBitmap&,unsigned long,wxObject*,const wxString&,const wxString&)
-      CreateTool__9wxToolBarFiRC8wxBitmapT2UlP8wxObjectRC8wxStringT6
       ;wxToolBar::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__9wxToolBarFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
-      ;wxToolBar::OS2Command(unsigned int,unsigned short)
-      OS2Command__9wxToolBarFUiUs
+      ;wxToolBar::InsertControl(unsigned int,wxControl*)
+      InsertControl__9wxToolBarFUiP9wxControl
+      ;wxToolBar::OnKillFocus(wxFocusEvent&)
+      OnKillFocus__9wxToolBarFR12wxFocusEvent
+      ;wxToolBar::LowerTool(wxToolBarToolBase*,unsigned long)
+      LowerTool__9wxToolBarFP17wxToolBarToolBaseUl
+      ;wxToolBar::InsertSeparator(unsigned int)
+      InsertSeparator__9wxToolBarFUi
       ;wxToolBar::DoInsertTool(unsigned int,wxToolBarToolBase*)
       DoInsertTool__9wxToolBarFUiP17wxToolBarToolBase
       ;wxToolBar::Realize()
@@ -14024,65 +14708,75 @@ EXPORTS
       sm_eventTableEntries__9wxToolBar
       ;wxToolBar::sm_classwxToolBar
       sm_classwxToolBar__9wxToolBar
+      ;wxToolBar::InsertTool(unsigned int,int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,const wxString&,const wxString&,wxObject*)
+      InsertTool__9wxToolBarFUiiRC8wxStringRC8wxBitmapT410wxItemKindN23P8wxObject
       __vft9wxToolBar8wxObject
-      ;wxToolBar::SetToolBitmapSize(const wxSize&)
-      SetToolBitmapSize__9wxToolBarFRC6wxSize
-      ;wxToolBar::DoEnableTool(wxToolBarToolBase*,unsigned long)
-      DoEnableTool__9wxToolBarFP17wxToolBarToolBaseUl
+      ;wxToolBar::RaiseTool(wxToolBarToolBase*,unsigned long)
+      RaiseTool__9wxToolBarFP17wxToolBarToolBaseUl
+      ;wxToolBar::OnPaint(wxPaintEvent&)
+      OnPaint__9wxToolBarFR12wxPaintEvent
+      ;wxToolBar::DeleteTool(int)
+      DeleteTool__9wxToolBarFi
+      ;wxToolBar::DrawTool(wxDC&,wxToolBarToolBase*)
+      DrawTool__9wxToolBarFR4wxDCP17wxToolBarToolBase
+      ;wxToolBar::OnSize(wxSizeEvent&)
+      OnSize__9wxToolBarFR11wxSizeEvent
+      ;wxToolBar::OnTimer(wxTimerEvent&)
+      OnTimer__9wxToolBarFR12wxTimerEvent
       ;wxToolBar::OnMouseEvent(wxMouseEvent&)
       OnMouseEvent__9wxToolBarFR12wxMouseEvent
       ;wxToolBar::DoSetToggle(wxToolBarToolBase*,unsigned long)
       DoSetToggle__9wxToolBarFP17wxToolBarToolBaseUl
-      ;wxToolBar::DoDeleteTool(unsigned int,wxToolBarToolBase*)
-      DoDeleteTool__9wxToolBarFUiP17wxToolBarToolBase
+      ;wxToolBar::DoEnableTool(wxToolBarToolBase*,unsigned long)
+      DoEnableTool__9wxToolBarFP17wxToolBarToolBaseUl
+      ;wxToolBar::DoAddTool(int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,const wxString&,const wxString&,wxObject*,int,int)
+      DoAddTool__9wxToolBarFiRC8wxStringRC8wxBitmapT310wxItemKindN22P8wxObjectN21
       ;wxToolBar::SetRows(int)
       SetRows__9wxToolBarFi
       ;wxToolBar::FindToolForPosition(int,int) const
       FindToolForPosition__9wxToolBarCFiT1
+      ;wxToolBar::DrawTool(wxToolBarToolBase*)
+      DrawTool__9wxToolBarFP17wxToolBarToolBase
+      ;wxToolBar::DoDeleteTool(unsigned int,wxToolBarToolBase*)
+      DoDeleteTool__9wxToolBarFUiP17wxToolBarToolBase
       ;wxToolBar::GetEventTable() const
       GetEventTable__9wxToolBarCFv
-      ;wxToolBar::OS2WindowProc(unsigned int,void*,void*)
-      OS2WindowProc__9wxToolBarFUiPvT2
-      ;wxToolBar::OnSysColourChanged(wxSysColourChangedEvent&)
-      OnSysColourChanged__9wxToolBarFR23wxSysColourChangedEvent
+      ;wxToolBar::CreateTool(int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,wxObject*,const wxString&,const wxString&)
+      CreateTool__9wxToolBarFiRC8wxStringRC8wxBitmapT310wxItemKindP8wxObjectN22
+      ;wxDisableBitmap(const wxBitmap&,long)
+      wxDisableBitmap__FRC8wxBitmapl
       ;wxConstructorForwxToolBar()
       wxConstructorForwxToolBar__Fv
+      ;wxToolBar::m_bInitialized
+      m_bInitialized__9wxToolBar
       ;wxToolBar::~wxToolBar()
       __dt__9wxToolBarFv
-      ;wxToolBar::UpdateSize()
-      UpdateSize__9wxToolBarFv
-      ;wxToolBar::OS2OnNotify(int,void*,void**)
-      OS2OnNotify__9wxToolBarFiPvPPv
   ;From object file:  ..\os2\tooltip.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxToolTip::wxToolTip(const wxString&)
       __ct__9wxToolTipFRC8wxString
-      ;wxToolTip::SetWindow(wxWindow*)
-      SetWindow__9wxToolTipFP8wxWindow
       __vft9wxToolTip8wxObject
-      ;wxToolTip::RelayEvent(void**)
-      RelayEvent__9wxToolTipFPPv
       ;wxToolTip::~wxToolTip()
       __dt__9wxToolTipFv
-      ;wxToolTip::Enable(unsigned long)
-      Enable__9wxToolTipFUl
-      ;wxToolTip::SetDelay(long)
-      SetDelay__9wxToolTipFl
+      ;wxToolTip::HideToolTipWindow()
+      HideToolTipWindow__9wxToolTipFv
       ;wxToolTip::SetTip(const wxString&)
       SetTip__9wxToolTipFRC8wxString
-      ;wxToolTip::GetToolTipCtrl()
-      GetToolTipCtrl__9wxToolTipFv
-      ;wxToolTip::Remove()
-      Remove__9wxToolTipFv
-      ;wxToolTip::hwndTT
-      hwndTT__9wxToolTip
+      ;wxToolTip::DisplayToolTipWindow(const wxPoint&)
+      DisplayToolTipWindow__9wxToolTipFRC7wxPoint
+      ;wxToolTip::Create(const wxString&)
+      Create__9wxToolTipFRC8wxString
   ;From object file:  ..\os2\toplevel.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxTopLevelWindowOS2::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__19wxTopLevelWindowOS2CFlPUl
       __vft19wxTopLevelWindowOS28wxObject
       ;wxTopLevelWindowOS2::CreateFrame(const wxString&,const wxPoint&,const wxSize&)
       CreateFrame__19wxTopLevelWindowOS2FRC8wxStringRC7wxPointRC6wxSize
       ;wxTopLevelWindowOS2::~wxTopLevelWindowOS2()
       __dt__19wxTopLevelWindowOS2Fv
+      ;wxTopLevelWindowOS2::sm_eventTableEntries
+      sm_eventTableEntries__19wxTopLevelWindowOS2
       ;wxTopLevelWindowOS2::ShowFullScreen(unsigned long,long)
       ShowFullScreen__19wxTopLevelWindowOS2FUll
       ;wxTopLevelWindowOS2::CreateDialog(unsigned long,const wxString&,const wxPoint&,const wxSize&)
@@ -14091,34 +14785,44 @@ EXPORTS
       DoShowWindow__19wxTopLevelWindowOS2Fi
       ;wxTopLevelWindowOS2::Init()
       Init__19wxTopLevelWindowOS2Fv
-      ;wxTopLevelWindowOS2::OS2GetCreateWindowFlags(long*) const
-      OS2GetCreateWindowFlags__19wxTopLevelWindowOS2CFPl
+      ;wxTopLevelWindowOS2::m_sbInitialized
+      m_sbInitialized__19wxTopLevelWindowOS2
+      ;wxTopLevelWindowOS2::OS2GetParent() const
+      OS2GetParent__19wxTopLevelWindowOS2CFv
+      ;wxTopLevelWindowOS2::GetEventTable() const
+      GetEventTable__19wxTopLevelWindowOS2CFv
       ;wxTopLevelWindowOS2::Iconize(unsigned long)
       Iconize__19wxTopLevelWindowOS2FUl
       ;wxTopLevelWindowOS2::DoSetClientSize(int,int)
       DoSetClientSize__19wxTopLevelWindowOS2FiT1
-      ;wxTopLevelWindowOS2::AlterChildPos()
-      AlterChildPos__19wxTopLevelWindowOS2Fv
+      ;wxTopLevelWindowOS2::IsMaximized() const
+      IsMaximized__19wxTopLevelWindowOS2CFv
+      ;wxTopLevelWindowOS2::m_spHiddenParent
+      m_spHiddenParent__19wxTopLevelWindowOS2
       ;wxTopLevelWindowOS2::SetIcon(const wxIcon&)
       SetIcon__19wxTopLevelWindowOS2FRC6wxIcon
       ;wxTopLevelWindowOS2::Restore()
       Restore__19wxTopLevelWindowOS2Fv
-      ;wxTopLevelWindowOS2::IsMaximized() const
-      IsMaximized__19wxTopLevelWindowOS2CFv
+      ;wxTopLevelWindowOS2::OnActivate(wxActivateEvent&)
+      OnActivate__19wxTopLevelWindowOS2FR15wxActivateEvent
       ;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::SetIcons(const wxIconBundle&)
+      SetIcons__19wxTopLevelWindowOS2FRC12wxIconBundle
       ;wxTopLevelWindowOS2::IsIconized() const
       IsIconized__19wxTopLevelWindowOS2CFv
+      ;wxTopLevelWindowOS2::sm_eventTable
+      sm_eventTable__19wxTopLevelWindowOS2
+      ;wxTopLevelWindowOS2::SendSizeEvent()
+      SendSizeEvent__19wxTopLevelWindowOS2Fv
       wxDlgProc
       wxModelessWindows
   ;From object file:  ..\os2\utils.cpp
@@ -14142,8 +14846,6 @@ EXPORTS
       wxColourDisplay__Fv
       ;wxCheckForInterrupt(wxWindow*)
       wxCheckForInterrupt__FP8wxWindow
-      ;wxDebugMsg(const char*,...)
-      wxDebugMsg__FPCce
       ;wxWriteResource(const wxString&,const wxString&,int,const wxString&)
       wxWriteResource__FRC8wxStringT1iT1
       ;wxGetResource(const wxString&,const wxString&,float*,const wxString&)
@@ -14152,6 +14854,8 @@ EXPORTS
       wxGetMousePosition__FPiT1
       ;wxDrawBorder(unsigned long,_RECTL&,unsigned long)
       wxDrawBorder__FUlR6_RECTLT1
+      ;wxShutdown(wxShutdownFlags)
+      wxShutdown__F15wxShutdownFlags
       ;wxPathExists(const wxString&)
       wxPathExists__FRC8wxString
       ;wxGetWindowText(unsigned long)
@@ -14162,8 +14866,6 @@ EXPORTS
       wxGetWindowClass__FUl
       ;wxGetUserId(char*,int)
       wxGetUserId__FPci
-      ;wxFatalError(const wxString&,const wxString&)
-      wxFatalError__FRC8wxStringT1
       ;wxDisplaySize(int*,int*)
       wxDisplaySize__FPiT1
       ;wxClientDisplayRect(int*,int*,int*,int*)
@@ -14185,8 +14887,6 @@ EXPORTS
       wxGetHostName__FPci
       ;wxGetResource(const wxString&,const wxString&,int*,const wxString&)
       wxGetResource__FRC8wxStringT1PiT1
-      ;wxError(const wxString&,const wxString&)
-      wxError__FRC8wxStringT1
       ;wxKill(long,wxSignal,wxKillError*)
       wxKill__Fl8wxSignalP11wxKillError
       ;wxBell()
@@ -14213,13 +14913,13 @@ EXPORTS
       wxGetEnv__FRC8wxStringP8wxString
   ;From object file:  ..\os2\utilsexc.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxExecute(char**,unsigned long,wxProcess*)
-      wxExecute__FPPcUlP9wxProcess
-      ;wxExecute(const wxString&,unsigned long,wxProcess*)
-      wxExecute__FRC8wxStringUlP9wxProcess
+      ;wxExecute(char**,int,wxProcess*)
+      wxExecute__FPPciP9wxProcess
       ;wxGetFullHostName(char*,int)
       wxGetFullHostName__FPci
       wxExecuteWindowCbk
+      ;wxExecute(const wxString&,int,wxProcess*)
+      wxExecute__FRC8wxStringiP9wxProcess
   ;From object file:  ..\os2\wave.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxWave::Create(const wxString&,unsigned long)
@@ -14247,6 +14947,8 @@ EXPORTS
       UnpackActivate__8wxWindowFPvT1PUsPUl
       ;wxWindow::SubclassWin(unsigned long)
       SubclassWin__8wxWindowFUl
+      ;wxWindow::SetWindowStyleFlag(long)
+      SetWindowStyleFlag__8wxWindowFl
       ;wxWindow::HandleInitDialog(unsigned long)
       HandleInitDialog__8wxWindowFUl
       ;wxWindow::HandleGetMinMaxInfo(_SWP*)
@@ -14255,20 +14957,26 @@ EXPORTS
       HandleEraseBkgnd__8wxWindowFUl
       ;wxWindow::HandleCreate(void*,unsigned long*)
       HandleCreate__8wxWindowFPvPUl
+      ;wxWindow::HandleChar(void*,void*,unsigned long)
+      HandleChar__8wxWindowFPvT1Ul
       ;wxWindow::DoGetPosition(int*,int*) const
       DoGetPosition__8wxWindowCFPiT1
       ;wxCharCodeOS2ToWX(int)
       wxCharCodeOS2ToWX__Fi
       ;wxWindow::HandleMouseMove(int,int,unsigned int)
       HandleMouseMove__8wxWindowFiT1Ui
-      ;wxWindow::Raise()
-      Raise__8wxWindowFv
+      ;wxWindow::SetFocusFromKbd()
+      SetFocusFromKbd__8wxWindowFv
       ;wxWindowCreationHook::~wxWindowCreationHook()
       __dt__20wxWindowCreationHookFv
       ;wxWindow::Update()
       Update__8wxWindowFv
       ;wxWindow::UnsubclassWin()
       UnsubclassWin__8wxWindowFv
+      ;wxWindow::Raise()
+      Raise__8wxWindowFv
+      ;wxWindow::OS2GetParent() const
+      OS2GetParent__8wxWindowCFv
       ;wxWindow::Lower()
       Lower__8wxWindowFv
       ;wxWindow::HandleMaximize()
@@ -14279,6 +14987,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*)
@@ -14315,22 +15025,14 @@ EXPORTS
       GetCapture__12wxWindowBaseFv
       ;wxWindow::SetFocus()
       SetFocus__8wxWindowFv
-      ;wxWindow::ReleaseMouse()
-      ReleaseMouse__8wxWindowFv
       ;wxWindow::OS2OnMeasureItem(int,void**)
       OS2OnMeasureItem__8wxWindowFiPPv
       ;wxWindow::OS2DestroyWindow()
       OS2DestroyWindow__8wxWindowFv
       ;wxWindow::IsMouseInWindow() const
       IsMouseInWindow__8wxWindowCFv
-      ;wxWindow::HandleKeyUp(unsigned long,void*)
-      HandleKeyUp__8wxWindowFUlPv
-      ;wxWindow::HandleKeyDown(unsigned short,void*)
-      HandleKeyDown__8wxWindowFUsPv
       ;wxWindow::Clear()
       Clear__8wxWindowFv
-      ;wxWindow::CaptureMouse()
-      CaptureMouse__8wxWindowFv
       ;wxRemoveHandleAssociation(wxWindow*)
       wxRemoveHandleAssociation__FP8wxWindow
       wxWndHook
@@ -14338,6 +15040,8 @@ EXPORTS
       Reparent__8wxWindowFP8wxWindow
       ;wxWindow::OS2GetCreateWindowCoords(const wxPoint&,const wxSize&,int&,int&,int&,int&) const
       OS2GetCreateWindowCoords__8wxWindowCFRC7wxPointRC6wxSizeRiN33
+      ;wxWindow::CreateKeyEvent(int,int,void*,void*) const
+      CreateKeyEvent__8wxWindowCFiT1PvT3
       ;wxWindow::Enable(unsigned long)
       Enable__8wxWindowFUl
       wxWinHandleList
@@ -14385,6 +15089,8 @@ EXPORTS
       GetEventTable__8wxWindowCFv
       ;wxWindow::GetClientAreaOrigin() const
       GetClientAreaOrigin__8wxWindowCFv
+      ;FindWindowForMouseEvent(wxWindow*,short*,short*)
+      FindWindowForMouseEvent__FP8wxWindowPsT2
       ;wxWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__8wxWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxAssociateWinWithHandle(unsigned long,wxWindow*)
@@ -14427,6 +15133,8 @@ EXPORTS
       HandleMove__8wxWindowFiT1
       ;wxWindow::HandleMouseEvent(unsigned int,int,int,unsigned int)
       HandleMouseEvent__8wxWindowFUiiT2T1
+      ;wxWindow::HandleKeyDown(void*,void*)
+      HandleKeyDown__8wxWindowFPvT1
       ;wxWindow::GetScrollRange(int) const
       GetScrollRange__8wxWindowCFi
       ;wxWindow::DoSetSize(int,int,int,int,int)
@@ -14447,6 +15155,8 @@ EXPORTS
       OS2WindowProc__8wxWindowFUiPvT2
       ;wxWindow::OS2TranslateMessage(void**)
       OS2TranslateMessage__8wxWindowFPPv
+      ;wxWindow::OS2ShouldPreProcessMessage(void**)
+      OS2ShouldPreProcessMessage__8wxWindowFPPv
       ;wxWindow::OS2DefWindowProc(unsigned int,void*,void*)
       OS2DefWindowProc__8wxWindowFUiPvT2
       ;wxWindow::HandleMinimize()
@@ -14457,8 +15167,6 @@ EXPORTS
       GetTitle__8wxWindowCFv
       ;wxWindow::GetCharHeight() const
       GetCharHeight__8wxWindowCFv
-      ;wxWindow::CreateKeyEvent(int,int,void*) const
-      CreateKeyEvent__8wxWindowCFiT1Pv
       ;wxWindow::OS2Command(unsigned int,unsigned short)
       OS2Command__8wxWindowFUiUs
       wxWndProc
@@ -14473,43 +15181,27 @@ EXPORTS
       ScrollWindow__8wxWindowFiT1PC6wxRect
       ;wxWindow::OnIdle(wxIdleEvent&)
       OnIdle__8wxWindowFR11wxIdleEvent
+      ;wxWindow::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__8wxWindowCFlPUl
       ;wxWindow::HandleActivate(int,unsigned long)
       HandleActivate__8wxWindowFiUl
       ;wxWindow::FindItemByHWND(unsigned long,unsigned long) const
       FindItemByHWND__8wxWindowCFUlT1
-      ;wxWindow::HandleChar(unsigned long,void*,unsigned long)
-      HandleChar__8wxWindowFUlPvT1
+      ;wxWindow::HandleKeyUp(void*,void*)
+      HandleKeyUp__8wxWindowFPvT1
       ;wxWindow::DoMoveWindow(int,int,int,int)
       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
       sm_eventTableEntries__8wxWindow
-  ;From object file:  ..\os2\xpmhand.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxXPMDataHandler::Create(wxBitmap*,void*,long,int,int,int)
-      Create__16wxXPMDataHandlerFP8wxBitmapPvliN24
-      __vft16wxXPMDataHandler8wxObject
-      ;wxConstructorForwxXPMFileHandler()
-      wxConstructorForwxXPMFileHandler__Fv
-      __vft16wxXPMFileHandler8wxObject
-      ;wxConstructorForwxXPMDataHandler()
-      wxConstructorForwxXPMDataHandler__Fv
-      ;wxXPMFileHandler::LoadFile(wxBitmap*,const wxString&,long,int,int)
-      LoadFile__16wxXPMFileHandlerFP8wxBitmapRC8wxStringliT4
-      ;wxXPMFileHandler::SaveFile(wxBitmap*,const wxString&,int,const wxPalette*)
-      SaveFile__16wxXPMFileHandlerFP8wxBitmapRC8wxStringiPC9wxPalette
-      ;wxXPMDataHandler::sm_classwxXPMDataHandler
-      sm_classwxXPMDataHandler__16wxXPMDataHandler
-      ;wxXPMFileHandler::sm_classwxXPMFileHandler
-      sm_classwxXPMFileHandler__16wxXPMFileHandler