Better placement of the AutoComplete listbox

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

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index e7c596211e0a7fd6f4caae3ad1c72015edcb21e3..67a5e1ad80274539f02f369d37dfe4fdfb38de04 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,41 +4,94 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
 CODE LOADONCALL
 
 EXPORTS

-;From library:  F:\DEV\WX2\WXWINDOWS\LIB\wx.lib
+;From library:  H:\DEV\WX2\WXWINDOWS\LIB\wx.lib

   ;From object file:  dummy.cpp
     ;PUBDEFs (Symbols available from object file):
       wxDummyChar
   ;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):
   ;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::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
       __vft9wxAppBase8wxObject
       ;wxAppBase::OnCmdLineHelp(wxCmdLineParser&)
       OnCmdLineHelp__9wxAppBaseFR15wxCmdLineParser
       ;wxTrap()
       wxTrap__Fv

-      ;wxAppBase::OnAssert(const char*,int,const char*)
-      OnAssert__9wxAppBaseFPCciT1
+      ;wxAppBase::OnRun()
+      OnRun__9wxAppBaseFv

       ;wxAppBase::OnExit()
       OnExit__9wxAppBaseFv
       ;wxAssertIsEqual(int,int)
       wxAssertIsEqual__FiT1
       ;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
       ;wxAppBase::wxAppBase()
       __ct__9wxAppBaseFv
       ;wxAppBase::OnInit()
       OnInit__9wxAppBaseFv

+      ;wxAppBase::CreateMessageOutput()
+      CreateMessageOutput__9wxAppBaseFv
+      ;wxOnAssert(const char*,int,const char*,const char*)
+      wxOnAssert__FPCciN21

       ;wxAppBase::~wxAppBase()
       __dt__9wxAppBaseFv
       ;wxAppBase::ProcessPendingEvents()
       ProcessPendingEvents__9wxAppBaseFv
       ;wxAppBase::OnCmdLineError(wxCmdLineParser&)
       OnCmdLineError__9wxAppBaseFR15wxCmdLineParser
       ;wxAppBase::~wxAppBase()
       __dt__9wxAppBaseFv
       ;wxAppBase::ProcessPendingEvents()
       ProcessPendingEvents__9wxAppBaseFv
       ;wxAppBase::OnCmdLineError(wxCmdLineParser&)
       OnCmdLineError__9wxAppBaseFR15wxCmdLineParser

+      ;wxAppBase::CreateLogTarget()
+      CreateLogTarget__9wxAppBaseFv

       ;wxAppBase::SetActive(unsigned long,wxWindow*)
       SetActive__9wxAppBaseFUlP8wxWindow
   ;From object file:  ..\common\choiccmn.cpp
       ;wxAppBase::SetActive(unsigned long,wxWindow*)
       SetActive__9wxAppBaseFUlP8wxWindow
   ;From object file:  ..\common\choiccmn.cpp


@@ -88,12 +141,10 @@ EXPORTS
       Index__13wxArrayParamsCFRC14wxCmdLineParamUl
       ;wxCmdLineParser::Found(const wxString&,long*) const
       Found__15wxCmdLineParserCFRC8wxStringPl
       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
       ;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**)
       ;wxCmdLineParser::Reset()
       Reset__15wxCmdLineParserFv
       ;wxCmdLineParser::SetCmdLine(int,char**)


@@ -110,12 +161,12 @@ EXPORTS
       FindOptionByLongName__19wxCmdLineParserDataFRC8wxString
       ;wxArrayOptions::Index(const wxCmdLineOption&,unsigned long) const
       Index__14wxArrayOptionsCFRC15wxCmdLineOptionUl
       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
       ;wxCmdLineParserData::wxCmdLineParserData()
       __ct__19wxCmdLineParserDataFv

+      ;wxCmdLineParser::AreLongOptionsEnabled()
+      AreLongOptionsEnabled__15wxCmdLineParserFv

       ;wxCmdLineParser::SetCmdLine(const wxString&)
       SetCmdLine__15wxCmdLineParserFRC8wxString
       ;wxArrayParams::wxArrayParams(const wxArrayParams&)
       ;wxCmdLineParser::SetCmdLine(const wxString&)
       SetCmdLine__15wxCmdLineParserFRC8wxString
       ;wxArrayParams::wxArrayParams(const wxArrayParams&)


@@ -126,36 +177,42 @@ EXPORTS
       SetArguments__19wxCmdLineParserDataFRC8wxString
       ;wxCmdLineParser::ConvertStringToArgs(const char*)
       ConvertStringToArgs__15wxCmdLineParserFPCc
       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::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
       ;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::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()
       __dt__15wxCmdLineParserFv
       ;wxArrayParams::~wxArrayParams()
       __dt__13wxArrayParamsFv
       ;wxCmdLineParser::Init()
       Init__15wxCmdLineParserFv
       ;wxCmdLineParser::~wxCmdLineParser()
       __dt__15wxCmdLineParserFv
       ;wxArrayParams::~wxArrayParams()
       __dt__13wxArrayParamsFv

+      ;wxCmdLineParser::GetUsageString()
+      GetUsageString__15wxCmdLineParserFv

       ;wxArrayParams::operator=(const wxArrayParams&)
       __as__13wxArrayParamsFRC13wxArrayParams
       ;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()
       ;wxCmdLineParser::AddOption(const wxString&,const wxString&,const wxString&,wxCmdLineParamType,int)
       AddOption__15wxCmdLineParserFRC8wxStringN2118wxCmdLineParamTypei
       ;wxArrayOptions::DoEmpty()


@@ -182,14 +239,16 @@ EXPORTS
       __ct__21wxPageSetupDialogDataFRC11wxPrintData
       ;wxPageSetupDialogData::operator=(const wxPageSetupDialogData&)
       __as__21wxPageSetupDialogDataFRC21wxPageSetupDialogData
       __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
       ;wxConstructorForwxPageSetupDialogData()
       wxConstructorForwxPageSetupDialogData__Fv
       ;wxPrintDialogData::~wxPrintDialogData()
       __dt__17wxPrintDialogDataFv
       ;wxColourData::wxColourData()
       __ct__12wxColourDataFv

+      ;wxPrintData::wxPrintData()
+      __ct__11wxPrintDataFv

       ;wxPageSetupDialogData::CalculatePaperSizeFromId()
       CalculatePaperSizeFromId__21wxPageSetupDialogDataFv
       ;wxPageSetupDialogData::CalculateIdFromPaperSize()
       ;wxPageSetupDialogData::CalculatePaperSizeFromId()
       CalculatePaperSizeFromId__21wxPageSetupDialogDataFv
       ;wxPageSetupDialogData::CalculateIdFromPaperSize()


@@ -222,31 +281,30 @@ EXPORTS
       __as__17wxPrintDialogDataFRC17wxPrintDialogData
       ;wxPrintDialogData::operator=(const wxPrintData&)
       __as__17wxPrintDialogDataFRC11wxPrintData
       __as__17wxPrintDialogDataFRC17wxPrintDialogData
       ;wxPrintDialogData::operator=(const wxPrintData&)
       __as__17wxPrintDialogDataFRC11wxPrintData

-      ;wxConstructorForwxFontData()
-      wxConstructorForwxFontData__Fv

       ;wxFontData::wxFontData()
       __ct__10wxFontDataFv
       ;wxFontData::wxFontData()
       __ct__10wxFontDataFv

-      __vft12wxColourData8wxObject
-      __vft17wxPrintDialogData8wxObject
+      ;wxConstructorForwxFontData()
+      wxConstructorForwxFontData__Fv

       __vft10wxFontData8wxObject
       __vft10wxFontData8wxObject

+      __vft17wxPrintDialogData8wxObject
+      __vft16wxFontDialogBase8wxObject
+      __vft12wxColourData8wxObject

       ;wxColourData::operator=(const wxColourData&)
       __as__12wxColourDataFRC12wxColourData
       ;wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData&)
       __ct__17wxPrintDialogDataFRC17wxPrintDialogData
       ;wxColourData::operator=(const wxColourData&)
       __as__12wxColourDataFRC12wxColourData
       ;wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData&)
       __ct__17wxPrintDialogDataFRC17wxPrintDialogData

+      ;wxPrintData::Ok() const
+      Ok__11wxPrintDataCFv

       ;wxConstructorForwxPrintData()
       wxConstructorForwxPrintData__Fv
       ;wxPageSetupDialogData::~wxPageSetupDialogData()
       __dt__21wxPageSetupDialogDataFv
       ;wxConstructorForwxPrintData()
       wxConstructorForwxPrintData__Fv
       ;wxPageSetupDialogData::~wxPageSetupDialogData()
       __dt__21wxPageSetupDialogDataFv

-      ;wxColourData::SetCustomColour(int,wxColour&)
-      SetCustomColour__12wxColourDataFiR8wxColour

       ;wxPrintData::operator=(const wxPrintData&)
       __as__11wxPrintDataFRC11wxPrintData
       ;wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData&)
       __ct__21wxPageSetupDialogDataFRC21wxPageSetupDialogData
       ;wxColourData::wxColourData(const wxColourData&)
       __ct__12wxColourDataFRC12wxColourData
       ;wxPrintData::operator=(const wxPrintData&)
       __as__11wxPrintDataFRC11wxPrintData
       ;wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData&)
       __ct__21wxPageSetupDialogDataFRC21wxPageSetupDialogData
       ;wxColourData::wxColourData(const wxColourData&)
       __ct__12wxColourDataFRC12wxColourData

-      ;wxPrintData::operator=(const wxPrintSetupData&)
-      __as__11wxPrintDataFRC16wxPrintSetupData

       ;wxPrintData::~wxPrintData()
       __dt__11wxPrintDataFv
       ;wxConstructorForwxPrintDialogData()
       ;wxPrintData::~wxPrintData()
       __dt__11wxPrintDataFv
       ;wxConstructorForwxPrintDialogData()


@@ -255,6 +313,8 @@ EXPORTS
       __ct__21wxPageSetupDialogDataFv
       ;wxPrintDialogData::wxPrintDialogData()
       __ct__17wxPrintDialogDataFv
       __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&)
   ;From object file:  ..\common\cmdproc.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCommandProcessor::UndoCommand(wxCommand&)


@@ -390,10 +450,12 @@ EXPORTS
       OnInit__20wxHelpProviderModuleFv
       ;wxContextHelpEvtHandler::ProcessEvent(wxEvent&)
       ProcessEvent__23wxContextHelpEvtHandlerFR7wxEvent
       OnInit__20wxHelpProviderModuleFv
       ;wxContextHelpEvtHandler::ProcessEvent(wxEvent&)
       ProcessEvent__23wxContextHelpEvtHandlerFR7wxEvent

-      ;wxSimpleHelpProvider::ShowHelp(wxWindowBase*)
-      ShowHelp__20wxSimpleHelpProviderFP12wxWindowBase
+      ;wxSimpleHelpProvider::RemoveHelp(wxWindowBase*)
+      RemoveHelp__20wxSimpleHelpProviderFP12wxWindowBase

       ;wxHelpProviderModule::sm_classwxHelpProviderModule
       sm_classwxHelpProviderModule__20wxHelpProviderModule
       ;wxHelpProviderModule::sm_classwxHelpProviderModule
       sm_classwxHelpProviderModule__20wxHelpProviderModule

+      ;wxSimpleHelpProvider::ShowHelp(wxWindowBase*)
+      ShowHelp__20wxSimpleHelpProviderFP12wxWindowBase

       ;wxContextHelpButton::sm_eventTableEntries
       sm_eventTableEntries__19wxContextHelpButton
       ;wxHelpProvider::AddHelp(int,const wxString&)
       ;wxContextHelpButton::sm_eventTableEntries
       sm_eventTableEntries__19wxContextHelpButton
       ;wxHelpProvider::AddHelp(int,const wxString&)


@@ -428,6 +490,8 @@ EXPORTS
       __vft23wxContextHelpEvtHandler8wxObject
       __vft20wxHelpProviderModule8wxObject
       __vft13wxContextHelp8wxObject
       __vft23wxContextHelpEvtHandler8wxObject
       __vft20wxHelpProviderModule8wxObject
       __vft13wxContextHelp8wxObject

+      ;wxHelpProvider::RemoveHelp(wxWindowBase*)
+      RemoveHelp__14wxHelpProviderFP12wxWindowBase

       ;wxContextHelpButton::GetEventTable() const
       GetEventTable__19wxContextHelpButtonCFv
       ;wxContextHelpButton::sm_classwxContextHelpButton
       ;wxContextHelpButton::GetEventTable() const
       GetEventTable__19wxContextHelpButtonCFv
       ;wxContextHelpButton::sm_classwxContextHelpButton


@@ -467,15 +531,19 @@ EXPORTS
       GetClientObject__15wxItemContainerCFi
       ;wxItemContainer::SetClientData(int,void*)
       SetClientData__15wxItemContainerFiPv
       GetClientObject__15wxItemContainerCFi
       ;wxItemContainer::SetClientData(int,void*)
       SetClientData__15wxItemContainerFiPv

+      __vft18wxControlWithItems8wxObject

       ;wxItemContainer::Append(const wxArrayString&)
       Append__15wxItemContainerFRC13wxArrayString
       ;wxItemContainer::~wxItemContainer()
       __dt__15wxItemContainerFv
       ;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
       ;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)
   ;From object file:  ..\common\datetime.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDateTime::wxDateTime(double)


@@ -500,8 +568,6 @@ EXPORTS
       Multiply__10wxDateSpanFi
       ;wxDateTime::IsWorkDay(wxDateTime::Country) const
       IsWorkDay__10wxDateTimeCFQ2_10wxDateTime7Country
       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
       ;wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags,const wxDateTime::TimeZone&) const
       GetWeekOfYear__10wxDateTimeCFQ2_10wxDateTime9WeekFlagsRCQ2_10wxDateTime8TimeZone
       ;wxDateTime::GetLastMonthDay(wxDateTime::Month,int) const


@@ -604,6 +670,8 @@ EXPORTS
       Set__10wxDateTimeFUsN31
       ;wxDateTime::SetToLastWeekDay(wxDateTime::WeekDay,wxDateTime::Month,int)
       SetToLastWeekDay__10wxDateTimeFQ2_10wxDateTime7WeekDayQ2_10wxDateTime5Monthi
       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
       ;wxDateTime::ParseFormat(const char*,const char*,const wxDateTime&)
       ParseFormat__10wxDateTimeFPCcT1RC10wxDateTime
       ;wxDateSpan::Multiply(int) const


@@ -628,8 +696,8 @@ EXPORTS
       DoGetHolidaysInRange__18wxDateTimeWorkDaysCFRC10wxDateTimeT1R15wxDateTimeArray
       ;wxDateTime::ConvertYearToBC(int)
       ConvertYearToBC__10wxDateTimeFi
       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)
       ;wxDateTime::Tm::AddMonths(int)
       AddMonths__Q2_10wxDateTime2TmFi
       ;wxDateTime::TimeZone::TimeZone(wxDateTime::TZ)


@@ -640,6 +708,8 @@ EXPORTS
       IsLeapYear__10wxDateTimeFiQ2_10wxDateTime8Calendar
       ;wxTimeSpan::IsEqualTo(const wxTimeSpan&) const
       IsEqualTo__10wxTimeSpanCFRC10wxTimeSpan
       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
       ;wxTimeSpan::GetWeeks() const
       GetWeeks__10wxTimeSpanCFv
       ;wxDateTime::GetTicks() const


@@ -667,8 +737,6 @@ EXPORTS
       SetToTheWeek__10wxDateTimeFUsQ2_10wxDateTime7WeekDay
       ;wxDateTime::SetToPrevWeekDay(wxDateTime::WeekDay)
       SetToPrevWeekDay__10wxDateTimeFQ2_10wxDateTime7WeekDay
       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
       ;wxDateTime::IsSameTime(const wxDateTime&) const
       IsSameTime__10wxDateTimeCFRC10wxDateTime
       ;wxDateTime::IsSameDate(const wxDateTime&) const


@@ -924,6 +992,8 @@ EXPORTS
       RemoveChild__12wxDialogBaseFP12wxWindowBase
       ;wxDialogBase::GetEventTable() const
       GetEventTable__12wxDialogBaseCFv
       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
   ;From object file:  ..\common\dobjcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDataObjectComposite::GetDataSize(const wxDataFormat&) const


@@ -1091,6 +1161,8 @@ EXPORTS
       OnNewDocument__10wxDocumentFv
       ;wxView::OnCreatePrintout()
       OnCreatePrintout__6wxViewFv
       OnNewDocument__10wxDocumentFv
       ;wxView::OnCreatePrintout()
       OnCreatePrintout__6wxViewFv

+      ;wxDocument::NotifyClosing()
+      NotifyClosing__10wxDocumentFv

       ;wxDocManager::GetNoHistoryFiles() const
       GetNoHistoryFiles__12wxDocManagerCFv
       ;wxFileHistory::AddFilesToMenu()
       ;wxDocManager::GetNoHistoryFiles() const
       GetNoHistoryFiles__12wxDocManagerCFv
       ;wxFileHistory::AddFilesToMenu()


@@ -1347,40 +1419,142 @@ EXPORTS
       wxDirSelectorPromptStr
   ;From object file:  ..\common\dynarray.cpp
     ;PUBDEFs (Symbols available from object file):
       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)
   ;From object file:  ..\common\dynlib.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxLibrary::wxLibrary(unsigned long)


@@ -1433,14 +1607,20 @@ EXPORTS
       ;wxEncodingConverter::wxEncodingConverter()
       __ct__19wxEncodingConverterFv
       CompareCharsetItems
       ;wxEncodingConverter::wxEncodingConverter()
       __ct__19wxEncodingConverterFv
       CompareCharsetItems

+      ;wxEncodingConverter::Convert(const char*,wchar_t*)
+      Convert__19wxEncodingConverterFPCcPw

       ;wxEncodingConverter::Init(wxFontEncoding,wxFontEncoding,int)
       Init__19wxEncodingConverterF14wxFontEncodingT1i
       ;wxEncodingConverter::Init(wxFontEncoding,wxFontEncoding,int)
       Init__19wxEncodingConverterF14wxFontEncodingT1i

+      ;wxEncodingConverter::Convert(const wchar_t*,char*)
+      Convert__19wxEncodingConverterFPCwPc

       ;wxEncodingConverter::Convert(const wxString&)
       Convert__19wxEncodingConverterFRC8wxString
       ;wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding,int)
       GetPlatformEquivalents__19wxEncodingConverterF14wxFontEncodingi
       ;wxEncodingConverter::Convert(const char*,char*)
       Convert__19wxEncodingConverterFPCcPc
       ;wxEncodingConverter::Convert(const wxString&)
       Convert__19wxEncodingConverterFRC8wxString
       ;wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding,int)
       GetPlatformEquivalents__19wxEncodingConverterF14wxFontEncodingi
       ;wxEncodingConverter::Convert(const char*,char*)
       Convert__19wxEncodingConverterFPCcPc

+      ;wxEncodingConverter::Convert(const wchar_t*,wchar_t*)
+      Convert__19wxEncodingConverterFPCwPw

   ;From object file:  ..\common\event.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSetCursorEvent::sm_classwxSetCursorEvent
   ;From object file:  ..\common\event.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSetCursorEvent::sm_classwxSetCursorEvent


@@ -1461,6 +1641,7 @@ EXPORTS
       sm_classwxCloseEvent__12wxCloseEvent
       ;wxCommandEvent::wxCommandEvent(int,int)
       __ct__14wxCommandEventFiT1
       sm_classwxCloseEvent__12wxCloseEvent
       ;wxCommandEvent::wxCommandEvent(int,int)
       __ct__14wxCommandEventFiT1

+      wxEVT_MENU_CLOSE

       wxEVT_MAXIMIZE
       wxEVT_ACTIVATE
       ;wxScrollWinEvent::wxScrollWinEvent(int,int,int)
       wxEVT_MAXIMIZE
       wxEVT_ACTIVATE
       ;wxScrollWinEvent::wxScrollWinEvent(int,int,int)


@@ -1473,7 +1654,7 @@ EXPORTS
       wxConstructorForwxNcPaintEvent__Fv
       wxEVT_SET_CURSOR
       wxEVT_SCROLLWIN_LINEDOWN
       wxConstructorForwxNcPaintEvent__Fv
       wxEVT_SET_CURSOR
       wxEVT_SCROLLWIN_LINEDOWN

-      wxEVT_MENU_CHAR
+      wxEVT_MENU_OPEN

       wxEVT_END_SESSION
       wxEVT_COMMAND_ENTER
       ;wxConstructorForwxShowEvent()
       wxEVT_END_SESSION
       wxEVT_COMMAND_ENTER
       ;wxConstructorForwxShowEvent()


@@ -1510,7 +1691,6 @@ EXPORTS
       wxEVT_SCROLLWIN_PAGEUP
       wxEVT_MOUSEWHEEL
       wxEVT_MIDDLE_UP
       wxEVT_SCROLLWIN_PAGEUP
       wxEVT_MOUSEWHEEL
       wxEVT_MIDDLE_UP

-      wxEVT_MENU_INIT

       wxEVT_HELP
       wxEVT_ERASE_BACKGROUND
       wxEVT_DETAILED_HELP
       wxEVT_HELP
       wxEVT_ERASE_BACKGROUND
       wxEVT_DETAILED_HELP


@@ -1564,6 +1744,8 @@ EXPORTS
       wxConstructorForwxSysColourChangedEvent__Fv
       ;wxConstructorForwxNavigationKeyEvent()
       wxConstructorForwxNavigationKeyEvent__Fv
       wxConstructorForwxSysColourChangedEvent__Fv
       ;wxConstructorForwxNavigationKeyEvent()
       wxConstructorForwxNavigationKeyEvent__Fv

+      ;wxConstructorForwxMouseCaptureChangedEvent()
+      wxConstructorForwxMouseCaptureChangedEvent__Fv

       ;wxConstructorForwxHelpEvent()
       wxConstructorForwxHelpEvent__Fv
       ;wxEvtHandler::~wxEvtHandler()
       ;wxConstructorForwxHelpEvent()
       wxConstructorForwxHelpEvent__Fv
       ;wxEvtHandler::~wxEvtHandler()


@@ -1636,9 +1818,10 @@ EXPORTS
       wxEVT_KILL_FOCUS
       wxEVT_COMMAND_RIGHT_DCLICK
       wxEVT_CLOSE_WINDOW
       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_LINEUP

+      wxEVT_SCROLL_ENDSCROLL

       wxEVT_PAINT
       wxEVT_NULL
       wxEVT_NC_RIGHT_UP
       wxEVT_PAINT
       wxEVT_NULL
       wxEVT_NC_RIGHT_UP


@@ -1665,6 +1848,8 @@ EXPORTS
       sm_classwxEraseEvent__12wxEraseEvent
       ;wxEvtHandler::SearchEventTable(wxEventTable&,wxEvent&)
       SearchEventTable__12wxEvtHandlerFR12wxEventTableR7wxEvent
       sm_classwxEraseEvent__12wxEraseEvent
       ;wxEvtHandler::SearchEventTable(wxEventTable&,wxEvent&)
       SearchEventTable__12wxEvtHandlerFR12wxEventTableR7wxEvent

+      ;wxEvtHandler::ProcessEvent(wxEvent&)
+      ProcessEvent__12wxEvtHandlerFR7wxEvent

       ;wxMouseEvent::wxMouseEvent(int)
       __ct__12wxMouseEventFi
       wxEVT_JOY_ZMOVE
       ;wxMouseEvent::wxMouseEvent(int)
       __ct__12wxMouseEventFi
       wxEVT_JOY_ZMOVE


@@ -1718,7 +1903,6 @@ EXPORTS
       ;wxEvent::wxEvent(const wxEvent&)
       __ct__7wxEventFRC7wxEvent
       wxEVT_RIGHT_UP
       ;wxEvent::wxEvent(const wxEvent&)
       __ct__7wxEventFRC7wxEvent
       wxEVT_RIGHT_UP

-      wxEVT_POPUP_MENU_INIT

       wxEVT_PALETTE_CHANGED
       wxEVT_NC_MIDDLE_UP
       wxEVT_MENU_HIGHLIGHT
       wxEVT_PALETTE_CHANGED
       wxEVT_NC_MIDDLE_UP
       wxEVT_MENU_HIGHLIGHT


@@ -1735,6 +1919,8 @@ EXPORTS
       sm_classwxScrollWinEvent__16wxScrollWinEvent
       ;wxNcPaintEvent::sm_classwxNcPaintEvent
       sm_classwxNcPaintEvent__14wxNcPaintEvent
       sm_classwxScrollWinEvent__16wxScrollWinEvent
       ;wxNcPaintEvent::sm_classwxNcPaintEvent
       sm_classwxNcPaintEvent__14wxNcPaintEvent

+      ;wxMouseCaptureChangedEvent::sm_classwxMouseCaptureChangedEvent
+      sm_classwxMouseCaptureChangedEvent__26wxMouseCaptureChangedEvent

       ;wxIdleEvent::sm_classwxIdleEvent
       sm_classwxIdleEvent__11wxIdleEvent
       ;wxDropFilesEvent::sm_classwxDropFilesEvent
       ;wxIdleEvent::sm_classwxIdleEvent
       sm_classwxIdleEvent__11wxIdleEvent
       ;wxDropFilesEvent::sm_classwxDropFilesEvent


@@ -1777,7 +1963,7 @@ EXPORTS
       wxEVT_NC_LEFT_DCLICK
       wxEVT_INIT_DIALOG
       wxEVT_COMMAND_SET_FOCUS
       wxEVT_NC_LEFT_DCLICK
       wxEVT_INIT_DIALOG
       wxEVT_COMMAND_SET_FOCUS

-  ;From object file:  F:\DEV\WX2\WXWINDOWS\src\common\extended.c
+  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\extended.c

     ;PUBDEFs (Symbols available from object file):
       ConvertToIeeeExtended
       ConvertFromIeeeExtended
     ;PUBDEFs (Symbols available from object file):
       ConvertToIeeeExtended
       ConvertFromIeeeExtended


@@ -2064,8 +2250,6 @@ EXPORTS
       Assign__10wxFileNameFRC8wxString12wxPathFormat
       ;wxFileName::SetPath(const wxString&,wxPathFormat)
       SetPath__10wxFileNameFRC8wxString12wxPathFormat
       Assign__10wxFileNameFRC8wxString12wxPathFormat
       ;wxFileName::SetPath(const wxString&,wxPathFormat)
       SetPath__10wxFileNameFRC8wxString12wxPathFormat

-      ;wxFileName::IsWild(wxPathFormat)
-      IsWild__10wxFileNameF12wxPathFormat

       ;wxFileName::GetTimes(wxDateTime*,wxDateTime*,wxDateTime*) const
       GetTimes__10wxFileNameCFP10wxDateTimeN21
       ;wxFileName::Clear()
       ;wxFileName::GetTimes(wxDateTime*,wxDateTime*,wxDateTime*) const
       GetTimes__10wxFileNameCFP10wxDateTimeN21
       ;wxFileName::Clear()


@@ -2080,12 +2264,12 @@ EXPORTS
       PrependDir__10wxFileNameFRC8wxString
       ;wxFileName::GetPathSeparators(wxPathFormat)
       GetPathSeparators__10wxFileNameF12wxPathFormat
       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::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&)
       ;wxFileName::Touch()
       Touch__10wxFileNameFv
       ;wxFileName::FileName(const wxString&)


@@ -2102,10 +2286,10 @@ EXPORTS
       Assign__10wxFileNameFRC8wxStringN3112wxPathFormat
       ;wxFileName::SameAs(const wxFileName&,wxPathFormat)
       SameAs__10wxFileNameFRC10wxFileName12wxPathFormat
       Assign__10wxFileNameFRC8wxStringN3112wxPathFormat
       ;wxFileName::SameAs(const wxFileName&,wxPathFormat)
       SameAs__10wxFileNameFRC10wxFileName12wxPathFormat

+      ;wxFileName::IsAbsolute(wxPathFormat) const
+      IsAbsolute__10wxFileNameCF12wxPathFormat

       ;wxFileName::GetVolumeSeparator(wxPathFormat)
       GetVolumeSeparator__10wxFileNameF12wxPathFormat
       ;wxFileName::GetVolumeSeparator(wxPathFormat)
       GetVolumeSeparator__10wxFileNameF12wxPathFormat

-      ;wxFileName::GetPath(unsigned long,wxPathFormat) const
-      GetPath__10wxFileNameCFUl12wxPathFormat

       ;wxFileName::RemoveDir(int)
       RemoveDir__10wxFileNameFi
       ;wxFileName::wxPathExists()
       ;wxFileName::RemoveDir(int)
       RemoveDir__10wxFileNameFi
       ;wxFileName::wxPathExists()


@@ -2122,12 +2306,12 @@ EXPORTS
       SplitPath__10wxFileNameFRC8wxStringP8wxStringN3212wxPathFormat
       ;wxFileName::Normalize(int,const wxString&,wxPathFormat)
       Normalize__10wxFileNameFiRC8wxString12wxPathFormat
       SplitPath__10wxFileNameFRC8wxStringP8wxStringN3212wxPathFormat
       ;wxFileName::Normalize(int,const wxString&,wxPathFormat)
       Normalize__10wxFileNameFiRC8wxString12wxPathFormat

-      ;wxFileName::Mkdir(int,unsigned long)
-      Mkdir__10wxFileNameFiUl

       ;wxFileName::MakeRelativeTo(const wxString&,wxPathFormat)
       MakeRelativeTo__10wxFileNameFRC8wxString12wxPathFormat
       ;wxFileName::AssignDir(const wxString&,wxPathFormat)
       AssignDir__10wxFileNameFRC8wxString12wxPathFormat
       ;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()
       ;wxFileName::SetTimes(const wxDateTime*,const wxDateTime*,const wxDateTime*)
       SetTimes__10wxFileNameFPC10wxDateTimeN21
       ;wxFileName::Rmdir()


@@ -2144,6 +2328,8 @@ EXPORTS
       SplitPath__10wxFileNameFRC8wxStringP8wxStringN2212wxPathFormat
       ;wxFileName::IsCaseSensitive(wxPathFormat)
       IsCaseSensitive__10wxFileNameF12wxPathFormat
       SplitPath__10wxFileNameFRC8wxStringP8wxStringN2212wxPathFormat
       ;wxFileName::IsCaseSensitive(wxPathFormat)
       IsCaseSensitive__10wxFileNameF12wxPathFormat

+      ;wxFileName::GetPath(int,wxPathFormat) const
+      GetPath__10wxFileNameCFi12wxPathFormat

       ;wxFileName::GetFormat(wxPathFormat)
       GetFormat__10wxFileNameF12wxPathFormat
       ;wxFileName::Assign(const wxFileName&)
       ;wxFileName::GetFormat(wxPathFormat)
       GetFormat__10wxFileNameF12wxPathFormat
       ;wxFileName::Assign(const wxFileName&)


@@ -2259,9 +2445,11 @@ EXPORTS
       FromUserString__16wxNativeFontInfoFRC8wxString
   ;From object file:  ..\common\fontmap.cpp
     ;PUBDEFs (Symbols available from object file):
       FromUserString__16wxNativeFontInfoFRC8wxString
   ;From object file:  ..\common\fontmap.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxConstructorForwxFontMapperModule()
+      wxConstructorForwxFontMapperModule__Fv
+      __vft12wxFontMapper

       ;wxFontMapper::GetConfig()
       GetConfig__12wxFontMapperFv
       ;wxFontMapper::GetConfig()
       GetConfig__12wxFontMapperFv

-      __vft12wxFontMapper

       ;wxFontMapper::GetConfigPath()
       GetConfigPath__12wxFontMapperFv
       ;wxFontMapper::RestorePath(const wxString&)
       ;wxFontMapper::GetConfigPath()
       GetConfigPath__12wxFontMapperFv
       ;wxFontMapper::RestorePath(const wxString&)


@@ -2272,13 +2460,20 @@ EXPORTS
       CharsetToEncoding__12wxFontMapperFRC8wxStringUl
       ;wxFontMapper::GetAltForEncoding(wxFontEncoding,wxFontEncoding*,const wxString&,unsigned long)
       GetAltForEncoding__12wxFontMapperF14wxFontEncodingP14wxFontEncodingRC8wxStringUl
       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
       ;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)
       ;wxFontMapper::GetDefaultConfigPath()
       GetDefaultConfigPath__12wxFontMapperFv
       ;wxFontMapper::GetEncodingDescription(wxFontEncoding)


@@ -2295,6 +2490,8 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxFrameBase::OnIdle(wxIdleEvent&)
       OnIdle__11wxFrameBaseFR11wxIdleEvent
     ;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*)
       ;wxFrameBase::DeleteAllBars()
       DeleteAllBars__11wxFrameBaseFv
       ;wxFrameBase::SetMenuBar(wxMenuBar*)


@@ -2321,6 +2518,8 @@ EXPORTS
       ProcessCommand__11wxFrameBaseFi
       ;wxFrameBase::SetStatusWidths(int,const int*)
       SetStatusWidths__11wxFrameBaseFiPCi
       ProcessCommand__11wxFrameBaseFi
       ;wxFrameBase::SetStatusWidths(int,const int*)
       SetStatusWidths__11wxFrameBaseFiPCi

+      ;wxFrameBase::PopStatusText(int)
+      PopStatusText__11wxFrameBaseFi

       ;wxFrameBase::wxFrameBase()
       __ct__11wxFrameBaseFv
       ;wxFrameBase::CreateToolBar(long,int,const wxString&)
       ;wxFrameBase::wxFrameBase()
       __ct__11wxFrameBaseFv
       ;wxFrameBase::CreateToolBar(long,int,const wxString&)


@@ -2335,6 +2534,8 @@ EXPORTS
       __dt__11wxFrameBaseFv
       ;wxFrameBase::AttachMenuBar(wxMenuBar*)
       AttachMenuBar__11wxFrameBaseFP9wxMenuBar
       __dt__11wxFrameBaseFv
       ;wxFrameBase::AttachMenuBar(wxMenuBar*)
       AttachMenuBar__11wxFrameBaseFP9wxMenuBar

+      ;wxFrameBase::DoGiveHelp(const wxString&,unsigned long)
+      DoGiveHelp__11wxFrameBaseFRC8wxStringUl

       __vft11wxFrameBase8wxObject
       ;wxFrameBase::SetStatusText(const wxString&,int)
       SetStatusText__11wxFrameBaseFRC8wxStringi
       __vft11wxFrameBase8wxObject
       ;wxFrameBase::SetStatusText(const wxString&,int)
       SetStatusText__11wxFrameBaseFRC8wxStringi


@@ -2711,6 +2912,8 @@ EXPORTS
       Put__11wxHashTableFlP8wxObject
       ;wxHashTable::Get(long) const
       Get__11wxHashTableCFl
       Put__11wxHashTableFlP8wxObject
       ;wxHashTable::Get(long) const
       Get__11wxHashTableCFl

+      ;wxStringHashTable::Delete(long) const
+      Delete__17wxStringHashTableCFl

       ;wxHashTable::DeleteContents(unsigned long)
       DeleteContents__11wxHashTableFUl
       ;wxHashTableLong::Create(unsigned int)
       ;wxHashTable::DeleteContents(unsigned long)
       DeleteContents__11wxHashTableFUl
       ;wxHashTableLong::Create(unsigned int)


@@ -2834,6 +3037,36 @@ EXPORTS
       GetContentType__6wxHTTPFv
       ;wxHTTP::Abort()
       Abort__6wxHTTPFv
       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()
   ;From object file:  ..\common\imagall.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxInitAllImageHandlers()


@@ -2928,6 +3161,8 @@ EXPORTS
       Copy__7wxImageCFv
       ;wxImage::GetOptionInt(const wxString&) const
       GetOptionInt__7wxImageCFRC8wxString
       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&)
       ;wxImage::SaveFile(wxOutputStream&,const wxString&) const
       SaveFile__7wxImageCFR14wxOutputStreamRC8wxString
       ;wxImage::FindHandlerMime(const wxString&)


@@ -2939,8 +3174,8 @@ EXPORTS
       GetImageCount__7wxImageFR13wxInputStreaml
       ;wxImage::FindFirstUnusedColour(unsigned char*,unsigned char*,unsigned char*,unsigned char,unsigned char,unsigned char) const
       FindFirstUnusedColour__7wxImageCFPUcN21UcN24
       GetImageCount__7wxImageFR13wxInputStreaml
       ;wxImage::FindFirstUnusedColour(unsigned char*,unsigned char*,unsigned char*,unsigned char,unsigned char,unsigned char) const
       FindFirstUnusedColour__7wxImageCFPUcN21UcN24

-      ;wxImage::Scale(int,int) const
-      Scale__7wxImageCFiT1
+      ;wxImageHandler::CallDoCanRead(wxInputStream&)
+      CallDoCanRead__14wxImageHandlerFR13wxInputStream

       ;wxImage::sm_handlers
       sm_handlers__7wxImage
       ;wxImage::wxImage(const wxImage&)
       ;wxImage::sm_handlers
       sm_handlers__7wxImage
       ;wxImage::wxImage(const wxImage&)


@@ -2949,6 +3184,8 @@ EXPORTS
       __ct__7wxImageFR13wxInputStreamRC8wxStringi
       ;wxImage::SetPalette(const wxPalette&)
       SetPalette__7wxImageFRC9wxPalette
       __ct__7wxImageFR13wxInputStreamRC8wxStringi
       ;wxImage::SetPalette(const wxPalette&)
       SetPalette__7wxImageFRC9wxPalette

+      ;wxImage::Scale(int,int) const
+      Scale__7wxImageCFiT1

       ;wxImage::LoadFile(const wxString&,long,int)
       LoadFile__7wxImageFRC8wxStringli
       ;wxImageHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       ;wxImage::LoadFile(const wxString&,long,int)
       LoadFile__7wxImageFRC8wxStringli
       ;wxImageHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)


@@ -3026,16 +3263,12 @@ EXPORTS
       SetData__7wxImageFPUciT2
       ;wxImage::GetMaskBlue() const
       GetMaskBlue__7wxImageCFv
       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::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)
       ;wxImage::CountColours(unsigned long) const
       CountColours__7wxImageCFUl
       ;wxImage::wxImage(const wxString&,long,int)


@@ -3064,6 +3297,10 @@ EXPORTS
       AddHandler__7wxImageFP14wxImageHandler
       ;wxImage::HasOption(const wxString&) const
       HasOption__7wxImageCFRC8wxString
       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)
   ;From object file:  ..\common\imaggif.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxGIFHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)


@@ -3233,48 +3470,50 @@ EXPORTS
       LoadFile__12wxXPMHandlerFP7wxImageR13wxInputStreamUli
   ;From object file:  ..\common\intl.cpp
     ;PUBDEFs (Symbols available from object file):
       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
       ;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::CreateLanguagesDB()
+      CreateLanguagesDB__8wxLocaleFv

       ;wxLocale::~wxLocale()
       __dt__8wxLocaleFv
       ;wxLocale::GetSystemLanguage()
       GetSystemLanguage__8wxLocaleFv
       ;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
       ;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
       ;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::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
       ;wxLocale::wxLocale()
       __ct__8wxLocaleFv

+      ;wxLanguageInfoArray::Insert(const wxLanguageInfo&,unsigned int,unsigned int)
+      Insert__19wxLanguageInfoArrayFRC14wxLanguageInfoUiT2
+      ;wxLocale::InitLanguagesDB()
+      InitLanguagesDB__8wxLocaleFv

       ;wxLocale::GetSystemEncodingName()
       GetSystemEncodingName__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)
       ;wxLocale::AddLanguage(const wxLanguageInfo&)
       AddLanguage__8wxLocaleFRC14wxLanguageInfo
       ;wxLocale::Init(const char*,const char*,const char*,unsigned long,unsigned long)


@@ -3283,12 +3522,16 @@ EXPORTS
       GetString__8wxLocaleCFPCcT1
       ;wxLocale::ms_languagesDB
       ms_languagesDB__8wxLocale
       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
       ;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
       ;wxLocale::DestroyLanguagesDB()
       DestroyLanguagesDB__8wxLocaleFv
       ;wxMsgCatalog::GetString(const char*) const


@@ -3299,14 +3542,10 @@ EXPORTS
       DoCopy__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
       ;wxLanguageInfoArray::operator=(const wxLanguageInfoArray&)
       __as__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
       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::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
   ;From object file:  ..\common\ipcbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxConnectionBase::sm_classwxConnectionBase


@@ -3491,12 +3730,16 @@ EXPORTS
       SetActiveTarget__5wxLogFP5wxLog
       ;wxLogWarning(const char*,...)
       wxLogWarning__FPCce
       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
       ;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
       ;wxVLogError(const char*,char*)
       ;wxLog::ClearTraceMasks()
       ClearTraceMasks__5wxLogFv
       ;wxVLogError(const char*,char*)


@@ -3540,14 +3783,16 @@ EXPORTS
       wxLogSysError__FlPCce
       ;wxLogStream::wxLogStream(ostream*)
       __ct__11wxLogStreamFP7ostream
       wxLogSysError__FlPCce
       ;wxLogStream::wxLogStream(ostream*)
       __ct__11wxLogStreamFP7ostream

+      ;wxLog::SetLogBuffer(char*,unsigned int)
+      SetLogBuffer__5wxLogFPcUi

       ;wxLogPassThrough::wxLogPassThrough()
       __ct__16wxLogPassThroughFv
       ;wxLogPassThrough::wxLogPassThrough()
       __ct__16wxLogPassThroughFv

-      ;wxVLogFatalError(const char*,char*)
-      wxVLogFatalError__FPCcPc
-      ;wxVLogSysError(const char*,char*)
-      wxVLogSysError__FPCcPc

       ;wxVLogInfo(const char*,char*)
       wxVLogInfo__FPCcPc
       ;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
       ;wxLog::ms_suspendCount
       ms_suspendCount__5wxLog
       ;wxLog::ms_bAutoCreate


@@ -3895,6 +4140,8 @@ EXPORTS
       SetHelpString__13wxMenuBarBaseFiRC8wxString
       ;wxMenuBase::Insert(unsigned int,wxMenuItem*)
       Insert__10wxMenuBaseFUiP10wxMenuItem
       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
       ;wxMenuBase::Remove(wxMenuItem*)
       Remove__10wxMenuBaseFP10wxMenuItem
       ;wxMenuBase::IsChecked(int) const


@@ -3988,8 +4235,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxFileType::GetIcon(wxIcon*,wxString*,int*) const
       GetIcon__10wxFileTypeCFP6wxIconP8wxStringPi
     ;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&)
       ;wxFileTypeInfo::wxFileTypeInfo(const wxArrayString&)
       __ct__14wxFileTypeInfoFRC13wxArrayString
       ;wxMimeTypesManager::Initialize(int,const wxString&)


@@ -4006,16 +4251,20 @@ EXPORTS
       __ct__14wxFileTypeInfoFPCcN31e
       ;wxFileType::SetDefaultIcon(const wxString&,int)
       SetDefaultIcon__10wxFileTypeFRC8wxStringi
       __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
       ;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::Unassociate(wxFileType*)
       Unassociate__18wxMimeTypesManagerFP10wxFileType

+      ;wxMimeTypesManager::IsOfType(const wxString&,const wxString&)
+      IsOfType__18wxMimeTypesManagerFRC8wxStringT1

       ;wxArrayFileTypeInfo::DoEmpty()
       DoEmpty__19wxArrayFileTypeInfoFv
       wxTheMimeTypesManager
       ;wxArrayFileTypeInfo::DoEmpty()
       DoEmpty__19wxArrayFileTypeInfoFv
       wxTheMimeTypesManager


@@ -4037,8 +4286,6 @@ EXPORTS
       SetCommand__10wxFileTypeFRC8wxStringT1Ul
       ;wxMimeTypesManager::ReadMailcap(const wxString&,unsigned long)
       ReadMailcap__18wxMimeTypesManagerFRC8wxStringUl
       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&)
       ;wxFileType::~wxFileType()
       __dt__10wxFileTypeFv
       ;wxFileType::GetExtensions(wxArrayString&)


@@ -4047,22 +4294,24 @@ EXPORTS
       GetMimeTypes__10wxFileTypeCFR13wxArrayString
       ;wxMimeTypesManager::AddFallbacks(const wxFileTypeInfo*)
       AddFallbacks__18wxMimeTypesManagerFPC14wxFileTypeInfo
       GetMimeTypes__10wxFileTypeCFR13wxArrayString
       ;wxMimeTypesManager::AddFallbacks(const wxFileTypeInfo*)
       AddFallbacks__18wxMimeTypesManagerFPC14wxFileTypeInfo

-      ;wxArrayFileTypeInfo::RemoveAt(unsigned int)
-      RemoveAt__19wxArrayFileTypeInfoFUi

       ;wxMimeTypeCmnModule::sm_classwxMimeTypeCmnModule
       sm_classwxMimeTypeCmnModule__19wxMimeTypeCmnModule
       ;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
       ;wxConstructorForwxMimeTypeCmnModule()
       wxConstructorForwxMimeTypeCmnModule__Fv
       ;wxMimeTypesManager::~wxMimeTypesManager()
       __dt__18wxMimeTypesManagerFv
       ;wxMimeTypesManager::wxMimeTypesManager()
       __ct__18wxMimeTypesManagerFv

+      ;wxFileType::Unassociate()
+      Unassociate__10wxFileTypeFv

       ;wxMimeTypesManager::ClearData()
       ClearData__18wxMimeTypesManagerFv
       ;wxArrayFileTypeInfo::operator=(const wxArrayFileTypeInfo&)
       __as__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo
       ;wxMimeTypesManager::ClearData()
       ClearData__18wxMimeTypesManagerFv
       ;wxArrayFileTypeInfo::operator=(const wxArrayFileTypeInfo&)
       __as__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo

+      ;wxFileType::GetOpenCommand(const wxString&) const
+      GetOpenCommand__10wxFileTypeCFRC8wxString

       ;wxFileType::GetOpenCommand(wxString*,const wxFileType::MessageParameters&) const
       GetOpenCommand__10wxFileTypeCFP8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxFileType::GetMimeType(wxString*) const
       ;wxFileType::GetOpenCommand(wxString*,const wxFileType::MessageParameters&) const
       GetOpenCommand__10wxFileTypeCFP8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxFileType::GetMimeType(wxString*) const


@@ -4090,6 +4339,23 @@ EXPORTS
       CleanUpModules__8wxModuleFv
       ;wxModule::RegisterModule(wxModule*)
       RegisterModule__8wxModuleFP8wxModule
       CleanUpModules__8wxModuleFv
       ;wxModule::RegisterModule(wxModule*)
       RegisterModule__8wxModuleFP8wxModule

+  ;From object file:  ..\common\msgout.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxMessageOutputMessageBox::Printf(const char*,...)
+      Printf__25wxMessageOutputMessageBoxFPCce
+      ;wxMessageOutput::Get()
+      Get__15wxMessageOutputFv
+      ;wxMessageOutput::ms_msgOut
+      ms_msgOut__15wxMessageOutput
+      ;wxMessageOutputLog::Printf(const char*,...)
+      Printf__18wxMessageOutputLogFPCce
+      ;wxMessageOutput::Set(wxMessageOutput*)
+      Set__15wxMessageOutputFP15wxMessageOutput
+      __vft25wxMessageOutputMessageBox15wxMessageOutput
+      __vft21wxMessageOutputStderr15wxMessageOutput
+      __vft18wxMessageOutputLog15wxMessageOutput
+      ;wxMessageOutputStderr::Printf(const char*,...)
+      Printf__21wxMessageOutputStderrFPCce

   ;From object file:  ..\common\mstream.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxMemoryOutputStream::CopyTo(void*,unsigned int) const
   ;From object file:  ..\common\mstream.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxMemoryOutputStream::CopyTo(void*,unsigned int) const


@@ -4150,6 +4416,10 @@ EXPORTS
       CreateRefData__8wxObjectCFv
       ;wxClassInfo::sm_classTable
       sm_classTable__11wxClassInfo
       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
       ;wxObject::CloneRefData(const wxObjectRefData*) const
       CloneRefData__8wxObjectCFPC15wxObjectRefData
       ;wxClassInfo::sm_first


@@ -4169,8 +4439,8 @@ EXPORTS
       FindClass__11wxClassInfoFPCc
       ;wxObject::sm_classwxObject
       sm_classwxObject__8wxObject
       FindClass__11wxClassInfoFPCc
       ;wxObject::sm_classwxObject
       sm_classwxObject__8wxObject

-      ;wxObject::operator new(unsigned int,char*,int)
-      __nw__8wxObjectFUiPci
+      ;wxClassInfo::~wxClassInfo()
+      __dt__11wxClassInfoFv

       ;wxClassInfo::InitializeClasses()
       InitializeClasses__11wxClassInfoFv
   ;From object file:  ..\common\odbc.cpp
       ;wxClassInfo::InitializeClasses()
       InitializeClasses__11wxClassInfoFv
   ;From object file:  ..\common\odbc.cpp


@@ -4227,6 +4497,57 @@ EXPORTS
       ;wxPrintPaperDatabase::AddPaperType(wxPaperSize,const wxString&,int,int)
       AddPaperType__20wxPrintPaperDatabaseF11wxPaperSizeRC8wxStringiT3
   ;From object file:  ..\common\popupcmn.cpp
       ;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&)
   ;From object file:  ..\common\prntbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPreviewControlBar::OnZoom(wxCommandEvent&)


@@ -4270,10 +4591,12 @@ EXPORTS
       SetZoom__18wxPrintPreviewBaseFi
       ;wxPrintout::GetPageInfo(int*,int*,int*,int*)
       GetPageInfo__10wxPrintoutFPiN31
       SetZoom__18wxPrintPreviewBaseFi
       ;wxPrintout::GetPageInfo(int*,int*,int*,int*)
       GetPageInfo__10wxPrintoutFPiN31

-      ;wxPrinterBase::~wxPrinterBase()
-      __dt__13wxPrinterBaseFv
+      ;wxPreviewControlBar::OnFirst()
+      OnFirst__19wxPreviewControlBarFv

       ;wxPreviewControlBar::sm_eventTable
       sm_eventTable__19wxPreviewControlBar
       ;wxPreviewControlBar::sm_eventTable
       sm_eventTable__19wxPreviewControlBar

+      ;wxPrinterBase::~wxPrinterBase()
+      __dt__13wxPrinterBaseFv

       ;wxPreviewFrame::CreateCanvas()
       CreateCanvas__14wxPreviewFrameFv
       ;wxPreviewControlBar::CreateButtons()
       ;wxPreviewFrame::CreateCanvas()
       CreateCanvas__14wxPreviewFrameFv
       ;wxPreviewControlBar::CreateButtons()


@@ -4304,6 +4627,8 @@ EXPORTS
       OnBeginDocument__10wxPrintoutFiT1
       ;wxPrintPreviewBase::Init(wxPrintout*,wxPrintout*)
       Init__18wxPrintPreviewBaseFP10wxPrintoutT1
       OnBeginDocument__10wxPrintoutFiT1
       ;wxPrintPreviewBase::Init(wxPrintout*,wxPrintout*)
       Init__18wxPrintPreviewBaseFP10wxPrintoutT1

+      ;wxPreviewControlBar::OnGoto()
+      OnGoto__19wxPreviewControlBarFv

       ;wxPrintout::~wxPrintout()
       __dt__10wxPrintoutFv
       ;wxPrintout::OnEndDocument()
       ;wxPrintout::~wxPrintout()
       __dt__10wxPrintoutFv
       ;wxPrintout::OnEndDocument()


@@ -4361,6 +4686,8 @@ EXPORTS
       __dt__14wxPreviewFrameFv
       ;wxPreviewControlBar::OnPrevious()
       OnPrevious__19wxPreviewControlBarFv
       __dt__14wxPreviewFrameFv
       ;wxPreviewControlBar::OnPrevious()
       OnPrevious__19wxPreviewControlBarFv

+      ;wxPreviewControlBar::OnLast()
+      OnLast__19wxPreviewControlBarFv

       ;wxPreviewControlBar::GetEventTable() const
       GetEventTable__19wxPreviewControlBarCFv
       ;wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase*,wxFrame*,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       ;wxPreviewControlBar::GetEventTable() const
       GetEventTable__19wxPreviewControlBarCFv
       ;wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase*,wxFrame*,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)


@@ -4375,14 +4702,20 @@ EXPORTS
       Exists__9wxProcessFi
       ;wxConstructorForwxProcess()
       wxConstructorForwxProcess__Fv
       Exists__9wxProcessFi
       ;wxConstructorForwxProcess()
       wxConstructorForwxProcess__Fv

-      ;wxProcess::Init(wxEvtHandler*,int,unsigned long)
-      Init__9wxProcessFP12wxEvtHandleriUl
-      __vft9wxProcess8wxObject

       ;wxProcess::Kill(int,wxSignal)
       Kill__9wxProcessFi8wxSignal
       ;wxProcess::Kill(int,wxSignal)
       Kill__9wxProcessFi8wxSignal

+      __vft9wxProcess8wxObject
+      ;wxProcess::Open(const wxString&,int)
+      Open__9wxProcessFRC8wxStringi
+      ;wxProcess::IsErrorAvailable() const
+      IsErrorAvailable__9wxProcessCFv

       wxEVT_END_PROCESS
       wxEVT_END_PROCESS

+      ;wxProcess::Init(wxEvtHandler*,int,int)
+      Init__9wxProcessFP12wxEvtHandleriT2

       ;wxProcess::~wxProcess()
       __dt__9wxProcessFv
       ;wxProcess::~wxProcess()
       __dt__9wxProcessFv

+      ;wxProcess::IsInputOpened() const
+      IsInputOpened__9wxProcessCFv

       ;wxConstructorForwxProcessEvent()
       wxConstructorForwxProcessEvent__Fv
       ;wxProcess::sm_classwxProcess
       ;wxConstructorForwxProcessEvent()
       wxConstructorForwxProcessEvent__Fv
       ;wxProcess::sm_classwxProcess


@@ -4393,6 +4726,8 @@ EXPORTS
       OnTerminate__9wxProcessFiT1
       ;wxProcess::Detach()
       Detach__9wxProcessFv
       OnTerminate__9wxProcessFiT1
       ;wxProcess::Detach()
       Detach__9wxProcessFv

+      ;wxProcess::IsInputAvailable() const
+      IsInputAvailable__9wxProcessCFv

   ;From object file:  ..\common\protocol.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxProtocol::wxProtocol()
   ;From object file:  ..\common\protocol.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxProtocol::wxProtocol()


@@ -4612,10 +4947,12 @@ EXPORTS
   ;From object file:  ..\common\sckaddr.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft13wxSockAddress8wxObject
   ;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::Hostname()
       Hostname__13wxIPV4addressFv

+      ;wxIPV4address::AnyAddress()
+      AnyAddress__13wxIPV4addressFv

       ;wxSockAddress::SetAddress(_GAddress*)
       SetAddress__13wxSockAddressFP9_GAddress
       ;wxSockAddress::operator=(const wxSockAddress&)
       ;wxSockAddress::SetAddress(_GAddress*)
       SetAddress__13wxSockAddressFP9_GAddress
       ;wxSockAddress::operator=(const wxSockAddress&)


@@ -4642,6 +4979,8 @@ EXPORTS
       __ct__13wxIPV4addressFv
       ;wxIPV4address::Service()
       Service__13wxIPV4addressFv
       __ct__13wxIPV4addressFv
       ;wxIPV4address::Service()
       Service__13wxIPV4addressFv

+      ;wxIPV4address::Clone() const
+      Clone__13wxIPV4addressCFv

       ;wxSockAddress::wxSockAddress(const wxSockAddress&)
       __ct__13wxSockAddressFRC13wxSockAddress
       __vft13wxIPV4address8wxObject
       ;wxSockAddress::wxSockAddress(const wxSockAddress&)
       __ct__13wxSockAddressFRC13wxSockAddress
       __vft13wxIPV4address8wxObject


@@ -4761,6 +5100,14 @@ EXPORTS
       __vft14wxSocketStream13wxInputStream12wxStreamBase
       ;wxSocketOutputStream::~wxSocketOutputStream()
       __dt__20wxSocketOutputStreamFv
       __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*)
   ;From object file:  ..\common\sizer.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSizerItem::wxSizerItem(int,int,int,int,int,wxObject*)


@@ -4804,6 +5151,8 @@ EXPORTS
       Fit__7wxSizerFP8wxWindow
       ;wxSizer::GetMinWindowSize(wxWindow*)
       GetMinWindowSize__7wxSizerFP8wxWindow
       Fit__7wxSizerFP8wxWindow
       ;wxSizer::GetMinWindowSize(wxWindow*)
       GetMinWindowSize__7wxSizerFP8wxWindow

+      ;wxSizer::FitInside(wxWindow*)
+      FitInside__7wxSizerFP8wxWindow

       ;wxSizer::Prepend(wxWindow*,int,int,int,wxObject*)
       Prepend__7wxSizerFP8wxWindowiN22P8wxObject
       __vft15wxFlexGridSizer8wxObject
       ;wxSizer::Prepend(wxWindow*,int,int,int,wxObject*)
       Prepend__7wxSizerFP8wxWindowiN22P8wxObject
       __vft15wxFlexGridSizer8wxObject


@@ -4871,10 +5220,12 @@ EXPORTS
       Add__7wxSizerFP7wxSizeriN22P8wxObject
       ;wxSizer::Prepend(int,int,int,int,int,wxObject*)
       Prepend__7wxSizerFiN41P8wxObject
       Add__7wxSizerFP7wxSizeriN22P8wxObject
       ;wxSizer::Prepend(int,int,int,int,int,wxObject*)
       Prepend__7wxSizerFiN41P8wxObject

-      ;wxFlexGridSizer::AddGrowableCol(unsigned int)
-      AddGrowableCol__15wxFlexGridSizerFUi
+      ;wxGridSizer::CalcRowsCols(int&,int&) const
+      CalcRowsCols__11wxGridSizerCFRiT1

       ;wxBoxSizer::wxBoxSizer(int)
       __ct__10wxBoxSizerFi
       ;wxBoxSizer::wxBoxSizer(int)
       __ct__10wxBoxSizerFi

+      ;wxFlexGridSizer::AddGrowableCol(unsigned int)
+      AddGrowableCol__15wxFlexGridSizerFUi

       ;wxSizerItem::IsSizer()
       IsSizer__11wxSizerItemFv
       ;wxNotebookSizer::sm_classwxNotebookSizer
       ;wxSizerItem::IsSizer()
       IsSizer__11wxSizerItemFv
       ;wxNotebookSizer::sm_classwxNotebookSizer


@@ -4890,6 +5241,10 @@ EXPORTS
       DoSetItemMinSize__7wxSizerFP7wxSizeriT2
       ;wxSizerItem::DeleteWindows()
       DeleteWindows__11wxSizerItemFv
       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
       ;wxSizerItem::wxSizerItem(wxWindow*,int,int,int,wxObject*)
       __ct__11wxSizerItemFP8wxWindowiN22P8wxObject
       __vft16wxStaticBoxSizer8wxObject


@@ -4914,8 +5269,12 @@ EXPORTS
       SetItemBounds__11wxGridSizerFP11wxSizerItemiN32
       ;wxGridSizer::CalcMin()
       CalcMin__11wxGridSizerFv
       SetItemBounds__11wxGridSizerFP11wxSizerItemiN32
       ;wxGridSizer::CalcMin()
       CalcMin__11wxGridSizerFv

+      ;wxSizer::VirtualFitSize(wxWindow*)
+      VirtualFitSize__7wxSizerFP8wxWindow

       ;wxNotebookSizer::wxNotebookSizer(wxNotebook*)
       __ct__15wxNotebookSizerFP10wxNotebook
       ;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)
   ;From object file:  ..\common\socket.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSocketBase::SetTimeout(long)


@@ -4946,6 +5305,8 @@ EXPORTS
       __dt__14wxSocketClientFv
       ;wxSocketBase::RestoreState()
       RestoreState__12wxSocketBaseFv
       __dt__14wxSocketClientFv
       ;wxSocketBase::RestoreState()
       RestoreState__12wxSocketBaseFv

+      ;wxSocketBase::IsInitialized()
+      IsInitialized__12wxSocketBaseFv

       ;wxSocketBase::Init()
       Init__12wxSocketBaseFv
       ;wxSocketBase::Discard()
       ;wxSocketBase::Init()
       Init__12wxSocketBaseFv
       ;wxSocketBase::Discard()


@@ -4965,6 +5326,8 @@ EXPORTS
       __vft12wxSocketBase8wxObject
       ;wxSocketBase::WaitForRead(long,long)
       WaitForRead__12wxSocketBaseFlT1
       __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)
       ;wxSocketBase::_Read(void*,unsigned int)
       _Read__12wxSocketBaseFPvUi
       ;wxSocketBase::Write(const void*,unsigned int)


@@ -4995,10 +5358,14 @@ EXPORTS
       Unread__12wxSocketBaseFPCvUi
       ;wxSocketBase::OnRequest(wxSocketNotify)
       OnRequest__12wxSocketBaseF14wxSocketNotify
       Unread__12wxSocketBaseFPCvUi
       ;wxSocketBase::OnRequest(wxSocketNotify)
       OnRequest__12wxSocketBaseF14wxSocketNotify

-      ;wxSocketBase::wxSocketBase()
-      __ct__12wxSocketBaseFv
+      ;wxSocketBase::Initialize()
+      Initialize__12wxSocketBaseFv

       ;wxConstructorForwxSocketModule()
       wxConstructorForwxSocketModule__Fv
       ;wxConstructorForwxSocketModule()
       wxConstructorForwxSocketModule__Fv

+      ;wxSocketBase::wxSocketBase()
+      __ct__12wxSocketBaseFv
+      ;wxSocketBase::Shutdown()
+      Shutdown__12wxSocketBaseFv

       ;wxSocketBase::GetPeer(wxSockAddress&) const
       GetPeer__12wxSocketBaseCFR13wxSockAddress
       ;wxSocketBase::Notify(unsigned long)
       ;wxSocketBase::GetPeer(wxSockAddress&) const
       GetPeer__12wxSocketBaseCFR13wxSockAddress
       ;wxSocketBase::Notify(unsigned long)


@@ -5025,30 +5392,89 @@ EXPORTS
       GetLocal__12wxSocketBaseCFR13wxSockAddress
   ;From object file:  ..\common\statbar.cpp
     ;PUBDEFs (Symbols available from object file):
       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::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::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::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::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
       ;wxConstructorForwxStatusBar()
       wxConstructorForwxStatusBar__Fv

+      __vft18wxwxListStringNode10wxNodeBase

   ;From object file:  ..\common\strconv.cpp
     ;PUBDEFs (Symbols available from object file):
   ;From object file:  ..\common\strconv.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxCSConv::wxCSConv(const wxCSConv&)
+      __ct__8wxCSConvFRC8wxCSConv
+      __vft8wxCSConv8wxMBConv
+      __vft12wxMBConvUTF78wxMBConv
+      ;wxMBConv::cMB2WC(const char*) const
+      cMB2WC__8wxMBConvCFPCc
+      ;wxCSConv::SetName(const char*)
+      SetName__8wxCSConvFPCc
+      ;wxMBConvUTF7::MB2WC(wchar_t*,const char*,unsigned int) const
+      MB2WC__12wxMBConvUTF7CFPwPCcUi
+      ;wxStrConvModule::sm_classwxStrConvModule
+      sm_classwxStrConvModule__15wxStrConvModule
+      ;wxMBConvUTF8::WC2MB(char*,const wchar_t*,unsigned int) const
+      WC2MB__12wxMBConvUTF8CFPcPCwUi
+      ;wxMBConvUTF8::MB2WC(wchar_t*,const char*,unsigned int) const
+      MB2WC__12wxMBConvUTF8CFPwPCcUi
+      __vft12wxMBConvUTF88wxMBConv

       wxConvCurrent
       wxConvCurrent

-      wxConvFile
+      ;wxMBConv::WC2MB(char*,const wchar_t*,unsigned int) const
+      WC2MB__8wxMBConvCFPcPCwUi
+      ;wxCSConv::Clear()
+      Clear__8wxCSConvFv
+      ;wxCSConv::~wxCSConv()
+      __dt__8wxCSConvFv
+      ;wxCSConv::operator=(const wxCSConv&)
+      __as__8wxCSConvFRC8wxCSConv
+      wxConvUTF7
+      wxConvLocal
+      wxConvUTF8
+      ;wxMBConvUTF7::WC2MB(char*,const wchar_t*,unsigned int) const
+      WC2MB__12wxMBConvUTF7CFPcPCwUi
+      ;wxCSConv::WC2MB(char*,const wchar_t*,unsigned int) const
+      WC2MB__8wxCSConvCFPcPCwUi
+      ;wxCSConv::MB2WC(wchar_t*,const char*,unsigned int) const
+      MB2WC__8wxCSConvCFPwPCcUi
+      ;wxCSConv::LoadNow()
+      LoadNow__8wxCSConvFv
+      ;wxCSConv::wxCSConv(const char*)
+      __ct__8wxCSConvFPCc

       wxConvLibc
       wxConvLibc

+      ;wxMBConv::MB2WC(wchar_t*,const char*,unsigned int) const
+      MB2WC__8wxMBConvCFPwPCcUi
+      ;wxConstructorForwxStrConvModule()
+      wxConstructorForwxStrConvModule__Fv
+      __vft8wxMBConv
+      ;wxMBConv::cWC2MB(const wchar_t*) const
+      cWC2MB__8wxMBConvCFPCw

   ;From object file:  ..\common\stream.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxStreamBuffer::SetBufferIO(void*,unsigned int,unsigned long)
   ;From object file:  ..\common\stream.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxStreamBuffer::SetBufferIO(void*,unsigned int,unsigned long)


@@ -5254,14 +5680,18 @@ EXPORTS
       find_first_of__8wxStringCFPCcUi
       ;operator+(const wxString&,const wxString&)
       __pl__FRC8wxStringT1
       find_first_of__8wxStringCFPCcUi
       ;operator+(const wxString&,const wxString&)
       __pl__FRC8wxStringT1

+      ;wxString::wxString(const wchar_t*,wxMBConv&,unsigned int)
+      __ct__8wxStringFPCwR8wxMBConvUi

       ;wxString::wxString(const void*,const void*)
       __ct__8wxStringFPCvT1
       ;wxArrayString::Sort(int(*)(const wxString&,const wxString&))
       Sort__13wxArrayStringFPFRC8wxStringT1_i
       ;wxArrayString::SetCount(unsigned int)
       SetCount__13wxArrayStringFUi
       ;wxString::wxString(const void*,const void*)
       __ct__8wxStringFPCvT1
       ;wxArrayString::Sort(int(*)(const wxString&,const wxString&))
       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)
       ;wxString::Format(const char*,...)
       Format__8wxStringFPCce
       ;wxString::Alloc(unsigned int)


@@ -5270,8 +5700,6 @@ EXPORTS
       IsAscii__8wxStringCFv
       ;wxString::IsWord() const
       IsWord__8wxStringCFv
       IsAscii__8wxStringCFv
       ;wxString::IsWord() const
       IsWord__8wxStringCFv

-      ;wxArrayString::Grow()
-      Grow__13wxArrayStringFv

       ;wxArrayString::DoSort()
       DoSort__13wxArrayStringFv
       ;operator+(char,const wxString&)
       ;wxArrayString::DoSort()
       DoSort__13wxArrayStringFv
       ;operator+(char,const wxString&)


@@ -5326,8 +5754,6 @@ EXPORTS
       AfterLast__8wxStringCFc
       ;wxString::find(char,unsigned int) const
       find__8wxStringCFcUi
       AfterLast__8wxStringCFc
       ;wxString::find(char,unsigned int) const
       find__8wxStringCFcUi

-      ;wxVsnprintf(char*,unsigned int,const char*,char*)
-      wxVsnprintf__FPcUiPCcT1

       ;wxString::rfind(const wxString&,unsigned int) const
       rfind__8wxStringCFRC8wxStringUi
       ;wxString::replace(unsigned int,unsigned int,const char*,unsigned int)
       ;wxString::rfind(const wxString&,unsigned int) const
       rfind__8wxStringCFRC8wxStringUi
       ;wxString::replace(unsigned int,unsigned int,const char*,unsigned int)


@@ -5342,14 +5768,14 @@ EXPORTS
       UngetWriteBuf__8wxStringFUi
       ;wxString::ToLong(long*,int) const
       ToLong__8wxStringCFPli
       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
       ;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::InitWith(const char*,unsigned int,unsigned int)
       InitWith__8wxStringFPCcUiT2
       wxStringCompareFunction


@@ -5369,14 +5795,14 @@ EXPORTS
       __pl__FRC8wxStringPCc
       ;wxArrayString::operator==(const wxArrayString&) const
       __eq__13wxArrayStringCFRC13wxArrayString
       __pl__FRC8wxStringPCc
       ;wxArrayString::operator==(const wxArrayString&) const
       __eq__13wxArrayStringCFRC13wxArrayString

+      ;wxString::operator=(const wchar_t*)
+      __as__8wxStringFPCw

       ;wxString::StartsWith(const char*,wxString*) const
       StartsWith__8wxStringCFPCcP8wxString
       ;wxArrayString::Remove(const char*)
       Remove__13wxArrayStringFPCc
       ;wxString::ConcatSelf(int,const char*)
       ConcatSelf__8wxStringFiPCc
       ;wxString::StartsWith(const char*,wxString*) const
       StartsWith__8wxStringCFPCcP8wxString
       ;wxArrayString::Remove(const char*)
       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*,...)
       ;wxString::erase(unsigned int,unsigned int)
       erase__8wxStringFUiT1
       ;wxString::sprintf(const char*,...)


@@ -5409,8 +5835,6 @@ EXPORTS
       ToDouble__8wxStringCFPd
       ;wxString::wxString(char,unsigned int)
       __ct__8wxStringFcUi
       ToDouble__8wxStringCFPd
       ;wxString::wxString(char,unsigned int)
       __ct__8wxStringFcUi

-      ;wxSnprintf(char*,unsigned int,const char*,...)
-      wxSnprintf__FPcUiPCce

       ;wxString::ToULong(unsigned long*,int) const
       ToULong__8wxStringCFPUli
       ;wxString::Right(unsigned int) const
       ;wxString::ToULong(unsigned long*,int) const
       ToULong__8wxStringCFPUli
       ;wxString::Right(unsigned int) const


@@ -5423,6 +5847,8 @@ EXPORTS
       __dt__13wxArrayStringFv
       ;wxString::Lower() const
       Lower__8wxStringCFv
       __dt__13wxArrayStringFv
       ;wxString::Lower() const
       Lower__8wxStringCFv

+      ;wxArrayString::Insert(const wxString&,unsigned int,unsigned int)
+      Insert__13wxArrayStringFRC8wxStringUiT2

       ;wxArrayString::Free()
       Free__13wxArrayStringFv
       ;wxArrayString::Clear()
       ;wxArrayString::Free()
       Free__13wxArrayStringFv
       ;wxArrayString::Clear()


@@ -5461,8 +5887,6 @@ EXPORTS
       __dt__17wxToolBarToolBaseFv
       ;wxToolBarBase::ClearTools()
       ClearTools__13wxToolBarBaseFv
       __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*)
       ;wxToolBarToolBase::Enable(unsigned long)
       Enable__17wxToolBarToolBaseFUl
       ;wxToolBarBase::SetToolClientData(int,wxObject*)


@@ -5481,14 +5905,18 @@ EXPORTS
       Toggle__17wxToolBarToolBaseFUl
       __vft17wxToolBarToolBase8wxObject
       __vft13wxToolBarBase8wxObject
       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::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::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&)
       ;wxToolBarToolBase::SetLongHelp(const wxString&)
       SetLongHelp__17wxToolBarToolBaseFRC8wxString
       ;wxToolBarBase::SetToolShortHelp(int,const wxString&)


@@ -5499,6 +5927,8 @@ EXPORTS
       OnIdle__13wxToolBarBaseFR11wxIdleEvent
       ;wxToolBarBase::AddControl(wxControl*)
       AddControl__13wxToolBarBaseFP9wxControl
       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
       ;wxToolBarBase::InsertSeparator(unsigned int)
       InsertSeparator__13wxToolBarBaseFUi
       ;wxToolBarBase::GetToolState(int) const


@@ -5517,14 +5947,14 @@ EXPORTS
       GetEventTable__13wxToolBarBaseCFv
       ;wxToolBarBase::DoToolbarUpdates()
       DoToolbarUpdates__13wxToolBarBaseFv
       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
       ;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
       ;wxToolBarBase::sm_eventTable
       sm_eventTable__13wxToolBarBase
       ;wxToolBarBase::sm_classwxToolBarBase


@@ -5611,6 +6041,8 @@ EXPORTS
       SaveFile__14wxTextCtrlBaseFRC8wxString
       ;wxTextCtrlBase::operator<<(const char)
       __ls__14wxTextCtrlBaseFCc
       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
       __vft14wxTextCtrlBase8wxObject
       ;wxTextAttr::Combine(const wxTextAttr&,const wxTextAttr&,const wxTextCtrlBase*)
       Combine__10wxTextAttrFRC10wxTextAttrT1PC14wxTextCtrlBase


@@ -5699,10 +6131,14 @@ EXPORTS
       __dt__20wxTopLevelWindowBaseFv
       ;wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__20wxTopLevelWindowBaseFR12wxCloseEvent
       __dt__20wxTopLevelWindowBaseFv
       ;wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__20wxTopLevelWindowBaseFR12wxCloseEvent

+      ;wxTopLevelWindowBase::IsLastBeforeExit() const
+      IsLastBeforeExit__20wxTopLevelWindowBaseCFv

       ;wxTopLevelWindowBase::DoScreenToClient(int*,int*) const
       DoScreenToClient__20wxTopLevelWindowBaseCFPiT1
       ;wxTopLevelWindowBase::Destroy()
       Destroy__20wxTopLevelWindowBaseFv
       ;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
       ;wxTopLevelWindow::sm_classwxTopLevelWindow
       sm_classwxTopLevelWindow__16wxTopLevelWindow
   ;From object file:  ..\common\treebase.cpp


@@ -5810,7 +6246,7 @@ EXPORTS
       Read32__17wxTextInputStreamFv
       ;wxTextInputStream::SkipIfEndOfLine(char)
       SkipIfEndOfLine__17wxTextInputStreamFc
       Read32__17wxTextInputStreamFv
       ;wxTextInputStream::SkipIfEndOfLine(char)
       SkipIfEndOfLine__17wxTextInputStreamFc

-  ;From object file:  F:\DEV\WX2\WXWINDOWS\src\common\unzip.c
+  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\unzip.c

     ;PUBDEFs (Symbols available from object file):
       unzReadCurrentFile
       unzGetCurrentFileInfo
     ;PUBDEFs (Symbols available from object file):
       unzReadCurrentFile
       unzGetCurrentFileInfo


@@ -6023,6 +6459,8 @@ EXPORTS
       __ct__15wxTextValidatorFlP8wxString
       ;wxTextValidator::Validate(wxWindow*)
       Validate__15wxTextValidatorFP8wxWindow
       __ct__15wxTextValidatorFlP8wxString
       ;wxTextValidator::Validate(wxWindow*)
       Validate__15wxTextValidatorFP8wxWindow

+      ;wxTextValidator::IsNotInCharExcludeList(const wxString&)
+      IsNotInCharExcludeList__15wxTextValidatorFRC8wxString

       ;wxConstructorForwxTextValidator()
       wxConstructorForwxTextValidator__Fv
       ;wxTextValidator::sm_eventTable
       ;wxConstructorForwxTextValidator()
       wxConstructorForwxTextValidator__Fv
       ;wxTextValidator::sm_eventTable


@@ -6032,6 +6470,8 @@ EXPORTS
       ;wxTextValidator::SetIncludeList(const wxStringList&)
       SetIncludeList__15wxTextValidatorFRC12wxStringList
       __vft15wxTextValidator8wxObject
       ;wxTextValidator::SetIncludeList(const wxStringList&)
       SetIncludeList__15wxTextValidatorFRC12wxStringList
       __vft15wxTextValidator8wxObject

+      ;wxTextValidator::IsInCharIncludeList(const wxString&)
+      IsInCharIncludeList__15wxTextValidatorFRC8wxString

       ;wxTextValidator::SetExcludeList(const wxStringList&)
       SetExcludeList__15wxTextValidatorFRC12wxStringList
       ;wxTextValidator::OnChar(wxKeyEvent&)
       ;wxTextValidator::SetExcludeList(const wxStringList&)
       SetExcludeList__15wxTextValidatorFRC12wxStringList
       ;wxTextValidator::OnChar(wxKeyEvent&)


@@ -6272,6 +6712,8 @@ EXPORTS
       sm_classwxVariantDataChar__17wxVariantDataChar
       ;wxVariant::operator==(void*) const
       __eq__9wxVariantCFPv
       sm_classwxVariantDataChar__17wxVariantDataChar
       ;wxVariant::operator==(void*) const
       __eq__9wxVariantCFPv

+      ;wxVariant::NullList()
+      NullList__9wxVariantFv

       ;wxVariant::GetList() const
       GetList__9wxVariantCFv
       ;wxVariant::GetCount() const
       ;wxVariant::GetList() const
       GetList__9wxVariantCFv
       ;wxVariant::GetCount() const


@@ -6653,6 +7095,10 @@ EXPORTS
       SetToolTip__12wxWindowBaseFRC8wxString
       ;wxWindowBase::ConvertPixelsToDialog(const wxPoint&)
       ConvertPixelsToDialog__12wxWindowBaseFRC7wxPoint
       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
       ;wxWindowBase::FindWindow(long)
       FindWindow__12wxWindowBaseFl
       ;wxWindowBase::IsExposed(int,int) const


@@ -6662,6 +7108,8 @@ EXPORTS
       ;wxWindowBase::sm_classwxWindowBase
       sm_classwxWindowBase__12wxWindowBase
       __vft16wxWindowListNode10wxNodeBase
       ;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)
       ;wxWindowBase::SetSizeHints(int,int,int,int,int,int)
       SetSizeHints__12wxWindowBaseFiN51
       ;wxWindowBase::MoveConstraint(int,int)


@@ -6670,6 +7118,8 @@ EXPORTS
       LayoutPhase1__12wxWindowBaseFPi
       ;wxWindowBase::GetPositionConstraint(int*,int*) const
       GetPositionConstraint__12wxWindowBaseCFPiT1
       LayoutPhase1__12wxWindowBaseFPi
       ;wxWindowBase::GetPositionConstraint(int*,int*) const
       GetPositionConstraint__12wxWindowBaseCFPiT1

+      ;wxWindowBase::AdjustForParentClientOrigin(int&,int&,int) const
+      AdjustForParentClientOrigin__12wxWindowBaseCFRiT1i

       ;wxWindowBase::TransferDataToWindow()
       TransferDataToWindow__12wxWindowBaseFv
       ;wxWindowBase::ReleaseMouse()
       ;wxWindowBase::TransferDataToWindow()
       TransferDataToWindow__12wxWindowBaseFv
       ;wxWindowBase::ReleaseMouse()


@@ -6696,16 +7146,14 @@ EXPORTS
       SetSizeConstraint__12wxWindowBaseFiN31
       ;wxWindowBase::GetClientSizeConstraint(int*,int*) const
       GetClientSizeConstraint__12wxWindowBaseCFPiT1
       SetSizeConstraint__12wxWindowBaseFiN31
       ;wxWindowBase::GetClientSizeConstraint(int*,int*) const
       GetClientSizeConstraint__12wxWindowBaseCFPiT1

+      ;wxWindowBase::DoSetVirtualSize(int,int)
+      DoSetVirtualSize__12wxWindowBaseFiT1

       ;wxWindowBase::DoHitTest(int,int) const
       DoHitTest__12wxWindowBaseCFiT1
       ;wxWindowBase::DoHitTest(int,int) const
       DoHitTest__12wxWindowBaseCFiT1

-      ;wxWindowBase::AdjustForParentClientOrigin(int&,int&,int)
-      AdjustForParentClientOrigin__12wxWindowBaseFRiT1i

       ;wxWindowBase::DoGetBestSize() const
       DoGetBestSize__12wxWindowBaseCFv
       ;wxWindowBase::TransferDataFromWindow()
       TransferDataFromWindow__12wxWindowBaseFv
       ;wxWindowBase::DoGetBestSize() const
       DoGetBestSize__12wxWindowBaseCFv
       ;wxWindowBase::TransferDataFromWindow()
       TransferDataFromWindow__12wxWindowBaseFv

-      ;wxWindowBase::SetSizer(wxSizer*)
-      SetSizer__12wxWindowBaseFP7wxSizer

       ;wxWindowBase::IsTopLevel() const
       IsTopLevel__12wxWindowBaseCFv
       ;wxWindowBase::GetUpdateClientRect() const
       ;wxWindowBase::IsTopLevel() const
       IsTopLevel__12wxWindowBaseCFv
       ;wxWindowBase::GetUpdateClientRect() const


@@ -6714,6 +7162,12 @@ EXPORTS
       GetHelpText__12wxWindowBaseCFv
       ;wxWindowBase::GetAncestorWithCustomPalette() const
       GetAncestorWithCustomPalette__12wxWindowBaseCFv
       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)
       ;wxWindowBase::SetFont(const wxFont&)
       SetFont__12wxWindowBaseFRC6wxFont
       ;wxWindowBase::MakeModal(unsigned long)


@@ -6730,6 +7184,8 @@ EXPORTS
       InitBase__12wxWindowBaseFv
       ;wxWindowBase::SetCursor(const wxCursor&)
       SetCursor__12wxWindowBaseFRC8wxCursor
       InitBase__12wxWindowBaseFv
       ;wxWindowBase::SetCursor(const wxCursor&)
       SetCursor__12wxWindowBaseFRC8wxCursor

+      ;wxWindowBase::SatisfyConstraints()
+      SatisfyConstraints__12wxWindowBaseFv

       ;wxWindowBase::ResetConstraints()
       ResetConstraints__12wxWindowBaseFv
       ;wxWindowBase::GetDefaultBorder() const
       ;wxWindowBase::ResetConstraints()
       ResetConstraints__12wxWindowBaseFv
       ;wxWindowBase::GetDefaultBorder() const


@@ -6740,16 +7196,27 @@ EXPORTS
       GetBorder__12wxWindowBaseCFv
       ;wxWindowBase::Fit()
       Fit__12wxWindowBaseFv
       GetBorder__12wxWindowBaseCFv
       ;wxWindowBase::Fit()
       Fit__12wxWindowBaseFv

+      ;wxWindowBase::DoGetVirtualSize() const
+      DoGetVirtualSize__12wxWindowBaseCFv

       ;wxWindowBase::DeleteRelatedConstraints()
       DeleteRelatedConstraints__12wxWindowBaseFv
       ;wxWindowBase::SetHelpText(const wxString&)
       SetHelpText__12wxWindowBaseFRC8wxString
       ;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):
   ;From object file:  ..\common\wxchar.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxVsnprintf_(char*,unsigned int,const char*,char*)
+      wxVsnprintf___FPcUiPCcT1
+      wcslen
+      ;wxMB2WC(wchar_t*,const char*,unsigned int)
+      wxMB2WC__FPwPCcUi
+      ;wxSnprintf_(char*,unsigned int,const char*,...)
+      wxSnprintf___FPcUiPCce
+      ;wxWC2MB(char*,const wchar_t*,unsigned int)
+      wxWC2MB__FPcPCwUi

       ;wxOKlibc()
       wxOKlibc__Fv
       ;wxOKlibc()
       wxOKlibc__Fv

-      ;wcslen(const wchar_t*)
-      wcslen__FPCw

   ;From object file:  ..\common\wxexpr.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxExpr::GetAttributeValue(const wxString&,long&) const
   ;From object file:  ..\common\wxexpr.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxExpr::GetAttributeValue(const wxString&,long&) const


@@ -7026,8 +7493,8 @@ EXPORTS
       GetEventTable__14wxYearSpinCtrlCFv
       ;wxCalendarCtrl::GetDateCoord(const wxDateTime&,int*,int*) const
       GetDateCoord__14wxCalendarCtrlCFRC10wxDateTimePiT2
       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
       wxEVT_CALENDAR_DAY_CHANGED
       ;wxYearSpinCtrl::sm_eventTable
       sm_eventTable__14wxYearSpinCtrl


@@ -7040,8 +7507,6 @@ EXPORTS
       ;wxCalendarCtrl::sm_classwxCalendarCtrl
       sm_classwxCalendarCtrl__14wxCalendarCtrl
       __vft14wxCalendarCtrl8wxObject
       ;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*)
       ;wxCalendarCtrl::IsDateInRange(const wxDateTime&) const
       IsDateInRange__14wxCalendarCtrlCFRC10wxDateTime
       ;wxCalendarCtrl::HitTest(const wxPoint&,wxDateTime*,wxDateTime::WeekDay*)


@@ -7070,10 +7535,12 @@ EXPORTS
       __vft15wxMonthComboBox15wxItemContainer
       ;wxCalendarCtrl::GetStartDate() const
       GetStartDate__14wxCalendarCtrlCFv
       __vft15wxMonthComboBox15wxItemContainer
       ;wxCalendarCtrl::GetStartDate() const
       GetStartDate__14wxCalendarCtrlCFv

-      ;wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl*)
-      __ct__15wxMonthComboBoxFP14wxCalendarCtrl
+      ;wxCalendarCtrl::OnYearChange(wxCommandEvent&)
+      OnYearChange__14wxCalendarCtrlFR14wxCommandEvent

       ;wxMonthComboBox::sm_eventTable
       sm_eventTable__15wxMonthComboBox
       ;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*)
       ;wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl*)
       __ct__14wxYearSpinCtrlFP14wxCalendarCtrl
       ;wxCalendarCtrl::HighlightRange(wxPaintDC*,const wxDateTime&,const wxDateTime&,wxPen*,wxBrush*)


@@ -7094,6 +7561,8 @@ EXPORTS
       GetEventTable__14wxCalendarCtrlCFv
       ;wxCalendarCtrl::GetMonthControl() const
       GetMonthControl__14wxCalendarCtrlCFv
       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()
   ;From object file:  ..\generic\caret.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCaret::Blink()


@@ -7235,43 +7704,42 @@ EXPORTS
       CalculateMeasurements__21wxGenericColourDialogFv
       ;wxGenericColourDialog::sm_classwxGenericColourDialog
       sm_classwxGenericColourDialog__21wxGenericColourDialog
       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):
   ;From object file:  ..\generic\dcpsg.cpp
     ;PUBDEFs (Symbols available from object file):

-      __vft23wxPostScriptPrintDialog8wxObject

       ;wxPostScriptDC::wxPostScriptDC(const wxPrintData&)
       __ct__14wxPostScriptDCFRC11wxPrintData
       ;wxPostScriptDC::wxPostScriptDC(const wxPrintData&)
       __ct__14wxPostScriptDCFRC11wxPrintData

-      ;wxGetPrinterScaling(double*,double*)
-      wxGetPrinterScaling__FPdT1
-      ;wxPostScriptPrintDialog::wxPostScriptPrintDialog(wxWindow*,const wxString&,const wxPoint&,const wxSize&,int)
-      __ct__23wxPostScriptPrintDialogFP8wxWindowRC8wxStringRC7wxPointRC6wxSizei

       ;wxPostScriptDC::DoDrawPoint(int,int)
       DoDrawPoint__14wxPostScriptDCFiT1
       ;wxPostScriptDC::DoDrawLines(int,wxPoint*,int,int)
       DoDrawLines__14wxPostScriptDCFiP7wxPointN21
       ;wxPostScriptDC::DoDrawEllipse(int,int,int,int)
       DoDrawEllipse__14wxPostScriptDCFiN31
       ;wxPostScriptDC::DoDrawPoint(int,int)
       DoDrawPoint__14wxPostScriptDCFiT1
       ;wxPostScriptDC::DoDrawLines(int,wxPoint*,int,int)
       DoDrawLines__14wxPostScriptDCFiP7wxPointN21
       ;wxPostScriptDC::DoDrawEllipse(int,int,int,int)
       DoDrawEllipse__14wxPostScriptDCFiN31

-      ;wxPostScriptPrintDialog::ShowModal()
-      ShowModal__23wxPostScriptPrintDialogFv
-      ;wxGetPrinterCommand()
-      wxGetPrinterCommand__Fv
-      ;wxGetPrintPreviewCommand()
-      wxGetPrintPreviewCommand__Fv
-      ;wxPrintSetupData::~wxPrintSetupData()
-      __dt__16wxPrintSetupDataFv

       ;wxPostScriptDC::StartPage()
       StartPage__14wxPostScriptDCFv
       ;wxPostScriptDC::StartPage()
       StartPage__14wxPostScriptDCFv

-      ;wxPostScriptModule::OnInit()
-      OnInit__18wxPostScriptModuleFv

       ;wxPostScriptDC::GetCharHeight() const
       GetCharHeight__14wxPostScriptDCCFv
       ;wxPostScriptDC::EndPage()
       EndPage__14wxPostScriptDCFv
       ;wxPostScriptDC::GetCharHeight() const
       GetCharHeight__14wxPostScriptDCCFv
       ;wxPostScriptDC::EndPage()
       EndPage__14wxPostScriptDCFv

-      ;wxPostScriptDC::Create(const wxString&,unsigned long,wxWindow*)
-      Create__14wxPostScriptDCFRC8wxStringUlP8wxWindow
-      ;wxSetPrinterFile(const wxString&)
-      wxSetPrinterFile__FRC8wxString
-      ;wxSetAFMPath(const wxString&)
-      wxSetAFMPath__FRC8wxString

       ;wxPostScriptDC::DoDrawRotatedText(const wxString&,int,int,double)
       DoDrawRotatedText__14wxPostScriptDCFRC8wxStringiT2d
       __vft14wxPostScriptDC8wxObject
       ;wxPostScriptDC::DoDrawRotatedText(const wxString&,int,int,double)
       DoDrawRotatedText__14wxPostScriptDCFRC8wxStringiT2d
       __vft14wxPostScriptDC8wxObject


@@ -7281,17 +7749,6 @@ EXPORTS
       DoDrawSpline__14wxPostScriptDCFP6wxList
       ;wxPostScriptDC::DoSetClippingRegion(int,int,int,int)
       DoSetClippingRegion__14wxPostScriptDCFiN31
       DoDrawSpline__14wxPostScriptDCFP6wxList
       ;wxPostScriptDC::DoSetClippingRegion(int,int,int,int)
       DoSetClippingRegion__14wxPostScriptDCFiN31

-      wxThePrintSetupData
-      ;wxSetPrinterMode(int)
-      wxSetPrinterMode__Fi
-      ;wxGetPrinterTranslation(int*,int*)
-      wxGetPrinterTranslation__FPiT1
-      ;wxPrintSetupData::sm_classwxPrintSetupData
-      sm_classwxPrintSetupData__16wxPrintSetupData
-      ;wxPrintSetupData::operator=(const wxPrintData&)
-      __as__16wxPrintSetupDataFRC11wxPrintData
-      ;wxPrintSetupData::operator=(wxPrintSetupData&)
-      __as__16wxPrintSetupDataFR16wxPrintSetupData

       ;wxPostScriptDC::SetLogicalFunction(int)
       SetLogicalFunction__14wxPostScriptDCFi
       ;wxPostScriptDC::DoGetSizeMM(int*,int*) const
       ;wxPostScriptDC::SetLogicalFunction(int)
       SetLogicalFunction__14wxPostScriptDCFi
       ;wxPostScriptDC::DoGetSizeMM(int*,int*) const


@@ -7302,21 +7759,10 @@ EXPORTS
       DoDrawLine__14wxPostScriptDCFiN31
       ;wxPostScriptDC::DoGetPixel(int,int,wxColour*) const
       DoGetPixel__14wxPostScriptDCCFiT1P8wxColour
       DoDrawLine__14wxPostScriptDCFiN31
       ;wxPostScriptDC::DoGetPixel(int,int,wxColour*) const
       DoGetPixel__14wxPostScriptDCCFiT1P8wxColour

-      ;wxConstructorForwxPostScriptModule()
-      wxConstructorForwxPostScriptModule__Fv
-      ;wxPostScriptDC::wxPostScriptDC(const wxString&,unsigned long,wxWindow*)
-      __ct__14wxPostScriptDCFRC8wxStringUlP8wxWindow

       ;wxPostScriptDC::DoDrawRoundedRectangle(int,int,int,int,double)
       DoDrawRoundedRectangle__14wxPostScriptDCFiN31d
       ;wxPostScriptDC::DoDrawRoundedRectangle(int,int,int,int,double)
       DoDrawRoundedRectangle__14wxPostScriptDCFiN31d

-      ;wxInitializePrintSetupData(unsigned long)
-      wxInitializePrintSetupData__FUl
-      __vft18wxPostScriptModule8wxObject

       ;wxPostScriptDC::SetResolution(int)
       SetResolution__14wxPostScriptDCFi
       ;wxPostScriptDC::SetResolution(int)
       SetResolution__14wxPostScriptDCFi

-      ;wxSetPrinterScaling(double,double)
-      wxSetPrinterScaling__FdT1
-      ;wxPostScriptModule::sm_classwxPostScriptModule
-      sm_classwxPostScriptModule__18wxPostScriptModule

       ;wxPostScriptDC::SetDeviceOrigin(int,int)
       SetDeviceOrigin__14wxPostScriptDCFiT1
       ;wxPostScriptDC::SetAxisOrientation(unsigned long,unsigned long)
       ;wxPostScriptDC::SetDeviceOrigin(int,int)
       SetDeviceOrigin__14wxPostScriptDCFiT1
       ;wxPostScriptDC::SetAxisOrientation(unsigned long,unsigned long)


@@ -7327,20 +7773,12 @@ EXPORTS
       DoDrawPolygon__14wxPostScriptDCFiP7wxPointN31
       ;wxPostScriptDC::DoDrawEllipticArc(int,int,int,int,double,double)
       DoDrawEllipticArc__14wxPostScriptDCFiN31dT5
       DoDrawPolygon__14wxPostScriptDCFiP7wxPointN31
       ;wxPostScriptDC::DoDrawEllipticArc(int,int,int,int,double,double)
       DoDrawEllipticArc__14wxPostScriptDCFiN31dT5

-      ;wxPostScriptDC::GetResolution()
-      GetResolution__14wxPostScriptDCFv
-      ;wxGetPrinterFile()
-      wxGetPrinterFile__Fv

       ;wxConstructorForwxPostScriptDC()
       wxConstructorForwxPostScriptDC__Fv
       ;wxPostScriptDC::wxPostScriptDC()
       __ct__14wxPostScriptDCFv
       ;wxConstructorForwxPostScriptDC()
       wxConstructorForwxPostScriptDC__Fv
       ;wxPostScriptDC::wxPostScriptDC()
       __ct__14wxPostScriptDCFv

-      ;wxPostScriptModule::OnExit()
-      OnExit__18wxPostScriptModuleFv
-      ;wxPostScriptDC::PrinterDialog(wxWindow*)
-      PrinterDialog__14wxPostScriptDCFP8wxWindow
-      ;wxSetPrinterOptions(const wxString&)
-      wxSetPrinterOptions__FRC8wxString
+      ;wxPostScriptDC::GetResolution()
+      GetResolution__14wxPostScriptDCFv

       ;wxPostScriptDC::DoDrawBitmap(const wxBitmap&,int,int,unsigned long)
       DoDrawBitmap__14wxPostScriptDCFRC8wxBitmapiT2Ul
       ;wxPostScriptDC::SetBackground(const wxBrush&)
       ;wxPostScriptDC::DoDrawBitmap(const wxBitmap&,int,int,unsigned long)
       DoDrawBitmap__14wxPostScriptDCFRC8wxBitmapiT2Ul
       ;wxPostScriptDC::SetBackground(const wxBrush&)


@@ -7353,14 +7791,6 @@ EXPORTS
       DoBlit__14wxPostScriptDCFiN31P4wxDCN31UlN21
       ;wxPostScriptDC::~wxPostScriptDC()
       __dt__14wxPostScriptDCFv
       DoBlit__14wxPostScriptDCFiN31P4wxDCN31UlN21
       ;wxPostScriptDC::~wxPostScriptDC()
       __dt__14wxPostScriptDCFv

-      ;wxGetPrinterOptions()
-      wxGetPrinterOptions__Fv
-      ;wxGetPrinterMode()
-      wxGetPrinterMode__Fv
-      ;wxGetAFMPath()
-      wxGetAFMPath__Fv
-      ;wxConstructorForwxPrintSetupData()
-      wxConstructorForwxPrintSetupData__Fv

       ;wxPostScriptDC::Ok() const
       Ok__14wxPostScriptDCCFv
       ;wxPostScriptDC::GetPPI() const
       ;wxPostScriptDC::Ok() const
       Ok__14wxPostScriptDCCFv
       ;wxPostScriptDC::GetPPI() const


@@ -7373,31 +7803,16 @@ EXPORTS
       Clear__14wxPostScriptDCFv
       ;wxPostScriptDC::StartDoc(const wxString&)
       StartDoc__14wxPostScriptDCFRC8wxString
       Clear__14wxPostScriptDCFv
       ;wxPostScriptDC::StartDoc(const wxString&)
       StartDoc__14wxPostScriptDCFRC8wxString

-      ;wxSetPrinterCommand(const wxString&)
-      wxSetPrinterCommand__FRC8wxString
-      ;wxSetPrintPreviewCommand(const wxString&)
-      wxSetPrintPreviewCommand__FRC8wxString
-      ;wxPostScriptPrintDialog::sm_classwxPostScriptPrintDialog
-      sm_classwxPostScriptPrintDialog__23wxPostScriptPrintDialog

       ;wxPostScriptDC::sm_classwxPostScriptDC
       sm_classwxPostScriptDC__14wxPostScriptDC
       ;wxPostScriptDC::SetFont(const wxFont&)
       SetFont__14wxPostScriptDCFRC6wxFont
       ;wxPostScriptDC::sm_classwxPostScriptDC
       sm_classwxPostScriptDC__14wxPostScriptDC
       ;wxPostScriptDC::SetFont(const wxFont&)
       SetFont__14wxPostScriptDCFRC6wxFont

-      __vft16wxPrintSetupData8wxObject

       ;wxPostScriptDC::SetBrush(const wxBrush&)
       SetBrush__14wxPostScriptDCFRC7wxBrush
       ;wxPostScriptDC::DoGetSize(int*,int*) const
       DoGetSize__14wxPostScriptDCCFPiT1
       ;wxPostScriptDC::SetBrush(const wxBrush&)
       SetBrush__14wxPostScriptDCFRC7wxBrush
       ;wxPostScriptDC::DoGetSize(int*,int*) const
       DoGetSize__14wxPostScriptDCCFPiT1

-      ;wxSetPrinterTranslation(int,int)
-      wxSetPrinterTranslation__FiT1
-      ;wxSetPrinterOrientation(int)
-      wxSetPrinterOrientation__Fi

       ;wxPostScriptDC::DoDrawIcon(const wxIcon&,int,int)
       DoDrawIcon__14wxPostScriptDCFRC6wxIconiT2
       ;wxPostScriptDC::DoDrawIcon(const wxIcon&,int,int)
       DoDrawIcon__14wxPostScriptDCFRC6wxIconiT2

-      ;wxGetPrinterOrientation()
-      wxGetPrinterOrientation__Fv
-      ;wxPrintSetupData::wxPrintSetupData()
-      __ct__16wxPrintSetupDataFv

       ;wxPostScriptDC::SetPen(const wxPen&)
       SetPen__14wxPostScriptDCFRC5wxPen
       ;wxPostScriptDC::GetCharWidth() const
       ;wxPostScriptDC::SetPen(const wxPen&)
       SetPen__14wxPostScriptDCFRC5wxPen
       ;wxPostScriptDC::GetCharWidth() const


@@ -7421,6 +7836,8 @@ EXPORTS
       ;wxGenericDirDialog::OnNew(wxCommandEvent&)
       OnNew__18wxGenericDirDialogFR14wxCommandEvent
       __vft18wxGenericDirDialog8wxObject
       ;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()
       ;wxGenericDirDialog::wxGenericDirDialog(wxWindow*,const wxString&,const wxString&,long,const wxPoint&,const wxSize&,const wxString&)
       __ct__18wxGenericDirDialogFP8wxWindowRC8wxStringT2lRC7wxPointRC6wxSizeT2
       ;wxGenericDirDialog::ShowModal()


@@ -7487,12 +7904,16 @@ EXPORTS
       SetFilterIndex__16wxGenericDirCtrlFi
       ;wxDirFilterListCtrl::FillFilterList(const wxString&,int)
       FillFilterList__19wxDirFilterListCtrlFRC8wxStringi
       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::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
       ;wxDirItemData::HasSubDirs() const
       HasSubDirs__13wxDirItemDataCFv
       ;wxGenericDirCtrl::GetPath() const


@@ -7528,58 +7949,6 @@ EXPORTS
       ;wxGenericDirCtrl::ExtractWildcard(const wxString&,int,wxString&,wxString&)
       ExtractWildcard__16wxGenericDirCtrlFRC8wxStringiR8wxStringT3
   ;From object file:  ..\generic\dragimgg.cpp
       ;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::wxGenericFontDialog(wxWindow*,wxFontData*)
-      __ct__19wxGenericFontDialogFP8wxWindowP10wxFontData
-      ;wxFontStyleIntToString(int)
-      wxFontStyleIntToString__Fi
-      ;wxGenericFontDialog::Create(wxWindow*,wxFontData*)
-      Create__19wxGenericFontDialogFP8wxWindowP10wxFontData
-      ;wxGenericFontDialog::GetEventTable() const
-      GetEventTable__19wxGenericFontDialogCFv
-      ;wxFontPreviewer::sm_eventTable
-      sm_eventTable__15wxFontPreviewer
-      ;wxGenericFontDialog::~wxGenericFontDialog()
-      __dt__19wxGenericFontDialogFv
-      ;wxFontWeightStringToInt(char*)
-      wxFontWeightStringToInt__FPc
-      __vft15wxFontPreviewer8wxObject
-      __vft19wxGenericFontDialog8wxObject
-      ;wxFontFamilyIntToString(int)
-      wxFontFamilyIntToString__Fi
-      ;wxFontPreviewer::OnPaint(wxPaintEvent&)
-      OnPaint__15wxFontPreviewerFR12wxPaintEvent
-      ;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
-      ;wxFontPreviewer::GetEventTable() const
-      GetEventTable__15wxFontPreviewerCFv
-      ;wxConstructorForwxGenericFontDialog()
-      wxConstructorForwxGenericFontDialog__Fv
-      ;wxFontFamilyStringToInt(char*)
-      wxFontFamilyStringToInt__FPc
-      ;wxFontStyleStringToInt(char*)
-      wxFontStyleStringToInt__FPc
-      ;wxGenericFontDialog::wxGenericFontDialog()
-      __ct__19wxGenericFontDialogFv
-      ;wxFontPreviewer::sm_eventTableEntries
-      sm_eventTableEntries__15wxFontPreviewer
-      ;wxGenericFontDialog::InitializeFont()
-      InitializeFont__19wxGenericFontDialogFv
-      ;wxGenericFontDialog::CreateWidgets()
-      CreateWidgets__19wxGenericFontDialogFv
-      ;wxGenericFontDialog::sm_classwxGenericFontDialog
-      sm_classwxGenericFontDialog__19wxGenericFontDialog

   ;From object file:  ..\generic\fdrepdlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxFindReplaceDialog::OnFind(wxCommandEvent&)
   ;From object file:  ..\generic\fdrepdlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxFindReplaceDialog::OnFind(wxCommandEvent&)


@@ -7665,14 +8034,8 @@ EXPORTS
       SetRowAttr__15wxGridTableBaseFP14wxGridCellAttri
       ;wxGrid::SetColMinimalWidth(int,int)
       SetColMinimalWidth__6wxGridFiT1
       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
       ;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)
       ;wxGridStringTable::InsertRows(unsigned int,unsigned int)
       InsertRows__17wxGridStringTableFUiT1
       ;wxGridTableBase::GetValueAsBool(int,int)


@@ -7693,6 +8056,8 @@ EXPORTS
       DeselectCol__6wxGridFi
       ;wxGridTableBase::AppendCols(unsigned int)
       AppendCols__15wxGridTableBaseFUi
       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
       ;wxGridCellAttr::Init(wxGridCellAttr*)
       Init__14wxGridCellAttrFP14wxGridCellAttr
       wxEVT_GRID_EDITOR_SHOWN


@@ -7700,7 +8065,8 @@ EXPORTS
       wxConstructorForwxGridEditorCreatedEvent__Fv
       ;wxConstructorForwxGridCornerLabelWindow()
       wxConstructorForwxGridCornerLabelWindow__Fv
       wxConstructorForwxGridEditorCreatedEvent__Fv
       ;wxConstructorForwxGridCornerLabelWindow()
       wxConstructorForwxGridCornerLabelWindow__Fv

-      __vft24wxGridCellStringRenderer16wxGridCellWorker
+      __vft22wxGridCellNumberEditor21wxClientDataContainer
+      __vft22wxGridCellBoolRenderer21wxClientDataContainer

       ;wxGrid::~wxGrid()
       __dt__6wxGridFv
       ;wxGridCellWithAttrArray::~wxGridCellWithAttrArray()
       ;wxGrid::~wxGrid()
       __dt__6wxGridFv
       ;wxGridCellWithAttrArray::~wxGridCellWithAttrArray()


@@ -7837,14 +8203,12 @@ EXPORTS
       SetColAttr__15wxGridTableBaseFP14wxGridCellAttri
       ;wxGridRowOrColAttrData::SetAttr(wxGridCellAttr*,int)
       SetAttr__22wxGridRowOrColAttrDataFP14wxGridCellAttri
       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
       ;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)
       ;wxGridTableBase::InsertRows(unsigned int,unsigned int)
       InsertRows__15wxGridTableBaseFUiT1
       ;wxGridStringTable::GetValue(int,int)


@@ -7879,6 +8243,8 @@ EXPORTS
       AppendRows__15wxGridTableBaseFUi
       ;wxGridStringTable::AppendCols(unsigned int)
       AppendCols__17wxGridStringTableFUi
       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
       ;wxGrid::SetDefaultCellBackgroundColour(const wxColour&)
       SetDefaultCellBackgroundColour__6wxGridFRC8wxColour
       wxEVT_GRID_EDITOR_HIDDEN


@@ -7891,9 +8257,11 @@ EXPORTS
       ;wxGridCellBoolRenderer::ms_sizeCheckMark
       ms_sizeCheckMark__22wxGridCellBoolRenderer
       __vft6wxGrid14wxScrollHelper
       ;wxGridCellBoolRenderer::ms_sizeCheckMark
       ms_sizeCheckMark__22wxGridCellBoolRenderer
       __vft6wxGrid14wxScrollHelper

-      __vft24wxGridCellNumberRenderer16wxGridCellWorker
-      __vft22wxGridCellBoolRenderer16wxGridCellWorker
-      __vft20wxGridCellTextEditor16wxGridCellWorker
+      __vft22wxGridCellChoiceEditor21wxClientDataContainer
+      __vft22wxGridCellAttrProvider21wxClientDataContainer
+      __vft21wxGridCellFloatEditor21wxClientDataContainer
+      __vft20wxGridCellTextEditor21wxClientDataContainer
+      __vft15wxGridTableBase21wxClientDataContainer

       ;wxGridCellAttrProvider::~wxGridCellAttrProvider()
       __dt__22wxGridCellAttrProviderFv
       ;wxGridTypeRegistry::~wxGridTypeRegistry()
       ;wxGridCellAttrProvider::~wxGridCellAttrProvider()
       __dt__22wxGridCellAttrProviderFv
       ;wxGridTypeRegistry::~wxGridTypeRegistry()


@@ -7920,6 +8288,12 @@ EXPORTS
       MergeWith__14wxGridCellAttrFP14wxGridCellAttr
       ;wxGrid::IsCurrentCellReadOnly() const
       IsCurrentCellReadOnly__6wxGridCFv
       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)
       ;wxGridCellAttr::GetTextColour() const
       GetTextColour__14wxGridCellAttrCFv
       ;wxGridCellNumberRenderer::GetString(wxGrid&,int,int)


@@ -7944,8 +8318,6 @@ EXPORTS
       CalcWindowSizes__6wxGridFv
       ;wxGrid::CalcRowLabelsExposed(const wxRegion&)
       CalcRowLabelsExposed__6wxGridFRC8wxRegion
       CalcWindowSizes__6wxGridFv
       ;wxGrid::CalcRowLabelsExposed(const wxRegion&)
       CalcRowLabelsExposed__6wxGridFRC8wxRegion

-      ;wxGridCellWithAttrArray::Add(const wxGridCellWithAttr&)
-      Add__23wxGridCellWithAttrArrayFRC18wxGridCellWithAttr

       ;wxGrid::SetCurrentCell(const wxGridCellCoords&)
       SetCurrentCell__6wxGridFRC16wxGridCellCoords
       wxGridNoCellCoords
       ;wxGrid::SetCurrentCell(const wxGridCellCoords&)
       SetCurrentCell__6wxGridFRC16wxGridCellCoords
       wxGridNoCellCoords


@@ -7966,10 +8338,6 @@ EXPORTS
       DrawCellBorder__6wxGridFR4wxDCRC16wxGridCellCoords
       ;wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr&,wxDC&,const wxString&)
       DoGetBestSize__24wxGridCellStringRendererFR14wxGridCellAttrR4wxDCRC8wxString
       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
       ;wxGrid::EnableCellEditControl(unsigned long)
       EnableCellEditControl__6wxGridFUl
       wxEVT_GRID_EDITOR_CREATED


@@ -8058,6 +8426,8 @@ EXPORTS
       SetRowLabelSize__6wxGridFi
       ;wxGrid::SetCellHighlightROPenWidth(int)
       SetCellHighlightROPenWidth__6wxGridFi
       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
       ;wxGrid::Redimension(wxGridTableMessage&)
       Redimension__6wxGridFR18wxGridTableMessage
       ;wxGrid::IsReadOnly(int,int) const


@@ -8088,11 +8458,9 @@ EXPORTS
       wxConstructorForwxGridRowLabelWindow__Fv
       ;wxGridCellEditorEvtHandler::sm_classwxGridCellEditorEvtHandler
       sm_classwxGridCellEditorEvtHandler__26wxGridCellEditorEvtHandler
       wxConstructorForwxGridRowLabelWindow__Fv
       ;wxGridCellEditorEvtHandler::sm_classwxGridCellEditorEvtHandler
       sm_classwxGridCellEditorEvtHandler__26wxGridCellEditorEvtHandler

-      __vft22wxGridCellNumberEditor16wxGridCellWorker
-      __vft22wxGridCellAttrProvider
-      __vft21wxGridCellFloatEditor16wxGridCellWorker
-      __vft20wxGridCellBoolEditor16wxGridCellWorker
-      __vft16wxGridCellWorker
+      __vft24wxGridCellStringRenderer21wxClientDataContainer
+      __vft24wxGridCellNumberRenderer21wxClientDataContainer
+      __vft20wxGridCellBoolEditor21wxClientDataContainer

       ;wxGridStringTable::~wxGridStringTable()
       __dt__17wxGridStringTableFv
       ;wxGridWindow::~wxGridWindow()
       ;wxGridStringTable::~wxGridStringTable()
       __dt__17wxGridStringTableFv
       ;wxGridWindow::~wxGridWindow()


@@ -8272,11 +8640,14 @@ EXPORTS
       GetCellFont__6wxGridFiT1
       ;wxGrid::DeselectRow(int)
       DeselectRow__6wxGridFi
       GetCellFont__6wxGridFiT1
       ;wxGrid::DeselectRow(int)
       DeselectRow__6wxGridFi

+      ;wxGridCellCoordsArray::Add(const wxGridCellCoords&,unsigned int)
+      Add__21wxGridCellCoordsArrayFRC16wxGridCellCoordsUi

       ;wxGridCellEditor::~wxGridCellEditor()
       __dt__16wxGridCellEditorFv
       ;wxConstructorForwxGridStringTable()
       wxConstructorForwxGridStringTable__Fv
       ;wxGridCellEditor::~wxGridCellEditor()
       __dt__16wxGridCellEditorFv
       ;wxConstructorForwxGridStringTable()
       wxConstructorForwxGridStringTable__Fv

-      __vft16wxGridCellEditor16wxGridCellWorker
+      __vft17wxGridStringTable21wxClientDataContainer
+      __vft16wxGridCellEditor21wxClientDataContainer

       ;wxGridStringTable::wxGridStringTable()
       __ct__17wxGridStringTableFv
       ;wxGrid::ShowCellEditControl()
       ;wxGridStringTable::wxGridStringTable()
       __ct__17wxGridStringTableFv
       ;wxGrid::ShowCellEditControl()


@@ -8414,8 +8785,8 @@ EXPORTS
       SetColFormatNumber__6wxGridFi
       ;wxGrid::SetCellHighlightPenWidth(int)
       SetCellHighlightPenWidth__6wxGridFi
       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)
       ;wxGridStringTable::InsertCols(unsigned int,unsigned int)
       InsertCols__17wxGridStringTableFUiT1
       ;wxGridTableBase::GetValueAsDouble(int,int)


@@ -8462,8 +8833,8 @@ EXPORTS
       wxConstructorForwxGridColLabelWindow__Fv
       ;wxGridCellEditorEvtHandler::sm_eventTableEntries
       sm_eventTableEntries__26wxGridCellEditorEvtHandler
       wxConstructorForwxGridColLabelWindow__Fv
       ;wxGridCellEditorEvtHandler::sm_eventTableEntries
       sm_eventTableEntries__26wxGridCellEditorEvtHandler

-      __vft23wxGridCellFloatRenderer16wxGridCellWorker
-      __vft22wxGridCellChoiceEditor16wxGridCellWorker
+      __vft23wxGridCellFloatRenderer21wxClientDataContainer
+      __vft16wxGridCellWorker21wxClientDataContainer

       ;wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
       __dt__22wxGridRowOrColAttrDataFv
       ;wxGridCellCoordsArray::~wxGridCellCoordsArray()
       ;wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
       __dt__22wxGridRowOrColAttrDataFv
       ;wxGridCellCoordsArray::~wxGridCellCoordsArray()


@@ -8552,11 +8923,12 @@ EXPORTS
       Draw__22wxGridCellEnumRendererFR6wxGridR14wxGridCellAttrR4wxDCRC6wxRectiT5Ul
       ;wxGridCellDateTimeRenderer::wxGridCellDateTimeRenderer(wxString,wxString)
       __ct__26wxGridCellDateTimeRendererF8wxStringT1
       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
       ;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&)
       ;wxGridCellDateTimeRenderer::SetParameters(const wxString&)
       SetParameters__26wxGridCellDateTimeRendererFRC8wxString
       ;wxGridCellEnumRenderer::SetParameters(const wxString&)


@@ -8569,8 +8941,8 @@ EXPORTS
       Draw__32wxGridCellAutoWrapStringRendererFR6wxGridR14wxGridCellAttrR4wxDCRC6wxRectiT5Ul
       ;wxGridCellDateTimeRenderer::Clone() const
       Clone__26wxGridCellDateTimeRendererCFv
       Draw__32wxGridCellAutoWrapStringRendererFR6wxGridR14wxGridCellAttrR4wxDCRC6wxRectiT5Ul
       ;wxGridCellDateTimeRenderer::Clone() const
       Clone__26wxGridCellDateTimeRendererCFv

-      __vft22wxGridCellEnumRenderer16wxGridCellWorker
-      __vft20wxGridCellEnumEditor16wxGridCellWorker
+      __vft30wxGridCellAutoWrapStringEditor21wxClientDataContainer
+      __vft26wxGridCellDateTimeRenderer21wxClientDataContainer

       ;wxGridCellDateTimeRenderer::GetString(wxGrid&,int,int)
       GetString__26wxGridCellDateTimeRendererFR6wxGridiT2
       ;wxGridCellEnumRenderer::GetString(wxGrid&,int,int)
       ;wxGridCellDateTimeRenderer::GetString(wxGrid&,int,int)
       GetString__26wxGridCellDateTimeRendererFR6wxGridiT2
       ;wxGridCellEnumRenderer::GetString(wxGrid&,int,int)


@@ -8587,8 +8959,7 @@ EXPORTS
       GetTextLines__32wxGridCellAutoWrapStringRendererFR6wxGridR4wxDCR14wxGridCellAttrRC6wxRectiT5
       ;wxGridCellEnumRenderer::Clone() const
       Clone__22wxGridCellEnumRendererCFv
       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)
   ;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)


@@ -8659,71 +9030,45 @@ EXPORTS
       LoadFile__24wxHTMLHelpControllerBaseFRC8wxString
       ;wxHTMLHelpControllerBase::KeywordSearch(const wxString&)
       KeywordSearch__24wxHTMLHelpControllerBaseFRC8wxString
       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\imaglist.cpp
     ;PUBDEFs (Symbols available from object file):
   ;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
+      ;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

       ;wxImageList::sm_classwxImageList
       sm_classwxImageList__11wxImageList
       ;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
+      ;wxGenericImageList::Remove(int)
+      Remove__18wxGenericImageListFi
+      ;wxGenericImageList::~wxGenericImageList()
+      __dt__18wxGenericImageListFv
+      ;wxConstructorForwxGenericImageList()
+      wxConstructorForwxGenericImageList__Fv
+      __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

       ;wxConstructorForwxImageList()
       wxConstructorForwxImageList__Fv
       ;wxConstructorForwxImageList()
       wxConstructorForwxImageList__Fv

-      ;wxImageList::RemoveAll()
-      RemoveAll__11wxImageListFv

   ;From object file:  ..\generic\laywin.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent&)
   ;From object file:  ..\generic\laywin.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent&)


@@ -8766,34 +9111,38 @@ EXPORTS
       wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT
       ;wxListTextCtrl::sm_eventTable
       sm_eventTable__14wxListTextCtrl
       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
       ;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
       ;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
       ;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
       ;wxListItemData::SetSize(int,int)
       SetSize__14wxListItemDataFiT1

+      ;wxGenericListCtrl::SetItem(wxListItem&)
+      SetItem__17wxGenericListCtrlFR10wxListItem

       ;wxListLineData::SetItem(int,const wxListItem&)
       SetItem__14wxListLineDataFiRC10wxListItem
       ;wxListLineData::SetItem(int,const wxListItem&)
       SetItem__14wxListLineDataFiRC10wxListItem

+      ;wxGenericListCtrl::SetColumnWidth(int,int)
+      SetColumnWidth__17wxGenericListCtrlFiT1
+      ;wxGenericListCtrl::ScrollList(int,int)
+      ScrollList__17wxGenericListCtrlFiT1

       ;wxListMainWindow::RefreshLine(unsigned int)
       RefreshLine__16wxListMainWindowFUi
       ;wxSelectionStore::OnItemDelete(unsigned int)
       ;wxListMainWindow::RefreshLine(unsigned int)
       RefreshLine__16wxListMainWindowFUi
       ;wxSelectionStore::OnItemDelete(unsigned int)


@@ -8804,104 +9153,118 @@ EXPORTS
       GetLineRect__16wxListMainWindowCFUi
       ;wxListMainWindow::GetLineLabelRect(unsigned int) const
       GetLineLabelRect__16wxListMainWindowCFUi
       GetLineRect__16wxListMainWindowCFUi
       ;wxListMainWindow::GetLineLabelRect(unsigned int) const
       GetLineLabelRect__16wxListMainWindowCFUi

-      ;wxListMainWindow::GetItem(wxListItem&)
-      GetItem__16wxListMainWindowFR10wxListItem

       ;wxListItemData::GetItem(wxListItem&) const
       GetItem__14wxListItemDataCFR10wxListItem
       ;wxListItemData::GetItem(wxListItem&) const
       GetItem__14wxListItemDataCFR10wxListItem

-      ;wxListCtrl::FindItem(long,long)
-      FindItem__10wxListCtrlFlT1

       ;wxListItemData::Init()
       Init__14wxListItemDataFv
       ;wxListItemData::Init()
       Init__14wxListItemDataFv

-      ;wxConstructorForwxListTextCtrl()
-      wxConstructorForwxListTextCtrl__Fv

       ;wxListHeaderWindow::~wxListHeaderWindow()
       __dt__18wxListHeaderWindowFv
       ;wxListMainWindow::wxListMainWindow()
       __ct__16wxListMainWindowFv
       ;wxListHeaderData::wxListHeaderData()
       __ct__16wxListHeaderDataFv
       ;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
       ;wxListLineData::ReverseHighlight()
       ReverseHighlight__14wxListLineDataFv

-      ;wxListMainWindow::OnRenameAccept()
-      OnRenameAccept__16wxListMainWindowFv

       ;wxListRenameTimer::Notify()
       Notify__17wxListRenameTimerFv
       ;wxListHeaderWindow::Init()
       Init__18wxListHeaderWindowFv
       ;wxListHeaderData::GetWidth() const
       GetWidth__16wxListHeaderDataCFv
       ;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
       ;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
       ;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
       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
       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
       __vft14wxListTextCtrl8wxObject

-      ;wxListCtrl::SetItemSpacing(int,unsigned long)
-      SetItemSpacing__10wxListCtrlFiUl
+      ;wxGenericListCtrl::SetItemCount(long)
+      SetItemCount__17wxGenericListCtrlFl

       ;wxListMainWindow::SetItemCount(long)
       SetItemCount__16wxListMainWindowFl
       ;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
       ;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
       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
       ;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::SetItemState(long,long,long)
       SetItemState__16wxListMainWindowFlN21
       ;wxListMainWindow::SetImageList(wxImageList*,int)
       SetImageList__16wxListMainWindowFP11wxImageListi

+      ;wxGenericListCtrl::SetColumn(int,wxListItem&)
+      SetColumn__17wxGenericListCtrlFiR10wxListItem

       ;wxListMainWindow::SetColumnWidth(int,int)
       SetColumnWidth__16wxListMainWindowFiT1
       ;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
       ;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
       ;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
       ;wxListMainWindow::GetColumn(int,wxListItem&) const
       GetColumn__16wxListMainWindowCFiR10wxListItem

+      ;wxGenericListCtrl::DeleteColumn(int)
+      DeleteColumn__17wxGenericListCtrlFi

       ;wxListMainWindow::CacheLineData(unsigned int)
       CacheLineData__16wxListMainWindowFUi
       ;wxListMainWindow::CacheLineData(unsigned int)
       CacheLineData__16wxListMainWindowFUi

-      ;wxwxListItemDataListNode::DeleteData()
-      DeleteData__24wxwxListItemDataListNodeFv
+      ;wxGenericListCtrl::AssignImageList(wxImageList*,int)
+      AssignImageList__17wxGenericListCtrlFP11wxImageListi
+      ;wxGenericListCtrl::GetNextItem(long,int,int) const
+      GetNextItem__17wxGenericListCtrlCFliT2

       ;wxConstructorForwxListCtrl()
       wxConstructorForwxListCtrl__Fv
       list_ctrl_compare_func_2
       ;wxConstructorForwxListCtrl()
       wxConstructorForwxListCtrl__Fv
       list_ctrl_compare_func_2


@@ -8909,24 +9272,32 @@ EXPORTS
       __dt__16wxListMainWindowFv
       ;wxListHeaderWindow::wxListHeaderWindow()
       __ct__18wxListHeaderWindowFv
       __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
       ;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
       ;wxListItemData::GetX() const
       GetX__14wxListItemDataCFv

-      ;wxListCtrl::GetTextColour() const
-      GetTextColour__10wxListCtrlCFv
+      ;wxGenericListCtrl::GetTextColour() const
+      GetTextColour__17wxGenericListCtrlCFv

       ;wxListMainWindow::GetHeaderWidth() const
       GetHeaderWidth__16wxListMainWindowCFv
       ;wxListMainWindow::GetHeaderWidth() const
       GetHeaderWidth__16wxListMainWindowCFv

+      ;wxGenericListCtrl::GetForegroundColour() const
+      GetForegroundColour__17wxGenericListCtrlCFv

       ;wxListTextCtrl::GetEventTable() const
       GetEventTable__14wxListTextCtrlCFv
       ;wxListTextCtrl::GetEventTable() const
       GetEventTable__14wxListTextCtrlCFv

+      ;wxGenericListCtrl::DoPopupMenu(wxMenu*,int,int)
+      DoPopupMenu__17wxGenericListCtrlFP6wxMenuiT2

       ;wxListMainWindow::DoDeleteAllItems()
       DoDeleteAllItems__16wxListMainWindowFv
       ;wxListMainWindow::DoDeleteAllItems()
       DoDeleteAllItems__16wxListMainWindowFv

-      ;wxListItem::ClearAttributes()
-      ClearAttributes__10wxListItemFv
+      ;wxwxListItemDataListNode::DeleteData()
+      DeleteData__24wxwxListItemDataListNodeFv

       ;wxListLineData::wxListLineData(wxListMainWindow*)
       __ct__14wxListLineDataFP16wxListMainWindow
       wxEVT_COMMAND_LIST_SET_INFO
       ;wxListLineData::wxListLineData(wxListMainWindow*)
       __ct__14wxListLineDataFP16wxListMainWindow
       wxEVT_COMMAND_LIST_SET_INFO


@@ -8943,36 +9314,46 @@ EXPORTS
       sm_classwxListMainWindow__16wxListMainWindow
       ;wxListRenameTimer::wxListRenameTimer(wxListMainWindow*)
       __ct__17wxListRenameTimerFP16wxListMainWindow
       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
       ;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
       ;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
       ;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
       ;wxListHeaderWindow::OnMouse(wxMouseEvent&)
       OnMouse__18wxListHeaderWindowFR12wxMouseEvent

+      ;wxGenericListCtrl::OnIdle(wxIdleEvent&)
+      OnIdle__17wxGenericListCtrlFR11wxIdleEvent
+      ;wxGenericListCtrl::OnGetItemAttr(long) const
+      OnGetItemAttr__17wxGenericListCtrlCFl

       ;wxListTextCtrl::OnChar(wxKeyEvent&)
       OnChar__14wxListTextCtrlFR10wxKeyEvent
       ;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)
       ;wxListHeaderData::wxListHeaderData(const wxListItem&)
       __ct__16wxListHeaderDataFRC10wxListItem
       ;wxListHeaderData::SetWidth(int)


@@ -8981,155 +9362,152 @@ EXPORTS
       SetPosition__16wxListHeaderDataFiT1
       ;wxListItemData::SetPosition(int,int)
       SetPosition__14wxListItemDataFiT1
       SetPosition__16wxListHeaderDataFiT1
       ;wxListItemData::SetPosition(int,int)
       SetPosition__14wxListItemDataFiT1

-      ;wxListLineData::SetImage(int,int)
-      SetImage__14wxListLineDataFiT1

       ;wxListHeaderData::SetHeight(int)
       SetHeight__16wxListHeaderDataFi
       ;wxListHeaderData::SetFormat(int)
       SetFormat__16wxListHeaderDataFi
       ;wxListHeaderData::SetHeight(int)
       SetHeight__16wxListHeaderDataFi
       ;wxListHeaderData::SetFormat(int)
       SetFormat__16wxListHeaderDataFi

-      ;wxListCtrl::SetColumnWidth(int,int)
-      SetColumnWidth__10wxListCtrlFiT1
-      ;wxListLineDataArray::RemoveAt(unsigned int)
-      RemoveAt__19wxListLineDataArrayFUi

       ;wxListMainWindow::RefreshLines(unsigned int,unsigned int)
       RefreshLines__16wxListMainWindowFUiT1
       ;wxListMainWindow::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
       ;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
       ;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
       ;wxListMainWindow::ChangeCurrent(unsigned int)
       ChangeCurrent__16wxListMainWindowFUi

-      ;wxListCtrl::Arrange(int)
-      Arrange__10wxListCtrlFi
-      ;wxListCtrl::GetNextItem(long,int,int) const
-      GetNextItem__10wxListCtrlCFliT2
+      ;wxGenericListCtrl::~wxGenericListCtrl()
+      __dt__17wxGenericListCtrlFv

       wxEVT_COMMAND_LIST_KEY_DOWN
       ;wxConstructorForwxListMainWindow()
       wxConstructorForwxListMainWindow__Fv
       ;wxConstructorForwxListEvent()
       wxConstructorForwxListEvent__Fv
       wxEVT_COMMAND_LIST_KEY_DOWN
       ;wxConstructorForwxListMainWindow()
       wxConstructorForwxListMainWindow__Fv
       ;wxConstructorForwxListEvent()
       wxConstructorForwxListEvent__Fv

+      ;wxConstructorForwxGenericListCtrl()
+      wxConstructorForwxGenericListCtrl__Fv

       __vft16wxListMainWindow14wxScrollHelper
       ;wxListMainWindow::UpdateCurrent()
       UpdateCurrent__16wxListMainWindowFv
       ;wxListMainWindow::Thaw()
       Thaw__16wxListMainWindowFv
       __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::InitScrolling()
       InitScrolling__16wxListMainWindowFv
       ;wxListItemData::GetY() const
       GetY__14wxListItemDataCFv

-      ;wxListMainWindow::GetSelectedItemCount()
-      GetSelectedItemCount__16wxListMainWindowFv
+      ;wxGenericListCtrl::GetSelectedItemCount() const
+      GetSelectedItemCount__17wxGenericListCtrlCFv

       ;wxListMainWindow::GetLineHeight() const
       GetLineHeight__16wxListMainWindowCFv
       ;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
       ;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
       ;wxListLineData::GetAttr() const
       GetAttr__14wxListLineDataCFv

+      ;wxGenericListCtrl::Freeze()
+      Freeze__17wxGenericListCtrlFv

       ;wxListMainWindow::Freeze()
       Freeze__16wxListMainWindowFv
       ;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
       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
       ;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
       ;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
       ;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
       ;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::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
       ;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
       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
       ;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
       ;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
       ;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
       ;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
       ;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
       wxSizeTCmpFn
       ;wxConstructorForwxListItem()
       wxConstructorForwxListItem__Fv


@@ -9137,54 +9515,55 @@ EXPORTS
       __dt__19wxListLineDataArrayFv
       ;wxListItemData::~wxListItemData()
       __dt__14wxListItemDataFv
       __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
       ;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
       ;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
       ;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
       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
       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&)
       ;wxListMainWindow::OnScroll(wxScrollWinEvent&)
       OnScroll__16wxListMainWindowFR16wxScrollWinEvent
       ;wxListHeaderWindow::OnPaint(wxPaintEvent&)


@@ -9195,18 +9574,20 @@ EXPORTS
       OnKeyUp__14wxListTextCtrlFR10wxKeyEvent
       ;wxListMainWindow::OnChar(wxKeyEvent&)
       OnChar__16wxListMainWindowFR10wxKeyEvent
       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
       ;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
       ;wxListLineData::GetText(int) const
       GetText__14wxListLineDataCFi
       __vft26wxwxListHeaderDataListNode10wxNodeBase


@@ -9217,54 +9598,40 @@ EXPORTS
       SetItem__16wxListMainWindowFR10wxListItem
       ;wxListItemData::SetItem(const wxListItem&)
       SetItem__14wxListItemDataFRC10wxListItem
       SetItem__16wxListMainWindowFR10wxListItem
       ;wxListItemData::SetItem(const wxListItem&)
       SetItem__14wxListItemDataFRC10wxListItem

-      ;wxListCtrl::SetItemData(long,long)
-      SetItemData__10wxListCtrlFlT1
-      ;wxListCtrl::SetImageList(wxImageList*,int)
-      SetImageList__10wxListCtrlFP11wxImageListi
+      ;wxGenericListCtrl::SetImageList(wxImageList*,int)
+      SetImageList__17wxGenericListCtrlFP11wxImageListi

       ;wxListMainWindow::SetColumn(int,wxListItem&)
       SetColumn__16wxListMainWindowFiR10wxListItem
       ;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
       ;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
       ;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::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
       ;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
       ;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
       ;wxListMainWindow::RefreshAll()
       RefreshAll__16wxListMainWindowFv
       ;wxListMainWindow::HitTestLine(unsigned int,int,int) const


@@ -9273,28 +9640,16 @@ EXPORTS
       HasImage__16wxListHeaderDataCFv
       ;wxListItemData::GetWidth() const
       GetWidth__14wxListItemDataCFv
       HasImage__16wxListHeaderDataCFv
       ;wxListItemData::GetWidth() const
       GetWidth__14wxListItemDataCFv

-      ;wxListMainWindow::GetNextItem(long,int,int)
-      GetNextItem__16wxListMainWindowFliT2

       ;wxListHeaderData::GetImage() const
       GetImage__16wxListHeaderDataCFv
       ;wxListHeaderData::GetImage() const
       GetImage__16wxListHeaderDataCFv

-      ;wxListCtrl::GetForegroundColour() const
-      GetForegroundColour__10wxListCtrlCFv

       ;wxListMainWindow::GetEventTable() const
       GetEventTable__16wxListMainWindowCFv
       ;wxListMainWindow::GetEventTable() const
       GetEventTable__16wxListMainWindowCFv

+      ;wxGenericListCtrl::GetCountPerPage() const
+      GetCountPerPage__17wxGenericListCtrlCFv

       ;wxListMainWindow::GetCountPerPage() const
       GetCountPerPage__16wxListMainWindowCFv
       ;wxListHeaderWindow::DrawCurrent()
       DrawCurrent__18wxListHeaderWindowFv
       ;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
       ;wxListItemData::wxListItemData(wxListMainWindow*)
       __ct__14wxListItemDataFP16wxListMainWindow
       wxEVT_COMMAND_LIST_COL_END_DRAG


@@ -9419,6 +9774,8 @@ EXPORTS
       Init__7wxPanelFv
       ;wxPanel::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__7wxPanelFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       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
       ;wxPanel::SetDefaultItem(wxWindow*)
       SetDefaultItem__7wxPanelFP8wxWindow
       __vft7wxPanel8wxObject


@@ -9484,8 +9841,6 @@ EXPORTS
       OnOK__20wxGenericPrintDialogFR14wxCommandEvent
       ;wxGenericPrintDialog::wxGenericPrintDialog(wxWindow*,wxPrintDialogData*)
       __ct__20wxGenericPrintDialogFP8wxWindowP17wxPrintDialogData
       OnOK__20wxGenericPrintDialogFR14wxCommandEvent
       ;wxGenericPrintDialog::wxGenericPrintDialog(wxWindow*,wxPrintDialogData*)
       __ct__20wxGenericPrintDialogFP8wxWindowP17wxPrintDialogData

-      ;wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow*,wxPrintSetupData*)
-      __ct__25wxGenericPrintSetupDialogFP8wxWindowP16wxPrintSetupData

       ;wxGenericPrintDialog::ShowModal()
       ShowModal__20wxGenericPrintDialogFv
       ;wxGenericPageSetupDialog::TransferDataFromWindow()
       ;wxGenericPrintDialog::ShowModal()
       ShowModal__20wxGenericPrintDialogFv
       ;wxGenericPageSetupDialog::TransferDataFromWindow()


@@ -9555,8 +9910,6 @@ EXPORTS
       __ct__16wxProgressDialogFRC8wxStringT1iP8wxWindowT3
       ;wxProgressDialog::CreateLabel(const wxString&,wxWindow**)
       CreateLabel__16wxProgressDialogFRC8wxStringPP8wxWindow
       __ct__16wxProgressDialogFRC8wxStringT1iP8wxWindowT3
       ;wxProgressDialog::CreateLabel(const wxString&,wxWindow**)
       CreateLabel__16wxProgressDialogFRC8wxStringPP8wxWindow

-      ;wxProgressDialog::OnShow(wxShowEvent&)
-      OnShow__16wxProgressDialogFR11wxShowEvent

       __vft16wxProgressDialog8wxObject
       ;wxProgressDialog::GetEventTable() const
       GetEventTable__16wxProgressDialogCFv
       __vft16wxProgressDialog8wxObject
       ;wxProgressDialog::GetEventTable() const
       GetEventTable__16wxProgressDialogCFv


@@ -9564,6 +9917,8 @@ EXPORTS
       Update__16wxProgressDialogFiRC8wxString
       ;wxProgressDialog::OnClose(wxCloseEvent&)
       OnClose__16wxProgressDialogFR12wxCloseEvent
       Update__16wxProgressDialogFiRC8wxString
       ;wxProgressDialog::OnClose(wxCloseEvent&)
       OnClose__16wxProgressDialogFR12wxCloseEvent

+      ;wxProgressDialog::Resume()
+      Resume__16wxProgressDialogFv

       ;wxProgressDialog::sm_classwxProgressDialog
       sm_classwxProgressDialog__16wxProgressDialog
       ;wxProgressDialog::sm_eventTable
       ;wxProgressDialog::sm_classwxProgressDialog
       sm_classwxProgressDialog__16wxProgressDialog
       ;wxProgressDialog::sm_eventTable


@@ -9642,6 +9997,8 @@ EXPORTS
       sm_eventTable__23wxGenericScrolledWindow
       ;wxAutoScrollTimer::wxAutoScrollTimer(wxWindow*,wxScrollHelper*,int,int,int)
       __ct__17wxAutoScrollTimerFP8wxWindowP14wxScrollHelperiN23
       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
       ;wxScrollHelper::HandleOnScroll(wxScrollWinEvent&)
       HandleOnScroll__14wxScrollHelperFR16wxScrollWinEvent
       __vft17wxAutoScrollTimer8wxObject


@@ -9666,19 +10023,19 @@ EXPORTS
       HandleOnSize__14wxScrollHelperFR11wxSizeEvent
       ;wxScrollHelper::HandleOnPaint(wxPaintEvent&)
       HandleOnPaint__14wxScrollHelperFR12wxPaintEvent
       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
       ;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
       ;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&)
       ;wxScrollHelper::HandleOnMouseEnter(wxMouseEvent&)
       HandleOnMouseEnter__14wxScrollHelperFR12wxMouseEvent
       ;wxScrollHelper::HandleOnMouseLeave(wxMouseEvent&)


@@ -9717,8 +10074,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxSplitterWindow::OnNavigationKey(wxNavigationKeyEvent&)
       OnNavigationKey__16wxSplitterWindowFR20wxNavigationKeyEvent
     ;PUBDEFs (Symbols available from object file):
       ;wxSplitterWindow::OnNavigationKey(wxNavigationKeyEvent&)
       OnNavigationKey__16wxSplitterWindowFR20wxNavigationKeyEvent

-      ;wxSplitterWindow::OnUnsplitEvent(wxSplitterEvent&)
-      OnUnsplitEvent__16wxSplitterWindowFR15wxSplitterEvent

       ;wxSplitterWindow::OnSize(wxSizeEvent&)
       OnSize__16wxSplitterWindowFR11wxSizeEvent
       ;wxSplitterWindow::OnChildFocus(wxChildFocusEvent&)
       ;wxSplitterWindow::OnSize(wxSizeEvent&)
       OnSize__16wxSplitterWindowFR11wxSizeEvent
       ;wxSplitterWindow::OnChildFocus(wxChildFocusEvent&)


@@ -9727,18 +10082,28 @@ EXPORTS
       RemoveChild__16wxSplitterWindowFP12wxWindowBase
       ;wxSplitterWindow::ReplaceWindow(wxWindow*,wxWindow*)
       ReplaceWindow__16wxSplitterWindowFP8wxWindowT1
       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::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::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()
       ;wxSplitterWindow::DrawSashTracker(int,int)
       DrawSashTracker__16wxSplitterWindowFiT1
       ;wxConstructorForwxSplitterWindow()


@@ -9748,16 +10113,14 @@ EXPORTS
       ;wxSplitterWindow::SetFocus()
       SetFocus__16wxSplitterWindowFv
       wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING
       ;wxSplitterWindow::SetFocus()
       SetFocus__16wxSplitterWindowFv
       wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING

-      ;wxSplitterWindow::OnSashPosChanged(wxSplitterEvent&)
-      OnSashPosChanged__16wxSplitterWindowFR15wxSplitterEvent

       ;wxSplitterEvent::sm_classwxSplitterEvent
       sm_classwxSplitterEvent__15wxSplitterEvent
       ;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::SizeWindows()
       SizeWindows__16wxSplitterWindowFv

-      ;wxSplitterWindow::SendUnsplitEvent(wxWindow*)
-      SendUnsplitEvent__16wxSplitterWindowFP8wxWindow

       ;wxSplitterWindow::sm_eventTableEntries
       sm_eventTableEntries__16wxSplitterWindow
       ;wxSplitterWindow::OnPaint(wxPaintEvent&)
       ;wxSplitterWindow::sm_eventTableEntries
       sm_eventTableEntries__16wxSplitterWindow
       ;wxSplitterWindow::OnPaint(wxPaintEvent&)


@@ -9765,10 +10128,14 @@ EXPORTS
       wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED
       ;wxSplitterWindow::OnIdle(wxIdleEvent&)
       OnIdle__16wxSplitterWindowFR11wxIdleEvent
       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::Init()
       Init__16wxSplitterWindowFv

+      ;wxSplitterWindow::SetResizeCursor()
+      SetResizeCursor__16wxSplitterWindowFv

       ;wxSplitterWindow::GetEventTable() const
       GetEventTable__16wxSplitterWindowCFv
       ;wxSplitterWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       ;wxSplitterWindow::GetEventTable() const
       GetEventTable__16wxSplitterWindowCFv
       ;wxSplitterWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)


@@ -9788,14 +10155,16 @@ EXPORTS
       SetSashPosition__16wxSplitterWindowFiUl
       ;wxSplitterWindow::SashHitTest(int,int,int)
       SashHitTest__16wxSplitterWindowFiN21
       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
       ;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
   ;From object file:  ..\generic\statusbr.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxStatusBar::GetFieldRect(int,wxRect&) const


@@ -9959,8 +10328,12 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxTextEntryDialog::OnOK(wxCommandEvent&)
       OnOK__17wxTextEntryDialogFR14wxCommandEvent
     ;PUBDEFs (Symbols available from object file):
       ;wxTextEntryDialog::OnOK(wxCommandEvent&)
       OnOK__17wxTextEntryDialogFR14wxCommandEvent

+      ;wxTextEntryDialog::SetTextValidator(long)
+      SetTextValidator__17wxTextEntryDialogFl

       ;wxTextEntryDialog::sm_classwxTextEntryDialog
       sm_classwxTextEntryDialog__17wxTextEntryDialog
       ;wxTextEntryDialog::sm_classwxTextEntryDialog
       sm_classwxTextEntryDialog__17wxTextEntryDialog

+      ;wxTextEntryDialog::SetValue(const wxString&)
+      SetValue__17wxTextEntryDialogFRC8wxString

       ;wxTextEntryDialog::GetEventTable() const
       GetEventTable__17wxTextEntryDialogCFv
       ;wxTextEntryDialog::sm_eventTableEntries
       ;wxTextEntryDialog::GetEventTable() const
       GetEventTable__17wxTextEntryDialogCFv
       ;wxTextEntryDialog::sm_eventTableEntries


@@ -9968,6 +10341,8 @@ EXPORTS
       ;wxTextEntryDialog::wxTextEntryDialog(wxWindow*,const wxString&,const wxString&,const wxString&,long,const wxPoint&)
       __ct__17wxTextEntryDialogFP8wxWindowRC8wxStringN22lRC7wxPoint
       __vft17wxTextEntryDialog8wxObject
       ;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
       ;wxTextEntryDialog::sm_eventTable
       sm_eventTable__17wxTextEntryDialog
   ;From object file:  ..\generic\tipdlg.cpp


@@ -9991,6 +10366,43 @@ EXPORTS
       ;wxTipDialog::wxTipDialog(wxWindow*,wxTipProvider*,unsigned long)
       __ct__11wxTipDialogFP8wxWindowP13wxTipProviderUl
   ;From object file:  ..\generic\tipwin.cpp
       ;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*)
   ;From object file:  ..\generic\treectlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTreeRenameTimer::wxTreeRenameTimer(wxGenericTreeCtrl*)


@@ -10041,6 +10453,8 @@ EXPORTS
       SetText__17wxGenericTreeItemFRC8wxString
       ;wxGenericTreeCtrl::GetSelections(wxArrayTreeItemIds&) const
       GetSelections__17wxGenericTreeCtrlCFR18wxArrayTreeItemIds
       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
       ;wxGenericTreeCtrl::Edit(const wxTreeItemId&)
       Edit__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxTreeTextCtrl::sm_eventTableEntries


@@ -10122,6 +10536,8 @@ EXPORTS
       AssignButtonsImageList__17wxGenericTreeCtrlFP11wxImageList
       ;wxGenericTreeCtrl::HitTest(const wxPoint&,int&)
       HitTest__17wxGenericTreeCtrlFRC7wxPointRi
       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()
       ;wxGenericTreeCtrl::GetItemImage(const wxTreeItemId&,wxTreeItemIcon) const
       GetItemImage__17wxGenericTreeCtrlCFRC12wxTreeItemId14wxTreeItemIcon
       ;wxGenericTreeItem::~wxGenericTreeItem()


@@ -10130,8 +10546,6 @@ EXPORTS
       Unselect__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::SetBackgroundColour(const wxColour&)
       SetBackgroundColour__17wxGenericTreeCtrlFRC8wxColour
       Unselect__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::SetBackgroundColour(const wxColour&)
       SetBackgroundColour__17wxGenericTreeCtrlFRC8wxColour

-      ;wxGenericTreeCtrl::OnRenameAccept()
-      OnRenameAccept__17wxGenericTreeCtrlFv

       ;wxGenericTreeCtrl::GetEventTable() const
       GetEventTable__17wxGenericTreeCtrlCFv
       ;wxGenericTreeItem::GetCurrentImage() const
       ;wxGenericTreeCtrl::GetEventTable() const
       GetEventTable__17wxGenericTreeCtrlCFv
       ;wxGenericTreeItem::GetCurrentImage() const


@@ -10140,6 +10554,8 @@ EXPORTS
       DeleteAllItems__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::CalculatePositions()
       CalculatePositions__17wxGenericTreeCtrlFv
       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
       ;wxGenericTreeCtrl::SetItemText(const wxTreeItemId&,const wxString&)
       SetItemText__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxString
       ;wxGenericTreeCtrl::ItemHasChildren(const wxTreeItemId&) const


@@ -10193,14 +10609,14 @@ EXPORTS
       AddRoot__17wxGenericTreeCtrlFRC8wxStringiT2P14wxTreeItemData
       ;wxGenericTreeCtrl::Init()
       Init__17wxGenericTreeCtrlFv
       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
       ;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&)
       ;wxGenericTreeCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__17wxGenericTreeCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxGenericTreeCtrl::PaintItem(wxGenericTreeItem*,wxDC&)


@@ -10243,6 +10659,8 @@ EXPORTS
       SetItemBackgroundColour__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxColour
       ;wxTreeTextCtrl::GetEventTable() const
       GetEventTable__14wxTreeTextCtrlCFv
       SetItemBackgroundColour__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxColour
       ;wxTreeTextCtrl::GetEventTable() const
       GetEventTable__14wxTreeTextCtrlCFv

+      ;wxTreeTextCtrl::Finish()
+      Finish__14wxTreeTextCtrlFv

       ;wxGenericTreeCtrl::FillArray(wxGenericTreeItem*,wxArrayTreeItemIds&) const
       FillArray__17wxGenericTreeCtrlCFP17wxGenericTreeItemR18wxArrayTreeItemIds
   ;From object file:  ..\generic\treelay.cpp
       ;wxGenericTreeCtrl::FillArray(wxGenericTreeItem*,wxArrayTreeItemIds&) const
       FillArray__17wxGenericTreeCtrlCFP17wxGenericTreeItemR18wxArrayTreeItemIds
   ;From object file:  ..\generic\treelay.cpp


@@ -10259,6 +10677,8 @@ EXPORTS
       DisplaySection__20wxHtmlHelpControllerFi
       ;wxHtmlHelpController::DestroyHelpWindow()
       DestroyHelpWindow__20wxHtmlHelpControllerFv
       DisplaySection__20wxHtmlHelpControllerFi
       ;wxHtmlHelpController::DestroyHelpWindow()
       DestroyHelpWindow__20wxHtmlHelpControllerFv

+      ;wxHtmlHelpController::AddGrabIfNeeded()
+      AddGrabIfNeeded__20wxHtmlHelpControllerFv

       ;wxHtmlHelpController::AddBook(const wxString&,unsigned long)
       AddBook__20wxHtmlHelpControllerFRC8wxStringUl
       __vft20wxHtmlHelpController8wxObject
       ;wxHtmlHelpController::AddBook(const wxString&,unsigned long)
       AddBook__20wxHtmlHelpControllerFRC8wxStringUl
       __vft20wxHtmlHelpController8wxObject


@@ -10268,8 +10688,14 @@ EXPORTS
       Quit__20wxHtmlHelpControllerFv
       ;wxHtmlHelpController::ReadCustomization(wxConfigBase*,const wxString&)
       ReadCustomization__20wxHtmlHelpControllerFP12wxConfigBaseRC8wxString
       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::sm_classwxHtmlHelpController
       sm_classwxHtmlHelpController__20wxHtmlHelpController

+      ;wxHtmlHelpController::Display(const wxString&)
+      Display__20wxHtmlHelpControllerFRC8wxString

       ;wxHtmlHelpController::WriteCustomization(wxConfigBase*,const wxString&)
       WriteCustomization__20wxHtmlHelpControllerFP12wxConfigBaseRC8wxString
       ;wxHtmlHelpController::UseConfig(wxConfigBase*,const wxString&)
       ;wxHtmlHelpController::WriteCustomization(wxConfigBase*,const wxString&)
       WriteCustomization__20wxHtmlHelpControllerFP12wxConfigBaseRC8wxString
       ;wxHtmlHelpController::UseConfig(wxConfigBase*,const wxString&)


@@ -10286,12 +10712,20 @@ EXPORTS
       OnCloseFrame__20wxHtmlHelpControllerFR12wxCloseEvent
       ;wxHtmlHelpController::wxHtmlHelpController(int)
       __ct__20wxHtmlHelpControllerFi
       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):
       ;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)
       ;wxHtmlHelpData::wxHtmlHelpData()
       __ct__14wxHtmlHelpDataFv
       ;wxSearchEngine::LookFor(const wxString&,unsigned long,unsigned long)


@@ -10310,12 +10744,10 @@ EXPORTS
       __ct__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray
       ;HP_TagHandler::WriteOut(wxHtmlContentsItem*&,int&)
       WriteOut__13HP_TagHandlerFRP18wxHtmlContentsItemRi
       __ct__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray
       ;HP_TagHandler::WriteOut(wxHtmlContentsItem*&,int&)
       WriteOut__13HP_TagHandlerFRP18wxHtmlContentsItemRi

-      ;wxHtmlBookRecArray::RemoveAt(unsigned int)
-      RemoveAt__18wxHtmlBookRecArrayFUi

       ;wxHtmlBookRecArray::DoEmpty()
       DoEmpty__18wxHtmlBookRecArrayFv
       ;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*)
       ;wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord*,wxOutputStream*)
       SaveCachedBook__14wxHtmlHelpDataFP16wxHtmlBookRecordP14wxOutputStream
       ;wxSearchEngine::Scan(wxInputStream*)


@@ -10333,8 +10765,6 @@ EXPORTS
       __vft14wxSearchEngine8wxObject
       ;wxHtmlBookRecArray::DoCopy(const wxHtmlBookRecArray&)
       DoCopy__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray
       __vft14wxSearchEngine8wxObject
       ;wxHtmlBookRecArray::DoCopy(const wxHtmlBookRecArray&)
       DoCopy__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray

-      ;wxHtmlBookRecArray::Insert(const wxHtmlBookRecord&,unsigned int)
-      Insert__18wxHtmlBookRecArrayFRC16wxHtmlBookRecordUi

       ;wxHtmlBookRecArray::~wxHtmlBookRecArray()
       __dt__18wxHtmlBookRecArrayFv
       wxHtmlHelpIndexCompareFunc
       ;wxHtmlBookRecArray::~wxHtmlBookRecArray()
       __dt__18wxHtmlBookRecArrayFv
       wxHtmlHelpIndexCompareFunc


@@ -10388,18 +10818,20 @@ EXPORTS
       WriteCustomization__15wxHtmlHelpFrameFP12wxConfigBaseRC8wxString
       ;wxHtmlHelpFrameOptionsDialog::sm_eventTable
       sm_eventTable__28wxHtmlHelpFrameOptionsDialog
       WriteCustomization__15wxHtmlHelpFrameFP12wxConfigBaseRC8wxString
       ;wxHtmlHelpFrameOptionsDialog::sm_eventTable
       sm_eventTable__28wxHtmlHelpFrameOptionsDialog

-      ;wxHtmlHelpFrame::OnIndexAll(wxCommandEvent&)
-      OnIndexAll__15wxHtmlHelpFrameFR14wxCommandEvent
+      ;wxHtmlHelpFrame::OnActivate(wxActivateEvent&)
+      OnActivate__15wxHtmlHelpFrameFR15wxActivateEvent

       __vft28wxHtmlHelpFrameOptionsDialog8wxObject
       __vft15wxHtmlHelpFrame8wxObject
       __vft28wxHtmlHelpFrameOptionsDialog8wxObject
       __vft15wxHtmlHelpFrame8wxObject

+      ;wxHtmlHelpFrame::OnIndexAll(wxCommandEvent&)
+      OnIndexAll__15wxHtmlHelpFrameFR14wxCommandEvent

       ;wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow*,int,const wxString&,int,wxHtmlHelpData*)
       __ct__15wxHtmlHelpFrameFP8wxWindowiRC8wxStringT2P14wxHtmlHelpData
       ;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::Create(wxWindow*,int,const wxString&,int)
       Create__15wxHtmlHelpFrameFP8wxWindowiRC8wxStringT2

+      ;wxHtmlHelpFrame::OptionsDialog()
+      OptionsDialog__15wxHtmlHelpFrameFv
+      ;wxHtmlHelpFrame::DisplayContents()
+      DisplayContents__15wxHtmlHelpFrameFv

       ;wxHtmlHelpFrame::CreateIndex()
       CreateIndex__15wxHtmlHelpFrameFv
       ;wxHtmlHelpFrameOptionsDialog::sm_eventTableEntries
       ;wxHtmlHelpFrame::CreateIndex()
       CreateIndex__15wxHtmlHelpFrameFv
       ;wxHtmlHelpFrameOptionsDialog::sm_eventTableEntries


@@ -10410,18 +10842,18 @@ EXPORTS
       OnSearch__15wxHtmlHelpFrameFR14wxCommandEvent
       ;wxHtmlHelpFrame::Init(wxHtmlHelpData*)
       Init__15wxHtmlHelpFrameFP14wxHtmlHelpData
       OnSearch__15wxHtmlHelpFrameFR14wxCommandEvent
       ;wxHtmlHelpFrame::Init(wxHtmlHelpData*)
       Init__15wxHtmlHelpFrameFP14wxHtmlHelpData

-      ;wxHtmlHelpFrame::DisplayIndex()
-      DisplayIndex__15wxHtmlHelpFrameFv
+      ;wxHtmlHelpFrame::NotifyPageChanged()
+      NotifyPageChanged__15wxHtmlHelpFrameFv

       ;wxConstructorForwxHtmlHelpFrame()
       wxConstructorForwxHtmlHelpFrame__Fv
       ;wxHtmlHelpFrame::~wxHtmlHelpFrame()
       __dt__15wxHtmlHelpFrameFv
       ;wxConstructorForwxHtmlHelpFrame()
       wxConstructorForwxHtmlHelpFrame__Fv
       ;wxHtmlHelpFrame::~wxHtmlHelpFrame()
       __dt__15wxHtmlHelpFrameFv

-      ;wxHtmlHelpFrame::NotifyPageChanged()
-      NotifyPageChanged__15wxHtmlHelpFrameFv

       ;wxHtmlHelpFrameOptionsDialog::GetEventTable() const
       GetEventTable__28wxHtmlHelpFrameOptionsDialogCFv
       ;wxHtmlHelpFrame::GetEventTable() const
       GetEventTable__15wxHtmlHelpFrameCFv
       ;wxHtmlHelpFrameOptionsDialog::GetEventTable() const
       GetEventTable__28wxHtmlHelpFrameOptionsDialogCFv
       ;wxHtmlHelpFrame::GetEventTable() const
       GetEventTable__15wxHtmlHelpFrameCFv

+      ;wxHtmlHelpFrame::DisplayIndex()
+      DisplayIndex__15wxHtmlHelpFrameFv

       ;wxHtmlHelpFrame::CreateSearch()
       CreateSearch__15wxHtmlHelpFrameFv
       ;wxHtmlHelpFrame::ReadCustomization(wxConfigBase*,const wxString&)
       ;wxHtmlHelpFrame::CreateSearch()
       CreateSearch__15wxHtmlHelpFrameFv
       ;wxHtmlHelpFrame::ReadCustomization(wxConfigBase*,const wxString&)


@@ -10525,6 +10957,8 @@ EXPORTS
       wxConstructorForwxHtmlFilterHTML__Fv
       ;wxHtmlFilterHTML::sm_classwxHtmlFilterHTML
       sm_classwxHtmlFilterHTML__16wxHtmlFilterHTML
       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
       ;wxHtmlFilterPlainText::ReadFile(const wxFSFile&) const
       ReadFile__21wxHtmlFilterPlainTextCFRC8wxFSFile
       ;wxHtmlFilterHTML::ReadFile(const wxFSFile&) const


@@ -10562,8 +10996,6 @@ EXPORTS
       ;wxHtmlTextPieces::Index(const wxHtmlTextPiece&,unsigned long) const
       Index__16wxHtmlTextPiecesCFRC15wxHtmlTextPieceUl
       __vft20wxHtmlEntitiesParser8wxObject
       ;wxHtmlTextPieces::Index(const wxHtmlTextPiece&,unsigned long) const
       Index__16wxHtmlTextPiecesCFRC15wxHtmlTextPieceUl
       __vft20wxHtmlEntitiesParser8wxObject

-      ;wxHtmlTextPieces::Insert(const wxHtmlTextPiece&,unsigned int)
-      Insert__16wxHtmlTextPiecesFRC15wxHtmlTextPieceUi

       ;wxHtmlParser::DoParsing()
       DoParsing__12wxHtmlParserFv
       ;wxHtmlParser::RestoreState()
       ;wxHtmlParser::DoParsing()
       DoParsing__12wxHtmlParserFv
       ;wxHtmlParser::RestoreState()


@@ -10574,6 +11006,8 @@ EXPORTS
       __ct__16wxHtmlTextPiecesFRC16wxHtmlTextPieces
       ;wxHtmlParser::SetSource(const wxString&)
       SetSource__12wxHtmlParserFRC8wxString
       __ct__16wxHtmlTextPiecesFRC16wxHtmlTextPieces
       ;wxHtmlParser::SetSource(const wxString&)
       SetSource__12wxHtmlParserFRC8wxString

+      ;wxHtmlTextPieces::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__16wxHtmlTextPiecesFUiT1

       ;wxHtmlTextPieces::DoEmpty()
       DoEmpty__16wxHtmlTextPiecesFv
       ;wxConstructorForwxHtmlEntitiesParser()
       ;wxHtmlTextPieces::DoEmpty()
       DoEmpty__16wxHtmlTextPiecesFv
       ;wxConstructorForwxHtmlEntitiesParser()


@@ -10594,13 +11028,13 @@ EXPORTS
       PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
       ;wxHtmlParser::OpenURL(wxHtmlURLType,const wxString&) const
       OpenURL__12wxHtmlParserCF13wxHtmlURLTypeRC8wxString
       PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
       ;wxHtmlParser::OpenURL(wxHtmlURLType,const wxString&) const
       OpenURL__12wxHtmlParserCF13wxHtmlURLTypeRC8wxString

-      ;wxHtmlTextPieces::RemoveAt(unsigned int)
-      RemoveAt__16wxHtmlTextPiecesFUi
+      ;wxHtmlParser::CreateDOMSubTree(wxHtmlTag*,int,int,wxHtmlTagsCache*)
+      CreateDOMSubTree__12wxHtmlParserFP9wxHtmlTagiT2P15wxHtmlTagsCache

       wxHtmlEntityCompare
       ;wxHtmlEntitiesParser::GetCharForCode(unsigned int)
       GetCharForCode__20wxHtmlEntitiesParserFUi
       wxHtmlEntityCompare
       ;wxHtmlEntitiesParser::GetCharForCode(unsigned int)
       GetCharForCode__20wxHtmlEntitiesParserFUi

-      ;wxHtmlParser::CreateDOMSubTree(wxHtmlTag*,int,int,wxHtmlTagsCache*)
-      CreateDOMSubTree__12wxHtmlParserFP9wxHtmlTagiT2P15wxHtmlTagsCache
+      ;wxHtmlTextPieces::Insert(const wxHtmlTextPiece&,unsigned int,unsigned int)
+      Insert__16wxHtmlTextPiecesFRC15wxHtmlTextPieceUiT2

       ;wxHtmlParser::~wxHtmlParser()
       __dt__12wxHtmlParserFv
       ;wxHtmlTextPieces::operator=(const wxHtmlTextPieces&)
       ;wxHtmlParser::~wxHtmlParser()
       __dt__12wxHtmlParserFv
       ;wxHtmlTextPieces::operator=(const wxHtmlTextPieces&)


@@ -10610,8 +11044,8 @@ EXPORTS
       __vft12wxHtmlParser8wxObject
       ;wxHtmlParser::DoParsing(int,int)
       DoParsing__12wxHtmlParserFiT1
       __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
       ;wxHtmlEntitiesParser::wxHtmlEntitiesParser()
       __ct__20wxHtmlEntitiesParserFv
       ;wxHtmlParser::sm_classwxHtmlParser


@@ -10665,16 +11099,14 @@ EXPORTS
       sm_classwxHtmlWinModule__15wxHtmlWinModule
       ;wxHtmlWindow::SetFonts(wxString,wxString,const int*)
       SetFonts__12wxHtmlWindowF8wxStringT1PCi
       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::~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()
       ;wxHtmlWindow::HistoryCanForward()
       HistoryCanForward__12wxHtmlWindowFv
       ;wxHtmlWindow::HistoryBack()


@@ -10693,8 +11125,6 @@ EXPORTS
       OnDraw__12wxHtmlWindowFR4wxDC
       ;wxHtmlHistoryArray::Index(const wxHtmlHistoryItem&,unsigned long) const
       Index__18wxHtmlHistoryArrayCFRC17wxHtmlHistoryItemUl
       OnDraw__12wxHtmlWindowFR4wxDC
       ;wxHtmlHistoryArray::Index(const wxHtmlHistoryItem&,unsigned long) const
       Index__18wxHtmlHistoryArrayCFRC17wxHtmlHistoryItemUl

-      ;wxHtmlHistoryArray::Insert(const wxHtmlHistoryItem&,unsigned int)
-      Insert__18wxHtmlHistoryArrayFRC17wxHtmlHistoryItemUi

       __vft25wxwxHtmlProcessorListNode10wxNodeBase
       ;wxHtmlHistoryArray::DoEmpty()
       DoEmpty__18wxHtmlHistoryArrayFv
       __vft25wxwxHtmlProcessorListNode10wxNodeBase
       ;wxHtmlHistoryArray::DoEmpty()
       DoEmpty__18wxHtmlHistoryArrayFv


@@ -10724,10 +11154,12 @@ EXPORTS
       OnSize__12wxHtmlWindowFR11wxSizeEvent
       ;wxHtmlWindow::OnMouseEvent(wxMouseEvent&)
       OnMouseEvent__12wxHtmlWindowFR12wxMouseEvent
       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::wxHtmlHistoryArray(const wxHtmlHistoryArray&)
       __ct__18wxHtmlHistoryArrayFRC18wxHtmlHistoryArray

+      ;wxHtmlHistoryArray::operator=(const wxHtmlHistoryArray&)
+      __as__18wxHtmlHistoryArrayFRC18wxHtmlHistoryArray

       ;wxHtmlWindow::SetRelatedStatusBar(int)
       SetRelatedStatusBar__12wxHtmlWindowFi
       ;wxHtmlWindow::CleanUpStatics()
       ;wxHtmlWindow::SetRelatedStatusBar(int)
       SetRelatedStatusBar__12wxHtmlWindowFi
       ;wxHtmlWindow::CleanUpStatics()


@@ -10742,6 +11174,8 @@ EXPORTS
       ReadCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
       ;wxHtmlWindow::OnIdle(wxIdleEvent&)
       OnIdle__12wxHtmlWindowFR11wxIdleEvent
       ReadCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
       ;wxHtmlWindow::OnIdle(wxIdleEvent&)
       OnIdle__12wxHtmlWindowFR11wxIdleEvent

+      ;wxHtmlHistoryArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__18wxHtmlHistoryArrayFUiT1

       ;wxHtmlWindow::Init()
       Init__12wxHtmlWindowFv
       ;wxConstructorForwxHtmlWindow()
       ;wxHtmlWindow::Init()
       Init__12wxHtmlWindowFv
       ;wxConstructorForwxHtmlWindow()


@@ -10872,8 +11306,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       __vft22wxHtmlImageMapAreaCell8wxObject
       __vft15wxHtmlImageCell8wxObject
     ;PUBDEFs (Symbols available from object file):
       __vft22wxHtmlImageMapAreaCell8wxObject
       __vft15wxHtmlImageCell8wxObject

-      ;CoordArray::Add(const int&)
-      Add__10CoordArrayFRCi

       ;CoordArray::operator=(const CoordArray&)
       __as__10CoordArrayFRC10CoordArray
       ;CoordArray::~CoordArray()
       ;CoordArray::operator=(const CoordArray&)
       __as__10CoordArrayFRC10CoordArray
       ;CoordArray::~CoordArray()


@@ -10898,6 +11330,8 @@ EXPORTS
       sm_classHTML_ModuleImage__16HTML_ModuleImage
       ;_link_dummy_func_m_image()
       _link_dummy_func_m_image__Fv
       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
       ;CoordArray::DoEmpty()
       DoEmpty__10CoordArrayFv
       __vft18wxHtmlImageMapCell8wxObject


@@ -10905,16 +11339,16 @@ EXPORTS
       DoCopy__10CoordArrayFRC10CoordArray
       ;CoordArray::CoordArray(const CoordArray&)
       __ct__10CoordArrayFRC10CoordArray
       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
       ;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::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()
       ;wxHtmlImageCell::GetLink(int,int) const
       GetLink__15wxHtmlImageCellCFiT1
       ;wxHtmlImageCell::~wxHtmlImageCell()


@@ -11080,12 +11514,12 @@ EXPORTS
       wxConstructorForwxAcceleratorTable__Fv
       ;wxAcceleratorTable::SetHACCEL(unsigned long)
       SetHACCEL__18wxAcceleratorTableFUl
       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()
       __dt__18wxAcceleratorTableFv
       ;wxAcceleratorTable::Ok() const
       Ok__18wxAcceleratorTableCFv

+      ;wxAcceleratorTable::wxAcceleratorTable(int,const wxAcceleratorEntry*)
+      __ct__18wxAcceleratorTableFiPC18wxAcceleratorEntry

       __vft20wxAcceleratorRefData15wxObjectRefData
       ;wxAcceleratorTable::wxAcceleratorTable()
       __ct__18wxAcceleratorTableFv
       __vft20wxAcceleratorRefData15wxObjectRefData
       ;wxAcceleratorTable::wxAcceleratorTable()
       __ct__18wxAcceleratorTableFv


@@ -11134,10 +11568,8 @@ EXPORTS
       OnIdle__5wxAppFR11wxIdleEvent
       ;wxMsgArray::wxMsgArray(const wxMsgArray&)
       __ct__10wxMsgArrayFRC10wxMsgArray
       OnIdle__5wxAppFR11wxIdleEvent
       ;wxMsgArray::wxMsgArray(const wxMsgArray&)
       __ct__10wxMsgArrayFRC10wxMsgArray

-      ;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
       wxDEFAULT_MDIPARENTFRAME_ICON
       ;wxApp::wxApp()
       __ct__5wxAppFv


@@ -11147,8 +11579,8 @@ EXPORTS
       ProcessMessage__5wxAppFPPv
       ;wxApp::OnInitGui()
       OnInitGui__5wxAppFv
       ProcessMessage__5wxAppFPPv
       ;wxApp::OnInitGui()
       OnInitGui__5wxAppFv

-      ;wxMsgArray::Add(const _QMSG&)
-      Add__10wxMsgArrayFRC5_QMSG
+      ;wxApp::HandleSockets()
+      HandleSockets__5wxAppFv

       ;wxApp::OnQueryEndSession(wxCloseEvent&)
       OnQueryEndSession__5wxAppFR12wxCloseEvent
       __vft5wxApp8wxObject
       ;wxApp::OnQueryEndSession(wxCloseEvent&)
       OnQueryEndSession__5wxAppFR12wxCloseEvent
       __vft5wxApp8wxObject


@@ -11172,11 +11604,9 @@ EXPORTS
       GetEventTable__5wxAppCFv
       ;wxSetInstance(unsigned long)
       wxSetInstance__FUl
       GetEventTable__5wxAppCFv
       ;wxSetInstance(unsigned long)
       wxSetInstance__FUl

-      ;wxMsgArray::RemoveAt(unsigned int)
-      RemoveAt__10wxMsgArrayFUi
+      ;wxMsgArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__10wxMsgArrayFUiT1

       wxGetInstance
       wxGetInstance

-      ;wxApp::GetStdIcon(int) const
-      GetStdIcon__5wxAppCFi

       ;wxMsgArray::~wxMsgArray()
       __dt__10wxMsgArrayFv
       wxSTD_MDIPARENTFRAME_ICON
       ;wxMsgArray::~wxMsgArray()
       __dt__10wxMsgArrayFv
       wxSTD_MDIPARENTFRAME_ICON


@@ -11193,6 +11623,8 @@ EXPORTS
       sm_eventTable__5wxApp
       ;wxApp::Initialize(unsigned long)
       Initialize__5wxAppFUl
       sm_eventTable__5wxApp
       ;wxApp::Initialize(unsigned long)
       Initialize__5wxAppFUl

+      ;wxMsgArray::Add(const _QMSG&,unsigned int)
+      Add__10wxMsgArrayFRC5_QMSGUi

       ;wxAppBase::m_appInitFn
       m_appInitFn__9wxAppBase
       ;wxApp::DoMessage()
       ;wxAppBase::m_appInitFn
       m_appInitFn__9wxAppBase
       ;wxApp::DoMessage()


@@ -11232,12 +11664,10 @@ EXPORTS
       Create__8wxBitmapFPvliN23
       ;wxBitmap::GetBitmapForDC(wxDC&) const
       GetBitmapForDC__8wxBitmapCFR4wxDC
       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
       ;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)
       ;wxMask::Create(const wxBitmap&)
       Create__6wxMaskFRC8wxBitmap
       ;wxBitmapHandler::Create(wxBitmap*,void*,long,int,int,int)


@@ -11255,8 +11685,6 @@ EXPORTS
       wxInvertMask__FUliT2
       ;wxMask::wxMask()
       __ct__6wxMaskFv
       wxInvertMask__FUliT2
       ;wxMask::wxMask()
       __ct__6wxMaskFv

-      ;wxBitmap::wxBitmap(const char**)
-      __ct__8wxBitmapFPPCc

       ;wxMask::sm_classwxMask
       sm_classwxMask__6wxMask
       __vft8wxBitmap8wxObject
       ;wxMask::sm_classwxMask
       sm_classwxMask__6wxMask
       __vft8wxBitmap8wxObject


@@ -11271,36 +11699,38 @@ EXPORTS
       __ct__8wxBitmapFPCciN22
       ;wxBitmapRefData::wxBitmapRefData()
       __ct__15wxBitmapRefDataFv
       __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
       ;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
       ;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
       ;wxConstructorForwxBitmapHandler()
       wxConstructorForwxBitmapHandler__Fv

+      ;wxBitmapHandler::LoadFile(wxBitmap*,int,long,int,int)
+      LoadFile__15wxBitmapHandlerFP8wxBitmapilN22

       ;wxBitmapRefData::Free()
       Free__15wxBitmapRefDataFv
       ;wxBitmapRefData::Free()
       Free__15wxBitmapRefDataFv

+      ;wxBitmap::wxBitmap(int,long)
+      __ct__8wxBitmapFil

       ;wxBitmap::sm_classwxBitmap
       sm_classwxBitmap__8wxBitmap
       ;wxBitmap::sm_classwxBitmap
       sm_classwxBitmap__8wxBitmap

-      ;wxBitmapHandler::Load(wxGDIImage*,const wxString&,unsigned long,long,int,int)
-      Load__15wxBitmapHandlerFP10wxGDIImageRC8wxStringUlliT5

       ;wxConstructorForwxBitmap()
       wxConstructorForwxBitmap__Fv
       ;wxConstructorForwxMask()
       wxConstructorForwxMask__Fv
       ;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
       ;wxBitmap::SetMask(wxMask*)
       SetMask__8wxBitmapFP6wxMask
   ;From object file:  ..\os2\bmpbuttn.cpp


@@ -11368,12 +11798,20 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxButton::Command(wxCommandEvent&)
       Command__8wxButtonFR14wxCommandEvent
     ;PUBDEFs (Symbols available from object file):
       ;wxButton::Command(wxCommandEvent&)
       Command__8wxButtonFR14wxCommandEvent

-      ;wxButton::MakeOwnerDrawn()
-      MakeOwnerDrawn__8wxButtonFv
+      ;wxButton::SetDefaultStyle(wxButton*,unsigned long)
+      SetDefaultStyle__8wxButtonFP8wxButtonUl
+      ;wxButton::SetTmpDefault()
+      SetTmpDefault__8wxButtonFv

       ;wxButton::WindowProc(unsigned int,void*,void*)
       WindowProc__8wxButtonFUiPvT2
       ;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::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
       OnCtlColor__8wxButtonFUlT1UiT3PvT5

+      ;wxButton::UnsetTmpDefault()
+      UnsetTmpDefault__8wxButtonFv

       ;wxButton::~wxButton()
       __dt__8wxButtonFv
       ;wxButton::SendClickEvent()
       ;wxButton::~wxButton()
       __dt__8wxButtonFv
       ;wxButton::SendClickEvent()


@@ -11464,6 +11902,8 @@ EXPORTS
       SetFont__14wxCheckListBoxFRC6wxFont
       ;wxCheckListBox::OnLeftClick(wxMouseEvent&)
       OnLeftClick__14wxCheckListBoxFR12wxMouseEvent
       SetFont__14wxCheckListBoxFRC6wxFont
       ;wxCheckListBox::OnLeftClick(wxMouseEvent&)
       OnLeftClick__14wxCheckListBoxFR12wxMouseEvent

+      ;wxCheckListBox::OS2OnMeasure(void**)
+      OS2OnMeasure__14wxCheckListBoxFPPv

   ;From object file:  ..\os2\choice.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxChoice::DoGetItemClientData(int) const
   ;From object file:  ..\os2\choice.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxChoice::DoGetItemClientData(int) const


@@ -11563,10 +12003,10 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxColour::Set(unsigned char,unsigned char,unsigned char)
       Set__8wxColourFUcN21
     ;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::operator=(const wxColour&)
       __as__8wxColourFRC8wxColour

+      ;wxColour::wxColour()
+      __ct__8wxColourFv

       ;wxColour::InitFromName(const wxString&)
       InitFromName__8wxColourFRC8wxString
       ;wxConstructorForwxColour()
       ;wxColour::InitFromName(const wxString&)
       InitFromName__8wxColourFRC8wxString
       ;wxConstructorForwxColour()


@@ -11574,12 +12014,12 @@ EXPORTS
       __vft8wxColour8wxObject
       ;wxColour::wxColour(unsigned char,unsigned char,unsigned char)
       __ct__8wxColourFUcN21
       __vft8wxColour8wxObject
       ;wxColour::wxColour(unsigned char,unsigned char,unsigned char)
       __ct__8wxColourFUcN21

-      ;wxColour::~wxColour()
-      __dt__8wxColourFv
-      ;wxColour::sm_classwxColour
-      sm_classwxColour__8wxColour

       ;wxColour::wxColour(const wxColour&)
       __ct__8wxColourFRC8wxColour
       ;wxColour::wxColour(const wxColour&)
       __ct__8wxColourFRC8wxColour

+      ;wxColour::sm_classwxColour
+      sm_classwxColour__8wxColour
+      ;wxColour::~wxColour()
+      __dt__8wxColourFv

   ;From object file:  ..\os2\combobox.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxComboBox::sm_classwxComboBox
   ;From object file:  ..\os2\combobox.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxComboBox::sm_classwxComboBox


@@ -11625,16 +12065,16 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxControl::OnEraseBackground(wxEraseEvent&)
       OnEraseBackground__9wxControlFR12wxEraseEvent
     ;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::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_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&)
       ;wxControl::DoGetBestSize() const
       DoGetBestSize__9wxControlCFv
       ;wxControl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)


@@ -11647,36 +12087,31 @@ EXPORTS
       __ct__9wxControlFv
       ;wxControl::GetEventTable() const
       GetEventTable__9wxControlCFv
       __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
       ;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):
   ;From object file:  ..\os2\cursor.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxCursorRefData::~wxCursorRefData()
-      __dt__15wxCursorRefDataFv
+      ;wxCursor::wxCursor(const wxImage&)
+      __ct__8wxCursorFRC7wxImage

       ;wxCursor::wxCursor(const wxString&,long,int,int)
       __ct__8wxCursorFRC8wxStringliT3
       ;wxCursor::wxCursor(const wxString&,long,int,int)
       __ct__8wxCursorFRC8wxStringliT3

-      __vft8wxCursor8wxObject

       ;wxCursor::wxCursor(int)
       __ct__8wxCursorFi
       ;wxCursor::wxCursor(int)
       __ct__8wxCursorFi

-      ;wxConstructorForwxCursor()
-      wxConstructorForwxCursor__Fv

       ;wxCursorRefData::wxCursorRefData()
       __ct__15wxCursorRefDataFv
       ;wxCursorRefData::wxCursorRefData()
       __ct__15wxCursorRefDataFv

-      ;wxCursor::SetHCURSOR(unsigned long)
-      SetHCURSOR__8wxCursorFUl
+      ;wxConstructorForwxCursor()
+      wxConstructorForwxCursor__Fv
+      ;wxCursorRefData::Free()
+      Free__15wxCursorRefDataFv

       ;wxCursor::sm_classwxCursor
       sm_classwxCursor__8wxCursor
       ;wxCursor::sm_classwxCursor
       sm_classwxCursor__8wxCursor

-      ;wxCursor::FreeResource(unsigned long)
-      FreeResource__8wxCursorFUl

       ;wxSetCursor(const wxCursor&)
       wxSetCursor__FRC8wxCursor
       ;wxSetCursor(const wxCursor&)
       wxSetCursor__FRC8wxCursor

-      ;wxCursor::~wxCursor()
-      __dt__8wxCursorFv

       ;wxCursor::wxCursor(const char*,int,int,int,int,const char*)
       __ct__8wxCursorFPCciN32T1
       __vft15wxCursorRefData15wxObjectRefData
       ;wxCursor::wxCursor(const char*,int,int,int,int,const char*)
       __ct__8wxCursorFPCciN32T1
       __vft15wxCursorRefData15wxObjectRefData


@@ -11730,7 +12165,6 @@ EXPORTS
       wxGaugeNameStr
       wxGREEN
       wxFrameNameStr
       wxGaugeNameStr
       wxGREEN
       wxFrameNameStr

-      wxFatalErrorStr

       wxDefaultPosition
       wxBitmapRadioButtonNameStr
       wxTheBitmapList
       wxDefaultPosition
       wxBitmapRadioButtonNameStr
       wxTheBitmapList


@@ -11780,7 +12214,6 @@ EXPORTS
       wxStatusLineNameStr
       wxRadioBoxNameStr
       wxLIGHT_GREY_PEN
       wxStatusLineNameStr
       wxRadioBoxNameStr
       wxLIGHT_GREY_PEN

-      wxInternalErrorStr

       wxGREY_PEN
       wxFileSelectorDefaultWildcardStr
       wxDoubleToStringStr
       wxGREY_PEN
       wxFileSelectorDefaultWildcardStr
       wxDoubleToStringStr


@@ -11932,6 +12365,8 @@ EXPORTS
       QueryTextBkColor__FUl
       ;wxDC::SelectOldObjects(unsigned long)
       SelectOldObjects__4wxDCFUl
       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)
       ;SetBkMode(unsigned long,int)
       SetBkMode__FUli
       ;wxDC::DoSetClippingRegion(int,int,int,int)


@@ -11954,6 +12389,8 @@ EXPORTS
       DoDrawIcon__4wxDCFRC6wxIconiT2
       ;wxDC::StartPage()
       StartPage__4wxDCFv
       DoDrawIcon__4wxDCFRC6wxIconiT2
       ;wxDC::StartPage()
       StartPage__4wxDCFv

+      ;wxDC::InitializePalette()
+      InitializePalette__4wxDCFv

       ;wxDC::GetCharWidth() const
       GetCharWidth__4wxDCCFv
       ;wxDC::DoDrawRotatedText(const wxString&,int,int,double)
       ;wxDC::GetCharWidth() const
       GetCharWidth__4wxDCCFv
       ;wxDC::DoDrawRotatedText(const wxString&,int,int,double)


@@ -11990,8 +12427,10 @@ EXPORTS
       InitDC__10wxClientDCFv
       ;wxArrayDCInfo::DoCopy(const wxArrayDCInfo&)
       DoCopy__13wxArrayDCInfoFRC13wxArrayDCInfo
       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&)
       ;wxPaintDC::wxPaintDC()
       __ct__9wxPaintDCFv
       ;wxArrayDCInfo::operator=(const wxArrayDCInfo&)


@@ -12000,8 +12439,9 @@ EXPORTS
       __ct__10wxClientDCFP8wxWindow
       ;wxPaintDC::FindDCInCache(wxWindow*)
       FindDCInCache__9wxPaintDCFP8wxWindow
       __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()
       ;wxConstructorForwxWindowDC()
       wxConstructorForwxWindowDC__Fv
       ;wxPaintDC::~wxPaintDC()


@@ -12012,20 +12452,22 @@ EXPORTS
       __ct__9wxPaintDCFP8wxWindow
       ;wxArrayDCInfo::Index(const wxPaintDCInfo&,unsigned long) const
       Index__13wxArrayDCInfoCFRC13wxPaintDCInfoUl
       __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
       ;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::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()
       ;wxArrayDCInfo::~wxArrayDCInfo()
       __dt__13wxArrayDCInfoFv
       ;wxConstructorForwxClientDC()


@@ -12052,8 +12494,6 @@ EXPORTS
       DoGetSize__10wxMemoryDCCFPiT1
       ;wxMemoryDC::wxMemoryDC(wxDC*)
       __ct__10wxMemoryDCFP4wxDC
       DoGetSize__10wxMemoryDCCFPiT1
       ;wxMemoryDC::wxMemoryDC(wxDC*)
       __ct__10wxMemoryDCFP4wxDC

-      ;wxMemoryDC::DoDrawRectangle(int,int,int,int)
-      DoDrawRectangle__10wxMemoryDCFiN31

       ;wxMemoryDC::wxMemoryDC()
       __ct__10wxMemoryDCFv
       ;wxMemoryDC::sm_classwxMemoryDC
       ;wxMemoryDC::wxMemoryDC()
       __ct__10wxMemoryDCFv
       ;wxMemoryDC::sm_classwxMemoryDC


@@ -12093,6 +12533,9 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxConstructorForwxScreenDC()
       wxConstructorForwxScreenDC__Fv
     ;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()
       ;wxScreenDC::sm_classwxScreenDC
       sm_classwxScreenDC__10wxScreenDC
       ;wxScreenDC::wxScreenDC()


@@ -12187,8 +12630,6 @@ EXPORTS
       Revoke__12wxDropTargetFUl
       ;wxDropTarget::Register(unsigned long)
       Register__12wxDropTargetFUl
       Revoke__12wxDropTargetFUl
       ;wxDropTarget::Register(unsigned long)
       Register__12wxDropTargetFUl

-      ;wxDropSource::DoDragDrop(unsigned long)
-      DoDragDrop__12wxDropSourceFUl

       ;wxDropTarget::OnDrop(int,int)
       OnDrop__12wxDropTargetFiT1
       ;wxDropTarget::GetData()
       ;wxDropTarget::OnDrop(int,int)
       OnDrop__12wxDropTargetFiT1
       ;wxDropTarget::GetData()


@@ -12201,6 +12642,8 @@ EXPORTS
       OnDragOver__12wxDropTargetFiT112wxDragResult
       ;wxDropTarget::~wxDropTarget()
       __dt__12wxDropTargetFv
       OnDragOver__12wxDropTargetFiT112wxDragResult
       ;wxDropTarget::~wxDropTarget()
       __dt__12wxDropTargetFv

+      ;wxDropSource::DoDragDrop(int)
+      DoDragDrop__12wxDropSourceFi

       ;wxDropSource::Init()
       Init__12wxDropSourceFv
       ;wxDropTarget::IsAcceptable(_DRAGINFO*)
       ;wxDropSource::Init()
       Init__12wxDropSourceFv
       ;wxDropTarget::IsAcceptable(_DRAGINFO*)


@@ -12219,6 +12662,8 @@ EXPORTS
       __ct__12wxFileDialogFP8wxWindowRC8wxStringN32lRC7wxPoint
       ;wxFileDialog::ShowModal()
       ShowModal__12wxFileDialogFv
       __ct__12wxFileDialogFP8wxWindowRC8wxStringN32lRC7wxPoint
       ;wxFileDialog::ShowModal()
       ShowModal__12wxFileDialogFv

+      ;wxFileDialog::GetPaths(wxArrayString&) const
+      GetPaths__12wxFileDialogCFR13wxArrayString

       __vft12wxFileDialog8wxObject
       ;wxFileDialog::sm_classwxFileDialog
       sm_classwxFileDialog__12wxFileDialog
       __vft12wxFileDialog8wxObject
       ;wxFileDialog::sm_classwxFileDialog
       sm_classwxFileDialog__12wxFileDialog


@@ -12337,16 +12782,10 @@ EXPORTS
       ;wxConstructorForwxFontDialog()
       wxConstructorForwxFontDialog__Fv
       __vft12wxFontDialog8wxObject
       ;wxConstructorForwxFontDialog()
       wxConstructorForwxFontDialog__Fv
       __vft12wxFontDialog8wxObject

-      ;wxFontDialog::wxFontDialog(wxWindow*,wxFontData*)
-      __ct__12wxFontDialogFP8wxWindowP10wxFontData
-      ;wxFontDialog::wxFontDialog()
-      __ct__12wxFontDialogFv

       ;wxFontDialog::ShowModal()
       ShowModal__12wxFontDialogFv
       ;wxFontDialog::sm_classwxFontDialog
       sm_classwxFontDialog__12wxFontDialog
       ;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)
   ;From object file:  ..\os2\fontenum.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxFontEnumerator::EnumerateFacenames(wxFontEncoding,unsigned long)


@@ -12376,6 +12815,8 @@ EXPORTS
       wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCPUlT3PlR8wxStringP6wxFont
       ;wxGetNativeFontEncoding(wxFontEncoding,wxNativeEncodingInfo*)
       wxGetNativeFontEncoding__F14wxFontEncodingP20wxNativeEncodingInfo
       wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCPUlT3PlR8wxStringP6wxFont
       ;wxGetNativeFontEncoding(wxFontEncoding,wxNativeEncodingInfo*)
       wxGetNativeFontEncoding__F14wxFontEncodingP20wxNativeEncodingInfo

+      ;wxConvertVectorFontSize(long,_FATTRS*)
+      wxConvertVectorFontSize__FlP7_FATTRS

       ;wxOS2SelectMatchingFontByName(_FATTRS*,_FACENAMEDESC*,_FONTMETRICS*,int,const wxFont*)
       wxOS2SelectMatchingFontByName__FP7_FATTRSP13_FACENAMEDESCP12_FONTMETRICSiPC6wxFont
       ;wxGpiStrcmp(char*,char*)
       ;wxOS2SelectMatchingFontByName(_FATTRS*,_FACENAMEDESC*,_FONTMETRICS*,int,const wxFont*)
       wxOS2SelectMatchingFontByName__FP7_FATTRSP13_FACENAMEDESCP12_FONTMETRICSiPC6wxFont
       ;wxGpiStrcmp(char*,char*)


@@ -12388,12 +12829,12 @@ EXPORTS
       HandleMenuSelect__7wxFrameFUsT1Ul
       ;wxFrame::OS2TranslateMessage(void**)
       OS2TranslateMessage__7wxFrameFPPv
       HandleMenuSelect__7wxFrameFUsT1Ul
       ;wxFrame::OS2TranslateMessage(void**)
       OS2TranslateMessage__7wxFrameFPPv

+      ;wxFrame::SendSizeEvent()
+      SendSizeEvent__7wxFrameFv

       ;wxFrame::HandlePaint()
       HandlePaint__7wxFrameFv
       ;wxFrame::OnCreateStatusBar(int,long,int,const wxString&)
       OnCreateStatusBar__7wxFrameFilT1RC8wxString
       ;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
       __vft7wxFrame8wxObject
       ;wxFrame::DoSetClientSize(int,int)
       DoSetClientSize__7wxFrameFiT1


@@ -12453,8 +12894,10 @@ EXPORTS
       GetEventTable__7wxFrameCFv
       ;wxFrame::DetachMenuBar()
       DetachMenuBar__7wxFrameFv
       GetEventTable__7wxFrameCFv
       ;wxFrame::DetachMenuBar()
       DetachMenuBar__7wxFrameFv

-      wxFrameMainWndProc
+      ;wxFrame::OnCreateToolBar(long,int,const wxString&)
+      OnCreateToolBar__7wxFrameFliRC8wxString

       wxFrameWndProc
       wxFrameWndProc

+      wxFrameMainWndProc

       ;wxFrame::SetClient(wxWindow*)
       SetClient__7wxFrameFP8wxWindow
   ;From object file:  ..\os2\gauge.cpp
       ;wxFrame::SetClient(wxWindow*)
       SetClient__7wxFrameFP8wxWindow
   ;From object file:  ..\os2\gauge.cpp


@@ -12508,6 +12951,8 @@ EXPORTS
       wxConstructorForwxICOResourceHandler__Fv
       ;wxBMPFileHandler::sm_classwxBMPFileHandler
       sm_classwxBMPFileHandler__16wxBMPFileHandler
       wxConstructorForwxICOResourceHandler__Fv
       ;wxBMPFileHandler::sm_classwxBMPFileHandler
       sm_classwxBMPFileHandler__16wxBMPFileHandler

+      ;wxBMPResourceHandler::LoadFile(wxBitmap*,int,long,int,int)
+      LoadFile__20wxBMPResourceHandlerFP8wxBitmapilN22

       ;wxGDIImage::CleanUpHandlers()
       CleanUpHandlers__10wxGDIImageFv
       ;wxGDIImage::AddHandler(wxGDIImageHandler*)
       ;wxGDIImage::CleanUpHandlers()
       CleanUpHandlers__10wxGDIImageFv
       ;wxGDIImage::AddHandler(wxGDIImageHandler*)


@@ -12515,8 +12960,6 @@ EXPORTS
       ;wxGDIImage::FindHandler(long)
       FindHandler__10wxGDIImageFl
       __vft20wxBMPResourceHandler8wxObject
       ;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()
       ;wxICOResourceHandler::LoadIcon(wxIcon*,const wxString&,unsigned long,long,int,int)
       LoadIcon__20wxICOResourceHandlerFP6wxIconRC8wxStringUlliT5
       ;wxConstructorForwxBMPResourceHandler()


@@ -13027,14 +13470,18 @@ EXPORTS
       sm_classwxMenuBar__9wxMenuBar
       ;wxMenuBar::RebuildAccelTable()
       RebuildAccelTable__9wxMenuBarFv
       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::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::DoRemove(wxMenuItem*)
       DoRemove__6wxMenuFP10wxMenuItem

+      ;wxMenu::DoAppend(wxMenuItem*)
+      DoAppend__6wxMenuFP10wxMenuItem

       ;wxMenu::CopyAccels(wxAcceleratorEntry*) const
       CopyAccels__6wxMenuCFP18wxAcceleratorEntry
       ;wxMenuBar::Refresh()
       ;wxMenu::CopyAccels(wxAcceleratorEntry*) const
       CopyAccels__6wxMenuCFP18wxAcceleratorEntry
       ;wxMenuBar::Refresh()


@@ -13065,25 +13512,35 @@ EXPORTS
       GetRealId__10wxMenuItemCFv
       ;wxMenuItem::SetCheckable(unsigned long)
       SetCheckable__10wxMenuItemFUl
       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::IsChecked() const
       IsChecked__10wxMenuItemCFv

+      ;wxMenuItem::SetAsRadioGroupStart()
+      SetAsRadioGroupStart__10wxMenuItemFv

       ;wxMenuItemBase::GetLabelFromText(const wxString&)
       GetLabelFromText__14wxMenuItemBaseFRC8wxString
       ;wxMenuItem::SetText(const wxString&)
       SetText__10wxMenuItemFRC8wxString
       ;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::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
       ;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):
       __vft10wxMenuItem12wxOwnerDrawn
   ;From object file:  ..\os2\metafile.cpp
     ;PUBDEFs (Symbols available from object file):


@@ -13134,14 +13591,14 @@ EXPORTS
       GetDescription__14wxFileTypeImplCFP8wxString
       ;wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString&)
       EnumAllFileTypes__22wxMimeTypesManagerImplFR13wxArrayString
       GetDescription__14wxFileTypeImplCFP8wxString
       ;wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString&)
       EnumAllFileTypes__22wxMimeTypesManagerImplFR13wxArrayString

+      ;wxFileTypeImpl::GetIcon(wxIcon*,wxString*,int*) const
+      GetIcon__14wxFileTypeImplCFP6wxIconP8wxStringPi

       ;wxFileTypeImpl::GetOpenCommand(wxString*,const wxFileType::MessageParameters&) const
       GetOpenCommand__14wxFileTypeImplCFP8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxFileTypeImpl::GetPrintCommand(wxString*,const wxFileType::MessageParameters&) const
       GetPrintCommand__14wxFileTypeImplCFP8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString&)
       GetFileTypeFromExtension__22wxMimeTypesManagerImplFRC8wxString
       ;wxFileTypeImpl::GetOpenCommand(wxString*,const wxFileType::MessageParameters&) const
       GetOpenCommand__14wxFileTypeImplCFP8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxFileTypeImpl::GetPrintCommand(wxString*,const wxFileType::MessageParameters&) const
       GetPrintCommand__14wxFileTypeImplCFP8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString&)
       GetFileTypeFromExtension__22wxMimeTypesManagerImplFRC8wxString

-      ;wxFileTypeImpl::GetIcon(wxIcon*) const
-      GetIcon__14wxFileTypeImplCFP6wxIcon

       ;wxFileTypeImpl::GetCommand(const char*) const
       GetCommand__14wxFileTypeImplCFPCc
       ;wxFileTypeImpl::GetMimeTypes(wxArrayString&) const
       ;wxFileTypeImpl::GetCommand(const char*) const
       GetCommand__14wxFileTypeImplCFPCc
       ;wxFileTypeImpl::GetMimeTypes(wxArrayString&) const


@@ -13195,8 +13652,6 @@ EXPORTS
       DeleteAllPages__10wxNotebookFv
       ;wxNotebook::SetPageText(int,const wxString&)
       SetPageText__10wxNotebookFiRC8wxString
       DeleteAllPages__10wxNotebookFv
       ;wxNotebook::SetPageText(int,const wxString&)
       SetPageText__10wxNotebookFiRC8wxString

-      ;wxNotebook::AdvanceSelection(unsigned long)
-      AdvanceSelection__10wxNotebookFUl

       wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
       ;wxNotebook::ChangePage(int,int)
       ChangePage__10wxNotebookFiT1
       wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
       ;wxNotebook::ChangePage(int,int)
       ChangePage__10wxNotebookFiT1


@@ -13206,6 +13661,8 @@ EXPORTS
       SetPageSize__10wxNotebookFRC6wxSize
       ;wxNotebook::AddPage(wxWindow*,const wxString&,unsigned long,int)
       AddPage__10wxNotebookFP8wxWindowRC8wxStringUli
       SetPageSize__10wxNotebookFRC6wxSize
       ;wxNotebook::AddPage(wxWindow*,const wxString&,unsigned long,int)
       AddPage__10wxNotebookFP8wxWindowRC8wxStringUli

+      ;wxNotebook::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__10wxNotebookCFlPUl

       ;wxNotebook::OnSize(wxSizeEvent&)
       OnSize__10wxNotebookFR11wxSizeEvent
       ;wxNotebook::SetSelection(int)
       ;wxNotebook::OnSize(wxSizeEvent&)
       OnSize__10wxNotebookFR11wxSizeEvent
       ;wxNotebook::SetSelection(int)


@@ -13214,8 +13671,6 @@ EXPORTS
       SetPageImage__10wxNotebookFiT1
       ;wxNotebook::DoPhase(int)
       DoPhase__10wxNotebookFi
       SetPageImage__10wxNotebookFiT1
       ;wxNotebook::DoPhase(int)
       DoPhase__10wxNotebookFi

-      ;wxNotebook::DeletePage(int)
-      DeletePage__10wxNotebookFi

       ;wxNotebook::GetPageCount() const
       GetPageCount__10wxNotebookCFv
       ;wxNotebook::wxNotebook(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       ;wxNotebook::GetPageCount() const
       GetPageCount__10wxNotebookCFv
       ;wxNotebook::wxNotebook(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)


@@ -13236,8 +13691,6 @@ EXPORTS
       wxConstructorForwxNotebook__Fv
       ;wxConstructorForwxNotebookEvent()
       wxConstructorForwxNotebookEvent__Fv
       wxConstructorForwxNotebook__Fv
       ;wxConstructorForwxNotebookEvent()
       wxConstructorForwxNotebookEvent__Fv

-      ;wxNotebook::OS2OnNotify(int,void*,void**)
-      OS2OnNotify__10wxNotebookFiPvPPv

       ;wxNotebook::Init()
       Init__10wxNotebookFv
       ;wxNotebook::sm_classwxNotebook
       ;wxNotebook::Init()
       Init__10wxNotebookFv
       ;wxNotebook::sm_classwxNotebook


@@ -13245,17 +13698,17 @@ EXPORTS
       wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
       ;wxNotebook::sm_eventTable
       sm_eventTable__10wxNotebook
       wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
       ;wxNotebook::sm_eventTable
       sm_eventTable__10wxNotebook

+      ;wxNotebook::OS2OnScroll(int,unsigned short,unsigned short,unsigned long)
+      OS2OnScroll__10wxNotebookFiUsT2Ul

       __vft10wxNotebook8wxObject
       ;wxNotebook::GetPageImage(int) const
       GetPageImage__10wxNotebookCFi
       __vft10wxNotebook8wxObject
       ;wxNotebook::GetPageImage(int) const
       GetPageImage__10wxNotebookCFi

-      ;wxNotebook::RemovePage(int)
-      RemovePage__10wxNotebookFi

       ;wxNotebook::InsertPage(int,wxWindow*,const wxString&,unsigned long,int)
       InsertPage__10wxNotebookFiP8wxWindowRC8wxStringUlT1
       ;wxNotebook::InsertPage(int,wxWindow*,const wxString&,unsigned long,int)
       InsertPage__10wxNotebookFiP8wxWindowRC8wxStringUlT1

+      ;wxNotebook::DoRemovePage(int)
+      DoRemovePage__10wxNotebookFi

       ;wxNotebook::GetEventTable() const
       GetEventTable__10wxNotebookCFv
       ;wxNotebook::GetEventTable() const
       GetEventTable__10wxNotebookCFv

-      ;wxNotebook::~wxNotebook()
-      __dt__10wxNotebookFv

       ;wxNotebook::GetRowCount() const
       GetRowCount__10wxNotebookCFv
       ;wxNotebook::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       ;wxNotebook::GetRowCount() const
       GetRowCount__10wxNotebookCFv
       ;wxNotebook::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)


@@ -13355,58 +13808,21 @@ EXPORTS
       __dt__12wxPenRefDataFv
       ;wxPen::SetColour(const wxColour&)
       SetColour__5wxPenFRC8wxColour
       __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)
   ;From object file:  ..\os2\print.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPrintPreview::Print(unsigned long)


@@ -13484,6 +13900,7 @@ EXPORTS
       GetRowCount__10wxRadioBoxCFv
       ;wxRadioBox::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,int,const wxString*,int,long,const wxValidator&,const wxString&)
       Create__10wxRadioBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizeT2PC8wxStringT2lRC11wxValidatorT3
       GetRowCount__10wxRadioBoxCFv
       ;wxRadioBox::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,int,const wxString*,int,long,const wxValidator&,const wxString&)
       Create__10wxRadioBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizeT2PC8wxStringT2lRC11wxValidatorT3

+      wxRadioBoxWndProc

       ;wxRadioBox::FindString(const wxString&) const
       FindString__10wxRadioBoxCFRC8wxString
       __vft10wxRadioBox8wxObject
       ;wxRadioBox::FindString(const wxString&) const
       FindString__10wxRadioBoxCFRC8wxString
       __vft10wxRadioBox8wxObject


@@ -13541,6 +13958,8 @@ EXPORTS
       SetValue__13wxRadioButtonFUl
       ;wxRadioButton::GetValue() const
       GetValue__13wxRadioButtonCFv
       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)
   ;From object file:  ..\os2\region.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxRegion::Combine(const wxRect&,wxRegionOp)


@@ -13693,6 +14112,8 @@ EXPORTS
       GetPosition__8wxSliderCFPiT1
       ;wxSlider::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
       OnCtlColor__8wxSliderFUlT1UiT3PvT5
       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()
       ;wxConstructorForwxSlider()
       wxConstructorForwxSlider__Fv
       ;wxSlider::wxSlider()


@@ -13776,6 +14197,8 @@ EXPORTS
       m_svAllSpins__10wxSpinCtrl
       ;wxSpinCtrl::DoGetPosition(int*,int*) const
       DoGetPosition__10wxSpinCtrlCFPiT1
       m_svAllSpins__10wxSpinCtrl
       ;wxSpinCtrl::DoGetPosition(int*,int*) const
       DoGetPosition__10wxSpinCtrlCFPiT1

+      ;wxSpinCtrl::SetSelection(long,long)
+      SetSelection__10wxSpinCtrlFlT1

       ;wxSpinCtrl::DoMoveWindow(int,int,int,int)
       DoMoveWindow__10wxSpinCtrlFiN31
       wxSpinCtrlWndProc
       ;wxSpinCtrl::DoMoveWindow(int,int,int,int)
       DoMoveWindow__10wxSpinCtrlFiN31
       wxSpinCtrlWndProc


@@ -13809,11 +14232,19 @@ EXPORTS
       GetValue__10wxSpinCtrlCFv
   ;From object file:  ..\os2\statbmp.cpp
     ;PUBDEFs (Symbols available from object file):
       GetValue__10wxSpinCtrlCFv
   ;From object file:  ..\os2\statbmp.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxStaticBitmap::OnPaint(wxPaintEvent&)
+      OnPaint__14wxStaticBitmapFR12wxPaintEvent
+      ;wxStaticBitmap::sm_eventTable
+      sm_eventTable__14wxStaticBitmap
+      ;wxStaticBitmap::sm_eventTableEntries
+      sm_eventTableEntries__14wxStaticBitmap

       __vft14wxStaticBitmap8wxObject
       ;wxStaticBitmap::Free()
       Free__14wxStaticBitmapFv
       ;wxStaticBitmap::Create(wxWindow*,int,const wxGDIImage&,const wxPoint&,const wxSize&,long,const wxString&)
       Create__14wxStaticBitmapFP8wxWindowiRC10wxGDIImageRC7wxPointRC6wxSizelRC8wxString
       __vft14wxStaticBitmap8wxObject
       ;wxStaticBitmap::Free()
       Free__14wxStaticBitmapFv
       ;wxStaticBitmap::Create(wxWindow*,int,const wxGDIImage&,const wxPoint&,const wxSize&,long,const wxString&)
       Create__14wxStaticBitmapFP8wxWindowiRC10wxGDIImageRC7wxPointRC6wxSizelRC8wxString

+      ;wxStaticBitmap::GetEventTable() const
+      GetEventTable__14wxStaticBitmapCFv

       ;wxStaticBitmap::sm_classwxStaticBitmap
       sm_classwxStaticBitmap__14wxStaticBitmap
       ;wxStaticBitmap::SetImage(const wxGDIImage&)
       ;wxStaticBitmap::sm_classwxStaticBitmap
       sm_classwxStaticBitmap__14wxStaticBitmap
       ;wxStaticBitmap::SetImage(const wxGDIImage&)


@@ -13862,8 +14293,11 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxStaticLine::sm_classwxStaticLine
       sm_classwxStaticLine__12wxStaticLine
     ;PUBDEFs (Symbols available from object file):
       ;wxStaticLine::sm_classwxStaticLine
       sm_classwxStaticLine__12wxStaticLine

+      ;wxStaticLine::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__12wxStaticLineCFlPUl

       ;wxConstructorForwxStaticLine()
       wxConstructorForwxStaticLine__Fv
       ;wxConstructorForwxStaticLine()
       wxConstructorForwxStaticLine__Fv

+      __vft12wxStaticLine8wxObject

       ;wxStaticLine::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__12wxStaticLineFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
   ;From object file:  ..\os2\tabctrl.cpp
       ;wxStaticLine::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__12wxStaticLineFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
   ;From object file:  ..\os2\tabctrl.cpp


@@ -14035,19 +14469,25 @@ EXPORTS
       SetStyle__10wxTextCtrlFlT1RC10wxTextAttr
       ;wxTextCtrl::CanRedo() const
       CanRedo__10wxTextCtrlCFv
       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::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::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()
       ;wxConstructorForwxTextCtrl()
       wxConstructorForwxTextCtrl__Fv
       ;wxTextCtrl::wxTextCtrl()


@@ -14143,14 +14583,12 @@ EXPORTS
   ;From object file:  ..\os2\thread.cpp
     ;PUBDEFs (Symbols available from object file):
       p_wxMainMutex
   ;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
       ;wxCriticalSection::Leave()
       Leave__17wxCriticalSectionFv
       ;wxMutex::~wxMutex()
       __dt__7wxMutexFv

-      ;wxMutex::wxMutex()
-      __ct__7wxMutexFv

       ;wxThread::Pause()
       Pause__8wxThreadFv
       ;wxThread::Kill()
       ;wxThread::Pause()
       Pause__8wxThreadFv
       ;wxThread::Kill()


@@ -14161,6 +14599,8 @@ EXPORTS
       GetId__8wxThreadCFv
       ;wxThread::Delete(void**)
       Delete__8wxThreadFPPv
       GetId__8wxThreadCFv
       ;wxThread::Delete(void**)
       Delete__8wxThreadFPPv

+      ;wxCondition::wxCondition(wxMutex&)
+      __ct__11wxConditionFR7wxMutex

       ;wxThreadInternal::OS2ThreadStart(wxThread*)
       OS2ThreadStart__16wxThreadInternalFP8wxThread
       ;wxMutex::Lock()
       ;wxThreadInternal::OS2ThreadStart(wxThread*)
       OS2ThreadStart__16wxThreadInternalFP8wxThread
       ;wxMutex::Lock()


@@ -14192,19 +14632,19 @@ EXPORTS
       wxGuiOwnedByMainThread__Fv
       ;wxCriticalSection::~wxCriticalSection()
       __dt__17wxCriticalSectionFv
       wxGuiOwnedByMainThread__Fv
       ;wxCriticalSection::~wxCriticalSection()
       __dt__17wxCriticalSectionFv

-      ;wxCondition::wxCondition()
-      __ct__11wxConditionFv

       ;wxThread::Yield()
       Yield__8wxThreadFv
       ;wxMutex::TryLock()
       TryLock__7wxMutexFv
       ;wxThread::This()
       This__8wxThreadFv
       ;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
       __vft8wxThread
       ;wxThread::wxThread(wxThreadKind)
       __ct__8wxThreadF12wxThreadKind

+      ;wxThread::Sleep(unsigned long)
+      Sleep__8wxThreadFUl

       ;wxMutex::Unlock()
       Unlock__7wxMutexFv
       ;wxMutexGuiLeaveOrEnter()
       ;wxMutex::Unlock()
       Unlock__7wxMutexFv
       ;wxMutexGuiLeaveOrEnter()


@@ -14256,6 +14696,8 @@ EXPORTS
       wxTimerList
       ;wxTimer::Init()
       Init__7wxTimerFv
       wxTimerList
       ;wxTimer::Init()
       Init__7wxTimerFv

+      ;wxTimer::Notify()
+      Notify__7wxTimerFv

       ;wxTimer::Start(int,unsigned long)
       Start__7wxTimerFiUl
       ;wxTimer::~wxTimer()
       ;wxTimer::Start(int,unsigned long)
       Start__7wxTimerFiUl
       ;wxTimer::~wxTimer()


@@ -14270,18 +14712,24 @@ EXPORTS
       CreateTool__9wxToolBarFP9wxControl
       ;wxToolBar::DoToggleTool(wxToolBarToolBase*,unsigned long)
       DoToggleTool__9wxToolBarFP17wxToolBarToolBaseUl
       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::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::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()
       ;wxToolBar::DoInsertTool(unsigned int,wxToolBarToolBase*)
       DoInsertTool__9wxToolBarFUiP17wxToolBarToolBase
       ;wxToolBar::Realize()


@@ -14290,65 +14738,75 @@ EXPORTS
       sm_eventTableEntries__9wxToolBar
       ;wxToolBar::sm_classwxToolBar
       sm_classwxToolBar__9wxToolBar
       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
       __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::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::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::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
       ;wxConstructorForwxToolBar()
       wxConstructorForwxToolBar__Fv

+      ;wxToolBar::m_bInitialized
+      m_bInitialized__9wxToolBar

       ;wxToolBar::~wxToolBar()
       __dt__9wxToolBarFv
       ;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
   ;From object file:  ..\os2\tooltip.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxToolTip::wxToolTip(const wxString&)
       __ct__9wxToolTipFRC8wxString

-      ;wxToolTip::SetWindow(wxWindow*)
-      SetWindow__9wxToolTipFP8wxWindow

       __vft9wxToolTip8wxObject
       __vft9wxToolTip8wxObject

-      ;wxToolTip::RelayEvent(void**)
-      RelayEvent__9wxToolTipFPPv

       ;wxToolTip::~wxToolTip()
       __dt__9wxToolTipFv
       ;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::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):
   ;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
       __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&)
       ;wxTopLevelWindowOS2::ShowFullScreen(unsigned long,long)
       ShowFullScreen__19wxTopLevelWindowOS2FUll
       ;wxTopLevelWindowOS2::CreateDialog(unsigned long,const wxString&,const wxPoint&,const wxSize&)


@@ -14359,18 +14817,24 @@ EXPORTS
       Init__19wxTopLevelWindowOS2Fv
       ;wxTopLevelWindowOS2::m_sbInitialized
       m_sbInitialized__19wxTopLevelWindowOS2
       Init__19wxTopLevelWindowOS2Fv
       ;wxTopLevelWindowOS2::m_sbInitialized
       m_sbInitialized__19wxTopLevelWindowOS2

-      ;wxTopLevelWindowOS2::OS2GetCreateWindowFlags(long*) const
-      OS2GetCreateWindowFlags__19wxTopLevelWindowOS2CFPl
+      ;wxTopLevelWindowOS2::OS2GetParent() const
+      OS2GetParent__19wxTopLevelWindowOS2CFv
+      ;wxTopLevelWindowOS2::GetEventTable() const
+      GetEventTable__19wxTopLevelWindowOS2CFv

       ;wxTopLevelWindowOS2::Iconize(unsigned long)
       Iconize__19wxTopLevelWindowOS2FUl
       ;wxTopLevelWindowOS2::DoSetClientSize(int,int)
       DoSetClientSize__19wxTopLevelWindowOS2FiT1
       ;wxTopLevelWindowOS2::IsMaximized() const
       IsMaximized__19wxTopLevelWindowOS2CFv
       ;wxTopLevelWindowOS2::Iconize(unsigned long)
       Iconize__19wxTopLevelWindowOS2FUl
       ;wxTopLevelWindowOS2::DoSetClientSize(int,int)
       DoSetClientSize__19wxTopLevelWindowOS2FiT1
       ;wxTopLevelWindowOS2::IsMaximized() const
       IsMaximized__19wxTopLevelWindowOS2CFv

+      ;wxTopLevelWindowOS2::m_spHiddenParent
+      m_spHiddenParent__19wxTopLevelWindowOS2

       ;wxTopLevelWindowOS2::SetIcon(const wxIcon&)
       SetIcon__19wxTopLevelWindowOS2FRC6wxIcon
       ;wxTopLevelWindowOS2::Restore()
       Restore__19wxTopLevelWindowOS2Fv
       ;wxTopLevelWindowOS2::SetIcon(const wxIcon&)
       SetIcon__19wxTopLevelWindowOS2FRC6wxIcon
       ;wxTopLevelWindowOS2::Restore()
       Restore__19wxTopLevelWindowOS2Fv

+      ;wxTopLevelWindowOS2::OnActivate(wxActivateEvent&)
+      OnActivate__19wxTopLevelWindowOS2FR15wxActivateEvent

       ;wxTopLevelWindowOS2::Maximize(unsigned long)
       Maximize__19wxTopLevelWindowOS2FUl
       ;wxTopLevelWindowOS2::EnableCloseButton(unsigned long)
       ;wxTopLevelWindowOS2::Maximize(unsigned long)
       Maximize__19wxTopLevelWindowOS2FUl
       ;wxTopLevelWindowOS2::EnableCloseButton(unsigned long)


@@ -14381,8 +14845,12 @@ EXPORTS
       Create__19wxTopLevelWindowOS2FP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
       ;wxTopLevelWindowOS2::Show(unsigned long)
       Show__19wxTopLevelWindowOS2FUl
       Create__19wxTopLevelWindowOS2FP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
       ;wxTopLevelWindowOS2::Show(unsigned long)
       Show__19wxTopLevelWindowOS2FUl

+      ;wxTopLevelWindowOS2::SetIcons(const wxIconBundle&)
+      SetIcons__19wxTopLevelWindowOS2FRC12wxIconBundle

       ;wxTopLevelWindowOS2::IsIconized() const
       IsIconized__19wxTopLevelWindowOS2CFv
       ;wxTopLevelWindowOS2::IsIconized() const
       IsIconized__19wxTopLevelWindowOS2CFv

+      ;wxTopLevelWindowOS2::sm_eventTable
+      sm_eventTable__19wxTopLevelWindowOS2

       ;wxTopLevelWindowOS2::SendSizeEvent()
       SendSizeEvent__19wxTopLevelWindowOS2Fv
       wxDlgProc
       ;wxTopLevelWindowOS2::SendSizeEvent()
       SendSizeEvent__19wxTopLevelWindowOS2Fv
       wxDlgProc


@@ -14408,8 +14876,6 @@ EXPORTS
       wxColourDisplay__Fv
       ;wxCheckForInterrupt(wxWindow*)
       wxCheckForInterrupt__FP8wxWindow
       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&)
       ;wxWriteResource(const wxString&,const wxString&,int,const wxString&)
       wxWriteResource__FRC8wxStringT1iT1
       ;wxGetResource(const wxString&,const wxString&,float*,const wxString&)


@@ -14418,6 +14884,8 @@ EXPORTS
       wxGetMousePosition__FPiT1
       ;wxDrawBorder(unsigned long,_RECTL&,unsigned long)
       wxDrawBorder__FUlR6_RECTLT1
       wxGetMousePosition__FPiT1
       ;wxDrawBorder(unsigned long,_RECTL&,unsigned long)
       wxDrawBorder__FUlR6_RECTLT1

+      ;wxShutdown(wxShutdownFlags)
+      wxShutdown__F15wxShutdownFlags

       ;wxPathExists(const wxString&)
       wxPathExists__FRC8wxString
       ;wxGetWindowText(unsigned long)
       ;wxPathExists(const wxString&)
       wxPathExists__FRC8wxString
       ;wxGetWindowText(unsigned long)


@@ -14428,8 +14896,6 @@ EXPORTS
       wxGetWindowClass__FUl
       ;wxGetUserId(char*,int)
       wxGetUserId__FPci
       wxGetWindowClass__FUl
       ;wxGetUserId(char*,int)
       wxGetUserId__FPci

-      ;wxFatalError(const wxString&,const wxString&)
-      wxFatalError__FRC8wxStringT1

       ;wxDisplaySize(int*,int*)
       wxDisplaySize__FPiT1
       ;wxClientDisplayRect(int*,int*,int*,int*)
       ;wxDisplaySize(int*,int*)
       wxDisplaySize__FPiT1
       ;wxClientDisplayRect(int*,int*,int*,int*)


@@ -14451,8 +14917,6 @@ EXPORTS
       wxGetHostName__FPci
       ;wxGetResource(const wxString&,const wxString&,int*,const wxString&)
       wxGetResource__FRC8wxStringT1PiT1
       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()
       ;wxKill(long,wxSignal,wxKillError*)
       wxKill__Fl8wxSignalP11wxKillError
       ;wxBell()


@@ -14479,13 +14943,13 @@ EXPORTS
       wxGetEnv__FRC8wxStringP8wxString
   ;From object file:  ..\os2\utilsexc.cpp
     ;PUBDEFs (Symbols available from object file):
       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
       ;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)
   ;From object file:  ..\os2\wave.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxWave::Create(const wxString&,unsigned long)


@@ -14513,6 +14977,8 @@ EXPORTS
       UnpackActivate__8wxWindowFPvT1PUsPUl
       ;wxWindow::SubclassWin(unsigned long)
       SubclassWin__8wxWindowFUl
       UnpackActivate__8wxWindowFPvT1PUsPUl
       ;wxWindow::SubclassWin(unsigned long)
       SubclassWin__8wxWindowFUl

+      ;wxWindow::SetWindowStyleFlag(long)
+      SetWindowStyleFlag__8wxWindowFl

       ;wxWindow::HandleInitDialog(unsigned long)
       HandleInitDialog__8wxWindowFUl
       ;wxWindow::HandleGetMinMaxInfo(_SWP*)
       ;wxWindow::HandleInitDialog(unsigned long)
       HandleInitDialog__8wxWindowFUl
       ;wxWindow::HandleGetMinMaxInfo(_SWP*)


@@ -14521,20 +14987,26 @@ EXPORTS
       HandleEraseBkgnd__8wxWindowFUl
       ;wxWindow::HandleCreate(void*,unsigned long*)
       HandleCreate__8wxWindowFPvPUl
       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::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
       ;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()
       ;wxWindow::Lower()
       Lower__8wxWindowFv
       ;wxWindow::HandleMaximize()


@@ -14589,10 +15061,6 @@ EXPORTS
       OS2DestroyWindow__8wxWindowFv
       ;wxWindow::IsMouseInWindow() const
       IsMouseInWindow__8wxWindowCFv
       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
       ;wxRemoveHandleAssociation(wxWindow*)
       ;wxWindow::Clear()
       Clear__8wxWindowFv
       ;wxRemoveHandleAssociation(wxWindow*)


@@ -14602,6 +15070,8 @@ EXPORTS
       Reparent__8wxWindowFP8wxWindow
       ;wxWindow::OS2GetCreateWindowCoords(const wxPoint&,const wxSize&,int&,int&,int&,int&) const
       OS2GetCreateWindowCoords__8wxWindowCFRC7wxPointRC6wxSizeRiN33
       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
       ;wxWindow::Enable(unsigned long)
       Enable__8wxWindowFUl
       wxWinHandleList


@@ -14649,6 +15119,8 @@ EXPORTS
       GetEventTable__8wxWindowCFv
       ;wxWindow::GetClientAreaOrigin() const
       GetClientAreaOrigin__8wxWindowCFv
       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*)
       ;wxWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__8wxWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxAssociateWinWithHandle(unsigned long,wxWindow*)


@@ -14691,6 +15163,8 @@ EXPORTS
       HandleMove__8wxWindowFiT1
       ;wxWindow::HandleMouseEvent(unsigned int,int,int,unsigned int)
       HandleMouseEvent__8wxWindowFUiiT2T1
       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)
       ;wxWindow::GetScrollRange(int) const
       GetScrollRange__8wxWindowCFi
       ;wxWindow::DoSetSize(int,int,int,int,int)


@@ -14723,8 +15197,6 @@ EXPORTS
       GetTitle__8wxWindowCFv
       ;wxWindow::GetCharHeight() const
       GetCharHeight__8wxWindowCFv
       GetTitle__8wxWindowCFv
       ;wxWindow::GetCharHeight() const
       GetCharHeight__8wxWindowCFv

-      ;wxWindow::CreateKeyEvent(int,int,void*) const
-      CreateKeyEvent__8wxWindowCFiT1Pv

       ;wxWindow::OS2Command(unsigned int,unsigned short)
       OS2Command__8wxWindowFUiUs
       wxWndProc
       ;wxWindow::OS2Command(unsigned int,unsigned short)
       OS2Command__8wxWindowFUiUs
       wxWndProc


@@ -14739,12 +15211,14 @@ EXPORTS
       ScrollWindow__8wxWindowFiT1PC6wxRect
       ;wxWindow::OnIdle(wxIdleEvent&)
       OnIdle__8wxWindowFR11wxIdleEvent
       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::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
       ;wxWindow::DoMoveWindow(int,int,int,int)
       DoMoveWindow__8wxWindowFiN31
       ;wxWindow::DoClientToScreen(int*,int*) const


@@ -14761,21 +15235,3 @@ EXPORTS
       SetTitle__8wxWindowFRC8wxString
       ;wxWindow::sm_eventTableEntries
       sm_eventTableEntries__8wxWindow
       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