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 66638bb673e43ead23adf9ca5d2ac9eb55de39d9..67a5e1ad80274539f02f369d37dfe4fdfb38de04 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,22 +4,104 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
 CODE LOADONCALL
 
 EXPORTS

-;From library:  H:\Dev\Wx2\WxWindows\lib\wx.lib
+;From library:  H:\DEV\WX2\WXWINDOWS\LIB\wx.lib

   ;From object file:  dummy.cpp
     ;PUBDEFs (Symbols available from object file):
       wxDummyChar
   ;From object file:  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):

+      ;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
       __vft9wxAppBase8wxObject

+      ;wxAppBase::OnCmdLineHelp(wxCmdLineParser&)
+      OnCmdLineHelp__9wxAppBaseFR15wxCmdLineParser
+      ;wxTrap()
+      wxTrap__Fv
+      ;wxAppBase::OnRun()
+      OnRun__9wxAppBaseFv

       ;wxAppBase::OnExit()
       OnExit__9wxAppBaseFv
       ;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::CreateMessageOutput()
+      CreateMessageOutput__9wxAppBaseFv
+      ;wxOnAssert(const char*,int,const char*,const char*)
+      wxOnAssert__FPCciN21
+      ;wxAppBase::~wxAppBase()
+      __dt__9wxAppBaseFv

       ;wxAppBase::ProcessPendingEvents()
       ProcessPendingEvents__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
     ;PUBDEFs (Symbols available from object file):
   ;From object file:  ..\common\choiccmn.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxChoiceBase::~wxChoiceBase()
+      __dt__12wxChoiceBaseFv

       ;wxChoiceBase::SetStringSelection(const wxString&)
       SetStringSelection__12wxChoiceBaseFRC8wxString
       __vft12wxChoiceBase8wxObject
       ;wxChoiceBase::SetStringSelection(const wxString&)
       SetStringSelection__12wxChoiceBaseFRC8wxString
       __vft12wxChoiceBase8wxObject

+      __vft12wxChoiceBase15wxItemContainer

       ;wxChoiceBase::Command(wxCommandEvent&)
       Command__12wxChoiceBaseFR14wxCommandEvent
   ;From object file:  ..\common\clipcmn.cpp
       ;wxChoiceBase::Command(wxCommandEvent&)
       Command__12wxChoiceBaseFR14wxCommandEvent
   ;From object file:  ..\common\clipcmn.cpp


@@ -36,6 +118,21 @@ EXPORTS
       __vft17wxClipboardModule8wxObject
       ;wxConstructorForwxClipboardModule()
       wxConstructorForwxClipboardModule__Fv
       __vft17wxClipboardModule8wxObject
       ;wxConstructorForwxClipboardModule()
       wxConstructorForwxClipboardModule__Fv

+  ;From object file:  ..\common\clntdata.cpp
+    ;PUBDEFs (Symbols available from object file):
+      __vft21wxClientDataContainer
+      ;wxClientDataContainer::DoSetClientObject(wxClientData*)
+      DoSetClientObject__21wxClientDataContainerFP12wxClientData
+      ;wxClientDataContainer::DoGetClientObject() const
+      DoGetClientObject__21wxClientDataContainerCFv
+      ;wxClientDataContainer::DoGetClientData() const
+      DoGetClientData__21wxClientDataContainerCFv
+      ;wxClientDataContainer::~wxClientDataContainer()
+      __dt__21wxClientDataContainerFv
+      ;wxClientDataContainer::DoSetClientData(void*)
+      DoSetClientData__21wxClientDataContainerFPv
+      ;wxClientDataContainer::wxClientDataContainer()
+      __ct__21wxClientDataContainerFv

   ;From object file:  ..\common\cmdline.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCmdLineParser::EnableLongOptions(unsigned long)
   ;From object file:  ..\common\cmdline.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCmdLineParser::EnableLongOptions(unsigned long)


@@ -44,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**)


@@ -66,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&)


@@ -80,36 +175,44 @@ EXPORTS
       __as__14wxArrayOptionsFRC14wxArrayOptions
       ;wxCmdLineParserData::SetArguments(const wxString&)
       SetArguments__19wxCmdLineParserDataFRC8wxString
       __as__14wxArrayOptionsFRC14wxArrayOptions
       ;wxCmdLineParserData::SetArguments(const wxString&)
       SetArguments__19wxCmdLineParserDataFRC8wxString

-      ;wxArrayOptions::Insert(const wxCmdLineOption&,unsigned int)
-      Insert__14wxArrayOptionsFRC15wxCmdLineOptionUi
-      ;wxArrayParams::Add(const wxCmdLineParam&)
-      Add__13wxArrayParamsFRC14wxCmdLineParam
+      ;wxCmdLineParser::ConvertStringToArgs(const char*)
+      ConvertStringToArgs__15wxCmdLineParserFPCc
+      ;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

-      ;wxCmdLineParser::Parse()
-      Parse__15wxCmdLineParserFv
+      ;wxArrayParams::Insert(const wxCmdLineParam&,unsigned int,unsigned int)
+      Insert__13wxArrayParamsFRC14wxCmdLineParamUiT2

       ;wxCmdLineParserData::SetArguments(int,char**)
       SetArguments__19wxCmdLineParserDataFiPPc
       ;wxCmdLineParser::Found(const wxString&) const
       Found__15wxCmdLineParserCFRC8wxString
       ;wxCmdLineParserData::SetArguments(int,char**)
       SetArguments__19wxCmdLineParserDataFiPPc
       ;wxCmdLineParser::Found(const wxString&) const
       Found__15wxCmdLineParserCFRC8wxString

-      ;wxCmdLineParser::AddParam(const wxString&,wxCmdLineParamType,int)
-      AddParam__15wxCmdLineParserFRC8wxString18wxCmdLineParamTypei
+      ;wxCmdLineParser::Parse(unsigned long)
+      Parse__15wxCmdLineParserFUl
+      ;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()


@@ -136,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()


@@ -176,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()


@@ -209,26 +313,68 @@ 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&)
+      UndoCommand__18wxCommandProcessorFR9wxCommand
+      ;wxCommandProcessor::Store(wxCommand*)
+      Store__18wxCommandProcessorFP9wxCommand
+      ;wxCommandProcessor::wxCommandProcessor(int)
+      __ct__18wxCommandProcessorFi
+      ;wxConstructorForwxCommandProcessor()
+      wxConstructorForwxCommandProcessor__Fv
+      ;wxCommandProcessor::DoCommand(wxCommand&)
+      DoCommand__18wxCommandProcessorFR9wxCommand
+      ;wxCommand::sm_classwxCommand
+      sm_classwxCommand__9wxCommand
+      ;wxCommandProcessor::Undo()
+      Undo__18wxCommandProcessorFv
+      ;wxCommandProcessor::SetMenuStrings()
+      SetMenuStrings__18wxCommandProcessorFv
+      ;wxCommandProcessor::CanRedo() const
+      CanRedo__18wxCommandProcessorCFv
+      ;wxCommandProcessor::Submit(wxCommand*,unsigned long)
+      Submit__18wxCommandProcessorFP9wxCommandUl
+      __vft18wxCommandProcessor8wxObject
+      ;wxCommand::~wxCommand()
+      __dt__9wxCommandFv
+      ;wxCommandProcessor::sm_classwxCommandProcessor
+      sm_classwxCommandProcessor__18wxCommandProcessor
+      ;wxCommandProcessor::~wxCommandProcessor()
+      __dt__18wxCommandProcessorFv
+      ;wxCommandProcessor::Initialize()
+      Initialize__18wxCommandProcessorFv
+      ;wxCommandProcessor::CanUndo() const
+      CanUndo__18wxCommandProcessorCFv
+      ;wxCommand::wxCommand(unsigned long,const wxString&)
+      __ct__9wxCommandFUlRC8wxString
+      __vft9wxCommand8wxObject
+      ;wxCommandProcessor::Redo()
+      Redo__18wxCommandProcessorFv
+      ;wxCommandProcessor::ClearCommands()
+      ClearCommands__18wxCommandProcessorFv

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

-      ;wxConfigBase::Write(const wxString&,double)
-      Write__12wxConfigBaseFRC8wxStringd
-      ;wxConfigBase::Write(const wxString&,unsigned long)
-      Write__12wxConfigBaseFRC8wxStringUl
-      ;wxConfigBase::Read(const wxString&,int*,int) const
-      Read__12wxConfigBaseCFRC8wxStringPii
+      ;wxConfigBase::Read(const wxString&,long*) const
+      Read__12wxConfigBaseCFRC8wxStringPl
+      ;wxConfigBase::DoWriteDouble(const wxString&,double)
+      DoWriteDouble__12wxConfigBaseFRC8wxStringd

       ;wxConfigBase::Read(const wxString&,wxString*,const wxString&) const
       Read__12wxConfigBaseCFRC8wxStringP8wxStringT1
       ;wxConfigBase::Read(const wxString&,wxString*,const wxString&) const
       Read__12wxConfigBaseCFRC8wxStringP8wxStringT1

+      ;wxConfigBase::Read(const wxString&,int*,int) const
+      Read__12wxConfigBaseCFRC8wxStringPii
+      ;wxConfigBase::DoWriteInt(const wxString&,int)
+      DoWriteInt__12wxConfigBaseFRC8wxStringi

       ;wxConfigBase::~wxConfigBase()
       __dt__12wxConfigBaseFv
       ;wxConfigPathChanger::~wxConfigPathChanger()
       __dt__19wxConfigPathChangerFv
       ;wxConfigBase::~wxConfigBase()
       __dt__12wxConfigBaseFv
       ;wxConfigPathChanger::~wxConfigPathChanger()
       __dt__19wxConfigPathChangerFv

-      ;wxConfigBase::Read(const wxString&,unsigned long*) const
-      Read__12wxConfigBaseCFRC8wxStringPUl

       ;wxConfigBase::wxConfigBase(const wxString&,const wxString&,const wxString&,const wxString&,long)
       __ct__12wxConfigBaseFRC8wxStringN31l
       ;wxConfigBase::wxConfigBase(const wxString&,const wxString&,const wxString&,const wxString&,long)
       __ct__12wxConfigBaseFRC8wxStringN31l

-      ;wxConfigBase::Read(const wxString&,const wxString&) const
-      Read__12wxConfigBaseCFRC8wxStringT1
+      ;wxConfigBase::Read(const wxString&,unsigned long*) const
+      Read__12wxConfigBaseCFRC8wxStringPUl

       ;wxConfigBase::ExpandEnvVars(const wxString&) const
       ExpandEnvVars__12wxConfigBaseCFRC8wxString
       ;wxSplitPath(wxArrayString&,const char*)
       ;wxConfigBase::ExpandEnvVars(const wxString&) const
       ExpandEnvVars__12wxConfigBaseCFRC8wxString
       ;wxSplitPath(wxArrayString&,const char*)


@@ -237,12 +383,16 @@ EXPORTS
       wxExpandEnvVars__FRC8wxString
       ;wxConfigBase::Read(const wxString&,long*,long) const
       Read__12wxConfigBaseCFRC8wxStringPll
       wxExpandEnvVars__FRC8wxString
       ;wxConfigBase::Read(const wxString&,long*,long) const
       Read__12wxConfigBaseCFRC8wxStringPll

+      ;wxConfigBase::DoReadInt(const wxString&,int*) const
+      DoReadInt__12wxConfigBaseCFRC8wxStringPi

       ;wxConfigBase::ms_pConfig
       ms_pConfig__12wxConfigBase
       ;wxConfigBase::ms_pConfig
       ms_pConfig__12wxConfigBase

-      ;wxConfigBase::Write(const wxString&,const char*)
-      Write__12wxConfigBaseFRC8wxStringPCc
+      ;wxConfigBase::Read(const wxString&,wxString*) const
+      Read__12wxConfigBaseCFRC8wxStringP8wxString

       ;wxConfigBase::Read(const wxString&,double*) const
       Read__12wxConfigBaseCFRC8wxStringPd
       ;wxConfigBase::Read(const wxString&,double*) const
       Read__12wxConfigBaseCFRC8wxStringPd

+      ;wxConfigBase::DoReadBool(const wxString&,unsigned long*) const
+      DoReadBool__12wxConfigBaseCFRC8wxStringPUl

       ;wxConfigBase::Set(wxConfigBase*)
       Set__12wxConfigBaseFP12wxConfigBase
       ;wxConfigBase::Create()
       ;wxConfigBase::Set(wxConfigBase*)
       Set__12wxConfigBaseFP12wxConfigBase
       ;wxConfigBase::Create()


@@ -253,11 +403,33 @@ EXPORTS
       Read__12wxConfigBaseCFRC8wxStringPdd
       ;wxConfigBase::Read(const wxString&,unsigned long*,unsigned long) const
       Read__12wxConfigBaseCFRC8wxStringPUlUl
       Read__12wxConfigBaseCFRC8wxStringPdd
       ;wxConfigBase::Read(const wxString&,unsigned long*,unsigned long) const
       Read__12wxConfigBaseCFRC8wxStringPUlUl

+      ;wxConfigBase::DoWriteBool(const wxString&,unsigned long)
+      DoWriteBool__12wxConfigBaseFRC8wxStringUl
+      ;wxConfigBase::DoReadDouble(const wxString&,double*) const
+      DoReadDouble__12wxConfigBaseCFRC8wxStringPd

       ;wxConfigBase::Read(const wxString&,int*) const
       Read__12wxConfigBaseCFRC8wxStringPi
       ;wxConfigBase::ms_bAutoCreate
       ms_bAutoCreate__12wxConfigBase
       __vft12wxConfigBase
       ;wxConfigBase::Read(const wxString&,int*) const
       Read__12wxConfigBaseCFRC8wxStringPi
       ;wxConfigBase::ms_bAutoCreate
       ms_bAutoCreate__12wxConfigBase
       __vft12wxConfigBase

+  ;From object file:  ..\common\containr.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxControlContainer::HandleOnFocus(wxFocusEvent&)
+      HandleOnFocus__18wxControlContainerFR12wxFocusEvent
+      ;wxControlContainer::DoSetFocus()
+      DoSetFocus__18wxControlContainerFv
+      ;wxControlContainer::wxControlContainer(wxWindow*)
+      __ct__18wxControlContainerFP8wxWindow
+      ;wxControlContainer::SetLastFocus(wxWindow*)
+      SetLastFocus__18wxControlContainerFP8wxWindow
+      ;wxControlContainer::HandleOnNavigationKey(wxNavigationKeyEvent&)
+      HandleOnNavigationKey__18wxControlContainerFR20wxNavigationKeyEvent
+      ;wxControlContainer::HandleOnWindowDestroy(wxWindowBase*)
+      HandleOnWindowDestroy__18wxControlContainerFP12wxWindowBase
+      ;wxControlContainer::SetFocusToChild()
+      SetFocusToChild__18wxControlContainerFv
+      ;wxSetFocusToChild(wxWindow*,wxWindow**)
+      wxSetFocusToChild__FP8wxWindowPP8wxWindow

   ;From object file:  ..\common\cshelp.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxContextHelpButton::wxContextHelpButton(wxWindow*,int,const wxPoint&,const wxSize&,long)
   ;From object file:  ..\common\cshelp.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxContextHelpButton::wxContextHelpButton(wxWindow*,int,const wxPoint&,const wxSize&,long)


@@ -278,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&)


@@ -316,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


@@ -332,24 +508,42 @@ EXPORTS
       ;wxControlBase::Command(wxCommandEvent&)
       Command__13wxControlBaseFR14wxCommandEvent
       __vft13wxControlBase8wxObject
       ;wxControlBase::Command(wxCommandEvent&)
       Command__13wxControlBaseFR14wxCommandEvent
       __vft13wxControlBase8wxObject

+      __vft18wxStaticBitmapBase8wxObject
+      ;wxControlBase::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
+      Create__13wxControlBaseFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString

       ;wxControlBase::CreateControl(wxWindowBase*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       CreateControl__13wxControlBaseFP12wxWindowBaseiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxControlBase::CreateControl(wxWindowBase*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       CreateControl__13wxControlBaseFP12wxWindowBaseiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString

+      ;wxControlBase::~wxControlBase()
+      __dt__13wxControlBaseFv

       ;wxControlBase::InheritAttributes()
       InheritAttributes__13wxControlBaseFv
       ;wxControlBase::InheritAttributes()
       InheritAttributes__13wxControlBaseFv

+      ;wxStaticBitmapBase::DoGetBestClientSize() const
+      DoGetBestClientSize__18wxStaticBitmapBaseCFv
+      ;wxStaticBitmapBase::~wxStaticBitmapBase()
+      __dt__18wxStaticBitmapBaseFv

       ;wxControlBase::InitCommandEvent(wxCommandEvent&) const
       InitCommandEvent__13wxControlBaseCFR14wxCommandEvent
   ;From object file:  ..\common\ctrlsub.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxControlBase::InitCommandEvent(wxCommandEvent&) const
       InitCommandEvent__13wxControlBaseCFR14wxCommandEvent
   ;From object file:  ..\common\ctrlsub.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxControlWithItems::GetClientData(int) const
-      GetClientData__18wxControlWithItemsCFi
-      ;wxControlWithItems::SetClientObject(int,wxClientData*)
-      SetClientObject__18wxControlWithItemsFiP12wxClientData
-      ;wxControlWithItems::GetStringSelection() const
-      GetStringSelection__18wxControlWithItemsCFv
-      ;wxControlWithItems::SetClientData(int,void*)
-      SetClientData__18wxControlWithItemsFiPv
-      ;wxControlWithItems::GetClientObject(int) const
-      GetClientObject__18wxControlWithItemsCFi
+      ;wxItemContainer::GetClientData(int) const
+      GetClientData__15wxItemContainerCFi
+      ;wxItemContainer::GetClientObject(int) const
+      GetClientObject__15wxItemContainerCFi
+      ;wxItemContainer::SetClientData(int,void*)
+      SetClientData__15wxItemContainerFiPv
+      __vft18wxControlWithItems8wxObject
+      ;wxItemContainer::Append(const wxArrayString&)
+      Append__15wxItemContainerFRC13wxArrayString
+      ;wxItemContainer::~wxItemContainer()
+      __dt__15wxItemContainerFv
+      ;wxControlWithItems::~wxControlWithItems()
+      __dt__18wxControlWithItemsFv
+      ;wxItemContainer::GetStringSelection() const
+      GetStringSelection__15wxItemContainerCFv
+      ;wxItemContainer::SetClientObject(int,wxClientData*)
+      SetClientObject__15wxItemContainerFiP12wxClientData
+      __vft15wxItemContainer
+      __vft18wxControlWithItems15wxItemContainer

   ;From object file:  ..\common\datetime.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDateTime::wxDateTime(double)
   ;From object file:  ..\common\datetime.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDateTime::wxDateTime(double)


@@ -374,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


@@ -478,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


@@ -502,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)


@@ -514,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


@@ -541,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


@@ -656,6 +850,8 @@ EXPORTS
       Format__10wxTimeSpanCFPCc
   ;From object file:  ..\common\datstrm.cpp
     ;PUBDEFs (Symbols available from object file):
       Format__10wxTimeSpanCFPCc
   ;From object file:  ..\common\datstrm.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxDataInputStream::operator>>(wxULongLongWx&)
+      __rs__17wxDataInputStreamFR13wxULongLongWx

       ;wxDataOutputStream::operator<<(unsigned int)
       __ls__18wxDataOutputStreamFUi
       ;wxDataInputStream::Read16()
       ;wxDataOutputStream::operator<<(unsigned int)
       __ls__18wxDataOutputStreamFUi
       ;wxDataInputStream::Read16()


@@ -680,6 +876,10 @@ EXPORTS
       Write16__18wxDataOutputStreamFUs
       ;wxDataInputStream::operator>>(double&)
       __rs__17wxDataInputStreamFRd
       Write16__18wxDataOutputStreamFUs
       ;wxDataInputStream::operator>>(double&)
       __rs__17wxDataInputStreamFRd

+      ;wxDataOutputStream::operator<<(wxULongLongWx)
+      __ls__18wxDataOutputStreamF13wxULongLongWx
+      ;wxDataOutputStream::Write64(wxULongLongWx)
+      Write64__18wxDataOutputStreamF13wxULongLongWx

       ;wxDataOutputStream::wxDataOutputStream(wxOutputStream&)
       __ct__18wxDataOutputStreamFR14wxOutputStream
       ;wxDataOutputStream::Write32(unsigned int)
       ;wxDataOutputStream::wxDataOutputStream(wxOutputStream&)
       __ct__18wxDataOutputStreamFR14wxOutputStream
       ;wxDataOutputStream::Write32(unsigned int)


@@ -700,10 +900,12 @@ EXPORTS
       __rs__17wxDataInputStreamFRi
       ;wxDataInputStream::operator>>(unsigned int&)
       __rs__17wxDataInputStreamFRUi
       __rs__17wxDataInputStreamFRi
       ;wxDataInputStream::operator>>(unsigned int&)
       __rs__17wxDataInputStreamFRUi

-      ;wxDataOutputStream::~wxDataOutputStream()
-      __dt__18wxDataOutputStreamFv
+      ;wxDataInputStream::Read64()
+      Read64__17wxDataInputStreamFv

       ;wxDataOutputStream::operator<<(float)
       __ls__18wxDataOutputStreamFf
       ;wxDataOutputStream::operator<<(float)
       __ls__18wxDataOutputStreamFf

+      ;wxDataOutputStream::~wxDataOutputStream()
+      __dt__18wxDataOutputStreamFv

       ;wxDataInputStream::operator>>(signed char&)
       __rs__17wxDataInputStreamFRSc
       ;wxDataOutputStream::operator<<(short)
       ;wxDataInputStream::operator>>(signed char&)
       __rs__17wxDataInputStreamFRSc
       ;wxDataOutputStream::operator<<(short)


@@ -730,10 +932,14 @@ EXPORTS
       DrawSpline__8wxDCBaseFiP7wxPoint
       wx_spline_point_list
       __vft8wxDCBase8wxObject
       DrawSpline__8wxDCBaseFiP7wxPoint
       wx_spline_point_list
       __vft8wxDCBase8wxObject

+      ;wxDCBase::DrawLabel(const wxString&,const wxBitmap&,const wxRect&,int,int,wxRect*)
+      DrawLabel__8wxDCBaseFRC8wxStringRC8wxBitmapRC6wxRectiT4P6wxRect

       ;wxDCBase::DoDrawSpline(wxList*)
       DoDrawSpline__8wxDCBaseFP6wxList
       ;wxDCBase::DrawLines(const wxList*,int,int)
       DrawLines__8wxDCBaseFPC6wxListiT2
       ;wxDCBase::DoDrawSpline(wxList*)
       DoDrawSpline__8wxDCBaseFP6wxList
       ;wxDCBase::DrawLines(const wxList*,int,int)
       DrawLines__8wxDCBaseFPC6wxListiT2

+      ;wxDCBase::GetMultiLineTextExtent(const wxString&,int*,int*,int*,wxFont*)
+      GetMultiLineTextExtent__8wxDCBaseFRC8wxStringPiN22P6wxFont

       ;wx_quadratic_spline(double,double,double,double,double,double,double,double)
       wx_quadratic_spline__FdN71
       ;wxDCBase::DrawPolygon(const wxList*,int,int,int)
       ;wx_quadratic_spline(double,double,double,double,double,double,double,double)
       wx_quadratic_spline__FdN71
       ;wxDCBase::DrawPolygon(const wxList*,int,int,int)


@@ -752,13 +958,42 @@ EXPORTS
       GetAllFiles__5wxDirFRC8wxStringP13wxArrayStringT1i
       ;wxDir::Traverse(wxDirTraverser&,const wxString&,int) const
       Traverse__5wxDirCFR14wxDirTraverserRC8wxStringi
       GetAllFiles__5wxDirFRC8wxStringP13wxArrayStringT1i
       ;wxDir::Traverse(wxDirTraverser&,const wxString&,int) const
       Traverse__5wxDirCFR14wxDirTraverserRC8wxStringi

+      ;wxDir::HasFiles(const wxString&)
+      HasFiles__5wxDirFRC8wxString
+      ;wxDir::HasSubDirs(const wxString&)
+      HasSubDirs__5wxDirFRC8wxString

   ;From object file:  ..\common\dndcmn.cpp
   ;From object file:  ..\common\dlgcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDialogBase::CreateButtonSizer(long)
       CreateButtonSizer__12wxDialogBaseFl
   ;From object file:  ..\common\dndcmn.cpp
   ;From object file:  ..\common\dlgcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDialogBase::CreateButtonSizer(long)
       CreateButtonSizer__12wxDialogBaseFl

+      ;wxDialogBase::Init()
+      Init__12wxDialogBaseFv
+      ;wxDialogBase::GetDefaultItem() const
+      GetDefaultItem__12wxDialogBaseCFv
+      ;wxDialogBase::SetDefaultItem(wxWindow*)
+      SetDefaultItem__12wxDialogBaseFP8wxWindow

       ;wxDialogBase::CreateTextSizer(const wxString&)
       CreateTextSizer__12wxDialogBaseFRC8wxString
       ;wxDialogBase::CreateTextSizer(const wxString&)
       CreateTextSizer__12wxDialogBaseFRC8wxString

+      ;wxDialogBase::OnFocus(wxFocusEvent&)
+      OnFocus__12wxDialogBaseFR12wxFocusEvent
+      ;wxDialogBase::sm_eventTableEntries
+      sm_eventTableEntries__12wxDialogBase
+      ;wxDialogBase::SetFocus()
+      SetFocus__12wxDialogBaseFv
+      ;wxDialogBase::OnChildFocus(wxChildFocusEvent&)
+      OnChildFocus__12wxDialogBaseFR17wxChildFocusEvent
+      __vft12wxDialogBase8wxObject
+      ;wxDialogBase::sm_eventTable
+      sm_eventTable__12wxDialogBase
+      ;wxDialogBase::OnNavigationKey(wxNavigationKeyEvent&)
+      OnNavigationKey__12wxDialogBaseFR20wxNavigationKeyEvent
+      ;wxDialogBase::RemoveChild(wxWindowBase*)
+      RemoveChild__12wxDialogBaseFP12wxWindowBase
+      ;wxDialogBase::GetEventTable() const
+      GetEventTable__12wxDialogBaseCFv
+      ;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


@@ -815,6 +1050,8 @@ EXPORTS
       __vft16wxTextDropTarget16wxDropTargetBase
       ;wxwxSimpleDataObjectListNode::DeleteData()
       DeleteData__28wxwxSimpleDataObjectListNodeFv
       __vft16wxTextDropTarget16wxDropTargetBase
       ;wxwxSimpleDataObjectListNode::DeleteData()
       DeleteData__28wxwxSimpleDataObjectListNodeFv

+      ;wxDataObjectComposite::wxDataObjectComposite()
+      __ct__21wxDataObjectCompositeFv

       ;wxCustomDataObject::TakeData(unsigned int,void*)
       TakeData__18wxCustomDataObjectFUiPv
       ;wxDataObjectBase::IsSupported(const wxDataFormat&,wxDataObjectBase::Direction) const
       ;wxCustomDataObject::TakeData(unsigned int,void*)
       TakeData__18wxCustomDataObjectFUiPv
       ;wxDataObjectBase::IsSupported(const wxDataFormat&,wxDataObjectBase::Direction) const


@@ -892,8 +1129,8 @@ EXPORTS
       Close__6wxViewFUl
       ;wxView::Activate(unsigned long)
       Activate__6wxViewFUl
       Close__6wxViewFUl
       ;wxView::Activate(unsigned long)
       Activate__6wxViewFUl

-      ;wxCommandProcessor::wxCommandProcessor(int)
-      __ct__18wxCommandProcessorFi
+      ;wxDocument::SaveObject(ostream&)
+      SaveObject__10wxDocumentFR7ostream

       ;wxDocParentFrame::sm_eventTable
       sm_eventTable__16wxDocParentFrame
       ;wxDocChildFrame::sm_eventTable
       ;wxDocParentFrame::sm_eventTable
       sm_eventTable__16wxDocParentFrame
       ;wxDocChildFrame::sm_eventTable


@@ -906,8 +1143,6 @@ EXPORTS
       __ct__15wxDocChildFrameFP10wxDocumentP6wxViewP7wxFrameiRC8wxStringRC7wxPointRC6wxSizelT5
       ;wxFileHistory::Save(wxConfigBase&)
       Save__13wxFileHistoryFR12wxConfigBase
       __ct__15wxDocChildFrameFP10wxDocumentP6wxViewP7wxFrameiRC8wxStringRC7wxPointRC6wxSizelT5
       ;wxFileHistory::Save(wxConfigBase&)
       Save__13wxFileHistoryFR12wxConfigBase

-      ;wxDocument::SaveObject(ostream&)
-      SaveObject__10wxDocumentFR7ostream

       ;wxDocManager::RemoveFileFromHistory(int)
       RemoveFileFromHistory__12wxDocManagerFi
       ;wxDocPrintout::OnBeginDocument(int,int)
       ;wxDocManager::RemoveFileFromHistory(int)
       RemoveFileFromHistory__12wxDocManagerFi
       ;wxDocPrintout::OnBeginDocument(int,int)


@@ -916,8 +1151,6 @@ EXPORTS
       FileHistoryLoad__12wxDocManagerFR12wxConfigBase
       ;wxConstructorForwxDocManager()
       wxConstructorForwxDocManager__Fv
       FileHistoryLoad__12wxDocManagerFR12wxConfigBase
       ;wxConstructorForwxDocManager()
       wxConstructorForwxDocManager__Fv

-      ;wxConstructorForwxCommandProcessor()
-      wxConstructorForwxCommandProcessor__Fv

       ;wxDocManager::sm_docManager
       sm_docManager__12wxDocManager
       ;wxDocTemplate::~wxDocTemplate()
       ;wxDocManager::sm_docManager
       sm_docManager__12wxDocManager
       ;wxDocTemplate::~wxDocTemplate()


@@ -928,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()


@@ -942,8 +1177,6 @@ EXPORTS
       AddFileToHistory__12wxDocManagerFRC8wxString
       ;wxDocument::wxDocument(wxDocument*)
       __ct__10wxDocumentFP10wxDocument
       AddFileToHistory__12wxDocManagerFRC8wxString
       ;wxDocument::wxDocument(wxDocument*)
       __ct__10wxDocumentFP10wxDocument

-      ;wxCommand::sm_classwxCommand
-      sm_classwxCommand__9wxCommand

       __vft6wxView8wxObject
       __vft16wxDocParentFrame8wxObject
       __vft13wxFileHistory8wxObject
       __vft6wxView8wxObject
       __vft16wxDocParentFrame8wxObject
       __vft13wxFileHistory8wxObject


@@ -989,10 +1222,6 @@ EXPORTS
       sm_classwxDocManager__12wxDocManager
       ;wxView::wxView()
       __ct__6wxViewFv
       sm_classwxDocManager__12wxDocManager
       ;wxView::wxView()
       __ct__6wxViewFv

-      ;wxCommandProcessor::Undo()
-      Undo__18wxCommandProcessorFv
-      ;wxCommandProcessor::SetMenuStrings()
-      SetMenuStrings__18wxCommandProcessorFv

       ;wxDocument::Save()
       Save__10wxDocumentFv
       ;wxDocument::OnChangedViewList()
       ;wxDocument::Save()
       Save__10wxDocumentFv
       ;wxDocument::OnChangedViewList()


@@ -1003,8 +1232,6 @@ EXPORTS
       GetCurrentDocument__12wxDocManagerCFv
       ;wxDocument::DeleteAllViews()
       DeleteAllViews__10wxDocumentFv
       GetCurrentDocument__12wxDocManagerCFv
       ;wxDocument::DeleteAllViews()
       DeleteAllViews__10wxDocumentFv

-      ;wxCommandProcessor::CanRedo() const
-      CanRedo__18wxCommandProcessorCFv

       ;wxDocument::OnSaveDocument(const wxString&)
       OnSaveDocument__10wxDocumentFRC8wxString
       ;wxDocument::RemoveView(wxView*)
       ;wxDocument::OnSaveDocument(const wxString&)
       OnSaveDocument__10wxDocumentFRC8wxString
       ;wxDocument::RemoveView(wxView*)


@@ -1017,8 +1244,6 @@ EXPORTS
       sm_classwxDocPrintout__13wxDocPrintout
       __vft15wxDocChildFrame8wxObject
       __vft10wxDocument8wxObject
       sm_classwxDocPrintout__13wxDocPrintout
       __vft15wxDocChildFrame8wxObject
       __vft10wxDocument8wxObject

-      ;wxCommandProcessor::Submit(wxCommand*,unsigned long)
-      Submit__18wxCommandProcessorFP9wxCommandUl

       ;wxDocManager::SelectDocumentPath(wxDocTemplate**,int,wxString&,long,unsigned long)
       SelectDocumentPath__12wxDocManagerFPP13wxDocTemplateiR8wxStringlUl
       ;wxDocParentFrame::ProcessEvent(wxEvent&)
       ;wxDocManager::SelectDocumentPath(wxDocTemplate**,int,wxString&,long,unsigned long)
       SelectDocumentPath__12wxDocManagerFPP13wxDocTemplateiR8wxStringlUl
       ;wxDocParentFrame::ProcessEvent(wxEvent&)


@@ -1077,7 +1302,6 @@ EXPORTS
       FileMatchesTemplate__13wxDocTemplateFRC8wxString
       ;wxDocManager::wxDocManager(long,unsigned long)
       __ct__12wxDocManagerFlUl
       FileMatchesTemplate__13wxDocTemplateFRC8wxString
       ;wxDocManager::wxDocManager(long,unsigned long)
       __ct__12wxDocManagerFlUl

-      __vft18wxCommandProcessor8wxObject

       ;wxDocManager::SelectViewType(wxDocTemplate**,int,unsigned long)
       SelectViewType__12wxDocManagerFPP13wxDocTemplateiUl
       ;wxDocManager::SelectDocumentType(wxDocTemplate**,int,unsigned long)
       ;wxDocManager::SelectViewType(wxDocTemplate**,int,unsigned long)
       SelectViewType__12wxDocManagerFPP13wxDocTemplateiUl
       ;wxDocManager::SelectDocumentType(wxDocTemplate**,int,unsigned long)


@@ -1090,12 +1314,16 @@ EXPORTS
       OnFileSave__12wxDocManagerFR14wxCommandEvent
       ;wxDocManager::OnFileNew(wxCommandEvent&)
       OnFileNew__12wxDocManagerFR14wxCommandEvent
       OnFileSave__12wxDocManagerFR14wxCommandEvent
       ;wxDocManager::OnFileNew(wxCommandEvent&)
       OnFileNew__12wxDocManagerFR14wxCommandEvent

+      ;wxDocManager::OnFileCloseAll(wxCommandEvent&)
+      OnFileCloseAll__12wxDocManagerFR14wxCommandEvent

       ;wxDocTemplate::CreateView(wxDocument*,long)
       CreateView__13wxDocTemplateFP10wxDocumentl
       ;wxDocManager::CreateView(wxDocument*,long)
       CreateView__12wxDocManagerFP10wxDocumentl
       ;wxDocTemplate::CreateDocument(const wxString&,long)
       CreateDocument__13wxDocTemplateFRC8wxStringl
       ;wxDocTemplate::CreateView(wxDocument*,long)
       CreateView__13wxDocTemplateFP10wxDocumentl
       ;wxDocManager::CreateView(wxDocument*,long)
       CreateView__12wxDocManagerFP10wxDocumentl
       ;wxDocTemplate::CreateDocument(const wxString&,long)
       CreateDocument__13wxDocTemplateFRC8wxStringl

+      ;wxDocManager::CloseDocuments(unsigned long)
+      CloseDocuments__12wxDocManagerFUl

       ;wxDocManager::AssociateTemplate(wxDocTemplate*)
       AssociateTemplate__12wxDocManagerFP13wxDocTemplate
       ;wxTransferFileToStream(const wxString&,ostream&)
       ;wxDocManager::AssociateTemplate(wxDocTemplate*)
       AssociateTemplate__12wxDocManagerFP13wxDocTemplate
       ;wxTransferFileToStream(const wxString&,ostream&)


@@ -1112,37 +1340,24 @@ EXPORTS
       wxConstructorForwxFileHistory__Fv
       ;wxDocManager::sm_eventTable
       sm_eventTable__12wxDocManager
       wxConstructorForwxFileHistory__Fv
       ;wxDocManager::sm_eventTable
       sm_eventTable__12wxDocManager

-      ;wxCommandProcessor::sm_classwxCommandProcessor
-      sm_classwxCommandProcessor__18wxCommandProcessor
-      ;wxCommand::~wxCommand()
-      __dt__9wxCommandFv
-      ;wxCommandProcessor::~wxCommandProcessor()
-      __dt__18wxCommandProcessorFv

       ;wxDocument::SaveAs()
       SaveAs__10wxDocumentFv
       ;wxDocument::OnSaveModified()
       OnSaveModified__10wxDocumentFv
       ;wxDocument::SaveAs()
       SaveAs__10wxDocumentFv
       ;wxDocument::OnSaveModified()
       OnSaveModified__10wxDocumentFv

-      ;wxCommandProcessor::Initialize()
-      Initialize__18wxCommandProcessorFv

       ;wxDocManager::Initialize()
       Initialize__12wxDocManagerFv
       ;wxDocParentFrame::GetEventTable() const
       GetEventTable__16wxDocParentFrameCFv
       ;wxDocManager::GetCurrentView() const
       GetCurrentView__12wxDocManagerCFv
       ;wxDocManager::Initialize()
       Initialize__12wxDocManagerFv
       ;wxDocParentFrame::GetEventTable() const
       GetEventTable__16wxDocParentFrameCFv
       ;wxDocManager::GetCurrentView() const
       GetCurrentView__12wxDocManagerCFv

-      ;wxCommandProcessor::CanUndo() const
-      CanUndo__18wxCommandProcessorCFv

       ;wxDocManager::MatchTemplate(const wxString&)
       MatchTemplate__12wxDocManagerFRC8wxString
       ;wxTransferStreamToFile(istream&,const wxString&)
       wxTransferStreamToFile__FR7istreamRC8wxString
       ;wxView::sm_classwxView
       sm_classwxView__6wxView
       ;wxDocManager::MatchTemplate(const wxString&)
       MatchTemplate__12wxDocManagerFRC8wxString
       ;wxTransferStreamToFile(istream&,const wxString&)
       wxTransferStreamToFile__FR7istreamRC8wxString
       ;wxView::sm_classwxView
       sm_classwxView__6wxView

-      ;wxCommand::wxCommand(unsigned long,const wxString&)
-      __ct__9wxCommandFUlRC8wxString

       ;wxDocManager::RemoveDocument(wxDocument*)
       RemoveDocument__12wxDocManagerFP10wxDocument
       ;wxDocManager::RemoveDocument(wxDocument*)
       RemoveDocument__12wxDocManagerFP10wxDocument

-      __vft9wxCommand8wxObject

       __vft13wxDocPrintout8wxObject
       __vft12wxDocManager8wxObject
       ;wxDocTemplate::wxDocTemplate(wxDocManager*,const wxString&,const wxString&,const wxString&,const wxString&,const wxString&,const wxString&,wxClassInfo*,wxClassInfo*,long)
       __vft13wxDocPrintout8wxObject
       __vft12wxDocManager8wxObject
       ;wxDocTemplate::wxDocTemplate(wxDocManager*,const wxString&,const wxString&,const wxString&,const wxString&,const wxString&,const wxString&,wxClassInfo*,wxClassInfo*,long)


@@ -1181,8 +1396,6 @@ EXPORTS
       __dt__13wxFileHistoryFv
       ;wxDocument::Revert()
       Revert__10wxDocumentFv
       __dt__13wxFileHistoryFv
       ;wxDocument::Revert()
       Revert__10wxDocumentFv

-      ;wxCommandProcessor::Redo()
-      Redo__18wxCommandProcessorFv

       ;wxDocument::OnCreateCommandProcessor()
       OnCreateCommandProcessor__10wxDocumentFv
       ;wxDocument::GetFirstView() const
       ;wxDocument::OnCreateCommandProcessor()
       OnCreateCommandProcessor__10wxDocumentFv
       ;wxDocument::GetFirstView() const


@@ -1195,46 +1408,153 @@ EXPORTS
       DeleteContents__10wxDocumentFv
       ;wxDocument::Close()
       Close__10wxDocumentFv
       DeleteContents__10wxDocumentFv
       ;wxDocument::Close()
       Close__10wxDocumentFv

-      ;wxCommandProcessor::ClearCommands()
-      ClearCommands__18wxCommandProcessorFv

       ;wxDocManager::ActivateView(wxView*,unsigned long,unsigned long)
       ActivateView__12wxDocManagerFP6wxViewUlT2
       ;wxDocument::OnOpenDocument(const wxString&)
       OnOpenDocument__10wxDocumentFRC8wxString
       ;wxDocManager::ActivateView(wxView*,unsigned long,unsigned long)
       ActivateView__12wxDocManagerFP6wxViewUlT2
       ;wxDocument::OnOpenDocument(const wxString&)
       OnOpenDocument__10wxDocumentFRC8wxString

+  ;From object file:  ..\common\dseldlg.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxDirSelector(const wxString&,const wxString&,long,const wxPoint&,wxWindow*)
+      wxDirSelector__FRC8wxStringT1lRC7wxPointP8wxWindow
+      wxDirSelectorPromptStr

   ;From object file:  ..\common\dynarray.cpp
     ;PUBDEFs (Symbols available from object file):
   ;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::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)


@@ -1243,8 +1563,6 @@ EXPORTS
       __dt__9wxLibraryFv
       ;wxLibraries::~wxLibraries()
       __dt__11wxLibrariesFv
       __dt__9wxLibraryFv
       ;wxLibraries::~wxLibraries()
       __dt__11wxLibrariesFv

-      ;wxDllLoader::GetSymbol(unsigned long,const wxString&)
-      GetSymbol__11wxDllLoaderFUlRC8wxString

       ;wxDllLoader::LoadLibrary(const wxString&,unsigned long*)
       LoadLibrary__11wxDllLoaderFRC8wxStringPUl
       ;wxLibraries::wxLibraries()
       ;wxDllLoader::LoadLibrary(const wxString&,unsigned long*)
       LoadLibrary__11wxDllLoaderFRC8wxStringPUl
       ;wxLibraries::wxLibraries()


@@ -1261,12 +1579,15 @@ EXPORTS
       GetProgramHandle__11wxDllLoaderFv
       ;wxLibrary::PrepareClasses(wxClassInfo*)
       PrepareClasses__9wxLibraryFP11wxClassInfo
       GetProgramHandle__11wxDllLoaderFv
       ;wxLibrary::PrepareClasses(wxClassInfo*)
       PrepareClasses__9wxLibraryFP11wxClassInfo

+      ;wxDllLoader::GetSymbol(unsigned long,const wxString&,unsigned long*)
+      GetSymbol__11wxDllLoaderFUlRC8wxStringPUl

       __vft9wxLibrary8wxObject
       __vft9wxLibrary8wxObject

-      ;wxDllLoader::GetDllExt()
-      GetDllExt__11wxDllLoaderFv
+      ;wxDllLoader::ms_dllext
+      ms_dllext__11wxDllLoader

       ;wxLibraries::LoadLibrary(const wxString&)
       LoadLibrary__11wxLibrariesFRC8wxString
       wxTheLibraries
       ;wxLibraries::LoadLibrary(const wxString&)
       LoadLibrary__11wxLibrariesFRC8wxString
       wxTheLibraries

+  ;From object file:  ..\common\dynload.cpp

   ;From object file:  ..\common\effects.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxEffects::sm_classwxEffects
   ;From object file:  ..\common\effects.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxEffects::sm_classwxEffects


@@ -1285,6 +1606,7 @@ EXPORTS
       GetAllEquivalents__19wxEncodingConverterF14wxFontEncoding
       ;wxEncodingConverter::wxEncodingConverter()
       __ct__19wxEncodingConverterFv
       GetAllEquivalents__19wxEncodingConverterF14wxFontEncoding
       ;wxEncodingConverter::wxEncodingConverter()
       __ct__19wxEncodingConverterFv

+      CompareCharsetItems

       ;wxEncodingConverter::Convert(const char*,wchar_t*)
       Convert__19wxEncodingConverterFPCcPw
       ;wxEncodingConverter::Init(wxFontEncoding,wxFontEncoding,int)
       ;wxEncodingConverter::Convert(const char*,wchar_t*)
       Convert__19wxEncodingConverterFPCcPw
       ;wxEncodingConverter::Init(wxFontEncoding,wxFontEncoding,int)


@@ -1301,8 +1623,8 @@ EXPORTS
       Convert__19wxEncodingConverterFPCwPw
   ;From object file:  ..\common\event.cpp
     ;PUBDEFs (Symbols available from object file):
       Convert__19wxEncodingConverterFPCwPw
   ;From object file:  ..\common\event.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxEvent::CopyObject(wxObject&) const
-      CopyObject__7wxEventCFR8wxObject
+      ;wxSetCursorEvent::sm_classwxSetCursorEvent
+      sm_classwxSetCursorEvent__16wxSetCursorEvent

       wxEVT_SETTING_CHANGED
       wxEVT_SCROLLWIN_TOP
       wxEVT_NC_LEFT_UP
       wxEVT_SETTING_CHANGED
       wxEVT_SCROLLWIN_TOP
       wxEVT_NC_LEFT_UP


@@ -1317,15 +1639,9 @@ EXPORTS
       sm_classwxFocusEvent__12wxFocusEvent
       ;wxCloseEvent::sm_classwxCloseEvent
       sm_classwxCloseEvent__12wxCloseEvent
       sm_classwxFocusEvent__12wxFocusEvent
       ;wxCloseEvent::sm_classwxCloseEvent
       sm_classwxCloseEvent__12wxCloseEvent

-      __vft16wxDropFilesEvent8wxObject
-      __vft11wxShowEvent8wxObject
-      __vft11wxMenuEvent8wxObject
-      ;wxNotifyEvent::CopyObject(wxObject&) const
-      CopyObject__13wxNotifyEventCFR8wxObject
-      ;wxCloseEvent::CopyObject(wxObject&) const
-      CopyObject__12wxCloseEventCFR8wxObject

       ;wxCommandEvent::wxCommandEvent(int,int)
       __ct__14wxCommandEventFiT1
       ;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)


@@ -1334,11 +1650,11 @@ EXPORTS
       ButtonUp__12wxMouseEventCFi
       ;wxMouseEvent::ButtonDown(int) const
       ButtonDown__12wxMouseEventCFi
       ButtonUp__12wxMouseEventCFi
       ;wxMouseEvent::ButtonDown(int) const
       ButtonDown__12wxMouseEventCFi

-      ;wxConstructorForwxEraseEvent()
-      wxConstructorForwxEraseEvent__Fv
+      ;wxConstructorForwxNcPaintEvent()
+      wxConstructorForwxNcPaintEvent__Fv

       wxEVT_SET_CURSOR
       wxEVT_SCROLLWIN_LINEDOWN
       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()


@@ -1351,25 +1667,30 @@ EXPORTS
       wxConstructorForwxJoystickEvent__Fv
       ;wxConstructorForwxIconizeEvent()
       wxConstructorForwxIconizeEvent__Fv
       wxConstructorForwxJoystickEvent__Fv
       ;wxConstructorForwxIconizeEvent()
       wxConstructorForwxIconizeEvent__Fv

+      ;wxConstructorForwxEraseEvent()
+      wxConstructorForwxEraseEvent__Fv

       ;wxConstructorForwxDropFilesEvent()
       wxConstructorForwxDropFilesEvent__Fv
       ;wxEvtHandler::sm_eventTableEntries
       sm_eventTableEntries__12wxEvtHandler
       ;wxConstructorForwxDropFilesEvent()
       wxConstructorForwxDropFilesEvent__Fv
       ;wxEvtHandler::sm_eventTableEntries
       sm_eventTableEntries__12wxEvtHandler

-      ;wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow*)
-      __ct__20wxWindowDestroyEventFP8wxWindow
+      ;wxEvtHandler::DoGetClientData() const
+      DoGetClientData__12wxEvtHandlerCFv
+      ;wxChildFocusEvent::wxChildFocusEvent(wxWindow*)
+      __ct__17wxChildFocusEventFP8wxWindow

       ;wxFindFocusDescendant(wxWindow*)
       wxFindFocusDescendant__FP8wxWindow
       wxEVT_RIGHT_DCLICK
       wxEVT_ENTER_WINDOW
       wxEVT_COMMAND_LEFT_CLICK
       wxEVT_CHAR_HOOK
       ;wxFindFocusDescendant(wxWindow*)
       wxFindFocusDescendant__FP8wxWindow
       wxEVT_RIGHT_DCLICK
       wxEVT_ENTER_WINDOW
       wxEVT_COMMAND_LEFT_CLICK
       wxEVT_CHAR_HOOK

+      ;wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow*)
+      __ct__20wxWindowDestroyEventFP8wxWindow

       ;wxEvtHandler::Connect(int,int,int,void( wxObject::*)(wxEvent&),wxObject*)
       Connect__12wxEvtHandlerFiN21M8wxObjectFR7wxEvent_vP8wxObject
       wxEVT_SOCKET
       wxEVT_SCROLLWIN_PAGEUP
       wxEVT_MOUSEWHEEL
       wxEVT_MIDDLE_UP
       ;wxEvtHandler::Connect(int,int,int,void( wxObject::*)(wxEvent&),wxObject*)
       Connect__12wxEvtHandlerFiN21M8wxObjectFR7wxEvent_vP8wxObject
       wxEVT_SOCKET
       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


@@ -1392,15 +1713,6 @@ EXPORTS
       sm_classwxJoystickEvent__15wxJoystickEvent
       ;wxCommandEvent::sm_classwxCommandEvent
       sm_classwxCommandEvent__14wxCommandEvent
       sm_classwxJoystickEvent__15wxJoystickEvent
       ;wxCommandEvent::sm_classwxCommandEvent
       sm_classwxCommandEvent__14wxCommandEvent

-      __vft22wxQueryNewPaletteEvent8wxObject
-      __vft15wxActivateEvent8wxObject
-      __vft12wxEraseEvent8wxObject
-      ;wxQueryNewPaletteEvent::CopyObject(wxObject&) const
-      CopyObject__22wxQueryNewPaletteEventCFR8wxObject
-      ;wxScrollWinEvent::CopyObject(wxObject&) const
-      CopyObject__16wxScrollWinEventCFR8wxObject
-      ;wxMouseEvent::CopyObject(wxObject&) const
-      CopyObject__12wxMouseEventCFR8wxObject

       ;wxEvtHandler::AddPendingEvent(wxEvent&)
       AddPendingEvent__12wxEvtHandlerFR7wxEvent
       ;wxMouseEvent::Button(int) const
       ;wxEvtHandler::AddPendingEvent(wxEvent&)
       AddPendingEvent__12wxEvtHandlerFR7wxEvent
       ;wxMouseEvent::Button(int) const


@@ -1415,6 +1727,8 @@ EXPORTS
       wxEVT_DRAW_ITEM
       ;wxKeyEvent::wxKeyEvent(int)
       __ct__10wxKeyEventFi
       wxEVT_DRAW_ITEM
       ;wxKeyEvent::wxKeyEvent(int)
       __ct__10wxKeyEventFi

+      ;wxEvtHandler::DoSetClientObject(wxClientData*)
+      DoSetClientObject__12wxEvtHandlerFP12wxClientData

       ;wxEvtHandler::wxEvtHandler()
       __ct__12wxEvtHandlerFv
       wxEVT_POWER
       ;wxEvtHandler::wxEvtHandler()
       __ct__12wxEvtHandlerFv
       wxEVT_POWER


@@ -1422,7 +1736,6 @@ EXPORTS
       wxEVT_MOTION
       wxEVT_KEY_DOWN
       wxEVT_JOY_BUTTON_DOWN
       wxEVT_MOTION
       wxEVT_KEY_DOWN
       wxEVT_JOY_BUTTON_DOWN

-      wxEVT_COMMAND_TEXT_ENTER

       ;wxConstructorForwxWindowCreateEvent()
       wxConstructorForwxWindowCreateEvent__Fv
       ;wxConstructorForwxUpdateUIEvent()
       ;wxConstructorForwxWindowCreateEvent()
       wxConstructorForwxWindowCreateEvent__Fv
       ;wxConstructorForwxUpdateUIEvent()


@@ -1431,12 +1744,15 @@ EXPORTS
       wxConstructorForwxSysColourChangedEvent__Fv
       ;wxConstructorForwxNavigationKeyEvent()
       wxConstructorForwxNavigationKeyEvent__Fv
       wxConstructorForwxSysColourChangedEvent__Fv
       ;wxConstructorForwxNavigationKeyEvent()
       wxConstructorForwxNavigationKeyEvent__Fv

+      ;wxConstructorForwxMouseCaptureChangedEvent()
+      wxConstructorForwxMouseCaptureChangedEvent__Fv

       ;wxConstructorForwxHelpEvent()
       wxConstructorForwxHelpEvent__Fv
       ;wxEvtHandler::~wxEvtHandler()
       __dt__12wxEvtHandlerFv
       ;wxEvtHandler::GetEventTable() const
       GetEventTable__12wxEvtHandlerCFv
       ;wxConstructorForwxHelpEvent()
       wxConstructorForwxHelpEvent__Fv
       ;wxEvtHandler::~wxEvtHandler()
       __dt__12wxEvtHandlerFv
       ;wxEvtHandler::GetEventTable() const
       GetEventTable__12wxEvtHandlerCFv

+      wxEVT_CHILD_FOCUS

       wxEVT_NC_LEAVE_WINDOW
       wxEVT_DROP_FILES
       wxEVT_COMMAND_RIGHT_CLICK
       wxEVT_NC_LEAVE_WINDOW
       wxEVT_DROP_FILES
       wxEVT_COMMAND_RIGHT_CLICK


@@ -1461,23 +1777,11 @@ EXPORTS
       sm_classwxMoveEvent__11wxMoveEvent
       ;wxIconizeEvent::sm_classwxIconizeEvent
       sm_classwxIconizeEvent__14wxIconizeEvent
       sm_classwxMoveEvent__11wxMoveEvent
       ;wxIconizeEvent::sm_classwxIconizeEvent
       sm_classwxIconizeEvent__14wxIconizeEvent

-      __vft16wxScrollWinEvent8wxObject
-      __vft13wxNotifyEvent8wxObject
-      __vft12wxMouseEvent8wxObject
+      ;wxChildFocusEvent::sm_classwxChildFocusEvent
+      sm_classwxChildFocusEvent__17wxChildFocusEvent

       __vft12wxEvtHandler8wxObject
       __vft12wxEvtHandler8wxObject

-      __vft11wxMoveEvent8wxObject
-      ;wxDropFilesEvent::CopyObject(wxObject&) const
-      CopyObject__16wxDropFilesEventCFR8wxObject
-      ;wxJoystickEvent::CopyObject(wxObject&) const
-      CopyObject__15wxJoystickEventCFR8wxObject
-      ;wxActivateEvent::CopyObject(wxObject&) const
-      CopyObject__15wxActivateEventCFR8wxObject
-      ;wxSizeEvent::CopyObject(wxObject&) const
-      CopyObject__11wxSizeEventCFR8wxObject
-      ;wxMenuEvent::CopyObject(wxObject&) const
-      CopyObject__11wxMenuEventCFR8wxObject
-      ;wxIdleEvent::CopyObject(wxObject&) const
-      CopyObject__11wxIdleEventCFR8wxObject
+      ;wxEvent::wxEvent(int,int)
+      __ct__7wxEventFiT1

       wxEVT_SIZE
       wxEVT_SCROLL_BOTTOM
       wxEVT_SCROLLWIN_BOTTOM
       wxEVT_SIZE
       wxEVT_SCROLL_BOTTOM
       wxEVT_SCROLLWIN_BOTTOM


@@ -1491,32 +1795,38 @@ EXPORTS
       wxEVT_NC_MOTION
       wxEVT_LEFT_DOWN
       wxEVT_COMMAND_TOOL_ENTER
       wxEVT_NC_MOTION
       wxEVT_LEFT_DOWN
       wxEVT_COMMAND_TOOL_ENTER

+      ;wxConstructorForwxSetCursorEvent()
+      wxConstructorForwxSetCursorEvent__Fv

       ;wxConstructorForwxScrollWinEvent()
       wxConstructorForwxScrollWinEvent__Fv
       ;wxConstructorForwxPaintEvent()
       wxConstructorForwxPaintEvent__Fv
       ;wxConstructorForwxNotifyEvent()
       wxConstructorForwxNotifyEvent__Fv
       ;wxConstructorForwxScrollWinEvent()
       wxConstructorForwxScrollWinEvent__Fv
       ;wxConstructorForwxPaintEvent()
       wxConstructorForwxPaintEvent__Fv
       ;wxConstructorForwxNotifyEvent()
       wxConstructorForwxNotifyEvent__Fv

+      ;wxConstructorForwxDisplayChangedEvent()
+      wxConstructorForwxDisplayChangedEvent__Fv

       ;wxConstructorForwxContextMenuEvent()
       wxConstructorForwxContextMenuEvent__Fv
       ;wxConstructorForwxCloseEvent()
       wxConstructorForwxCloseEvent__Fv
       ;wxEvtHandler::sm_classwxEvtHandler
       sm_classwxEvtHandler__12wxEvtHandler
       ;wxConstructorForwxContextMenuEvent()
       wxConstructorForwxContextMenuEvent__Fv
       ;wxConstructorForwxCloseEvent()
       wxConstructorForwxCloseEvent__Fv
       ;wxEvtHandler::sm_classwxEvtHandler
       sm_classwxEvtHandler__12wxEvtHandler

+      ;wxEvtHandler::DoGetClientObject() const
+      DoGetClientObject__12wxEvtHandlerCFv

       wxEVT_LEAVE_WINDOW
       wxEVT_NC_RIGHT_DCLICK
       wxEVT_KILL_FOCUS
       wxEVT_COMMAND_RIGHT_DCLICK
       wxEVT_CLOSE_WINDOW
       wxEVT_LEAVE_WINDOW
       wxEVT_NC_RIGHT_DCLICK
       wxEVT_KILL_FOCUS
       wxEVT_COMMAND_RIGHT_DCLICK
       wxEVT_CLOSE_WINDOW

-      ;wxCommandEvent::CopyObject(wxObject&) const
-      CopyObject__14wxCommandEventCFR8wxObject
+      ;wxMouseEvent::Assign(const wxMouseEvent&)
+      Assign__12wxMouseEventFRC12wxMouseEvent

       wxEVT_SCROLL_LINEUP
       wxEVT_SCROLL_LINEUP

+      wxEVT_SCROLL_ENDSCROLL

       wxEVT_PAINT
       wxEVT_NULL
       wxEVT_NC_RIGHT_UP
       wxEVT_NC_PAINT
       wxEVT_LEFT_UP
       wxEVT_PAINT
       wxEVT_NULL
       wxEVT_NC_RIGHT_UP
       wxEVT_NC_PAINT
       wxEVT_LEFT_UP

-      wxEVT_COMMAND_TEXT_UPDATED

       wxEVT_COMMAND_RADIOBOX_SELECTED
       wxEVT_COMMAND_MENU_SELECTED
       wxEVT_COMMAND_LISTBOX_SELECTED
       wxEVT_COMMAND_RADIOBOX_SELECTED
       wxEVT_COMMAND_MENU_SELECTED
       wxEVT_COMMAND_LISTBOX_SELECTED


@@ -1536,25 +1846,10 @@ EXPORTS
       sm_classwxEvent__7wxEvent
       ;wxEraseEvent::sm_classwxEraseEvent
       sm_classwxEraseEvent__12wxEraseEvent
       sm_classwxEvent__7wxEvent
       ;wxEraseEvent::sm_classwxEraseEvent
       sm_classwxEraseEvent__12wxEraseEvent

-      __vft7wxEvent8wxObject
-      __vft21wxPaletteChangedEvent8wxObject
-      __vft14wxCommandEvent8wxObject
-      __vft11wxSizeEvent8wxObject
-      __vft10wxKeyEvent8wxObject

       ;wxEvtHandler::SearchEventTable(wxEventTable&,wxEvent&)
       SearchEventTable__12wxEvtHandlerFR12wxEventTableR7wxEvent
       ;wxEvtHandler::ProcessEvent(wxEvent&)
       ProcessEvent__12wxEvtHandlerFR7wxEvent
       ;wxEvtHandler::SearchEventTable(wxEventTable&,wxEvent&)
       SearchEventTable__12wxEvtHandlerFR12wxEventTableR7wxEvent
       ;wxEvtHandler::ProcessEvent(wxEvent&)
       ProcessEvent__12wxEvtHandlerFR7wxEvent

-      ;wxUpdateUIEvent::CopyObject(wxObject&) const
-      CopyObject__15wxUpdateUIEventCFR8wxObject
-      ;wxEraseEvent::CopyObject(wxObject&) const
-      CopyObject__12wxEraseEventCFR8wxObject
-      ;wxShowEvent::CopyObject(wxObject&) const
-      CopyObject__11wxShowEventCFR8wxObject
-      ;wxMoveEvent::CopyObject(wxObject&) const
-      CopyObject__11wxMoveEventCFR8wxObject
-      ;wxKeyEvent::CopyObject(wxObject&) const
-      CopyObject__10wxKeyEventCFR8wxObject

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


@@ -1591,6 +1886,8 @@ EXPORTS
       wxConstructorForwxActivateEvent__Fv
       ;wxEvtHandler::ProcessPendingEvents()
       ProcessPendingEvents__12wxEvtHandlerFv
       wxConstructorForwxActivateEvent__Fv
       ;wxEvtHandler::ProcessPendingEvents()
       ProcessPendingEvents__12wxEvtHandlerFv

+      ;wxMouseEvent::GetButton() const
+      GetButton__12wxMouseEventCFv

       ;wxWindowCreateEvent::wxWindowCreateEvent(wxWindow*)
       __ct__19wxWindowCreateEventFP8wxWindow
       wxPendingEvents
       ;wxWindowCreateEvent::wxWindowCreateEvent(wxWindow*)
       __ct__19wxWindowCreateEventFP8wxWindow
       wxPendingEvents


@@ -1603,15 +1900,15 @@ EXPORTS
       wxEVT_COMMAND_LEFT_DCLICK
       ;wxMouseEvent::GetLogicalPosition(const wxDC&) const
       GetLogicalPosition__12wxMouseEventCFRC4wxDC
       wxEVT_COMMAND_LEFT_DCLICK
       ;wxMouseEvent::GetLogicalPosition(const wxDC&) const
       GetLogicalPosition__12wxMouseEventCFRC4wxDC

-      ;wxPaletteChangedEvent::CopyObject(wxObject&) const
-      CopyObject__21wxPaletteChangedEventCFR8wxObject
+      ;wxEvent::wxEvent(const wxEvent&)
+      __ct__7wxEventFRC7wxEvent

       wxEVT_RIGHT_UP
       wxEVT_RIGHT_UP

-      wxEVT_POPUP_MENU_INIT

       wxEVT_PALETTE_CHANGED
       wxEVT_NC_MIDDLE_UP
       wxEVT_MENU_HIGHLIGHT
       wxEVT_KEY_UP
       wxEVT_JOY_BUTTON_UP
       wxEVT_PALETTE_CHANGED
       wxEVT_NC_MIDDLE_UP
       wxEVT_MENU_HIGHLIGHT
       wxEVT_KEY_UP
       wxEVT_JOY_BUTTON_UP

+      wxEVT_DISPLAY_CHANGED

       wxEVT_COMMAND_SCROLLBAR_UPDATED
       wxEVT_COMMAND_RADIOBUTTON_SELECTED
       ;wxWindowCreateEvent::sm_classwxWindowCreateEvent
       wxEVT_COMMAND_SCROLLBAR_UPDATED
       wxEVT_COMMAND_RADIOBUTTON_SELECTED
       ;wxWindowCreateEvent::sm_classwxWindowCreateEvent


@@ -1620,27 +1917,27 @@ EXPORTS
       sm_classwxShowEvent__11wxShowEvent
       ;wxScrollWinEvent::sm_classwxScrollWinEvent
       sm_classwxScrollWinEvent__16wxScrollWinEvent
       sm_classwxShowEvent__11wxShowEvent
       ;wxScrollWinEvent::sm_classwxScrollWinEvent
       sm_classwxScrollWinEvent__16wxScrollWinEvent

+      ;wxNcPaintEvent::sm_classwxNcPaintEvent
+      sm_classwxNcPaintEvent__14wxNcPaintEvent
+      ;wxMouseCaptureChangedEvent::sm_classwxMouseCaptureChangedEvent
+      sm_classwxMouseCaptureChangedEvent__26wxMouseCaptureChangedEvent

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

+      ;wxDisplayChangedEvent::sm_classwxDisplayChangedEvent
+      sm_classwxDisplayChangedEvent__21wxDisplayChangedEvent

       ;wxContextMenuEvent::sm_classwxContextMenuEvent
       sm_classwxContextMenuEvent__18wxContextMenuEvent
       ;wxActivateEvent::sm_classwxActivateEvent
       sm_classwxActivateEvent__15wxActivateEvent
       ;wxContextMenuEvent::sm_classwxContextMenuEvent
       sm_classwxContextMenuEvent__18wxContextMenuEvent
       ;wxActivateEvent::sm_classwxActivateEvent
       sm_classwxActivateEvent__15wxActivateEvent

-      __vft15wxUpdateUIEvent8wxObject
-      __vft15wxJoystickEvent8wxObject
-      __vft12wxCloseEvent8wxObject
-      __vft11wxIdleEvent8wxObject

       ;wxEvtHandler::SearchDynamicEventTable(wxEvent&)
       SearchDynamicEventTable__12wxEvtHandlerFR7wxEvent
       ;wxEvtHandler::ProcessThreadEvent(wxEvent&)
       ProcessThreadEvent__12wxEvtHandlerFR7wxEvent
       ;wxEvtHandler::SearchDynamicEventTable(wxEvent&)
       SearchDynamicEventTable__12wxEvtHandlerFR7wxEvent
       ;wxEvtHandler::ProcessThreadEvent(wxEvent&)
       ProcessThreadEvent__12wxEvtHandlerFR7wxEvent

-      ;wxEvent::wxEvent(int)
-      __ct__7wxEventFi
-      wxEVT_UPDATE_UI

       ;wxScrollEvent::wxScrollEvent(int,int,int,int)
       __ct__13wxScrollEventFiN31
       ;wxScrollEvent::wxScrollEvent(int,int,int,int)
       __ct__13wxScrollEventFiN31

+      wxEVT_UPDATE_UI

       ;wxConstructorForwxIdleEvent()
       wxConstructorForwxIdleEvent__Fv
       wxEVT_SCROLL_PAGEDOWN
       ;wxConstructorForwxIdleEvent()
       wxConstructorForwxIdleEvent__Fv
       wxEVT_SCROLL_PAGEDOWN


@@ -1655,8 +1952,12 @@ EXPORTS
       wxConstructorForwxQueryNewPaletteEvent__Fv
       ;wxConstructorForwxFocusEvent()
       wxConstructorForwxFocusEvent__Fv
       wxConstructorForwxQueryNewPaletteEvent__Fv
       ;wxConstructorForwxFocusEvent()
       wxConstructorForwxFocusEvent__Fv

+      ;wxConstructorForwxChildFocusEvent()
+      wxConstructorForwxChildFocusEvent__Fv

       ;wxEvtHandler::sm_eventTable
       sm_eventTable__12wxEvtHandler
       ;wxEvtHandler::sm_eventTable
       sm_eventTable__12wxEvtHandler

+      ;wxEvtHandler::DoSetClientData(void*)
+      DoSetClientData__12wxEvtHandlerFPv

       wxEVT_LEFT_DCLICK
       wxEVT_SET_FOCUS
       wxEVT_NC_LEFT_DCLICK
       wxEVT_LEFT_DCLICK
       wxEVT_SET_FOCUS
       wxEVT_NC_LEFT_DCLICK


@@ -1666,6 +1967,24 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ConvertToIeeeExtended
       ConvertFromIeeeExtended
     ;PUBDEFs (Symbols available from object file):
       ConvertToIeeeExtended
       ConvertFromIeeeExtended

+  ;From object file:  ..\common\fddlgcmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxFindDialogEvent::sm_classwxFindDialogEvent
+      sm_classwxFindDialogEvent__17wxFindDialogEvent
+      wxEVT_COMMAND_FIND_REPLACE_ALL
+      wxEVT_COMMAND_FIND_REPLACE
+      wxEVT_COMMAND_FIND_CLOSE
+      ;wxFindReplaceDialogBase::Send(wxFindDialogEvent&)
+      Send__23wxFindReplaceDialogBaseFR17wxFindDialogEvent
+      ;wxFindReplaceData::Init()
+      Init__17wxFindReplaceDataFv
+      ;wxConstructorForwxFindDialogEvent()
+      wxConstructorForwxFindDialogEvent__Fv
+      __vft23wxFindReplaceDialogBase8wxObject
+      wxEVT_COMMAND_FIND_NEXT
+      wxEVT_COMMAND_FIND
+      ;wxFindReplaceDialogBase::~wxFindReplaceDialogBase()
+      __dt__23wxFindReplaceDialogBaseFv

   ;From object file:  ..\common\ffile.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxFFile::Seek(long,wxSeekMode)
   ;From object file:  ..\common\ffile.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxFFile::Seek(long,wxSeekMode)


@@ -1728,101 +2047,103 @@ EXPORTS
       __ct__10wxTempFileFRC8wxString
   ;From object file:  ..\common\fileconf.cpp
     ;PUBDEFs (Symbols available from object file):
       __ct__10wxTempFileFRC8wxString
   ;From object file:  ..\common\fileconf.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;ConfigEntry::SetValue(const wxString&,unsigned long)
-      SetValue__11ConfigEntryFRC8wxStringUl
-      ;wxFileConfig::Write(const wxString&,long)
-      Write__12wxFileConfigFRC8wxStringl
-      ;wxFileConfig::Read(const wxString&,long*) const
-      Read__12wxFileConfigCFRC8wxStringPl
+      ;wxFileConfigGroup::SetLine(wxFileConfigLineList*)
+      SetLine__17wxFileConfigGroupFP20wxFileConfigLineList
+      ;wxFileConfig::LineListRemove(wxFileConfigLineList*)
+      LineListRemove__12wxFileConfigFP20wxFileConfigLineList

       ;wxFileConfig::GetNextGroup(wxString&,long&) const
       GetNextGroup__12wxFileConfigCFR8wxStringRl
       ;wxFileConfig::GetFirstEntry(wxString&,long&) const
       GetFirstEntry__12wxFileConfigCFR8wxStringRl
       ;wxFileConfig::DeleteEntry(const wxString&,unsigned long)
       DeleteEntry__12wxFileConfigFRC8wxStringUl
       ;wxFileConfig::GetNextGroup(wxString&,long&) const
       GetNextGroup__12wxFileConfigCFR8wxStringRl
       ;wxFileConfig::GetFirstEntry(wxString&,long&) const
       GetFirstEntry__12wxFileConfigCFR8wxStringRl
       ;wxFileConfig::DeleteEntry(const wxString&,unsigned long)
       DeleteEntry__12wxFileConfigFRC8wxStringUl

-      ;wxFileConfig::Write(const wxString&,const wxString&)
-      Write__12wxFileConfigFRC8wxStringT1
-      ;ConfigEntry::ConfigEntry(ConfigGroup*,const wxString&,int)
-      __ct__11ConfigEntryFP11ConfigGroupRC8wxStringi
-      ;ConfigGroup::~ConfigGroup()
-      __dt__11ConfigGroupFv
-      ;ConfigGroup::GetFullName() const
-      GetFullName__11ConfigGroupCFv
-      ;ConfigGroup::FindEntry(const char*) const
-      FindEntry__11ConfigGroupCFPCc
-      ;ConfigEntry::SetLine(LineList*)
-      SetLine__11ConfigEntryFP8LineList
+      ;wxFileConfigGroup::~wxFileConfigGroup()
+      __dt__17wxFileConfigGroupFv
+      ;wxFileConfigEntry::SetDirty()
+      SetDirty__17wxFileConfigEntryFv
+      ;wxFileConfigGroup::GetFullName() const
+      GetFullName__17wxFileConfigGroupCFv
+      ;wxFileConfigGroup::wxFileConfigGroup(wxFileConfigGroup*,const wxString&,wxFileConfig*)
+      __ct__17wxFileConfigGroupFP17wxFileConfigGroupRC8wxStringP12wxFileConfig
+      ;wxFileConfigGroup::Rename(const wxString&)
+      Rename__17wxFileConfigGroupFRC8wxString
+      ;wxFileConfigGroup::FindEntry(const char*) const
+      FindEntry__17wxFileConfigGroupCFPCc
+      ;wxFileConfigEntry::SetValue(const wxString&,unsigned long)
+      SetValue__17wxFileConfigEntryFRC8wxStringUl
+      ;wxFileConfig::wxFileConfig(wxInputStream&)
+      __ct__12wxFileConfigFR13wxInputStream

       ;wxFileConfig::RenameGroup(const wxString&,const wxString&)
       RenameGroup__12wxFileConfigFRC8wxStringT1
       ;wxFileConfig::Init()
       Init__12wxFileConfigFv
       ;wxFileConfig::RenameGroup(const wxString&,const wxString&)
       RenameGroup__12wxFileConfigFRC8wxStringT1
       ;wxFileConfig::Init()
       Init__12wxFileConfigFv

-      ;ConfigEntry::SetDirty()
-      SetDirty__11ConfigEntryFv
+      ;wxFileConfigGroup::GetLastGroupLine()
+      GetLastGroupLine__17wxFileConfigGroupFv

       ;wxFileConfig::LineListAppend(const wxString&)
       LineListAppend__12wxFileConfigFRC8wxString
       ;wxFileConfig::LineListAppend(const wxString&)
       LineListAppend__12wxFileConfigFRC8wxString

-      ;ConfigGroup::DeleteSubgroupByName(const char*)
-      DeleteSubgroupByName__11ConfigGroupFPCc
+      ;wxFileConfig::DoReadString(const wxString&,wxString*) const
+      DoReadString__12wxFileConfigCFRC8wxStringP8wxString

       ;wxFileConfig::DeleteGroup(const wxString&)
       DeleteGroup__12wxFileConfigFRC8wxString
       ;wxFileConfig::DeleteGroup(const wxString&)
       DeleteGroup__12wxFileConfigFRC8wxString

-      ;wxFileConfig::Parse(wxTextFile&,unsigned long)
-      Parse__12wxFileConfigFR10wxTextFileUl
-      ;ConfigGroup::SetLine(LineList*)
-      SetLine__11ConfigGroupFP8LineList
+      ;wxFileConfig::DoReadLong(const wxString&,long*) const
+      DoReadLong__12wxFileConfigCFRC8wxStringPl
+      ;wxFileConfig::LineListInsert(const wxString&,wxFileConfigLineList*)
+      LineListInsert__12wxFileConfigFRC8wxStringP20wxFileConfigLineList

       ;wxFileConfig::Flush(unsigned long)
       Flush__12wxFileConfigFUl
       ;wxFileConfig::Flush(unsigned long)
       Flush__12wxFileConfigFUl

-      ;ConfigGroup::AddEntry(const wxString&,int)
-      AddEntry__11ConfigGroupFRC8wxStringi
+      ;wxFileConfig::DoWriteLong(const wxString&,long)
+      DoWriteLong__12wxFileConfigFRC8wxStringl
+      ;wxFileConfig::DoWriteString(const wxString&,const wxString&)
+      DoWriteString__12wxFileConfigFRC8wxStringT1

       ;wxFileConfig::RenameEntry(const wxString&,const wxString&)
       RenameEntry__12wxFileConfigFRC8wxStringT1
       ;wxFileConfig::RenameEntry(const wxString&,const wxString&)
       RenameEntry__12wxFileConfigFRC8wxStringT1

-      ;wxFileConfig::Read(const wxString&,wxString*,const wxString&) const
-      Read__12wxFileConfigCFRC8wxStringP8wxStringT1

       ;wxFileConfig::SetRootPath()
       SetRootPath__12wxFileConfigFv
       ;wxFileConfig::SetRootPath()
       SetRootPath__12wxFileConfigFv

+      ;wxFileConfigGroup::GetLastEntryLine()
+      GetLastEntryLine__17wxFileConfigGroupFv

       ;wxFileConfig::GetLocalFileName(const char*)
       GetLocalFileName__12wxFileConfigFPCc
       ;wxFileConfig::GetLocalFileName(const char*)
       GetLocalFileName__12wxFileConfigFPCc

-      ;ConfigGroup::ConfigGroup(ConfigGroup*,const wxString&,wxFileConfig*)
-      __ct__11ConfigGroupFP11ConfigGroupRC8wxStringP12wxFileConfig
+      ;wxFileConfigGroup::FindSubgroup(const char*) const
+      FindSubgroup__17wxFileConfigGroupCFPCc
+      ;wxFileConfigGroup::DeleteSubgroupByName(const char*)
+      DeleteSubgroupByName__17wxFileConfigGroupFPCc

       ;wxFileConfig::GetFirstGroup(wxString&,long&) const
       GetFirstGroup__12wxFileConfigCFR8wxStringRl
       ;wxFileConfig::GetNumberOfGroups(unsigned long) const
       GetNumberOfGroups__12wxFileConfigCFUl
       ;wxFileConfig::GetFirstGroup(wxString&,long&) const
       GetFirstGroup__12wxFileConfigCFR8wxStringRl
       ;wxFileConfig::GetNumberOfGroups(unsigned long) const
       GetNumberOfGroups__12wxFileConfigCFUl

+      ;wxFileConfigGroup::AddEntry(const wxString&,int)
+      AddEntry__17wxFileConfigGroupFRC8wxStringi

       __vft12wxFileConfig12wxConfigBase
       __vft12wxFileConfig12wxConfigBase

+      ;wxFileConfigEntry::wxFileConfigEntry(wxFileConfigGroup*,const wxString&,int)
+      __ct__17wxFileConfigEntryFP17wxFileConfigGroupRC8wxStringi

       ;wxFileConfig::~wxFileConfig()
       __dt__12wxFileConfigFv
       ;wxFileConfig::~wxFileConfig()
       __dt__12wxFileConfigFv

+      ;wxFileConfigGroup::SetDirty()
+      SetDirty__17wxFileConfigGroupFv

       ;wxFileConfig::LineListIsEmpty()
       LineListIsEmpty__12wxFileConfigFv
       ;wxFileConfig::LineListIsEmpty()
       LineListIsEmpty__12wxFileConfigFv

-      ;ConfigGroup::GetLastGroupLine()
-      GetLastGroupLine__11ConfigGroupFv
-      ;ConfigGroup::GetGroupLine()
-      GetGroupLine__11ConfigGroupFv
-      ;ConfigGroup::FindSubgroup(const char*) const
-      FindSubgroup__11ConfigGroupCFPCc
-      ;wxFileConfig::Read(const wxString&,wxString*) const
-      Read__12wxFileConfigCFRC8wxStringP8wxString
+      ;wxFileConfigGroup::GetGroupLine()
+      GetGroupLine__17wxFileConfigGroupFv

       ;wxFileConfig::HasEntry(const wxString&) const
       HasEntry__12wxFileConfigCFRC8wxString
       ;wxFileConfig::HasEntry(const wxString&) const
       HasEntry__12wxFileConfigCFRC8wxString

-      ;ConfigGroup::AddSubgroup(const wxString&)
-      AddSubgroup__11ConfigGroupFRC8wxString
+      ;wxFileConfigGroup::DeleteEntry(const char*)
+      DeleteEntry__17wxFileConfigGroupFPCc
+      ;wxFileConfig::Parse(wxTextBuffer&,unsigned long)
+      Parse__12wxFileConfigFR12wxTextBufferUl

       ;wxFileConfig::wxFileConfig(const wxString&,const wxString&,const wxString&,const wxString&,long)
       __ct__12wxFileConfigFRC8wxStringN31l
       ;wxFileConfig::wxFileConfig(const wxString&,const wxString&,const wxString&,const wxString&,long)
       __ct__12wxFileConfigFRC8wxStringN31l

-      ;wxFileConfig::LineListRemove(LineList*)
-      LineListRemove__12wxFileConfigFP8LineList
-      ;wxFileConfig::LineListInsert(const wxString&,LineList*)
-      LineListInsert__12wxFileConfigFRC8wxStringP8LineList
+      ;wxFileConfigEntry::SetLine(wxFileConfigLineList*)
+      SetLine__17wxFileConfigEntryFP20wxFileConfigLineList

       ;wxFileConfig::GetNumberOfEntries(unsigned long) const
       GetNumberOfEntries__12wxFileConfigCFUl
       ;wxFileConfig::GetNextEntry(wxString&,long&) const
       GetNextEntry__12wxFileConfigCFR8wxStringRl
       ;wxFileConfig::GetNumberOfEntries(unsigned long) const
       GetNumberOfEntries__12wxFileConfigCFUl
       ;wxFileConfig::GetNextEntry(wxString&,long&) const
       GetNextEntry__12wxFileConfigCFR8wxStringRl

-      ;ConfigGroup::DeleteSubgroup(ConfigGroup*)
-      DeleteSubgroup__11ConfigGroupFP11ConfigGroup
+      ;wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup*)
+      DeleteSubgroup__17wxFileConfigGroupFP17wxFileConfigGroup

       ;wxFileConfig::GetGlobalDir()
       GetGlobalDir__12wxFileConfigFv
       ;wxFileConfig::GetGlobalDir()
       GetGlobalDir__12wxFileConfigFv

-      ;ConfigGroup::SetDirty()
-      SetDirty__11ConfigGroupFv

       ;wxFileConfig::GetLocalDir()
       GetLocalDir__12wxFileConfigFv
       ;wxFileConfig::GetLocalDir()
       GetLocalDir__12wxFileConfigFv

-      ;ConfigGroup::GetLastEntryLine()
-      GetLastEntryLine__11ConfigGroupFv

       ;wxFileConfig::DeleteAll()
       DeleteAll__12wxFileConfigFv
       ;wxFileConfig::CleanUp()
       ;wxFileConfig::DeleteAll()
       DeleteAll__12wxFileConfigFv
       ;wxFileConfig::CleanUp()


@@ -1831,12 +2152,10 @@ EXPORTS
       GetGlobalFileName__12wxFileConfigFPCc
       ;wxFileConfig::SetPath(const wxString&)
       SetPath__12wxFileConfigFRC8wxString
       GetGlobalFileName__12wxFileConfigFPCc
       ;wxFileConfig::SetPath(const wxString&)
       SetPath__12wxFileConfigFRC8wxString

-      ;ConfigGroup::Rename(const wxString&)
-      Rename__11ConfigGroupFRC8wxString

       ;wxFileConfig::HasGroup(const wxString&) const
       HasGroup__12wxFileConfigCFRC8wxString
       ;wxFileConfig::HasGroup(const wxString&) const
       HasGroup__12wxFileConfigCFRC8wxString

-      ;ConfigGroup::DeleteEntry(const char*)
-      DeleteEntry__11ConfigGroupFPCc
+      ;wxFileConfigGroup::AddSubgroup(const wxString&)
+      AddSubgroup__17wxFileConfigGroupFRC8wxString

   ;From object file:  ..\common\filefn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCopyFile(const wxString&,const wxString&,unsigned long)
   ;From object file:  ..\common\filefn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCopyFile(const wxString&,const wxString&,unsigned long)


@@ -1929,46 +2248,48 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxFileName::Assign(const wxString&,wxPathFormat)
       Assign__10wxFileNameFRC8wxString12wxPathFormat
     ;PUBDEFs (Symbols available from object file):
       ;wxFileName::Assign(const wxString&,wxPathFormat)
       Assign__10wxFileNameFRC8wxString12wxPathFormat

-      ;wxFileName::Normalize(wxPathNormalize,const wxString&,wxPathFormat)
-      Normalize__10wxFileNameF15wxPathNormalizeRC8wxString12wxPathFormat
-      ;wxFileName::IsWild(wxPathFormat)
-      IsWild__10wxFileNameF12wxPathFormat
-      ;wxFileName::Assign(const wxString&,const wxString&,const wxString&,wxPathFormat)
-      Assign__10wxFileNameFRC8wxStringN2112wxPathFormat
+      ;wxFileName::SetPath(const wxString&,wxPathFormat)
+      SetPath__10wxFileNameFRC8wxString12wxPathFormat
+      ;wxFileName::GetTimes(wxDateTime*,wxDateTime*,wxDateTime*) const
+      GetTimes__10wxFileNameCFP10wxDateTimeN21

       ;wxFileName::Clear()
       Clear__10wxFileNameFv
       ;wxFileName::wxFileExists()
       wxFileExists__10wxFileNameFv
       ;wxFileName::Clear()
       Clear__10wxFileNameFv
       ;wxFileName::wxFileExists()
       wxFileExists__10wxFileNameFv

-      ;wxFileName::GetModificationTime()
-      GetModificationTime__10wxFileNameFv

       ;wxFileName::GetFullName() const
       GetFullName__10wxFileNameCFv
       ;wxFileName::AssignHomeDir()
       AssignHomeDir__10wxFileNameFv
       ;wxFileName::GetFullName() const
       GetFullName__10wxFileNameCFv
       ;wxFileName::AssignHomeDir()
       AssignHomeDir__10wxFileNameFv

-      ;wxFileName::AssignCwd()
-      AssignCwd__10wxFileNameFv

       ;wxFileName::PrependDir(const wxString&)
       PrependDir__10wxFileNameFRC8wxString
       ;wxFileName::GetPathSeparators(wxPathFormat)
       GetPathSeparators__10wxFileNameF12wxPathFormat
       ;wxFileName::PrependDir(const wxString&)
       PrependDir__10wxFileNameFRC8wxString
       ;wxFileName::GetPathSeparators(wxPathFormat)
       GetPathSeparators__10wxFileNameF12wxPathFormat

-      ;wxFileName::Mkdir(const wxString&,int,unsigned long)
-      Mkdir__10wxFileNameFRC8wxStringiUl

       ;wxFileName::IsPathSeparator(char,wxPathFormat)
       IsPathSeparator__10wxFileNameFc12wxPathFormat
       ;wxFileName::IsPathSeparator(char,wxPathFormat)
       IsPathSeparator__10wxFileNameFc12wxPathFormat

-      ;wxFileName::IsAbsolute(wxPathFormat)
-      IsAbsolute__10wxFileNameF12wxPathFormat

       ;wxFileName::GetFullPath(wxPathFormat) const
       GetFullPath__10wxFileNameCF12wxPathFormat
       ;wxFileName::GetFullPath(wxPathFormat) const
       GetFullPath__10wxFileNameCF12wxPathFormat

+      ;wxFileName::Mkdir(const wxString&,int,int)
+      Mkdir__10wxFileNameFRC8wxStringiT2
+      ;wxFileName::Touch()
+      Touch__10wxFileNameFv

       ;wxFileName::FileName(const wxString&)
       FileName__10wxFileNameFRC8wxString
       ;wxFileName::wxPathExists(const wxString&)
       wxPathExists__10wxFileNameFRC8wxString
       ;wxFileName::SetFullName(const wxString&)
       SetFullName__10wxFileNameFRC8wxString
       ;wxFileName::FileName(const wxString&)
       FileName__10wxFileNameFRC8wxString
       ;wxFileName::wxPathExists(const wxString&)
       wxPathExists__10wxFileNameFRC8wxString
       ;wxFileName::SetFullName(const wxString&)
       SetFullName__10wxFileNameFRC8wxString

+      ;wxFileName::GetCwd(const wxString&)
+      GetCwd__10wxFileNameFRC8wxString
+      ;wxFileName::AssignCwd(const wxString&)
+      AssignCwd__10wxFileNameFRC8wxString
+      ;wxFileName::Assign(const wxString&,const wxString&,const wxString&,const wxString&,wxPathFormat)
+      Assign__10wxFileNameFRC8wxStringN3112wxPathFormat

       ;wxFileName::SameAs(const wxFileName&,wxPathFormat)
       SameAs__10wxFileNameFRC10wxFileName12wxPathFormat
       ;wxFileName::SameAs(const wxFileName&,wxPathFormat)
       SameAs__10wxFileNameFRC10wxFileName12wxPathFormat

-      ;wxFileName::GetPath(unsigned long,wxPathFormat) const
-      GetPath__10wxFileNameCFUl12wxPathFormat
+      ;wxFileName::IsAbsolute(wxPathFormat) const
+      IsAbsolute__10wxFileNameCF12wxPathFormat
+      ;wxFileName::GetVolumeSeparator(wxPathFormat)
+      GetVolumeSeparator__10wxFileNameF12wxPathFormat

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


@@ -1981,10 +2302,18 @@ EXPORTS
       GetHomeDir__10wxFileNameFv
       ;wxFileName::AppendDir(const wxString&)
       AppendDir__10wxFileNameFRC8wxString
       GetHomeDir__10wxFileNameFv
       ;wxFileName::AppendDir(const wxString&)
       AppendDir__10wxFileNameFRC8wxString

-      ;wxFileName::Mkdir(int,unsigned long)
-      Mkdir__10wxFileNameFiUl
-      ;wxFileName::IsRelative(wxPathFormat)
-      IsRelative__10wxFileNameF12wxPathFormat
+      ;wxFileName::SplitPath(const wxString&,wxString*,wxString*,wxString*,wxString*,wxPathFormat)
+      SplitPath__10wxFileNameFRC8wxStringP8wxStringN3212wxPathFormat
+      ;wxFileName::Normalize(int,const wxString&,wxPathFormat)
+      Normalize__10wxFileNameFiRC8wxString12wxPathFormat
+      ;wxFileName::MakeRelativeTo(const wxString&,wxPathFormat)
+      MakeRelativeTo__10wxFileNameFRC8wxString12wxPathFormat
+      ;wxFileName::AssignDir(const wxString&,wxPathFormat)
+      AssignDir__10wxFileNameFRC8wxString12wxPathFormat
+      ;wxFileName::Mkdir(int,int)
+      Mkdir__10wxFileNameFiT1
+      ;wxFileName::SetTimes(const wxDateTime*,const wxDateTime*,const wxDateTime*)
+      SetTimes__10wxFileNameFPC10wxDateTimeN21

       ;wxFileName::Rmdir()
       Rmdir__10wxFileNameFv
       ;wxFileName::GetLongPath() const
       ;wxFileName::Rmdir()
       Rmdir__10wxFileNameFv
       ;wxFileName::GetLongPath() const


@@ -1999,20 +2328,22 @@ 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&)
       Assign__10wxFileNameFRC10wxFileName
       ;wxFileName::GetFormat(wxPathFormat)
       GetFormat__10wxFileNameF12wxPathFormat
       ;wxFileName::Assign(const wxFileName&)
       Assign__10wxFileNameFRC10wxFileName

-      ;wxFileName::GetCwd()
-      GetCwd__10wxFileNameFv
+      ;wxFileName::CreateTempFileName(const wxString&,wxFile*)
+      CreateTempFileName__10wxFileNameFRC8wxStringP6wxFile
+      ;wxFileName::AssignTempFileName(const wxString&,wxFile*)
+      AssignTempFileName__10wxFileNameFRC8wxStringP6wxFile

       ;wxFileName::DirName(const wxString&)
       DirName__10wxFileNameFRC8wxString
       ;wxFileName::SetCwd(const wxString&)
       SetCwd__10wxFileNameFRC8wxString
       ;wxFileName::Rmdir(const wxString&)
       Rmdir__10wxFileNameFRC8wxString
       ;wxFileName::DirName(const wxString&)
       DirName__10wxFileNameFRC8wxString
       ;wxFileName::SetCwd(const wxString&)
       SetCwd__10wxFileNameFRC8wxString
       ;wxFileName::Rmdir(const wxString&)
       Rmdir__10wxFileNameFRC8wxString

-      ;wxFileName::AssignTempFileName(const wxString&)
-      AssignTempFileName__10wxFileNameFRC8wxString

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


@@ -2023,12 +2354,16 @@ EXPORTS
       sm_classwxFileSystem__12wxFileSystem
       ;wxLocalFSHandler::FindNext()
       FindNext__16wxLocalFSHandlerFv
       sm_classwxFileSystem__12wxFileSystem
       ;wxLocalFSHandler::FindNext()
       FindNext__16wxLocalFSHandlerFv

+      ;wxLocalFSHandler::ms_root
+      ms_root__16wxLocalFSHandler

       ;wxFileSystemHandler::GetMimeTypeFromExt(const wxString&)
       GetMimeTypeFromExt__19wxFileSystemHandlerFRC8wxString
       ;wxFileSystemHandler::GetMimeTypeFromExt(const wxString&)
       GetMimeTypeFromExt__19wxFileSystemHandlerFRC8wxString

-      ;wxFileSystem::m_Handlers
-      m_Handlers__12wxFileSystem
+      ;wxFSFile::sm_classwxFSFile
+      sm_classwxFSFile__8wxFSFile

       ;wxFileSystemModule::sm_classwxFileSystemModule
       sm_classwxFileSystemModule__18wxFileSystemModule
       ;wxFileSystemModule::sm_classwxFileSystemModule
       sm_classwxFileSystemModule__18wxFileSystemModule

+      ;wxFileSystem::m_Handlers
+      m_Handlers__12wxFileSystem

       ;wxFileSystemHandler::FindNext()
       FindNext__19wxFileSystemHandlerFv
       ;wxFileSystem::CleanUpHandlers()
       ;wxFileSystemHandler::FindNext()
       FindNext__19wxFileSystemHandlerFv
       ;wxFileSystem::CleanUpHandlers()


@@ -2071,36 +2406,50 @@ EXPORTS
       New__10wxFontBaseFRC16wxNativeFontInfo
       ;wxFontBase::New(const wxString&)
       New__10wxFontBaseFRC8wxString
       New__10wxFontBaseFRC16wxNativeFontInfo
       ;wxFontBase::New(const wxString&)
       New__10wxFontBaseFRC8wxString

-      ;wxNativeFontInfo::FromString(const wxString&)
-      FromString__16wxNativeFontInfoFRC8wxString

       ;wxFont::operator=(const wxFont&)
       __as__6wxFontFRC6wxFont
       ;wxFont::operator=(const wxFont&)
       __as__6wxFontFRC6wxFont

-      ;wxFontBase::GetNativeFontInfoDesc() const
-      GetNativeFontInfoDesc__10wxFontBaseCFv
+      ;wxFontBase::~wxFontBase()
+      __dt__10wxFontBaseFv
+      ;wxNativeFontInfo::ToUserString() const
+      ToUserString__16wxNativeFontInfoCFv

       ;wxFontBase::GetWeightString() const
       GetWeightString__10wxFontBaseCFv
       ;wxFontBase::GetStyleString() const
       GetStyleString__10wxFontBaseCFv
       ;wxFontBase::GetWeightString() const
       GetWeightString__10wxFontBaseCFv
       ;wxFontBase::GetStyleString() const
       GetStyleString__10wxFontBaseCFv

+      ;wxFontBase::GetNativeFontInfoUserDesc() const
+      GetNativeFontInfoUserDesc__10wxFontBaseCFv
+      ;wxFontBase::GetNativeFontInfoDesc() const
+      GetNativeFontInfoDesc__10wxFontBaseCFv

       ;wxFontBase::SetNativeFontInfo(const wxNativeFontInfo&)
       SetNativeFontInfo__10wxFontBaseFRC16wxNativeFontInfo
       ;wxFontBase::SetNativeFontInfo(const wxNativeFontInfo&)
       SetNativeFontInfo__10wxFontBaseFRC16wxNativeFontInfo

+      ;wxFontBase::SetNativeFontInfoUserDesc(const wxString&)
+      SetNativeFontInfoUserDesc__10wxFontBaseFRC8wxString

       ;wxFontBase::ms_encodingDefault
       ms_encodingDefault__10wxFontBase
       ;wxFontBase::ms_encodingDefault
       ms_encodingDefault__10wxFontBase

+      ;wxFontBase::SetNativeFontInfo(const wxString&)
+      SetNativeFontInfo__10wxFontBaseFRC8wxString

       ;wxFontBase::operator==(const wxFont&) const
       __eq__10wxFontBaseCFRC6wxFont
       __vft10wxFontBase8wxObject
       ;wxFontBase::operator!=(const wxFont&) const
       __ne__10wxFontBaseCFRC6wxFont
       ;wxFontBase::operator==(const wxFont&) const
       __eq__10wxFontBaseCFRC6wxFont
       __vft10wxFontBase8wxObject
       ;wxFontBase::operator!=(const wxFont&) const
       __ne__10wxFontBaseCFRC6wxFont

-      ;wxNativeFontInfo::ToString() const
-      ToString__16wxNativeFontInfoCFv

       ;wxFontBase::GetFamilyString() const
       GetFamilyString__10wxFontBaseCFv
       ;wxFontBase::GetFamilyString() const
       GetFamilyString__10wxFontBaseCFv

+      ;wxFontBase::SetDefaultEncoding(wxFontEncoding)
+      SetDefaultEncoding__10wxFontBaseF14wxFontEncoding
+      ;wxFontBase::IsFixedWidth() const
+      IsFixedWidth__10wxFontBaseCFv

       ;wxFontBase::New(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       New__10wxFontBaseFiN31UlRC8wxString14wxFontEncoding
       ;wxFontBase::New(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       New__10wxFontBaseFiN31UlRC8wxString14wxFontEncoding

+      ;wxNativeFontInfo::FromUserString(const wxString&)
+      FromUserString__16wxNativeFontInfoFRC8wxString

   ;From object file:  ..\common\fontmap.cpp
     ;PUBDEFs (Symbols available from object file):
   ;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&)


@@ -2111,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)


@@ -2134,34 +2490,36 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxFrameBase::OnIdle(wxIdleEvent&)
       OnIdle__11wxFrameBaseFR11wxIdleEvent
     ;PUBDEFs (Symbols available from object file):
       ;wxFrameBase::OnIdle(wxIdleEvent&)
       OnIdle__11wxFrameBaseFR11wxIdleEvent

-      ;wxFrameBase::DoScreenToClient(int*,int*) const
-      DoScreenToClient__11wxFrameBaseCFPiT1
+      ;wxFrameBase::PushStatusText(const wxString&,int)
+      PushStatusText__11wxFrameBaseFRC8wxStringi

       ;wxFrameBase::DeleteAllBars()
       DeleteAllBars__11wxFrameBaseFv
       ;wxFrameBase::DeleteAllBars()
       DeleteAllBars__11wxFrameBaseFv

+      ;wxFrameBase::SetMenuBar(wxMenuBar*)
+      SetMenuBar__11wxFrameBaseFP9wxMenuBar
+      ;wxFrameBase::DetachMenuBar()
+      DetachMenuBar__11wxFrameBaseFv

       ;wxFrameBase::CreateStatusBar(int,long,int,const wxString&)
       CreateStatusBar__11wxFrameBaseFilT1RC8wxString
       ;wxFrameBase::OnCreateToolBar(long,int,const wxString&)
       OnCreateToolBar__11wxFrameBaseFliRC8wxString
       ;wxFrameBase::OnCreateStatusBar(int,long,int,const wxString&)
       OnCreateStatusBar__11wxFrameBaseFilT1RC8wxString
       ;wxFrameBase::CreateStatusBar(int,long,int,const wxString&)
       CreateStatusBar__11wxFrameBaseFilT1RC8wxString
       ;wxFrameBase::OnCreateToolBar(long,int,const wxString&)
       OnCreateToolBar__11wxFrameBaseFliRC8wxString
       ;wxFrameBase::OnCreateStatusBar(int,long,int,const wxString&)
       OnCreateStatusBar__11wxFrameBaseFilT1RC8wxString

-      ;wxFrameBase::MakeModal(unsigned long)
-      MakeModal__11wxFrameBaseFUl
-      ;wxFrameBase::OnSize(wxSizeEvent&)
-      OnSize__11wxFrameBaseFR11wxSizeEvent
-      ;wxFrameBase::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__11wxFrameBaseFR12wxCloseEvent

       ;wxFrameBase::sm_eventTable
       sm_eventTable__11wxFrameBase
       ;wxFrameBase::GetClientAreaOrigin() const
       GetClientAreaOrigin__11wxFrameBaseCFv
       ;wxFrameBase::DoMenuUpdates()
       DoMenuUpdates__11wxFrameBaseFv
       ;wxFrameBase::sm_eventTable
       sm_eventTable__11wxFrameBase
       ;wxFrameBase::GetClientAreaOrigin() const
       GetClientAreaOrigin__11wxFrameBaseCFv
       ;wxFrameBase::DoMenuUpdates()
       DoMenuUpdates__11wxFrameBaseFv

+      ;wxFrameBase::IsOneOfBars(const wxWindow*) const
+      IsOneOfBars__11wxFrameBaseCFPC8wxWindow

       ;wxFrameBase::DoMenuUpdates(wxMenu*,wxWindow*)
       DoMenuUpdates__11wxFrameBaseFP6wxMenuP8wxWindow
       ;wxFrameBase::ProcessCommand(int)
       ProcessCommand__11wxFrameBaseFi
       ;wxFrameBase::SetStatusWidths(int,const int*)
       SetStatusWidths__11wxFrameBaseFiPCi
       ;wxFrameBase::DoMenuUpdates(wxMenu*,wxWindow*)
       DoMenuUpdates__11wxFrameBaseFP6wxMenuP8wxWindow
       ;wxFrameBase::ProcessCommand(int)
       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&)


@@ -2172,17 +2530,17 @@ EXPORTS
       ShowMenuHelp__11wxFrameBaseFP11wxStatusBari
       ;wxFrameBase::GetEventTable() const
       GetEventTable__11wxFrameBaseCFv
       ShowMenuHelp__11wxFrameBaseFP11wxStatusBari
       ;wxFrameBase::GetEventTable() const
       GetEventTable__11wxFrameBaseCFv

-      ;wxFrameBase::SendIconizeEvent(unsigned long)
-      SendIconizeEvent__11wxFrameBaseFUl
+      ;wxFrameBase::~wxFrameBase()
+      __dt__11wxFrameBaseFv
+      ;wxFrameBase::AttachMenuBar(wxMenuBar*)
+      AttachMenuBar__11wxFrameBaseFP9wxMenuBar
+      ;wxFrameBase::DoGiveHelp(const wxString&,unsigned long)
+      DoGiveHelp__11wxFrameBaseFRC8wxStringUl

       __vft11wxFrameBase8wxObject
       __vft11wxFrameBase8wxObject

-      ;wxFrameBase::DoClientToScreen(int*,int*) const
-      DoClientToScreen__11wxFrameBaseCFPiT1
-      ;wxFrameBase::sm_eventTableEntries
-      sm_eventTableEntries__11wxFrameBase

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

-      ;wxFrameBase::Destroy()
-      Destroy__11wxFrameBaseFv
+      ;wxFrameBase::sm_eventTableEntries
+      sm_eventTableEntries__11wxFrameBase

       ;wxFrameBase::New(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       New__11wxFrameBaseFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
   ;From object file:  ..\common\fs_inet.cpp
       ;wxFrameBase::New(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       New__11wxFrameBaseFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
   ;From object file:  ..\common\fs_inet.cpp


@@ -2298,6 +2656,29 @@ EXPORTS
       wxProtocolUsewxFTP
       ;wxFTP::sm_classwxFTP
       sm_classwxFTP__5wxFTP
       wxProtocolUsewxFTP
       ;wxFTP::sm_classwxFTP
       sm_classwxFTP__5wxFTP

+  ;From object file:  ..\common\gaugecmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxGaugeBase::SetShadowWidth(int)
+      SetShadowWidth__11wxGaugeBaseFi
+      ;wxGaugeBase::SetBezelFace(int)
+      SetBezelFace__11wxGaugeBaseFi
+      ;wxGaugeBase::GetRange() const
+      GetRange__11wxGaugeBaseCFv
+      ;wxGaugeBase::GetShadowWidth() const
+      GetShadowWidth__11wxGaugeBaseCFv
+      ;wxGaugeBase::GetBezelFace() const
+      GetBezelFace__11wxGaugeBaseCFv
+      ;wxGaugeBase::GetValue() const
+      GetValue__11wxGaugeBaseCFv
+      ;wxGaugeBase::SetRange(int)
+      SetRange__11wxGaugeBaseFi
+      ;wxGaugeBase::Create(wxWindow*,int,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
+      Create__11wxGaugeBaseFP8wxWindowiT2RC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
+      __vft11wxGaugeBase8wxObject
+      ;wxGaugeBase::SetValue(int)
+      SetValue__11wxGaugeBaseFi
+      ;wxGaugeBase::~wxGaugeBase()
+      __dt__11wxGaugeBaseFv

   ;From object file:  ..\common\gdicmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxBrushList::AddBrush(wxBrush*)
   ;From object file:  ..\common\gdicmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxBrushList::AddBrush(wxBrush*)


@@ -2321,9 +2702,11 @@ EXPORTS
       FindName__16wxColourDatabaseCFRC8wxColour
       ;wxPenList::AddPen(wxPen*)
       AddPen__9wxPenListFP5wxPen
       FindName__16wxColourDatabaseCFRC8wxColour
       ;wxPenList::AddPen(wxPen*)
       AddPen__9wxPenListFP5wxPen

-      __vft9wxPenList8wxObject
+      ;wxRect::Intersect(const wxRect&)
+      Intersect__6wxRectFRC6wxRect

       ;wxBitmapList::sm_classwxBitmapList
       sm_classwxBitmapList__12wxBitmapList
       ;wxBitmapList::sm_classwxBitmapList
       sm_classwxBitmapList__12wxBitmapList

+      __vft9wxPenList8wxObject

       __vft15wxResourceCache8wxObject
       ;wxColourDatabase::wxColourDatabase(int)
       __ct__16wxColourDatabaseFi
       __vft15wxResourceCache8wxObject
       ;wxColourDatabase::wxColourDatabase(int)
       __ct__16wxColourDatabaseFi


@@ -2352,10 +2735,14 @@ EXPORTS
       RemoveFont__10wxFontListFP6wxFont
       ;wxBrushList::RemoveBrush(wxBrush*)
       RemoveBrush__11wxBrushListFP7wxBrush
       RemoveFont__10wxFontListFP6wxFont
       ;wxBrushList::RemoveBrush(wxBrush*)
       RemoveBrush__11wxBrushListFP7wxBrush

+      ;wxRect::Intersects(const wxRect&) const
+      Intersects__6wxRectCFRC6wxRect

       ;wxFontList::AddFont(wxFont*)
       AddFont__10wxFontListFP6wxFont
       ;wxBitmapList::AddBitmap(wxBitmap*)
       AddBitmap__12wxBitmapListFP8wxBitmap
       ;wxFontList::AddFont(wxFont*)
       AddFont__10wxFontListFP6wxFont
       ;wxBitmapList::AddBitmap(wxBitmap*)
       AddBitmap__12wxBitmapListFP8wxBitmap

+      ;wxRect::Inflate(int,int)
+      Inflate__6wxRectFiT1

       ;wxBitmapList::wxBitmapList()
       __ct__12wxBitmapListFv
       ;wxDeleteStockLists()
       ;wxBitmapList::wxBitmapList()
       __ct__12wxBitmapListFv
       ;wxDeleteStockLists()


@@ -2367,10 +2754,10 @@ EXPORTS
       ;wxBrushList::sm_classwxBrushList
       sm_classwxBrushList__11wxBrushList
       __vft16wxColourDatabase8wxObject
       ;wxBrushList::sm_classwxBrushList
       sm_classwxBrushList__11wxBrushList
       __vft16wxColourDatabase8wxObject

-      ;wxRect::wxRect(const wxPoint&,const wxPoint&)
-      __ct__6wxRectFRC7wxPointT1

       ;wxRect::wxRect(const wxPoint&,const wxSize&)
       __ct__6wxRectFRC7wxPointRC6wxSize
       ;wxRect::wxRect(const wxPoint&,const wxSize&)
       __ct__6wxRectFRC7wxPointRC6wxSize

+      ;wxRect::wxRect(const wxPoint&,const wxPoint&)
+      __ct__6wxRectFRC7wxPointT1

       ;wxBrushList::FindOrCreateBrush(const wxColour&,int)
       FindOrCreateBrush__11wxBrushListFRC8wxColouri
       ;wxConstructorForwxBrushList()
       ;wxBrushList::FindOrCreateBrush(const wxColour&,int)
       FindOrCreateBrush__11wxBrushListFRC8wxColouri
       ;wxConstructorForwxBrushList()


@@ -2406,12 +2793,16 @@ EXPORTS
       ConstrainTo__11wxRect2DIntFRC11wxRect2DInt
       ;wxRect2DInt::ReadFrom(wxDataInputStream&)
       ReadFrom__11wxRect2DIntFR17wxDataInputStream
       ConstrainTo__11wxRect2DIntFRC11wxRect2DInt
       ;wxRect2DInt::ReadFrom(wxDataInputStream&)
       ReadFrom__11wxRect2DIntFR17wxDataInputStream

+      ;wxPoint2DDouble::GetVectorAngle() const
+      GetVectorAngle__15wxPoint2DDoubleCFv

       ;wxRect2DInt::Intersect(const wxRect2DInt&,const wxRect2DInt&,wxRect2DInt*)
       Intersect__11wxRect2DIntFRC11wxRect2DIntT1P11wxRect2DInt
       ;wxRect2DInt::operator=(const wxRect2DInt&)
       __as__11wxRect2DIntFRC11wxRect2DInt
       ;wxRect2DInt::Union(const wxPoint2DInt&)
       Union__11wxRect2DIntFRC12wxPoint2DInt
       ;wxRect2DInt::Intersect(const wxRect2DInt&,const wxRect2DInt&,wxRect2DInt*)
       Intersect__11wxRect2DIntFRC11wxRect2DIntT1P11wxRect2DInt
       ;wxRect2DInt::operator=(const wxRect2DInt&)
       __as__11wxRect2DIntFRC11wxRect2DInt
       ;wxRect2DInt::Union(const wxPoint2DInt&)
       Union__11wxRect2DIntFRC12wxPoint2DInt

+      ;wxPoint2DDouble::SetVectorAngle(double)
+      SetVectorAngle__15wxPoint2DDoubleFd

       ;wxRect2DDouble::Intersect(const wxRect2DDouble&,const wxRect2DDouble&,wxRect2DDouble*)
       Intersect__14wxRect2DDoubleFRC14wxRect2DDoubleT1P14wxRect2DDouble
       ;wxRect2DInt::WriteTo(wxDataOutputStream&) const
       ;wxRect2DDouble::Intersect(const wxRect2DDouble&,const wxRect2DDouble&,wxRect2DDouble*)
       Intersect__14wxRect2DDoubleFRC14wxRect2DDoubleT1P14wxRect2DDouble
       ;wxRect2DInt::WriteTo(wxDataOutputStream&) const


@@ -2422,6 +2813,8 @@ EXPORTS
       Intersects__14wxRect2DDoubleCFRC14wxRect2DDouble
       ;wxRect2DInt::Union(const wxRect2DInt&,const wxRect2DInt&,wxRect2DInt*)
       Union__11wxRect2DIntFRC11wxRect2DIntT1P11wxRect2DInt
       Intersects__14wxRect2DDoubleCFRC14wxRect2DDouble
       ;wxRect2DInt::Union(const wxRect2DInt&,const wxRect2DInt&,wxRect2DInt*)
       Union__11wxRect2DIntFRC11wxRect2DIntT1P11wxRect2DInt

+      ;wxPoint2DInt::SetVectorAngle(double)
+      SetVectorAngle__12wxPoint2DIntFd

       ;wxRect2DDouble::Union(const wxPoint2DDouble&)
       Union__14wxRect2DDoubleFRC15wxPoint2DDouble
       ;wxPoint2DInt::ReadFrom(wxDataInputStream&)
       ;wxRect2DDouble::Union(const wxPoint2DDouble&)
       Union__14wxRect2DDoubleFRC15wxPoint2DDouble
       ;wxPoint2DInt::ReadFrom(wxDataInputStream&)


@@ -2482,12 +2875,14 @@ EXPORTS
       GoNextFrame__12wxGIFDecoderFUl
       ;wxGIFDecoder::ConvertToImage(wxImage*) const
       ConvertToImage__12wxGIFDecoderCFP7wxImage
       GoNextFrame__12wxGIFDecoderFUl
       ;wxGIFDecoder::ConvertToImage(wxImage*) const
       ConvertToImage__12wxGIFDecoderCFP7wxImage

-      ;wxGIFDecoder::GetTop() const
-      GetTop__12wxGIFDecoderCFv
+      ;GIFImage::GIFImage()
+      __ct__8GIFImageFv

       ;wxGIFDecoder::IsAnimation() const
       IsAnimation__12wxGIFDecoderCFv
       ;wxGIFDecoder::GoFirstFrame()
       GoFirstFrame__12wxGIFDecoderFv
       ;wxGIFDecoder::IsAnimation() const
       IsAnimation__12wxGIFDecoderCFv
       ;wxGIFDecoder::GoFirstFrame()
       GoFirstFrame__12wxGIFDecoderFv

+      ;wxGIFDecoder::GetTop() const
+      GetTop__12wxGIFDecoderCFv

       ;wxGIFDecoder::GetDisposalMethod() const
       GetDisposalMethod__12wxGIFDecoderCFv
       ;wxGIFDecoder::GetDelay() const
       ;wxGIFDecoder::GetDisposalMethod() const
       GetDisposalMethod__12wxGIFDecoderCFv
       ;wxGIFDecoder::GetDelay() const


@@ -2517,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)


@@ -2579,6 +2976,22 @@ EXPORTS
       Destroy__17wxStringHashTableFv
       ;wxHashTable::Get(long,const char*) const
       Get__11wxHashTableCFlPCc
       Destroy__17wxStringHashTableFv
       ;wxHashTable::Get(long,const char*) const
       Get__11wxHashTableCFlPCc

+  ;From object file:  ..\common\hashmap.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;_wxHashTableBase2::CopyHashTable(_wxHashTable_NodeBase**,unsigned int,_wxHashTableBase2*,_wxHashTable_NodeBase**,unsigned long(*)(_wxHashTableBase2*,_wxHashTable_NodeBase*),_wxHashTable_NodeBase*(*)(_wxHashTable_NodeBase*))
+      CopyHashTable__17_wxHashTableBase2FPP21_wxHashTable_NodeBaseUiP17_wxHashTableBase2T1PFP17_wxHashTableBase2P21_wxHashTable_NodeBase_UlPFP21_wxHashTable_NodeBase_P21_wxHashTable_NodeBase
+      ;wxStringHash::wxCharStringHash(const char*)
+      wxCharStringHash__12wxStringHashFPCc
+      ;_wxHashTableBase2::ms_primes
+      ms_primes__17_wxHashTableBase2
+      ;_wxHashTableBase2::DummyProcessNode(_wxHashTable_NodeBase*)
+      DummyProcessNode__17_wxHashTableBase2FP21_wxHashTable_NodeBase
+      ;_wxHashTableBase2::DeleteNodes(unsigned int,_wxHashTable_NodeBase**,void(*)(_wxHashTable_NodeBase*))
+      DeleteNodes__17_wxHashTableBase2FUiPP21_wxHashTable_NodeBasePFP21_wxHashTable_NodeBase_v
+      ;_wxHashTableBase2::GetNextPrime(unsigned long)
+      GetNextPrime__17_wxHashTableBase2FUl
+      ;_wxHashTableBase2::GetPreviousPrime(unsigned long)
+      GetPreviousPrime__17_wxHashTableBase2FUl

   ;From object file:  ..\common\helpbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHelpControllerBase::sm_classwxHelpControllerBase
   ;From object file:  ..\common\helpbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHelpControllerBase::sm_classwxHelpControllerBase


@@ -2592,6 +3005,8 @@ EXPORTS
       __ct__6wxHTTPFv
       ;wxHTTP::SendHeaders()
       SendHeaders__6wxHTTPFv
       __ct__6wxHTTPFv
       ;wxHTTP::SendHeaders()
       SendHeaders__6wxHTTPFv

+      ;wxHTTP::ClearHeaders()
+      ClearHeaders__6wxHTTPFv

       ;wxHTTP::GetHeader(const wxString&)
       GetHeader__6wxHTTPFRC8wxString
       ;wxHTTP::Connect(const wxString&)
       ;wxHTTP::GetHeader(const wxString&)
       GetHeader__6wxHTTPFRC8wxString
       ;wxHTTP::Connect(const wxString&)


@@ -2622,23 +3037,92 @@ 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()
       wxInitAllImageHandlers__Fv
   ;From object file:  ..\common\imagbmp.cpp
     ;PUBDEFs (Symbols available from object file):
   ;From object file:  ..\common\imagall.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxInitAllImageHandlers()
       wxInitAllImageHandlers__Fv
   ;From object file:  ..\common\imagbmp.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxBMPHandler::DoLoadDib(wxImage*,int,int,int,int,int,long,wxInputStream&,unsigned long,unsigned long,unsigned long)
+      DoLoadDib__12wxBMPHandlerFP7wxImageiN42lR13wxInputStreamUlN29

       ;wxBMPHandler::sm_classwxBMPHandler
       sm_classwxBMPHandler__12wxBMPHandler
       ;wxBMPHandler::sm_classwxBMPHandler
       sm_classwxBMPHandler__12wxBMPHandler

+      ;wxICOHandler::sm_classwxICOHandler
+      sm_classwxICOHandler__12wxICOHandler
+      ;wxCURHandler::sm_classwxCURHandler
+      sm_classwxCURHandler__12wxCURHandler
+      __vft12wxICOHandler8wxObject
+      __vft12wxCURHandler8wxObject
+      ;wxANIHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
+      LoadFile__12wxANIHandlerFP7wxImageR13wxInputStreamUli
+      ;wxANIHandler::sm_classwxANIHandler
+      sm_classwxANIHandler__12wxANIHandler
+      ;wxBMPHandler::LoadDib(wxImage*,wxInputStream&,unsigned long,unsigned long)
+      LoadDib__12wxBMPHandlerFP7wxImageR13wxInputStreamUlT3

       ;wxBMPHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__12wxBMPHandlerFP7wxImageR14wxOutputStreamUl
       ;wxBMPHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__12wxBMPHandlerFP7wxImageR14wxOutputStreamUl

+      ;wxANIHandler::GetImageCount(wxInputStream&)
+      GetImageCount__12wxANIHandlerFR13wxInputStream

       ;wxConstructorForwxBMPHandler()
       wxConstructorForwxBMPHandler__Fv
       ;wxConstructorForwxBMPHandler()
       wxConstructorForwxBMPHandler__Fv

+      ;wxConstructorForwxCURHandler()
+      wxConstructorForwxCURHandler__Fv
+      ;wxICOHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
+      SaveFile__12wxICOHandlerFP7wxImageR14wxOutputStreamUl
+      __vft12wxANIHandler8wxObject

       ;wxBMPHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__12wxBMPHandlerFP7wxImageR13wxInputStreamUli
       ;wxBMPHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__12wxBMPHandlerFP7wxImageR13wxInputStreamUli

+      ;wxICOHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
+      LoadFile__12wxICOHandlerFP7wxImageR13wxInputStreamUli
+      ;wxICOHandler::DoCanRead(wxInputStream&)
+      DoCanRead__12wxICOHandlerFR13wxInputStream
+      ;wxCURHandler::DoCanRead(wxInputStream&)
+      DoCanRead__12wxCURHandlerFR13wxInputStream

       ;wxBMPHandler::DoCanRead(wxInputStream&)
       DoCanRead__12wxBMPHandlerFR13wxInputStream
       ;wxBMPHandler::DoCanRead(wxInputStream&)
       DoCanRead__12wxBMPHandlerFR13wxInputStream

+      ;wxConstructorForwxANIHandler()
+      wxConstructorForwxANIHandler__Fv
+      ;wxBMPHandler::SaveDib(wxImage*,wxOutputStream&,unsigned long,unsigned long,unsigned long)
+      SaveDib__12wxBMPHandlerFP7wxImageR14wxOutputStreamUlN23

       __vft12wxBMPHandler8wxObject
       __vft12wxBMPHandler8wxObject

+      ;wxICOHandler::DoLoadFile(wxImage*,wxInputStream&,unsigned long,int)
+      DoLoadFile__12wxICOHandlerFP7wxImageR13wxInputStreamUli
+      ;wxICOHandler::GetImageCount(wxInputStream&)
+      GetImageCount__12wxICOHandlerFR13wxInputStream
+      ;wxANIHandler::DoCanRead(wxInputStream&)
+      DoCanRead__12wxANIHandlerFR13wxInputStream
+      ;wxConstructorForwxICOHandler()
+      wxConstructorForwxICOHandler__Fv

   ;From object file:  ..\common\image.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxImage::wxImage(int,int,unsigned char*,unsigned long)
   ;From object file:  ..\common\image.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxImage::wxImage(int,int,unsigned char*,unsigned long)


@@ -2649,8 +3133,6 @@ EXPORTS
       FindHandler__7wxImageFl
       ;wxImage::FindHandler(const wxString&,long)
       FindHandler__7wxImageFRC8wxStringl
       FindHandler__7wxImageFl
       ;wxImage::FindHandler(const wxString&,long)
       FindHandler__7wxImageFRC8wxStringl

-      ;wxImage::CountColours(unsigned long)
-      CountColours__7wxImageFUl

       ;wxImage::wxImage(int,int)
       __ct__7wxImageFiT1
       ;wxImageModule::sm_classwxImageModule
       ;wxImage::wxImage(int,int)
       __ct__7wxImageFiT1
       ;wxImageModule::sm_classwxImageModule


@@ -2679,25 +3161,37 @@ 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&)
       FindHandlerMime__7wxImageFRC8wxString
       ;wxImage::Mirror(unsigned long) const
       Mirror__7wxImageCFUl
       __vft14wxImageHandler8wxObject
       ;wxImage::FindHandlerMime(const wxString&)
       FindHandlerMime__7wxImageFRC8wxString
       ;wxImage::Mirror(unsigned long) const
       Mirror__7wxImageCFUl
       __vft14wxImageHandler8wxObject

-      ;wxImage::LoadFile(const wxString&,long)
-      LoadFile__7wxImageFRC8wxStringl
-      ;wxImage::Scale(int,int) const
-      Scale__7wxImageCFiT1
+      ;wxImage::GetImageCount(wxInputStream&,long)
+      GetImageCount__7wxImageFR13wxInputStreaml
+      ;wxImage::FindFirstUnusedColour(unsigned char*,unsigned char*,unsigned char*,unsigned char,unsigned char,unsigned char) const
+      FindFirstUnusedColour__7wxImageCFPUcN21UcN24
+      ;wxImageHandler::CallDoCanRead(wxInputStream&)
+      CallDoCanRead__14wxImageHandlerFR13wxInputStream

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

+      ;wxImage::wxImage(wxInputStream&,const wxString&,int)
+      __ct__7wxImageFR13wxInputStreamRC8wxStringi

       ;wxImage::SetPalette(const wxPalette&)
       SetPalette__7wxImageFRC9wxPalette
       ;wxImage::SetPalette(const wxPalette&)
       SetPalette__7wxImageFRC9wxPalette

-      ;wxImage::SaveFile(wxOutputStream&,int)
-      SaveFile__7wxImageFR14wxOutputStreami
+      ;wxImage::Scale(int,int) const
+      Scale__7wxImageCFiT1
+      ;wxImage::LoadFile(const wxString&,long,int)
+      LoadFile__7wxImageFRC8wxStringli

       ;wxImageHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__14wxImageHandlerFP7wxImageR13wxInputStreamUli
       ;wxImageHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__14wxImageHandlerFP7wxImageR13wxInputStreamUli

+      ;wxImage::ComputeHistogram(wxImageHistogram&) const
+      ComputeHistogram__7wxImageCFR16wxImageHistogram

       ;wxImageRefData::~wxImageRefData()
       __dt__14wxImageRefDataFv
       ;wxImage::HasPalette() const
       ;wxImageRefData::~wxImageRefData()
       __dt__14wxImageRefDataFv
       ;wxImage::HasPalette() const


@@ -2706,24 +3200,20 @@ EXPORTS
       GetMaskGreen__7wxImageCFv
       ;wxImage::SetRGB(int,int,unsigned char,unsigned char,unsigned char)
       SetRGB__7wxImageFiT1UcN23
       GetMaskGreen__7wxImageCFv
       ;wxImage::SetRGB(int,int,unsigned char,unsigned char,unsigned char)
       SetRGB__7wxImageFiT1UcN23

-      ;wxImage::SaveFile(wxOutputStream&,const wxString&)
-      SaveFile__7wxImageFR14wxOutputStreamRC8wxString
-      ;wxImage::LoadFile(wxInputStream&,const wxString&)
-      LoadFile__7wxImageFR13wxInputStreamRC8wxString

       ;wxImage::CanRead(const wxString&)
       CanRead__7wxImageFRC8wxString
       ;wxImage::CanRead(const wxString&)
       CanRead__7wxImageFRC8wxString

+      ;wxImage::GetImageCount(const wxString&,long)
+      GetImageCount__7wxImageFRC8wxStringl
+      __vft7wxImage8wxObject

       ;wxImage::Rotate(double,const wxPoint&,unsigned long,wxPoint*) const
       Rotate__7wxImageCFdRC7wxPointUlP7wxPoint
       ;wxImage::Rotate(double,const wxPoint&,unsigned long,wxPoint*) const
       Rotate__7wxImageCFdRC7wxPointUlP7wxPoint

-      __vft7wxImage8wxObject
-      ;wxImage::wxImage(const wxString&,const wxString&)
-      __ct__7wxImageFRC8wxStringT1
-      wxNullImage
-      ;wxImage::SaveFile(const wxString&,int)
-      SaveFile__7wxImageFRC8wxStringi

       ;wxImage::Replace(unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char)
       Replace__7wxImageFUcN51
       ;wxImage::Replace(unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char)
       Replace__7wxImageFUcN51

-      ;wxImage::LoadFile(const wxString&,const wxString&)
-      LoadFile__7wxImageFRC8wxStringT1
+      wxNullImage
+      ;wxImage::SaveFile(const wxString&,const wxString&) const
+      SaveFile__7wxImageCFRC8wxStringT1
+      ;wxImage::LoadFile(const wxString&,const wxString&,int)
+      LoadFile__7wxImageFRC8wxStringT1i

       ;wxImageRefData::wxImageRefData()
       __ct__14wxImageRefDataFv
       ;wxConstructorForwxImageModule()
       ;wxImageRefData::wxImageRefData()
       __ct__14wxImageRefDataFv
       ;wxConstructorForwxImageModule()


@@ -2746,8 +3236,6 @@ EXPORTS
       FindHandler__7wxImageFRC8wxString
       ;wxImage::Create(int,int,unsigned char*,unsigned long)
       Create__7wxImageFiT1PUcUl
       FindHandler__7wxImageFRC8wxString
       ;wxImage::Create(int,int,unsigned char*,unsigned long)
       Create__7wxImageFiT1PUcUl

-      ;wxImage::wxImage(wxInputStream&,long)
-      __ct__7wxImageFR13wxInputStreaml

       ;wxImage::SetMask(unsigned long)
       SetMask__7wxImageFUl
       ;wxImage::Rotate90(unsigned long) const
       ;wxImage::SetMask(unsigned long)
       SetMask__7wxImageFUl
       ;wxImage::Rotate90(unsigned long) const


@@ -2755,12 +3243,16 @@ EXPORTS
       ;wxImage::Create(int,int)
       Create__7wxImageFiT1
       __vft14wxImageRefData15wxObjectRefData
       ;wxImage::Create(int,int)
       Create__7wxImageFiT1
       __vft14wxImageRefData15wxObjectRefData

+      ;wxImage::wxImage(const wxString&,const wxString&,int)
+      __ct__7wxImageFRC8wxStringT1i

       ;wxImage::wxImage(const wxImage*)
       __ct__7wxImageFPC7wxImage
       ;wxImage::SetOption(const wxString&,const wxString&)
       SetOption__7wxImageFRC8wxStringT1
       ;wxImage::SetMaskColour(unsigned char,unsigned char,unsigned char)
       SetMaskColour__7wxImageFUcN21
       ;wxImage::wxImage(const wxImage*)
       __ct__7wxImageFPC7wxImage
       ;wxImage::SetOption(const wxString&,const wxString&)
       SetOption__7wxImageFRC8wxStringT1
       ;wxImage::SetMaskColour(unsigned char,unsigned char,unsigned char)
       SetMaskColour__7wxImageFUcN21

+      ;wxImage::SaveFile(wxOutputStream&,int) const
+      SaveFile__7wxImageCFR14wxOutputStreami

       ;wxImageHandler::GetImageCount(wxInputStream&)
       GetImageCount__14wxImageHandlerFR13wxInputStream
       ;wxImage::ConvertToMono(unsigned char,unsigned char,unsigned char) const
       ;wxImageHandler::GetImageCount(wxInputStream&)
       GetImageCount__14wxImageHandlerFR13wxInputStream
       ;wxImage::ConvertToMono(unsigned char,unsigned char,unsigned char) const


@@ -2771,40 +3263,44 @@ 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
       ;wxImage::CleanUpHandlers()
       CleanUpHandlers__7wxImageFv
       ;wxImageHandler::CanRead(const wxString&)
       CanRead__14wxImageHandlerFRC8wxString

-      ;wxImage::wxImage(const wxString&,long)
-      __ct__7wxImageFRC8wxStringl
-      ;wxImage::wxImage(const wxBitmap&)
-      __ct__7wxImageFRC8wxBitmap

       ;wxImageHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__14wxImageHandlerFP7wxImageR14wxOutputStreamUl
       ;wxImageHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__14wxImageHandlerFP7wxImageR14wxOutputStreamUl

-      ;wxImage::LoadFile(wxInputStream&,long)
-      LoadFile__7wxImageFR13wxInputStreaml
-      ;wxImage::GetBlue(int,int) const
-      GetBlue__7wxImageCFiT1
+      ;wxImage::CountColours(unsigned long) const
+      CountColours__7wxImageCFUl
+      ;wxImage::wxImage(const wxString&,long,int)
+      __ct__7wxImageFRC8wxStringli

       ;wxImage::sm_classwxImage
       sm_classwxImage__7wxImage
       ;wxImage::sm_classwxImage
       sm_classwxImage__7wxImage

+      ;wxImage::wxImage(wxInputStream&,long,int)
+      __ct__7wxImageFR13wxInputStreamli

       ;wxImage::SetOption(const wxString&,int)
       SetOption__7wxImageFRC8wxStringi
       ;wxImage::SetOption(const wxString&,int)
       SetOption__7wxImageFRC8wxStringi

-      ;wxImage::SaveFile(const wxString&,const wxString&)
-      SaveFile__7wxImageFRC8wxStringT1
-      ;wxImage::ComputeHistogram(wxHashTable&)
-      ComputeHistogram__7wxImageFR11wxHashTable
+      ;wxImage::SaveFile(const wxString&,int) const
+      SaveFile__7wxImageCFRC8wxStringi
+      ;wxImage::LoadFile(wxInputStream&,long,int)
+      LoadFile__7wxImageFR13wxInputStreamli
+      ;wxImage::LoadFile(wxInputStream&,const wxString&,int)
+      LoadFile__7wxImageFR13wxInputStreamRC8wxStringi
+      ;wxImage::GetBlue(int,int) const
+      GetBlue__7wxImageCFiT1

       ;wxImage::CanRead(wxInputStream&)
       CanRead__7wxImageFR13wxInputStream
       ;wxImage::CanRead(wxInputStream&)
       CanRead__7wxImageFR13wxInputStream

-      ;wxImage::AddHandler(wxImageHandler*)
-      AddHandler__7wxImageFP14wxImageHandler
+      ;wxImage::SetMaskFromImage(const wxImage&,unsigned char,unsigned char,unsigned char)
+      SetMaskFromImage__7wxImageFRC7wxImageUcN22

       ;wxImageHandler::sm_classwxImageHandler
       sm_classwxImageHandler__14wxImageHandler
       ;wxImageHandler::sm_classwxImageHandler
       sm_classwxImageHandler__14wxImageHandler

-      ;wxImage::wxImage(wxInputStream&,const wxString&)
-      __ct__7wxImageFR13wxInputStreamRC8wxString
+      ;wxImage::AddHandler(wxImageHandler*)
+      AddHandler__7wxImageFP14wxImageHandler

       ;wxImage::HasOption(const wxString&) const
       HasOption__7wxImageCFRC8wxString
       ;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)


@@ -2818,14 +3314,55 @@ EXPORTS
       __vft12wxGIFHandler8wxObject
       ;wxGIFHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__12wxGIFHandlerFP7wxImageR13wxInputStreamUli
       __vft12wxGIFHandler8wxObject
       ;wxGIFHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__12wxGIFHandlerFP7wxImageR13wxInputStreamUli

+  ;From object file:  ..\common\imagiff.cpp
+    ;PUBDEFs (Symbols available from object file):
+      __vft12wxIFFHandler8wxObject
+      ;wxIFFDecoder::ConvertToImage(wxImage*) const
+      ConvertToImage__12wxIFFDecoderCFP7wxImage
+      ;wxIFFHandler::DoCanRead(wxInputStream&)
+      DoCanRead__12wxIFFHandlerFR13wxInputStream
+      ;wxIFFDecoder::Destroy()
+      Destroy__12wxIFFDecoderFv
+      ;wxIFFDecoder::GetTransparentColour() const
+      GetTransparentColour__12wxIFFDecoderCFv
+      ;wxIFFDecoder::GetNumColors() const
+      GetNumColors__12wxIFFDecoderCFv
+      ;wxIFFDecoder::GetData() const
+      GetData__12wxIFFDecoderCFv
+      ;wxIFFDecoder::CanRead()
+      CanRead__12wxIFFDecoderFv
+      ;wxConstructorForwxIFFHandler()
+      wxConstructorForwxIFFHandler__Fv
+      ;wxIFFDecoder::GetWidth() const
+      GetWidth__12wxIFFDecoderCFv
+      ;wxIFFDecoder::ReadIFF()
+      ReadIFF__12wxIFFDecoderFv
+      ;wxIFFDecoder::GetPalette() const
+      GetPalette__12wxIFFDecoderCFv
+      ;wxIFFDecoder::wxIFFDecoder(wxInputStream*)
+      __ct__12wxIFFDecoderFP13wxInputStream
+      ;wxIFFHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
+      SaveFile__12wxIFFHandlerFP7wxImageR14wxOutputStreamUl
+      ;wxIFFHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
+      LoadFile__12wxIFFHandlerFP7wxImageR13wxInputStreamUli
+      ;wxIFFDecoder::GetHeight() const
+      GetHeight__12wxIFFDecoderCFv
+      ;wxIFFHandler::sm_classwxIFFHandler
+      sm_classwxIFFHandler__12wxIFFHandler

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

+      my_error_exit

       ;wxJPEGHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__13wxJPEGHandlerFP7wxImageR14wxOutputStreamUl
       ;wxJPEGHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__13wxJPEGHandlerFP7wxImageR14wxOutputStreamUl

+      my_skip_input_data

       ;jpeg_wxio_dest(jpeg_compress_struct*,wxOutputStream&)
       jpeg_wxio_dest__FP20jpeg_compress_structR14wxOutputStream
       ;jpeg_wxio_dest(jpeg_compress_struct*,wxOutputStream&)
       jpeg_wxio_dest__FP20jpeg_compress_structR14wxOutputStream

+      my_fill_input_buffer

       ;wxJPEGHandler::sm_classwxJPEGHandler
       sm_classwxJPEGHandler__13wxJPEGHandler
       ;wxJPEGHandler::sm_classwxJPEGHandler
       sm_classwxJPEGHandler__13wxJPEGHandler

+      empty_output_buffer
+      my_term_source
+      term_destination

       ;jpeg_wxio_src(jpeg_decompress_struct*,wxInputStream&)
       jpeg_wxio_src__FP22jpeg_decompress_structR13wxInputStream
       ;wxJPEGHandler::DoCanRead(wxInputStream&)
       ;jpeg_wxio_src(jpeg_decompress_struct*,wxInputStream&)
       jpeg_wxio_src__FP22jpeg_decompress_structR13wxInputStream
       ;wxJPEGHandler::DoCanRead(wxInputStream&)


@@ -2833,8 +3370,10 @@ EXPORTS
       ;wxConstructorForwxJPEGHandler()
       wxConstructorForwxJPEGHandler__Fv
       __vft13wxJPEGHandler8wxObject
       ;wxConstructorForwxJPEGHandler()
       wxConstructorForwxJPEGHandler__Fv
       __vft13wxJPEGHandler8wxObject

+      my_init_source

       ;wxJPEGHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__13wxJPEGHandlerFP7wxImageR13wxInputStreamUli
       ;wxJPEGHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__13wxJPEGHandlerFP7wxImageR13wxInputStreamUli

+      init_destination

   ;From object file:  ..\common\imagpcx.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPCXHandler::sm_classwxPCXHandler
   ;From object file:  ..\common\imagpcx.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPCXHandler::sm_classwxPCXHandler


@@ -2861,16 +3400,18 @@ EXPORTS
       __vft12wxPNGHandler8wxObject
       ;wxConstructorForwxPNGHandler()
       wxConstructorForwxPNGHandler__Fv
       __vft12wxPNGHandler8wxObject
       ;wxConstructorForwxPNGHandler()
       wxConstructorForwxPNGHandler__Fv

+      wx_png_error
+      wx_png_warning
+      _PNG_stream_reader

       ;wxPNGHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__12wxPNGHandlerFP7wxImageR14wxOutputStreamUl
       ;wxPNGHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__12wxPNGHandlerFP7wxImageR13wxInputStreamUli
       ;wxPNGHandler::DoCanRead(wxInputStream&)
       DoCanRead__12wxPNGHandlerFR13wxInputStream
       ;wxPNGHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__12wxPNGHandlerFP7wxImageR14wxOutputStreamUl
       ;wxPNGHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__12wxPNGHandlerFP7wxImageR13wxInputStreamUli
       ;wxPNGHandler::DoCanRead(wxInputStream&)
       DoCanRead__12wxPNGHandlerFR13wxInputStream

-      png_silent_error
+      _PNG_stream_writer

       ;wxPNGHandler::sm_classwxPNGHandler
       sm_classwxPNGHandler__12wxPNGHandler
       ;wxPNGHandler::sm_classwxPNGHandler
       sm_classwxPNGHandler__12wxPNGHandler

-      png_silent_warning

   ;From object file:  ..\common\imagpnm.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPNMHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
   ;From object file:  ..\common\imagpnm.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPNMHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)


@@ -2888,16 +3429,23 @@ EXPORTS
       DoCanRead__12wxPNMHandlerFR13wxInputStream
   ;From object file:  ..\common\imagtiff.cpp
     ;PUBDEFs (Symbols available from object file):
       DoCanRead__12wxPNMHandlerFR13wxInputStream
   ;From object file:  ..\common\imagtiff.cpp
     ;PUBDEFs (Symbols available from object file):

+      _tiffCloseProc
+      _tiffUnmapProc

       ;wxTIFFHandler::DoCanRead(wxInputStream&)
       DoCanRead__13wxTIFFHandlerFR13wxInputStream
       ;TIFFwxOpen(wxOutputStream&,const char*,const char*)
       TIFFwxOpen__FR14wxOutputStreamPCcT2
       ;wxTIFFHandler::DoCanRead(wxInputStream&)
       DoCanRead__13wxTIFFHandlerFR13wxInputStream
       ;TIFFwxOpen(wxOutputStream&,const char*,const char*)
       TIFFwxOpen__FR14wxOutputStreamPCcT2

+      _tiffWriteProc

       ;wxTIFFHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__13wxTIFFHandlerFP7wxImageR13wxInputStreamUli
       ;wxTIFFHandler::GetImageCount(wxInputStream&)
       GetImageCount__13wxTIFFHandlerFR13wxInputStream
       ;TIFFwxOpen(wxInputStream&,const char*,const char*)
       TIFFwxOpen__FR13wxInputStreamPCcT2
       ;wxTIFFHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__13wxTIFFHandlerFP7wxImageR13wxInputStreamUli
       ;wxTIFFHandler::GetImageCount(wxInputStream&)
       GetImageCount__13wxTIFFHandlerFR13wxInputStream
       ;TIFFwxOpen(wxInputStream&,const char*,const char*)
       TIFFwxOpen__FR13wxInputStreamPCcT2

+      _tiffNullProc
+      _tiffSizeProc
+      _tiffSeekOProc
+      _tiffReadProc

       ;wxTIFFHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__13wxTIFFHandlerFP7wxImageR14wxOutputStreamUl
       __vft13wxTIFFHandler8wxObject
       ;wxTIFFHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__13wxTIFFHandlerFP7wxImageR14wxOutputStreamUl
       __vft13wxTIFFHandler8wxObject


@@ -2905,6 +3453,8 @@ EXPORTS
       wxConstructorForwxTIFFHandler__Fv
       ;wxTIFFHandler::sm_classwxTIFFHandler
       sm_classwxTIFFHandler__13wxTIFFHandler
       wxConstructorForwxTIFFHandler__Fv
       ;wxTIFFHandler::sm_classwxTIFFHandler
       sm_classwxTIFFHandler__13wxTIFFHandler

+      _tiffSeekIProc
+      _tiffMapProc

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


@@ -2920,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)


@@ -2970,30 +3522,30 @@ 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
       GetString__12wxMsgCatalogCFPCc
       ;wxLocale::FindCatalog(const char*) const
       FindCatalog__8wxLocaleCFPCc
       ;wxLocale::DestroyLanguagesDB()
       DestroyLanguagesDB__8wxLocaleFv
       ;wxMsgCatalog::GetString(const char*) const
       GetString__12wxMsgCatalogCFPCc
       ;wxLocale::FindCatalog(const char*) const
       FindCatalog__8wxLocaleCFPCc

-      ;wxLanguageInfoArray::RemoveAt(unsigned int)
-      RemoveAt__19wxLanguageInfoArrayFUi
-      ;wxLanguageInfoArray::operator=(const wxLanguageInfoArray&)
-      __as__19wxLanguageInfoArrayFRC19wxLanguageInfoArray

       ;wxLanguageInfoArray::DoCopy(const wxLanguageInfoArray&)
       DoCopy__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
       ;wxLanguageInfoArray::DoCopy(const wxLanguageInfoArray&)
       DoCopy__19wxLanguageInfoArrayFRC19wxLanguageInfoArray

-      ;wxMsgCatalog::GetHash(const char*)
-      GetHash__12wxMsgCatalogFPCc
-      ;wxLocale::IsLoaded(const char*) const
-      IsLoaded__8wxLocaleCFPCc
+      ;wxLanguageInfoArray::operator=(const wxLanguageInfoArray&)
+      __as__19wxLanguageInfoArrayFRC19wxLanguageInfoArray

       ;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


@@ -3048,10 +3600,17 @@ EXPORTS
       wxConstructorForwxIndividualLayoutConstraint__Fv
   ;From object file:  ..\common\lboxcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       wxConstructorForwxIndividualLayoutConstraint__Fv
   ;From object file:  ..\common\lboxcmn.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxListBoxBase::AppendAndEnsureVisible(const wxString&)
+      AppendAndEnsureVisible__13wxListBoxBaseFRC8wxString

       ;wxListBoxBase::SetStringSelection(const wxString&,unsigned long)
       SetStringSelection__13wxListBoxBaseFRC8wxStringUl
       ;wxListBoxBase::SetStringSelection(const wxString&,unsigned long)
       SetStringSelection__13wxListBoxBaseFRC8wxStringUl

+      __vft13wxListBoxBase15wxItemContainer

       ;wxListBoxBase::SetFirstItem(const wxString&)
       SetFirstItem__13wxListBoxBaseFRC8wxString
       ;wxListBoxBase::SetFirstItem(const wxString&)
       SetFirstItem__13wxListBoxBaseFRC8wxString

+      ;wxListBoxBase::DeselectAll(int)
+      DeselectAll__13wxListBoxBaseFi
+      ;wxListBoxBase::EnsureVisible(int)
+      EnsureVisible__13wxListBoxBaseFi

       __vft13wxListBoxBase8wxObject
       ;wxListBoxBase::InsertItems(int,const wxString*,int)
       InsertItems__13wxListBoxBaseFiPC8wxStringT1
       __vft13wxListBoxBase8wxObject
       ;wxListBoxBase::InsertItems(int,const wxString*,int)
       InsertItems__13wxListBoxBaseFiPC8wxStringT1


@@ -3059,14 +3618,20 @@ EXPORTS
       Set__13wxListBoxBaseFiPC8wxStringPPv
       ;wxListBoxBase::Command(wxCommandEvent&)
       Command__13wxListBoxBaseFR14wxCommandEvent
       Set__13wxListBoxBaseFiPC8wxStringPPv
       ;wxListBoxBase::Command(wxCommandEvent&)
       Command__13wxListBoxBaseFR14wxCommandEvent

+      ;wxListBoxBase::~wxListBoxBase()
+      __dt__13wxListBoxBaseFv

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

+      ;wxList::sm_classwxList
+      sm_classwxList__6wxList

       ;wxListBase::LastThat(int(*)(void*))
       LastThat__10wxListBaseFPFPv_i
       __vft16wxStringListNode10wxNodeBase
       ;wxListBase::Clear()
       Clear__10wxListBaseFv
       ;wxListBase::LastThat(int(*)(void*))
       LastThat__10wxListBaseFPFPv_i
       __vft16wxStringListNode10wxNodeBase
       ;wxListBase::Clear()
       Clear__10wxListBaseFv

+      ;wxConstructorForwxStringList()
+      wxConstructorForwxStringList__Fv

       ;wxListBase::DeleteObject(void*)
       DeleteObject__10wxListBaseFPv
       ;wxObjectListNode::DeleteData()
       ;wxListBase::DeleteObject(void*)
       DeleteObject__10wxListBaseFPv
       ;wxObjectListNode::DeleteData()


@@ -3095,6 +3660,8 @@ EXPORTS
       FirstThat__10wxListBaseFPFPv_i
       ;wxNodeBase::~wxNodeBase()
       __dt__10wxNodeBaseFv
       FirstThat__10wxListBaseFPFPv_i
       ;wxNodeBase::~wxNodeBase()
       __dt__10wxNodeBaseFv

+      ;wxConstructorForwxList()
+      wxConstructorForwxList__Fv

       ;wxStringList::Sort()
       Sort__12wxStringListFv
       ;wxListBase::Find(void*) const
       ;wxStringList::Sort()
       Sort__12wxStringListFv
       ;wxListBase::Find(void*) const


@@ -3103,6 +3670,8 @@ EXPORTS
       Delete__12wxStringListFPCc
       ;wxStringList::Member(const char*) const
       Member__12wxStringListCFPCc
       Delete__12wxStringListFPCc
       ;wxStringList::Member(const char*) const
       Member__12wxStringListCFPCc

+      ;wxStringList::sm_classwxStringList
+      sm_classwxStringList__12wxStringList

       ;wxNodeBase::wxNodeBase(wxListBase*,wxNodeBase*,wxNodeBase*,void*,const wxListKey&)
       __ct__10wxNodeBaseFP10wxListBaseP10wxNodeBaseT2PvRC9wxListKey
       __vft10wxNodeBase
       ;wxNodeBase::wxNodeBase(wxListBase*,wxNodeBase*,wxNodeBase*,void*,const wxListKey&)
       __ct__10wxNodeBaseFP10wxListBaseP10wxNodeBaseT2PvRC9wxListKey
       __vft10wxNodeBase


@@ -3122,6 +3691,7 @@ EXPORTS
       IndexOf__10wxListBaseCFPv
       ;wxStringListNode::DeleteData()
       DeleteData__16wxStringListNodeFv
       IndexOf__10wxListBaseCFPv
       ;wxStringListNode::DeleteData()
       DeleteData__16wxStringListNodeFv

+      wx_comparestrings

       ;wxStringList::DoCopy(const wxStringList&)
       DoCopy__12wxStringListFRC12wxStringList
       ;wxStringList::ListToArray(unsigned long) const
       ;wxStringList::DoCopy(const wxStringList&)
       DoCopy__12wxStringListFRC12wxStringList
       ;wxStringList::ListToArray(unsigned long) const


@@ -3142,8 +3712,6 @@ EXPORTS
       DoLog__5wxLogFUlPCcl
       ;wxLogStream::DoLogString(const char*,long)
       DoLogString__11wxLogStreamFPCcl
       DoLog__5wxLogFUlPCcl
       ;wxLogStream::DoLogString(const char*,long)
       DoLogString__11wxLogStreamFPCcl

-      ;wxOnAssert(const char*,int,const char*)
-      wxOnAssert__FPCciT1

       ;wxLogGeneric(unsigned long,const char*,...)
       wxLogGeneric__FUlPCce
       ;wxLogDebug(const char*,...)
       ;wxLogGeneric(unsigned long,const char*,...)
       wxLogGeneric__FUlPCce
       ;wxLogDebug(const char*,...)


@@ -3152,22 +3720,38 @@ EXPORTS
       __ct__5wxLogFv
       ;wxLog::Flush()
       Flush__5wxLogFv
       __ct__5wxLogFv
       ;wxLog::Flush()
       Flush__5wxLogFv

-      ;wxLog::SetActiveTarget(wxLog*)
-      SetActiveTarget__5wxLogFP5wxLog
+      ;wxLogChain::Flush()
+      Flush__10wxLogChainFv
+      ;wxVLogTrace(const char*,char*)
+      wxVLogTrace__FPCcPc

       ;wxLog::ms_doLog
       ms_doLog__5wxLog
       ;wxLog::ms_doLog
       ms_doLog__5wxLog

+      ;wxLog::SetActiveTarget(wxLog*)
+      SetActiveTarget__5wxLogFP5wxLog

       ;wxLogWarning(const char*,...)
       wxLogWarning__FPCce
       ;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
       ;wxLog::ClearTraceMasks()
       ClearTraceMasks__5wxLogFv

-      ;wxTrap()
-      wxTrap__Fv
+      ;wxVLogError(const char*,char*)
+      wxVLogError__FPCcPc
+      ;wxVLogTrace(unsigned long,const char*,char*)
+      wxVLogTrace__FUlPCcPc
+      ;wxVLogTrace(const char*,const char*,char*)
+      wxVLogTrace__FPCcT1Pc
+      ;wxVLogDebug(const char*,char*)
+      wxVLogDebug__FPCcPc
+      ;wxLog::ms_bVerbose
+      ms_bVerbose__5wxLog

       ;wxLog::RemoveTraceMask(const wxString&)
       RemoveTraceMask__5wxLogFRC8wxString
       ;wxSysErrorMsg(unsigned long)
       ;wxLog::RemoveTraceMask(const wxString&)
       RemoveTraceMask__5wxLogFRC8wxString
       ;wxSysErrorMsg(unsigned long)


@@ -3182,24 +3766,45 @@ EXPORTS
       wxLogSysError__FPCce
       ;wxLog::DontCreateOnDemand()
       DontCreateOnDemand__5wxLogFv
       wxLogSysError__FPCce
       ;wxLog::DontCreateOnDemand()
       DontCreateOnDemand__5wxLogFv

+      ;wxVLogWarning(const char*,char*)
+      wxVLogWarning__FPCcPc
+      ;wxVLogStatus(const char*,char*)
+      wxVLogStatus__FPCcPc
+      ;wxVLogMessage(const char*,char*)
+      wxVLogMessage__FPCcPc
+      __vft10wxLogChain5wxLog
+      ;wxLogChain::wxLogChain(wxLog*)
+      __ct__10wxLogChainFP5wxLog

       ;wxLog::TimeStamp(wxString*)
       TimeStamp__5wxLogFP8wxString
       ;wxLogInfo(const char*,...)
       wxLogInfo__FPCce
       ;wxLogSysError(long,const char*,...)
       wxLogSysError__FlPCce
       ;wxLog::TimeStamp(wxString*)
       TimeStamp__5wxLogFP8wxString
       ;wxLogInfo(const char*,...)
       wxLogInfo__FPCce
       ;wxLogSysError(long,const char*,...)
       wxLogSysError__FlPCce

-      ;wxAssertIsEqual(int,int)
-      wxAssertIsEqual__FiT1

       ;wxLogStream::wxLogStream(ostream*)
       __ct__11wxLogStreamFP7ostream
       ;wxLogStream::wxLogStream(ostream*)
       __ct__11wxLogStreamFP7ostream

+      ;wxLog::SetLogBuffer(char*,unsigned int)
+      SetLogBuffer__5wxLogFPcUi
+      ;wxLogPassThrough::wxLogPassThrough()
+      __ct__16wxLogPassThroughFv
+      ;wxVLogInfo(const char*,char*)
+      wxVLogInfo__FPCcPc
+      ;wxVLogSysError(const char*,char*)
+      wxVLogSysError__FPCcPc
+      ;wxVLogFatalError(const char*,char*)
+      wxVLogFatalError__FPCcPc

       ;wxLog::ms_suspendCount
       ms_suspendCount__5wxLog
       ;wxLog::ms_bAutoCreate
       ms_bAutoCreate__5wxLog
       __vft11wxLogStream5wxLog
       __vft11wxLogStderr5wxLog
       ;wxLog::ms_suspendCount
       ms_suspendCount__5wxLog
       ;wxLog::ms_bAutoCreate
       ms_bAutoCreate__5wxLog
       __vft11wxLogStream5wxLog
       __vft11wxLogStderr5wxLog

+      ;wxLogChain::SetLog(wxLog*)
+      SetLog__10wxLogChainFP5wxLog

       ;wxLogStderr::DoLogString(const char*,long)
       DoLogString__11wxLogStderrFPCcl
       ;wxLogStderr::DoLogString(const char*,long)
       DoLogString__11wxLogStderrFPCcl

+      ;wxLogChain::DoLog(unsigned long,const char*,long)
+      DoLog__10wxLogChainFUlPCcl

       ;wxLogError(const char*,...)
       wxLogError__FPCce
       ;wxLogTrace(const char*,...)
       ;wxLogError(const char*,...)
       wxLogError__FPCce
       ;wxLogTrace(const char*,...)


@@ -3212,6 +3817,12 @@ EXPORTS
       GetActiveTarget__5wxLogFv
       ;wxSysErrorCode()
       wxSysErrorCode__Fv
       GetActiveTarget__5wxLogFv
       ;wxSysErrorCode()
       wxSysErrorCode__Fv

+      ;wxVLogGeneric(unsigned long,const char*,char*)
+      wxVLogGeneric__FUlPCcPc
+      ;wxVLogVerbose(const char*,char*)
+      wxVLogVerbose__FPCcPc
+      ;wxVLogSysError(long,const char*,char*)
+      wxVLogSysError__FlPCcPc

       ;wxLog::ms_ulTraceMask
       ms_ulTraceMask__5wxLog
       ;wxLog::ms_timestamp
       ;wxLog::ms_ulTraceMask
       ms_ulTraceMask__5wxLog
       ;wxLog::ms_timestamp


@@ -3225,14 +3836,36 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxLongLongWx::operator<(const wxLongLongWx&) const
       __lt__12wxLongLongWxCFRC12wxLongLongWx
     ;PUBDEFs (Symbols available from object file):
       ;wxLongLongWx::operator<(const wxLongLongWx&) const
       __lt__12wxLongLongWxCFRC12wxLongLongWx

+      ;wxULongLongWx::operator-(const wxULongLongWx&) const
+      __mi__13wxULongLongWxCFRC13wxULongLongWx

       ;wxLongLongWx::operator%(const wxLongLongWx&) const
       __md__12wxLongLongWxCFRC12wxLongLongWx
       ;wxLongLongWx::operator%(const wxLongLongWx&) const
       __md__12wxLongLongWxCFRC12wxLongLongWx

+      ;wxULongLongWx::operator>(const wxULongLongWx&) const
+      __gt__13wxULongLongWxCFRC13wxULongLongWx

       ;wxLongLongWx::operator>(const wxLongLongWx&) const
       __gt__12wxLongLongWxCFRC12wxLongLongWx
       ;wxLongLongWx::operator>(const wxLongLongWx&) const
       __gt__12wxLongLongWxCFRC12wxLongLongWx

+      ;wxULongLongWx::operator/(const wxULongLongWx&) const
+      __dv__13wxULongLongWxCFRC13wxULongLongWx
+      ;wxULongLongWx::operator+=(unsigned long)
+      __apl__13wxULongLongWxFUl
+      ;wxULongLongWx::operator-=(const wxULongLongWx&)
+      __ami__13wxULongLongWxFRC13wxULongLongWx
+      ;wxULongLongWx::operator^=(const wxULongLongWx&)
+      __aer__13wxULongLongWxFRC13wxULongLongWx
+      ;wxULongLongWx::operator&(const wxULongLongWx&) const
+      __ad__13wxULongLongWxCFRC13wxULongLongWx

       ;wxLongLongWx::operator<<(int) const
       __ls__12wxLongLongWxCFi
       ;wxLongLongWx::operator<<(int) const
       __ls__12wxLongLongWxCFi

+      ;wxULongLongWx::operator--()
+      __mm__13wxULongLongWxFv
+      ;wxULongLongWx::asArray() const
+      asArray__13wxULongLongWxCFv
+      ;wxULongLongWx::ToString() const
+      ToString__13wxULongLongWxCFv

       ;wxLongLongWx::operator+=(const wxLongLongWx&)
       __apl__12wxLongLongWxFRC12wxLongLongWx
       ;wxLongLongWx::operator+=(const wxLongLongWx&)
       __apl__12wxLongLongWxFRC12wxLongLongWx

+      ;wxULongLongWx::operator|(const wxULongLongWx&) const
+      __or__13wxULongLongWxCFRC13wxULongLongWx

       ;wxLongLongWx::operator|(const wxLongLongWx&) const
       __or__12wxLongLongWxCFRC12wxLongLongWx
       ;wxLongLongWx::operator^(const wxLongLongWx&) const
       ;wxLongLongWx::operator|(const wxLongLongWx&) const
       __or__12wxLongLongWxCFRC12wxLongLongWx
       ;wxLongLongWx::operator^(const wxLongLongWx&) const


@@ -3243,10 +3876,20 @@ EXPORTS
       __adv__12wxLongLongWxFRC12wxLongLongWx
       ;wxLongLongWx::operator&(const wxLongLongWx&) const
       __ad__12wxLongLongWxCFRC12wxLongLongWx
       __adv__12wxLongLongWxFRC12wxLongLongWx
       ;wxLongLongWx::operator&(const wxLongLongWx&) const
       __ad__12wxLongLongWxCFRC12wxLongLongWx

+      ;wxULongLongWx::operator<<=(int)
+      __als__13wxULongLongWxFi
+      ;wxULongLongWx::operator>>=(int)
+      __ars__13wxULongLongWxFi

       ;wxLongLongWx::Negate()
       Negate__12wxLongLongWxFv
       ;wxLongLongWx::Negate()
       Negate__12wxLongLongWxFv

+      ;wxLongLongWx::ToString() const
+      ToString__12wxLongLongWxCFv

       ;wxLongLongWx::operator-(const wxLongLongWx&) const
       __mi__12wxLongLongWxCFRC12wxLongLongWx
       ;wxLongLongWx::operator-(const wxLongLongWx&) const
       __mi__12wxLongLongWxCFRC12wxLongLongWx

+      ;wxULongLongWx::operator+(const wxULongLongWx&) const
+      __pl__13wxULongLongWxCFRC13wxULongLongWx
+      ;wxULongLongWx::operator*=(const wxULongLongWx&)
+      __amu__13wxULongLongWxFRC13wxULongLongWx

       ;wxLongLongWx::operator&=(const wxLongLongWx&)
       __aad__12wxLongLongWxFRC12wxLongLongWx
       ;wxLongLongWx::Assign(double)
       ;wxLongLongWx::operator&=(const wxLongLongWx&)
       __aad__12wxLongLongWxFRC12wxLongLongWx
       ;wxLongLongWx::Assign(double)


@@ -3257,6 +3900,8 @@ EXPORTS
       __mm__12wxLongLongWxFv
       ;wxLongLongWx::asArray() const
       asArray__12wxLongLongWxCFv
       __mm__12wxLongLongWxFv
       ;wxLongLongWx::asArray() const
       asArray__12wxLongLongWxCFv

+      ;wxULongLongWx::operator++()
+      __pp__13wxULongLongWxFv

       ;wxLongLongWx::operator-() const
       __mi__12wxLongLongWxCFv
       ;wxLongLongWx::operator~() const
       ;wxLongLongWx::operator-() const
       __mi__12wxLongLongWxCFv
       ;wxLongLongWx::operator~() const


@@ -3265,28 +3910,56 @@ EXPORTS
       Divide__12wxLongLongWxCFRC12wxLongLongWxR12wxLongLongWxT2
       ;wxLongLongWx::operator+(const wxLongLongWx&) const
       __pl__12wxLongLongWxCFRC12wxLongLongWx
       Divide__12wxLongLongWxCFRC12wxLongLongWxR12wxLongLongWxT2
       ;wxLongLongWx::operator+(const wxLongLongWx&) const
       __pl__12wxLongLongWxCFRC12wxLongLongWx

+      ;wxULongLongWx::operator*(const wxULongLongWx&) const
+      __ml__13wxULongLongWxCFRC13wxULongLongWx

       ;wxLongLongWx::operator*(const wxLongLongWx&) const
       __ml__12wxLongLongWxCFRC12wxLongLongWx
       ;wxLongLongWx::operator*(const wxLongLongWx&) const
       __ml__12wxLongLongWxCFRC12wxLongLongWx

+      ;wxULongLongWx::operator^(const wxULongLongWx&) const
+      __er__13wxULongLongWxCFRC13wxULongLongWx

       ;wxLongLongWx::operator+=(long)
       __apl__12wxLongLongWxFl
       ;wxLongLongWx::operator|=(const wxLongLongWx&)
       __aor__12wxLongLongWxFRC12wxLongLongWx
       ;wxLongLongWx::operator*=(const wxLongLongWx&)
       __amu__12wxLongLongWxFRC12wxLongLongWx
       ;wxLongLongWx::operator+=(long)
       __apl__12wxLongLongWxFl
       ;wxLongLongWx::operator|=(const wxLongLongWx&)
       __aor__12wxLongLongWxFRC12wxLongLongWx
       ;wxLongLongWx::operator*=(const wxLongLongWx&)
       __amu__12wxLongLongWxFRC12wxLongLongWx

+      ;wxULongLongWx::operator&=(const wxULongLongWx&)
+      __aad__13wxULongLongWxFRC13wxULongLongWx
+      ;wxULongLongWx::operator<<(int) const
+      __ls__13wxULongLongWxCFi
+      ;wxULongLongWx::operator>>(int) const
+      __rs__13wxULongLongWxCFi
+      ;wxULongLongWx::operator<(const wxULongLongWx&) const
+      __lt__13wxULongLongWxCFRC13wxULongLongWx
+      ;wxULongLongWx::operator+(unsigned long) const
+      __pl__13wxULongLongWxCFUl

       ;wxLongLongWx::operator+(long) const
       __pl__12wxLongLongWxCFl
       ;wxLongLongWx::operator+(long) const
       __pl__12wxLongLongWxCFl

+      ;wxULongLongWx::operator%(const wxULongLongWx&) const
+      __md__13wxULongLongWxCFRC13wxULongLongWx
+      ;operator<<(ostream&,const wxULongLongWx&)
+      __ls__FR7ostreamRC13wxULongLongWx

       ;operator<<(ostream&,const wxLongLongWx&)
       __ls__FR7ostreamRC12wxLongLongWx
       ;wxLongLongWx::operator/(const wxLongLongWx&) const
       __dv__12wxLongLongWxCFRC12wxLongLongWx
       ;operator<<(ostream&,const wxLongLongWx&)
       __ls__FR7ostreamRC12wxLongLongWx
       ;wxLongLongWx::operator/(const wxLongLongWx&) const
       __dv__12wxLongLongWxCFRC12wxLongLongWx

+      ;wxULongLongWx::operator+=(const wxULongLongWx&)
+      __apl__13wxULongLongWxFRC13wxULongLongWx
+      ;wxULongLongWx::operator|=(const wxULongLongWx&)
+      __aor__13wxULongLongWxFRC13wxULongLongWx

       ;wxLongLongWx::operator^=(const wxLongLongWx&)
       __aer__12wxLongLongWxFRC12wxLongLongWx
       ;wxLongLongWx::operator^=(const wxLongLongWx&)
       __aer__12wxLongLongWxFRC12wxLongLongWx

+      ;wxULongLongWx::operator/=(const wxULongLongWx&)
+      __adv__13wxULongLongWxFRC13wxULongLongWx

       ;wxLongLongWx::operator<<=(int)
       __als__12wxLongLongWxFi
       ;wxLongLongWx::operator>>=(int)
       __ars__12wxLongLongWxFi
       ;wxLongLongWx::operator++()
       __pp__12wxLongLongWxFv
       ;wxLongLongWx::operator<<=(int)
       __als__12wxLongLongWxFi
       ;wxLongLongWx::operator>>=(int)
       __ars__12wxLongLongWxFi
       ;wxLongLongWx::operator++()
       __pp__12wxLongLongWxFv

+      ;wxULongLongWx::operator~() const
+      __co__13wxULongLongWxCFv
+      ;wxULongLongWx::Divide(const wxULongLongWx&,wxULongLongWx&,wxULongLongWx&) const
+      Divide__13wxULongLongWxCFRC13wxULongLongWxR13wxULongLongWxT2

   ;From object file:  ..\common\matrix.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTransformMatrix::wxTransformMatrix(const wxTransformMatrix&)
   ;From object file:  ..\common\matrix.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTransformMatrix::wxTransformMatrix(const wxTransformMatrix&)


@@ -3453,6 +4126,10 @@ EXPORTS
       IsEnabled__13wxMenuBarBaseCFi
       ;wxMenuBarBase::IsChecked(int) const
       IsChecked__13wxMenuBarBaseCFi
       IsEnabled__13wxMenuBarBaseCFi
       ;wxMenuBarBase::IsChecked(int) const
       IsChecked__13wxMenuBarBaseCFi

+      ;wxMenuBarBase::FindItem(int,wxMenu**) const
+      FindItem__13wxMenuBarBaseCFiPP6wxMenu
+      ;wxMenuBarBase::Attach(wxFrame*)
+      Attach__13wxMenuBarBaseFP7wxFrame

       ;wxwxMenuItemListNode::DeleteData()
       DeleteData__20wxwxMenuItemListNodeFv
       ;wxMenuBase::~wxMenuBase()
       ;wxwxMenuItemListNode::DeleteData()
       DeleteData__20wxwxMenuItemListNodeFv
       ;wxMenuBase::~wxMenuBase()


@@ -3463,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


@@ -3481,6 +4160,10 @@ EXPORTS
       Destroy__10wxMenuBaseFP10wxMenuItem
       ;wxMenuBase::Delete(wxMenuItem*)
       Delete__10wxMenuBaseFP10wxMenuItem
       Destroy__10wxMenuBaseFP10wxMenuItem
       ;wxMenuBase::Delete(wxMenuItem*)
       Delete__10wxMenuBaseFP10wxMenuItem

+      ;wxMenuBase::AddSubMenu(wxMenu*)
+      AddSubMenu__10wxMenuBaseFP6wxMenu
+      ;wxMenuBase::Detach()
+      Detach__10wxMenuBaseFv

       ;wxMenuBase::SetHelpString(int,const wxString&)
       SetHelpString__10wxMenuBaseFiRC8wxString
       ;wxMenuBarBase::Append(wxMenu*,const wxString&)
       ;wxMenuBase::SetHelpString(int,const wxString&)
       SetHelpString__10wxMenuBaseFiRC8wxString
       ;wxMenuBarBase::Append(wxMenu*,const wxString&)


@@ -3492,6 +4175,8 @@ EXPORTS
       Enable__10wxMenuBaseFiUl
       ;wxMenuBase::FindChildItem(int,unsigned int*) const
       FindChildItem__10wxMenuBaseCFiPUi
       Enable__10wxMenuBaseFiUl
       ;wxMenuBase::FindChildItem(int,unsigned int*) const
       FindChildItem__10wxMenuBaseCFiPUi

+      ;wxMenuBase::SendEvent(int,int)
+      SendEvent__10wxMenuBaseFiT1

       ;wxMenuBase::FindItem(int,wxMenu**) const
       FindItem__10wxMenuBaseCFiPP6wxMenu
       ;wxMenuItemBase::~wxMenuItemBase()
       ;wxMenuBase::FindItem(int,wxMenu**) const
       FindItem__10wxMenuBaseCFiPP6wxMenu
       ;wxMenuItemBase::~wxMenuItemBase()


@@ -3515,10 +4200,16 @@ EXPORTS
       DeleteData__16wxwxMenuListNodeFv
       ;wxMenuBarBase::wxMenuBarBase()
       __ct__13wxMenuBarBaseFv
       DeleteData__16wxwxMenuListNodeFv
       ;wxMenuBarBase::wxMenuBarBase()
       __ct__13wxMenuBarBaseFv

-      ;wxMenuBarBase::Replace(unsigned int,wxMenu*,const wxString&)
-      Replace__13wxMenuBarBaseFUiP6wxMenuRC8wxString
+      ;wxMenuItemBase::GetAccel() const
+      GetAccel__14wxMenuItemBaseCFv
+      ;wxMenuBarBase::Detach()
+      Detach__13wxMenuBarBaseFv
+      ;wxGetAccelFromString(const wxString&)
+      wxGetAccelFromString__FRC8wxString

       ;wxMenuBarBase::SetLabel(int,const wxString&)
       SetLabel__13wxMenuBarBaseFiRC8wxString
       ;wxMenuBarBase::SetLabel(int,const wxString&)
       SetLabel__13wxMenuBarBaseFiRC8wxString

+      ;wxMenuBarBase::Replace(unsigned int,wxMenu*,const wxString&)
+      Replace__13wxMenuBarBaseFUiP6wxMenuRC8wxString

       ;wxMenuBase::Init(long)
       Init__10wxMenuBaseFl
       __vft14wxMenuItemBase8wxObject
       ;wxMenuBase::Init(long)
       Init__10wxMenuBaseFl
       __vft14wxMenuItemBase8wxObject


@@ -3528,6 +4219,10 @@ EXPORTS
       Remove__13wxMenuBarBaseFUi
       ;wxMenuBase::IsEnabled(int) const
       IsEnabled__10wxMenuBaseCFi
       Remove__13wxMenuBarBaseFUi
       ;wxMenuBase::IsEnabled(int) const
       IsEnabled__10wxMenuBaseCFi

+      ;wxMenuBarBase::FindMenuItem(const wxString&,const wxString&) const
+      FindMenuItem__13wxMenuBarBaseCFRC8wxStringT1
+      ;wxMenuBase::Attach(wxMenuBarBase*)
+      Attach__10wxMenuBaseFP13wxMenuBarBase

       ;wxMenuBarBase::~wxMenuBarBase()
       __dt__13wxMenuBarBaseFv
       ;wxMenuBase::FindItem(const wxString&) const
       ;wxMenuBarBase::~wxMenuBarBase()
       __dt__13wxMenuBarBaseFv
       ;wxMenuBase::FindItem(const wxString&) const


@@ -3540,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&)


@@ -3558,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


@@ -3589,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&)


@@ -3599,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


@@ -3636,10 +4333,29 @@ EXPORTS
       InitializeModules__8wxModuleFv
       ;wxModule::m_modules
       m_modules__8wxModule
       InitializeModules__8wxModuleFv
       ;wxModule::m_modules
       m_modules__8wxModule

+      ;wxModule::UnregisterModule(wxModule*)
+      UnregisterModule__8wxModuleFP8wxModule

       ;wxModule::CleanUpModules()
       CleanUpModules__8wxModuleFv
       ;wxModule::RegisterModule(wxModule*)
       RegisterModule__8wxModuleFP8wxModule
       ;wxModule::CleanUpModules()
       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


@@ -3670,96 +4386,63 @@ EXPORTS
       Eof__19wxMemoryInputStreamCFv
       ;wxMemoryOutputStream::OnSysTell() const
       OnSysTell__20wxMemoryOutputStreamCFv
       Eof__19wxMemoryInputStreamCFv
       ;wxMemoryOutputStream::OnSysTell() const
       OnSysTell__20wxMemoryOutputStreamCFv

+  ;From object file:  ..\common\nbkbase.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxNotebookBase::AssignImageList(wxImageList*)
+      AssignImageList__14wxNotebookBaseFP11wxImageList
+      __vft14wxNotebookBase8wxObject
+      ;wxNotebookBase::DoRemovePage(int)
+      DoRemovePage__14wxNotebookBaseFi
+      ;wxNotebookBase::~wxNotebookBase()
+      __dt__14wxNotebookBaseFv
+      ;wxNotebookBase::GetNextPage(unsigned long) const
+      GetNextPage__14wxNotebookBaseCFUl
+      ;wxNotebookBase::SetImageList(wxImageList*)
+      SetImageList__14wxNotebookBaseFP11wxImageList
+      ;wxNotebookBase::DeletePage(int)
+      DeletePage__14wxNotebookBaseFi
+      ;wxNotebookBase::CalcSizeFromPage(const wxSize&)
+      CalcSizeFromPage__14wxNotebookBaseFRC6wxSize
+      ;wxNotebookBase::Init()
+      Init__14wxNotebookBaseFv

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

-      ;wxCreateStoredObject(wxInputStream&)
-      wxCreateStoredObject__FR13wxInputStream
-      __vft15wxObjectRefData

       ;wxCreateDynamicObject(const char*)
       wxCreateDynamicObject__FPCc
       ;wxCreateDynamicObject(const char*)
       wxCreateDynamicObject__FPCc

-      ;wxClassInfo::wxClassInfo(const char*,const char*,const char*,int,wxObject*(*)())
-      __ct__11wxClassInfoFPCcN21iPFv_P8wxObject

       ;wxObject::Dump(ostream&)
       Dump__8wxObjectFR7ostream
       ;wxObject::Dump(ostream&)
       Dump__8wxObjectFR7ostream

-      wxTrue
-      ;wxObject::LoadObject(wxObjectInputStream&)
-      LoadObject__8wxObjectFR19wxObjectInputStream
-      ;wxClassInfo::IsKindOf(const wxClassInfo*) const
-      IsKindOf__11wxClassInfoCFPC11wxClassInfo
+      ;wxObject::CreateRefData() const
+      CreateRefData__8wxObjectCFv

       ;wxClassInfo::sm_classTable
       sm_classTable__11wxClassInfo
       ;wxClassInfo::sm_classTable
       sm_classTable__11wxClassInfo

-      ;wxObject::CopyObject(wxObject&) const
-      CopyObject__8wxObjectCFR8wxObject
-      ;wxObject::StoreObject(wxObjectOutputStream&)
-      StoreObject__8wxObjectFR20wxObjectOutputStream
-      ;wxObjectRefData::~wxObjectRefData()
-      __dt__15wxObjectRefDataFv
-      ;wxObject::Clone() const
-      Clone__8wxObjectCFv
+      ;wxObject::InitFrom(const wxObject&)
+      InitFrom__8wxObjectFRC8wxObject
+      ;wxObject::operator new(unsigned int,const char*,int)
+      __nw__8wxObjectFUiPCci
+      ;wxObject::CloneRefData(const wxObjectRefData*) const
+      CloneRefData__8wxObjectCFPC15wxObjectRefData

       ;wxClassInfo::sm_first
       sm_first__11wxClassInfo
       ;wxObject::Ref(const wxObject&)
       Ref__8wxObjectFRC8wxObject
       wxFalse
       ;wxClassInfo::sm_first
       sm_first__11wxClassInfo
       ;wxObject::Ref(const wxObject&)
       Ref__8wxObjectFRC8wxObject
       wxFalse

-      ;wxObjectRefData::wxObjectRefData()
-      __ct__15wxObjectRefDataFv

       ;wxObject::UnRef()
       UnRef__8wxObjectFv
       ;wxObject::UnRef()
       UnRef__8wxObjectFv

-      ;wxClassInfo::CreateObject()
-      CreateObject__11wxClassInfoFv

       ;wxClassInfo::CleanUpClasses()
       CleanUpClasses__11wxClassInfoFv
       ;wxClassInfo::CleanUpClasses()
       CleanUpClasses__11wxClassInfoFv

+      ;wxObject::AllocExclusive()
+      AllocExclusive__8wxObjectFv

       ;wxObject::IsKindOf(wxClassInfo*) const
       IsKindOf__8wxObjectCFP11wxClassInfo
       ;wxClassInfo::FindClass(const char*)
       FindClass__11wxClassInfoFPCc
       ;wxObject::sm_classwxObject
       sm_classwxObject__8wxObject
       ;wxObject::IsKindOf(wxClassInfo*) const
       IsKindOf__8wxObjectCFP11wxClassInfo
       ;wxClassInfo::FindClass(const char*)
       FindClass__11wxClassInfoFPCc
       ;wxObject::sm_classwxObject
       sm_classwxObject__8wxObject

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

       ;wxClassInfo::InitializeClasses()
       InitializeClasses__11wxClassInfoFv
       ;wxClassInfo::InitializeClasses()
       InitializeClasses__11wxClassInfoFv

-  ;From object file:  ..\common\objstrm.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxObjectOutputStream::AddChild(wxObject*)
-      AddChild__20wxObjectOutputStreamFP8wxObject
-      ;wxObjectOutputStream::SaveObject(wxObject&)
-      SaveObject__20wxObjectOutputStreamFR8wxObject
-      ;wxObjectInputStream::LoadObject()
-      LoadObject__19wxObjectInputStreamFv
-      ;wxObjectOutputStream::WriteObjectDef(wxObjectStreamInfo&)
-      WriteObjectDef__20wxObjectOutputStreamFR18wxObjectStreamInfo
-      ;wxObjectInputStream::ProcessObjectData(wxObjectStreamInfo*)
-      ProcessObjectData__19wxObjectInputStreamFP18wxObjectStreamInfo
-      ;wxObjectOutputStream::wxObjectOutputStream(wxOutputStream&)
-      __ct__20wxObjectOutputStreamFR14wxOutputStream
-      ;wxObjectInputStream::wxObjectInputStream(wxInputStream&)
-      __ct__19wxObjectInputStreamFR13wxInputStream
-      ;wxObjectInputStream::GetChild(int) const
-      GetChild__19wxObjectInputStreamCFi
-      ;wxObjectInputStream::GetParent() const
-      GetParent__19wxObjectInputStreamCFv
-      ;wxObjectOutputStream::ProcessObjectDef(wxObjectStreamInfo*)
-      ProcessObjectDef__20wxObjectOutputStreamFP18wxObjectStreamInfo
-      ;wxObjectInputStream::ProcessObjectDef(wxObjectStreamInfo*)
-      ProcessObjectDef__19wxObjectInputStreamFP18wxObjectStreamInfo
-      ;wxObjectOutputStream::GetObjectName(wxObject*)
-      GetObjectName__20wxObjectOutputStreamFP8wxObject
-      ;wxObjectInputStream::GetChild()
-      GetChild__19wxObjectInputStreamFv
-      ;wxObjectOutputStream::ProcessObjectData(wxObjectStreamInfo*)
-      ProcessObjectData__20wxObjectOutputStreamFP18wxObjectStreamInfo
-      ;wxObjectInputStream::SolveName(const wxString&) const
-      SolveName__19wxObjectInputStreamCFRC8wxString
-      ;wxObjectInputStream::ReadObjectDef(wxObjectStreamInfo*)
-      ReadObjectDef__19wxObjectInputStreamFP18wxObjectStreamInfo
-      ;wxObjectInputStream::RemoveChildren(int)
-      RemoveChildren__19wxObjectInputStreamFi

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


@@ -3813,6 +4496,58 @@ EXPORTS
       __ct__16wxPrintPaperTypeFv
       ;wxPrintPaperDatabase::AddPaperType(wxPaperSize,const wxString&,int,int)
       AddPaperType__20wxPrintPaperDatabaseF11wxPaperSizeRC8wxStringiT3
       __ct__16wxPrintPaperTypeFv
       ;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&)


@@ -3856,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()


@@ -3890,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()


@@ -3918,6 +4657,7 @@ EXPORTS
       sm_eventTableEntries__19wxPreviewControlBar
       ;wxPreviewControlBar::sm_classwxPreviewControlBar
       sm_classwxPreviewControlBar__19wxPreviewControlBar
       sm_eventTableEntries__19wxPreviewControlBar
       ;wxPreviewControlBar::sm_classwxPreviewControlBar
       sm_classwxPreviewControlBar__19wxPreviewControlBar

+      __vft15wxPreviewCanvas14wxScrollHelper

       ;wxPreviewControlBar::~wxPreviewControlBar()
       __dt__19wxPreviewControlBarFv
       ;wxPrintPreviewBase::~wxPrintPreviewBase()
       ;wxPreviewControlBar::~wxPreviewControlBar()
       __dt__19wxPreviewControlBarFv
       ;wxPrintPreviewBase::~wxPrintPreviewBase()


@@ -3946,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&)


@@ -3956,14 +4698,24 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxProcess::SetPipeStreams(wxInputStream*,wxOutputStream*,wxInputStream*)
       SetPipeStreams__9wxProcessFP13wxInputStreamP14wxOutputStreamT1
     ;PUBDEFs (Symbols available from object file):
       ;wxProcess::SetPipeStreams(wxInputStream*,wxOutputStream*,wxInputStream*)
       SetPipeStreams__9wxProcessFP13wxInputStreamP14wxOutputStreamT1

+      ;wxProcess::Exists(int)
+      Exists__9wxProcessFi

       ;wxConstructorForwxProcess()
       wxConstructorForwxProcess__Fv
       ;wxConstructorForwxProcess()
       wxConstructorForwxProcess__Fv

-      ;wxProcess::Init(wxEvtHandler*,int,unsigned long)
-      Init__9wxProcessFP12wxEvtHandleriUl
+      ;wxProcess::Kill(int,wxSignal)
+      Kill__9wxProcessFi8wxSignal

       __vft9wxProcess8wxObject
       __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


@@ -3974,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()


@@ -4031,6 +4785,40 @@ EXPORTS
       jinit_2pass_quantizer__FP12j_decompress
       ;wxQuantize::Quantize(const wxImage&,wxImage&,int,unsigned char**,int)
       Quantize__10wxQuantizeFRC7wxImageR7wxImageiPPUcT3
       jinit_2pass_quantizer__FP12j_decompress
       ;wxQuantize::Quantize(const wxImage&,wxImage&,int,unsigned char**,int)
       Quantize__10wxQuantizeFRC7wxImageR7wxImageiPPUcT3

+  ;From object file:  ..\common\radiocmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxRadioBoxBase::GetNextItem(int,wxDirection,long) const
+      GetNextItem__14wxRadioBoxBaseCFi11wxDirectionl
+  ;From object file:  ..\common\regex.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxRegEx::Replace(wxString*,const wxString&,unsigned int) const
+      Replace__7wxRegExCFP8wxStringRC8wxStringUi
+      ;wxRegEx::~wxRegEx()
+      __dt__7wxRegExFv
+      ;wxRegEx::Compile(const wxString&,int)
+      Compile__7wxRegExFRC8wxStringi
+      ;wxRegExImpl::GetErrorMsg(int) const
+      GetErrorMsg__11wxRegExImplCFi
+      ;wxRegExImpl::Replace(wxString*,const wxString&,unsigned int) const
+      Replace__11wxRegExImplCFP8wxStringRC8wxStringUi
+      ;wxRegExImpl::~wxRegExImpl()
+      __dt__11wxRegExImplFv
+      ;wxRegExImpl::Compile(const wxString&,int)
+      Compile__11wxRegExImplFRC8wxStringi
+      ;wxRegEx::Matches(const char*,int) const
+      Matches__7wxRegExCFPCci
+      ;wxRegEx::GetMatch(const wxString&,unsigned int) const
+      GetMatch__7wxRegExCFRC8wxStringUi
+      ;wxRegEx::GetMatch(unsigned int*,unsigned int*,unsigned int) const
+      GetMatch__7wxRegExCFPUiT1Ui
+      ;wxRegExImpl::wxRegExImpl()
+      __ct__11wxRegExImplFv
+      ;wxRegExImpl::Matches(const char*,int) const
+      Matches__11wxRegExImplCFPCci
+      ;wxRegExImpl::GetMatch(unsigned int*,unsigned int*,unsigned int) const
+      GetMatch__11wxRegExImplCFPUiT1Ui
+      ;wxRegEx::Init()
+      Init__7wxRegExFv

   ;From object file:  ..\common\resource.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxResourceTable::ParseResourceFile(wxInputStream*)
   ;From object file:  ..\common\resource.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxResourceTable::ParseResourceFile(wxInputStream*)


@@ -4159,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&)


@@ -4171,6 +4961,8 @@ EXPORTS
       Service__13wxIPV4addressFUs
       ;wxIPV4address::Service(const wxString&)
       Service__13wxIPV4addressFRC8wxString
       Service__13wxIPV4addressFUs
       ;wxIPV4address::Service(const wxString&)
       Service__13wxIPV4addressFRC8wxString

+      ;wxIPV4address::wxIPV4address(const wxIPV4address&)
+      __ct__13wxIPV4addressFRC13wxIPV4address

       ;wxIPV4address::Hostname(unsigned long)
       Hostname__13wxIPV4addressFUl
       ;wxSockAddress::~wxSockAddress()
       ;wxIPV4address::Hostname(unsigned long)
       Hostname__13wxIPV4addressFUl
       ;wxSockAddress::~wxSockAddress()


@@ -4187,8 +4979,10 @@ EXPORTS
       __ct__13wxIPV4addressFv
       ;wxIPV4address::Service()
       Service__13wxIPV4addressFv
       __ct__13wxIPV4addressFv
       ;wxIPV4address::Service()
       Service__13wxIPV4addressFv

-      ;wxSockAddress::CopyObject(wxObject&) const
-      CopyObject__13wxSockAddressCFR8wxObject
+      ;wxIPV4address::Clone() const
+      Clone__13wxIPV4addressCFv
+      ;wxSockAddress::wxSockAddress(const wxSockAddress&)
+      __ct__13wxSockAddressFRC13wxSockAddress

       __vft13wxIPV4address8wxObject
       ;wxSockAddress::Clear()
       Clear__13wxSockAddressFv
       __vft13wxIPV4address8wxObject
       ;wxSockAddress::Clear()
       Clear__13wxSockAddressFv


@@ -4306,30 +5100,14 @@ EXPORTS
       __vft14wxSocketStream13wxInputStream12wxStreamBase
       ;wxSocketOutputStream::~wxSocketOutputStream()
       __dt__20wxSocketOutputStreamFv
       __vft14wxSocketStream13wxInputStream12wxStreamBase
       ;wxSocketOutputStream::~wxSocketOutputStream()
       __dt__20wxSocketOutputStreamFv

-  ;From object file:  ..\common\serbase.cpp
-    ;PUBDEFs (Symbols available from object file):
-      __vft21wxHashTable_Serialize8wxObject
-      __vft16wxList_Serialize8wxObject
-      ;wxObject_Serialize::sm_classwxObject_Serialize
-      sm_classwxObject_Serialize__18wxObject_Serialize
-      ;wxList_Serialize::sm_classwxList_Serialize
-      sm_classwxList_Serialize__16wxList_Serialize
-      ;wxConstructorForwxList_Serialize()
-      wxConstructorForwxList_Serialize__Fv
-      ;wxList_Serialize::StoreObject(wxObjectOutputStream&)
-      StoreObject__16wxList_SerializeFR20wxObjectOutputStream
-      ;wxHashTable_Serialize::sm_classwxHashTable_Serialize
-      sm_classwxHashTable_Serialize__21wxHashTable_Serialize
-      ;wxHashTable_Serialize::LoadObject(wxObjectInputStream&)
-      LoadObject__21wxHashTable_SerializeFR19wxObjectInputStream
-      ;wxConstructorForwxObject_Serialize()
-      wxConstructorForwxObject_Serialize__Fv
-      ;wxList_Serialize::LoadObject(wxObjectInputStream&)
-      LoadObject__16wxList_SerializeFR19wxObjectInputStream
-      ;wxConstructorForwxHashTable_Serialize()
-      wxConstructorForwxHashTable_Serialize__Fv
-      ;wxHashTable_Serialize::StoreObject(wxObjectOutputStream&)
-      StoreObject__21wxHashTable_SerializeFR20wxObjectOutputStream
+  ;From object file:  ..\common\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*)


@@ -4347,16 +5125,22 @@ EXPORTS
       __ct__16wxStaticBoxSizerFP11wxStaticBoxi
       ;wxGridSizer::wxGridSizer(int,int,int)
       __ct__11wxGridSizerFiN21
       __ct__16wxStaticBoxSizerFP11wxStaticBoxi
       ;wxGridSizer::wxGridSizer(int,int,int)
       __ct__11wxGridSizerFiN21

-      ;wxSizer::DoSetItemMinSize(wxWindow*,int,int)
-      DoSetItemMinSize__7wxSizerFP8wxWindowiT2
+      ;wxSizer::DeleteWindows()
+      DeleteWindows__7wxSizerFv

       ;wxStaticBoxSizer::sm_classwxStaticBoxSizer
       sm_classwxStaticBoxSizer__16wxStaticBoxSizer
       ;wxGridSizer::sm_classwxGridSizer
       sm_classwxGridSizer__11wxGridSizer
       ;wxStaticBoxSizer::sm_classwxStaticBoxSizer
       sm_classwxStaticBoxSizer__16wxStaticBoxSizer
       ;wxGridSizer::sm_classwxGridSizer
       sm_classwxGridSizer__11wxGridSizer

+      __vft7wxSizer21wxClientDataContainer
+      __vft15wxNotebookSizer21wxClientDataContainer
+      ;wxNotebookSizer::RecalcSizes()
+      RecalcSizes__15wxNotebookSizerFv

       ;wxFlexGridSizer::RecalcSizes()
       RecalcSizes__15wxFlexGridSizerFv
       ;wxGridSizer::RecalcSizes()
       RecalcSizes__11wxGridSizerFv
       ;wxFlexGridSizer::RecalcSizes()
       RecalcSizes__15wxFlexGridSizerFv
       ;wxGridSizer::RecalcSizes()
       RecalcSizes__11wxGridSizerFv

+      ;wxSizer::DoSetItemMinSize(wxWindow*,int,int)
+      DoSetItemMinSize__7wxSizerFP8wxWindowiT2

       ;wxStaticBoxSizer::CalcMin()
       CalcMin__16wxStaticBoxSizerFv
       ;wxFlexGridSizer::CalcMin()
       ;wxStaticBoxSizer::CalcMin()
       CalcMin__16wxStaticBoxSizerFv
       ;wxFlexGridSizer::CalcMin()


@@ -4367,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


@@ -4389,6 +5175,8 @@ EXPORTS
       __dt__7wxSizerFv
       ;wxSizer::sm_classwxSizer
       sm_classwxSizer__7wxSizer
       __dt__7wxSizerFv
       ;wxSizer::sm_classwxSizer
       sm_classwxSizer__7wxSizer

+      __vft11wxGridSizer21wxClientDataContainer
+      __vft10wxBoxSizer21wxClientDataContainer

       ;wxSizerItem::~wxSizerItem()
       __dt__11wxSizerItemFv
       ;wxStaticBoxSizer::RecalcSizes()
       ;wxSizerItem::~wxSizerItem()
       __dt__11wxSizerItemFv
       ;wxStaticBoxSizer::RecalcSizes()


@@ -4397,17 +5185,23 @@ EXPORTS
       IsWindow__11wxSizerItemFv
       ;wxSizerItem::GetSize()
       GetSize__11wxSizerItemFv
       IsWindow__11wxSizerItemFv
       ;wxSizerItem::GetSize()
       GetSize__11wxSizerItemFv

+      ;wxNotebookSizer::CalcMin()
+      CalcMin__15wxNotebookSizerFv

       ;wxSizerItem::CalcMin()
       CalcMin__11wxSizerItemFv
       ;wxSizer::Remove(wxWindow*)
       Remove__7wxSizerFP8wxWindow
       ;wxSizer::FitSize(wxWindow*)
       FitSize__7wxSizerFP8wxWindow
       ;wxSizerItem::CalcMin()
       CalcMin__11wxSizerItemFv
       ;wxSizer::Remove(wxWindow*)
       Remove__7wxSizerFP8wxWindow
       ;wxSizer::FitSize(wxWindow*)
       FitSize__7wxSizerFP8wxWindow

+      ;wxSizer::Clear(unsigned long)
+      Clear__7wxSizerFUl

       __vft7wxSizer8wxObject
       __vft7wxSizer8wxObject

+      __vft15wxNotebookSizer8wxObject

       ;wxSizer::Remove(int)
       Remove__7wxSizerFi
       ;wxSizer::GetMinSize()
       GetMinSize__7wxSizerFv
       ;wxSizer::Remove(int)
       Remove__7wxSizerFi
       ;wxSizer::GetMinSize()
       GetMinSize__7wxSizerFv

+      __vft16wxStaticBoxSizer21wxClientDataContainer

       ;wxFlexGridSizer::~wxFlexGridSizer()
       __dt__15wxFlexGridSizerFv
       ;wxSizer::wxSizer()
       ;wxFlexGridSizer::~wxFlexGridSizer()
       __dt__15wxFlexGridSizerFv
       ;wxSizer::wxSizer()


@@ -4426,20 +5220,31 @@ 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
       ;wxSizerItem::IsSizer()
       IsSizer__11wxSizerItemFv

+      ;wxNotebookSizer::sm_classwxNotebookSizer
+      sm_classwxNotebookSizer__15wxNotebookSizer

       ;wxFlexGridSizer::sm_classwxFlexGridSizer
       sm_classwxFlexGridSizer__15wxFlexGridSizer
       ;wxBoxSizer::sm_classwxBoxSizer
       sm_classwxBoxSizer__10wxBoxSizer
       ;wxFlexGridSizer::sm_classwxFlexGridSizer
       sm_classwxFlexGridSizer__15wxFlexGridSizer
       ;wxBoxSizer::sm_classwxBoxSizer
       sm_classwxBoxSizer__10wxBoxSizer

+      __vft15wxFlexGridSizer21wxClientDataContainer

       ;wxSizer::Remove(wxSizer*)
       Remove__7wxSizerFP7wxSizer
       ;wxSizer::DoSetItemMinSize(wxSizer*,int,int)
       DoSetItemMinSize__7wxSizerFP7wxSizeriT2
       ;wxSizer::Remove(wxSizer*)
       Remove__7wxSizerFP7wxSizer
       ;wxSizer::DoSetItemMinSize(wxSizer*,int,int)
       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


@@ -4464,14 +5269,18 @@ EXPORTS
       SetItemBounds__11wxGridSizerFP11wxSizerItemiN32
       ;wxGridSizer::CalcMin()
       CalcMin__11wxGridSizerFv
       SetItemBounds__11wxGridSizerFP11wxSizerItemiN32
       ;wxGridSizer::CalcMin()
       CalcMin__11wxGridSizerFv

+      ;wxSizer::VirtualFitSize(wxWindow*)
+      VirtualFitSize__7wxSizerFP8wxWindow
+      ;wxNotebookSizer::wxNotebookSizer(wxNotebook*)
+      __ct__15wxNotebookSizerFP10wxNotebook
+      ;wxSizer::SetVirtualSizeHints(wxWindow*)
+      SetVirtualSizeHints__7wxSizerFP8wxWindow

   ;From object file:  ..\common\socket.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSocketBase::SetTimeout(long)
       SetTimeout__12wxSocketBaseFl
       ;wxSocketEvent::sm_classwxSocketEvent
       sm_classwxSocketEvent__13wxSocketEvent
   ;From object file:  ..\common\socket.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSocketBase::SetTimeout(long)
       SetTimeout__12wxSocketBaseFl
       ;wxSocketEvent::sm_classwxSocketEvent
       sm_classwxSocketEvent__13wxSocketEvent

-      ;wxSocketEvent::CopyObject(wxObject&) const
-      CopyObject__13wxSocketEventCFR8wxObject

       ;wxSocketClient::Connect(wxSockAddress&,unsigned long)
       Connect__14wxSocketClientFR13wxSockAddressUl
       ;wxSocketServer::AcceptWith(wxSocketBase&,unsigned long)
       ;wxSocketClient::Connect(wxSockAddress&,unsigned long)
       Connect__14wxSocketClientFR13wxSockAddressUl
       ;wxSocketServer::AcceptWith(wxSocketBase&,unsigned long)


@@ -4496,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()


@@ -4506,18 +5317,17 @@ EXPORTS
       sm_classwxSocketClient__14wxSocketClient
       ;wxDatagramSocket::sm_classwxDatagramSocket
       sm_classwxDatagramSocket__16wxDatagramSocket
       sm_classwxSocketClient__14wxSocketClient
       ;wxDatagramSocket::sm_classwxDatagramSocket
       sm_classwxDatagramSocket__16wxDatagramSocket

-      ;wxSocketEvent::wxSocketEvent(int)
-      __ct__13wxSocketEventFi
-      ;wxSocketModule::sm_classwxSocketModule
-      sm_classwxSocketModule__14wxSocketModule

       ;wxSocketBase::wxSocketBase(int,wxSocketType)
       __ct__12wxSocketBaseFi12wxSocketType
       ;wxSocketBase::wxSocketBase(int,wxSocketType)
       __ct__12wxSocketBaseFi12wxSocketType

+      ;wxSocketModule::sm_classwxSocketModule
+      sm_classwxSocketModule__14wxSocketModule

       ;wxSocketBase::SaveState()
       SaveState__12wxSocketBaseFv
       ;wxSocketBase::SaveState()
       SaveState__12wxSocketBaseFv

-      __vft13wxSocketEvent8wxObject

       __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)


@@ -4536,6 +5346,7 @@ EXPORTS
       Destroy__12wxSocketBaseFv
       ;wxSocketBase::Close()
       Close__12wxSocketBaseFv
       Destroy__12wxSocketBaseFv
       ;wxSocketBase::Close()
       Close__12wxSocketBaseFv

+      wx_socket_callback

       __vft14wxSocketClient8wxObject
       ;wxSocketBase::_Write(const void*,unsigned int)
       _Write__12wxSocketBaseFPCvUi
       __vft14wxSocketClient8wxObject
       ;wxSocketBase::_Write(const void*,unsigned int)
       _Write__12wxSocketBaseFPCvUi


@@ -4547,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)


@@ -4575,39 +5390,77 @@ EXPORTS
       __dt__12wxSocketBaseFv
       ;wxSocketBase::GetLocal(wxSockAddress&) const
       GetLocal__12wxSocketBaseCFR13wxSockAddress
       __dt__12wxSocketBaseFv
       ;wxSocketBase::GetLocal(wxSockAddress&) const
       GetLocal__12wxSocketBaseCFR13wxSockAddress

+  ;From object file:  ..\common\statbar.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxStatusBarBase::PopStatusText(int)
+      PopStatusText__15wxStatusBarBaseFi
+      ;wxStatusBarBase::FreeWidths()
+      FreeWidths__15wxStatusBarBaseFv
+      __vft15wxStatusBarBase8wxObject
+      ;wxStatusBarBase::GetStatusStack(int) const
+      GetStatusStack__15wxStatusBarBaseCFi
+      ;wxStatusBarBase::InitWidths()
+      InitWidths__15wxStatusBarBaseFv
+      ;wxStatusBar::sm_classwxStatusBar
+      sm_classwxStatusBar__11wxStatusBar
+      ;wxStatusBarBase::~wxStatusBarBase()
+      __dt__15wxStatusBarBaseFv
+      ;wxStatusBarBase::InitStacks()
+      InitStacks__15wxStatusBarBaseFv
+      ;wxwxListStringNode::DeleteData()
+      DeleteData__18wxwxListStringNodeFv
+      ;wxStatusBarBase::SetStatusWidths(int,const int*)
+      SetStatusWidths__15wxStatusBarBaseFiPCi
+      ;wxStatusBarBase::GetOrCreateStatusStack(int)
+      GetOrCreateStatusStack__15wxStatusBarBaseFi
+      ;wxStatusBarBase::CalculateAbsWidths(int) const
+      CalculateAbsWidths__15wxStatusBarBaseCFi
+      ;wxStatusBarBase::wxStatusBarBase()
+      __ct__15wxStatusBarBaseFv
+      ;wxStatusBarBase::SetFieldsCount(int,const int*)
+      SetFieldsCount__15wxStatusBarBaseFiPCi
+      ;wxStatusBarBase::PushStatusText(const wxString&,int)
+      PushStatusText__15wxStatusBarBaseFRC8wxStringi
+      ;wxStatusBarBase::FreeStacks()
+      FreeStacks__15wxStatusBarBaseFv
+      ;wxConstructorForwxStatusBar()
+      wxConstructorForwxStatusBar__Fv
+      __vft18wxwxListStringNode10wxNodeBase

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

-      __vft12wxMBConvUTF78wxMBConv
+      ;wxCSConv::wxCSConv(const wxCSConv&)
+      __ct__8wxCSConvFRC8wxCSConv

       __vft8wxCSConv8wxMBConv
       __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
       ;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
       ;wxMBConvUTF8::WC2MB(char*,const wchar_t*,unsigned int) const
       WC2MB__12wxMBConvUTF8CFPcPCwUi
       ;wxMBConvUTF8::MB2WC(wchar_t*,const char*,unsigned int) const
       MB2WC__12wxMBConvUTF8CFPwPCcUi

-      __vft12wxMBConvFile8wxMBConv

       __vft12wxMBConvUTF88wxMBConv
       wxConvCurrent
       ;wxMBConv::WC2MB(char*,const wchar_t*,unsigned int) const
       WC2MB__8wxMBConvCFPcPCwUi
       __vft12wxMBConvUTF88wxMBConv
       wxConvCurrent
       ;wxMBConv::WC2MB(char*,const wchar_t*,unsigned int) const
       WC2MB__8wxMBConvCFPcPCwUi

+      ;wxCSConv::Clear()
+      Clear__8wxCSConvFv

       ;wxCSConv::~wxCSConv()
       __dt__8wxCSConvFv
       ;wxCSConv::~wxCSConv()
       __dt__8wxCSConvFv

+      ;wxCSConv::operator=(const wxCSConv&)
+      __as__8wxCSConvFRC8wxCSConv

       wxConvUTF7
       wxConvUTF7

-      wxConvUTF8

       wxConvLocal
       wxConvLocal

-      ;wxMBConvFile::MB2WC(wchar_t*,const char*,unsigned int) const
-      MB2WC__12wxMBConvFileCFPwPCcUi
-      wxConvFile
-      ;wxCSConv::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__8wxCSConvCFPcPCwUi
+      wxConvUTF8

       ;wxMBConvUTF7::WC2MB(char*,const wchar_t*,unsigned int) const
       WC2MB__12wxMBConvUTF7CFPcPCwUi
       ;wxMBConvUTF7::WC2MB(char*,const wchar_t*,unsigned int) const
       WC2MB__12wxMBConvUTF7CFPcPCwUi

-      ;wxMBConvFile::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__12wxMBConvFileCFPcPCwUi
+      ;wxCSConv::WC2MB(char*,const wchar_t*,unsigned int) const
+      WC2MB__8wxCSConvCFPcPCwUi

       ;wxCSConv::MB2WC(wchar_t*,const char*,unsigned int) const
       MB2WC__8wxCSConvCFPwPCcUi
       ;wxCSConv::LoadNow()
       ;wxCSConv::MB2WC(wchar_t*,const char*,unsigned int) const
       MB2WC__8wxCSConvCFPwPCcUi
       ;wxCSConv::LoadNow()


@@ -4617,6 +5470,8 @@ EXPORTS
       wxConvLibc
       ;wxMBConv::MB2WC(wchar_t*,const char*,unsigned int) const
       MB2WC__8wxMBConvCFPwPCcUi
       wxConvLibc
       ;wxMBConv::MB2WC(wchar_t*,const char*,unsigned int) const
       MB2WC__8wxMBConvCFPwPCcUi

+      ;wxConstructorForwxStrConvModule()
+      wxConstructorForwxStrConvModule__Fv

       __vft8wxMBConv
       ;wxMBConv::cWC2MB(const wchar_t*) const
       cWC2MB__8wxMBConvCFPCw
       __vft8wxMBConv
       ;wxMBConv::cWC2MB(const wchar_t*) const
       cWC2MB__8wxMBConvCFPCw


@@ -4624,8 +5479,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxStreamBuffer::SetBufferIO(void*,unsigned int,unsigned long)
       SetBufferIO__14wxStreamBufferFPvUiUl
     ;PUBDEFs (Symbols available from object file):
       ;wxStreamBuffer::SetBufferIO(void*,unsigned int,unsigned long)
       SetBufferIO__14wxStreamBufferFPvUiUl

-      ;wxOutputStream::operator<<(wxObject&)
-      __ls__14wxOutputStreamFR8wxObject

       ;wxStreamBuffer::wxStreamBuffer(wxStreamBase&,wxStreamBuffer::BufMode)
       __ct__14wxStreamBufferFR12wxStreamBaseQ2_14wxStreamBuffer7BufMode
       ;wxEndL(wxOutputStream&)
       ;wxStreamBuffer::wxStreamBuffer(wxStreamBase&,wxStreamBuffer::BufMode)
       __ct__14wxStreamBufferFR12wxStreamBaseQ2_14wxStreamBuffer7BufMode
       ;wxEndL(wxOutputStream&)


@@ -4691,11 +5544,13 @@ EXPORTS
       OnSysSeek__21wxBufferedInputStreamFl10wxSeekMode
       ;wxInputStream::GetWBack(void*,unsigned int)
       GetWBack__13wxInputStreamFPvUi
       OnSysSeek__21wxBufferedInputStreamFl10wxSeekMode
       ;wxInputStream::GetWBack(void*,unsigned int)
       GetWBack__13wxInputStreamFPvUi

-      ;wxFilterOutputStream::~wxFilterOutputStream()
-      __dt__20wxFilterOutputStreamFv
+      ;wxStreamBuffer::SetError(wxStreamError)
+      SetError__14wxStreamBufferF13wxStreamError

       __vft14wxStreamBuffer
       ;wxBufferedOutputStream::~wxBufferedOutputStream()
       __dt__22wxBufferedOutputStreamFv
       __vft14wxStreamBuffer
       ;wxBufferedOutputStream::~wxBufferedOutputStream()
       __dt__22wxBufferedOutputStreamFv

+      ;wxFilterOutputStream::~wxFilterOutputStream()
+      __dt__20wxFilterOutputStreamFv

       ;wxBufferedInputStream::wxBufferedInputStream(wxInputStream&,wxStreamBuffer*)
       __ct__21wxBufferedInputStreamFR13wxInputStreamP14wxStreamBuffer
       ;wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer&)
       ;wxBufferedInputStream::wxBufferedInputStream(wxInputStream&,wxStreamBuffer*)
       __ct__21wxBufferedInputStreamFR13wxInputStreamP14wxStreamBuffer
       ;wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer&)


@@ -4706,8 +5561,6 @@ EXPORTS
       TellO__22wxBufferedOutputStreamCFv
       ;wxInputStream::TellI() const
       TellI__13wxInputStreamCFv
       TellO__22wxBufferedOutputStreamCFv
       ;wxInputStream::TellI() const
       TellI__13wxInputStreamCFv

-      ;wxStreamBuffer::SetError(wxStreamError)
-      SetError__14wxStreamBufferF13wxStreamError

       ;wxInputStream::Peek()
       Peek__13wxInputStreamFv
       ;wxCountingOutputStream::OnSysTell() const
       ;wxInputStream::Peek()
       Peek__13wxInputStreamFv
       ;wxCountingOutputStream::OnSysTell() const


@@ -4730,10 +5583,10 @@ EXPORTS
       Ungetch__13wxInputStreamFPCvUi
       ;wxBufferedInputStream::Read(void*,unsigned int)
       Read__21wxBufferedInputStreamFPvUi
       Ungetch__13wxInputStreamFPCvUi
       ;wxBufferedInputStream::Read(void*,unsigned int)
       Read__21wxBufferedInputStreamFPvUi

-      ;wxFilterInputStream::~wxFilterInputStream()
-      __dt__19wxFilterInputStreamFv

       ;wxStreamBuffer::~wxStreamBuffer()
       __dt__14wxStreamBufferFv
       ;wxStreamBuffer::~wxStreamBuffer()
       __dt__14wxStreamBufferFv

+      ;wxFilterInputStream::~wxFilterInputStream()
+      __dt__19wxFilterInputStreamFv

       ;wxOutputStream::Sync()
       Sync__14wxOutputStreamFv
       ;wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer*)
       ;wxOutputStream::Sync()
       Sync__14wxOutputStreamFv
       ;wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer*)


@@ -4770,8 +5623,6 @@ EXPORTS
       GetInputStream__14wxStreamBufferCFv
       ;wxStreamBuffer::PutChar(char)
       PutChar__14wxStreamBufferFc
       GetInputStream__14wxStreamBufferCFv
       ;wxStreamBuffer::PutChar(char)
       PutChar__14wxStreamBufferFc

-      ;wxInputStream::operator>>(wxObject*&)
-      __rs__13wxInputStreamFRP8wxObject

       ;wxInputStream::Read(wxOutputStream&)
       Read__13wxInputStreamFR14wxOutputStream
       __vft22wxCountingOutputStream12wxStreamBase
       ;wxInputStream::Read(wxOutputStream&)
       Read__13wxInputStreamFR14wxOutputStream
       __vft22wxCountingOutputStream12wxStreamBase


@@ -4791,14 +5642,14 @@ EXPORTS
       GetFromBuffer__14wxStreamBufferFPvUi
       ;wxInputStream::AllocSpaceWBack(unsigned int)
       AllocSpaceWBack__13wxInputStreamFUi
       GetFromBuffer__14wxStreamBufferFPvUi
       ;wxInputStream::AllocSpaceWBack(unsigned int)
       AllocSpaceWBack__13wxInputStreamFUi

-      ;wxStreamBuffer::ResetBuffer()
-      ResetBuffer__14wxStreamBufferFv

       ;wxOutputStream::wxOutputStream()
       __ct__14wxOutputStreamFv
       ;wxBufferedInputStream::TellI() const
       TellI__21wxBufferedInputStreamCFv
       ;wxBufferedOutputStream::Sync()
       Sync__22wxBufferedOutputStreamFv
       ;wxOutputStream::wxOutputStream()
       __ct__14wxOutputStreamFv
       ;wxBufferedInputStream::TellI() const
       TellI__21wxBufferedInputStreamCFv
       ;wxBufferedOutputStream::Sync()
       Sync__22wxBufferedOutputStreamFv

+      ;wxStreamBuffer::ResetBuffer()
+      ResetBuffer__14wxStreamBufferFv

       ;wxStreamBuffer::Read(wxStreamBuffer*)
       Read__14wxStreamBufferFP14wxStreamBuffer
       ;wxBufferedInputStream::Peek()
       ;wxStreamBuffer::Read(wxStreamBuffer*)
       Read__14wxStreamBufferFP14wxStreamBuffer
       ;wxBufferedInputStream::Peek()


@@ -4819,22 +5670,28 @@ EXPORTS
       Trim__8wxStringFUl
       ;wxArrayString::Sort(unsigned long)
       Sort__13wxArrayStringFUl
       Trim__8wxStringFUl
       ;wxArrayString::Sort(unsigned long)
       Sort__13wxArrayStringFUl

-      ;operator+(const wxString&,const wxString&)
-      __pl__FRC8wxStringT1
+      ;wxString::Truncate(unsigned int)
+      Truncate__8wxStringFUi

       ;wxString::rfind(char,unsigned int) const
       rfind__8wxStringCFcUi
       ;wxString::find_last_not_of(char,unsigned int) const
       find_last_not_of__8wxStringCFcUi
       ;wxString::find_first_of(const char*,unsigned int) const
       find_first_of__8wxStringCFPCcUi
       ;wxString::rfind(char,unsigned int) const
       rfind__8wxStringCFcUi
       ;wxString::find_last_not_of(char,unsigned int) const
       find_last_not_of__8wxStringCFcUi
       ;wxString::find_first_of(const char*,unsigned int) const
       find_first_of__8wxStringCFPCcUi

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

       ;wxString::wxString(const void*,const void*)
       __ct__8wxStringFPCvT1
       ;wxString::wxString(const void*,const void*)
       __ct__8wxStringFPCvT1

-      ;wxString::Truncate(unsigned int)
-      Truncate__8wxStringFUi

       ;wxArrayString::Sort(int(*)(const wxString&,const wxString&))
       Sort__13wxArrayStringFPFRC8wxStringT1_i
       ;wxArrayString::Sort(int(*)(const wxString&,const wxString&))
       Sort__13wxArrayStringFPFRC8wxStringT1_i

-      ;wxArrayString::Remove(unsigned int)
-      Remove__13wxArrayStringFUi
+      ;wxArrayString::SetCount(unsigned int)
+      SetCount__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)


@@ -4843,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&)


@@ -4859,8 +5714,6 @@ EXPORTS
       FormatV__8wxStringFPCcPc
       ;wxString::Find(char,unsigned long) const
       Find__8wxStringCFcUl
       FormatV__8wxStringFPCcPc
       ;wxString::Find(char,unsigned long) const
       Find__8wxStringCFcUl

-      ;wxString::ToLong(long*) const
-      ToLong__8wxStringCFPl

       ;wxString::Replace(const char*,const char*,unsigned long)
       Replace__8wxStringFPCcT1Ul
       ;wxString::Mid(unsigned int,unsigned int) const
       ;wxString::Replace(const char*,const char*,unsigned long)
       Replace__8wxStringFPCcT1Ul
       ;wxString::Mid(unsigned int,unsigned int) const


@@ -4879,6 +5732,8 @@ EXPORTS
       Upper__8wxStringCFv
       ;wxString::IsNumber() const
       IsNumber__8wxStringCFv
       Upper__8wxStringCFv
       ;wxString::IsNumber() const
       IsNumber__8wxStringCFv

+      ;wxArrayString::GetStringArray() const
+      GetStringArray__13wxArrayStringCFv

       ;wxArrayString::Empty()
       Empty__13wxArrayStringFv
       ;wxArrayString::Copy(const wxArrayString&)
       ;wxArrayString::Empty()
       Empty__13wxArrayStringFv
       ;wxArrayString::Copy(const wxArrayString&)


@@ -4897,12 +5752,8 @@ EXPORTS
       BeforeFirst__8wxStringCFc
       ;wxString::AfterLast(char) const
       AfterLast__8wxStringCFc
       BeforeFirst__8wxStringCFc
       ;wxString::AfterLast(char) const
       AfterLast__8wxStringCFc

-      ;wxArrayString::wxArrayString(unsigned long)
-      __ct__13wxArrayStringFUl

       ;wxString::find(char,unsigned int) const
       find__8wxStringCFcUi
       ;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)


@@ -4915,16 +5766,19 @@ EXPORTS
       find__8wxStringCFRC8wxStringUi
       ;wxString::UngetWriteBuf(unsigned int)
       UngetWriteBuf__8wxStringFUi
       find__8wxStringCFRC8wxStringUi
       ;wxString::UngetWriteBuf(unsigned int)
       UngetWriteBuf__8wxStringFUi

-      ;wxArrayString::Insert(const wxString&,unsigned int)
-      Insert__13wxArrayStringFRC8wxStringUi
+      ;wxString::ToLong(long*,int) const
+      ToLong__8wxStringCFPli

       ;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
       ;wxString::InitWith(const char*,unsigned int,unsigned int)
       InitWith__8wxStringFPCcUiT2

+      wxStringCompareFunction

       ;wxString::Shrink()
       Shrink__8wxStringFv
       ;wxArrayString::Shrink()
       ;wxString::Shrink()
       Shrink__8wxStringFv
       ;wxArrayString::Shrink()


@@ -4949,10 +5803,6 @@ EXPORTS
       Remove__13wxArrayStringFPCc
       ;wxString::ConcatSelf(int,const char*)
       ConcatSelf__8wxStringFiPCc
       Remove__13wxArrayStringFPCc
       ;wxString::ConcatSelf(int,const char*)
       ConcatSelf__8wxStringFiPCc

-      ;wxArrayString::Add(const wxString&)
-      Add__13wxArrayStringFRC8wxString
-      ;wxString::ToULong(unsigned long*) const
-      ToULong__8wxStringCFPUl

       ;wxString::erase(unsigned int,unsigned int)
       erase__8wxStringFUiT1
       ;wxString::sprintf(const char*,...)
       ;wxString::erase(unsigned int,unsigned int)
       erase__8wxStringFUiT1
       ;wxString::sprintf(const char*,...)


@@ -4979,12 +5829,14 @@ EXPORTS
       __pl__FRC8wxStringc
       ;wxString::Freq(char) const
       Freq__8wxStringCFc
       __pl__FRC8wxStringc
       ;wxString::Freq(char) const
       Freq__8wxStringCFc

+      ;wxArrayString::Init(unsigned long)
+      Init__13wxArrayStringFUl

       ;wxString::ToDouble(double*) const
       ToDouble__8wxStringCFPd
       ;wxString::wxString(char,unsigned int)
       __ct__8wxStringFcUi
       ;wxString::ToDouble(double*) const
       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
       Right__8wxStringCFUi
       ;wxString::CopyBeforeWrite()
       ;wxString::Right(unsigned int) const
       Right__8wxStringCFUi
       ;wxString::CopyBeforeWrite()


@@ -4993,10 +5845,10 @@ EXPORTS
       rfind__8wxStringCFPCcUiT2
       ;wxArrayString::~wxArrayString()
       __dt__13wxArrayStringFv
       rfind__8wxStringCFPCcUiT2
       ;wxArrayString::~wxArrayString()
       __dt__13wxArrayStringFv

-      ;wxString::wxString(const wchar_t*,wxMBConv&)
-      __ct__8wxStringFPCwR8wxMBConv

       ;wxString::Lower() const
       Lower__8wxStringCFv
       ;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()


@@ -5018,6 +5870,7 @@ EXPORTS
       AssignCopy__8wxStringFUiPCc
       ;wxString::AfterFirst(char) const
       AfterFirst__8wxStringCFc
       AssignCopy__8wxStringFUiPCc
       ;wxString::AfterFirst(char) const
       AfterFirst__8wxStringCFc

+  ;From object file:  ..\common\sysopt.cpp

   ;From object file:  ..\common\tbarbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxToolBarBase::EnableTool(int,unsigned long)
   ;From object file:  ..\common\tbarbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxToolBarBase::EnableTool(int,unsigned long)


@@ -5034,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*)


@@ -5054,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&)


@@ -5072,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


@@ -5090,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


@@ -5109,10 +5966,40 @@ EXPORTS
       __dt__13wxToolBarBaseFv
       ;wxToolBarBase::SetToolLongHelp(int,const wxString&)
       SetToolLongHelp__13wxToolBarBaseFiRC8wxString
       __dt__13wxToolBarBaseFv
       ;wxToolBarBase::SetToolLongHelp(int,const wxString&)
       SetToolLongHelp__13wxToolBarBaseFiRC8wxString

+  ;From object file:  ..\common\textbuf.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxTextBuffer::GuessType() const
+      GuessType__12wxTextBufferCFv
+      ;wxTextBuffer::Close()
+      Close__12wxTextBufferFv
+      ;wxTextBuffer::Exists() const
+      Exists__12wxTextBufferCFv
+      __vft12wxTextBuffer
+      ;wxTextBuffer::Write(wxTextFileType,wxMBConv&)
+      Write__12wxTextBufferF14wxTextFileTypeR8wxMBConv
+      ;wxTextBuffer::Open(const wxString&,wxMBConv&)
+      Open__12wxTextBufferFRC8wxStringR8wxMBConv
+      ;wxTextBuffer::Create()
+      Create__12wxTextBufferFv
+      ;wxTextBuffer::Translate(const wxString&,wxTextFileType)
+      Translate__12wxTextBufferFRC8wxString14wxTextFileType
+      ;wxTextBuffer::~wxTextBuffer()
+      __dt__12wxTextBufferFv
+      ;wxTextBuffer::wxTextBuffer(const wxString&)
+      __ct__12wxTextBufferFRC8wxString
+      ;wxTextBuffer::typeDefault
+      typeDefault__12wxTextBuffer
+      ;wxTextBuffer::GetEOL(wxTextFileType)
+      GetEOL__12wxTextBufferF14wxTextFileType
+      ;wxTextBuffer::Open(wxMBConv&)
+      Open__12wxTextBufferFR8wxMBConv
+      ;wxTextBuffer::Create(const wxString&)
+      Create__12wxTextBufferFRC8wxString

   ;From object file:  ..\common\textcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTextCtrlBase::operator<<(double)
       __ls__14wxTextCtrlBaseFd
   ;From object file:  ..\common\textcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTextCtrlBase::operator<<(double)
       __ls__14wxTextCtrlBaseFd

+      wxEVT_COMMAND_TEXT_URL

       ;wxTextCtrlBase::operator<<(float)
       __ls__14wxTextCtrlBaseFf
       ;wxTextCtrlBase::LoadFile(const wxString&)
       ;wxTextCtrlBase::operator<<(float)
       __ls__14wxTextCtrlBaseFf
       ;wxTextCtrlBase::LoadFile(const wxString&)


@@ -5121,53 +6008,61 @@ EXPORTS
       __ls__14wxTextCtrlBaseFRC8wxString
       ;wxTextCtrlBase::operator<<(int)
       __ls__14wxTextCtrlBaseFi
       __ls__14wxTextCtrlBaseFRC8wxString
       ;wxTextCtrlBase::operator<<(int)
       __ls__14wxTextCtrlBaseFi

+      ;wxTextCtrlBase::GetRange(long,long) const
+      GetRange__14wxTextCtrlBaseCFlT1

       ;wxTextCtrlBase::wxTextCtrlBase()
       __ct__14wxTextCtrlBaseFv
       ;wxTextCtrlBase::wxTextCtrlBase()
       __ct__14wxTextCtrlBaseFv

+      wxEVT_COMMAND_TEXT_ENTER

       ;wxTextCtrlBase::SetDefaultStyle(const wxTextAttr&)
       SetDefaultStyle__14wxTextCtrlBaseFRC10wxTextAttr
       ;wxTextCtrlBase::SetDefaultStyle(const wxTextAttr&)
       SetDefaultStyle__14wxTextCtrlBaseFRC10wxTextAttr

+      ;wxTextCtrlBase::CanCut() const
+      CanCut__14wxTextCtrlBaseCFv
+      ;wxTextCtrlBase::CanCopy() const
+      CanCopy__14wxTextCtrlBaseCFv

       ;wxTextCtrlBase::operator<<(long)
       __ls__14wxTextCtrlBaseFl
       ;wxTextCtrlBase::operator<<(long)
       __ls__14wxTextCtrlBaseFl

+      ;wxTextUrlEvent::sm_classwxTextUrlEvent
+      sm_classwxTextUrlEvent__14wxTextUrlEvent

       ;wxTextCtrlBase::~wxTextCtrlBase()
       __dt__14wxTextCtrlBaseFv
       ;wxTextCtrlBase::~wxTextCtrlBase()
       __dt__14wxTextCtrlBaseFv

+      ;wxTextCtrlBase::GetStringSelection() const
+      GetStringSelection__14wxTextCtrlBaseCFv

       ;wxTextCtrlBase::GetDefaultStyle() const
       GetDefaultStyle__14wxTextCtrlBaseCFv
       ;wxTextCtrlBase::GetDefaultStyle() const
       GetDefaultStyle__14wxTextCtrlBaseCFv

+      ;wxTextCtrlBase::CanPaste() const
+      CanPaste__14wxTextCtrlBaseCFv
+      wxEVT_COMMAND_TEXT_UPDATED
+      ;wxConstructorForwxTextUrlEvent()
+      wxConstructorForwxTextUrlEvent__Fv
+      wxEVT_COMMAND_TEXT_MAXLEN
+      ;wxTextCtrlBase::SelectAll()
+      SelectAll__14wxTextCtrlBaseFv

       ;wxTextCtrlBase::SaveFile(const wxString&)
       SaveFile__14wxTextCtrlBaseFRC8wxString
       ;wxTextCtrlBase::operator<<(const char)
       __ls__14wxTextCtrlBaseFCc
       ;wxTextCtrlBase::SaveFile(const wxString&)
       SaveFile__14wxTextCtrlBaseFRC8wxString
       ;wxTextCtrlBase::operator<<(const char)
       __ls__14wxTextCtrlBaseFCc

+      ;wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent&)
+      EmulateKeyPress__14wxTextCtrlBaseFRC10wxKeyEvent

       __vft14wxTextCtrlBase8wxObject
       __vft14wxTextCtrlBase8wxObject

+      ;wxTextAttr::Combine(const wxTextAttr&,const wxTextAttr&,const wxTextCtrlBase*)
+      Combine__10wxTextAttrFRC10wxTextAttrT1PC14wxTextCtrlBase

       ;wxTextCtrlBase::SetStyle(long,long,const wxTextAttr&)
       SetStyle__14wxTextCtrlBaseFlT1RC10wxTextAttr
   ;From object file:  ..\common\textfile.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTextCtrlBase::SetStyle(long,long,const wxTextAttr&)
       SetStyle__14wxTextCtrlBaseFlT1RC10wxTextAttr
   ;From object file:  ..\common\textfile.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxTextFile::GuessType() const
-      GuessType__10wxTextFileCFv
-      ;wxTextFile::Open(const wxString&)
-      Open__10wxTextFileFRC8wxString
-      ;wxTextFile::~wxTextFile()
-      __dt__10wxTextFileFv
-      ;wxTextFile::Open()
-      Open__10wxTextFileFv
-      ;wxTextFile::Write(wxTextFileType)
-      Write__10wxTextFileF14wxTextFileType
-      ;wxTextFile::typeDefault
-      typeDefault__10wxTextFile
-      ;wxTextFile::Exists() const
-      Exists__10wxTextFileCFv
-      ;wxTextFile::Create()
-      Create__10wxTextFileFv
-      ;wxTextFile::GetEOL(wxTextFileType)
-      GetEOL__10wxTextFileF14wxTextFileType
-      ;wxTextFile::Translate(const wxString&,wxTextFileType)
-      Translate__10wxTextFileFRC8wxString14wxTextFileType
-      ;wxTextFile::Read()
-      Read__10wxTextFileFv
-      ;wxTextFile::Close()
-      Close__10wxTextFileFv
+      ;wxTextFile::OnRead(wxMBConv&)
+      OnRead__10wxTextFileFR8wxMBConv
+      __vft10wxTextFile12wxTextBuffer
+      ;wxTextFile::OnOpen(const wxString&,wxTextBuffer::wxTextBufferOpenMode)
+      OnOpen__10wxTextFileFRC8wxStringQ2_12wxTextBuffer20wxTextBufferOpenMode
+      ;wxTextFile::OnExists() const
+      OnExists__10wxTextFileCFv
+      ;wxTextFile::OnClose()
+      OnClose__10wxTextFileFv
+      ;wxTextFile::OnWrite(wxTextFileType,wxMBConv&)
+      OnWrite__10wxTextFileF14wxTextFileTypeR8wxMBConv

       ;wxTextFile::wxTextFile(const wxString&)
       __ct__10wxTextFileFRC8wxString
       ;wxTextFile::wxTextFile(const wxString&)
       __ct__10wxTextFileFRC8wxString

-      ;wxTextFile::Create(const wxString&)
-      Create__10wxTextFileFRC8wxString

   ;From object file:  ..\common\timercmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTimerEvent::sm_classwxTimerEvent
   ;From object file:  ..\common\timercmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTimerEvent::sm_classwxTimerEvent


@@ -5185,6 +6080,8 @@ EXPORTS
       Start__11wxStopWatchFl
       ;wxGetElapsedTime(unsigned long)
       wxGetElapsedTime__FUl
       Start__11wxStopWatchFl
       ;wxGetElapsedTime(unsigned long)
       wxGetElapsedTime__FUl

+      ;wxTimerBase::~wxTimerBase()
+      __dt__11wxTimerBaseFv

       ;wxGetLocalTime()
       wxGetLocalTime__Fv
       ;wxTimerBase::Start(int,unsigned long)
       ;wxGetLocalTime()
       wxGetLocalTime__Fv
       ;wxTimerBase::Start(int,unsigned long)


@@ -5203,12 +6100,47 @@ EXPORTS
       GetNextToken__17wxStringTokenizerFv
       ;wxStringTokenizer::HasMoreTokens() const
       HasMoreTokens__17wxStringTokenizerCFv
       GetNextToken__17wxStringTokenizerFv
       ;wxStringTokenizer::HasMoreTokens() const
       HasMoreTokens__17wxStringTokenizerCFv

+      ;wxStringTokenize(const wxString&,const wxString&,wxStringTokenizerMode)
+      wxStringTokenize__FRC8wxStringT121wxStringTokenizerMode

       ;wxStringTokenizer::wxStringTokenizer(const wxString&,const wxString&,wxStringTokenizerMode)
       __ct__17wxStringTokenizerFRC8wxStringT121wxStringTokenizerMode
       ;wxStringTokenizer::CountTokens() const
       CountTokens__17wxStringTokenizerCFv
       ;wxStringTokenizer::Reinit(const wxString&)
       Reinit__17wxStringTokenizerFRC8wxString
       ;wxStringTokenizer::wxStringTokenizer(const wxString&,const wxString&,wxStringTokenizerMode)
       __ct__17wxStringTokenizerFRC8wxStringT121wxStringTokenizerMode
       ;wxStringTokenizer::CountTokens() const
       CountTokens__17wxStringTokenizerCFv
       ;wxStringTokenizer::Reinit(const wxString&)
       Reinit__17wxStringTokenizerFRC8wxString

+  ;From object file:  ..\common\toplvcmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxTopLevelWindowBase::SendIconizeEvent(unsigned long)
+      SendIconizeEvent__20wxTopLevelWindowBaseFUl
+      ;wxTopLevelWindowBase::sm_eventTable
+      sm_eventTable__20wxTopLevelWindowBase
+      ;wxConstructorForwxTopLevelWindow()
+      wxConstructorForwxTopLevelWindow__Fv
+      ;wxTopLevelWindowBase::DoClientToScreen(int*,int*) const
+      DoClientToScreen__20wxTopLevelWindowBaseCFPiT1
+      ;wxTopLevelWindowBase::wxTopLevelWindowBase()
+      __ct__20wxTopLevelWindowBaseFv
+      ;wxTopLevelWindowBase::GetEventTable() const
+      GetEventTable__20wxTopLevelWindowBaseCFv
+      ;wxTopLevelWindowBase::OnSize(wxSizeEvent&)
+      OnSize__20wxTopLevelWindowBaseFR11wxSizeEvent
+      __vft20wxTopLevelWindowBase8wxObject
+      ;wxTopLevelWindowBase::sm_eventTableEntries
+      sm_eventTableEntries__20wxTopLevelWindowBase
+      ;wxTopLevelWindowBase::~wxTopLevelWindowBase()
+      __dt__20wxTopLevelWindowBaseFv
+      ;wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent&)
+      OnCloseWindow__20wxTopLevelWindowBaseFR12wxCloseEvent
+      ;wxTopLevelWindowBase::IsLastBeforeExit() const
+      IsLastBeforeExit__20wxTopLevelWindowBaseCFv
+      ;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
     ;PUBDEFs (Symbols available from object file):
       wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT
   ;From object file:  ..\common\treebase.cpp
     ;PUBDEFs (Symbols available from object file):
       wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT


@@ -5384,12 +6316,12 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;IntToString(int)
       IntToString__Fi
     ;PUBDEFs (Symbols available from object file):
       ;IntToString(int)
       IntToString__Fi

-      ;wxStripMenuCodes(char*,char*)
-      wxStripMenuCodes__FPcT1

       ;wxDecToHex(int)
       wxDecToHex__Fi
       ;wxNow()
       wxNow__Fv
       ;wxDecToHex(int)
       wxDecToHex__Fi
       ;wxNow()
       wxNow__Fv

+      ;wxGetInstallPrefix()
+      wxGetInstallPrefix__Fv

       ;wxWindowDisabler::~wxWindowDisabler()
       __dt__16wxWindowDisablerFv
       ;copystring(const char*)
       ;wxWindowDisabler::~wxWindowDisabler()
       __dt__16wxWindowDisablerFv
       ;copystring(const char*)


@@ -5404,62 +6336,70 @@ EXPORTS
       wxGetTextFromUser__FRC8wxStringN21P8wxWindowiT5Ul
       ;wxFindWindowAtPoint(wxWindow*,const wxPoint&)
       wxFindWindowAtPoint__FP8wxWindowRC7wxPoint
       wxGetTextFromUser__FRC8wxStringN21P8wxWindowiT5Ul
       ;wxFindWindowAtPoint(wxWindow*,const wxPoint&)
       wxFindWindowAtPoint__FP8wxWindowRC7wxPoint

-      ;StringToDouble(char*,double*)
-      StringToDouble__FPcPd
-      ;StringToInt(char*,int*)
-      StringToInt__FPcPi
+      ;StringToLong(const char*,long*)
+      StringToLong__FPCcPl

       ;wxMessageBox(const wxString&,const wxString&,long,wxWindow*,int,int)
       wxMessageBox__FRC8wxStringT1lP8wxWindowiT5
       ;wxNewId()
       wxNewId__Fv
       ;wxMessageBox(const wxString&,const wxString&,long,wxWindow*,int,int)
       wxMessageBox__FRC8wxStringT1lP8wxWindowiT5
       ;wxNewId()
       wxNewId__Fv

+      ;wxYieldIfNeeded()
+      wxYieldIfNeeded__Fv

       ;wxExecute(const wxString&,wxArrayString&,wxArrayString&)
       wxExecute__FRC8wxStringR13wxArrayStringT2
       ;wxHexToDec(const wxString&)
       wxHexToDec__FRC8wxString
       ;wxExecute(const wxString&,wxArrayString&)
       wxExecute__FRC8wxStringR13wxArrayString
       ;wxExecute(const wxString&,wxArrayString&,wxArrayString&)
       wxExecute__FRC8wxStringR13wxArrayStringT2
       ;wxHexToDec(const wxString&)
       wxHexToDec__FRC8wxString
       ;wxExecute(const wxString&,wxArrayString&)
       wxExecute__FRC8wxStringR13wxArrayString

-      ;StringToLong(char*,long*)
-      StringToLong__FPcPl

       ;LongToString(long)
       LongToString__Fl
       ;LongToString(long)
       LongToString__Fl

+      ;wxGetFontFromUser(wxWindow*,const wxFont&)
+      wxGetFontFromUser__FP8wxWindowRC6wxFont

       ;wxGetCurrentId()
       wxGetCurrentId__Fv
       ;wxGetCurrentId()
       wxGetCurrentId__Fv

+      ;wxYield()
+      wxYield__Fv

       ;wxGetHostName()
       wxGetHostName__Fv
       ;wxGetHomeDir()
       wxGetHomeDir__Fv
       ;wxGetFullHostName()
       wxGetFullHostName__Fv
       ;wxGetHostName()
       wxGetHostName__Fv
       ;wxGetHomeDir()
       wxGetHomeDir__Fv
       ;wxGetFullHostName()
       wxGetFullHostName__Fv

+      ;wxGetDataDir()
+      wxGetDataDir__Fv

       ;wxFindWindowByName(const wxString&,wxWindow*)
       wxFindWindowByName__FRC8wxStringP8wxWindow
       ;wxFindWindowByName(const wxString&,wxWindow*)
       wxFindWindowByName__FRC8wxStringP8wxWindow

+      ;StringToDouble(const char*,double*)
+      StringToDouble__FPCcPd

       ;wxGenericFindWindowAtPoint(const wxPoint&)
       wxGenericFindWindowAtPoint__FRC7wxPoint
       ;wxEnableTopLevelWindows(unsigned long)
       wxEnableTopLevelWindows__FUl
       ;wxGenericFindWindowAtPoint(const wxPoint&)
       wxGenericFindWindowAtPoint__FRC7wxPoint
       ;wxEnableTopLevelWindows(unsigned long)
       wxEnableTopLevelWindows__FUl

+      ;StringToInt(const char*,int*)
+      StringToInt__FPCcPi

       ;wxGetEmailAddress(char*,int)
       wxGetEmailAddress__FPci
       ;wxGetEmailAddress(char*,int)
       wxGetEmailAddress__FPci

+      ;StringToFloat(const char*,float*)
+      StringToFloat__FPCcPf

       ;wxGetUserId()
       wxGetUserId__Fv
       ;DoubleToString(double,const char*)
       DoubleToString__FdPCc
       ;wxStripMenuCodes(const wxString&)
       wxStripMenuCodes__FRC8wxString
       ;wxGetUserId()
       wxGetUserId__Fv
       ;DoubleToString(double,const char*)
       DoubleToString__FdPCc
       ;wxStripMenuCodes(const wxString&)
       wxStripMenuCodes__FRC8wxString

+      ;wxStripMenuCodes(const char*,char*)
+      wxStripMenuCodes__FPCcPc

       ;wxSafeYield(wxWindow*)
       wxSafeYield__FP8wxWindow
       ;wxSafeYield(wxWindow*)
       wxSafeYield__FP8wxWindow

-      ;wxGetAccelFromString(const wxString&)
-      wxGetAccelFromString__FRC8wxString
-      ;StringMatch(char*,char*,unsigned long,unsigned long)
-      StringMatch__FPcT1UlT3
-      ;StringToFloat(char*,float*)
-      StringToFloat__FPcPf
+      ;StringMatch(const char*,const char*,unsigned long,unsigned long)
+      StringMatch__FPCcT1UlT3
+      ;wxFindMenuItemId(wxFrame*,const wxString&,const wxString&)
+      wxFindMenuItemId__FP7wxFrameRC8wxStringT2

       ;wxGetUserName()
       wxGetUserName__Fv
       ;wxGetEmailAddress()
       wxGetEmailAddress__Fv
       ;wxGetColourFromUser(wxWindow*,const wxColour&)
       wxGetColourFromUser__FP8wxWindowRC8wxColour
       ;wxGetUserName()
       wxGetUserName__Fv
       ;wxGetEmailAddress()
       wxGetEmailAddress__Fv
       ;wxGetColourFromUser(wxWindow*,const wxColour&)
       wxGetColourFromUser__FP8wxWindowRC8wxColour

-      ;wxFindMenuItemId(wxFrame*,const wxString&,const wxString&)
-      wxFindMenuItemId__FP7wxFrameRC8wxStringT2

       ;FloatToString(float,const char*)
       FloatToString__FfPCc
       ;wxFindWindowByLabel(const wxString&,wxWindow*)
       ;FloatToString(float,const char*)
       FloatToString__FfPCc
       ;wxFindWindowByLabel(const wxString&,wxWindow*)


@@ -5519,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


@@ -5528,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&)


@@ -5603,6 +6547,8 @@ EXPORTS
       ClearList__9wxVariantFv
       ;wxVariantDataChar::Write(wxString&) const
       Write__17wxVariantDataCharCFR8wxString
       ClearList__9wxVariantFv
       ;wxVariantDataChar::Write(wxString&) const
       Write__17wxVariantDataCharCFR8wxString

+      ;wxVariant::operator!=(const wxArrayString&) const
+      __ne__9wxVariantCFRC13wxArrayString

       ;wxVariant::wxVariant(const wxDate&,const wxString&)
       __ct__9wxVariantFRC6wxDateRC8wxString
       ;wxVariant::operator=(char)
       ;wxVariant::wxVariant(const wxDate&,const wxString&)
       __ct__9wxVariantFRC6wxDateRC8wxString
       ;wxVariant::operator=(char)


@@ -5617,6 +6563,7 @@ EXPORTS
       Read__17wxVariantDataDateFR8wxString
       ;wxVariantDataList::wxVariantDataList(const wxList&)
       __ct__17wxVariantDataListFRC6wxList
       Read__17wxVariantDataDateFR8wxString
       ;wxVariantDataList::wxVariantDataList(const wxList&)
       __ct__17wxVariantDataListFRC6wxList

+      __vft24wxVariantDataArrayString8wxObject

       __vft17wxVariantDataReal8wxObject
       __vft17wxVariantDataList8wxObject
       ;wxVariant::operator!=(const wxStringList&) const
       __vft17wxVariantDataReal8wxObject
       __vft17wxVariantDataList8wxObject
       ;wxVariant::operator!=(const wxStringList&) const


@@ -5641,6 +6588,8 @@ EXPORTS
       Write__17wxVariantDataLongCFR14wxOutputStream
       ;wxVariantDataChar::Write(wxOutputStream&) const
       Write__17wxVariantDataCharCFR14wxOutputStream
       Write__17wxVariantDataLongCFR14wxOutputStream
       ;wxVariantDataChar::Write(wxOutputStream&) const
       Write__17wxVariantDataCharCFR14wxOutputStream

+      ;wxVariantDataArrayString::Read(istream&)
+      Read__24wxVariantDataArrayStringFR7istream

       ;wxVariantDataString::Read(wxInputStream&)
       Read__19wxVariantDataStringFR13wxInputStream
       ;wxVariantDataTime::Read(istream&)
       ;wxVariantDataString::Read(wxInputStream&)
       Read__19wxVariantDataStringFR13wxInputStream
       ;wxVariantDataTime::Read(istream&)


@@ -5651,12 +6600,16 @@ EXPORTS
       Read__17wxVariantDataLongFR13wxInputStream
       ;wxVariantDataLong::Eq(wxVariantData&) const
       Eq__17wxVariantDataLongCFR13wxVariantData
       Read__17wxVariantDataLongFR13wxInputStream
       ;wxVariantDataLong::Eq(wxVariantData&) const
       Eq__17wxVariantDataLongCFR13wxVariantData

+      ;wxVariantDataArrayString::Copy(wxVariantData&)
+      Copy__24wxVariantDataArrayStringFR13wxVariantData

       ;wxVariant::MakeString() const
       MakeString__9wxVariantCFv
       ;wxConstructorForwxVariant()
       wxConstructorForwxVariant__Fv
       ;wxConstructorForwxVariantDataChar()
       wxConstructorForwxVariantDataChar__Fv
       ;wxVariant::MakeString() const
       MakeString__9wxVariantCFv
       ;wxConstructorForwxVariant()
       wxConstructorForwxVariant__Fv
       ;wxConstructorForwxVariantDataChar()
       wxConstructorForwxVariantDataChar__Fv

+      ;wxConstructorForwxVariantDataArrayString()
+      wxConstructorForwxVariantDataArrayString__Fv

       ;wxConstructorForwxTime()
       wxConstructorForwxTime__Fv
       ;wxVariant::operator!=(void*) const
       ;wxConstructorForwxTime()
       wxConstructorForwxTime__Fv
       ;wxVariant::operator!=(void*) const


@@ -5679,12 +6632,16 @@ EXPORTS
       __ct__9wxVariantFUlRC8wxString
       ;wxVariant::wxVariant(const wxList&,const wxString&)
       __ct__9wxVariantFRC6wxListRC8wxString
       __ct__9wxVariantFUlRC8wxString
       ;wxVariant::wxVariant(const wxList&,const wxString&)
       __ct__9wxVariantFRC6wxListRC8wxString

+      ;wxVariant::wxVariant(const wxArrayString&,const wxString&)
+      __ct__9wxVariantFRC13wxArrayStringRC8wxString

       ;wxVariant::wxVariant(const _DATE_STRUCT*,const wxString&)
       __ct__9wxVariantFPC12_DATE_STRUCTRC8wxString
       ;wxVariant::wxVariant(wxVariantData*,const wxString&)
       __ct__9wxVariantFP13wxVariantDataRC8wxString
       ;wxVariant::operator=(const wxString&)
       __as__9wxVariantFRC8wxString
       ;wxVariant::wxVariant(const _DATE_STRUCT*,const wxString&)
       __ct__9wxVariantFPC12_DATE_STRUCTRC8wxString
       ;wxVariant::wxVariant(wxVariantData*,const wxString&)
       __ct__9wxVariantFP13wxVariantDataRC8wxString
       ;wxVariant::operator=(const wxString&)
       __as__9wxVariantFRC8wxString

+      ;wxVariant::operator=(const wxArrayString&)
+      __as__9wxVariantFRC13wxArrayString

       ;wxVariant::operator=(const char*)
       __as__9wxVariantFPCc
       ;wxVariantDataReal::Read(wxString&)
       ;wxVariant::operator=(const char*)
       __as__9wxVariantFPCc
       ;wxVariantDataReal::Read(wxString&)


@@ -5713,6 +6670,8 @@ EXPORTS
       __vc__9wxVariantFUi
       ;wxVariant::operator!=(const wxTime&) const
       __ne__9wxVariantCFRC6wxTime
       __vc__9wxVariantFUi
       ;wxVariant::operator!=(const wxTime&) const
       __ne__9wxVariantCFRC6wxTime

+      ;wxVariantDataArrayString::Write(ostream&) const
+      Write__24wxVariantDataArrayStringCFR7ostream

       ;wxVariantDataDateTime::Write(ostream&) const
       Write__21wxVariantDataDateTimeCFR7ostream
       ;wxVariantDataString::Write(ostream&) const
       ;wxVariantDataDateTime::Write(ostream&) const
       Write__21wxVariantDataDateTimeCFR7ostream
       ;wxVariantDataString::Write(ostream&) const


@@ -5753,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


@@ -5775,6 +6736,8 @@ EXPORTS
       Write__17wxVariantDataDateCFR8wxString
       ;wxVariantDataBool::Write(wxString&) const
       Write__17wxVariantDataBoolCFR8wxString
       Write__17wxVariantDataDateCFR8wxString
       ;wxVariantDataBool::Write(wxString&) const
       Write__17wxVariantDataBoolCFR8wxString

+      ;wxVariantDataArrayString::Read(wxString&)
+      Read__24wxVariantDataArrayStringFR8wxString

       ;wxVariantDataTime::Read(wxString&)
       Read__17wxVariantDataTimeFR8wxString
       ;wxVariantDataChar::Read(wxString&)
       ;wxVariantDataTime::Read(wxString&)
       Read__17wxVariantDataTimeFR8wxString
       ;wxVariantDataChar::Read(wxString&)


@@ -5848,18 +6811,24 @@ EXPORTS
       __dt__9wxVariantFv
       ;wxVariantDataList::~wxVariantDataList()
       __dt__17wxVariantDataListFv
       __dt__9wxVariantFv
       ;wxVariantDataList::~wxVariantDataList()
       __dt__17wxVariantDataListFv

+      ;wxVariant::GetArrayString() const
+      GetArrayString__9wxVariantCFv

       ;wxVariantDataList::Clear()
       Clear__17wxVariantDataListFv
       ;wxVariantDataStringList::Write(wxString&) const
       Write__23wxVariantDataStringListCFR8wxString
       ;wxVariant::operator==(const wxString&) const
       __eq__9wxVariantCFRC8wxString
       ;wxVariantDataList::Clear()
       Clear__17wxVariantDataListFv
       ;wxVariantDataStringList::Write(wxString&) const
       Write__23wxVariantDataStringListCFR8wxString
       ;wxVariant::operator==(const wxString&) const
       __eq__9wxVariantCFRC8wxString

+      ;wxVariant::operator==(const wxArrayString&) const
+      __eq__9wxVariantCFRC13wxArrayString

       ;wxVariant::wxVariant(long,const wxString&)
       __ct__9wxVariantFlRC8wxString
       ;wxVariant::wxVariant(double,const wxString&)
       __ct__9wxVariantFdRC8wxString
       ;wxVariant::wxVariant(const _TIME_STRUCT*,const wxString&)
       __ct__9wxVariantFPC12_TIME_STRUCTRC8wxString
       ;wxVariant::wxVariant(long,const wxString&)
       __ct__9wxVariantFlRC8wxString
       ;wxVariant::wxVariant(double,const wxString&)
       __ct__9wxVariantFdRC8wxString
       ;wxVariant::wxVariant(const _TIME_STRUCT*,const wxString&)
       __ct__9wxVariantFPC12_TIME_STRUCTRC8wxString

+      ;wxVariantDataArrayString::Write(wxString&) const
+      Write__24wxVariantDataArrayStringCFR8wxString

       ;wxVariantDataReal::Write(wxString&) const
       Write__17wxVariantDataRealCFR8wxString
       ;wxVariantDataVoidPtr::Read(wxString&)
       ;wxVariantDataReal::Write(wxString&) const
       Write__17wxVariantDataRealCFR8wxString
       ;wxVariantDataVoidPtr::Read(wxString&)


@@ -5917,6 +6886,8 @@ EXPORTS
       Read__17wxVariantDataListFR7istream
       ;wxVariantDataBool::Read(wxInputStream&)
       Read__17wxVariantDataBoolFR13wxInputStream
       Read__17wxVariantDataListFR7istream
       ;wxVariantDataBool::Read(wxInputStream&)
       Read__17wxVariantDataBoolFR13wxInputStream

+      ;wxVariantDataArrayString::Eq(wxVariantData&) const
+      Eq__24wxVariantDataArrayStringCFR13wxVariantData

       ;wxVariantDataStringList::Eq(wxVariantData&) const
       Eq__23wxVariantDataStringListCFR13wxVariantData
       ;wxVariantDataBool::Eq(wxVariantData&) const
       ;wxVariantDataStringList::Eq(wxVariantData&) const
       Eq__23wxVariantDataStringListCFR13wxVariantData
       ;wxVariantDataBool::Eq(wxVariantData&) const


@@ -5947,6 +6918,8 @@ EXPORTS
       GetStringList__9wxVariantCFv
       ;wxVariantDataList::Write(wxString&) const
       Write__17wxVariantDataListCFR8wxString
       GetStringList__9wxVariantCFv
       ;wxVariantDataList::Write(wxString&) const
       Write__17wxVariantDataListCFR8wxString

+      ;wxVariantDataArrayString::sm_classwxVariantDataArrayString
+      sm_classwxVariantDataArrayString__24wxVariantDataArrayString

       ;wxVariant::operator!=(const wxString&) const
       __ne__9wxVariantCFRC8wxString
       ;wxVariant::operator==(char) const
       ;wxVariant::operator!=(const wxString&) const
       __ne__9wxVariantCFRC8wxString
       ;wxVariant::operator==(char) const


@@ -6080,6 +7053,8 @@ EXPORTS
       SetForegroundColour__12wxWindowBaseFRC8wxColour
       ;wxWindowBase::SetBackgroundColour(const wxColour&)
       SetBackgroundColour__12wxWindowBaseFRC8wxColour
       SetForegroundColour__12wxWindowBaseFRC8wxColour
       ;wxWindowBase::SetBackgroundColour(const wxColour&)
       SetBackgroundColour__12wxWindowBaseFRC8wxColour

+      ;wxWindowBase::RemoveEventHandler(wxEvtHandler*)
+      RemoveEventHandler__12wxWindowBaseFP12wxEvtHandler

       ;wxWindowBase::Destroy()
       Destroy__12wxWindowBaseFv
       ;wxWindowBase::SetConstraints(wxLayoutConstraints*)
       ;wxWindowBase::Destroy()
       Destroy__12wxWindowBaseFv
       ;wxWindowBase::SetConstraints(wxLayoutConstraints*)


@@ -6090,8 +7065,12 @@ EXPORTS
       OnInitDialog__12wxWindowBaseFR17wxInitDialogEvent
       ;wxWindowBase::AddChild(wxWindowBase*)
       AddChild__12wxWindowBaseFP12wxWindowBase
       OnInitDialog__12wxWindowBaseFR17wxInitDialogEvent
       ;wxWindowBase::AddChild(wxWindowBase*)
       AddChild__12wxWindowBaseFP12wxWindowBase

+      ;wxWindowBase::ms_winCaptureNext
+      ms_winCaptureNext__12wxWindowBase

       ;wxWindowBase::ms_lastControlId
       ms_lastControlId__12wxWindowBase
       ;wxWindowBase::ms_lastControlId
       ms_lastControlId__12wxWindowBase

+      ;wxWindowBase::SetPalette(const wxPalette&)
+      SetPalette__12wxWindowBaseFRC9wxPalette

       ;wxWindowBase::RemoveConstraintReference(wxWindowBase*)
       RemoveConstraintReference__12wxWindowBaseFP12wxWindowBase
       ;wxWindowBase::LayoutPhase2(int*)
       ;wxWindowBase::RemoveConstraintReference(wxWindowBase*)
       RemoveConstraintReference__12wxWindowBaseFP12wxWindowBase
       ;wxWindowBase::LayoutPhase2(int*)


@@ -6104,8 +7083,6 @@ EXPORTS
       UpdateWindowUI__12wxWindowBaseFv
       ;wxWindowBase::PushEventHandler(wxEvtHandler*)
       PushEventHandler__12wxWindowBaseFP12wxEvtHandler
       UpdateWindowUI__12wxWindowBaseFv
       ;wxWindowBase::PushEventHandler(wxEvtHandler*)
       PushEventHandler__12wxWindowBaseFP12wxEvtHandler

-      ;wxWindowBase::DoGetClientObject() const
-      DoGetClientObject__12wxWindowBaseCFv

       ;wxWindowBase::DestroyChildren()
       DestroyChildren__12wxWindowBaseFv
       ;wxWindowListNode::DeleteData()
       ;wxWindowBase::DestroyChildren()
       DestroyChildren__12wxWindowBaseFv
       ;wxWindowListNode::DeleteData()


@@ -6118,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


@@ -6127,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)


@@ -6135,16 +7118,18 @@ EXPORTS
       LayoutPhase1__12wxWindowBaseFPi
       ;wxWindowBase::GetPositionConstraint(int*,int*) const
       GetPositionConstraint__12wxWindowBaseCFPiT1
       LayoutPhase1__12wxWindowBaseFPi
       ;wxWindowBase::GetPositionConstraint(int*,int*) const
       GetPositionConstraint__12wxWindowBaseCFPiT1

-      ;wxWindowBase::DoSetClientObject(wxClientData*)
-      DoSetClientObject__12wxWindowBaseFP12wxClientData
+      ;wxWindowBase::AdjustForParentClientOrigin(int&,int&,int) const
+      AdjustForParentClientOrigin__12wxWindowBaseCFRiT1i

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

+      ;wxWindowBase::ReleaseMouse()
+      ReleaseMouse__12wxWindowBaseFv

       ;wxWindowBase::Layout()
       Layout__12wxWindowBaseFv
       ;wxWindowBase::InitDialog()
       InitDialog__12wxWindowBaseFv
       ;wxWindowBase::Layout()
       Layout__12wxWindowBaseFv
       ;wxWindowBase::InitDialog()
       InitDialog__12wxWindowBaseFv

-      ;wxWindowBase::DoSetClientData(void*)
-      DoSetClientData__12wxWindowBaseFPv
+      ;wxWindowBase::CaptureMouse()
+      CaptureMouse__12wxWindowBaseFv

       ;wxWindowBase::FindWindow(const wxString&)
       FindWindow__12wxWindowBaseFRC8wxString
       ;wxWindowBase::SetHelpTextForId(const wxString&)
       ;wxWindowBase::FindWindow(const wxString&)
       FindWindow__12wxWindowBaseFRC8wxString
       ;wxWindowBase::SetHelpTextForId(const wxString&)


@@ -6161,18 +7146,28 @@ 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::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::IsTopLevel() const
       IsTopLevel__12wxWindowBaseCFv

+      ;wxWindowBase::GetUpdateClientRect() const
+      GetUpdateClientRect__12wxWindowBaseCFv

       ;wxWindowBase::GetHelpText() const
       GetHelpText__12wxWindowBaseCFv
       ;wxWindowBase::GetHelpText() const
       GetHelpText__12wxWindowBaseCFv

-      ;wxWindowBase::DoGetClientData() const
-      DoGetClientData__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)


@@ -6189,19 +7184,35 @@ 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::ResetConstraints()
       ResetConstraints__12wxWindowBaseFv

+      ;wxWindowBase::GetDefaultBorder() const
+      GetDefaultBorder__12wxWindowBaseCFv
+      ;wxWindowBase::GetClientAreaOrigin() const
+      GetClientAreaOrigin__12wxWindowBaseCFv
+      ;wxWindowBase::GetBorder() const
+      GetBorder__12wxWindowBaseCFv

       ;wxWindowBase::Fit()
       Fit__12wxWindowBaseFv
       ;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
       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()
       ;wxWC2MB(char*,const wchar_t*,unsigned int)
       wxWC2MB__FPcPCwUi
       ;wxOKlibc()


@@ -6418,8 +7429,8 @@ EXPORTS
       __vft10wxBusyInfo8wxObject
       ;wxInfoFrame::wxInfoFrame(wxWindow*,const wxString&)
       __ct__11wxInfoFrameFP8wxWindowRC8wxString
       __vft10wxBusyInfo8wxObject
       ;wxInfoFrame::wxInfoFrame(wxWindow*,const wxString&)
       __ct__11wxInfoFrameFP8wxWindowRC8wxString

-      ;wxBusyInfo::wxBusyInfo(const wxString&)
-      __ct__10wxBusyInfoFRC8wxString
+      ;wxBusyInfo::wxBusyInfo(const wxString&,wxWindow*)
+      __ct__10wxBusyInfoFRC8wxStringP8wxWindow

   ;From object file:  ..\generic\calctrl.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCalendarCtrl::OnMonthChange(wxCommandEvent&)
   ;From object file:  ..\generic\calctrl.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCalendarCtrl::OnMonthChange(wxCommandEvent&)


@@ -6433,6 +7444,10 @@ EXPORTS
       __ct__15wxCalendarEventFP14wxCalendarCtrli
       ;wxCalendarCtrl::SetHoliday(unsigned int)
       SetHoliday__14wxCalendarCtrlFUi
       __ct__15wxCalendarEventFP14wxCalendarCtrli
       ;wxCalendarCtrl::SetHoliday(unsigned int)
       SetHoliday__14wxCalendarCtrlFUi

+      ;wxCalendarCtrl::SetDateRange(const wxDateTime&,const wxDateTime&)
+      SetDateRange__14wxCalendarCtrlFRC10wxDateTimeT1
+      ;wxCalendarCtrl::ChangeMonth(wxDateTime*) const
+      ChangeMonth__14wxCalendarCtrlCFP10wxDateTime

       ;wxCalendarCtrl::Init()
       Init__14wxCalendarCtrlFv
       ;wxConstructorForwxCalendarCtrl()
       ;wxCalendarCtrl::Init()
       Init__14wxCalendarCtrlFv
       ;wxConstructorForwxCalendarCtrl()


@@ -6454,6 +7469,8 @@ EXPORTS
       OnDClick__14wxCalendarCtrlFR12wxMouseEvent
       ;wxCalendarCtrl::RefreshDate(const wxDateTime&)
       RefreshDate__14wxCalendarCtrlFRC10wxDateTime
       OnDClick__14wxCalendarCtrlFR12wxMouseEvent
       ;wxCalendarCtrl::RefreshDate(const wxDateTime&)
       RefreshDate__14wxCalendarCtrlFRC10wxDateTime

+      ;wxCalendarCtrl::SetUpperDateLimit(const wxDateTime&)
+      SetUpperDateLimit__14wxCalendarCtrlFRC10wxDateTime

       ;wxCalendarCtrl::GetWeek(const wxDateTime&) const
       GetWeek__14wxCalendarCtrlCFRC10wxDateTime
       ;wxCalendarCtrl::DoSetSize(int,int,int,int,int)
       ;wxCalendarCtrl::GetWeek(const wxDateTime&) const
       GetWeek__14wxCalendarCtrlCFRC10wxDateTime
       ;wxCalendarCtrl::DoSetSize(int,int,int,int,int)


@@ -6474,8 +7491,10 @@ EXPORTS
       GetYearControl__14wxCalendarCtrlCFv
       ;wxYearSpinCtrl::GetEventTable() const
       GetEventTable__14wxYearSpinCtrlCFv
       GetYearControl__14wxCalendarCtrlCFv
       ;wxYearSpinCtrl::GetEventTable() const
       GetEventTable__14wxYearSpinCtrlCFv

-      ;wxCalendarCtrl::OnYearChange(wxSpinEvent&)
-      OnYearChange__14wxCalendarCtrlFR11wxSpinEvent
+      ;wxCalendarCtrl::GetDateCoord(const wxDateTime&,int*,int*) const
+      GetDateCoord__14wxCalendarCtrlCFRC10wxDateTimePiT2
+      ;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


@@ -6488,12 +7507,12 @@ EXPORTS
       ;wxCalendarCtrl::sm_classwxCalendarCtrl
       sm_classwxCalendarCtrl__14wxCalendarCtrl
       __vft14wxCalendarCtrl8wxObject
       ;wxCalendarCtrl::sm_classwxCalendarCtrl
       sm_classwxCalendarCtrl__14wxCalendarCtrl
       __vft14wxCalendarCtrl8wxObject

-      ;wxCalendarCtrl::OnPaint(wxPaintEvent&)
-      OnPaint__14wxCalendarCtrlFR12wxPaintEvent
-      ;wxCalendarCtrl::DoGetPosition(int*,int*) const
-      DoGetPosition__14wxCalendarCtrlCFPiT1
+      ;wxCalendarCtrl::IsDateInRange(const wxDateTime&) const
+      IsDateInRange__14wxCalendarCtrlCFRC10wxDateTime

       ;wxCalendarCtrl::HitTest(const wxPoint&,wxDateTime*,wxDateTime::WeekDay*)
       HitTest__14wxCalendarCtrlFRC7wxPointP10wxDateTimePQ2_10wxDateTime7WeekDay
       ;wxCalendarCtrl::HitTest(const wxPoint&,wxDateTime*,wxDateTime::WeekDay*)
       HitTest__14wxCalendarCtrlFRC7wxPointP10wxDateTimePQ2_10wxDateTime7WeekDay

+      ;wxCalendarCtrl::DoGetPosition(int*,int*) const
+      DoGetPosition__14wxCalendarCtrlCFPiT1

       ;wxCalendarCtrl::Enable(unsigned long)
       Enable__14wxCalendarCtrlFUl
       wxEVT_CALENDAR_WEEKDAY_CLICKED
       ;wxCalendarCtrl::Enable(unsigned long)
       Enable__14wxCalendarCtrlFUl
       wxEVT_CALENDAR_WEEKDAY_CLICKED


@@ -6509,20 +7528,29 @@ EXPORTS
       ChangeDay__14wxCalendarCtrlFRC10wxDateTime
       ;wxCalendarCtrl::SetDateAndNotify(const wxDateTime&)
       SetDateAndNotify__14wxCalendarCtrlFRC10wxDateTime
       ChangeDay__14wxCalendarCtrlFRC10wxDateTime
       ;wxCalendarCtrl::SetDateAndNotify(const wxDateTime&)
       SetDateAndNotify__14wxCalendarCtrlFRC10wxDateTime

+      ;wxCalendarCtrl::ChangeYear(wxDateTime*) const
+      ChangeYear__14wxCalendarCtrlCFP10wxDateTime

       ;wxCalendarEvent::Init()
       Init__15wxCalendarEventFv
       ;wxCalendarEvent::Init()
       Init__15wxCalendarEventFv

+      __vft15wxMonthComboBox15wxItemContainer

       ;wxCalendarCtrl::GetStartDate() const
       GetStartDate__14wxCalendarCtrlCFv
       ;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
       ;wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl*)
       __ct__14wxYearSpinCtrlFP14wxCalendarCtrl

+      ;wxCalendarCtrl::HighlightRange(wxPaintDC*,const wxDateTime&,const wxDateTime&,wxPen*,wxBrush*)
+      HighlightRange__14wxCalendarCtrlFP9wxPaintDCRC10wxDateTimeT2P5wxPenP7wxBrush

       ;wxCalendarCtrl::EnableYearChange(unsigned long)
       EnableYearChange__14wxCalendarCtrlFUl
       ;wxCalendarCtrl::SetDate(const wxDateTime&)
       SetDate__14wxCalendarCtrlFRC10wxDateTime
       ;wxCalendarCtrl::EnableYearChange(unsigned long)
       EnableYearChange__14wxCalendarCtrlFUl
       ;wxCalendarCtrl::SetDate(const wxDateTime&)
       SetDate__14wxCalendarCtrlFRC10wxDateTime

+      ;wxCalendarCtrl::SetLowerDateLimit(const wxDateTime&)
+      SetLowerDateLimit__14wxCalendarCtrlFRC10wxDateTime

       ;wxCalendarCtrl::IsDateShown(const wxDateTime&) const
       IsDateShown__14wxCalendarCtrlCFRC10wxDateTime
       ;wxCalendarCtrl::DoMoveWindow(int,int,int,int)
       ;wxCalendarCtrl::IsDateShown(const wxDateTime&) const
       IsDateShown__14wxCalendarCtrlCFRC10wxDateTime
       ;wxCalendarCtrl::DoMoveWindow(int,int,int,int)


@@ -6533,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()


@@ -6674,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


@@ -6720,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


@@ -6741,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)


@@ -6766,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&)


@@ -6788,16 +7787,10 @@ EXPORTS
       DoCrossHair__14wxPostScriptDCFiT1
       ;wxPostScriptDC::DoDrawArc(int,int,int,int,int,int)
       DoDrawArc__14wxPostScriptDCFiN51
       DoCrossHair__14wxPostScriptDCFiT1
       ;wxPostScriptDC::DoDrawArc(int,int,int,int,int,int)
       DoDrawArc__14wxPostScriptDCFiN51

+      ;wxPostScriptDC::DoBlit(int,int,int,int,wxDC*,int,int,int,unsigned long,int,int)
+      DoBlit__14wxPostScriptDCFiN31P4wxDCN31UlN21

       ;wxPostScriptDC::~wxPostScriptDC()
       __dt__14wxPostScriptDCFv
       ;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


@@ -6810,33 +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::SetBrush(const wxBrush&)
       SetBrush__14wxPostScriptDCFRC7wxBrush

-      ;wxPostScriptDC::DoBlit(int,int,int,int,wxDC*,int,int,int,unsigned long)
-      DoBlit__14wxPostScriptDCFiN31P4wxDCN31Ul

       ;wxPostScriptDC::DoGetSize(int*,int*) const
       DoGetSize__14wxPostScriptDCCFPiT1
       ;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


@@ -6845,10 +7821,41 @@ EXPORTS
       DoDrawText__14wxPostScriptDCFRC8wxStringiT2
       ;wxPostScriptDC::ms_PSScaleFactor
       ms_PSScaleFactor__14wxPostScriptDC
       DoDrawText__14wxPostScriptDCFRC8wxStringiT2
       ;wxPostScriptDC::ms_PSScaleFactor
       ms_PSScaleFactor__14wxPostScriptDC

-  ;From object file:  ..\generic\dirctrlg.cpp
+  ;From object file:  ..\generic\dirdlgg.cpp

     ;PUBDEFs (Symbols available from object file):
       ;wxGenericDirDialog::OnOK(wxCommandEvent&)
       OnOK__18wxGenericDirDialogFR14wxCommandEvent
     ;PUBDEFs (Symbols available from object file):
       ;wxGenericDirDialog::OnOK(wxCommandEvent&)
       OnOK__18wxGenericDirDialogFR14wxCommandEvent

+      ;wxGenericDirDialog::OnTreeSelected(wxTreeEvent&)
+      OnTreeSelected__18wxGenericDirDialogFR11wxTreeEvent
+      ;wxGenericDirDialog::OnShowHidden(wxCommandEvent&)
+      OnShowHidden__18wxGenericDirDialogFR14wxCommandEvent
+      ;wxGenericDirDialog::GetEventTable() const
+      GetEventTable__18wxGenericDirDialogCFv
+      ;wxGenericDirDialog::GetPath() const
+      GetPath__18wxGenericDirDialogCFv
+      ;wxGenericDirDialog::OnNew(wxCommandEvent&)
+      OnNew__18wxGenericDirDialogFR14wxCommandEvent
+      __vft18wxGenericDirDialog8wxObject
+      ;wxGenericDirDialog::OnGoHome(wxCommandEvent&)
+      OnGoHome__18wxGenericDirDialogFR14wxCommandEvent
+      ;wxGenericDirDialog::wxGenericDirDialog(wxWindow*,const wxString&,const wxString&,long,const wxPoint&,const wxSize&,const wxString&)
+      __ct__18wxGenericDirDialogFP8wxWindowRC8wxStringT2lRC7wxPointRC6wxSizeT2
+      ;wxGenericDirDialog::ShowModal()
+      ShowModal__18wxGenericDirDialogFv
+      ;wxGenericDirDialog::SetPath(const wxString&)
+      SetPath__18wxGenericDirDialogFRC8wxString
+      ;wxGenericDirDialog::sm_eventTable
+      sm_eventTable__18wxGenericDirDialog
+      ;wxGenericDirDialog::sm_eventTableEntries
+      sm_eventTableEntries__18wxGenericDirDialog
+      ;wxGenericDirDialog::OnCloseWindow(wxCloseEvent&)
+      OnCloseWindow__18wxGenericDirDialogFR12wxCloseEvent
+      ;wxGenericDirDialog::OnTreeKeyDown(wxTreeEvent&)
+      OnTreeKeyDown__18wxGenericDirDialogFR11wxTreeEvent
+  ;From object file:  ..\generic\dirctrlg.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxDirItemData::wxDirItemData(const wxString&,const wxString&,unsigned long)
+      __ct__13wxDirItemDataFRC8wxStringT1Ul

       ;wxGenericDirCtrl::sm_eventTableEntries
       sm_eventTableEntries__16wxGenericDirCtrl
       ;wxGenericDirCtrl::sm_classwxGenericDirCtrl
       ;wxGenericDirCtrl::sm_eventTableEntries
       sm_eventTableEntries__16wxGenericDirCtrl
       ;wxGenericDirCtrl::sm_classwxGenericDirCtrl


@@ -6857,8 +7864,6 @@ EXPORTS
       sm_classwxDirFilterListCtrl__19wxDirFilterListCtrl
       __vft19wxDirFilterListCtrl8wxObject
       __vft16wxGenericDirCtrl8wxObject
       sm_classwxDirFilterListCtrl__19wxDirFilterListCtrl
       __vft19wxDirFilterListCtrl8wxObject
       __vft16wxGenericDirCtrl8wxObject

-      ;wxGenericDirDialog::OnTreeSelected(wxTreeEvent&)
-      OnTreeSelected__18wxGenericDirDialogFR11wxTreeEvent

       ;setdrive(int)
       setdrive__Fi
       ;wxDirFilterListCtrl::Init()
       ;setdrive(int)
       setdrive__Fi
       ;wxDirFilterListCtrl::Init()


@@ -6867,6 +7872,8 @@ EXPORTS
       wxConstructorForwxGenericDirCtrl__Fv
       ;wxGenericDirCtrl::wxGenericDirCtrl()
       __ct__16wxGenericDirCtrlFv
       wxConstructorForwxGenericDirCtrl__Fv
       ;wxGenericDirCtrl::wxGenericDirCtrl()
       __ct__16wxGenericDirCtrlFv

+      ;wxDirItemData::SetNewDirName(const wxString&)
+      SetNewDirName__13wxDirItemDataFRC8wxString

       ;wxGenericDirCtrl::ExpandPath(const wxString&)
       ExpandPath__16wxGenericDirCtrlFRC8wxString
       ;wxDirFilterListCtrl::Create(wxGenericDirCtrl*,const int,const wxPoint&,const wxSize&,long)
       ;wxGenericDirCtrl::ExpandPath(const wxString&)
       ExpandPath__16wxGenericDirCtrlFRC8wxString
       ;wxDirFilterListCtrl::Create(wxGenericDirCtrl*,const int,const wxPoint&,const wxSize&,long)


@@ -6877,10 +7884,12 @@ EXPORTS
       OnSize__16wxGenericDirCtrlFR11wxSizeEvent
       ;wxGenericDirCtrl::OnEndEditItem(wxTreeEvent&)
       OnEndEditItem__16wxGenericDirCtrlFR11wxTreeEvent
       OnSize__16wxGenericDirCtrlFR11wxSizeEvent
       ;wxGenericDirCtrl::OnEndEditItem(wxTreeEvent&)
       OnEndEditItem__16wxGenericDirCtrlFR11wxTreeEvent

+      __vft13wxDirItemData12wxClientData

       ;wxGenericDirCtrl::Init()
       Init__16wxGenericDirCtrlFv
       ;wxGenericDirCtrl::Init()
       Init__16wxGenericDirCtrlFv

-      ;wxDirItemDataEx::~wxDirItemDataEx()
-      __dt__15wxDirItemDataExFv
+      __vft19wxDirFilterListCtrl15wxItemContainer
+      ;wxDirItemData::~wxDirItemData()
+      __dt__13wxDirItemDataFv

       ;wxGenericDirCtrl::ParseFilter(const wxString&,wxArrayString&,wxArrayString&)
       ParseFilter__16wxGenericDirCtrlFRC8wxStringR13wxArrayStringT2
       ;wxDirFilterListCtrl::GetEventTable() const
       ;wxGenericDirCtrl::ParseFilter(const wxString&,wxArrayString&,wxArrayString&)
       ParseFilter__16wxGenericDirCtrlFRC8wxStringR13wxArrayStringT2
       ;wxDirFilterListCtrl::GetEventTable() const


@@ -6895,38 +7904,26 @@ 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::SetupSections()
       SetupSections__16wxGenericDirCtrlFv

-      ;wxGenericDirDialog::GetPath() const
-      GetPath__18wxGenericDirDialogCFv
-      ;wxGenericDirDialog::GetEventTable() const
-      GetEventTable__18wxGenericDirDialogCFv
-      ;wxDirItemDataEx::SetNewDirName(wxString)
-      SetNewDirName__15wxDirItemDataExF8wxString
-      ;wxDirItemDataEx::wxDirItemDataEx(const wxString&,const wxString&,unsigned long)
-      __ct__15wxDirItemDataExFRC8wxStringT1Ul
-      __vft18wxGenericDirDialog8wxObject
-      ;wxGenericDirDialog::OnNew(wxCommandEvent&)
-      OnNew__18wxGenericDirDialogFR14wxCommandEvent
+      ;wxGenericDirCtrl::ShowHidden(unsigned long)
+      ShowHidden__16wxGenericDirCtrlFUl

       ;wxGenericDirCtrl::OnCollapseItem(wxTreeEvent&)
       OnCollapseItem__16wxGenericDirCtrlFR11wxTreeEvent
       ;wxGenericDirCtrl::OnCollapseItem(wxTreeEvent&)
       OnCollapseItem__16wxGenericDirCtrlFR11wxTreeEvent

-      __vft15wxDirItemDataEx12wxClientData
+      ;wxGenericDirCtrl::CollapseDir(wxTreeItemId)
+      CollapseDir__16wxGenericDirCtrlF12wxTreeItemId
+      ;wxDirItemData::HasSubDirs() const
+      HasSubDirs__13wxDirItemDataCFv

       ;wxGenericDirCtrl::GetPath() const
       GetPath__16wxGenericDirCtrlCFv
       ;wxGenericDirCtrl::GetPath() const
       GetPath__16wxGenericDirCtrlCFv

-      ;wxGenericDirDialog::wxGenericDirDialog(wxWindow*,const wxString&,const wxString&,long,const wxPoint&,const wxSize&,const wxString&)
-      __ct__18wxGenericDirDialogFP8wxWindowRC8wxStringT2lRC7wxPointRC6wxSizeT2
-      ;wxGenericDirDialog::ShowModal()
-      ShowModal__18wxGenericDirDialogFv

       ;wxGenericDirCtrl::GetFilePath() const
       GetFilePath__16wxGenericDirCtrlCFv
       ;wxGenericDirCtrl::Create(wxWindow*,const int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&,int,const wxString&)
       Create__16wxGenericDirCtrlFP8wxWindowCiRC8wxStringRC7wxPointRC6wxSizelT3iT3
       ;wxGenericDirCtrl::GetFilePath() const
       GetFilePath__16wxGenericDirCtrlCFv
       ;wxGenericDirCtrl::Create(wxWindow*,const int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&,int,const wxString&)
       Create__16wxGenericDirCtrlFP8wxWindowCiRC8wxStringRC7wxPointRC6wxSizelT3iT3

-      ;wxGenericDirDialog::sm_eventTable
-      sm_eventTable__18wxGenericDirDialog
-      ;wxGenericDirDialog::sm_eventTableEntries
-      sm_eventTableEntries__18wxGenericDirDialog
-      ;wxGenericDirDialog::SetPath(const wxString&)
-      SetPath__18wxGenericDirDialogFRC8wxString
+      ;wxIsDriveAvailable(const wxString&)
+      wxIsDriveAvailable__FRC8wxString

       ;wxGenericDirCtrl::SetPath(const wxString&)
       SetPath__16wxGenericDirCtrlFRC8wxString
       ;wxGenericDirCtrl::SetFilter(const wxString&)
       ;wxGenericDirCtrl::SetPath(const wxString&)
       SetPath__16wxGenericDirCtrlFRC8wxString
       ;wxGenericDirCtrl::SetFilter(const wxString&)


@@ -6935,12 +7932,8 @@ EXPORTS
       OnBeginEditItem__16wxGenericDirCtrlFR11wxTreeEvent
       ;wxDirFilterListCtrl::sm_eventTable
       sm_eventTable__19wxDirFilterListCtrl
       OnBeginEditItem__16wxGenericDirCtrlFR11wxTreeEvent
       ;wxDirFilterListCtrl::sm_eventTable
       sm_eventTable__19wxDirFilterListCtrl

-      ;wxGenericDirDialog::OnTreeKeyDown(wxTreeEvent&)
-      OnTreeKeyDown__18wxGenericDirDialogFR11wxTreeEvent

       ;wxGenericDirCtrl::OnExpandItem(wxTreeEvent&)
       OnExpandItem__16wxGenericDirCtrlFR11wxTreeEvent
       ;wxGenericDirCtrl::OnExpandItem(wxTreeEvent&)
       OnExpandItem__16wxGenericDirCtrlFR11wxTreeEvent

-      ;wxGenericDirDialog::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__18wxGenericDirDialogFR12wxCloseEvent

       ;wxGenericDirCtrl::FindChild(wxTreeItemId,const wxString&,unsigned long&)
       FindChild__16wxGenericDirCtrlF12wxTreeItemIdRC8wxStringRUl
       ;wxGenericDirCtrl::AddSection(const wxString&,const wxString&,int)
       ;wxGenericDirCtrl::FindChild(wxTreeItemId,const wxString&,unsigned long&)
       FindChild__16wxGenericDirCtrlF12wxTreeItemIdRC8wxStringRUl
       ;wxGenericDirCtrl::AddSection(const wxString&,const wxString&,int)


@@ -6951,100 +7944,42 @@ EXPORTS
       __dt__16wxGenericDirCtrlFv
       ;wxGenericDirCtrl::DoResize()
       DoResize__16wxGenericDirCtrlFv
       __dt__16wxGenericDirCtrlFv
       ;wxGenericDirCtrl::DoResize()
       DoResize__16wxGenericDirCtrlFv

+      ;wxDirItemData::HasFiles(const wxString&) const
+      HasFiles__13wxDirItemDataCFRC8wxString

       ;wxGenericDirCtrl::ExtractWildcard(const wxString&,int,wxString&,wxString&)
       ExtractWildcard__16wxGenericDirCtrlFRC8wxStringiR8wxStringT3
   ;From object file:  ..\generic\dragimgg.cpp
       ;wxGenericDirCtrl::ExtractWildcard(const wxString&,int,wxString&,wxString&)
       ExtractWildcard__16wxGenericDirCtrlFRC8wxStringiR8wxStringT3
   ;From object file:  ..\generic\dragimgg.cpp

-    ;PUBDEFs (Symbols available from object file):
-      ;wxGenericDragImage::BeginDrag(const wxPoint&,wxWindow*,unsigned long,wxRect*)
-      BeginDrag__18wxGenericDragImageFRC7wxPointP8wxWindowUlP6wxRect
-      ;wxGenericDragImage::Move(const wxPoint&)
-      Move__18wxGenericDragImageFRC7wxPoint
-      ;wxGenericDragImage::~wxGenericDragImage()
-      __dt__18wxGenericDragImageFv
-      ;wxGenericDragImage::BeginDrag(const wxPoint&,wxWindow*,wxWindow*)
-      BeginDrag__18wxGenericDragImageFRC7wxPointP8wxWindowT2
-      ;wxGenericDragImage::Show()
-      Show__18wxGenericDragImageFv
-      ;wxGenericDragImage::Hide()
-      Hide__18wxGenericDragImageFv
-      ;wxGenericDragImage::Create(const wxTreeCtrl&,wxTreeItemId&)
-      Create__18wxGenericDragImageFRC10wxTreeCtrlR12wxTreeItemId
-      __vft18wxGenericDragImage8wxObject
-      ;wxGenericDragImage::Create(const wxCursor&)
-      Create__18wxGenericDragImageFRC8wxCursor
-      ;wxConstructorForwxGenericDragImage()
-      wxConstructorForwxGenericDragImage__Fv
-      ;wxGenericDragImage::RedrawImage(const wxPoint&,const wxPoint&,unsigned long,unsigned long)
-      RedrawImage__18wxGenericDragImageFRC7wxPointT1UlT3
-      ;wxGenericDragImage::GetImageRect(const wxPoint&) const
-      GetImageRect__18wxGenericDragImageCFRC7wxPoint
-      ;wxGenericDragImage::Init()
-      Init__18wxGenericDragImageFv
-      ;wxGenericDragImage::EndDrag()
-      EndDrag__18wxGenericDragImageFv
-      ;wxGenericDragImage::Create(const wxString&,const wxCursor&)
-      Create__18wxGenericDragImageFRC8wxStringRC8wxCursor
-      ;wxGenericDragImage::Create(const wxBitmap&,const wxCursor&)
-      Create__18wxGenericDragImageFRC8wxBitmapRC8wxCursor
-      ;wxGenericDragImage::UpdateBackingFromWindow(wxDC&,wxMemoryDC&,const wxRect&,const wxRect&) const
-      UpdateBackingFromWindow__18wxGenericDragImageCFR4wxDCR10wxMemoryDCRC6wxRectT3
-      ;wxGenericDragImage::Create(const wxListCtrl&,long)
-      Create__18wxGenericDragImageFRC10wxListCtrll
-      ;wxGenericDragImage::DoDrawImage(wxDC&,const wxPoint&) const
-      DoDrawImage__18wxGenericDragImageCFR4wxDCRC7wxPoint
-      ;wxGenericDragImage::sm_classwxGenericDragImage
-      sm_classwxGenericDragImage__18wxGenericDragImage
-      ;wxGenericDragImage::Create(const wxIcon&,const wxCursor&)
-      Create__18wxGenericDragImageFRC6wxIconRC8wxCursor
-  ;From object file:  ..\generic\fontdlgg.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxGenericFontDialog::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__19wxGenericFontDialogFR12wxCloseEvent
-      ;wxGenericFontDialog::OnPaint(wxPaintEvent&)
-      OnPaint__19wxGenericFontDialogFR12wxPaintEvent
-      ;wxGenericFontDialog::wxGenericFontDialog(wxWindow*,wxFontData*)
-      __ct__19wxGenericFontDialogFP8wxWindowP10wxFontData
-      ;wxFontStyleIntToString(int)
-      wxFontStyleIntToString__Fi
-      ;wxGenericFontDialog::Create(wxWindow*,wxFontData*)
-      Create__19wxGenericFontDialogFP8wxWindowP10wxFontData
-      ;wxGenericFontDialog::GetEventTable() const
-      GetEventTable__19wxGenericFontDialogCFv
-      ;wxGenericFontDialog::~wxGenericFontDialog()
-      __dt__19wxGenericFontDialogFv
-      ;wxFontWeightStringToInt(char*)
-      wxFontWeightStringToInt__FPc
-      __vft19wxGenericFontDialog8wxObject
-      ;wxFontFamilyIntToString(int)
-      wxFontFamilyIntToString__Fi
-      ;wxGenericFontDialog::PaintFontBackground(wxDC&)
-      PaintFontBackground__19wxGenericFontDialogFR4wxDC
-      ;wxGenericFontDialog::OnChangeFont(wxCommandEvent&)
-      OnChangeFont__19wxGenericFontDialogFR14wxCommandEvent
-      ;wxGenericFontDialog::ShowModal()
-      ShowModal__19wxGenericFontDialogFv
-      ;wxGenericFontDialog::sm_eventTableEntries
-      sm_eventTableEntries__19wxGenericFontDialog
-      ;wxGenericFontDialog::sm_eventTable
-      sm_eventTable__19wxGenericFontDialog
-      ;wxFontWeightIntToString(int)
-      wxFontWeightIntToString__Fi
-      ;wxConstructorForwxGenericFontDialog()
-      wxConstructorForwxGenericFontDialog__Fv
-      ;wxFontFamilyStringToInt(char*)
-      wxFontFamilyStringToInt__FPc
-      ;wxFontStyleStringToInt(char*)
-      wxFontStyleStringToInt__FPc
-      ;wxGenericFontDialog::wxGenericFontDialog()
-      __ct__19wxGenericFontDialogFv
-      ;wxGenericFontDialog::InitializeFont()
-      InitializeFont__19wxGenericFontDialogFv
-      ;wxGenericFontDialog::CreateWidgets()
-      CreateWidgets__19wxGenericFontDialogFv
-      ;wxGenericFontDialog::PaintFont(wxDC&)
-      PaintFont__19wxGenericFontDialogFR4wxDC
-      ;wxGenericFontDialog::sm_classwxGenericFontDialog
-      sm_classwxGenericFontDialog__19wxGenericFontDialog
+  ;From object file:  ..\generic\fdrepdlg.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxFindReplaceDialog::OnFind(wxCommandEvent&)
+      OnFind__19wxFindReplaceDialogFR14wxCommandEvent
+      ;wxFindReplaceDialog::OnUpdateFindUI(wxUpdateUIEvent&)
+      OnUpdateFindUI__19wxFindReplaceDialogFR15wxUpdateUIEvent
+      ;wxFindReplaceDialog::OnReplaceAll(wxCommandEvent&)
+      OnReplaceAll__19wxFindReplaceDialogFR14wxCommandEvent
+      ;wxFindReplaceDialog::sm_classwxFindReplaceDialog
+      sm_classwxFindReplaceDialog__19wxFindReplaceDialog
+      ;wxFindReplaceDialog::sm_eventTable
+      sm_eventTable__19wxFindReplaceDialog
+      __vft19wxFindReplaceDialog8wxObject
+      ;wxConstructorForwxGenericFindReplaceDialog()
+      wxConstructorForwxGenericFindReplaceDialog__Fv
+      ;wxFindReplaceDialog::OnCancel(wxCommandEvent&)
+      OnCancel__19wxFindReplaceDialogFR14wxCommandEvent
+      ;wxFindReplaceDialog::Create(wxWindow*,wxFindReplaceData*,const wxString&,int)
+      Create__19wxFindReplaceDialogFP8wxWindowP17wxFindReplaceDataRC8wxStringi
+      ;wxFindReplaceDialog::SendEvent(const int&)
+      SendEvent__19wxFindReplaceDialogFRCi
+      ;wxFindReplaceDialog::Init()
+      Init__19wxFindReplaceDialogFv
+      ;wxFindReplaceDialog::sm_eventTableEntries
+      sm_eventTableEntries__19wxFindReplaceDialog
+      ;wxFindReplaceDialog::OnReplace(wxCommandEvent&)
+      OnReplace__19wxFindReplaceDialogFR14wxCommandEvent
+      ;wxFindReplaceDialog::OnCloseWindow(wxCloseEvent&)
+      OnCloseWindow__19wxFindReplaceDialogFR12wxCloseEvent
+      ;wxFindReplaceDialog::GetEventTable() const
+      GetEventTable__19wxFindReplaceDialogCFv

   ;From object file:  ..\generic\grid.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxGrid::EnableDragColSize(unsigned long)
   ;From object file:  ..\generic\grid.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxGrid::EnableDragColSize(unsigned long)


@@ -7085,8 +8020,8 @@ EXPORTS
       ChangeCursorMode__6wxGridFQ2_6wxGrid10CursorModeP8wxWindowUl
       ;wxGridCellTextEditor::BeginEdit(int,int,wxGrid*)
       BeginEdit__20wxGridCellTextEditorFiT1P6wxGrid
       ChangeCursorMode__6wxGridFQ2_6wxGrid10CursorModeP8wxWindowUl
       ;wxGridCellTextEditor::BeginEdit(int,int,wxGrid*)
       BeginEdit__20wxGridCellTextEditorFiT1P6wxGrid

-      ;wxGridStringArray::RemoveAt(unsigned int)
-      RemoveAt__17wxGridStringArrayFUi
+      ;wxGrid::SetOrCalcRowSizes(unsigned long,unsigned long)
+      SetOrCalcRowSizes__6wxGridFUlT1

       ;wxGridCellFloatRenderer::wxGridCellFloatRenderer(int,int)
       __ct__23wxGridCellFloatRendererFiT1
       ;wxGrid::XToEdgeOfCol(int)
       ;wxGridCellFloatRenderer::wxGridCellFloatRenderer(int,int)
       __ct__23wxGridCellFloatRendererFiT1
       ;wxGrid::XToEdgeOfCol(int)


@@ -7097,16 +8032,10 @@ EXPORTS
       SetRowAttr__22wxGridCellAttrProviderFP14wxGridCellAttri
       ;wxGridTableBase::SetRowAttr(wxGridCellAttr*,int)
       SetRowAttr__15wxGridTableBaseFP14wxGridCellAttri
       SetRowAttr__22wxGridCellAttrProviderFP14wxGridCellAttri
       ;wxGridTableBase::SetRowAttr(wxGridCellAttr*,int)
       SetRowAttr__15wxGridTableBaseFP14wxGridCellAttri

-      ;wxGrid::SetOrCalcRowSizes(unsigned long,unsigned long)
-      SetOrCalcRowSizes__6wxGridFUlT1

       ;wxGrid::SetColMinimalWidth(int,int)
       SetColMinimalWidth__6wxGridFiT1
       ;wxGrid::SetColMinimalWidth(int,int)
       SetColMinimalWidth__6wxGridFiT1

-      ;wxGridCellWithAttrArray::RemoveAt(unsigned int)
-      RemoveAt__23wxGridCellWithAttrArrayFUi

       ;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)


@@ -7127,14 +8056,17 @@ EXPORTS
       DeselectCol__6wxGridFi
       ;wxGridTableBase::AppendCols(unsigned int)
       AppendCols__15wxGridTableBaseFUi
       DeselectCol__6wxGridFi
       ;wxGridTableBase::AppendCols(unsigned int)
       AppendCols__15wxGridTableBaseFUi

-      ;wxGridStringArray::DoEmpty()
-      DoEmpty__17wxGridStringArrayFv
+      ;wxGridCellWithAttrArray::Add(const wxGridCellWithAttr&,unsigned int)
+      Add__23wxGridCellWithAttrArrayFRC18wxGridCellWithAttrUi
+      ;wxGridCellAttr::Init(wxGridCellAttr*)
+      Init__14wxGridCellAttrFP14wxGridCellAttr

       wxEVT_GRID_EDITOR_SHOWN
       ;wxConstructorForwxGridEditorCreatedEvent()
       wxConstructorForwxGridEditorCreatedEvent__Fv
       ;wxConstructorForwxGridCornerLabelWindow()
       wxConstructorForwxGridCornerLabelWindow__Fv
       wxEVT_GRID_EDITOR_SHOWN
       ;wxConstructorForwxGridEditorCreatedEvent()
       wxConstructorForwxGridEditorCreatedEvent__Fv
       ;wxConstructorForwxGridCornerLabelWindow()
       wxConstructorForwxGridCornerLabelWindow__Fv

-      __vft24wxGridCellStringRenderer16wxGridCellWorker
+      __vft22wxGridCellNumberEditor21wxClientDataContainer
+      __vft22wxGridCellBoolRenderer21wxClientDataContainer

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


@@ -7167,6 +8099,8 @@ EXPORTS
       GetDefaultCellBackgroundColour__6wxGridFv
       ;wxGrid::DoGetBestSize() const
       DoGetBestSize__6wxGridCFv
       GetDefaultCellBackgroundColour__6wxGridFv
       ;wxGrid::DoGetBestSize() const
       DoGetBestSize__6wxGridCFv

+      ;wxGridStringArray::DoEmpty()
+      DoEmpty__17wxGridStringArrayFv

       ;wxGridCellTextEditor::Create(wxWindow*,int,wxEvtHandler*)
       Create__20wxGridCellTextEditorFP8wxWindowiP12wxEvtHandler
       ;wxGridCellEditor::Create(wxWindow*,int,wxEvtHandler*)
       ;wxGridCellTextEditor::Create(wxWindow*,int,wxEvtHandler*)
       Create__20wxGridCellTextEditorFP8wxWindowiP12wxEvtHandler
       ;wxGridCellEditor::Create(wxWindow*,int,wxEvtHandler*)


@@ -7269,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)


@@ -7311,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


@@ -7322,9 +8256,12 @@ EXPORTS
       sm_eventTable__26wxGridCellEditorEvtHandler
       ;wxGridCellBoolRenderer::ms_sizeCheckMark
       ms_sizeCheckMark__22wxGridCellBoolRenderer
       sm_eventTable__26wxGridCellEditorEvtHandler
       ;wxGridCellBoolRenderer::ms_sizeCheckMark
       ms_sizeCheckMark__22wxGridCellBoolRenderer

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

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


@@ -7351,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)


@@ -7375,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


@@ -7397,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


@@ -7489,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


@@ -7519,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()


@@ -7703,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()


@@ -7845,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)


@@ -7893,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()


@@ -7983,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&)


@@ -8000,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)


@@ -8018,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)


@@ -8090,107 +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\helpxlp.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxXLPHelpController::DisplayContents()
-      DisplayContents__19wxXLPHelpControllerFv
-      ;wxXLPHelpController::Quit()
-      Quit__19wxXLPHelpControllerFv
-      ;wxXLPHelpController::DisplayBlock(long)
-      DisplayBlock__19wxXLPHelpControllerFl
-      __vft19wxXLPHelpController8wxObject
-      __vft19wxXLPHelpConnection8wxObject
-      ;wxXLPHelpController::DisplaySection(int)
-      DisplaySection__19wxXLPHelpControllerFi
-      ;wxXLPHelpConnection::wxXLPHelpConnection(wxXLPHelpController*)
-      __ct__19wxXLPHelpConnectionFP19wxXLPHelpController
-      ;wxXLPHelpController::OnQuit()
-      OnQuit__19wxXLPHelpControllerFv
-      ;wxXLPHelpClient::sm_classwxXLPHelpClient
-      sm_classwxXLPHelpClient__15wxXLPHelpClient
-      ;wxXLPHelpController::Initialize(const wxString&,int)
-      Initialize__19wxXLPHelpControllerFRC8wxStringi
-      ;wxXLPHelpController::~wxXLPHelpController()
-      __dt__19wxXLPHelpControllerFv
-      ;wxXLPHelpController::Run()
-      Run__19wxXLPHelpControllerFv
-      ;wxXLPHelpConnection::OnDisconnect()
-      OnDisconnect__19wxXLPHelpConnectionFv
-      ;wxXLPHelpController::LoadFile(const wxString&)
-      LoadFile__19wxXLPHelpControllerFRC8wxString
-      ;wxXLPHelpController::KeywordSearch(const wxString&)
-      KeywordSearch__19wxXLPHelpControllerFRC8wxString
-      ;wxXLPHelpController::wxXLPHelpController()
-      __ct__19wxXLPHelpControllerFv
-      ;wxXLPHelpController::sm_classwxXLPHelpController
-      sm_classwxXLPHelpController__19wxXLPHelpController
-      ;wxXLPHelpConnection::sm_classwxXLPHelpConnection
-      sm_classwxXLPHelpConnection__19wxXLPHelpConnection

   ;From object file:  ..\generic\imaglist.cpp
     ;PUBDEFs (Symbols available from object file):
   ;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&)


@@ -8212,6 +9090,8 @@ EXPORTS
       Create__18wxSashLayoutWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxSashLayoutWindow::GetEventTable() const
       GetEventTable__18wxSashLayoutWindowCFv
       Create__18wxSashLayoutWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxSashLayoutWindow::GetEventTable() const
       GetEventTable__18wxSashLayoutWindowCFv

+      ;wxLayoutAlgorithm::LayoutFrame(wxFrame*,wxWindow*)
+      LayoutFrame__17wxLayoutAlgorithmFP7wxFrameP8wxWindow

       ;wxSashLayoutWindow::sm_classwxSashLayoutWindow
       sm_classwxSashLayoutWindow__18wxSashLayoutWindow
       ;wxCalculateLayoutEvent::sm_classwxCalculateLayoutEvent
       ;wxSashLayoutWindow::sm_classwxSashLayoutWindow
       sm_classwxSashLayoutWindow__18wxSashLayoutWindow
       ;wxCalculateLayoutEvent::sm_classwxCalculateLayoutEvent


@@ -8226,138 +9106,165 @@ EXPORTS
       sm_eventTableEntries__18wxSashLayoutWindow
   ;From object file:  ..\generic\listctrl.cpp
     ;PUBDEFs (Symbols available from object file):
       sm_eventTableEntries__18wxSashLayoutWindow
   ;From object file:  ..\generic\listctrl.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxListItemData::SetData(long)
-      SetData__14wxListItemDataFl
+      ;wxSelectionStore::SelectItem(unsigned int,unsigned long)
+      SelectItem__16wxSelectionStoreFUiUl

       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
+      ;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::DeleteItem(long)
       DeleteItem__16wxListMainWindowFl
       ;wxListLineDataArray::wxListLineDataArray(const wxListLineDataArray&)
       __ct__19wxListLineDataArrayFRC19wxListLineDataArray

-      ;wxListEvent::wxListEvent(int,int)
-      __ct__11wxListEventFiT1
+      ;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

-      ;wxListMainWindow::RefreshLine(wxListLineData*)
-      RefreshLine__16wxListMainWindowFP14wxListLineData
+      ;wxGenericListCtrl::SetColumnWidth(int,int)
+      SetColumnWidth__17wxGenericListCtrlFiT1
+      ;wxGenericListCtrl::ScrollList(int,int)
+      ScrollList__17wxGenericListCtrlFiT1
+      ;wxListMainWindow::RefreshLine(unsigned int)
+      RefreshLine__16wxListMainWindowFUi
+      ;wxSelectionStore::OnItemDelete(unsigned int)
+      OnItemDelete__16wxSelectionStoreFUi

       ;wxListMainWindow::InsertColumn(long,wxListItem&)
       InsertColumn__16wxListMainWindowFlR10wxListItem
       ;wxListMainWindow::InsertColumn(long,wxListItem&)
       InsertColumn__16wxListMainWindowFlR10wxListItem

-      ;wxListLineData::GetLabelExtent(int&,int&,int&,int&)
-      GetLabelExtent__14wxListLineDataFRiN31
-      ;wxListMainWindow::GetItem(wxListItem&)
-      GetItem__16wxListMainWindowFR10wxListItem
+      ;wxListMainWindow::GetLineRect(unsigned int) const
+      GetLineRect__16wxListMainWindowCFUi
+      ;wxListMainWindow::GetLineLabelRect(unsigned int) const
+      GetLineLabelRect__16wxListMainWindowCFUi

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

-      ;wxListMainWindow::GetColumn(int,wxListItem&)
-      GetColumn__16wxListMainWindowFiR10wxListItem
-      ;wxListMainWindow::GetColumnWidth(int)
-      GetColumnWidth__16wxListMainWindowFi
-      ;wxListCtrl::FindItem(long,long)
-      FindItem__10wxListCtrlFlT1
-      ;wxListHeaderData::wxListHeaderData()
-      __ct__16wxListHeaderDataFv
-      ;wxConstructorForwxListTextCtrl()
-      wxConstructorForwxListTextCtrl__Fv
+      ;wxListItemData::Init()
+      Init__14wxListItemDataFv

       ;wxListHeaderWindow::~wxListHeaderWindow()
       __dt__18wxListHeaderWindowFv
       ;wxListMainWindow::wxListMainWindow()
       __ct__16wxListMainWindowFv
       ;wxListHeaderWindow::~wxListHeaderWindow()
       __dt__18wxListHeaderWindowFv
       ;wxListMainWindow::wxListMainWindow()
       __ct__16wxListMainWindowFv

-      ;wxListCtrl::SetFocus()
-      SetFocus__10wxListCtrlFv
-      ;wxListCtrl::SetCursor(const wxCursor&)
-      SetCursor__10wxListCtrlFRC8wxCursor
-      ;wxListMainWindow::RealizeChanges()
-      RealizeChanges__16wxListMainWindowFv
-      ;wxListMainWindow::OnRenameAccept()
-      OnRenameAccept__16wxListMainWindowFv
+      ;wxListHeaderData::wxListHeaderData()
+      __ct__16wxListHeaderDataFv
+      ;wxGenericListCtrl::Thaw()
+      Thaw__17wxGenericListCtrlFv
+      ;wxGenericListCtrl::SetTextColour(const wxColour&)
+      SetTextColour__17wxGenericListCtrlFRC8wxColour
+      ;wxGenericListCtrl::SetForegroundColour(const wxColour&)
+      SetForegroundColour__17wxGenericListCtrlFRC8wxColour
+      ;wxListLineData::ReverseHighlight()
+      ReverseHighlight__14wxListLineDataFv

       ;wxListRenameTimer::Notify()
       Notify__17wxListRenameTimerFv
       ;wxListRenameTimer::Notify()
       Notify__17wxListRenameTimerFv

-      ;wxListMainWindow::MoveToFocus()
-      MoveToFocus__16wxListMainWindowFv
-      ;wxListHeaderData::HasText() const
-      HasText__16wxListHeaderDataCFv
+      ;wxListHeaderWindow::Init()
+      Init__18wxListHeaderWindowFv

       ;wxListHeaderData::GetWidth() const
       GetWidth__16wxListHeaderDataCFv
       ;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
+      ;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

-      ;wxListHeaderData::GetText(wxString&)
-      GetText__16wxListHeaderDataFR8wxString
+      ;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_ITEM_DESELECTED
       wxEVT_COMMAND_LIST_ITEM_ACTIVATED

+      wxEVT_COMMAND_LIST_CACHE_HINT
+      ;wxGenericListCtrl::sm_eventTable
+      sm_eventTable__17wxGenericListCtrl

       __vft14wxListTextCtrl8wxObject
       __vft14wxListTextCtrl8wxObject

-      ;wxListMainWindow::SetMode(long)
-      SetMode__16wxListMainWindowFl
-      ;wxListCtrl::SetItemSpacing(int,unsigned long)
-      SetItemSpacing__10wxListCtrlFiUl
-      ;wxListCtrl::SetDropTarget(wxDropTarget*)
-      SetDropTarget__10wxListCtrlFP12wxDropTarget
+      ;wxGenericListCtrl::SetItemCount(long)
+      SetItemCount__17wxGenericListCtrlFl
+      ;wxListMainWindow::SetItemCount(long)
+      SetItemCount__16wxListMainWindowFl
+      ;wxListMainWindow::RecalculatePositions(unsigned long)
+      RecalculatePositions__16wxListMainWindowFUl

       ;wxListMainWindow::OnKeyDown(wxKeyEvent&)
       OnKeyDown__16wxListMainWindowFR10wxKeyEvent
       ;wxListMainWindow::OnKeyDown(wxKeyEvent&)
       OnKeyDown__16wxListMainWindowFR10wxKeyEvent

-      ;wxListEvent::CopyObject(wxObject&) const
-      CopyObject__11wxListEventCFR8wxObject
-      ;wxListLineDataArray::operator=(const wxListLineDataArray&)
-      __as__19wxListLineDataArrayFRC19wxListLineDataArray
+      ;wxListMainWindow::OnArrowChar(unsigned int,const wxKeyEvent&)
+      OnArrowChar__16wxListMainWindowFUiRC10wxKeyEvent
+      ;wxGenericListCtrl::GetItemData(long) const
+      GetItemData__17wxGenericListCtrlCFl
+      ;wxGenericListCtrl::GetItemState(long,long) const
+      GetItemState__17wxGenericListCtrlCFlT1

       wxEVT_COMMAND_LIST_INSERT_ITEM
       wxEVT_COMMAND_LIST_INSERT_ITEM

-      ;wxListLineData::sm_classwxListLineData
-      sm_classwxListLineData__14wxListLineData

       ;wxListItem::sm_classwxListItem
       sm_classwxListItem__10wxListItem
       list_ctrl_compare_func_1
       list_ctrl_compare_data
       ;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

-      ;wxListMainWindow::SelectLine(wxListLineData*)
-      SelectLine__16wxListMainWindowFP14wxListLineData
+      ;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
       ;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
-      ;wxListMainWindow::FocusLine(wxListLineData*)
-      FocusLine__16wxListMainWindowFP14wxListLineData
-      ;wxListMainWindow::DeselectLine(wxListLineData*)
-      DeselectLine__16wxListMainWindowFP14wxListLineData
-      ;wxListItemData::GetX() const
-      GetX__14wxListItemDataCFv
-      ;wxConstructorForwxListHeaderData()
-      wxConstructorForwxListHeaderData__Fv
+      ;wxGenericListCtrl::GetImageList(int) const
+      GetImageList__17wxGenericListCtrlCFi
+      ;wxGenericListCtrl::GetColumn(int,wxListItem&) const
+      GetColumn__17wxGenericListCtrlCFiR10wxListItem
+      ;wxListMainWindow::GetColumn(int,wxListItem&) const
+      GetColumn__16wxListMainWindowCFiR10wxListItem
+      ;wxGenericListCtrl::DeleteColumn(int)
+      DeleteColumn__17wxGenericListCtrlFi
+      ;wxListMainWindow::CacheLineData(unsigned int)
+      CacheLineData__16wxListMainWindowFUi
+      ;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


@@ -8365,72 +9272,88 @@ EXPORTS
       __dt__16wxListMainWindowFv
       ;wxListHeaderWindow::wxListHeaderWindow()
       __ct__18wxListHeaderWindowFv
       __dt__16wxListMainWindowFv
       ;wxListHeaderWindow::wxListHeaderWindow()
       __ct__18wxListHeaderWindowFv

-      ;wxListLineData::SetPosition(wxDC*,int,int,int)
-      SetPosition__14wxListLineDataFP4wxDCiN22
+      ;wxGenericListCtrl::SetItem(long,int,const wxString&,int)
+      SetItem__17wxGenericListCtrlFliRC8wxStringT2
+      ;wxListLineData::SetAttr(wxListItemAttr*)
+      SetAttr__14wxListLineDataFP14wxListItemAttr
+      ;wxListMainWindow::RefreshSelected()
+      RefreshSelected__16wxListMainWindowFv

       ;wxListMainWindow::OnRenameTimer()
       OnRenameTimer__16wxListMainWindowFv
       ;wxListMainWindow::OnRenameTimer()
       OnRenameTimer__16wxListMainWindowFv

-      ;wxListCtrl::GetTextColour() const
-      GetTextColour__10wxListCtrlCFv
+      ;wxListLineDataArray::Insert(const wxListLineData&,unsigned int,unsigned int)
+      Insert__19wxListLineDataArrayFRC14wxListLineDataUiT2
+      ;wxListItemData::GetX() const
+      GetX__14wxListItemDataCFv
+      ;wxGenericListCtrl::GetTextColour() const
+      GetTextColour__17wxGenericListCtrlCFv
+      ;wxListMainWindow::GetHeaderWidth() const
+      GetHeaderWidth__16wxListMainWindowCFv
+      ;wxGenericListCtrl::GetForegroundColour() const
+      GetForegroundColour__17wxGenericListCtrlCFv

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

-      ;wxListMainWindow::GetCountPerPage()
-      GetCountPerPage__16wxListMainWindowFv
-      ;wxListLineData::DoDraw(wxDC*,unsigned long,unsigned long)
-      DoDraw__14wxListLineDataFP4wxDCUlT2
-      ;wxListItem::ClearAttributes()
-      ClearAttributes__10wxListItemFv
-      ;wxListItemData::GetText(wxString&)
-      GetText__14wxListItemDataFR8wxString
+      ;wxGenericListCtrl::DoPopupMenu(wxMenu*,int,int)
+      DoPopupMenu__17wxGenericListCtrlFP6wxMenuiT2
+      ;wxListMainWindow::DoDeleteAllItems()
+      DoDeleteAllItems__16wxListMainWindowFv
+      ;wxwxListItemDataListNode::DeleteData()
+      DeleteData__24wxwxListItemDataListNodeFv
+      ;wxListLineData::wxListLineData(wxListMainWindow*)
+      __ct__14wxListLineDataFP16wxListMainWindow

       wxEVT_COMMAND_LIST_SET_INFO
       wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK
       wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS
       wxEVT_COMMAND_LIST_SET_INFO
       wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK
       wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS

+      wxEVT_COMMAND_LIST_COL_DRAGGING

       ;wxListHeaderWindow::sm_eventTable
       sm_eventTable__18wxListHeaderWindow
       ;wxListHeaderWindow::sm_eventTableEntries
       sm_eventTableEntries__18wxListHeaderWindow
       ;wxListHeaderWindow::sm_eventTable
       sm_eventTable__18wxListHeaderWindow
       ;wxListHeaderWindow::sm_eventTableEntries
       sm_eventTableEntries__18wxListHeaderWindow

+      ;wxListView::sm_classwxListView
+      sm_classwxListView__10wxListView

       ;wxListMainWindow::sm_classwxListMainWindow
       sm_classwxListMainWindow__16wxListMainWindow
       ;wxListRenameTimer::wxListRenameTimer(wxListMainWindow*)
       __ct__17wxListRenameTimerFP16wxListMainWindow
       ;wxListMainWindow::sm_classwxListMainWindow
       sm_classwxListMainWindow__16wxListMainWindow
       ;wxListRenameTimer::wxListRenameTimer(wxListMainWindow*)
       __ct__17wxListRenameTimerFP16wxListMainWindow

-      ;wxListCtrl::InsertColumn(long,const wxString&,int,int)
-      InsertColumn__10wxListCtrlFlRC8wxStringiT3
-      ;wxListMainWindow::GetTextLength(wxString&)
-      GetTextLength__16wxListMainWindowFR8wxString
-      ;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

-      __vft11wxListEvent8wxObject
+      ;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

-      ;wxListMainWindow::SendNotify(wxListLineData*,int,wxPoint)
-      SendNotify__16wxListMainWindowFP14wxListLineDatai7wxPoint
-      ;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

-      ;wxListLineData::IsInRect(int,int,const wxRect&)
-      IsInRect__14wxListLineDataFiT1RC6wxRect
-      ;wxListLineDataArray::Index(const wxListLineData&,unsigned long) const
-      Index__19wxListLineDataArrayCFRC14wxListLineDataUl
-      ;wxListLineData::Hilight(unsigned long)
-      Hilight__14wxListLineDataFUl
-      ;wxListCtrl::FindItem(long,const wxString&,unsigned long)
-      FindItem__10wxListCtrlFlRC8wxStringUl
-      ;wxListLineData::DrawRubberBand(wxDC*,unsigned long)
-      DrawRubberBand__14wxListLineDataFP4wxDCUl
-      ;wxListLineDataArray::RemoveAt(unsigned int)
-      RemoveAt__19wxListLineDataArrayFUi
+      ;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)


@@ -8439,189 +9362,208 @@ EXPORTS
       SetPosition__16wxListHeaderDataFiT1
       ;wxListItemData::SetPosition(int,int)
       SetPosition__14wxListItemDataFiT1
       SetPosition__16wxListHeaderDataFiT1
       ;wxListItemData::SetPosition(int,int)
       SetPosition__14wxListItemDataFiT1

-      ;wxListCtrl::SetItemState(long,long,long)
-      SetItemState__10wxListCtrlFlN21

       ;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
-      ;wxListCtrl::InsertItem(long,int)
-      InsertItem__10wxListCtrlFli
-      ;wxListCtrl::GetItem(wxListItem&) const
-      GetItem__10wxListCtrlCFR10wxListItem
-      ;wxListMainWindow::GetIndexOfLine(const wxListLineData*)
-      GetIndexOfLine__16wxListMainWindowFPC14wxListLineData
-      ;wxListLineData::GetExtent(int&,int&,int&,int&)
-      GetExtent__14wxListLineDataFRiN31
+      ;wxListMainWindow::RefreshLines(unsigned int,unsigned int)
+      RefreshLines__16wxListMainWindowFUiT1
+      ;wxGenericListCtrl::InsertColumn(long,wxListItem&)
+      InsertColumn__17wxGenericListCtrlFlR10wxListItem
+      ;wxGenericListCtrl::HitTest(const wxPoint&,int&)
+      HitTest__17wxGenericListCtrlFRC7wxPointRi
+      ;wxListMainWindow::GetVisibleLinesRange(unsigned int*,unsigned int*)
+      GetVisibleLinesRange__16wxListMainWindowFPUiT1
+      ;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
-      ;wxListCtrl::Arrange(int)
-      Arrange__10wxListCtrlFi
-      ;wxListItemData::HasImage() const
-      HasImage__14wxListItemDataCFv
+      ;wxListMainWindow::ChangeCurrent(unsigned int)
+      ChangeCurrent__16wxListMainWindowFUi
+      ;wxGenericListCtrl::~wxGenericListCtrl()
+      __dt__17wxGenericListCtrlFv

       wxEVT_COMMAND_LIST_KEY_DOWN
       ;wxConstructorForwxListMainWindow()
       wxConstructorForwxListMainWindow__Fv
       wxEVT_COMMAND_LIST_KEY_DOWN
       ;wxConstructorForwxListMainWindow()
       wxConstructorForwxListMainWindow__Fv

-      ;wxConstructorForwxListLineData()
-      wxConstructorForwxListLineData__Fv

       ;wxConstructorForwxListEvent()
       wxConstructorForwxListEvent__Fv
       ;wxConstructorForwxListEvent()
       wxConstructorForwxListEvent__Fv

-      ;wxListCtrl::SetItem(long,int,const wxString&,int)
-      SetItem__10wxListCtrlFliRC8wxStringT2
-      ;wxListLineData::ReverseHilight()
-      ReverseHilight__14wxListLineDataFv
-      ;wxListItemData::HasText() const
-      HasText__14wxListItemDataCFv
+      ;wxConstructorForwxGenericListCtrl()
+      wxConstructorForwxGenericListCtrl__Fv
+      __vft16wxListMainWindow14wxScrollHelper
+      ;wxListMainWindow::UpdateCurrent()
+      UpdateCurrent__16wxListMainWindowFv
+      ;wxListMainWindow::Thaw()
+      Thaw__16wxListMainWindowFv
+      ;wxGenericListCtrl::SetItemBackgroundColour(long,const wxColour&)
+      SetItemBackgroundColour__17wxGenericListCtrlFlRC8wxColour
+      ;wxListMainWindow::SetFocus()
+      SetFocus__16wxListMainWindowFv
+      ;wxListMainWindow::InitScrolling()
+      InitScrolling__16wxListMainWindowFv

       ;wxListItemData::GetY() const
       GetY__14wxListItemDataCFv
       ;wxListItemData::GetY() const
       GetY__14wxListItemDataCFv

-      ;wxListMainWindow::GetSelectedItemCount()
-      GetSelectedItemCount__16wxListMainWindowFv
-      ;wxListCtrl::GetNextItem(long,int,int) const
-      GetNextItem__10wxListCtrlCFliT2
-      ;wxListMainWindow::GetItemCount()
-      GetItemCount__16wxListMainWindowFv
+      ;wxGenericListCtrl::GetSelectedItemCount() const
+      GetSelectedItemCount__17wxGenericListCtrlCFv
+      ;wxListMainWindow::GetLineHeight() const
+      GetLineHeight__16wxListMainWindowCFv
+      ;wxGenericListCtrl::GetItemCount() const
+      GetItemCount__17wxGenericListCtrlCFv
+      ;wxListMainWindow::GetItemCount() const
+      GetItemCount__16wxListMainWindowCFv

       ;wxListItemData::GetHeight() const
       GetHeight__14wxListItemDataCFv
       ;wxListHeaderData::GetFormat() const
       GetFormat__16wxListHeaderDataCFv
       ;wxListItemData::GetHeight() const
       GetHeight__14wxListItemDataCFv
       ;wxListHeaderData::GetFormat() const
       GetFormat__16wxListHeaderDataCFv

-      ;wxListCtrl::GetEventTable() const
-      GetEventTable__10wxListCtrlCFv
-      ;wxListCtrl::GetCountPerPage() const
-      GetCountPerPage__10wxListCtrlCFv
-      ;wxListMainWindow::GetColumnCount()
-      GetColumnCount__16wxListMainWindowFv
-      ;wxListCtrl::GetBackgroundColour() const
-      GetBackgroundColour__10wxListCtrlCFv
-      ;wxListLineData::AssignRect(wxRect&,int,int,int,int)
-      AssignRect__14wxListLineDataFR6wxRectiN32
-      ;wxListLineData::SetText(int,const wxString)
-      SetText__14wxListLineDataFiC8wxString
+      ;wxListLineData::GetAttr() const
+      GetAttr__14wxListLineDataCFv
+      ;wxGenericListCtrl::Freeze()
+      Freeze__17wxGenericListCtrlFv
+      ;wxListMainWindow::Freeze()
+      Freeze__16wxListMainWindowFv
+      ;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
       ;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

-      ;wxListMainWindow::EditLabel(long)
-      EditLabel__16wxListMainWindowFl
-      ;wxListCtrl::sm_eventTable
-      sm_eventTable__10wxListCtrl
+      ;wxGenericListCtrl::EnsureVisible(long)
+      EnsureVisible__17wxGenericListCtrlFl
+      ;wxGenericListCtrl::sm_classwxGenericListCtrl
+      sm_classwxGenericListCtrl__17wxGenericListCtrl
+      __vft17wxGenericListCtrl8wxObject

       __vft16wxListMainWindow8wxObject
       __vft16wxListMainWindow8wxObject

-      ;wxListLineData::wxListLineData(wxListMainWindow*,int,wxBrush*)
-      __ct__14wxListLineDataFP16wxListMainWindowiP7wxBrush
-      ;wxListCtrl::SetFont(const wxFont&)
-      SetFont__10wxListCtrlFRC6wxFont
-      ;wxListMainWindow::OnSize(wxSizeEvent&)
-      OnSize__16wxListMainWindowFR11wxSizeEvent
+      ;wxListLineData::SetAttributes(wxDC*,const wxListItemAttr*,unsigned long)
+      SetAttributes__14wxListLineDataFP4wxDCPC14wxListItemAttrUl
+      ;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

-      ;wxListMainWindow::OnArrowChar(wxListLineData*,unsigned long)
-      OnArrowChar__16wxListMainWindowFP14wxListLineDataUl
-      ;wxListLineData::GetRect(wxRect&)
-      GetRect__14wxListLineDataFR6wxRect
+      ;wxGenericListCtrl::OnGetItemImage(long) const
+      OnGetItemImage__17wxGenericListCtrlCFl
+      ;wxListLineData::Highlight(unsigned long)
+      Highlight__14wxListLineDataFUl
+      ;wxListMainWindow::HighlightLines(unsigned int,unsigned int,unsigned long)
+      HighlightLines__16wxListMainWindowFUiT1Ul
+      ;wxGenericListCtrl::GetItemSpacing(unsigned long) const
+      GetItemSpacing__17wxGenericListCtrlCFUl

       ;wxListMainWindow::GetItemSpacing(unsigned long)
       GetItemSpacing__16wxListMainWindowFUl
       ;wxListMainWindow::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::FindItem(long,const wxString&,unsigned long)
       FindItem__16wxListMainWindowFlRC8wxStringUl

-      ;wxListCtrl::DeleteItem(long)
-      DeleteItem__10wxListCtrlFl
-      ;wxListLineData::AssignRect(wxRect&,const wxRect&)
-      AssignRect__14wxListLineDataFR6wxRectRC6wxRect
-      ;wxListLineDataArray::DoCopy(const wxListLineDataArray&)
-      DoCopy__19wxListLineDataArrayFRC19wxListLineDataArray
+      ;wxListMainWindow::EditLabel(long)
+      EditLabel__16wxListMainWindowFl
+      ;wxGenericListCtrl::SetItemState(long,long,long)
+      SetItemState__17wxGenericListCtrlFlN21

       wxEVT_COMMAND_LIST_DELETE_ITEM
       wxEVT_COMMAND_LIST_DELETE_ITEM

-      ;wxListMainWindow::UnfocusLine(wxListLineData*)
-      UnfocusLine__16wxListMainWindowFP14wxListLineData
-      ;wxListItemData::SetImage(int)
-      SetImage__14wxListItemDataFi
-      ;wxListCtrl::SetColumn(int,wxListItem&)
-      SetColumn__10wxListCtrlFiR10wxListItem
+      ;wxGenericListCtrl::SetItemData(long,long)
+      SetItemData__17wxGenericListCtrlFlT1
+      ;wxListMainWindow::RefreshAfter(unsigned int)
+      RefreshAfter__16wxListMainWindowFUi
+      ;wxGenericListCtrl::InsertItem(long,const wxString&,int)
+      InsertItem__17wxGenericListCtrlFlRC8wxStringi

       ;wxListLineData::InitItems(int)
       InitItems__14wxListLineDataFi
       ;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

-      ;wxListCtrl::GetItemState(long,long) const
-      GetItemState__10wxListCtrlCFlT1
-      ;wxListLineData::GetImage(int)
-      GetImage__14wxListLineDataFi
-      ;wxListCtrl::GetImageList(int) const
-      GetImageList__10wxListCtrlCFi
-      ;wxListCtrl::GetColumn(int,wxListItem&) const
-      GetColumn__10wxListCtrlCFiR10wxListItem
+      ;wxGenericListCtrl::GetItemRect(long,wxRect&,int) const
+      GetItemRect__17wxGenericListCtrlCFlR6wxRecti
+      ;wxListLineData::GetImage(int) const
+      GetImage__14wxListLineDataCFi
+      ;wxGenericListCtrl::FindItem(long,long)
+      FindItem__17wxGenericListCtrlFlT1
+      ;wxListLineDataArray::DoCopy(const wxListLineDataArray&)
+      DoCopy__19wxListLineDataArrayFRC19wxListLineDataArray

       ;wxListMainWindow::DeleteColumn(int)
       DeleteColumn__16wxListMainWindowFi
       ;wxListLineData::CalculateSize(wxDC*,int)
       CalculateSize__14wxListLineDataFP4wxDCi
       ;wxListMainWindow::DeleteColumn(int)
       DeleteColumn__16wxListMainWindowFi
       ;wxListLineData::CalculateSize(wxDC*,int)
       CalculateSize__14wxListLineDataFP4wxDCi

-      ;wxListLineDataArray::~wxListLineDataArray()
-      __dt__19wxListLineDataArrayFv
+      ;wxGenericListCtrl::Arrange(int)
+      Arrange__17wxGenericListCtrlFi
+      ;wxGenericListCtrl::wxGenericListCtrl()
+      __ct__17wxGenericListCtrlFv
+      wxSizeTCmpFn

       ;wxConstructorForwxListItem()
       wxConstructorForwxListItem__Fv
       ;wxConstructorForwxListItem()
       wxConstructorForwxListItem__Fv

-      ;wxListCtrl::~wxListCtrl()
-      __dt__10wxListCtrlFv
-      ;wxListItem::wxListItem()
-      __ct__10wxListItemFv
-      ;wxListCtrl::SetItemImage(long,int,int)
-      SetItemImage__10wxListCtrlFliT2
-      ;wxListCtrl::SetForegroundColour(const wxColour&)
-      SetForegroundColour__10wxListCtrlFRC8wxColour
-      ;wxListLineData::IsHilighted()
-      IsHilighted__14wxListLineDataFv
-      ;wxListCtrl::GetSelectedItemCount() const
-      GetSelectedItemCount__10wxListCtrlCFv
-      ;wxListMainWindow::GetMode() const
-      GetMode__16wxListMainWindowCFv
-      ;wxListMainWindow::GetImageSize(int,int&,int&)
-      GetImageSize__16wxListMainWindowFiRiT2
+      ;wxListLineDataArray::~wxListLineDataArray()
+      __dt__19wxListLineDataArrayFv
+      ;wxListItemData::~wxListItemData()
+      __dt__14wxListItemDataFv
+      ;wxGenericListCtrl::SetItemTextColour(long,const wxColour&)
+      SetItemTextColour__17wxGenericListCtrlFlRC8wxColour
+      ;wxGenericListCtrl::SetCursor(const wxCursor&)
+      SetCursor__17wxGenericListCtrlFRC8wxCursor
+      ;wxListMainWindow::Init()
+      Init__16wxListMainWindowFv
+      ;wxListHeaderData::Init()
+      Init__16wxListHeaderDataFv
+      ;wxListMainWindow::GetSelectedItemCount() const
+      GetSelectedItemCount__16wxListMainWindowCFv

       ;wxListHeaderWindow::GetEventTable() const
       GetEventTable__18wxListHeaderWindowCFv
       ;wxListHeaderWindow::GetEventTable() const
       GetEventTable__18wxListHeaderWindowCFv

-      ;wxListCtrl::GetDropTarget() const
-      GetDropTarget__10wxListCtrlCFv
-      ;wxListCtrl::GetColumnCount() const
-      GetColumnCount__10wxListCtrlCFv
+      ;wxListMainWindow::GetDummyLine() const
+      GetDummyLine__16wxListMainWindowCFv
+      ;wxGenericListCtrl::GetColumnCount() const
+      GetColumnCount__17wxGenericListCtrlCFv
+      ;wxGenericListCtrl::GetBackgroundColour() const
+      GetBackgroundColour__17wxGenericListCtrlCFv
+      ;wxListTextCtrl::Finish()
+      Finish__14wxListTextCtrlFv

       ;wxListMainWindow::DeleteEverything()
       DeleteEverything__16wxListMainWindowFv
       ;wxListMainWindow::DeleteEverything()
       DeleteEverything__16wxListMainWindowFv

+      ;wxwxListHeaderDataListNode::DeleteData()
+      DeleteData__26wxwxListHeaderDataListNodeFv

       ;wxListMainWindow::DeleteAllItems()
       DeleteAllItems__16wxListMainWindowFv
       ;wxListMainWindow::DeleteAllItems()
       DeleteAllItems__16wxListMainWindowFv

-      ;wxListCtrl::DeleteAllColumns()
-      DeleteAllColumns__10wxListCtrlFv
-      ;wxListMainWindow::CalculatePositions()
-      CalculatePositions__16wxListMainWindowFv
-      ;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

-      ;wxListLineData::GetText(int,wxString&)
-      GetText__14wxListLineDataFiR8wxString
-      ;wxListLineData::SetAttributes(wxDC*,const wxListItemAttr*,const wxColour&,const wxFont&,unsigned long)
-      SetAttributes__14wxListLineDataFP4wxDCPC14wxListItemAttrRC8wxColourRC6wxFontUl
+      ;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
+      ;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&)


@@ -8632,106 +9574,85 @@ EXPORTS
       OnKeyUp__14wxListTextCtrlFR10wxKeyEvent
       ;wxListMainWindow::OnChar(wxKeyEvent&)
       OnChar__16wxListMainWindowFR10wxKeyEvent
       OnKeyUp__14wxListTextCtrlFR10wxKeyEvent
       ;wxListMainWindow::OnChar(wxKeyEvent&)
       OnChar__16wxListMainWindowFR10wxKeyEvent

-      ;wxListMainWindow::HilightAll(unsigned long)
-      HilightAll__16wxListMainWindowFUl
-      ;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
       ;wxListMainWindow::EnsureVisible(long)
       EnsureVisible__16wxListMainWindowFl

-      ;wxListCtrl::EnsureVisible(long)
-      EnsureVisible__10wxListCtrlFl
-      ;wxListLineDataArray::Add(const wxListLineData&)
-      Add__19wxListLineDataArrayFRC14wxListLineData
-      ;wxListItemData::sm_classwxListItemData
-      sm_classwxListItemData__14wxListItemData
-      ;wxListHeaderData::sm_classwxListHeaderData
-      sm_classwxListHeaderData__16wxListHeaderData
-      ;wxListItemData::wxListItemData(const wxListItem&)
-      __ct__14wxListItemDataFRC10wxListItem
+      ;wxListLineData::DrawInReportMode(wxDC*,const wxRect&,const wxRect&,unsigned long)
+      DrawInReportMode__14wxListLineDataFP4wxDCRC6wxRectT2Ul
+      ;wxGenericListCtrl::DeleteItem(long)
+      DeleteItem__17wxGenericListCtrlFl
+      ;wxListLineData::GetText(int) const
+      GetText__14wxListLineDataCFi
+      __vft26wxwxListHeaderDataListNode10wxNodeBase
+      __vft24wxwxListItemDataListNode10wxNodeBase
+      ;wxListLineData::SetPosition(int,int,int,int)
+      SetPosition__14wxListLineDataFiN31

       ;wxListMainWindow::SetItem(wxListItem&)
       SetItem__16wxListMainWindowFR10wxListItem
       ;wxListItemData::SetItem(const wxListItem&)
       SetItem__14wxListItemDataFRC10wxListItem
       ;wxListMainWindow::SetItem(wxListItem&)
       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

-      ;wxListLineData::SetColumnPosition(int,int)
-      SetColumnPosition__14wxListLineDataFiT1
-      ;wxListCtrl::ScrollList(int,int)
-      ScrollList__10wxListCtrlFiT1
-      ;wxListLineData::IsHit(int,int)
-      IsHit__14wxListLineDataFiT1
-      ;wxListLineDataArray::Insert(const wxListLineData&,unsigned int)
-      Insert__19wxListLineDataArrayFRC14wxListLineDataUi
+      ;wxListLineDataArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__19wxListLineDataArrayFUiT1
+      ;wxSelectionStore::IsSelected(unsigned int) const
+      IsSelected__16wxSelectionStoreCFUi
+      ;wxListMainWindow::IsHighlighted(unsigned int) const
+      IsHighlighted__16wxListMainWindowCFUi
+      ;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
-      ;wxListLineData::GetSize(int&,int&)
-      GetSize__14wxListLineDataFRiT1
-      ;wxListMainWindow::GetItemState(long,long)
-      GetItemState__16wxListMainWindowFlT1
-      ;wxListCtrl::GetItemRect(long,wxRect&,int) const
-      GetItemRect__10wxListCtrlCFlR6wxRecti
-      ;wxListCtrl::GetColumnWidth(int) const
-      GetColumnWidth__10wxListCtrlCFi
-      ;wxListCtrl::FindItem(long,const wxPoint&,int)
-      FindItem__10wxListCtrlFlRC7wxPointi
-      ;wxListMainWindow::DeleteLine(wxListLineData*)
-      DeleteLine__16wxListMainWindowFP14wxListLineData
-      ;wxListCtrl::AssignImageList(wxImageList*,int)
-      AssignImageList__10wxListCtrlFP11wxImageListi
+      ;wxListMainWindow::GetLineIconRect(unsigned int) const
+      GetLineIconRect__16wxListMainWindowCFUi
+      ;wxListMainWindow::GetItemState(long,long) const
+      GetItemState__16wxListMainWindowCFlT1
+      ;wxListMainWindow::GetColumnWidth(int) const
+      GetColumnWidth__16wxListMainWindowCFi
+      ;wxListLineDataArray::Add(const wxListLineData&,unsigned int)
+      Add__19wxListLineDataArrayFRC14wxListLineDataUi

       ;wxListLineDataArray::DoEmpty()
       DoEmpty__19wxListLineDataArrayFv
       ;wxListLineDataArray::DoEmpty()
       DoEmpty__19wxListLineDataArrayFv

-      ;wxConstructorForwxListItemData()
-      wxConstructorForwxListItemData__Fv
+      ;wxConstructorForwxListView()
+      wxConstructorForwxListView__Fv

       ;wxConstructorForwxListHeaderWindow()
       wxConstructorForwxListHeaderWindow__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
-      ;wxListItemData::wxListItemData()
-      __ct__14wxListItemDataFv
-      ;wxListCtrl::wxListCtrl()
-      __ct__10wxListCtrlFv
-      ;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
+      HitTestLine__16wxListMainWindowCFUiiT2

       ;wxListHeaderData::HasImage() const
       HasImage__16wxListHeaderDataCFv
       ;wxListItemData::GetWidth() const
       GetWidth__14wxListItemDataCFv
       ;wxListHeaderData::HasImage() const
       HasImage__16wxListHeaderDataCFv
       ;wxListItemData::GetWidth() const
       GetWidth__14wxListItemDataCFv

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

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

-      ;wxListItemData::GetImage() const
-      GetImage__14wxListItemDataCFv
-      ;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
       ;wxListHeaderWindow::DrawCurrent()
       DrawCurrent__18wxListHeaderWindowFv

-      ;wxListCtrl::DoPopupMenu(wxMenu*,int,int)
-      DoPopupMenu__10wxListCtrlFP6wxMenuiT2
-      ;wxListCtrl::DeleteAllItems()
-      DeleteAllItems__10wxListCtrlFv
-      ;wxListItem::Clear()
-      Clear__10wxListItemFv
-      ;wxListCtrl::ClearAll()
-      ClearAll__10wxListCtrlFv
-      ;wxListItemData::SetText(const wxString&)
-      SetText__14wxListItemDataFRC8wxString
+      ;wxListItemData::wxListItemData(wxListMainWindow*)
+      __ct__14wxListItemDataFP16wxListMainWindow
+      wxEVT_COMMAND_LIST_COL_END_DRAG

       wxEVT_COMMAND_LIST_COL_CLICK
       wxEVT_COMMAND_LIST_BEGIN_RDRAG
       wxEVT_COMMAND_LIST_BEGIN_DRAG
       wxEVT_COMMAND_LIST_COL_CLICK
       wxEVT_COMMAND_LIST_BEGIN_RDRAG
       wxEVT_COMMAND_LIST_BEGIN_DRAG


@@ -8785,12 +9706,12 @@ EXPORTS
       ;wxLogDialog::sm_eventTable
       sm_eventTable__11wxLogDialog
       __vft11wxLogWindow5wxLog
       ;wxLogDialog::sm_eventTable
       sm_eventTable__11wxLogDialog
       __vft11wxLogWindow5wxLog

-      ;wxLogTextCtrl::DoLogString(const char*,long)
-      DoLogString__13wxLogTextCtrlFPCcl
-      ;wxLogDialog::OnSave(wxCommandEvent&)
-      OnSave__11wxLogDialogFR14wxCommandEvent

       ;wxLogFrame::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__10wxLogFrameFR12wxCloseEvent
       ;wxLogFrame::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__10wxLogFrameFR12wxCloseEvent

+      ;wxLogDialog::OnSave(wxCommandEvent&)
+      OnSave__11wxLogDialogFR14wxCommandEvent
+      ;wxLogTextCtrl::DoLogString(const char*,long)
+      DoLogString__13wxLogTextCtrlFPCcl

       ;wxLogWindow::DoLogString(const char*,long)
       DoLogString__11wxLogWindowFPCcl
       ;wxLogStatus(wxFrame*,const char*,...)
       ;wxLogWindow::DoLogString(const char*,long)
       DoLogString__11wxLogWindowFPCcl
       ;wxLogStatus(wxFrame*,const char*,...)


@@ -8803,13 +9724,15 @@ EXPORTS
       __dt__11wxLogWindowFv
       ;wxLogGui::Clear()
       Clear__8wxLogGuiFv
       __dt__11wxLogWindowFv
       ;wxLogGui::Clear()
       Clear__8wxLogGuiFv

+      ;wxVLogStatus(wxFrame*,const char*,char*)
+      wxVLogStatus__FP7wxFramePCcPc

       __vft8wxLogGui5wxLog
       __vft8wxLogGui5wxLog

-      ;wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl*)
-      __ct__13wxLogTextCtrlFP10wxTextCtrl
-      __vft11wxLogDialog8wxObject
-      __vft10wxLogFrame8wxObject

       ;wxLogDialog::OnOk(wxCommandEvent&)
       OnOk__11wxLogDialogFR14wxCommandEvent
       ;wxLogDialog::OnOk(wxCommandEvent&)
       OnOk__11wxLogDialogFR14wxCommandEvent

+      __vft11wxLogDialog8wxObject
+      __vft10wxLogFrame8wxObject
+      ;wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl*)
+      __ct__13wxLogTextCtrlFP10wxTextCtrl

       ;wxLogWindow::OnFrameClose(wxFrame*)
       OnFrameClose__11wxLogWindowFP7wxFrame
       ;wxLogFrame::sm_eventTable
       ;wxLogWindow::OnFrameClose(wxFrame*)
       OnFrameClose__11wxLogWindowFP7wxFrame
       ;wxLogFrame::sm_eventTable


@@ -8818,8 +9741,6 @@ EXPORTS
       OnFrameDelete__11wxLogWindowFP7wxFrame
       ;wxLogDialog::~wxLogDialog()
       __dt__11wxLogDialogFv
       OnFrameDelete__11wxLogWindowFP7wxFrame
       ;wxLogDialog::~wxLogDialog()
       __dt__11wxLogDialogFv

-      ;wxLogWindow::Flush()
-      Flush__11wxLogWindowFv

       ;wxLogFrame::wxLogFrame(wxFrame*,wxLogWindow*,const char*)
       __ct__10wxLogFrameFP7wxFrameP11wxLogWindowPCc
       ;wxLogWindow::wxLogWindow(wxFrame*,const char*,unsigned long,unsigned long)
       ;wxLogFrame::wxLogFrame(wxFrame*,wxLogWindow*,const char*)
       __ct__10wxLogFrameFP7wxFrameP11wxLogWindowPCc
       ;wxLogWindow::wxLogWindow(wxFrame*,const char*,unsigned long,unsigned long)


@@ -8853,15 +9774,23 @@ 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::GetEventTable() const
       GetEventTable__7wxPanelCFv
       ;wxPanel::InitDialog()
       InitDialog__7wxPanelFv
       __vft7wxPanel8wxObject
       ;wxPanel::GetEventTable() const
       GetEventTable__7wxPanelCFv
       ;wxPanel::InitDialog()
       InitDialog__7wxPanelFv

-      ;wxPanel::sm_classwxPanel
-      sm_classwxPanel__7wxPanel
+      ;wxPanel::OnChildFocus(wxChildFocusEvent&)
+      OnChildFocus__7wxPanelFR17wxChildFocusEvent

       ;wxPanel::sm_eventTable
       sm_eventTable__7wxPanel
       ;wxPanel::sm_eventTable
       sm_eventTable__7wxPanel

+      ;wxPanel::sm_classwxPanel
+      sm_classwxPanel__7wxPanel
+      ;wxPanel::~wxPanel()
+      __dt__7wxPanelFv

       ;wxPanel::OnNavigationKey(wxNavigationKeyEvent&)
       OnNavigationKey__7wxPanelFR20wxNavigationKeyEvent
       ;wxPanel::OnFocus(wxFocusEvent&)
       ;wxPanel::OnNavigationKey(wxNavigationKeyEvent&)
       OnNavigationKey__7wxPanelFR20wxNavigationKeyEvent
       ;wxPanel::OnFocus(wxFocusEvent&)


@@ -8872,10 +9801,8 @@ EXPORTS
       wxConstructorForwxPanel__Fv
       ;wxPanel::SetFocus()
       SetFocus__7wxPanelFv
       wxConstructorForwxPanel__Fv
       ;wxPanel::SetFocus()
       SetFocus__7wxPanelFv

-      ;wxPanel::SetFocusToChild()
-      SetFocusToChild__7wxPanelFv
-      ;wxSetFocusToChild(wxWindow*,wxWindow**)
-      wxSetFocusToChild__FP8wxWindowPP8wxWindow
+      ;wxPanel::GetDefaultItem() const
+      GetDefaultItem__7wxPanelCFv

   ;From object file:  ..\generic\printps.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPostScriptPrintPreview::wxPostScriptPrintPreview(wxPrintout*,wxPrintout*,wxPrintDialogData*)
   ;From object file:  ..\generic\printps.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPostScriptPrintPreview::wxPostScriptPrintPreview(wxPrintout*,wxPrintout*,wxPrintDialogData*)


@@ -8914,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()


@@ -8985,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


@@ -8994,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


@@ -9007,668 +9932,8 @@ EXPORTS
       ;wxProgressDialog::~wxProgressDialog()
       __dt__16wxProgressDialogFv
   ;From object file:  ..\generic\prop.cpp
       ;wxProgressDialog::~wxProgressDialog()
       __dt__16wxProgressDialogFv
   ;From object file:  ..\generic\prop.cpp

-    ;PUBDEFs (Symbols available from object file):
-      ;wxPropertyValue::wxPropertyValue(unsigned long)
-      __ct__15wxPropertyValueFUl
-      ;wxPropertyValue::wxPropertyValue(double)
-      __ct__15wxPropertyValueFd
-      ;wxPropertyValue::operator=(const long*)
-      __as__15wxPropertyValueFPCl
-      ;wxPropertyValidator::DoubleToString(double)
-      DoubleToString__19wxPropertyValidatorFd
-      ;wxPropertyValidator::StringToInt(char*,int*)
-      StringToInt__19wxPropertyValidatorFPcPi
-      ;wxPropertyValue::sm_classwxPropertyValue
-      sm_classwxPropertyValue__15wxPropertyValue
-      ;wxPropertyValidatorRegistry::sm_classwxPropertyValidatorRegistry
-      sm_classwxPropertyValidatorRegistry__27wxPropertyValidatorRegistry
-      ;wxConstructorForwxPropertyValue()
-      wxConstructorForwxPropertyValue__Fv
-      ;wxConstructorForwxProperty()
-      wxConstructorForwxProperty__Fv
-      ;wxConstructorForwxPropertyValidatorRegistry()
-      wxConstructorForwxPropertyValidatorRegistry__Fv
-      ;wxConstructorForwxPropertySheet()
-      wxConstructorForwxPropertySheet__Fv
-      ;wxProperty::~wxProperty()
-      __dt__10wxPropertyFv
-      ;wxPropertyValue::wxPropertyValue(float)
-      __ct__15wxPropertyValueFf
-      ;wxPropertyValue::wxPropertyValue(float*)
-      __ct__15wxPropertyValueFPf
-      ;wxPropertyValue::NewCopy() const
-      NewCopy__15wxPropertyValueCFv
-      ;wxPropertyValue::IntegerValue() const
-      IntegerValue__15wxPropertyValueCFv
-      ;wxProperty::GetName() const
-      GetName__10wxPropertyCFv
-      ;wxPropertyValue::BoolValue() const
-      BoolValue__15wxPropertyValueCFv
-      ;wxProperty::SetName(wxString&)
-      SetName__10wxPropertyFR8wxString
-      ;wxPropertySheet::GetProperty(const wxString&) const
-      GetProperty__15wxPropertySheetCFRC8wxString
-      ;wxPropertyValue::wxPropertyValue(wxStringList*)
-      __ct__15wxPropertyValueFP12wxStringList
-      __vft15wxPropertyValue8wxObject
-      ;wxPropertyValue::operator=(const unsigned long*)
-      __as__15wxPropertyValueFPCUl
-      ;wxPropertyValidator::StringToDouble(char*,double*)
-      StringToDouble__19wxPropertyValidatorFPcPd
-      ;wxPropertyValue::Append(wxPropertyValue*)
-      Append__15wxPropertyValueFP15wxPropertyValue
-      ;wxProperty::sm_classwxProperty
-      sm_classwxProperty__10wxProperty
-      ;wxPropertyValue::Delete(wxPropertyValue*)
-      Delete__15wxPropertyValueFP15wxPropertyValue
-      ;wxPropertyValue::Copy(wxPropertyValue&)
-      Copy__15wxPropertyValueFR15wxPropertyValue
-      ;wxPropertyValue::Arg(wxPropertyValueType,int) const
-      Arg__15wxPropertyValueCF19wxPropertyValueTypei
-      ;wxPropertySheet::AddProperty(wxProperty*)
-      AddProperty__15wxPropertySheetFP10wxProperty
-      ;wxPropertyValue::wxPropertyValue()
-      __ct__15wxPropertyValueFv
-      ;wxPropertyValidatorRegistry::~wxPropertyValidatorRegistry()
-      __dt__27wxPropertyValidatorRegistryFv
-      ;wxPropertyValidator::~wxPropertyValidator()
-      __dt__19wxPropertyValidatorFv
-      ;wxPropertyView::~wxPropertyView()
-      __dt__14wxPropertyViewFv
-      ;wxProperty::wxProperty()
-      __ct__10wxPropertyFv
-      ;wxProperty::wxProperty(wxString,wxString,wxPropertyValidator*)
-      __ct__10wxPropertyF8wxStringT1P19wxPropertyValidator
-      ;wxPropertyValue::operator=(const float)
-      __as__15wxPropertyValueFCf
-      ;wxPropertyValue::RealValuePtr() const
-      RealValuePtr__15wxPropertyValueCFv
-      ;wxPropertyValue::GetStringRepresentation()
-      GetStringRepresentation__15wxPropertyValueFv
-      ;wxPropertyValue::BoolValuePtr() const
-      BoolValuePtr__15wxPropertyValueCFv
-      ;wxPropertyValue::wxPropertyValue(const char*)
-      __ct__15wxPropertyValueFPCc
-      ;wxPropertyValue::wxPropertyValue(const wxString&)
-      __ct__15wxPropertyValueFRC8wxString
-      ;wxPropertyValue::operator=(const wxString&)
-      __as__15wxPropertyValueFRC8wxString
-      ;wxPropertySheet::HasProperty(const wxString&) const
-      HasProperty__15wxPropertySheetCFRC8wxString
-      ;wxPropertyValidatorRegistry::GetValidator(const wxString&)
-      GetValidator__27wxPropertyValidatorRegistryFRC8wxString
-      ;wxPropertyValue::wxPropertyValue(long)
-      __ct__15wxPropertyValueFl
-      __vft19wxPropertyValidator8wxObject
-      __vft14wxPropertyView8wxObject
-      ;wxPropertyValue::wxPropertyValue(long*)
-      __ct__15wxPropertyValueFPl
-      ;wxPropertyValue::wxPropertyValue(const wxPropertyValue&)
-      __ct__15wxPropertyValueFRC15wxPropertyValue
-      ;wxProperty::wxProperty(wxProperty&)
-      __ct__10wxPropertyFR10wxProperty
-      ;wxPropertyValue::operator=(const wxPropertyValue&)
-      __as__15wxPropertyValueFRC15wxPropertyValue
-      ;wxPropertySheet::SetProperty(const wxString&,const wxPropertyValue&)
-      SetProperty__15wxPropertySheetFRC8wxStringRC15wxPropertyValue
-      ;wxPropertyValue::Nth(int) const
-      Nth__15wxPropertyValueCFi
-      ;wxPropertyView::AddRegistry(wxPropertyValidatorRegistry*)
-      AddRegistry__14wxPropertyViewFP27wxPropertyValidatorRegistry
-      ;wxPropertyValue::~wxPropertyValue()
-      __dt__15wxPropertyValueFv
-      ;wxPropertySheet::~wxPropertySheet()
-      __dt__15wxPropertySheetFv
-      ;wxPropertyValidatorRegistry::wxPropertyValidatorRegistry()
-      __ct__27wxPropertyValidatorRegistryFv
-      ;wxProperty::wxProperty(wxString,const wxPropertyValue&,wxString,wxPropertyValidator*)
-      __ct__10wxPropertyF8wxStringRC15wxPropertyValueT1P19wxPropertyValidator
-      ;wxPropertyValue::StringValuePtr() const
-      StringValuePtr__15wxPropertyValueCFv
-      ;wxPropertyValidator::StringToFloat(char*,float*)
-      StringToFloat__19wxPropertyValidatorFPcPf
-      ;wxPropertyValidatorRegistry::RegisterValidator(const wxString&,wxPropertyValidator*)
-      RegisterValidator__27wxPropertyValidatorRegistryFRC8wxStringP19wxPropertyValidator
-      ;wxPropertyValue::IntegerValuePtr() const
-      IntegerValuePtr__15wxPropertyValueCFv
-      ;wxProperty::GetValidator() const
-      GetValidator__10wxPropertyCFv
-      ;wxPropertyValidatorRegistry::ClearRegistry()
-      ClearRegistry__27wxPropertyValidatorRegistryFv
-      ;wxPropertyValue::ClearList()
-      ClearList__15wxPropertyValueFv
-      ;wxPropertyValue::wxPropertyValue(char**)
-      __ct__15wxPropertyValueFPPc
-      ;wxPropertySheet::wxPropertySheet(const wxString&)
-      __ct__15wxPropertySheetFRC8wxString
-      ;wxPropertyValue::WritePropertyType(wxString&)
-      WritePropertyType__15wxPropertyValueFR8wxString
-      ;wxPropertySheet::RemoveProperty(const wxString&)
-      RemoveProperty__15wxPropertySheetFRC8wxString
-      ;wxPropertyValue::wxPropertyValue(unsigned long*)
-      __ct__15wxPropertyValueFPUl
-      __vft27wxPropertyValidatorRegistry8wxObject
-      __vft15wxPropertySheet8wxObject
-      __vft10wxProperty8wxObject
-      ;wxPropertyValidator::wxPropertyValidator(long)
-      __ct__19wxPropertyValidatorFl
-      ;wxPropertyView::wxPropertyView(long)
-      __ct__14wxPropertyViewFl
-      ;wxPropertyValue::operator=(const long)
-      __as__15wxPropertyValueFCl
-      ;wxPropertySheet::SetAllModified(unsigned long)
-      SetAllModified__15wxPropertySheetFUl
-      ;wxPropertyValidator::LongToString(long)
-      LongToString__19wxPropertyValidatorFl
-      ;wxProperty::SetValue(const wxPropertyValue&)
-      SetValue__10wxPropertyFRC15wxPropertyValue
-      ;wxPropertyValidator::IntToString(int)
-      IntToString__19wxPropertyValidatorFi
-      ;wxPropertyView::FindPropertyValidator(wxProperty*)
-      FindPropertyValidator__14wxPropertyViewFP10wxProperty
-      ;wxPropertyValue::operator=(const float*)
-      __as__15wxPropertyValueFPCf
-      ;wxProperty::GetValue() const
-      GetValue__10wxPropertyCFv
-      ;wxPropertyValue::WritePropertyClause(wxString&)
-      WritePropertyClause__15wxPropertyValueFR8wxString
-      ;wxPropertyView::sm_classwxPropertyView
-      sm_classwxPropertyView__14wxPropertyView
-      ;wxProperty::SetRole(wxString&)
-      SetRole__10wxPropertyFR8wxString
-      ;wxPropertyValue::wxPropertyValue(wxList*)
-      __ct__15wxPropertyValueFP6wxList
-      ;wxPropertySheet::sm_classwxPropertySheet
-      sm_classwxPropertySheet__15wxPropertySheet
-      ;wxPropertyValue::operator=(const unsigned long)
-      __as__15wxPropertyValueFCUl
-      ;wxPropertyValidator::StringToLong(char*,long*)
-      StringToLong__19wxPropertyValidatorFPcPl
-      ;wxPropertyValue::Insert(wxPropertyValue*)
-      Insert__15wxPropertyValueFP15wxPropertyValue
-      ;wxProperty::operator=(const wxPropertyValue&)
-      __as__10wxPropertyFRC15wxPropertyValue
-      ;wxPropertyValue::Number() const
-      Number__15wxPropertyValueCFv
-      ;wxConstructorForwxPropertyView()
-      wxConstructorForwxPropertyView__Fv
-      ;wxPropertyValidator::sm_classwxPropertyValidator
-      sm_classwxPropertyValidator__19wxPropertyValidator
-      ;wxPropertyValue::StringValue() const
-      StringValue__15wxPropertyValueCFv
-      ;wxProperty::SetValidator(wxPropertyValidator*)
-      SetValidator__10wxPropertyFP19wxPropertyValidator
-      ;wxPropertyValue::RealValue() const
-      RealValue__15wxPropertyValueCFv
-      ;wxProperty::GetRole() const
-      GetRole__10wxPropertyCFv
-      ;wxPropertyValidator::FloatToString(float)
-      FloatToString__19wxPropertyValidatorFf
-      ;wxPropertySheet::Clear()
-      Clear__15wxPropertySheetFv
-      ;wxPropertyValue::operator=(const char**)
-      __as__15wxPropertyValueFPPCc
-      ;wxPropertySheet::UpdateAllViews(wxPropertyView*)
-      UpdateAllViews__15wxPropertySheetFP14wxPropertyView

   ;From object file:  ..\generic\propform.cpp
   ;From object file:  ..\generic\propform.cpp

-    ;PUBDEFs (Symbols available from object file):
-      ;wxPropertyFormView::OnUpdate(wxCommandEvent&)
-      OnUpdate__18wxPropertyFormViewFR14wxCommandEvent
-      __vft20wxPropertyFormDialog8wxObject
-      ;wxPropertyFormView::OnRevert(wxCommandEvent&)
-      OnRevert__18wxPropertyFormViewFR14wxCommandEvent
-      ;wxConstructorForwxPropertyFormView()
-      wxConstructorForwxPropertyFormView__Fv
-      ;wxPropertyFormValidator::sm_classwxPropertyFormValidator
-      sm_classwxPropertyFormValidator__23wxPropertyFormValidator
-      ;wxPropertyFormDialog::GetEventTable() const
-      GetEventTable__20wxPropertyFormDialogCFv
-      ;wxPropertyFormView::AssociateNames()
-      AssociateNames__18wxPropertyFormViewFv
-      ;wxPropertyFormFrame::OnCreatePanel(wxFrame*,wxPropertyFormView*)
-      OnCreatePanel__19wxPropertyFormFrameFP7wxFrameP18wxPropertyFormView
-      ;wxPropertyFormView::sm_eventTableEntries
-      sm_eventTableEntries__18wxPropertyFormView
-      ;wxPropertyFormView::sm_classwxPropertyFormView
-      sm_classwxPropertyFormView__18wxPropertyFormView
-      ;wxBoolFormValidator::OnDisplayValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnDisplayValue__19wxBoolFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxIntegerFormValidator::OnCheckValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnCheckValue__22wxIntegerFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxPropertyFormView::wxPropertyFormView(wxWindow*,long)
-      __ct__18wxPropertyFormViewFP8wxWindowl
-      ;wxPropertyFormPanel::sm_classwxPropertyFormPanel
-      sm_classwxPropertyFormPanel__19wxPropertyFormPanel
-      __vft19wxRealFormValidator8wxObject
-      __vft18wxPropertyFormView8wxObject
-      ;wxPropertyFormDialog::ProcessEvent(wxEvent&)
-      ProcessEvent__20wxPropertyFormDialogFR7wxEvent
-      ;wxPropertyFormPanel::ProcessEvent(wxEvent&)
-      ProcessEvent__19wxPropertyFormPanelFR7wxEvent
-      ;wxPropertyFormView::ProcessEvent(wxEvent&)
-      ProcessEvent__18wxPropertyFormViewFR7wxEvent
-      ;wxPropertyFormPanel::OnDefaultAction(wxControl*)
-      OnDefaultAction__19wxPropertyFormPanelFP9wxControl
-      ;wxPropertyFormDialog::OnCommand(wxWindow&,wxCommandEvent&)
-      OnCommand__20wxPropertyFormDialogFR8wxWindowR14wxCommandEvent
-      ;wxPropertyFormView::OnUpdateView()
-      OnUpdateView__18wxPropertyFormViewFv
-      ;wxConstructorForwxStringFormValidator()
-      wxConstructorForwxStringFormValidator__Fv
-      ;wxConstructorForwxPropertyFormDialog()
-      wxConstructorForwxPropertyFormDialog__Fv
-      ;wxPropertyFormView::OnClose()
-      OnClose__18wxPropertyFormViewFv
-      ;wxRealFormValidator::OnCheckValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnCheckValue__19wxRealFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxPropertyFormView::sm_eventTable
-      sm_eventTable__18wxPropertyFormView
-      ;wxPropertyFormDialog::sm_classwxPropertyFormDialog
-      sm_classwxPropertyFormDialog__20wxPropertyFormDialog
-      ;wxIntegerFormValidator::OnRetrieveValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnRetrieveValue__22wxIntegerFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxBoolFormValidator::OnRetrieveValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnRetrieveValue__19wxBoolFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxStringFormValidator::OnCheckValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnCheckValue__21wxStringFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxPropertyFormView::OnCancel(wxCommandEvent&)
-      OnCancel__18wxPropertyFormViewFR14wxCommandEvent
-      __vft19wxPropertyFormPanel8wxObject
-      ;wxPropertyFormDialog::OnDefaultAction(wxControl*)
-      OnDefaultAction__20wxPropertyFormDialogFP9wxControl
-      ;wxPropertyFormPanel::OnCommand(wxWindow&,wxCommandEvent&)
-      OnCommand__19wxPropertyFormPanelFR8wxWindowR14wxCommandEvent
-      ;wxPropertyFormFrame::sm_eventTable
-      sm_eventTable__19wxPropertyFormFrame
-      ;wxPropertyFormView::Check()
-      Check__18wxPropertyFormViewFv
-      ;wxConstructorForwxPropertyFormPanel()
-      wxConstructorForwxPropertyFormPanel__Fv
-      ;wxBoolFormValidator::sm_classwxBoolFormValidator
-      sm_classwxBoolFormValidator__19wxBoolFormValidator
-      ;wxPropertyFormView::TransferToPropertySheet()
-      TransferToPropertySheet__18wxPropertyFormViewFv
-      ;wxPropertyFormFrame::Initialize()
-      Initialize__19wxPropertyFormFrameFv
-      ;wxPropertyFormView::sm_dialogCancelled
-      sm_dialogCancelled__18wxPropertyFormView
-      ;wxPropertyFormView::OnOk(wxCommandEvent&)
-      OnOk__18wxPropertyFormViewFR14wxCommandEvent
-      __vft22wxIntegerFormValidator8wxObject
-      __vft21wxStringFormValidator8wxObject
-      __vft19wxPropertyFormFrame8wxObject
-      __vft19wxBoolFormValidator8wxObject
-      ;wxPropertyFormView::OnHelp(wxCommandEvent&)
-      OnHelp__18wxPropertyFormViewFR14wxCommandEvent
-      ;wxPropertyFormView::OnDoubleClick(wxControl*)
-      OnDoubleClick__18wxPropertyFormViewFP9wxControl
-      ;wxPropertyFormDialog::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__20wxPropertyFormDialogFR12wxCloseEvent
-      ;wxPropertyFormFrame::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__19wxPropertyFormFrameFR12wxCloseEvent
-      ;wxPropertyFormFrame::sm_eventTableEntries
-      sm_eventTableEntries__19wxPropertyFormFrame
-      ;wxPropertyFormView::~wxPropertyFormView()
-      __dt__18wxPropertyFormViewFv
-      ;wxConstructorForwxRealFormValidator()
-      wxConstructorForwxRealFormValidator__Fv
-      ;wxConstructorForwxIntegerFormValidator()
-      wxConstructorForwxIntegerFormValidator__Fv
-      ;wxConstructorForwxBoolFormValidator()
-      wxConstructorForwxBoolFormValidator__Fv
-      ;wxStringFormValidator::sm_classwxStringFormValidator
-      sm_classwxStringFormValidator__21wxStringFormValidator
-      ;wxRealFormValidator::sm_classwxRealFormValidator
-      sm_classwxRealFormValidator__19wxRealFormValidator
-      ;wxIntegerFormValidator::sm_classwxIntegerFormValidator
-      sm_classwxIntegerFormValidator__22wxIntegerFormValidator
-      ;wxPropertyFormFrame::GetEventTable() const
-      GetEventTable__19wxPropertyFormFrameCFv
-      ;wxStringFormValidator::OnRetrieveValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnRetrieveValue__21wxStringFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxPropertyFormDialog::sm_eventTable
-      sm_eventTable__20wxPropertyFormDialog
-      ;wxStringFormValidator::OnDisplayValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnDisplayValue__21wxStringFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxPropertyFormView::OnCommand(wxWindow&,wxCommandEvent&)
-      OnCommand__18wxPropertyFormViewFR8wxWindowR14wxCommandEvent
-      ;wxStringFormValidator::wxStringFormValidator(wxStringList*,long)
-      __ct__21wxStringFormValidatorFP12wxStringListl
-      ;wxPropertyFormFrame::sm_classwxPropertyFormFrame
-      sm_classwxPropertyFormFrame__19wxPropertyFormFrame
-      ;wxPropertyFormView::GetEventTable() const
-      GetEventTable__18wxPropertyFormViewCFv
-      ;wxConstructorForwxPropertyFormFrame()
-      wxConstructorForwxPropertyFormFrame__Fv
-      ;wxPropertyFormView::TransferToDialog()
-      TransferToDialog__18wxPropertyFormViewFv
-      ;wxPropertyFormView::ShowView(wxPropertySheet*,wxWindow*)
-      ShowView__18wxPropertyFormViewFP15wxPropertySheetP8wxWindow
-      ;wxPropertyFormDialog::sm_eventTableEntries
-      sm_eventTableEntries__20wxPropertyFormDialog
-      ;wxPropertyFormDialog::wxPropertyFormDialog(wxPropertyFormView*,wxWindow*,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
-      __ct__20wxPropertyFormDialogFP18wxPropertyFormViewP8wxWindowRC8wxStringRC7wxPointRC6wxSizelT3
-      ;wxRealFormValidator::OnRetrieveValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnRetrieveValue__19wxRealFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxIntegerFormValidator::OnDisplayValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnDisplayValue__22wxIntegerFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxRealFormValidator::OnDisplayValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnDisplayValue__19wxRealFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxBoolFormValidator::OnCheckValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnCheckValue__19wxBoolFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow

   ;From object file:  ..\generic\proplist.cpp
   ;From object file:  ..\generic\proplist.cpp

-    ;PUBDEFs (Symbols available from object file):
-      ;wxPropertyListView::ShowView(wxPropertySheet*,wxPanel*)
-      ShowView__18wxPropertyListViewFP15wxPropertySheetP7wxPanel
-      ;wxPropertyListPanel::sm_eventTableEntries
-      sm_eventTableEntries__19wxPropertyListPanel
-      ;wxPropertyListPanel::sm_classwxPropertyListPanel
-      sm_classwxPropertyListPanel__19wxPropertyListPanel
-      __vft23wxFilenameListValidator8wxObject
-      __vft21wxStringListValidator8wxObject
-      ;wxColourListValidator::wxColourListValidator(long)
-      __ct__21wxColourListValidatorFl
-      ;wxPropertyListView::ShowTextControl(unsigned long)
-      ShowTextControl__18wxPropertyListViewFUl
-      ;wxPropertyListView::ShowListBoxControl(unsigned long)
-      ShowListBoxControl__18wxPropertyListViewFUl
-      ;wxPropertyListView::OnPropertySelect(wxCommandEvent&)
-      OnPropertySelect__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyListView::OnPropertyDoubleClick(wxCommandEvent&)
-      OnPropertyDoubleClick__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyListView::OnEdit(wxCommandEvent&)
-      OnEdit__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyListPanel::OnDefaultAction(wxControl*)
-      OnDefaultAction__19wxPropertyListPanelFP9wxControl
-      ;wxPropertyStringListEditorDialog::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__32wxPropertyStringListEditorDialogFR12wxCloseEvent
-      ;wxPropertyListView::EnableCheck(unsigned long)
-      EnableCheck__18wxPropertyListViewFUl
-      ;wxPropertyListView::OnUpdateView()
-      OnUpdateView__18wxPropertyListViewFv
-      ;wxConstructorForwxFilenameListValidator()
-      wxConstructorForwxFilenameListValidator__Fv
-      ;wxFilenameListValidator::sm_classwxFilenameListValidator
-      sm_classwxFilenameListValidator__23wxFilenameListValidator
-      ;wxBoolListValidator::sm_classwxBoolListValidator
-      sm_classwxBoolListValidator__19wxBoolListValidator
-      ;wxPropertyStringListEditorDialog::SaveCurrentSelection()
-      SaveCurrentSelection__32wxPropertyStringListEditorDialogFv
-      ;wxPropertyStringListEditorDialog::GetEventTable() const
-      GetEventTable__32wxPropertyStringListEditorDialogCFv
-      ;wxPropertyListPanel::GetEventTable() const
-      GetEventTable__19wxPropertyListPanelCFv
-      ;wxPropertyListFrame::GetEventTable() const
-      GetEventTable__19wxPropertyListFrameCFv
-      ;wxPropertyListFrame::OnCreatePanel(wxFrame*,wxPropertyListView*)
-      OnCreatePanel__19wxPropertyListFrameFP7wxFrameP18wxPropertyListView
-      ;wxPropertyListDialog::sm_eventTableEntries
-      sm_eventTableEntries__20wxPropertyListDialog
-      ;wxPropertyListView::sm_dialogCancelled
-      sm_dialogCancelled__18wxPropertyListView
-      ;wxPropertyListView::sm_classwxPropertyListView
-      sm_classwxPropertyListView__18wxPropertyListView
-      ;wxListOfStringsListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__28wxListOfStringsListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__23wxPropertyListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxFilenameListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__23wxFilenameListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxIntegerListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__22wxIntegerListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxBoolListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__19wxBoolListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxListOfStringsListValidator::OnPrepareControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareControls__28wxListOfStringsListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxListOfStringsListValidator::OnDoubleClick(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDoubleClick__28wxListOfStringsListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxListOfStringsListValidator::OnDisplayValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDisplayValue__28wxListOfStringsListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxFilenameListValidator::OnDisplayValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDisplayValue__23wxFilenameListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListValidator::OnClearControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnClearControls__23wxPropertyListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxStringListValidator::OnCheckValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnCheckValue__21wxStringListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxRealListValidator::OnCheckValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnCheckValue__19wxRealListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxBoolListValidator::OnCheckValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnCheckValue__19wxBoolListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListView::EnableCross(unsigned long)
-      EnableCross__18wxPropertyListViewFUl
-      __vft23wxPropertyListValidator8wxObject
-      __vft19wxPropertyListPanel8wxObject
-      __vft19wxPropertyListFrame8wxObject
-      __vft19wxBoolListValidator8wxObject
-      __vft18wxPropertyListView8wxObject
-      ;wxListOfStringsListValidator::wxListOfStringsListValidator(long)
-      __ct__28wxListOfStringsListValidatorFl
-      ;wxPropertyListDialog::ProcessEvent(wxEvent&)
-      ProcessEvent__20wxPropertyListDialogFR7wxEvent
-      ;wxPropertyStringListEditorDialog::OnDelete(wxCommandEvent&)
-      OnDelete__32wxPropertyStringListEditorDialogFR14wxCommandEvent
-      ;wxPropertyListDialog::OnDefaultAction(wxControl*)
-      OnDefaultAction__20wxPropertyListDialogFP9wxControl
-      ;wxPropertyListView::OnCross(wxCommandEvent&)
-      OnCross__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyListView::MakeNameValueString(wxString,wxString)
-      MakeNameValueString__18wxPropertyListViewF8wxStringT1
-      ;wxPropertyListFrame::sm_classwxPropertyListFrame
-      sm_classwxPropertyListFrame__19wxPropertyListFrame
-      ;wxPropertyListView::EditProperty(wxProperty*)
-      EditProperty__18wxPropertyListViewFP10wxProperty
-      ;wxConstructorForwxPropertyTextEdit()
-      wxConstructorForwxPropertyTextEdit__Fv
-      ;wxConstructorForwxPropertyListView()
-      wxConstructorForwxPropertyListView__Fv
-      ;wxConstructorForwxPropertyListDialog()
-      wxConstructorForwxPropertyListDialog__Fv
-      ;wxConstructorForwxIntegerListValidator()
-      wxConstructorForwxIntegerListValidator__Fv
-      ;wxRealListValidator::sm_classwxRealListValidator
-      sm_classwxRealListValidator__19wxRealListValidator
-      ;wxIntegerListValidator::sm_classwxIntegerListValidator
-      sm_classwxIntegerListValidator__22wxIntegerListValidator
-      ;wxPropertyStringListEditorDialog::ShowCurrentSelection()
-      ShowCurrentSelection__32wxPropertyStringListEditorDialogFv
-      ;wxPropertyTextEdit::OnSetFocus()
-      OnSetFocus__18wxPropertyTextEditFv
-      ;wxPropertyListView::OnClose()
-      OnClose__18wxPropertyListViewFv
-      ;wxPropertyListValidator::OnSelect(unsigned long,wxProperty*,wxPropertyListView*,wxWindow*)
-      OnSelect__23wxPropertyListValidatorFUlP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyStringListEditorDialog::sm_eventTableEntries
-      sm_eventTableEntries__32wxPropertyStringListEditorDialog
-      ;wxFilenameListValidator::OnPrepareControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareControls__23wxFilenameListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxRealListValidator::OnPrepareControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareControls__19wxRealListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxFilenameListValidator::OnDoubleClick(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDoubleClick__23wxFilenameListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListValidator::OnDisplayValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDisplayValue__23wxPropertyListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxStringListValidator::OnDisplayValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDisplayValue__21wxStringListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxFilenameListValidator::OnCheckValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnCheckValue__23wxFilenameListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyTextEdit::wxPropertyTextEdit(wxPropertyListView*,wxWindow*,const int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
-      __ct__18wxPropertyTextEditFP18wxPropertyListViewP8wxWindowCiRC8wxStringRC7wxPointRC6wxSizelT4
-      ;wxPropertyTextEdit::sm_classwxPropertyTextEdit
-      sm_classwxPropertyTextEdit__18wxPropertyTextEdit
-      __vft32wxPropertyStringListEditorDialog8wxObject
-      __vft28wxListOfStringsListValidator8wxObject
-      __vft20wxPropertyListDialog8wxObject
-      __vft19wxRealListValidator8wxObject
-      ;wxFilenameListValidator::wxFilenameListValidator(wxString,wxString,long)
-      __ct__23wxFilenameListValidatorF8wxStringT1l
-      ;wxStringListValidator::wxStringListValidator(wxStringList*,long)
-      __ct__21wxStringListValidatorFP12wxStringListl
-      ;wxPropertyListView::wxPropertyListView(wxPanel*,long)
-      __ct__18wxPropertyListViewFP7wxPanell
-      ;wxPropertyListView::ShowProperty(wxProperty*,unsigned long)
-      ShowProperty__18wxPropertyListViewFP10wxPropertyUl
-      ;wxPropertyListDialog::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__20wxPropertyListDialogFR12wxCloseEvent
-      ;wxPropertyListDialog::OnCancel(wxCommandEvent&)
-      OnCancel__20wxPropertyListDialogFR14wxCommandEvent
-      ;wxPropertyListView::OnCancel(wxCommandEvent&)
-      OnCancel__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent&)
-      OnAdd__32wxPropertyStringListEditorDialogFR14wxCommandEvent
-      ;wxPropertyListView::UpdatePropertyDisplayInList(wxProperty*)
-      UpdatePropertyDisplayInList__18wxPropertyListViewFP10wxProperty
-      ;wxPropertyListView::EndDetailedEditing()
-      EndDetailedEditing__18wxPropertyListViewFv
-      ;wxConstructorForwxBoolListValidator()
-      wxConstructorForwxBoolListValidator__Fv
-      ;wxListOfStringsListValidator::sm_classwxListOfStringsListValidator
-      sm_classwxListOfStringsListValidator__28wxListOfStringsListValidator
-      ;wxColourListValidator::sm_classwxColourListValidator
-      sm_classwxColourListValidator__21wxColourListValidator
-      ;wxPropertyListView::CreateControls()
-      CreateControls__18wxPropertyListViewFv
-      ;wxPropertyListDialog::wxPropertyListDialog(wxPropertyListView*,wxWindow*,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
-      __ct__20wxPropertyListDialogFP18wxPropertyListViewP8wxWindowRC8wxStringRC7wxPointRC6wxSizelT3
-      ;wxPropertyListDialog::sm_eventTable
-      sm_eventTable__20wxPropertyListDialog
-      ;wxPropertyStringListEditorDialog::sm_dialogCancelled
-      sm_dialogCancelled__32wxPropertyStringListEditorDialog
-      ;wxStringListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__21wxStringListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxColourListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__21wxColourListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxStringListValidator::OnPrepareDetailControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareDetailControls__21wxStringListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxColourListValidator::OnPrepareControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareControls__21wxColourListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxBoolListValidator::OnPrepareControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareControls__19wxBoolListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListValidator::OnEdit(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnEdit__23wxPropertyListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxStringListValidator::OnDoubleClick(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDoubleClick__21wxStringListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxStringListValidator::OnClearDetailControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnClearDetailControls__21wxStringListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxBoolListValidator::OnClearDetailControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnClearDetailControls__19wxBoolListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxListOfStringsListValidator::OnCheckValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnCheckValue__28wxListOfStringsListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxIntegerListValidator::OnCheckValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnCheckValue__22wxIntegerListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListView::UpdatePropertyList(unsigned long)
-      UpdatePropertyList__18wxPropertyListViewFUl
-      ;wxPropertyListPanel::sm_eventTable
-      sm_eventTable__19wxPropertyListPanel
-      __vft21wxColourListValidator8wxObject
-      ;wxPropertyStringListEditorDialog::OnText(wxCommandEvent&)
-      OnText__32wxPropertyStringListEditorDialogFR14wxCommandEvent
-      ;wxPropertyListPanel::OnSize(wxSizeEvent&)
-      OnSize__19wxPropertyListPanelFR11wxSizeEvent
-      ;wxPropertyStringListEditorDialog::OnOK(wxCommandEvent&)
-      OnOK__32wxPropertyStringListEditorDialogFR14wxCommandEvent
-      ;wxPropertyListFrame::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__19wxPropertyListFrameFR12wxCloseEvent
-      ;wxPropertyListView::FindListIndexForProperty(wxProperty*)
-      FindListIndexForProperty__18wxPropertyListViewFP10wxProperty
-      ;wxPropertyListView::RetrieveProperty(wxProperty*)
-      RetrieveProperty__18wxPropertyListViewFP10wxProperty
-      ;wxPropertyListView::EndShowingProperty(wxProperty*)
-      EndShowingProperty__18wxPropertyListViewFP10wxProperty
-      ;wxPropertyListView::DisplayProperty(wxProperty*)
-      DisplayProperty__18wxPropertyListViewFP10wxProperty
-      ;wxPropertyListView::BeginShowingProperty(wxProperty*)
-      BeginShowingProperty__18wxPropertyListViewFP10wxProperty
-      ;wxPropertyTextEdit::OnKillFocus()
-      OnKillFocus__18wxPropertyTextEditFv
-      ;wxConstructorForwxStringListValidator()
-      wxConstructorForwxStringListValidator__Fv
-      ;wxConstructorForwxPropertyListFrame()
-      wxConstructorForwxPropertyListFrame__Fv
-      ;wxConstructorForwxListOfStringsListValidator()
-      wxConstructorForwxListOfStringsListValidator__Fv
-      ;wxFilenameListValidator::~wxFilenameListValidator()
-      __dt__23wxFilenameListValidatorFv
-      ;wxColourListValidator::~wxColourListValidator()
-      __dt__21wxColourListValidatorFv
-      ;wxPropertyListFrame::Initialize()
-      Initialize__19wxPropertyListFrameFv
-      ;wxPropertyListDialog::GetEventTable() const
-      GetEventTable__20wxPropertyListDialogCFv
-      ;wxPropertyListView::BeginDetailedEditing()
-      BeginDetailedEditing__18wxPropertyListViewFv
-      ;wxPropertyListValidator::OnValueListSelect(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnValueListSelect__23wxPropertyListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListView::sm_eventTable
-      sm_eventTable__18wxPropertyListView
-      ;wxPropertyListDialog::sm_classwxPropertyListDialog
-      sm_classwxPropertyListDialog__20wxPropertyListDialog
-      ;wxRealListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__19wxRealListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxIntegerListValidator::OnPrepareControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareControls__22wxIntegerListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxStringListValidator::OnPrepareControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareControls__21wxStringListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxListOfStringsListValidator::OnEdit(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnEdit__28wxListOfStringsListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxColourListValidator::OnEdit(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnEdit__21wxColourListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxColourListValidator::OnDoubleClick(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDoubleClick__21wxColourListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxBoolListValidator::OnDoubleClick(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDoubleClick__19wxBoolListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxColourListValidator::OnDisplayValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDisplayValue__21wxColourListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListView::OnCheck(wxCommandEvent&)
-      OnCheck__18wxPropertyListViewFR14wxCommandEvent
-      __vft22wxIntegerListValidator8wxObject
-      ;wxPropertyListPanel::ProcessEvent(wxEvent&)
-      ProcessEvent__19wxPropertyListPanelFR7wxEvent
-      ;wxPropertyListView::OnValueListSelect(wxCommandEvent&)
-      OnValueListSelect__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyListView::OnText(wxCommandEvent&)
-      OnText__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyStringListEditorDialog::OnStrings(wxCommandEvent&)
-      OnStrings__32wxPropertyStringListEditorDialogFR14wxCommandEvent
-      ;wxPropertyListView::OnOk(wxCommandEvent&)
-      OnOk__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyListView::OnHelp(wxCommandEvent&)
-      OnHelp__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyStringListEditorDialog::OnCancel(wxCommandEvent&)
-      OnCancel__32wxPropertyStringListEditorDialogFR14wxCommandEvent
-      ;wxPropertyListFrame::sm_eventTableEntries
-      sm_eventTableEntries__19wxPropertyListFrame
-      ;wxPropertyListFrame::sm_eventTable
-      sm_eventTable__19wxPropertyListFrame
-      ;wxPropertyListView::GetEventTable() const
-      GetEventTable__18wxPropertyListViewCFv
-      ;wxConstructorForwxRealListValidator()
-      wxConstructorForwxRealListValidator__Fv
-      ;wxConstructorForwxPropertyListPanel()
-      wxConstructorForwxPropertyListPanel__Fv
-      ;wxConstructorForwxColourListValidator()
-      wxConstructorForwxColourListValidator__Fv
-      ;wxStringListValidator::sm_classwxStringListValidator
-      sm_classwxStringListValidator__21wxStringListValidator
-      ;wxPropertyListValidator::sm_classwxPropertyListValidator
-      sm_classwxPropertyListValidator__23wxPropertyListValidator
-      ;wxPropertyListPanel::~wxPropertyListPanel()
-      __dt__19wxPropertyListPanelFv
-      ;wxPropertyListView::~wxPropertyListView()
-      __dt__18wxPropertyListViewFv
-      ;wxBoolListValidator::OnDisplayValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDisplayValue__19wxBoolListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyStringListEditorDialog::sm_eventTable
-      sm_eventTable__32wxPropertyStringListEditorDialog
-      ;wxPropertyListView::sm_eventTableEntries
-      sm_eventTableEntries__18wxPropertyListView
-      ;wxBoolListValidator::OnPrepareDetailControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareDetailControls__19wxBoolListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxFilenameListValidator::OnEdit(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnEdit__23wxFilenameListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxColourListValidator::OnCheckValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnCheckValue__21wxColourListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxListOfStringsListValidator::EditStringList(wxWindow*,wxStringList*,const char*)
-      EditStringList__28wxListOfStringsListValidatorFP8wxWindowP12wxStringListPCc

   ;From object file:  ..\generic\sashwin.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSashWindow::OnSize(wxSizeEvent&)
   ;From object file:  ..\generic\sashwin.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSashWindow::OnSize(wxSizeEvent&)


@@ -9715,98 +9980,147 @@ EXPORTS
       sm_classwxSashWindow__12wxSashWindow
       ;wxSashWindow::sm_eventTableEntries
       sm_eventTableEntries__12wxSashWindow
       sm_classwxSashWindow__12wxSashWindow
       ;wxSashWindow::sm_eventTableEntries
       sm_eventTableEntries__12wxSashWindow

-  ;From object file:  ..\generic\scrolwin.cpp
+  ;From object file:  ..\generic\scrlwing.cpp

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

-      ;wxGenericScrolledWindow::OnChar(wxKeyEvent&)
-      OnChar__23wxGenericScrolledWindowFR10wxKeyEvent
+      ;wxScrollHelper::SendAutoScrollEvents(wxScrollWinEvent&) const
+      SendAutoScrollEvents__14wxScrollHelperCFR16wxScrollWinEvent

       __vft23wxGenericScrolledWindow8wxObject
       __vft23wxGenericScrolledWindow8wxObject

-      ;wxGenericScrolledWindow::GetVirtualSize(int*,int*) const
-      GetVirtualSize__23wxGenericScrolledWindowCFPiT1
+      ;wxScrollHelper::EnableScrolling(unsigned long,unsigned long)
+      EnableScrolling__14wxScrollHelperFUlT1
+      ;wxAutoScrollTimer::Notify()
+      Notify__17wxAutoScrollTimerFv
+      ;wxScrollHelper::DeleteEvtHandler()
+      DeleteEvtHandler__14wxScrollHelperFv
+      ;wxScrollHelper::wxScrollHelper(wxWindow*)
+      __ct__14wxScrollHelperFP8wxWindow

       ;wxGenericScrolledWindow::sm_eventTable
       sm_eventTable__23wxGenericScrolledWindow
       ;wxGenericScrolledWindow::sm_eventTable
       sm_eventTable__23wxGenericScrolledWindow

-      ;wxGenericScrolledWindow::OnScroll(wxScrollWinEvent&)
-      OnScroll__23wxGenericScrolledWindowFR16wxScrollWinEvent
-      ;wxGenericScrolledWindow::OnSize(wxSizeEvent&)
-      OnSize__23wxGenericScrolledWindowFR11wxSizeEvent
-      ;wxGenericScrolledWindow::CalcScrollInc(wxScrollWinEvent&)
-      CalcScrollInc__23wxGenericScrolledWindowFR16wxScrollWinEvent
-      ;wxGenericScrolledWindow::Scroll(int,int)
-      Scroll__23wxGenericScrolledWindowFiT1
-      ;wxGenericScrolledWindow::GetViewStart(int*,int*) const
-      GetViewStart__23wxGenericScrolledWindowCFPiT1
-      ;wxGenericScrolledWindow::EnableScrolling(unsigned long,unsigned long)
-      EnableScrolling__23wxGenericScrolledWindowFUlT1
+      ;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::CalcScrollInc(wxScrollWinEvent&)
+      CalcScrollInc__14wxScrollHelperFR16wxScrollWinEvent
+      ;wxScrollHelper::GetScrollPixelsPerUnit(int*,int*) const
+      GetScrollPixelsPerUnit__14wxScrollHelperCFPiT1
+      ;wxScrollHelper::Scroll(int,int)
+      Scroll__14wxScrollHelperFiT1
+      ;wxScrollHelper::~wxScrollHelper()
+      __dt__14wxScrollHelperFv

       ;wxConstructorForwxGenericScrolledWindow()
       wxConstructorForwxGenericScrolledWindow__Fv
       ;wxConstructorForwxGenericScrolledWindow()
       wxConstructorForwxGenericScrolledWindow__Fv

-      ;wxGenericScrolledWindow::PrepareDC(wxDC&)
-      PrepareDC__23wxGenericScrolledWindowFR4wxDC
+      __vft23wxGenericScrolledWindow14wxScrollHelper
+      ;wxScrollHelper::StopAutoScrolling()
+      StopAutoScrolling__14wxScrollHelperFv
+      ;wxScrollHelper::AdjustScrollbars()
+      AdjustScrollbars__14wxScrollHelperFv

       ;wxGenericScrolledWindow::sm_eventTableEntries
       sm_eventTableEntries__23wxGenericScrolledWindow
       ;wxGenericScrolledWindow::sm_eventTableEntries
       sm_eventTableEntries__23wxGenericScrolledWindow

-      ;wxGenericScrolledWindow::CalcUnscrolledPosition(int,int,int*,int*) const
-      CalcUnscrolledPosition__23wxGenericScrolledWindowCFiT1PiT3
-      ;wxGenericScrolledWindow::SetScrollbars(int,int,int,int,int,int,unsigned long)
-      SetScrollbars__23wxGenericScrolledWindowFiN51Ul
+      ;wxScrollHelper::HandleOnSize(wxSizeEvent&)
+      HandleOnSize__14wxScrollHelperFR11wxSizeEvent
+      ;wxScrollHelper::HandleOnPaint(wxPaintEvent&)
+      HandleOnPaint__14wxScrollHelperFR12wxPaintEvent
+      ;wxScrollHelper::SetScrollRate(int,int)
+      SetScrollRate__14wxScrollHelperFiT1
+      ;wxScrollHelper::GetTargetWindow() const
+      GetTargetWindow__14wxScrollHelperCFv
+      __vft14wxScrollHelper
+      ;wxGenericScrolledWindow::Layout()
+      Layout__23wxGenericScrolledWindowFv

       ;wxGenericScrolledWindow::GetEventTable() const
       GetEventTable__23wxGenericScrolledWindowCFv
       ;wxGenericScrolledWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__23wxGenericScrolledWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxGenericScrolledWindow::GetEventTable() const
       GetEventTable__23wxGenericScrolledWindowCFv
       ;wxGenericScrolledWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__23wxGenericScrolledWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString

-      ;wxGenericScrolledWindow::SetTargetWindow(wxWindow*)
-      SetTargetWindow__23wxGenericScrolledWindowFP8wxWindow
-      ;wxGenericScrolledWindow::CalcScrolledPosition(int,int,int*,int*) const
-      CalcScrolledPosition__23wxGenericScrolledWindowCFiT1PiT3
-      ;wxGenericScrolledWindow::GetScrollPageSize(int) const
-      GetScrollPageSize__23wxGenericScrolledWindowCFi
-      ;wxGenericScrolledWindow::SetScrollPageSize(int,int)
-      SetScrollPageSize__23wxGenericScrolledWindowFiT1
+      ;wxScrollHelper::DoCalcScrolledPosition(int,int,int*,int*) const
+      DoCalcScrolledPosition__14wxScrollHelperCFiT1PiT3
+      ;wxScrollHelper::HandleOnMouseEnter(wxMouseEvent&)
+      HandleOnMouseEnter__14wxScrollHelperFR12wxMouseEvent
+      ;wxScrollHelper::HandleOnMouseLeave(wxMouseEvent&)
+      HandleOnMouseLeave__14wxScrollHelperFR12wxMouseEvent
+      ;wxScrollHelper::HandleOnChar(wxKeyEvent&)
+      HandleOnChar__14wxScrollHelperFR10wxKeyEvent
+      ;wxScrollHelper::SetScrollPageSize(int,int)
+      SetScrollPageSize__14wxScrollHelperFiT1
+      ;wxScrollHelper::GetViewStart(int*,int*) const
+      GetViewStart__14wxScrollHelperCFPiT1

       ;wxGenericScrolledWindow::~wxGenericScrolledWindow()
       __dt__23wxGenericScrolledWindowFv
       ;wxGenericScrolledWindow::~wxGenericScrolledWindow()
       __dt__23wxGenericScrolledWindowFv

+      ;wxScrollHelper::SetTargetWindow(wxWindow*)
+      SetTargetWindow__14wxScrollHelperFP8wxWindow

       ;wxScrolledWindow::sm_classwxScrolledWindow
       sm_classwxScrolledWindow__16wxScrolledWindow
       ;wxScrolledWindow::sm_classwxScrolledWindow
       sm_classwxScrolledWindow__16wxScrolledWindow

+      ;wxScrollHelper::DoPrepareDC(wxDC&)
+      DoPrepareDC__14wxScrollHelperFR4wxDC
+      ;wxScrollHelperEvtHandler::ProcessEvent(wxEvent&)
+      ProcessEvent__24wxScrollHelperEvtHandlerFR7wxEvent
+      __vft24wxScrollHelperEvtHandler8wxObject
+      ;wxScrollHelper::SetScrollbars(int,int,int,int,int,int,unsigned long)
+      SetScrollbars__14wxScrollHelperFiN51Ul

       ;wxGenericScrolledWindow::OnPaint(wxPaintEvent&)
       OnPaint__23wxGenericScrolledWindowFR12wxPaintEvent
       ;wxGenericScrolledWindow::OnPaint(wxPaintEvent&)
       OnPaint__23wxGenericScrolledWindowFR12wxPaintEvent

-      ;wxGenericScrolledWindow::OnMouseWheel(wxMouseEvent&)
-      OnMouseWheel__23wxGenericScrolledWindowFR12wxMouseEvent
-      ;wxGenericScrolledWindow::GetScrollPixelsPerUnit(int*,int*) const
-      GetScrollPixelsPerUnit__23wxGenericScrolledWindowCFPiT1
-      ;wxGenericScrolledWindow::wxGenericScrolledWindow()
-      __ct__23wxGenericScrolledWindowFv
-      ;wxGenericScrolledWindow::GetTargetWindow()
-      GetTargetWindow__23wxGenericScrolledWindowFv
-      ;wxGenericScrolledWindow::AdjustScrollbars()
-      AdjustScrollbars__23wxGenericScrolledWindowFv
+      ;wxScrollHelper::GetScrollPageSize(int) const
+      GetScrollPageSize__14wxScrollHelperCFi
+      ;wxScrollHelper::SetWindow(wxWindow*)
+      SetWindow__14wxScrollHelperFP8wxWindow

       ;wxGenericScrolledWindow::sm_classwxGenericScrolledWindow
       sm_classwxGenericScrolledWindow__23wxGenericScrolledWindow
       ;wxGenericScrolledWindow::sm_classwxGenericScrolledWindow
       sm_classwxGenericScrolledWindow__23wxGenericScrolledWindow

+      ;wxScrollHelper::DoSetTargetWindow(wxWindow*)
+      DoSetTargetWindow__14wxScrollHelperFP8wxWindow
+  ;From object file:  ..\generic\spinctlg.cpp

   ;From object file:  ..\generic\splitter.cpp
     ;PUBDEFs (Symbols available from object file):
   ;From object file:  ..\generic\splitter.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxSplitterWindow::OnNavigationKey(wxNavigationKeyEvent&)
+      OnNavigationKey__16wxSplitterWindowFR20wxNavigationKeyEvent

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

-      ;wxSplitterWindow::OnUnsplitEvent(wxSplitterEvent&)
-      OnUnsplitEvent__16wxSplitterWindowFR15wxSplitterEvent
+      ;wxSplitterWindow::OnChildFocus(wxChildFocusEvent&)
+      OnChildFocus__16wxSplitterWindowFR17wxChildFocusEvent
+      ;wxSplitterWindow::RemoveChild(wxWindowBase*)
+      RemoveChild__16wxSplitterWindowFP12wxWindowBase

       ;wxSplitterWindow::ReplaceWindow(wxWindow*,wxWindow*)
       ReplaceWindow__16wxSplitterWindowFP8wxWindowT1
       ;wxSplitterWindow::ReplaceWindow(wxWindow*,wxWindow*)
       ReplaceWindow__16wxSplitterWindowFP8wxWindowT1

+      ;wxSplitterWindow::AdjustSashPosition(int) const
+      AdjustSashPosition__16wxSplitterWindowCFi
+      ;wxSplitterWindow::GetDefaultItem() const
+      GetDefaultItem__16wxSplitterWindowCFv

       ;wxSplitterWindow::InitColours()
       InitColours__16wxSplitterWindowFv
       ;wxSplitterWindow::InitColours()
       InitColours__16wxSplitterWindowFv

-      ;wxSplitterWindow::OnSetCursor(wxSetCursorEvent&)
-      OnSetCursor__16wxSplitterWindowFR16wxSetCursorEvent
+      ;wxSplitterWindow::SetDefaultItem(wxWindow*)
+      SetDefaultItem__16wxSplitterWindowFP8wxWindow
+      ;wxSplitterWindow::SetTmpDefaultItem(wxWindow*)
+      SetTmpDefaultItem__16wxSplitterWindowFP8wxWindow
+      ;wxSplitterWindow::OnFocus(wxFocusEvent&)
+      OnFocus__16wxSplitterWindowFR12wxFocusEvent

       wxEVT_COMMAND_SPLITTER_UNSPLIT
       __vft16wxSplitterWindow8wxObject
       wxEVT_COMMAND_SPLITTER_UNSPLIT
       __vft16wxSplitterWindow8wxObject

+      ;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()
       wxConstructorForwxSplitterWindow__Fv
       ;wxSplitterWindow::~wxSplitterWindow()
       __dt__16wxSplitterWindowFv
       ;wxSplitterWindow::DrawSashTracker(int,int)
       DrawSashTracker__16wxSplitterWindowFiT1
       ;wxConstructorForwxSplitterWindow()
       wxConstructorForwxSplitterWindow__Fv
       ;wxSplitterWindow::~wxSplitterWindow()
       __dt__16wxSplitterWindowFv

+      ;wxSplitterWindow::SetFocus()
+      SetFocus__16wxSplitterWindowFv

       wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING
       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&)


@@ -9814,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&)


@@ -9837,59 +10155,53 @@ 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):
   ;From object file:  ..\generic\statusbr.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxStatusBarGeneric::SetMinHeight(int)
-      SetMinHeight__18wxStatusBarGenericFi
-      ;wxStatusBarGeneric::sm_eventTableEntries
-      sm_eventTableEntries__18wxStatusBarGeneric
-      ;wxStatusBarGeneric::OnPaint(wxPaintEvent&)
-      OnPaint__18wxStatusBarGenericFR12wxPaintEvent
-      ;wxStatusBarGeneric::SetStatusText(const wxString&,int)
-      SetStatusText__18wxStatusBarGenericFRC8wxStringi
-      ;wxStatusBarGeneric::GetEventTable() const
-      GetEventTable__18wxStatusBarGenericCFv
-      ;wxStatusBar::sm_classwxStatusBar
-      sm_classwxStatusBar__11wxStatusBar
-      ;wxStatusBarGeneric::sm_eventTable
-      sm_eventTable__18wxStatusBarGeneric
-      ;wxStatusBarGeneric::SetFieldsCount(int,const int*)
-      SetFieldsCount__18wxStatusBarGenericFiPCi
-      ;wxStatusBarGeneric::DrawFieldText(wxDC&,int)
-      DrawFieldText__18wxStatusBarGenericFR4wxDCi
-      ;wxStatusBarGeneric::wxStatusBarGeneric()
-      __ct__18wxStatusBarGenericFv
-      ;wxStatusBarGeneric::~wxStatusBarGeneric()
-      __dt__18wxStatusBarGenericFv
-      ;wxStatusBarGeneric::InitColours()
-      InitColours__18wxStatusBarGenericFv
-      ;wxStatusBarGeneric::GetStatusText(int) const
-      GetStatusText__18wxStatusBarGenericCFi
-      ;wxConstructorForwxStatusBarGeneric()
-      wxConstructorForwxStatusBarGeneric__Fv
-      ;wxConstructorForwxStatusBar()
-      wxConstructorForwxStatusBar__Fv
-      ;wxStatusBarGeneric::Create(wxWindow*,int,long,const wxString&)
-      Create__18wxStatusBarGenericFP8wxWindowilRC8wxString
-      ;wxStatusBarGeneric::sm_classwxStatusBarGeneric
-      sm_classwxStatusBarGeneric__18wxStatusBarGeneric
-      ;wxStatusBarGeneric::GetFieldRect(int,wxRect&) const
-      GetFieldRect__18wxStatusBarGenericCFiR6wxRect
-      __vft18wxStatusBarGeneric8wxObject
-      ;wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent&)
-      OnSysColourChanged__18wxStatusBarGenericFR23wxSysColourChangedEvent
-      ;wxStatusBarGeneric::SetStatusWidths(int,const int*)
-      SetStatusWidths__18wxStatusBarGenericFiPCi
-      ;wxStatusBarGeneric::DrawField(wxDC&,int)
-      DrawField__18wxStatusBarGenericFR4wxDCi
+      ;wxStatusBar::GetFieldRect(int,wxRect&) const
+      GetFieldRect__11wxStatusBarCFiR6wxRect
+      ;wxStatusBar::SetStatusWidths(int,const int*)
+      SetStatusWidths__11wxStatusBarFiPCi
+      ;wxStatusBar::DrawField(wxDC&,int)
+      DrawField__11wxStatusBarFR4wxDCi
+      ;wxStatusBar::DrawFieldText(wxDC&,int)
+      DrawFieldText__11wxStatusBarFR4wxDCi
+      ;wxStatusBar::InitColours()
+      InitColours__11wxStatusBarFv
+      ;wxStatusBar::Create(wxWindow*,int,long,const wxString&)
+      Create__11wxStatusBarFP8wxWindowilRC8wxString
+      ;wxStatusBar::OnPaint(wxPaintEvent&)
+      OnPaint__11wxStatusBarFR12wxPaintEvent
+      ;wxStatusBar::GetStatusText(int) const
+      GetStatusText__11wxStatusBarCFi
+      ;wxStatusBar::SetFieldsCount(int,const int*)
+      SetFieldsCount__11wxStatusBarFiPCi
+      ;wxStatusBar::SetStatusText(const wxString&,int)
+      SetStatusText__11wxStatusBarFRC8wxStringi
+      ;wxStatusBar::SetMinHeight(int)
+      SetMinHeight__11wxStatusBarFi
+      ;wxStatusBar::~wxStatusBar()
+      __dt__11wxStatusBarFv
+      ;wxStatusBar::OnSysColourChanged(wxSysColourChangedEvent&)
+      OnSysColourChanged__11wxStatusBarFR23wxSysColourChangedEvent
+      __vft11wxStatusBar8wxObject
+      ;wxStatusBar::GetEventTable() const
+      GetEventTable__11wxStatusBarCFv
+      ;wxStatusBar::sm_eventTable
+      sm_eventTable__11wxStatusBar
+      ;wxStatusBar::sm_eventTableEntries
+      sm_eventTableEntries__11wxStatusBar
+      ;wxStatusBar::wxStatusBar()
+      __ct__11wxStatusBarFv

   ;From object file:  ..\generic\tabg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTabControl::OnDraw(wxDC&,unsigned long)
   ;From object file:  ..\generic\tabg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTabControl::OnDraw(wxDC&,unsigned long)


@@ -10016,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


@@ -10025,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


@@ -10049,10 +10367,12 @@ EXPORTS
       __ct__11wxTipDialogFP8wxWindowP13wxTipProviderUl
   ;From object file:  ..\generic\tipwin.cpp
     ;PUBDEFs (Symbols available from object file):
       __ct__11wxTipDialogFP8wxWindowP13wxTipProviderUl
   ;From object file:  ..\generic\tipwin.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxTipWindow::OnKillFocus(wxFocusEvent&)
-      OnKillFocus__11wxTipWindowFR12wxFocusEvent
-      ;wxTipWindow::wxTipWindow(wxWindow*,const wxString&,int,wxTipWindow**)
-      __ct__11wxTipWindowFP8wxWindowRC8wxStringiPP11wxTipWindow
+      ;wxTipWindow::SetBoundingRect(const wxRect&)
+      SetBoundingRect__11wxTipWindowFRC6wxRect
+      ;wxTipWindowView::OnMouseMove(wxMouseEvent&)
+      OnMouseMove__15wxTipWindowViewFR12wxMouseEvent
+      ;wxTipWindow::OnDismiss()
+      OnDismiss__11wxTipWindowFv

       ;wxTipWindowView::sm_eventTable
       sm_eventTable__15wxTipWindowView
       ;wxTipWindowView::OnMouseClick(wxMouseEvent&)
       ;wxTipWindowView::sm_eventTable
       sm_eventTable__15wxTipWindowView
       ;wxTipWindowView::OnMouseClick(wxMouseEvent&)


@@ -10060,25 +10380,25 @@ EXPORTS
       __vft11wxTipWindow8wxObject
       ;wxTipWindowView::GetEventTable() const
       GetEventTable__15wxTipWindowViewCFv
       __vft11wxTipWindow8wxObject
       ;wxTipWindowView::GetEventTable() const
       GetEventTable__15wxTipWindowViewCFv

+      ;wxTipWindow::Close()
+      Close__11wxTipWindowFv

       ;wxTipWindow::OnMouseClick(wxMouseEvent&)
       OnMouseClick__11wxTipWindowFR12wxMouseEvent
       ;wxTipWindow::OnMouseClick(wxMouseEvent&)
       OnMouseClick__11wxTipWindowFR12wxMouseEvent

-      ;wxTipWindowView::OnKillFocus(wxFocusEvent&)
-      OnKillFocus__15wxTipWindowViewFR12wxFocusEvent

       ;wxTipWindow::GetEventTable() const
       GetEventTable__11wxTipWindowCFv
       ;wxTipWindow::~wxTipWindow()
       __dt__11wxTipWindowFv
       ;wxTipWindow::sm_eventTable
       sm_eventTable__11wxTipWindow
       ;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::OnPaint(wxPaintEvent&)
       OnPaint__15wxTipWindowViewFR12wxPaintEvent

-      __vft15wxTipWindowView8wxObject

       ;wxTipWindowView::wxTipWindowView(wxWindow*)
       __ct__15wxTipWindowViewFP8wxWindow
       ;wxTipWindow::sm_eventTableEntries
       sm_eventTableEntries__11wxTipWindow
       ;wxTipWindowView::wxTipWindowView(wxWindow*)
       __ct__15wxTipWindowViewFP8wxWindow
       ;wxTipWindow::sm_eventTableEntries
       sm_eventTableEntries__11wxTipWindow

-      ;wxTipWindow::OnActivate(wxActivateEvent&)
-      OnActivate__11wxTipWindowFR15wxActivateEvent

       ;wxTipWindowView::Adjust(const wxString&,int)
       Adjust__15wxTipWindowViewFRC8wxStringi
       ;wxTipWindowView::sm_eventTableEntries
       ;wxTipWindowView::Adjust(const wxString&,int)
       Adjust__15wxTipWindowViewFRC8wxStringi
       ;wxTipWindowView::sm_eventTableEntries


@@ -10115,24 +10435,30 @@ EXPORTS
       RefreshSubtree__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem*,wxDC&,int,int&)
       PaintLevel__17wxGenericTreeCtrlFP17wxGenericTreeItemR4wxDCiRi
       RefreshSubtree__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem*,wxDC&,int,int&)
       PaintLevel__17wxGenericTreeCtrlFP17wxGenericTreeItemR4wxDCiRi

+      ;wxGenericTreeItem::HitTest(const wxPoint&,const wxGenericTreeCtrl*,int&,int)
+      HitTest__17wxGenericTreeItemFRC7wxPointPC17wxGenericTreeCtrlRii

       ;wxGenericTreeCtrl::OnRenameTimer()
       OnRenameTimer__17wxGenericTreeCtrlFv
       ;wxConstructorForwxGenericTreeCtrl()
       wxConstructorForwxGenericTreeCtrl__Fv
       ;wxGenericTreeCtrl::OnRenameTimer()
       OnRenameTimer__17wxGenericTreeCtrlFv
       ;wxConstructorForwxGenericTreeCtrl()
       wxConstructorForwxGenericTreeCtrl__Fv

+      ;wxGenericTreeCtrl::RefreshSelected()
+      RefreshSelected__17wxGenericTreeCtrlFv

       ;wxGenericTreeCtrl::GetFirstVisibleItem() const
       GetFirstVisibleItem__17wxGenericTreeCtrlCFv
       ;wxGenericTreeCtrl::GetFirstVisibleItem() const
       GetFirstVisibleItem__17wxGenericTreeCtrlCFv

+      ;wxGenericTreeCtrl::CalculateLineHeight()
+      CalculateLineHeight__17wxGenericTreeCtrlFv

       ;wxGenericTreeCtrl::AdjustMyScrollbars()
       AdjustMyScrollbars__17wxGenericTreeCtrlFv
       ;wxGenericTreeItem::SetText(const wxString&)
       SetText__17wxGenericTreeItemFRC8wxString
       ;wxGenericTreeCtrl::GetSelections(wxArrayTreeItemIds&) const
       GetSelections__17wxGenericTreeCtrlCFR18wxArrayTreeItemIds
       ;wxGenericTreeCtrl::AdjustMyScrollbars()
       AdjustMyScrollbars__17wxGenericTreeCtrlFv
       ;wxGenericTreeItem::SetText(const wxString&)
       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
       sm_eventTableEntries__14wxTreeTextCtrl
       ;wxGenericTreeCtrl::Edit(const wxTreeItemId&)
       Edit__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxTreeTextCtrl::sm_eventTableEntries
       sm_eventTableEntries__14wxTreeTextCtrl

-      ;wxTreeTextCtrl::sm_classwxTreeTextCtrl
-      sm_classwxTreeTextCtrl__14wxTreeTextCtrl

       __vft17wxGenericTreeCtrl8wxObject
       ;wxGenericTreeCtrl::SetItemBold(const wxTreeItemId&,unsigned long)
       SetItemBold__17wxGenericTreeCtrlFRC12wxTreeItemIdUl
       __vft17wxGenericTreeCtrl8wxObject
       ;wxGenericTreeCtrl::SetItemBold(const wxTreeItemId&,unsigned long)
       SetItemBold__17wxGenericTreeCtrlFRC12wxTreeItemIdUl


@@ -10150,8 +10476,6 @@ EXPORTS
       DeleteChildren__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeCtrl::Collapse(const wxTreeItemId&)
       Collapse__17wxGenericTreeCtrlFRC12wxTreeItemId
       DeleteChildren__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeCtrl::Collapse(const wxTreeItemId&)
       Collapse__17wxGenericTreeCtrlFRC12wxTreeItemId

-      ;wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem*,const wxString&,wxDC&,int,int,wxTreeItemData*)
-      __ct__17wxGenericTreeItemFP17wxGenericTreeItemRC8wxStringR4wxDCiT4P14wxTreeItemData

       ;wxGenericTreeCtrl::SetSpacing(unsigned int)
       SetSpacing__17wxGenericTreeCtrlFUi
       ;wxGenericTreeCtrl::PrependItem(const wxTreeItemId&,const wxString&,int,int,wxTreeItemData*)
       ;wxGenericTreeCtrl::SetSpacing(unsigned int)
       SetSpacing__17wxGenericTreeCtrlFUi
       ;wxGenericTreeCtrl::PrependItem(const wxTreeItemId&,const wxString&,int,int,wxTreeItemData*)


@@ -10164,6 +10488,8 @@ EXPORTS
       __dt__17wxGenericTreeCtrlFv
       ;wxConstructorForwxTreeCtrl()
       wxConstructorForwxTreeCtrl__Fv
       __dt__17wxGenericTreeCtrlFv
       ;wxConstructorForwxTreeCtrl()
       wxConstructorForwxTreeCtrl__Fv

+      ;wxGenericTreeCtrl::SetForegroundColour(const wxColour&)
+      SetForegroundColour__17wxGenericTreeCtrlFRC8wxColour

       ;wxGenericTreeCtrl::GetStateImageList() const
       GetStateImageList__17wxGenericTreeCtrlCFv
       ;wxGenericTreeCtrl::GetImageList() const
       ;wxGenericTreeCtrl::GetStateImageList() const
       GetStateImageList__17wxGenericTreeCtrlCFv
       ;wxGenericTreeCtrl::GetImageList() const


@@ -10180,6 +10506,8 @@ EXPORTS
       SetItemFont__17wxGenericTreeCtrlFRC12wxTreeItemIdRC6wxFont
       ;wxGenericTreeCtrl::SetFont(const wxFont&)
       SetFont__17wxGenericTreeCtrlFRC6wxFont
       SetItemFont__17wxGenericTreeCtrlFRC12wxTreeItemIdRC6wxFont
       ;wxGenericTreeCtrl::SetFont(const wxFont&)
       SetFont__17wxGenericTreeCtrlFRC6wxFont

+      ;wxGenericTreeCtrl::SetButtonsImageList(wxImageList*)
+      SetButtonsImageList__17wxGenericTreeCtrlFP11wxImageList

       ;wxGenericTreeCtrl::OnPaint(wxPaintEvent&)
       OnPaint__17wxGenericTreeCtrlFR12wxPaintEvent
       ;wxTreeTextCtrl::OnKeyUp(wxKeyEvent&)
       ;wxGenericTreeCtrl::OnPaint(wxPaintEvent&)
       OnPaint__17wxGenericTreeCtrlFR12wxPaintEvent
       ;wxTreeTextCtrl::OnKeyUp(wxKeyEvent&)


@@ -10204,20 +10532,20 @@ EXPORTS
       DrawBorder__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeCtrl::Delete(const wxTreeItemId&)
       Delete__17wxGenericTreeCtrlFRC12wxTreeItemId
       DrawBorder__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeCtrl::Delete(const wxTreeItemId&)
       Delete__17wxGenericTreeCtrlFRC12wxTreeItemId

+      ;wxGenericTreeCtrl::AssignButtonsImageList(wxImageList*)
+      AssignButtonsImageList__17wxGenericTreeCtrlFP11wxImageList

       ;wxGenericTreeCtrl::HitTest(const wxPoint&,int&)
       HitTest__17wxGenericTreeCtrlFRC7wxPointRi
       ;wxGenericTreeCtrl::HitTest(const wxPoint&,int&)
       HitTest__17wxGenericTreeCtrlFRC7wxPointRi

-      ;wxGenericTreeItem::HitTest(const wxPoint&,const wxGenericTreeCtrl*,int&)
-      HitTest__17wxGenericTreeItemFRC7wxPointPC17wxGenericTreeCtrlRi
+      ;wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl*,wxGenericTreeItem*)
+      __ct__14wxTreeTextCtrlFP17wxGenericTreeCtrlP17wxGenericTreeItem

       ;wxGenericTreeCtrl::GetItemImage(const wxTreeItemId&,wxTreeItemIcon) const
       GetItemImage__17wxGenericTreeCtrlCFRC12wxTreeItemId14wxTreeItemIcon
       ;wxGenericTreeCtrl::GetItemImage(const wxTreeItemId&,wxTreeItemIcon) const
       GetItemImage__17wxGenericTreeCtrlCFRC12wxTreeItemId14wxTreeItemIcon

-      ;wxConstructorForwxTreeTextCtrl()
-      wxConstructorForwxTreeTextCtrl__Fv

       ;wxGenericTreeItem::~wxGenericTreeItem()
       __dt__17wxGenericTreeItemFv
       ;wxGenericTreeCtrl::Unselect()
       Unselect__17wxGenericTreeCtrlFv
       ;wxGenericTreeItem::~wxGenericTreeItem()
       __dt__17wxGenericTreeItemFv
       ;wxGenericTreeCtrl::Unselect()
       Unselect__17wxGenericTreeCtrlFv

-      ;wxGenericTreeCtrl::OnRenameAccept()
-      OnRenameAccept__17wxGenericTreeCtrlFv
+      ;wxGenericTreeCtrl::SetBackgroundColour(const wxColour&)
+      SetBackgroundColour__17wxGenericTreeCtrlFRC8wxColour

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


@@ -10226,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


@@ -10247,8 +10577,6 @@ EXPORTS
       OnKillFocus__14wxTreeTextCtrlFR12wxFocusEvent
       ;wxGenericTreeCtrl::OnChar(wxKeyEvent&)
       OnChar__17wxGenericTreeCtrlFR10wxKeyEvent
       OnKillFocus__14wxTreeTextCtrlFR12wxFocusEvent
       ;wxGenericTreeCtrl::OnChar(wxKeyEvent&)
       OnChar__17wxGenericTreeCtrlFR10wxKeyEvent

-      ;wxGenericTreeCtrl::GetPrev(const wxTreeItemId&) const
-      GetPrev__17wxGenericTreeCtrlCFRC12wxTreeItemId

       ;wxGenericTreeCtrl::GetPrevVisible(const wxTreeItemId&) const
       GetPrevVisible__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::GetPrevSibling(const wxTreeItemId&) const
       ;wxGenericTreeCtrl::GetPrevVisible(const wxTreeItemId&) const
       GetPrevVisible__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::GetPrevSibling(const wxTreeItemId&) const


@@ -10269,8 +10597,6 @@ EXPORTS
       SetItemData__17wxGenericTreeCtrlFRC12wxTreeItemIdP14wxTreeItemData
       ;wxGenericTreeCtrl::SetIndent(unsigned int)
       SetIndent__17wxGenericTreeCtrlFUi
       SetItemData__17wxGenericTreeCtrlFRC12wxTreeItemIdP14wxTreeItemData
       ;wxGenericTreeCtrl::SetIndent(unsigned int)
       SetIndent__17wxGenericTreeCtrlFUi

-      ;wxGenericTreeItem::SetCross(int,int)
-      SetCross__17wxGenericTreeItemFiT1

       ;wxGenericTreeCtrl::OnCompareItems(const wxTreeItemId&,const wxTreeItemId&)
       OnCompareItems__17wxGenericTreeCtrlFRC12wxTreeItemIdT1
       ;wxGenericTreeCtrl::InsertItem(const wxTreeItemId&,unsigned int,const wxString&,int,int,wxTreeItemData*)
       ;wxGenericTreeCtrl::OnCompareItems(const wxTreeItemId&,const wxTreeItemId&)
       OnCompareItems__17wxGenericTreeCtrlFRC12wxTreeItemIdT1
       ;wxGenericTreeCtrl::InsertItem(const wxTreeItemId&,unsigned int,const wxString&,int,int,wxTreeItemData*)


@@ -10283,12 +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::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&)


@@ -10300,6 +10628,8 @@ EXPORTS
       __vft17wxTreeRenameTimer8wxObject
       ;wxGenericTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem*,wxGenericTreeItem*,unsigned long)
       TagAllChildrenUntilLast__17wxGenericTreeCtrlFP17wxGenericTreeItemT1Ul
       __vft17wxTreeRenameTimer8wxObject
       ;wxGenericTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem*,wxGenericTreeItem*,unsigned long)
       TagAllChildrenUntilLast__17wxGenericTreeCtrlFP17wxGenericTreeItemT1Ul

+      ;wxGenericTreeCtrl::SetWindowStyle(const long)
+      SetWindowStyle__17wxGenericTreeCtrlFCl

       ;wxGenericTreeCtrl::GetNextVisible(const wxTreeItemId&) const
       GetNextVisible__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::GetItemData(const wxTreeItemId&) const
       ;wxGenericTreeCtrl::GetNextVisible(const wxTreeItemId&) const
       GetNextVisible__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::GetItemData(const wxTreeItemId&) const


@@ -10308,82 +10638,33 @@ EXPORTS
       EnsureVisible__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeCtrl::CollapseAndReset(const wxTreeItemId&)
       CollapseAndReset__17wxGenericTreeCtrlFRC12wxTreeItemId
       EnsureVisible__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeCtrl::CollapseAndReset(const wxTreeItemId&)
       CollapseAndReset__17wxGenericTreeCtrlFRC12wxTreeItemId

-      ;wxGenericTreeCtrl::RefreshLine(wxGenericTreeItem*)
-      RefreshLine__17wxGenericTreeCtrlFP17wxGenericTreeItem
+      ;wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem*,const wxString&,int,int,wxTreeItemData*)
+      __ct__17wxGenericTreeItemFP17wxGenericTreeItemRC8wxStringiT3P14wxTreeItemData

       ;wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem*,wxGenericTreeItem*)
       SelectItemRange__17wxGenericTreeCtrlFP17wxGenericTreeItemT1
       ;wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem*,wxGenericTreeItem*)
       SelectItemRange__17wxGenericTreeCtrlFP17wxGenericTreeItemT1

+      ;wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem*)
+      RefreshSelectedUnder__17wxGenericTreeCtrlFP17wxGenericTreeItem
+      ;wxGenericTreeCtrl::RefreshLine(wxGenericTreeItem*)
+      RefreshLine__17wxGenericTreeCtrlFP17wxGenericTreeItem

       ;wxGenericTreeCtrl::DrawDropEffect(wxGenericTreeItem*)
       DrawDropEffect__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxTreeRenameTimer::Notify()
       Notify__17wxTreeRenameTimerFv
       ;wxGenericTreeCtrl::DrawDropEffect(wxGenericTreeItem*)
       DrawDropEffect__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxTreeRenameTimer::Notify()
       Notify__17wxTreeRenameTimerFv

+      __vft17wxGenericTreeCtrl14wxScrollHelper

       ;wxGenericTreeCtrl::UnselectAll()
       UnselectAll__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::SetItemTextColour(const wxTreeItemId&,const wxColour&)
       SetItemTextColour__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxColour
       ;wxGenericTreeCtrl::SetItemBackgroundColour(const wxTreeItemId&,const wxColour&)
       SetItemBackgroundColour__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxColour
       ;wxGenericTreeCtrl::UnselectAll()
       UnselectAll__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::SetItemTextColour(const wxTreeItemId&,const wxColour&)
       SetItemTextColour__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxColour
       ;wxGenericTreeCtrl::SetItemBackgroundColour(const wxTreeItemId&,const wxColour&)
       SetItemBackgroundColour__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxColour

-      ;wxGenericTreeItem::Reset()
-      Reset__17wxGenericTreeItemFv

       ;wxTreeTextCtrl::GetEventTable() const
       GetEventTable__14wxTreeTextCtrlCFv
       ;wxTreeTextCtrl::GetEventTable() const
       GetEventTable__14wxTreeTextCtrlCFv

+      ;wxTreeTextCtrl::Finish()
+      Finish__14wxTreeTextCtrlFv

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

-    ;PUBDEFs (Symbols available from object file):
-      ;wxWizard::wxWizard(wxWindow*,int,const wxString&,const wxBitmap&,const wxPoint&)
-      __ct__8wxWizardFP8wxWindowiRC8wxStringRC8wxBitmapRC7wxPoint
-      __vft8wxWizard8wxObject
-      ;wxWizard::OnCancel(wxCommandEvent&)
-      OnCancel__8wxWizardFR14wxCommandEvent
-      ;wxWizard::SetPageSize(const wxSize&)
-      SetPageSize__8wxWizardFRC6wxSize
-      ;wxWizard::RunWizard(wxWizardPage*)
-      RunWizard__8wxWizardFP12wxWizardPage
-      ;wxWizard::GetEventTable() const
-      GetEventTable__8wxWizardCFv
-      ;wxConstructorForwxWizardPageSimple()
-      wxConstructorForwxWizardPageSimple__Fv
-      ;wxWizard::GetPageSize() const
-      GetPageSize__8wxWizardCFv
-      wxEVT_WIZARD_PAGE_CHANGING
-      ;wxWizard::OnBackOrNext(wxCommandEvent&)
-      OnBackOrNext__8wxWizardFR14wxCommandEvent
-      ;wxWizardPageSimple::sm_classwxWizardPageSimple
-      sm_classwxWizardPageSimple__18wxWizardPageSimple
-      ;wxWizardPageSimple::GetPrev() const
-      GetPrev__18wxWizardPageSimpleCFv
-      ;wxWizardEvent::sm_classwxWizardEvent
-      sm_classwxWizardEvent__13wxWizardEvent
-      wxEVT_WIZARD_CANCEL
-      ;wxConstructorForwxWizard()
-      wxConstructorForwxWizard__Fv
-      ;wxConstructorForwxWizardEvent()
-      wxConstructorForwxWizardEvent__Fv
-      ;wxWizardPageSimple::GetNext() const
-      GetNext__18wxWizardPageSimpleCFv
-      ;wxWizard::sm_classwxWizard
-      sm_classwxWizard__8wxWizard
-      wxEVT_WIZARD_PAGE_CHANGED
-      ;wxWizard::sm_eventTable
-      sm_eventTable__8wxWizard
-      ;wxWizard::sm_eventTableEntries
-      sm_eventTableEntries__8wxWizard
-      ;wxWizard::DoCreateControls()
-      DoCreateControls__8wxWizardFv
-      ;wxWizard::GetCurrentPage() const
-      GetCurrentPage__8wxWizardCFv
-      ;wxWizardPage::wxWizardPage(wxWizard*,const wxBitmap&)
-      __ct__12wxWizardPageFP8wxWizardRC8wxBitmap
-      __vft18wxWizardPageSimple8wxObject
-      ;wxWizardEvent::wxWizardEvent(int,int,unsigned long)
-      __ct__13wxWizardEventFiT1Ul
-      ;wxWizard::ShowPage(wxWizardPage*,unsigned long)
-      ShowPage__8wxWizardFP12wxWizardPageUl
-      ;wxWizardBase::Create(wxWindow*,int,const wxString&,const wxBitmap&,const wxPoint&,const wxSize&)
-      Create__12wxWizardBaseFP8wxWindowiRC8wxStringRC8wxBitmapRC7wxPointRC6wxSize
-      ;wxWizardPage::sm_classwxWizardPage
-      sm_classwxWizardPage__12wxWizardPage

   ;From object file:  ..\html\helpctrl.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlHelpController::DisplayTextPopup(const wxString&,const wxPoint&)
   ;From object file:  ..\html\helpctrl.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlHelpController::DisplayTextPopup(const wxString&,const wxPoint&)


@@ -10396,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


@@ -10405,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&)


@@ -10423,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)


@@ -10439,20 +10736,18 @@ EXPORTS
       Index__18wxHtmlBookRecArrayCFRC16wxHtmlBookRecordUl
       __vft14wxHtmlHelpData8wxObject
       __vft13HP_TagHandler8wxObject
       Index__18wxHtmlBookRecArrayCFRC16wxHtmlBookRecordUl
       __vft14wxHtmlHelpData8wxObject
       __vft13HP_TagHandler8wxObject

-      ;wxHtmlBookRecArray::RemoveAt(unsigned int)
-      RemoveAt__18wxHtmlBookRecArrayFUi
+      ;wxHtmlBookRecArray::operator=(const wxHtmlBookRecArray&)
+      __as__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray

       ;wxHtmlHelpData::sm_classwxHtmlHelpData
       sm_classwxHtmlHelpData__14wxHtmlHelpData
       ;wxHtmlBookRecArray::wxHtmlBookRecArray(const wxHtmlBookRecArray&)
       __ct__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray
       ;wxHtmlHelpData::sm_classwxHtmlHelpData
       sm_classwxHtmlHelpData__14wxHtmlHelpData
       ;wxHtmlBookRecArray::wxHtmlBookRecArray(const wxHtmlBookRecArray&)
       __ct__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray

-      ;wxHtmlBookRecArray::operator=(const wxHtmlBookRecArray&)
-      __as__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray

       ;HP_TagHandler::WriteOut(wxHtmlContentsItem*&,int&)
       WriteOut__13HP_TagHandlerFRP18wxHtmlContentsItemRi
       ;wxHtmlBookRecArray::DoEmpty()
       DoEmpty__18wxHtmlBookRecArrayFv
       ;HP_TagHandler::WriteOut(wxHtmlContentsItem*&,int&)
       WriteOut__13HP_TagHandlerFRP18wxHtmlContentsItemRi
       ;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*)


@@ -10470,10 +10765,9 @@ 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
       ;wxHtmlBookRecArray::~wxHtmlBookRecArray()
       __dt__18wxHtmlBookRecArrayFv

+      wxHtmlHelpIndexCompareFunc

       ;wxHtmlHelpData::SetTempDir(const wxString&)
       SetTempDir__14wxHtmlHelpDataFRC8wxString
       ;wxHtmlHelpData::FindPageByName(const wxString&)
       ;wxHtmlHelpData::SetTempDir(const wxString&)
       SetTempDir__14wxHtmlHelpDataFRC8wxString
       ;wxHtmlHelpData::FindPageByName(const wxString&)


@@ -10524,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


@@ -10546,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&)


@@ -10575,6 +10871,8 @@ EXPORTS
       __vft14wxHtmlFontCell8wxObject
       ;wxHtmlContainerCell::OnMouseClick(wxWindow*,int,int,const wxMouseEvent&)
       OnMouseClick__19wxHtmlContainerCellFP8wxWindowiT2RC12wxMouseEvent
       __vft14wxHtmlFontCell8wxObject
       ;wxHtmlContainerCell::OnMouseClick(wxWindow*,int,int,const wxMouseEvent&)
       OnMouseClick__19wxHtmlContainerCellFP8wxWindowiT2RC12wxMouseEvent

+      ;wxHtmlContainerCell::GetHorizontalConstraints(int*,int*) const
+      GetHorizontalConstraints__19wxHtmlContainerCellCFPiT1

       ;wxHtmlCell::~wxHtmlCell()
       __dt__10wxHtmlCellFv
       ;wxHtmlContainerCell::Find(int,const void*) const
       ;wxHtmlCell::~wxHtmlCell()
       __dt__10wxHtmlCellFv
       ;wxHtmlContainerCell::Find(int,const void*) const


@@ -10608,6 +10906,8 @@ EXPORTS
       GetLink__19wxHtmlContainerCellCFiT1
       ;wxHtmlContainerCell::GetIndent(int) const
       GetIndent__19wxHtmlContainerCellCFi
       GetLink__19wxHtmlContainerCellCFiT1
       ;wxHtmlContainerCell::GetIndent(int) const
       GetIndent__19wxHtmlContainerCellCFi

+      ;wxHtmlCell::FindCellByPos(int,int) const
+      FindCellByPos__10wxHtmlCellCFiT1

       ;wxHtmlWordCell::Draw(wxDC&,int,int,int,int)
       Draw__14wxHtmlWordCellFR4wxDCiN32
       ;wxHtmlContainerCell::Draw(wxDC&,int,int,int,int)
       ;wxHtmlWordCell::Draw(wxDC&,int,int,int,int)
       Draw__14wxHtmlWordCellFR4wxDCiN32
       ;wxHtmlContainerCell::Draw(wxDC&,int,int,int,int)


@@ -10620,28 +10920,28 @@ EXPORTS
       __vft16wxHtmlColourCell8wxObject
       ;wxHtmlContainerCell::AdjustPagebreak(int*) const
       AdjustPagebreak__19wxHtmlContainerCellCFPi
       __vft16wxHtmlColourCell8wxObject
       ;wxHtmlContainerCell::AdjustPagebreak(int*) const
       AdjustPagebreak__19wxHtmlContainerCellCFPi

+      ;wxHtmlContainerCell::FindCellByPos(int,int) const
+      FindCellByPos__19wxHtmlContainerCellCFiT1

       ;wxHtmlColourCell::DrawInvisible(wxDC&,int,int)
       DrawInvisible__16wxHtmlColourCellFR4wxDCiT2
       ;wxHtmlContainerCell::SetAlign(const wxHtmlTag&)
       SetAlign__19wxHtmlContainerCellFRC9wxHtmlTag
       ;wxHtmlColourCell::DrawInvisible(wxDC&,int,int)
       DrawInvisible__16wxHtmlColourCellFR4wxDCiT2
       ;wxHtmlContainerCell::SetAlign(const wxHtmlTag&)
       SetAlign__19wxHtmlContainerCellFRC9wxHtmlTag

-      ;wxHtmlContainerCell::GetIndentUnits(int) const
-      GetIndentUnits__19wxHtmlContainerCellCFi
+      ;wxHtmlCell::GetHorizontalConstraints(int*,int*) const
+      GetHorizontalConstraints__10wxHtmlCellCFPiT1

       ;wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow*,int)
       __ct__16wxHtmlWidgetCellFP8wxWindowi
       ;wxHtmlWidgetCell::Layout(int)
       Layout__16wxHtmlWidgetCellFi
       ;wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow*,int)
       __ct__16wxHtmlWidgetCellFP8wxWindowi
       ;wxHtmlWidgetCell::Layout(int)
       Layout__16wxHtmlWidgetCellFi

+      ;wxHtmlContainerCell::GetIndentUnits(int) const
+      GetIndentUnits__19wxHtmlContainerCellCFi

       ;wxHtmlCell::wxHtmlCell()
       __ct__10wxHtmlCellFv
       ;wxHtmlCell::Find(int,const void*) const
       Find__10wxHtmlCellCFiPCv
       ;wxHtmlFontCell::Draw(wxDC&,int,int,int,int)
       Draw__14wxHtmlFontCellFR4wxDCiN32
       ;wxHtmlCell::wxHtmlCell()
       __ct__10wxHtmlCellFv
       ;wxHtmlCell::Find(int,const void*) const
       Find__10wxHtmlCellCFiPCv
       ;wxHtmlFontCell::Draw(wxDC&,int,int,int,int)
       Draw__14wxHtmlFontCellFR4wxDCiN32

-      ;wxHtmlCell::Draw(wxDC&,int,int,int,int)
-      Draw__10wxHtmlCellFR4wxDCiN32

       ;wxHtmlWidgetCell::DrawInvisible(wxDC&,int,int)
       DrawInvisible__16wxHtmlWidgetCellFR4wxDCiT2
       ;wxHtmlWidgetCell::DrawInvisible(wxDC&,int,int)
       DrawInvisible__16wxHtmlWidgetCellFR4wxDCiT2

-      ;wxHtmlCell::DrawInvisible(wxDC&,int,int)
-      DrawInvisible__10wxHtmlCellFR4wxDCiT2

   ;From object file:  ..\html\htmlfilt.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft21wxHtmlFilterPlainText8wxObject
   ;From object file:  ..\html\htmlfilt.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft21wxHtmlFilterPlainText8wxObject


@@ -10657,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


@@ -10679,65 +10981,132 @@ EXPORTS
       sm_classwxHtmlFilter__12wxHtmlFilter
   ;From object file:  ..\html\htmlpars.cpp
     ;PUBDEFs (Symbols available from object file):
       sm_classwxHtmlFilter__12wxHtmlFilter
   ;From object file:  ..\html\htmlpars.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxHtmlTextPieces::~wxHtmlTextPieces()
+      __dt__16wxHtmlTextPiecesFv
+      ;wxHtmlEntitiesParser::~wxHtmlEntitiesParser()
+      __dt__20wxHtmlEntitiesParserFv

       ;wxHtmlParser::DoneParser()
       DoneParser__12wxHtmlParserFv
       ;wxHtmlParser::DoneParser()
       DoneParser__12wxHtmlParserFv

+      ;wxHtmlParser::DestroyDOMTree()
+      DestroyDOMTree__12wxHtmlParserFv
+      ;wxHtmlTextPieces::DoCopy(const wxHtmlTextPieces&)
+      DoCopy__16wxHtmlTextPiecesFRC16wxHtmlTextPieces
+      ;wxHtmlEntitiesParser::GetEntityChar(const wxString&)
+      GetEntityChar__20wxHtmlEntitiesParserFRC8wxString
+      ;wxHtmlTextPieces::Index(const wxHtmlTextPiece&,unsigned long) const
+      Index__16wxHtmlTextPiecesCFRC15wxHtmlTextPieceUl
+      __vft20wxHtmlEntitiesParser8wxObject
+      ;wxHtmlParser::DoParsing()
+      DoParsing__12wxHtmlParserFv
+      ;wxHtmlParser::RestoreState()
+      RestoreState__12wxHtmlParserFv

       ;wxHtmlParser::AddTagHandler(wxHtmlTagHandler*)
       AddTagHandler__12wxHtmlParserFP16wxHtmlTagHandler
       ;wxHtmlParser::AddTagHandler(wxHtmlTagHandler*)
       AddTagHandler__12wxHtmlParserFP16wxHtmlTagHandler

+      ;wxHtmlTextPieces::wxHtmlTextPieces(const wxHtmlTextPieces&)
+      __ct__16wxHtmlTextPiecesFRC16wxHtmlTextPieces

       ;wxHtmlParser::SetSource(const wxString&)
       SetSource__12wxHtmlParserFRC8wxString
       ;wxHtmlParser::SetSource(const wxString&)
       SetSource__12wxHtmlParserFRC8wxString

-      ;wxHtmlParser::PopTagHandler()
-      PopTagHandler__12wxHtmlParserFv
+      ;wxHtmlTextPieces::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__16wxHtmlTextPiecesFUiT1
+      ;wxHtmlTextPieces::DoEmpty()
+      DoEmpty__16wxHtmlTextPiecesFv
+      ;wxConstructorForwxHtmlEntitiesParser()
+      wxConstructorForwxHtmlEntitiesParser__Fv

       ;wxHtmlTagHandler::sm_classwxHtmlTagHandler
       sm_classwxHtmlTagHandler__16wxHtmlTagHandler
       ;wxHtmlTagHandler::sm_classwxHtmlTagHandler
       sm_classwxHtmlTagHandler__16wxHtmlTagHandler

+      ;wxHtmlParser::wxHtmlParser()
+      __ct__12wxHtmlParserFv
+      ;wxHtmlParser::PopTagHandler()
+      PopTagHandler__12wxHtmlParserFv
+      ;wxHtmlParser::CreateDOMTree()
+      CreateDOMTree__12wxHtmlParserFv
+      ;wxHtmlEntitiesParser::Parse(const wxString&)
+      Parse__20wxHtmlEntitiesParserFRC8wxString
+      ;wxHtmlEntitiesParser::SetEncoding(wxFontEncoding)
+      SetEncoding__20wxHtmlEntitiesParserF14wxFontEncoding

       ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
       PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
       ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
       PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString

+      ;wxHtmlParser::OpenURL(wxHtmlURLType,const wxString&) const
+      OpenURL__12wxHtmlParserCF13wxHtmlURLTypeRC8wxString
+      ;wxHtmlParser::CreateDOMSubTree(wxHtmlTag*,int,int,wxHtmlTagsCache*)
+      CreateDOMSubTree__12wxHtmlParserFP9wxHtmlTagiT2P15wxHtmlTagsCache
+      wxHtmlEntityCompare
+      ;wxHtmlEntitiesParser::GetCharForCode(unsigned int)
+      GetCharForCode__20wxHtmlEntitiesParserFUi
+      ;wxHtmlTextPieces::Insert(const wxHtmlTextPiece&,unsigned int,unsigned int)
+      Insert__16wxHtmlTextPiecesFRC15wxHtmlTextPieceUiT2

       ;wxHtmlParser::~wxHtmlParser()
       __dt__12wxHtmlParserFv
       ;wxHtmlParser::~wxHtmlParser()
       __dt__12wxHtmlParserFv

+      ;wxHtmlTextPieces::operator=(const wxHtmlTextPieces&)
+      __as__16wxHtmlTextPiecesFRC16wxHtmlTextPieces

       ;wxHtmlParser::AddTag(const wxHtmlTag&)
       AddTag__12wxHtmlParserFRC9wxHtmlTag
       __vft12wxHtmlParser8wxObject
       ;wxHtmlParser::DoParsing(int,int)
       DoParsing__12wxHtmlParserFiT1
       ;wxHtmlParser::AddTag(const wxHtmlTag&)
       AddTag__12wxHtmlParserFRC9wxHtmlTag
       __vft12wxHtmlParser8wxObject
       ;wxHtmlParser::DoParsing(int,int)
       DoParsing__12wxHtmlParserFiT1

+      ;wxHtmlTextPieces::Add(const wxHtmlTextPiece&,unsigned int)
+      Add__16wxHtmlTextPiecesFRC15wxHtmlTextPieceUi
+      ;wxHtmlEntitiesParser::wxHtmlEntitiesParser()
+      __ct__20wxHtmlEntitiesParserFv

       ;wxHtmlParser::sm_classwxHtmlParser
       sm_classwxHtmlParser__12wxHtmlParser
       ;wxHtmlParser::sm_classwxHtmlParser
       sm_classwxHtmlParser__12wxHtmlParser

+      ;wxHtmlEntitiesParser::sm_classwxHtmlEntitiesParser
+      sm_classwxHtmlEntitiesParser__20wxHtmlEntitiesParser

       ;wxHtmlParser::Parse(const wxString&)
       Parse__12wxHtmlParserFRC8wxString
       ;wxHtmlParser::Parse(const wxString&)
       Parse__12wxHtmlParserFRC8wxString

+      ;wxHtmlParser::SetSourceAndSaveState(const wxString&)
+      SetSourceAndSaveState__12wxHtmlParserFRC8wxString

       ;wxHtmlParser::InitParser(const wxString&)
       InitParser__12wxHtmlParserFRC8wxString
   ;From object file:  ..\html\htmltag.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTag::GetParam(const wxString&,unsigned long) const
       GetParam__9wxHtmlTagCFRC8wxStringUl
       ;wxHtmlParser::InitParser(const wxString&)
       InitParser__12wxHtmlParserFRC8wxString
   ;From object file:  ..\html\htmltag.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTag::GetParam(const wxString&,unsigned long) const
       GetParam__9wxHtmlTagCFRC8wxStringUl

-      ;wxHtmlTag::ScanParam(const wxString&,char*,void*) const
-      ScanParam__9wxHtmlTagCFRC8wxStringPcPv
+      __vft9wxHtmlTag8wxObject
+      ;wxHtmlTag::ScanParam(const wxString&,const char*,void*) const
+      ScanParam__9wxHtmlTagCFRC8wxStringPCcPv
+      ;wxHtmlTag::GetNextTag() const
+      GetNextTag__9wxHtmlTagCFv

       ;wxHtmlTagsCache::wxHtmlTagsCache(const wxString&)
       __ct__15wxHtmlTagsCacheFRC8wxString
       ;wxHtmlTag::HasParam(const wxString&) const
       HasParam__9wxHtmlTagCFRC8wxString
       ;wxHtmlTagsCache::wxHtmlTagsCache(const wxString&)
       __ct__15wxHtmlTagsCacheFRC8wxString
       ;wxHtmlTag::HasParam(const wxString&) const
       HasParam__9wxHtmlTagCFRC8wxString

-      ;wxHtmlTag::wxHtmlTag(const wxString&,int,int,wxHtmlTagsCache*)
-      __ct__9wxHtmlTagFRC8wxStringiT2P15wxHtmlTagsCache

       ;wxHtmlTagsCache::QueryTag(int,int*,int*)
       QueryTag__15wxHtmlTagsCacheFiPiT2
       ;wxHtmlTagsCache::QueryTag(int,int*,int*)
       QueryTag__15wxHtmlTagsCacheFiPiT2

+      ;wxHtmlTag::~wxHtmlTag()
+      __dt__9wxHtmlTagFv
+      ;wxHtmlTag::GetFirstSibling() const
+      GetFirstSibling__9wxHtmlTagCFv
+      ;wxHtmlTag::GetParamAsInt(const wxString&,int*) const
+      GetParamAsInt__9wxHtmlTagCFRC8wxStringPi

       ;wxHtmlTagsCache::sm_classwxHtmlTagsCache
       sm_classwxHtmlTagsCache__15wxHtmlTagsCache
       ;wxHtmlTagsCache::sm_classwxHtmlTagsCache
       sm_classwxHtmlTagsCache__15wxHtmlTagsCache

+      ;wxHtmlTag::wxHtmlTag(wxHtmlTag*,const wxString&,int,int,wxHtmlTagsCache*,wxHtmlEntitiesParser*)
+      __ct__9wxHtmlTagFP9wxHtmlTagRC8wxStringiT3P15wxHtmlTagsCacheP20wxHtmlEntitiesParser
+      ;wxHtmlTag::GetParamAsColour(const wxString&,wxColour*) const
+      GetParamAsColour__9wxHtmlTagCFRC8wxStringP8wxColour
+      ;wxHtmlTag::GetLastSibling() const
+      GetLastSibling__9wxHtmlTagCFv
+      ;wxHtmlTag::GetAllParams() const
+      GetAllParams__9wxHtmlTagCFv

       ;wxHtmlTag::sm_classwxHtmlTag
       sm_classwxHtmlTag__9wxHtmlTag
   ;From object file:  ..\html\htmlwin.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTag::sm_classwxHtmlTag
       sm_classwxHtmlTag__9wxHtmlTag
   ;From object file:  ..\html\htmlwin.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxHtmlHistoryArray::RemoveAt(unsigned int)
-      RemoveAt__18wxHtmlHistoryArrayFUi
+      ;wxHtmlHistoryArray::DoCopy(const wxHtmlHistoryArray&)
+      DoCopy__18wxHtmlHistoryArrayFRC18wxHtmlHistoryArray

       ;wxHtmlWinModule::sm_classwxHtmlWinModule
       sm_classwxHtmlWinModule__15wxHtmlWinModule
       ;wxHtmlWindow::SetFonts(wxString,wxString,const int*)
       SetFonts__12wxHtmlWindowF8wxStringT1PCi
       ;wxHtmlWinModule::sm_classwxHtmlWinModule
       sm_classwxHtmlWinModule__15wxHtmlWinModule
       ;wxHtmlWindow::SetFonts(wxString,wxString,const int*)
       SetFonts__12wxHtmlWindowF8wxStringT1PCi

-      ;wxHtmlHistoryArray::DoCopy(const wxHtmlHistoryArray&)
-      DoCopy__18wxHtmlHistoryArrayFRC18wxHtmlHistoryArray
-      ;wxHtmlHistoryArray::Add(const wxHtmlHistoryItem&)
-      Add__18wxHtmlHistoryArrayFRC17wxHtmlHistoryItem

       ;wxHtmlHistoryArray::~wxHtmlHistoryArray()
       __dt__18wxHtmlHistoryArrayFv
       ;wxHtmlWindow::~wxHtmlWindow()
       __dt__12wxHtmlWindowFv
       ;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()


@@ -10748,14 +11117,14 @@ EXPORTS
       AddGlobalProcessor__12wxHtmlWindowFP15wxHtmlProcessor
       ;wxHtmlWindow::AddFilter(wxHtmlFilter*)
       AddFilter__12wxHtmlWindowFP12wxHtmlFilter
       AddGlobalProcessor__12wxHtmlWindowFP15wxHtmlProcessor
       ;wxHtmlWindow::AddFilter(wxHtmlFilter*)
       AddFilter__12wxHtmlWindowFP12wxHtmlFilter

-      ;wxHtmlWindow::OnDraw(wxDC&)
-      OnDraw__12wxHtmlWindowFR4wxDC
+      ;wxHtmlWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
+      Create__12wxHtmlWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString

       ;wxHtmlWindow::m_Filters
       m_Filters__12wxHtmlWindow
       ;wxHtmlWindow::m_Filters
       m_Filters__12wxHtmlWindow

+      ;wxHtmlWindow::OnDraw(wxDC&)
+      OnDraw__12wxHtmlWindowFR4wxDC

       ;wxHtmlHistoryArray::Index(const wxHtmlHistoryItem&,unsigned long) const
       Index__18wxHtmlHistoryArrayCFRC17wxHtmlHistoryItemUl
       ;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


@@ -10779,14 +11148,18 @@ EXPORTS
       m_DefaultFilter__12wxHtmlWindow
       ;wxHtmlWindow::OnSetTitle(const wxString&)
       OnSetTitle__12wxHtmlWindowFRC8wxString
       m_DefaultFilter__12wxHtmlWindow
       ;wxHtmlWindow::OnSetTitle(const wxString&)
       OnSetTitle__12wxHtmlWindowFRC8wxString

+      ;wxHtmlWindow::OnCellClicked(wxHtmlCell*,int,int,const wxMouseEvent&)
+      OnCellClicked__12wxHtmlWindowFP10wxHtmlCelliT2RC12wxMouseEvent

       ;wxHtmlWindow::OnSize(wxSizeEvent&)
       OnSize__12wxHtmlWindowFR11wxSizeEvent
       ;wxHtmlWindow::OnMouseEvent(wxMouseEvent&)
       OnMouseEvent__12wxHtmlWindowFR12wxMouseEvent
       ;wxHtmlWindow::OnSize(wxSizeEvent&)
       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()


@@ -10801,10 +11174,15 @@ EXPORTS
       ReadCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
       ;wxHtmlWindow::OnIdle(wxIdleEvent&)
       OnIdle__12wxHtmlWindowFR11wxIdleEvent
       ReadCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
       ;wxHtmlWindow::OnIdle(wxIdleEvent&)
       OnIdle__12wxHtmlWindowFR11wxIdleEvent

-      ;wxHtmlWindow::CreateLayout()
-      CreateLayout__12wxHtmlWindowFv
+      ;wxHtmlHistoryArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__18wxHtmlHistoryArrayFUiT1
+      ;wxHtmlWindow::Init()
+      Init__12wxHtmlWindowFv

       ;wxConstructorForwxHtmlWindow()
       wxConstructorForwxHtmlWindow__Fv
       ;wxConstructorForwxHtmlWindow()
       wxConstructorForwxHtmlWindow__Fv

+      __vft12wxHtmlWindow14wxScrollHelper
+      ;wxHtmlWindow::CreateLayout()
+      CreateLayout__12wxHtmlWindowFv

       ;wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo&)
       OnLinkClicked__12wxHtmlWindowFRC14wxHtmlLinkInfo
       ;wxHtmlWindow::m_GlobalProcessors
       ;wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo&)
       OnLinkClicked__12wxHtmlWindowFRC14wxHtmlLinkInfo
       ;wxHtmlWindow::m_GlobalProcessors


@@ -10816,14 +11194,14 @@ EXPORTS
       HistoryForward__12wxHtmlWindowFv
       ;wxHtmlWindow::AddProcessor(wxHtmlProcessor*)
       AddProcessor__12wxHtmlWindowFP15wxHtmlProcessor
       HistoryForward__12wxHtmlWindowFv
       ;wxHtmlWindow::AddProcessor(wxHtmlProcessor*)
       AddProcessor__12wxHtmlWindowFP15wxHtmlProcessor

-      ;wxHtmlWindow::wxHtmlWindow(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
-      __ct__12wxHtmlWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
+      ;wxHtmlWindow::SetRelatedFrame(wxFrame*,const wxString&)
+      SetRelatedFrame__12wxHtmlWindowFP7wxFrameRC8wxString

       ;wxHtmlWindow::sm_eventTableEntries
       sm_eventTableEntries__12wxHtmlWindow
       ;wxHtmlWindow::WriteCustomization(wxConfigBase*,wxString)
       WriteCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
       ;wxHtmlWindow::sm_eventTableEntries
       sm_eventTableEntries__12wxHtmlWindow
       ;wxHtmlWindow::WriteCustomization(wxConfigBase*,wxString)
       WriteCustomization__12wxHtmlWindowFP12wxConfigBase8wxString

-      ;wxHtmlWindow::SetRelatedFrame(wxFrame*,const wxString&)
-      SetRelatedFrame__12wxHtmlWindowFP7wxFrameRC8wxString
+      ;wxHtmlWindow::AppendToPage(const wxString&)
+      AppendToPage__12wxHtmlWindowFRC8wxString

   ;From object file:  ..\html\htmprint.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlDCRenderer::SetDC(wxDC*,double)
   ;From object file:  ..\html\htmprint.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlDCRenderer::SetDC(wxDC*,double)


@@ -10928,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()


@@ -10946,29 +11322,39 @@ EXPORTS
       GetLink__22wxHtmlImageMapAreaCellCFiT1
       ;wxHtmlImageMapCell::Find(int,const void*) const
       Find__18wxHtmlImageMapCellCFiPCv
       GetLink__22wxHtmlImageMapAreaCellCFiT1
       ;wxHtmlImageMapCell::Find(int,const void*) const
       Find__18wxHtmlImageMapCellCFiPCv

+      ;wxHtmlImageCell::AdvanceAnimation(wxTimer*)
+      AdvanceAnimation__15wxHtmlImageCellFP7wxTimer
+      ;wxHtmlImageCell::SetImage(const wxImage&)
+      SetImage__15wxHtmlImageCellFRC7wxImage

       ;HTML_ModuleImage::sm_classHTML_ModuleImage
       sm_classHTML_ModuleImage__16HTML_ModuleImage
       ;_link_dummy_func_m_image()
       _link_dummy_func_m_image__Fv
       ;HTML_ModuleImage::sm_classHTML_ModuleImage
       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
       ;CoordArray::DoEmpty()
       DoEmpty__10CoordArrayFv

-      ;wxHtmlImageCell::wxHtmlImageCell(wxFSFile*,int,int,double,int,wxString)
-      __ct__15wxHtmlImageCellFP8wxFSFileiT2dT28wxString

       __vft18wxHtmlImageMapCell8wxObject
       ;CoordArray::DoCopy(const CoordArray&)
       DoCopy__10CoordArrayFRC10CoordArray
       ;CoordArray::CoordArray(const CoordArray&)
       __ct__10CoordArrayFRC10CoordArray
       __vft18wxHtmlImageMapCell8wxObject
       ;CoordArray::DoCopy(const CoordArray&)
       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
       ;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::GetLink(int,int) const
       GetLink__15wxHtmlImageCellCFiT1

+      ;wxHtmlImageCell::~wxHtmlImageCell()
+      __dt__15wxHtmlImageCellFv
+      ;wxHtmlImageCell::wxHtmlImageCell(wxWindow*,wxFSFile*,int,int,double,int,const wxString&)
+      __ct__15wxHtmlImageCellFP8wxWindowP8wxFSFileiT3dT3RC8wxString

   ;From object file:  ..\html\m_layout.cpp
     ;PUBDEFs (Symbols available from object file):
       ;HTML_ModuleLayout::sm_classHTML_ModuleLayout
   ;From object file:  ..\html\m_layout.cpp
     ;PUBDEFs (Symbols available from object file):
       ;HTML_ModuleLayout::sm_classHTML_ModuleLayout


@@ -11014,10 +11400,20 @@ EXPORTS
       _link_dummy_func_m_pre__Fv
       ;wxConstructorForHTML_ModulePre()
       wxConstructorForHTML_ModulePre__Fv
       _link_dummy_func_m_pre__Fv
       ;wxConstructorForHTML_ModulePre()
       wxConstructorForHTML_ModulePre__Fv

+  ;From object file:  ..\html\m_style.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;HTML_ModuleStyleTag::sm_classHTML_ModuleStyleTag
+      sm_classHTML_ModuleStyleTag__19HTML_ModuleStyleTag
+      ;_link_dummy_func_m_style()
+      _link_dummy_func_m_style__Fv
+      ;wxConstructorForHTML_ModuleStyleTag()
+      wxConstructorForHTML_ModuleStyleTag__Fv

   ;From object file:  ..\html\m_tables.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTableCell::ReallocRows(int)
       ReallocRows__15wxHtmlTableCellFi
   ;From object file:  ..\html\m_tables.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTableCell::ReallocRows(int)
       ReallocRows__15wxHtmlTableCellFi

+      ;wxHtmlTableCell::ComputeMinMaxWidths()
+      ComputeMinMaxWidths__15wxHtmlTableCellFv

       ;wxConstructorForHTML_ModuleTables()
       wxConstructorForHTML_ModuleTables__Fv
       __vft15wxHtmlTableCell8wxObject
       ;wxConstructorForHTML_ModuleTables()
       wxConstructorForHTML_ModuleTables__Fv
       __vft15wxHtmlTableCell8wxObject


@@ -11041,6 +11437,8 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTagsModule::sm_classwxHtmlTagsModule
       sm_classwxHtmlTagsModule__16wxHtmlTagsModule
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTagsModule::sm_classwxHtmlTagsModule
       sm_classwxHtmlTagsModule__16wxHtmlTagsModule

+      ;wxHtmlWinParser::wxHtmlWinParser(wxHtmlWindow*)
+      __ct__15wxHtmlWinParserFP12wxHtmlWindow

       ;wxHtmlWinParser::AddText(const char*)
       AddText__15wxHtmlWinParserFPCc
       ;wxHtmlWinParser::SetFonts(wxString,wxString,const int*)
       ;wxHtmlWinParser::AddText(const char*)
       AddText__15wxHtmlWinParserFPCc
       ;wxHtmlWinParser::SetFonts(wxString,wxString,const int*)


@@ -11083,8 +11481,8 @@ EXPORTS
       OnInit__16wxHtmlTagsModuleFv
       ;wxHtmlWinParser::CreateCurrentFont()
       CreateCurrentFont__15wxHtmlWinParserFv
       OnInit__16wxHtmlTagsModuleFv
       ;wxHtmlWinParser::CreateCurrentFont()
       CreateCurrentFont__15wxHtmlWinParserFv

-      ;wxHtmlWinParser::wxHtmlWinParser(wxWindow*)
-      __ct__15wxHtmlWinParserFP8wxWindow
+      ;wxHtmlWinParser::OpenURL(wxHtmlURLType,const wxString&) const
+      OpenURL__15wxHtmlWinParserCF13wxHtmlURLTypeRC8wxString

       ;wxHtmlWinParser::SetFontFace(const wxString&)
       SetFontFace__15wxHtmlWinParserFRC8wxString
   ;From object file:  ..\generic\msgdlgg.cpp
       ;wxHtmlWinParser::SetFontFace(const wxString&)
       SetFontFace__15wxHtmlWinParserFRC8wxString
   ;From object file:  ..\generic\msgdlgg.cpp


@@ -11116,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


@@ -11164,18 +11562,14 @@ EXPORTS
       RegisterWindowClasses__5wxAppFUl
       ;wxApp::sm_eventTableEntries
       sm_eventTableEntries__5wxApp
       RegisterWindowClasses__5wxAppFUl
       ;wxApp::sm_eventTableEntries
       sm_eventTableEntries__5wxApp

+      ;wxApp::Yield(unsigned long)
+      Yield__5wxAppFUl

       ;wxApp::OnIdle(wxIdleEvent&)
       OnIdle__5wxAppFR11wxIdleEvent
       ;wxMsgArray::wxMsgArray(const wxMsgArray&)
       __ct__10wxMsgArrayFRC10wxMsgArray
       ;wxApp::OnIdle(wxIdleEvent&)
       OnIdle__5wxAppFR11wxIdleEvent
       ;wxMsgArray::wxMsgArray(const wxMsgArray&)
       __ct__10wxMsgArrayFRC10wxMsgArray

-      wxPanelClassName
-      wxMDIFrameClassName
-      ;wxMsgArray::Insert(const _QMSG&,unsigned int)
-      Insert__10wxMsgArrayFRC5_QMSGUi
-      ;wxApp::HandleSockets()
-      HandleSockets__5wxAppFv
-      ;wxYieldIfNeeded()
-      wxYieldIfNeeded__Fv
+      ;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


@@ -11185,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


@@ -11196,8 +11590,8 @@ EXPORTS
       __as__10wxMsgArrayFRC10wxMsgArray
       ;wxApp::RemoveSocketHandler(int)
       RemoveSocketHandler__5wxAppFi
       __as__10wxMsgArrayFRC10wxMsgArray
       ;wxApp::RemoveSocketHandler(int)
       RemoveSocketHandler__5wxAppFi

-      ;wxYield()
-      wxYield__Fv
+      ;wxMsgArray::DoEmpty()
+      DoEmpty__10wxMsgArrayFv

       wxSTD_FRAME_ICON
       wxDEFAULT_FRAME_ICON
       ;wxApp::ProcessIdle()
       wxSTD_FRAME_ICON
       wxDEFAULT_FRAME_ICON
       ;wxApp::ProcessIdle()


@@ -11208,18 +11602,11 @@ EXPORTS
       Initialized__5wxAppFv
       ;wxApp::GetEventTable() const
       GetEventTable__5wxAppCFv
       Initialized__5wxAppFv
       ;wxApp::GetEventTable() const
       GetEventTable__5wxAppCFv

-      ;wxMsgArray::DoEmpty()
-      DoEmpty__10wxMsgArrayFv
-      wxFrameClassNameNoRedraw

       ;wxSetInstance(unsigned long)
       wxSetInstance__FUl
       ;wxSetInstance(unsigned long)
       wxSetInstance__FUl

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

       wxGetInstance
       wxGetInstance

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

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


@@ -11229,7 +11616,6 @@ EXPORTS
       ;wxApp::CleanUp()
       CleanUp__5wxAppFv
       svCurrentMsg
       ;wxApp::CleanUp()
       CleanUp__5wxAppFv
       svCurrentMsg

-      wxMDIChildFrameClassNameNoRedraw

       ;wxMsgArray::Index(const _QMSG&,unsigned long) const
       Index__10wxMsgArrayCFRC5_QMSGUl
       wxDisableButtonBrush
       ;wxMsgArray::Index(const _QMSG&,unsigned long) const
       Index__10wxMsgArrayCFRC5_QMSGUl
       wxDisableButtonBrush


@@ -11237,9 +11623,10 @@ 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
       ;wxAppBase::m_appInitFn
       m_appInitFn__9wxAppBase

-      wxCanvasClassName

       ;wxApp::DoMessage()
       DoMessage__5wxAppFv
       ;wxExit()
       ;wxApp::DoMessage()
       DoMessage__5wxAppFv
       ;wxExit()


@@ -11250,7 +11637,6 @@ EXPORTS
       Dispatch__5wxAppFv
       ;wxEntry(int,char**)
       wxEntry__FiPPc
       Dispatch__5wxAppFv
       ;wxEntry(int,char**)
       wxEntry__FiPPc

-      wxMDIFrameClassNameNoRedraw

       ;wxApp::SendIdleEvents(wxWindow*)
       SendIdleEvents__5wxAppFP8wxWindow
   ;From object file:  ..\os2\bitmap.cpp
       ;wxApp::SendIdleEvents(wxWindow*)
       SendIdleEvents__5wxAppFP8wxWindow
   ;From object file:  ..\os2\bitmap.cpp


@@ -11278,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)


@@ -11301,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


@@ -11317,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


@@ -11414,8 +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::SetDefaultStyle(wxButton*,unsigned long)
+      SetDefaultStyle__8wxButtonFP8wxButtonUl
+      ;wxButton::SetTmpDefault()
+      SetTmpDefault__8wxButtonFv
+      ;wxButton::WindowProc(unsigned int,void*,void*)
+      WindowProc__8wxButtonFUiPvT2
+      ;wxButton::MakeOwnerDrawn()
+      MakeOwnerDrawn__8wxButtonFv
+      ;wxButton::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__8wxButtonCFlPUl

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


@@ -11453,8 +11849,6 @@ EXPORTS
       ;wxCheckBox::SetValue(unsigned long)
       SetValue__10wxCheckBoxFUl
       __vft16wxBitmapCheckBox8wxObject
       ;wxCheckBox::SetValue(unsigned long)
       SetValue__10wxCheckBoxFUl
       __vft16wxBitmapCheckBox8wxObject

-      ;wxCheckBox::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
-      OnCtlColor__10wxCheckBoxFUlT1UiT3PvT5

       ;wxCheckBox::DoGetBestSize() const
       DoGetBestSize__10wxCheckBoxCFv
       ;wxCheckBox::GetValue() const
       ;wxCheckBox::DoGetBestSize() const
       DoGetBestSize__10wxCheckBoxCFv
       ;wxCheckBox::GetValue() const


@@ -11480,6 +11874,7 @@ EXPORTS
       ;wxCheckListBox::GetEventTable() const
       GetEventTable__14wxCheckListBoxCFv
       __vft18wxCheckListBoxItem12wxOwnerDrawn
       ;wxCheckListBox::GetEventTable() const
       GetEventTable__14wxCheckListBoxCFv
       __vft18wxCheckListBoxItem12wxOwnerDrawn

+      __vft14wxCheckListBox15wxItemContainer

       ;wxCheckListBox::wxCheckListBox(wxWindow*,int,const wxPoint&,const wxSize&,int,const wxString*,long,const wxValidator&,const wxString&)
       __ct__14wxCheckListBoxFP8wxWindowiRC7wxPointRC6wxSizeT2PC8wxStringlRC11wxValidatorRC8wxString
       ;wxCheckListBox::Check(unsigned int,unsigned long)
       ;wxCheckListBox::wxCheckListBox(wxWindow*,int,const wxPoint&,const wxSize&,int,const wxString*,long,const wxValidator&,const wxString&)
       __ct__14wxCheckListBoxFP8wxWindowiRC7wxPointRC6wxSizeT2PC8wxStringlRC11wxValidatorRC8wxString
       ;wxCheckListBox::Check(unsigned int,unsigned long)


@@ -11507,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


@@ -11529,6 +11926,7 @@ EXPORTS
       DoSetSize__8wxChoiceFiN41
       ;wxChoice::DoGetBestSize() const
       DoGetBestSize__8wxChoiceCFv
       DoSetSize__8wxChoiceFiN41
       ;wxChoice::DoGetBestSize() const
       DoGetBestSize__8wxChoiceCFv

+      __vft8wxChoice15wxItemContainer

       ;wxChoice::DoAppend(const wxString&)
       DoAppend__8wxChoiceFRC8wxString
       ;wxChoice::OS2Command(unsigned int,unsigned short)
       ;wxChoice::DoAppend(const wxString&)
       DoAppend__8wxChoiceFRC8wxString
       ;wxChoice::OS2Command(unsigned int,unsigned short)


@@ -11546,6 +11944,8 @@ EXPORTS
       sm_classwxChoice__8wxChoice
       ;wxChoice::DoGetItemClientObject(int) const
       DoGetItemClientObject__8wxChoiceCFi
       sm_classwxChoice__8wxChoice
       ;wxChoice::DoGetItemClientObject(int) const
       DoGetItemClientObject__8wxChoiceCFi

+      ;wxChoice::Free()
+      Free__8wxChoiceFv

       ;wxChoice::GetCount() const
       GetCount__8wxChoiceCFv
       ;wxChoice::SetString(int,const wxString&)
       ;wxChoice::GetCount() const
       GetCount__8wxChoiceCFv
       ;wxChoice::SetString(int,const wxString&)


@@ -11603,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()


@@ -11637,12 +12037,15 @@ EXPORTS
       DoSetSize__10wxComboBoxFiN41
       ;wxComboBox::Paste()
       Paste__10wxComboBoxFv
       DoSetSize__10wxComboBoxFiN41
       ;wxComboBox::Paste()
       Paste__10wxComboBoxFv

+      __vft10wxComboBox15wxItemContainer

       ;wxComboBox::GetInsertionPoint() const
       GetInsertionPoint__10wxComboBoxCFv
       ;wxComboBox::SetEditable(unsigned long)
       SetEditable__10wxComboBoxFUl
       ;wxComboBox::SetInsertionPointEnd()
       SetInsertionPointEnd__10wxComboBoxFv
       ;wxComboBox::GetInsertionPoint() const
       GetInsertionPoint__10wxComboBoxCFv
       ;wxComboBox::SetEditable(unsigned long)
       SetEditable__10wxComboBoxFUl
       ;wxComboBox::SetInsertionPointEnd()
       SetInsertionPointEnd__10wxComboBoxFv

+      ;wxComboBox::ProcessEditMsg(unsigned int,void*,void*)
+      ProcessEditMsg__10wxComboBoxFUiPvT2

       ;wxComboBox::SetValue(const wxString&)
       SetValue__10wxComboBoxFRC8wxString
       ;wxComboBox::SetInsertionPoint(long)
       ;wxComboBox::SetValue(const wxString&)
       SetValue__10wxComboBoxFRC8wxString
       ;wxComboBox::SetInsertionPoint(long)


@@ -11655,22 +12058,23 @@ EXPORTS
       wxConstructorForwxComboBox__Fv
       ;wxComboBox::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,int,const wxString*,long,const wxValidator&,const wxString&)
       Create__10wxComboBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizeT2PC8wxStringlRC11wxValidatorT3
       wxConstructorForwxComboBox__Fv
       ;wxComboBox::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,int,const wxString*,long,const wxValidator&,const wxString&)
       Create__10wxComboBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizeT2PC8wxStringlRC11wxValidatorT3

+      wxComboEditWndProc

       ;wxComboBox::OS2Command(unsigned int,unsigned short)
       OS2Command__10wxComboBoxFUiUs
   ;From object file:  ..\os2\control.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxControl::OnEraseBackground(wxEraseEvent&)
       OnEraseBackground__9wxControlFR12wxEraseEvent
       ;wxComboBox::OS2Command(unsigned int,unsigned short)
       OS2Command__10wxComboBoxFUiUs
   ;From object file:  ..\os2\control.cpp
     ;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&)


@@ -11683,6 +12087,8 @@ 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
       ;wxFindMaxSize(unsigned long,_RECTL*)
       wxFindMaxSize__FUlP6_RECTL
       __vft9wxControl8wxObject


@@ -11690,27 +12096,22 @@ EXPORTS
       __dt__9wxControlFv
   ;From object file:  ..\os2\cursor.cpp
     ;PUBDEFs (Symbols available from object file):
       __dt__9wxControlFv
   ;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


@@ -11740,12 +12141,15 @@ EXPORTS
       wxDialogNameStr
       wxCheckBoxNameStr
       wxCanvasNameStr
       wxDialogNameStr
       wxCheckBoxNameStr
       wxCanvasNameStr

+      wxCanvasClassNameNR

       wxCYAN_PEN
       wxButtonBarNameStr
       wxNullBitmap
       wxNORMAL_FONT
       wxMEDIUM_GREY_BRUSH
       wxTheColourDatabase
       wxCYAN_PEN
       wxButtonBarNameStr
       wxNullBitmap
       wxNORMAL_FONT
       wxMEDIUM_GREY_BRUSH
       wxTheColourDatabase

+      wxPanelClassName
+      wxMDIFrameClassName

       wxLIGHT_GREY
       wxDefaultSize
       wxBLUE
       wxLIGHT_GREY
       wxDefaultSize
       wxBLUE


@@ -11755,12 +12159,12 @@ EXPORTS
       wxStaticBoxNameStr
       wxSliderNameStr
       wxRED_PEN
       wxStaticBoxNameStr
       wxSliderNameStr
       wxRED_PEN

+      wxPanelClassNameNR

       wxMultiTextNameStr
       wxMEDIUM_GREY_PEN
       wxGaugeNameStr
       wxGREEN
       wxFrameNameStr
       wxMultiTextNameStr
       wxMEDIUM_GREY_PEN
       wxGaugeNameStr
       wxGREEN
       wxFrameNameStr

-      wxFatalErrorStr

       wxDefaultPosition
       wxBitmapRadioButtonNameStr
       wxTheBitmapList
       wxDefaultPosition
       wxBitmapRadioButtonNameStr
       wxTheBitmapList


@@ -11779,9 +12183,12 @@ EXPORTS
       wxComboBoxNameStr
       wxCROSS_CURSOR
       wxTopLevelWindows
       wxComboBoxNameStr
       wxCROSS_CURSOR
       wxTopLevelWindows

+      wxFrameClassNameNoRedraw

       wxTRANSPARENT_BRUSH
       wxWHITE_BRUSH
       wxRED_BRUSH
       wxTRANSPARENT_BRUSH
       wxWHITE_BRUSH
       wxRED_BRUSH

+      wxFrameClassName
+      wxMDIChildFrameClassName

       wxNullColour
       wxTRANSPARENT_PEN
       wxStaticNameStr
       wxNullColour
       wxTRANSPARENT_PEN
       wxStaticNameStr


@@ -11795,17 +12202,18 @@ EXPORTS
       wxBLACK_DASHED_PEN
       g_globalCursor
       wxNullNativeFontInfo
       wxBLACK_DASHED_PEN
       g_globalCursor
       wxNullNativeFontInfo

+      wxMDIChildFrameClassNameNoRedraw

       wxBLUE_BRUSH
       wxLIGHT_GREY_BRUSH
       wxBLACK_BRUSH
       wxPendingDelete
       wxNullAcceleratorTable
       wxBLUE_BRUSH
       wxLIGHT_GREY_BRUSH
       wxBLACK_BRUSH
       wxPendingDelete
       wxNullAcceleratorTable

+      wxCanvasClassName

       wxGREEN_PEN
       wxVirtListBoxNameStr
       wxStatusLineNameStr
       wxRadioBoxNameStr
       wxLIGHT_GREY_PEN
       wxGREEN_PEN
       wxVirtListBoxNameStr
       wxStatusLineNameStr
       wxRadioBoxNameStr
       wxLIGHT_GREY_PEN

-      wxInternalErrorStr

       wxGREY_PEN
       wxFileSelectorDefaultWildcardStr
       wxDoubleToStringStr
       wxGREY_PEN
       wxFileSelectorDefaultWildcardStr
       wxDoubleToStringStr


@@ -11814,6 +12222,7 @@ EXPORTS
       wxChoiceNameStr
       wxCYAN
       wxBLACK
       wxChoiceNameStr
       wxCYAN
       wxBLACK

+      wxMDIFrameClassNameNoRedraw

   ;From object file:  ..\os2\dataobj.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDataFormat::wxDataFormat()
   ;From object file:  ..\os2\dataobj.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDataFormat::wxDataFormat()


@@ -11932,8 +12341,6 @@ EXPORTS
       ;wxDC::DoGetTextExtent(const wxString&,int*,int*,int*,int*,wxFont*) const
       DoGetTextExtent__4wxDCCFRC8wxStringPiN32P6wxFont
       __vft4wxDC8wxObject
       ;wxDC::DoGetTextExtent(const wxString&,int*,int*,int*,int*,wxFont*) const
       DoGetTextExtent__4wxDCCFRC8wxStringPiN32P6wxFont
       __vft4wxDC8wxObject

-      ;wxDC::DoBlit(int,int,int,int,wxDC*,int,int,int,unsigned long)
-      DoBlit__4wxDCFiN31P4wxDCN31Ul

       ;wxDC::DoFloodFill(int,int,const wxColour&,int)
       DoFloodFill__4wxDCFiT1RC8wxColourT1
       ;wxDC::SetLogicalFunction(int)
       ;wxDC::DoFloodFill(int,int,const wxColour&,int)
       DoFloodFill__4wxDCFiT1RC8wxColourT1
       ;wxDC::SetLogicalFunction(int)


@@ -11958,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)


@@ -11970,6 +12379,8 @@ EXPORTS
       DoDrawLine__4wxDCFiN31
       ;wxDC::DoDrawEllipticArc(int,int,int,int,double,double)
       DoDrawEllipticArc__4wxDCFiN31dT5
       DoDrawLine__4wxDCFiN31
       ;wxDC::DoDrawEllipticArc(int,int,int,int,double,double)
       DoDrawEllipticArc__4wxDCFiN31dT5

+      ;wxDC::DoBlit(int,int,int,int,wxDC*,int,int,int,unsigned long,int,int)
+      DoBlit__4wxDCFiN31P4wxDCN31UlN21

       ;wxDCBase::DeviceToLogicalY(int) const
       DeviceToLogicalY__8wxDCBaseCFi
       ;wxDCBase::DeviceToLogicalXRel(int) const
       ;wxDCBase::DeviceToLogicalY(int) const
       DeviceToLogicalY__8wxDCBaseCFi
       ;wxDCBase::DeviceToLogicalXRel(int) const


@@ -11978,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)


@@ -12010,10 +12423,14 @@ EXPORTS
       wxConstructorForwxPaintDC__Fv
       ;wxWindowDC::InitDC()
       InitDC__10wxWindowDCFv
       wxConstructorForwxPaintDC__Fv
       ;wxWindowDC::InitDC()
       InitDC__10wxWindowDCFv

+      ;wxClientDC::InitDC()
+      InitDC__10wxClientDCFv

       ;wxArrayDCInfo::DoCopy(const wxArrayDCInfo&)
       DoCopy__13wxArrayDCInfoFRC13wxArrayDCInfo
       ;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&)


@@ -12022,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()


@@ -12034,17 +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
       ;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
       ;wxClientDC::sm_classwxClientDC
       sm_classwxClientDC__10wxClientDC
       ;wxPaintDC::sm_classwxPaintDC
       sm_classwxPaintDC__9wxPaintDC

+      __vft10wxClientDC8wxObject

       __vft9wxPaintDC8wxObject
       __vft9wxPaintDC8wxObject

+      ;wxClientDC::DoGetSize(int*,int*) const
+      DoGetSize__10wxClientDCCFPiT1

       ;wxArrayDCInfo::~wxArrayDCInfo()
       __dt__13wxArrayDCInfoFv
       ;wxConstructorForwxClientDC()
       ;wxArrayDCInfo::~wxArrayDCInfo()
       __dt__13wxArrayDCInfoFv
       ;wxConstructorForwxClientDC()


@@ -12071,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


@@ -12083,12 +12504,12 @@ EXPORTS
       CreateCompatible__10wxMemoryDCFP4wxDC
   ;From object file:  ..\os2\dcprint.cpp
     ;PUBDEFs (Symbols available from object file):
       CreateCompatible__10wxMemoryDCFP4wxDC
   ;From object file:  ..\os2\dcprint.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxPrinterDC::DoBlit(int,int,int,int,wxDC*,int,int,int,unsigned long,int,int)
+      DoBlit__11wxPrinterDCFiN31P4wxDCN31UlN21

       ;wxPrinterDC::EndDoc()
       EndDoc__11wxPrinterDCFv
       ;wxPrinterDC::EndPage()
       EndPage__11wxPrinterDCFv
       ;wxPrinterDC::EndDoc()
       EndDoc__11wxPrinterDCFv
       ;wxPrinterDC::EndPage()
       EndPage__11wxPrinterDCFv

-      ;wxPrinterDC::DoBlit(int,int,int,int,wxDC*,int,int,int,unsigned long)
-      DoBlit__11wxPrinterDCFiN31P4wxDCN31Ul

       ;wxGetPrinterDC(const wxPrintData&)
       wxGetPrinterDC__FRC11wxPrintData
       ;wxPrinterDC::sm_classwxPrinterDC
       ;wxGetPrinterDC(const wxPrintData&)
       wxGetPrinterDC__FRC11wxPrintData
       ;wxPrinterDC::sm_classwxPrinterDC


@@ -12112,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()


@@ -12122,10 +12546,6 @@ EXPORTS
       SetModal__8wxDialogFUl
       ;wxDialog::OnCancel(wxCommandEvent&)
       OnCancel__8wxDialogFR14wxCommandEvent
       SetModal__8wxDialogFUl
       ;wxDialog::OnCancel(wxCommandEvent&)
       OnCancel__8wxDialogFR14wxCommandEvent

-      ;wxDialog::DoGetPosition(int*,int*) const
-      DoGetPosition__8wxDialogCFPiT1
-      ;wxDialog::IsIconized() const
-      IsIconized__8wxDialogCFv

       ;wxDialog::IsModal() const
       IsModal__8wxDialogCFv
       ;wxDialog::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       ;wxDialog::IsModal() const
       IsModal__8wxDialogCFv
       ;wxDialog::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)


@@ -12139,8 +12559,6 @@ EXPORTS
       OnOK__8wxDialogFR14wxCommandEvent
       ;wxDialog::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__8wxDialogFR12wxCloseEvent
       OnOK__8wxDialogFR14wxCommandEvent
       ;wxDialog::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__8wxDialogFR12wxCloseEvent

-      ;wxDialog::DoSetClientSize(int,int)
-      DoSetClientSize__8wxDialogFiT1

       ;wxDialog::Init()
       Init__8wxDialogFv
       ;wxDialog::ShowModal()
       ;wxDialog::Init()
       Init__8wxDialogFv
       ;wxDialog::ShowModal()


@@ -12154,10 +12572,6 @@ EXPORTS
       OnSysColourChanged__8wxDialogFR23wxSysColourChangedEvent
       ;wxDialog::DoShowModal()
       DoShowModal__8wxDialogFv
       OnSysColourChanged__8wxDialogFR23wxSysColourChangedEvent
       ;wxDialog::DoShowModal()
       DoShowModal__8wxDialogFv

-      ;wxDialog::Destroy()
-      Destroy__8wxDialogFv
-      ;wxDialog::Iconize(unsigned long)
-      Iconize__8wxDialogFUl

       ;wxDialog::Show(unsigned long)
       Show__8wxDialogFUl
       ;wxDialog::OnApply(wxCommandEvent&)
       ;wxDialog::Show(unsigned long)
       Show__8wxDialogFUl
       ;wxDialog::OnApply(wxCommandEvent&)


@@ -12172,7 +12586,6 @@ EXPORTS
       OS2WindowProc__8wxDialogFUiPvT2
       ;wxDialog::GetEventTable() const
       GetEventTable__8wxDialogCFv
       OS2WindowProc__8wxDialogFUiPvT2
       ;wxDialog::GetEventTable() const
       GetEventTable__8wxDialogCFv

-      wxModelessWindows

       ;wxDialog::sm_eventTable
       sm_eventTable__8wxDialog
   ;From object file:  ..\os2\dir.cpp
       ;wxDialog::sm_eventTable
       sm_eventTable__8wxDialog
   ;From object file:  ..\os2\dir.cpp


@@ -12203,15 +12616,6 @@ EXPORTS
       Open__5wxDirFRC8wxString
       ;wxDir::GetName() const
       GetName__5wxDirCFv
       Open__5wxDirFRC8wxString
       ;wxDir::GetName() const
       GetName__5wxDirCFv

-  ;From object file:  ..\os2\dirdlg.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxDirDialog::sm_classwxDirDialog
-      sm_classwxDirDialog__11wxDirDialog
-      __vft11wxDirDialog8wxObject
-      ;wxDirDialog::ShowModal()
-      ShowModal__11wxDirDialogFv
-      ;wxDirDialog::wxDirDialog(wxWindow*,const wxString&,const wxString&,long,const wxPoint&)
-      __ct__11wxDirDialogFP8wxWindowRC8wxStringT2lRC7wxPoint

   ;From object file:  ..\os2\dnd.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDropTarget::OnData(int,int,wxDragResult)
   ;From object file:  ..\os2\dnd.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDropTarget::OnData(int,int,wxDragResult)


@@ -12226,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()


@@ -12240,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*)


@@ -12258,17 +12662,25 @@ 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
   ;From object file:  ..\os2\font.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft12wxFileDialog8wxObject
       ;wxFileDialog::sm_classwxFileDialog
       sm_classwxFileDialog__12wxFileDialog
   ;From object file:  ..\os2\font.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxFont::Create(const wxNativeFontInfo&,unsigned long)
+      Create__6wxFontFRC16wxNativeFontInfoUl
+      ;wxNativeFontInfo::SetUnderlined(unsigned long)
+      SetUnderlined__16wxNativeFontInfoFUl

       ;wxFont::SetStyle(int)
       SetStyle__6wxFontFi
       ;wxFont::SetStyle(int)
       SetStyle__6wxFontFi

-      ;wxFont::OS2SelectMatchingFontByName()
-      OS2SelectMatchingFontByName__6wxFontFv
+      ;wxFontRefData::Init(const wxNativeFontInfo&,unsigned long,unsigned long)
+      Init__13wxFontRefDataFRC16wxNativeFontInfoUlT2

       ;wxFont::IsFree() const
       IsFree__6wxFontCFv
       ;wxFont::IsFree() const
       IsFree__6wxFontCFv

+      ;wxNativeFontInfo::GetUnderlined() const
+      GetUnderlined__16wxNativeFontInfoCFv

       ;wxFont::GetHFONT() const
       GetHFONT__6wxFontCFv
       ;wxFont::GetFamily() const
       ;wxFont::GetHFONT() const
       GetHFONT__6wxFontCFv
       ;wxFont::GetFamily() const


@@ -12277,9 +12689,15 @@ EXPORTS
       GetFaceName__6wxFontCFv
       ;wxFontRefData::Init(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       Init__13wxFontRefDataFiN31UlRC8wxString14wxFontEncoding
       GetFaceName__6wxFontCFv
       ;wxFontRefData::Init(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       Init__13wxFontRefDataFiN31UlRC8wxString14wxFontEncoding

+      ;wxFont::wxFont(const wxString&)
+      __ct__6wxFontFRC8wxString
+      ;wxNativeFontInfo::FromString(const wxString&)
+      FromString__16wxNativeFontInfoFRC8wxString
+      ;wxNativeFontInfo::SetFamily(wxFontFamily)
+      SetFamily__16wxNativeFontInfoF12wxFontFamily
+      __vft13wxFontRefData15wxObjectRefData

       ;wxFont::SetFamily(int)
       SetFamily__6wxFontFi
       ;wxFont::SetFamily(int)
       SetFamily__6wxFontFi

-      __vft13wxFontRefData15wxObjectRefData

       ;wxConstructorForwxFont()
       wxConstructorForwxFont__Fv
       ;wxFontRefData::~wxFontRefData()
       ;wxConstructorForwxFont()
       wxConstructorForwxFont__Fv
       ;wxFontRefData::~wxFontRefData()


@@ -12288,6 +12706,8 @@ EXPORTS
       GetUnderlined__6wxFontCFv
       ;wxFont::GetStyle() const
       GetStyle__6wxFontCFv
       GetUnderlined__6wxFontCFv
       ;wxFont::GetStyle() const
       GetStyle__6wxFontCFv

+      ;wxFont::GetNativeFontInfo() const
+      GetNativeFontInfo__6wxFontCFv

       ;wxFont::SetEncoding(wxFontEncoding)
       SetEncoding__6wxFontF14wxFontEncoding
       ;wxFont::FreeResource(unsigned long)
       ;wxFont::SetEncoding(wxFontEncoding)
       SetEncoding__6wxFontF14wxFontEncoding
       ;wxFont::FreeResource(unsigned long)


@@ -12296,27 +12716,51 @@ EXPORTS
       SetUnderlined__6wxFontFUl
       ;wxFont::SetPS(unsigned long)
       SetPS__6wxFontFUl
       SetUnderlined__6wxFontFUl
       ;wxFont::SetPS(unsigned long)
       SetPS__6wxFontFUl

-      ;wxFont::GetFontId() const
-      GetFontId__6wxFontCFv
-      ;wxFont::GetPS() const
-      GetPS__6wxFontCFv
+      ;wxNativeFontInfo::SetStyle(wxFontStyle)
+      SetStyle__16wxNativeFontInfoF11wxFontStyle
+      ;wxNativeFontInfo::GetStyle() const
+      GetStyle__16wxNativeFontInfoCFv
+      ;wxNativeFontInfo::GetPointSize() const
+      GetPointSize__16wxNativeFontInfoCFv
+      ;wxNativeFontInfo::GetFamily() const
+      GetFamily__16wxNativeFontInfoCFv
+      ;wxNativeFontInfo::GetFaceName() const
+      GetFaceName__16wxNativeFontInfoCFv

       ;wxFont::GetEncoding() const
       GetEncoding__6wxFontCFv
       ;wxFont::GetEncoding() const
       GetEncoding__6wxFontCFv

+      ;wxNativeFontInfo::SetEncoding(wxFontEncoding)
+      SetEncoding__16wxNativeFontInfoF14wxFontEncoding
+      ;wxFont::SetNativeFontInfo(const wxNativeFontInfo&)
+      SetNativeFontInfo__6wxFontFRC16wxNativeFontInfo

       ;wxFont::SetFaceName(const wxString&)
       SetFaceName__6wxFontFRC8wxString
       ;wxFont::SetFaceName(const wxString&)
       SetFaceName__6wxFontFRC8wxString

-      __vft6wxFont8wxObject
+      ;wxNativeFontInfo::SetWeight(wxFontWeight)
+      SetWeight__16wxNativeFontInfoF12wxFontWeight

       ;wxFont::sm_classwxFont
       sm_classwxFont__6wxFont
       ;wxFont::sm_classwxFont
       sm_classwxFont__6wxFont

+      __vft6wxFont8wxObject
+      ;wxNativeFontInfo::SetPointSize(int)
+      SetPointSize__16wxNativeFontInfoFi

       ;wxFont::Init()
       Init__6wxFontFv
       ;wxFont::Init()
       Init__6wxFontFv

+      ;wxNativeFontInfo::ToString() const
+      ToString__16wxNativeFontInfoCFv

       ;wxFont::GetResourceHandle()
       GetResourceHandle__6wxFontFv
       ;wxFont::GetResourceHandle()
       GetResourceHandle__6wxFontFv

+      ;wxNativeFontInfo::GetEncoding() const
+      GetEncoding__16wxNativeFontInfoCFv
+      ;wxFontRefData::Free()
+      Free__13wxFontRefDataFv
+      ;wxFontRefData::Alloc(wxFont*)
+      Alloc__13wxFontRefDataFP6wxFont

       ;wxFont::SetPointSize(int)
       SetPointSize__6wxFontFi
       ;wxFont::SetWeight(int)
       SetWeight__6wxFontFi
       ;wxFont::SetFM(_FONTMETRICS*,int)
       SetFM__6wxFontFP12_FONTMETRICSi
       ;wxFont::SetPointSize(int)
       SetPointSize__6wxFontFi
       ;wxFont::SetWeight(int)
       SetWeight__6wxFontFi
       ;wxFont::SetFM(_FONTMETRICS*,int)
       SetFM__6wxFontFP12_FONTMETRICSi

+      ;wxNativeFontInfo::Init()
+      Init__16wxNativeFontInfoFv

       ;wxFont::~wxFont()
       __dt__6wxFontFv
       ;wxFont::Unshare()
       ;wxFont::~wxFont()
       __dt__6wxFontFv
       ;wxFont::Unshare()


@@ -12325,25 +12769,23 @@ EXPORTS
       RealizeResource__6wxFontFv
       ;wxFont::GetWeight() const
       GetWeight__6wxFontCFv
       RealizeResource__6wxFontFv
       ;wxFont::GetWeight() const
       GetWeight__6wxFontCFv

+      ;wxNativeFontInfo::GetWeight() const
+      GetWeight__16wxNativeFontInfoCFv

       ;wxFont::GetPointSize() const
       GetPointSize__6wxFontCFv
       ;wxFont::Create(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       Create__6wxFontFiN31UlRC8wxString14wxFontEncoding
       ;wxFont::GetPointSize() const
       GetPointSize__6wxFontCFv
       ;wxFont::Create(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       Create__6wxFontFiN31UlRC8wxString14wxFontEncoding

+      ;wxNativeFontInfo::SetFaceName(wxString)
+      SetFaceName__16wxNativeFontInfoF8wxString

   ;From object file:  ..\os2\fontdlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxConstructorForwxFontDialog()
       wxConstructorForwxFontDialog__Fv
       __vft12wxFontDialog8wxObject
   ;From object file:  ..\os2\fontdlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;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)


@@ -12361,36 +12803,38 @@ EXPORTS
       SetEncoding__22wxFontEnumeratorHelperF14wxFontEncoding
   ;From object file:  ..\os2\fontutil.cpp
     ;PUBDEFs (Symbols available from object file):
       SetEncoding__22wxFontEnumeratorHelperF14wxFontEncoding
   ;From object file:  ..\os2\fontutil.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxGetFontEncFromCharSet(int)
+      wxGetFontEncFromCharSet__Fi

       ;wxNativeEncodingInfo::ToString() const
       ToString__20wxNativeEncodingInfoCFv
       ;wxTestFontEncoding(const wxNativeEncodingInfo&)
       wxTestFontEncoding__FRC20wxNativeEncodingInfo
       ;wxCreateFontFromLogFont(const _FATTRS*,_FONTMETRICS* const,_FACENAMEDESC*)
       wxCreateFontFromLogFont__FPC7_FATTRSCP12_FONTMETRICSP13_FACENAMEDESC
       ;wxNativeEncodingInfo::ToString() const
       ToString__20wxNativeEncodingInfoCFv
       ;wxTestFontEncoding(const wxNativeEncodingInfo&)
       wxTestFontEncoding__FRC20wxNativeEncodingInfo
       ;wxCreateFontFromLogFont(const _FATTRS*,_FONTMETRICS* const,_FACENAMEDESC*)
       wxCreateFontFromLogFont__FPC7_FATTRSCP12_FONTMETRICSP13_FACENAMEDESC

+      ;wxFillLogFont(_FATTRS*,_FACENAMEDESC*,unsigned long*,unsigned long*,long*,wxString&,wxFont*)
+      wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCPUlT3PlR8wxStringP6wxFont

       ;wxGetNativeFontEncoding(wxFontEncoding,wxNativeEncodingInfo*)
       wxGetNativeFontEncoding__F14wxFontEncodingP20wxNativeEncodingInfo
       ;wxGetNativeFontEncoding(wxFontEncoding,wxNativeEncodingInfo*)
       wxGetNativeFontEncoding__F14wxFontEncodingP20wxNativeEncodingInfo

-      ;wxFillLogFont(_FATTRS*,_FACENAMEDESC*,const wxFont*)
-      wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCPC6wxFont
+      ;wxConvertVectorFontSize(long,_FATTRS*)
+      wxConvertVectorFontSize__FlP7_FATTRS
+      ;wxOS2SelectMatchingFontByName(_FATTRS*,_FACENAMEDESC*,_FONTMETRICS*,int,const wxFont*)
+      wxOS2SelectMatchingFontByName__FP7_FATTRSP13_FACENAMEDESCP12_FONTMETRICSiPC6wxFont

       ;wxGpiStrcmp(char*,char*)
       wxGpiStrcmp__FPcT1
       ;wxNativeEncodingInfo::FromString(const wxString&)
       FromString__20wxNativeEncodingInfoFRC8wxString
   ;From object file:  ..\os2\frame.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxGpiStrcmp(char*,char*)
       wxGpiStrcmp__FPcT1
       ;wxNativeEncodingInfo::FromString(const wxString&)
       FromString__20wxNativeEncodingInfoFRC8wxString
   ;From object file:  ..\os2\frame.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxFrame::Show(unsigned long)
-      Show__7wxFrameFUl
-      ;wxFrame::Iconize(unsigned long)
-      Iconize__7wxFrameFUl

       ;wxFrame::HandleMenuSelect(unsigned short,unsigned short,unsigned long)
       HandleMenuSelect__7wxFrameFUsT1Ul
       ;wxFrame::OS2TranslateMessage(void**)
       OS2TranslateMessage__7wxFrameFPPv
       ;wxFrame::HandleMenuSelect(unsigned short,unsigned short,unsigned long)
       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


@@ -12398,44 +12842,32 @@ EXPORTS
       HandleSize__7wxFrameFiT1Ui
       ;wxConstructorForwxFrame()
       wxConstructorForwxFrame__Fv
       HandleSize__7wxFrameFiT1Ui
       ;wxConstructorForwxFrame()
       wxConstructorForwxFrame__Fv

-      ;wxFrame::SetIcon(const wxIcon&)
-      SetIcon__7wxFrameFRC6wxIcon
-      ;wxFrame::Restore()
-      Restore__7wxFrameFv
-      ;wxFrame::IsMaximized() const
-      IsMaximized__7wxFrameCFv
-      ;wxFrame::IsIconized() const
-      IsIconized__7wxFrameCFv
+      ;wxFrame::Raise()
+      Raise__7wxFrameFv

       ;wxFrame::GetClientAreaOrigin() const
       GetClientAreaOrigin__7wxFrameCFv
       ;wxFrame::GetClientAreaOrigin() const
       GetClientAreaOrigin__7wxFrameCFv

+      ;wxFrame::AttachMenuBar(wxMenuBar*)
+      AttachMenuBar__7wxFrameFP9wxMenuBar

       ;wxFrame::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       Create__7wxFrameFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
       ;wxFrame::OnSysColourChanged(wxSysColourChangedEvent&)
       OnSysColourChanged__7wxFrameFR23wxSysColourChangedEvent
       ;wxFrame::ShowFullScreen(unsigned long,long)
       ShowFullScreen__7wxFrameFUll
       ;wxFrame::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       Create__7wxFrameFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
       ;wxFrame::OnSysColourChanged(wxSysColourChangedEvent&)
       OnSysColourChanged__7wxFrameFR23wxSysColourChangedEvent
       ;wxFrame::ShowFullScreen(unsigned long,long)
       ShowFullScreen__7wxFrameFUll

-      ;wxFrame::DoShowWindow(int)
-      DoShowWindow__7wxFrameFi
+      ;wxFrame::m_bUseNativeStatusBar
+      m_bUseNativeStatusBar__7wxFrame

       ;wxFrame::sm_eventTable
       sm_eventTable__7wxFrame
       ;wxFrame::sm_eventTableEntries
       sm_eventTableEntries__7wxFrame
       ;wxFrame::sm_classwxFrame
       sm_classwxFrame__7wxFrame
       ;wxFrame::sm_eventTable
       sm_eventTable__7wxFrame
       ;wxFrame::sm_eventTableEntries
       sm_eventTableEntries__7wxFrame
       ;wxFrame::sm_classwxFrame
       sm_classwxFrame__7wxFrame

-      ;wxFrame::m_bUseNativeStatusBar
-      m_bUseNativeStatusBar__7wxFrame

       ;wxFrame::~wxFrame()
       __dt__7wxFrameFv
       ;wxFrame::GetClient()
       GetClient__7wxFrameFv
       ;wxFrame::~wxFrame()
       __dt__7wxFrameFv
       ;wxFrame::GetClient()
       GetClient__7wxFrameFv

-      ;wxFrame::OS2Create(int,wxWindow*,const char*,wxWindow*,const char*,int,int,int,int,long)
-      OS2Create__7wxFrameFiP8wxWindowPCcT2T3N41l

       ;wxFrame::HandleCommand(unsigned short,unsigned short,unsigned long)
       HandleCommand__7wxFrameFUsT1Ul
       ;wxFrame::HandleCommand(unsigned short,unsigned short,unsigned long)
       HandleCommand__7wxFrameFUsT1Ul

-      ;wxFrame::DoGetSize(int*,int*) const
-      DoGetSize__7wxFrameCFPiT1
-      ;wxFrame::DoGetPosition(int*,int*) const
-      DoGetPosition__7wxFrameCFPiT1

       ;wxFrame::PositionStatusBar()
       PositionStatusBar__7wxFrameFv
       ;wxFrame::PositionToolBar()
       ;wxFrame::PositionStatusBar()
       PositionStatusBar__7wxFrameFv
       ;wxFrame::PositionToolBar()


@@ -12444,14 +12876,14 @@ EXPORTS
       OS2WindowProc__7wxFrameFUiPvT2
       ;wxFrame::InternalSetMenuBar()
       InternalSetMenuBar__7wxFrameFv
       OS2WindowProc__7wxFrameFUiPvT2
       ;wxFrame::InternalSetMenuBar()
       InternalSetMenuBar__7wxFrameFv

+      ;wxFrame::GetDefaultIcon() const
+      GetDefaultIcon__7wxFrameCFv

       ;wxFrame::CreateToolBar(long,int,const wxString&)
       CreateToolBar__7wxFrameFliRC8wxString
       ;wxFrame::CreateToolBar(long,int,const wxString&)
       CreateToolBar__7wxFrameFliRC8wxString

-      ;wxFrame::Maximize(unsigned long)
-      Maximize__7wxFrameFUl
-      ;wxFrame::SetClient(unsigned long)
-      SetClient__7wxFrameFUl

       ;wxFrame::IconizeChildFrames(unsigned long)
       IconizeChildFrames__7wxFrameFUl
       ;wxFrame::IconizeChildFrames(unsigned long)
       IconizeChildFrames__7wxFrameFUl

+      ;wxFrame::SetClient(unsigned long)
+      SetClient__7wxFrameFUl

       ;wxFrame::DoGetClientSize(int*,int*) const
       DoGetClientSize__7wxFrameCFPiT1
       ;wxFrame::Init()
       ;wxFrame::DoGetClientSize(int*,int*) const
       DoGetClientSize__7wxFrameCFPiT1
       ;wxFrame::Init()


@@ -12462,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


@@ -12475,6 +12909,7 @@ EXPORTS
       sm_classwxGauge__7wxGauge
       ;wxGauge::SetForegroundColour(const wxColour&)
       SetForegroundColour__7wxGaugeFRC8wxColour
       sm_classwxGauge__7wxGauge
       ;wxGauge::SetForegroundColour(const wxColour&)
       SetForegroundColour__7wxGaugeFRC8wxColour

+      wxGaugeWndProc

       ;wxConstructorForwxGauge()
       wxConstructorForwxGauge__Fv
       ;wxGauge::SetBackgroundColour(const wxColour&)
       ;wxConstructorForwxGauge()
       wxConstructorForwxGauge__Fv
       ;wxGauge::SetBackgroundColour(const wxColour&)


@@ -12483,16 +12918,16 @@ EXPORTS
       GetRange__7wxGaugeCFv
       ;wxGauge::Create(wxWindow*,int,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__7wxGaugeFP8wxWindowiT2RC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       GetRange__7wxGaugeCFv
       ;wxGauge::Create(wxWindow*,int,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__7wxGaugeFP8wxWindowiT2RC7wxPointRC6wxSizelRC11wxValidatorRC8wxString

+      ;wxGauge::SetBezelFace(int)
+      SetBezelFace__7wxGaugeFi

       ;wxGauge::SetShadowWidth(int)
       SetShadowWidth__7wxGaugeFi
       ;wxGauge::SetRange(int)
       SetRange__7wxGaugeFi
       ;wxGauge::SetShadowWidth(int)
       SetShadowWidth__7wxGaugeFi
       ;wxGauge::SetRange(int)
       SetRange__7wxGaugeFi

-      ;wxGauge::SetBezelFace(int)
-      SetBezelFace__7wxGaugeFi
-      ;wxGauge::GetShadowWidth() const
-      GetShadowWidth__7wxGaugeCFv

       ;wxGauge::GetValue() const
       GetValue__7wxGaugeCFv
       ;wxGauge::GetValue() const
       GetValue__7wxGaugeCFv

+      ;wxGauge::GetShadowWidth() const
+      GetShadowWidth__7wxGaugeCFv

       ;wxGauge::GetBezelFace() const
       GetBezelFace__7wxGaugeCFv
   ;From object file:  ..\os2\gdiimage.cpp
       ;wxGauge::GetBezelFace() const
       GetBezelFace__7wxGaugeCFv
   ;From object file:  ..\os2\gdiimage.cpp


@@ -12516,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*)


@@ -12523,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()


@@ -12829,16 +13264,12 @@ EXPORTS
       DoSetItemClientData__9wxListBoxFiPv
       ;wxListBox::DoAppend(const wxString&)
       DoAppend__9wxListBoxFRC8wxString
       DoSetItemClientData__9wxListBoxFiPv
       ;wxListBox::DoAppend(const wxString&)
       DoAppend__9wxListBoxFRC8wxString

-      ;wxListBox::SetHorizontalExtent(const wxString&)
-      SetHorizontalExtent__9wxListBoxFRC8wxString

       ;wxListBox::OS2Command(unsigned int,unsigned short)
       OS2Command__9wxListBoxFUiUs
       ;wxListBox::sm_classwxListBox
       sm_classwxListBox__9wxListBox
       ;wxListBox::DoSetFirstItem(int)
       DoSetFirstItem__9wxListBoxFi
       ;wxListBox::OS2Command(unsigned int,unsigned short)
       OS2Command__9wxListBoxFUiUs
       ;wxListBox::sm_classwxListBox
       sm_classwxListBox__9wxListBox
       ;wxListBox::DoSetFirstItem(int)
       DoSetFirstItem__9wxListBoxFi

-      ;wxListBox::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
-      OnCtlColor__9wxListBoxFUlT1UiT3PvT5

       ;wxListBox::IsSelected(int) const
       IsSelected__9wxListBoxCFi
       ;wxListBox::SetString(int,const wxString&)
       ;wxListBox::IsSelected(int) const
       IsSelected__9wxListBoxCFi
       ;wxListBox::SetString(int,const wxString&)


@@ -12858,6 +13289,7 @@ EXPORTS
       DoSetItemClientObject__9wxListBoxFiP12wxClientData
       ;wxListBox::GetCount() const
       GetCount__9wxListBoxCFv
       DoSetItemClientObject__9wxListBoxFiP12wxClientData
       ;wxListBox::GetCount() const
       GetCount__9wxListBoxCFv

+      __vft9wxListBox15wxItemContainer

       ;wxListBoxItem::wxListBoxItem(const wxString&)
       __ct__13wxListBoxItemFRC8wxString
       ;wxListBox::SetSelection(int,unsigned long)
       ;wxListBoxItem::wxListBoxItem(const wxString&)
       __ct__13wxListBoxItemFRC8wxString
       ;wxListBox::SetSelection(int,unsigned long)


@@ -13038,16 +13470,18 @@ EXPORTS
       sm_classwxMenuBar__9wxMenuBar
       ;wxMenuBar::RebuildAccelTable()
       RebuildAccelTable__9wxMenuBarFv
       sm_classwxMenuBar__9wxMenuBar
       ;wxMenuBar::RebuildAccelTable()
       RebuildAccelTable__9wxMenuBarFv

-      ;wxMenu::Detach()
-      Detach__6wxMenuFv
+      ;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()


@@ -13056,8 +13490,6 @@ EXPORTS
       GetWindow__6wxMenuCFv
       ;wxMenuBar::Create()
       Create__9wxMenuBarFv
       GetWindow__6wxMenuCFv
       ;wxMenuBar::Create()
       Create__9wxMenuBarFv

-      ;wxMenu::ProcessCommand(wxCommandEvent&)
-      ProcessCommand__6wxMenuFR14wxCommandEvent

       ;wxMenuBar::FindMenuItem(const wxString&,const wxString&) const
       FindMenuItem__9wxMenuBarCFRC8wxStringT1
       ;wxConstructorForwxMenuBar()
       ;wxMenuBar::FindMenuItem(const wxString&,const wxString&) const
       FindMenuItem__9wxMenuBarCFRC8wxStringT1
       ;wxConstructorForwxMenuBar()


@@ -13070,8 +13502,6 @@ EXPORTS
       Init__9wxMenuBarFv
       ;wxMenu::Break()
       Break__6wxMenuFv
       Init__9wxMenuBarFv
       ;wxMenu::Break()
       Break__6wxMenuFv

-      ;wxMenu::Attach(wxMenuBar*)
-      Attach__6wxMenuFP9wxMenuBar

       ;wxMenuBar::Replace(unsigned int,wxMenu*,const wxString&)
       Replace__9wxMenuBarFUiP6wxMenuRC8wxString
   ;From object file:  ..\os2\menuitem.cpp
       ;wxMenuBar::Replace(unsigned int,wxMenu*,const wxString&)
       Replace__9wxMenuBarFUiP6wxMenuRC8wxString
   ;From object file:  ..\os2\menuitem.cpp


@@ -13082,27 +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::GetAccel() const
-      GetAccel__10wxMenuItemCFv
+      ;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):


@@ -13153,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


@@ -13214,15 +13652,17 @@ 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
       ;wxNotebook::SetTabSize(const wxSize&)
       SetTabSize__10wxNotebookFRC6wxSize
       wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
       ;wxNotebook::ChangePage(int,int)
       ChangePage__10wxNotebookFiT1
       ;wxNotebook::SetTabSize(const wxSize&)
       SetTabSize__10wxNotebookFRC6wxSize

+      ;wxNotebook::SetPageSize(const wxSize&)
+      SetPageSize__10wxNotebookFRC6wxSize

       ;wxNotebook::AddPage(wxWindow*,const wxString&,unsigned long,int)
       AddPage__10wxNotebookFP8wxWindowRC8wxStringUli
       ;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)


@@ -13231,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&)


@@ -13247,12 +13685,12 @@ EXPORTS
       OnNavigationKey__10wxNotebookFR20wxNavigationKeyEvent
       ;wxNotebook::GetPageText(int) const
       GetPageText__10wxNotebookCFi
       OnNavigationKey__10wxNotebookFR20wxNavigationKeyEvent
       ;wxNotebook::GetPageText(int) const
       GetPageText__10wxNotebookCFi

+      ;wxNotebook::SetPadding(const wxSize&)
+      SetPadding__10wxNotebookFRC6wxSize

       ;wxConstructorForwxNotebook()
       wxConstructorForwxNotebook__Fv
       ;wxConstructorForwxNotebookEvent()
       wxConstructorForwxNotebookEvent__Fv
       ;wxConstructorForwxNotebook()
       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


@@ -13260,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&)


@@ -13370,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)


@@ -13452,115 +13853,133 @@ EXPORTS
       sm_classwxPrinter__9wxPrinter
   ;From object file:  ..\os2\radiobox.cpp
     ;PUBDEFs (Symbols available from object file):
       sm_classwxPrinter__9wxPrinter
   ;From object file:  ..\os2\radiobox.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxRadioBox::Show(unsigned long)
-      Show__10wxRadioBoxFUl

       ;wxRadioBox::ContainsHWND(unsigned long) const
       ContainsHWND__10wxRadioBoxCFUl
       ;wxRadioBox::ContainsHWND(unsigned long) const
       ContainsHWND__10wxRadioBoxCFUl

+      ;wxRadioBox::Show(unsigned long)
+      Show__10wxRadioBoxFUl

       ;wxRadioBox::GetString(int) const
       GetString__10wxRadioBoxCFi
       ;wxRadioBox::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
       OnCtlColor__10wxRadioBoxFUlT1UiT3PvT5
       ;wxRadioBox::GetString(int) const
       GetString__10wxRadioBoxCFi
       ;wxRadioBox::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
       OnCtlColor__10wxRadioBoxFUlT1UiT3PvT5

-      ;wxRadioBox::GetSelection() const
-      GetSelection__10wxRadioBoxCFv
+      ;wxRadioBox::GetMaxButtonSize() const
+      GetMaxButtonSize__10wxRadioBoxCFv

       ;wxRadioBox::GetStringSelection() const
       GetStringSelection__10wxRadioBoxCFv
       ;wxRadioBox::GetStringSelection() const
       GetStringSelection__10wxRadioBoxCFv

+      ;wxRadioBox::GetSelection() const
+      GetSelection__10wxRadioBoxCFv
+      ;wxRadioBox::DoGetBestSize() const
+      DoGetBestSize__10wxRadioBoxCFv

       ;wxRadioBox::SetStringSelection(const wxString&)
       SetStringSelection__10wxRadioBoxFRC8wxString
       ;wxRadioBox::Enable(int,unsigned long)
       Enable__10wxRadioBoxFiUl
       ;wxRadioBox::Enable(unsigned long)
       Enable__10wxRadioBoxFUl
       ;wxRadioBox::SetStringSelection(const wxString&)
       SetStringSelection__10wxRadioBoxFRC8wxString
       ;wxRadioBox::Enable(int,unsigned long)
       Enable__10wxRadioBoxFiUl
       ;wxRadioBox::Enable(unsigned long)
       Enable__10wxRadioBoxFUl

-      ;wxRadioBox::GetLabel(int) const
-      GetLabel__10wxRadioBoxCFi
-      ;wxRadioBox::GetSize(int*,int*) const
-      GetSize__10wxRadioBoxCFPiT1

       ;wxRadioBox::GetPosition(int*,int*) const
       GetPosition__10wxRadioBoxCFPiT1
       ;wxRadioBox::GetPosition(int*,int*) const
       GetPosition__10wxRadioBoxCFPiT1

+      ;wxRadioBox::GetSize(int*,int*) const
+      GetSize__10wxRadioBoxCFPiT1
+      ;wxRadioBox::GetLabel(int) const
+      GetLabel__10wxRadioBoxCFi
+      ;wxRadioBox::GetColumnCount() const
+      GetColumnCount__10wxRadioBoxCFv

       ;wxRadioBox::SetFocus()
       SetFocus__10wxRadioBoxFv
       ;wxRadioBox::OS2Command(unsigned int,unsigned short)
       OS2Command__10wxRadioBoxFUiUs
       ;wxRadioBox::SetFocus()
       SetFocus__10wxRadioBoxFv
       ;wxRadioBox::OS2Command(unsigned int,unsigned short)
       OS2Command__10wxRadioBoxFUiUs

-      ;wxRadioBox::SetLabel(int,wxBitmap*)
-      SetLabel__10wxRadioBoxFiP8wxBitmap

       ;wxRadioBox::SubclassRadioButton(unsigned long)
       SubclassRadioButton__10wxRadioBoxFUl
       ;wxRadioBox::SubclassRadioButton(unsigned long)
       SubclassRadioButton__10wxRadioBoxFUl

+      __vft10wxRadioBox14wxRadioBoxBase

       ;wxConstructorForwxRadioBox()
       wxConstructorForwxRadioBox__Fv
       ;wxRadioBox::wxRadioBox()
       __ct__10wxRadioBoxFv
       ;wxRadioBox::SendNotificationEvent()
       SendNotificationEvent__10wxRadioBoxFv
       ;wxConstructorForwxRadioBox()
       wxConstructorForwxRadioBox__Fv
       ;wxRadioBox::wxRadioBox()
       __ct__10wxRadioBoxFv
       ;wxRadioBox::SendNotificationEvent()
       SendNotificationEvent__10wxRadioBoxFv

+      ;wxRadioBox::GetRowCount() const
+      GetRowCount__10wxRadioBoxCFv

       ;wxRadioBox::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,int,const wxString*,int,long,const wxValidator&,const wxString&)
       Create__10wxRadioBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizeT2PC8wxStringT2lRC11wxValidatorT3
       ;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
       ;wxRadioBox::FindString(const wxString&) const
       FindString__10wxRadioBoxCFRC8wxString

+      __vft10wxRadioBox8wxObject

       ;wxRadioBox::sm_classwxRadioBox
       sm_classwxRadioBox__10wxRadioBox
       ;wxRadioBox::sm_classwxRadioBox
       sm_classwxRadioBox__10wxRadioBox

-      __vft10wxRadioBox8wxObject
+      ;wxRadioBox::AdjustButtons(int,int,int,int,int)
+      AdjustButtons__10wxRadioBoxFiN41

       ;wxRadioBox::SetSelection(int)
       SetSelection__10wxRadioBoxFi
       ;wxRadioBox::SetSelection(int)
       SetSelection__10wxRadioBoxFi

-      ;wxRadioBox::GetNumVer() const
-      GetNumVer__10wxRadioBoxCFv

       ;wxRadioBox::~wxRadioBox()
       __dt__10wxRadioBoxFv
       ;wxRadioBox::~wxRadioBox()
       __dt__10wxRadioBoxFv

-      ;wxRadioBtnWndProc(unsigned long,unsigned int,void*,void*)
-      wxRadioBtnWndProc__FUlUiPvT3
-      ;wxRadioBox::Show(int,unsigned long)
-      Show__10wxRadioBoxFiUl
+      ;wxRadioBox::GetNumVer() const
+      GetNumVer__10wxRadioBoxCFv
+      ;wxRadioBox::GetCount() const
+      GetCount__10wxRadioBoxCFv

       ;wxRadioBox::Command(wxCommandEvent&)
       Command__10wxRadioBoxFR14wxCommandEvent
       ;wxRadioBox::Command(wxCommandEvent&)
       Command__10wxRadioBoxFR14wxCommandEvent

+      ;wxRadioBox::Show(int,unsigned long)
+      Show__10wxRadioBoxFiUl
+      ;wxRadioBox::SetFont(const wxFont&)
+      SetFont__10wxRadioBoxFRC6wxFont
+      ;wxRadioBox::GetTotalButtonSize(const wxSize&) const
+      GetTotalButtonSize__10wxRadioBoxCFRC6wxSize

       ;wxRadioBox::DoSetSize(int,int,int,int,int)
       DoSetSize__10wxRadioBoxFiN41
       ;wxRadioBox::GetNumHor() const
       GetNumHor__10wxRadioBoxCFv
       ;wxRadioBox::DoSetSize(int,int,int,int,int)
       DoSetSize__10wxRadioBoxFiN41
       ;wxRadioBox::GetNumHor() const
       GetNumHor__10wxRadioBoxCFv

-      ;wxRadioBox::SetLabel(int,const wxString&)
-      SetLabel__10wxRadioBoxFiRC8wxString
+      ;wxRadioBox::WindowProc(unsigned int,void*,void*)
+      WindowProc__10wxRadioBoxFUiPvT2
+      ;wxRadioBox::SetString(int,const wxString&)
+      SetString__10wxRadioBoxFiRC8wxString
+      wxRadioBtnWndProc

   ;From object file:  ..\os2\radiobut.cpp
     ;PUBDEFs (Symbols available from object file):
   ;From object file:  ..\os2\radiobut.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxBitmapRadioButton::GetValue() const
-      GetValue__19wxBitmapRadioButtonCFv
+      ;wxRadioButton::SetFocus()
+      SetFocus__13wxRadioButtonFv

       ;wxRadioButton::sm_classwxRadioButton
       sm_classwxRadioButton__13wxRadioButton
       ;wxRadioButton::OS2Command(unsigned int,unsigned short)
       OS2Command__13wxRadioButtonFUiUs
       ;wxRadioButton::sm_classwxRadioButton
       sm_classwxRadioButton__13wxRadioButton
       ;wxRadioButton::OS2Command(unsigned int,unsigned short)
       OS2Command__13wxRadioButtonFUiUs

+      ;wxRadioButton::Init()
+      Init__13wxRadioButtonFv

       ;wxConstructorForwxRadioButton()
       wxConstructorForwxRadioButton__Fv
       ;wxConstructorForwxRadioButton()
       wxConstructorForwxRadioButton__Fv

+      ;wxRadioButton::DoGetBestSize() const
+      DoGetBestSize__13wxRadioButtonCFv

       ;wxRadioButton::Command(wxCommandEvent&)
       Command__13wxRadioButtonFR14wxCommandEvent
       ;wxRadioButton::Command(wxCommandEvent&)
       Command__13wxRadioButtonFR14wxCommandEvent

-      ;wxBitmapRadioButton::SetValue(unsigned long)
-      SetValue__19wxBitmapRadioButtonFUl
-      ;wxBitmapRadioButton::sm_classwxBitmapRadioButton
-      sm_classwxBitmapRadioButton__19wxBitmapRadioButton
-      ;wxBitmapRadioButton::SetLabel(const wxBitmap*)
-      SetLabel__19wxBitmapRadioButtonFPC8wxBitmap

       __vft13wxRadioButton8wxObject
       __vft13wxRadioButton8wxObject

-      ;wxConstructorForwxBitmapRadioButton()
-      wxConstructorForwxBitmapRadioButton__Fv

       ;wxRadioButton::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__13wxRadioButtonFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelRC11wxValidatorT3
       ;wxRadioButton::SetLabel(const wxString&)
       SetLabel__13wxRadioButtonFRC8wxString
       ;wxRadioButton::SetValue(unsigned long)
       SetValue__13wxRadioButtonFUl
       ;wxRadioButton::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__13wxRadioButtonFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelRC11wxValidatorT3
       ;wxRadioButton::SetLabel(const wxString&)
       SetLabel__13wxRadioButtonFRC8wxString
       ;wxRadioButton::SetValue(unsigned long)
       SetValue__13wxRadioButtonFUl

-      __vft19wxBitmapRadioButton8wxObject

       ;wxRadioButton::GetValue() const
       GetValue__13wxRadioButtonCFv
       ;wxRadioButton::GetValue() const
       GetValue__13wxRadioButtonCFv

-      ;wxBitmapRadioButton::Create(wxWindow*,int,const wxBitmap*,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
-      Create__19wxBitmapRadioButtonFP8wxWindowiPC8wxBitmapRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
+      ;wxRadioButton::OS2WindowProc(unsigned int,void*,void*)
+      OS2WindowProc__13wxRadioButtonFUiPvT2

   ;From object file:  ..\os2\region.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxRegion::Combine(const wxRect&,wxRegionOp)
       Combine__8wxRegionFRC6wxRect10wxRegionOp
   ;From object file:  ..\os2\region.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxRegion::Combine(const wxRect&,wxRegionOp)
       Combine__8wxRegionFRC6wxRect10wxRegionOp

+      ;wxRegion::Offset(int,int)
+      Offset__8wxRegionFiT1

       ;wxRegion::GetBox() const
       GetBox__8wxRegionCFv
       ;wxRegionIterator::operator++()
       __pp__16wxRegionIteratorFv
       ;wxRegion::Combine(const wxRegion&,wxRegionOp)
       Combine__8wxRegionFRC8wxRegion10wxRegionOp
       ;wxRegion::GetBox() const
       GetBox__8wxRegionCFv
       ;wxRegionIterator::operator++()
       __pp__16wxRegionIteratorFv
       ;wxRegion::Combine(const wxRegion&,wxRegionOp)
       Combine__8wxRegionFRC8wxRegion10wxRegionOp

+      ;wxRegion::wxRegion(unsigned long,unsigned long)
+      __ct__8wxRegionFUlT1

       ;wxRegion::wxRegion(const wxPoint&,const wxPoint&)
       __ct__8wxRegionFRC7wxPointT1
       ;wxRegion::Contains(int,int) const
       Contains__8wxRegionCFiT1
       ;wxRegion::wxRegion(const wxPoint&,const wxPoint&)
       __ct__8wxRegionFRC7wxPointT1
       ;wxRegion::Contains(int,int) const
       Contains__8wxRegionCFiT1

+      ;wxRegion::CloneData(const wxObjectRefData*) const
+      CloneData__8wxRegionCFPC15wxObjectRefData

       ;wxRegionIterator::GetY() const
       GetY__16wxRegionIteratorCFv
       ;wxConstructorForwxRegion()
       ;wxRegionIterator::GetY() const
       GetY__16wxRegionIteratorCFv
       ;wxConstructorForwxRegion()


@@ -13606,11 +14025,11 @@ EXPORTS
       __ct__16wxRegionIteratorFRC8wxRegion
       ;wxRegionIterator::GetH() const
       GetH__16wxRegionIteratorCFv
       __ct__16wxRegionIteratorFRC8wxRegion
       ;wxRegionIterator::GetH() const
       GetH__16wxRegionIteratorCFv

-      ;wxRegion::wxRegion(unsigned long)
-      __ct__8wxRegionFUl
-      __vft16wxRegionIterator8wxObject
+      ;wxRegion::CreateData() const
+      CreateData__8wxRegionCFv

       ;wxRegion::SetPS(unsigned long)
       SetPS__8wxRegionFUl
       ;wxRegion::SetPS(unsigned long)
       SetPS__8wxRegionFUl

+      __vft16wxRegionIterator8wxObject

       ;wxRegion::wxRegion(int,int,int,int)
       __ct__8wxRegionFiN31
       ;wxRegion::Empty() const
       ;wxRegion::wxRegion(int,int,int,int)
       __ct__8wxRegionFiN31
       ;wxRegion::Empty() const


@@ -13648,37 +14067,31 @@ EXPORTS
       sm_eventTable__11wxScrollBar
   ;From object file:  ..\os2\settings.cpp
     ;PUBDEFs (Symbols available from object file):
       sm_eventTable__11wxScrollBar
   ;From object file:  ..\os2\settings.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxSystemSettings::SetOption(const wxString&,const wxString&)
-      SetOption__16wxSystemSettingsFRC8wxStringT1

       ;wxSystemSettingsModule::sm_classwxSystemSettingsModule
       sm_classwxSystemSettingsModule__22wxSystemSettingsModule
       ;wxSystemSettingsModule::OnInit()
       OnInit__22wxSystemSettingsModuleFv
       ;wxSystemSettingsModule::sm_classwxSystemSettingsModule
       sm_classwxSystemSettingsModule__22wxSystemSettingsModule
       ;wxSystemSettingsModule::OnInit()
       OnInit__22wxSystemSettingsModuleFv

-      ;wxSystemSettings::GetOption(const wxString&)
-      GetOption__16wxSystemSettingsFRC8wxString
+      ;wxSystemSettingsNative::GetFont(wxSystemFont)
+      GetFont__22wxSystemSettingsNativeF12wxSystemFont

       __vft22wxSystemSettingsModule8wxObject
       __vft22wxSystemSettingsModule8wxObject

-      ;wxSystemSettings::GetSystemColour(int)
-      GetSystemColour__16wxSystemSettingsFi
-      ;wxSystemSettings::GetSystemMetric(int)
-      GetSystemMetric__16wxSystemSettingsFi
-      ;wxSystemSettings::HasOption(const wxString&)
-      HasOption__16wxSystemSettingsFRC8wxString
+      ;wxSystemSettingsNative::HasFeature(wxSystemFeature)
+      HasFeature__22wxSystemSettingsNativeF15wxSystemFeature

       ;wxSystemSettingsModule::sm_optionNames
       sm_optionNames__22wxSystemSettingsModule
       ;wxSystemSettingsModule::sm_optionNames
       sm_optionNames__22wxSystemSettingsModule

+      ;wxSystemSettingsNative::GetColour(wxSystemColour)
+      GetColour__22wxSystemSettingsNativeF14wxSystemColour

       ;wxSystemSettingsModule::OnExit()
       OnExit__22wxSystemSettingsModuleFv
       ;wxSystemSettingsModule::sm_optionValues
       sm_optionValues__22wxSystemSettingsModule
       ;wxConstructorForwxSystemSettingsModule()
       wxConstructorForwxSystemSettingsModule__Fv
       ;wxSystemSettingsModule::OnExit()
       OnExit__22wxSystemSettingsModuleFv
       ;wxSystemSettingsModule::sm_optionValues
       sm_optionValues__22wxSystemSettingsModule
       ;wxConstructorForwxSystemSettingsModule()
       wxConstructorForwxSystemSettingsModule__Fv

-      ;wxSystemSettings::GetOptionInt(const wxString&)
-      GetOptionInt__16wxSystemSettingsFRC8wxString
-      ;wxSystemSettings::GetSystemFont(int)
-      GetSystemFont__16wxSystemSettingsFi
-      ;wxSystemSettings::SetOption(const wxString&,int)
-      SetOption__16wxSystemSettingsFRC8wxStringi
+      ;wxSystemSettingsNative::GetMetric(wxSystemMetric)
+      GetMetric__22wxSystemSettingsNativeF14wxSystemMetric

   ;From object file:  ..\os2\slider.cpp
     ;PUBDEFs (Symbols available from object file):
   ;From object file:  ..\os2\slider.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxSlider::DoSetSize(int,int,int,int,int)
+      DoSetSize__8wxSliderFiN41

       ;wxSlider::SetValue(int)
       SetValue__8wxSliderFi
       ;wxSlider::SetTick(int)
       ;wxSlider::SetValue(int)
       SetValue__8wxSliderFi
       ;wxSlider::SetTick(int)


@@ -13689,8 +14102,6 @@ EXPORTS
       SetPageSize__8wxSliderFi
       ;wxSlider::SetLineSize(int)
       SetLineSize__8wxSliderFi
       SetPageSize__8wxSliderFi
       ;wxSlider::SetLineSize(int)
       SetLineSize__8wxSliderFi

-      ;wxSlider::DoSetSize(int,int,int,int,int)
-      DoSetSize__8wxSliderFiN41

       ;wxSlider::GetValue() const
       GetValue__8wxSliderCFv
       ;wxSlider::ContainsHWND(unsigned long) const
       ;wxSlider::GetValue() const
       GetValue__8wxSliderCFv
       ;wxSlider::ContainsHWND(unsigned long) const


@@ -13701,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()


@@ -13714,6 +14127,8 @@ EXPORTS
       ;wxSlider::Create(wxWindow*,int,int,int,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__8wxSliderFP8wxWindowiN32RC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       __vft8wxSlider8wxObject
       ;wxSlider::Create(wxWindow*,int,int,int,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__8wxSliderFP8wxWindowiN32RC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       __vft8wxSlider8wxObject

+      ;wxSlider::AdjustSubControls(int,int,int,int,int)
+      AdjustSubControls__8wxSliderFiN41

       ;wxSlider::SetRange(int,int)
       SetRange__8wxSliderFiT1
       ;wxSlider::~wxSlider()
       ;wxSlider::SetRange(int,int)
       SetRange__8wxSliderFiT1
       ;wxSlider::~wxSlider()


@@ -13730,10 +14145,10 @@ EXPORTS
       ClearSel__8wxSliderFv
       ;wxSlider::GetLineSize() const
       GetLineSize__8wxSliderCFv
       ClearSel__8wxSliderFv
       ;wxSlider::GetLineSize() const
       GetLineSize__8wxSliderCFv

-      ;wxSlider::OS2OnScroll(int,unsigned short,unsigned short,unsigned long)
-      OS2OnScroll__8wxSliderFiUsT2Ul

       ;wxSlider::Command(wxCommandEvent&)
       Command__8wxSliderFR14wxCommandEvent
       ;wxSlider::Command(wxCommandEvent&)
       Command__8wxSliderFR14wxCommandEvent

+      ;wxSlider::OS2OnScroll(int,unsigned short,unsigned short,unsigned long)
+      OS2OnScroll__8wxSliderFiUsT2Ul

       ;wxSlider::SetSelection(int,int)
       SetSelection__8wxSliderFiT1
       ;wxSlider::sm_classwxSlider
       ;wxSlider::SetSelection(int,int)
       SetSelection__8wxSliderFiT1
       ;wxSlider::sm_classwxSlider


@@ -13748,13 +14163,11 @@ EXPORTS
       sm_classwxSpinButton__12wxSpinButton
       ;wxSpinButton::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__12wxSpinButtonFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       sm_classwxSpinButton__12wxSpinButton
       ;wxSpinButton::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__12wxSpinButtonFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString

-      ;wxSpinButton::OS2OnNotify(int,void*,void**)
-      OS2OnNotify__12wxSpinButtonFiPvPPv

       __vft12wxSpinButton8wxObject
       __vft12wxSpinButton8wxObject

-      ;wxSpinButton::SetValue(int)
-      SetValue__12wxSpinButtonFi

       ;wxSpinButton::SetRange(int,int)
       SetRange__12wxSpinButtonFiT1
       ;wxSpinButton::SetRange(int,int)
       SetRange__12wxSpinButtonFiT1

+      ;wxSpinButton::SetValue(int)
+      SetValue__12wxSpinButtonFi

       ;wxConstructorForwxSpinEvent()
       wxConstructorForwxSpinEvent__Fv
       ;wxConstructorForwxSpinButton()
       ;wxConstructorForwxSpinEvent()
       wxConstructorForwxSpinEvent__Fv
       ;wxConstructorForwxSpinButton()


@@ -13769,27 +14182,46 @@ EXPORTS
       OS2Command__12wxSpinButtonFUiUs
   ;From object file:  ..\os2\spinctrl.cpp
     ;PUBDEFs (Symbols available from object file):
       OS2Command__12wxSpinButtonFUiUs
   ;From object file:  ..\os2\spinctrl.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxSpinCtrl::GetSpinForTextCtrl(unsigned long)
+      GetSpinForTextCtrl__10wxSpinCtrlFUl
+      __vft10wxSpinCtrl8wxObject

       ;wxSpinCtrl::SetFont(const wxFont&)
       SetFont__10wxSpinCtrlFRC6wxFont
       ;wxSpinCtrl::SetFont(const wxFont&)
       SetFont__10wxSpinCtrlFRC6wxFont

-      __vft10wxSpinCtrl8wxObject
+      ;wxSpinCtrl::SetFocus()
+      SetFocus__10wxSpinCtrlFv

       ;wxSpinCtrl::SetValue(const wxString&)
       SetValue__10wxSpinCtrlFRC8wxString
       ;wxSpinCtrl::sm_classwxSpinCtrl
       sm_classwxSpinCtrl__10wxSpinCtrl
       ;wxSpinCtrl::SetValue(const wxString&)
       SetValue__10wxSpinCtrlFRC8wxString
       ;wxSpinCtrl::sm_classwxSpinCtrl
       sm_classwxSpinCtrl__10wxSpinCtrl

+      ;wxSpinCtrl::m_svAllSpins
+      m_svAllSpins__10wxSpinCtrl
+      ;wxSpinCtrl::DoGetPosition(int*,int*) const
+      DoGetPosition__10wxSpinCtrlCFPiT1
+      ;wxSpinCtrl::SetSelection(long,long)
+      SetSelection__10wxSpinCtrlFlT1

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

-      ;wxSpinCtrl::Show(unsigned long)
-      Show__10wxSpinCtrlFUl
+      wxSpinCtrlWndProc
+      ;wxSpinCtrl::OnChar(wxKeyEvent&)
+      OnChar__10wxSpinCtrlFR10wxKeyEvent

       ;wxSpinCtrl::sm_eventTable
       sm_eventTable__10wxSpinCtrl
       ;wxSpinCtrl::sm_eventTableEntries
       sm_eventTableEntries__10wxSpinCtrl
       ;wxSpinCtrl::sm_eventTable
       sm_eventTable__10wxSpinCtrl
       ;wxSpinCtrl::sm_eventTableEntries
       sm_eventTableEntries__10wxSpinCtrl

+      ;wxSpinCtrl::Show(unsigned long)
+      Show__10wxSpinCtrlFUl

       ;wxSpinCtrl::OnSpinChange(wxSpinEvent&)
       OnSpinChange__10wxSpinCtrlFR11wxSpinEvent
       ;wxSpinCtrl::OnSpinChange(wxSpinEvent&)
       OnSpinChange__10wxSpinCtrlFR11wxSpinEvent

+      ;wxSpinCtrl::DoGetSize(int*,int*) const
+      DoGetSize__10wxSpinCtrlCFPiT1
+      ;wxSpinCtrl::~wxSpinCtrl()
+      __dt__10wxSpinCtrlFv

       ;wxSpinCtrl::DoGetBestSize() const
       DoGetBestSize__10wxSpinCtrlCFv
       ;wxSpinCtrl::Enable(unsigned long)
       Enable__10wxSpinCtrlFUl
       ;wxSpinCtrl::DoGetBestSize() const
       DoGetBestSize__10wxSpinCtrlCFv
       ;wxSpinCtrl::Enable(unsigned long)
       Enable__10wxSpinCtrlFUl

+      ;wxSpinCtrl::ProcessTextCommand(unsigned short,unsigned short)
+      ProcessTextCommand__10wxSpinCtrlFUsT1

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


@@ -13800,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&)


@@ -13815,31 +14255,25 @@ EXPORTS
       ImageIsOk__14wxStaticBitmapCFv
       ;wxStaticBitmap::DoGetBestSize() const
       DoGetBestSize__14wxStaticBitmapCFv
       ImageIsOk__14wxStaticBitmapCFv
       ;wxStaticBitmap::DoGetBestSize() const
       DoGetBestSize__14wxStaticBitmapCFv

+      ;wxStaticBitmap::OS2WindowProc(unsigned int,void*,void*)
+      OS2WindowProc__14wxStaticBitmapFUiPvT2

   ;From object file:  ..\os2\statbox.cpp
     ;PUBDEFs (Symbols available from object file):
   ;From object file:  ..\os2\statbox.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxStaticBox::OnEraseBackground(wxEraseEvent&)
-      OnEraseBackground__11wxStaticBoxFR12wxEraseEvent

       ;wxConstructorForwxStaticBox()
       wxConstructorForwxStaticBox__Fv
       ;wxConstructorForwxStaticBox()
       wxConstructorForwxStaticBox__Fv

-      ;wxStaticBox::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
-      OnCtlColor__11wxStaticBoxFUlT1UiT3PvT5
-      ;wxStaticBox::GetEventTable() const
-      GetEventTable__11wxStaticBoxCFv
-      ;wxStaticBox::OS2WindowProc(unsigned int,void*,void*)
-      OS2WindowProc__11wxStaticBoxFUiPvT2

       ;wxStaticBox::DoGetBestSize() const
       DoGetBestSize__11wxStaticBoxCFv
       ;wxStaticBox::DoGetBestSize() const
       DoGetBestSize__11wxStaticBoxCFv

+      ;wxStaticBox::OS2WindowProc(unsigned int,void*,void*)
+      OS2WindowProc__11wxStaticBoxFUiPvT2

       ;wxStaticBox::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       Create__11wxStaticBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
       ;wxStaticBox::sm_classwxStaticBox
       sm_classwxStaticBox__11wxStaticBox
       ;wxStaticBox::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       Create__11wxStaticBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
       ;wxStaticBox::sm_classwxStaticBox
       sm_classwxStaticBox__11wxStaticBox

-      ;wxStaticBox::sm_eventTable
-      sm_eventTable__11wxStaticBox

       __vft11wxStaticBox8wxObject
       __vft11wxStaticBox8wxObject

-      ;wxStaticBox::sm_eventTableEntries
-      sm_eventTableEntries__11wxStaticBox

   ;From object file:  ..\os2\stattext.cpp
     ;PUBDEFs (Symbols available from object file):
   ;From object file:  ..\os2\stattext.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxStaticText::DoSetSize(int,int,int,int,int)
+      DoSetSize__12wxStaticTextFiN41

       ;wxStaticText::OS2WindowProc(unsigned int,void*,void*)
       OS2WindowProc__12wxStaticTextFUiPvT2
       ;wxStaticText::SetLabel(const wxString&)
       ;wxStaticText::OS2WindowProc(unsigned int,void*,void*)
       OS2WindowProc__12wxStaticTextFUiPvT2
       ;wxStaticText::SetLabel(const wxString&)


@@ -13859,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


@@ -14032,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()


@@ -14075,6 +14518,8 @@ EXPORTS
       Cut__10wxTextCtrlFv
       ;wxTextCtrl::SetInsertionPointEnd()
       SetInsertionPointEnd__10wxTextCtrlFv
       Cut__10wxTextCtrlFv
       ;wxTextCtrl::SetInsertionPointEnd()
       SetInsertionPointEnd__10wxTextCtrlFv

+      ;wxTextCtrl::OS2ShouldPreProcessMessage(void**)
+      OS2ShouldPreProcessMessage__10wxTextCtrlFPPv

       ;wxTextCtrl::DiscardEdits()
       DiscardEdits__10wxTextCtrlFv
       ;wxTextCtrl::CanUndo() const
       ;wxTextCtrl::DiscardEdits()
       DiscardEdits__10wxTextCtrlFv
       ;wxTextCtrl::CanUndo() const


@@ -14138,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()


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

-      ;wxThread::Create()
-      Create__8wxThreadFv
+      ;wxCondition::wxCondition(wxMutex&)
+      __ct__11wxConditionFR7wxMutex

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


@@ -14189,16 +14632,14 @@ 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

-      ;wxThreadInternal::Create(wxThread*)
-      Create__16wxThreadInternalFP8wxThread
+      ;wxCondition::WaitTimeout(unsigned long)
+      WaitTimeout__11wxConditionFUl

       __vft8wxThread
       ;wxThread::wxThread(wxThreadKind)
       __ct__8wxThreadF12wxThreadKind
       __vft8wxThread
       ;wxThread::wxThread(wxThreadKind)
       __ct__8wxThreadF12wxThreadKind


@@ -14223,6 +14664,10 @@ EXPORTS
       SetPriority__16wxThreadInternalFUi
       ;wxThread::SetPriority(unsigned int)
       SetPriority__8wxThreadFUi
       SetPriority__16wxThreadInternalFUi
       ;wxThread::SetPriority(unsigned int)
       SetPriority__8wxThreadFUi

+      ;wxThread::Create(unsigned int)
+      Create__8wxThreadFUi
+      ;wxThreadInternal::Create(wxThread*,unsigned int)
+      Create__16wxThreadInternalFP8wxThreadUi

       ;wxMutexGuiLeave()
       wxMutexGuiLeave__Fv
       ;wxThread::~wxThread()
       ;wxMutexGuiLeave()
       wxMutexGuiLeave__Fv
       ;wxThread::~wxThread()


@@ -14251,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()


@@ -14265,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()


@@ -14285,58 +14738,123 @@ 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):
+      ;wxTopLevelWindowOS2::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__19wxTopLevelWindowOS2CFlPUl
+      __vft19wxTopLevelWindowOS28wxObject
+      ;wxTopLevelWindowOS2::CreateFrame(const wxString&,const wxPoint&,const wxSize&)
+      CreateFrame__19wxTopLevelWindowOS2FRC8wxStringRC7wxPointRC6wxSize
+      ;wxTopLevelWindowOS2::~wxTopLevelWindowOS2()
+      __dt__19wxTopLevelWindowOS2Fv
+      ;wxTopLevelWindowOS2::sm_eventTableEntries
+      sm_eventTableEntries__19wxTopLevelWindowOS2
+      ;wxTopLevelWindowOS2::ShowFullScreen(unsigned long,long)
+      ShowFullScreen__19wxTopLevelWindowOS2FUll
+      ;wxTopLevelWindowOS2::CreateDialog(unsigned long,const wxString&,const wxPoint&,const wxSize&)
+      CreateDialog__19wxTopLevelWindowOS2FUlRC8wxStringRC7wxPointRC6wxSize
+      ;wxTopLevelWindowOS2::DoShowWindow(int)
+      DoShowWindow__19wxTopLevelWindowOS2Fi
+      ;wxTopLevelWindowOS2::Init()
+      Init__19wxTopLevelWindowOS2Fv
+      ;wxTopLevelWindowOS2::m_sbInitialized
+      m_sbInitialized__19wxTopLevelWindowOS2
+      ;wxTopLevelWindowOS2::OS2GetParent() const
+      OS2GetParent__19wxTopLevelWindowOS2CFv
+      ;wxTopLevelWindowOS2::GetEventTable() const
+      GetEventTable__19wxTopLevelWindowOS2CFv
+      ;wxTopLevelWindowOS2::Iconize(unsigned long)
+      Iconize__19wxTopLevelWindowOS2FUl
+      ;wxTopLevelWindowOS2::DoSetClientSize(int,int)
+      DoSetClientSize__19wxTopLevelWindowOS2FiT1
+      ;wxTopLevelWindowOS2::IsMaximized() const
+      IsMaximized__19wxTopLevelWindowOS2CFv
+      ;wxTopLevelWindowOS2::m_spHiddenParent
+      m_spHiddenParent__19wxTopLevelWindowOS2
+      ;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)
+      EnableCloseButton__19wxTopLevelWindowOS2FUl
+      ;wxTopLevelWindowOS2::DoGetClientSize(int*,int*) const
+      DoGetClientSize__19wxTopLevelWindowOS2CFPiT1
+      ;wxTopLevelWindowOS2::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
+      Create__19wxTopLevelWindowOS2FP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
+      ;wxTopLevelWindowOS2::Show(unsigned long)
+      Show__19wxTopLevelWindowOS2FUl
+      ;wxTopLevelWindowOS2::SetIcons(const wxIconBundle&)
+      SetIcons__19wxTopLevelWindowOS2FRC12wxIconBundle
+      ;wxTopLevelWindowOS2::IsIconized() const
+      IsIconized__19wxTopLevelWindowOS2CFv
+      ;wxTopLevelWindowOS2::sm_eventTable
+      sm_eventTable__19wxTopLevelWindowOS2
+      ;wxTopLevelWindowOS2::SendSizeEvent()
+      SendSizeEvent__19wxTopLevelWindowOS2Fv
+      wxDlgProc
+      wxModelessWindows

   ;From object file:  ..\os2\utils.cpp
     ;PUBDEFs (Symbols available from object file):
       gs_wxBusyCursorOld
   ;From object file:  ..\os2\utils.cpp
     ;PUBDEFs (Symbols available from object file):
       gs_wxBusyCursorOld


@@ -14344,8 +14862,6 @@ EXPORTS
       wxGetUserName__FPci
       ;wxSleep(int)
       wxSleep__Fi
       wxGetUserName__FPci
       ;wxSleep(int)
       wxSleep__Fi

-      ;wxKill(long,wxSignal,wxKillError*)
-      wxKill__Fl8wxSignalP11wxKillError

       ;wxGetResource(const wxString&,const wxString&,long*,const wxString&)
       wxGetResource__FRC8wxStringT1PlT1
       ;wxGetOsVersion(int*,int*)
       ;wxGetResource(const wxString&,const wxString&,long*,const wxString&)
       wxGetResource__FRC8wxStringT1PlT1
       ;wxGetOsVersion(int*,int*)


@@ -14360,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&)


@@ -14370,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)


@@ -14380,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*)


@@ -14397,12 +14911,14 @@ EXPORTS
       wxUsleep__FUl
       ;wxPMErrorToStr(unsigned long)
       wxPMErrorToStr__FUl
       wxUsleep__FUl
       ;wxPMErrorToStr(unsigned long)
       wxPMErrorToStr__FUl

+      ;wxOS2SetFont(unsigned long,const wxFont&)
+      wxOS2SetFont__FUlRC6wxFont

       ;wxGetHostName(char*,int)
       wxGetHostName__FPci
       ;wxGetResource(const wxString&,const wxString&,int*,const wxString&)
       wxGetResource__FRC8wxStringT1PiT1
       ;wxGetHostName(char*,int)
       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()
       wxBell__Fv
       ;wxShell(const wxString&)
       ;wxBell()
       wxBell__Fv
       ;wxShell(const wxString&)


@@ -14427,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)


@@ -14461,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*)


@@ -14469,24 +14987,38 @@ 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
       ;wxWindow::UnsubclassWin()
       UnsubclassWin__8wxWindowFv

+      ;wxWindow::Raise()
+      Raise__8wxWindowFv
+      ;wxWindow::OS2GetParent() const
+      OS2GetParent__8wxWindowCFv

       ;wxWindow::Lower()
       Lower__8wxWindowFv
       ;wxWindow::HandleMaximize()
       HandleMaximize__8wxWindowFv
       ;wxWindow::HandleDestroy()
       HandleDestroy__8wxWindowFv
       ;wxWindow::Lower()
       Lower__8wxWindowFv
       ;wxWindow::HandleMaximize()
       HandleMaximize__8wxWindowFv
       ;wxWindow::HandleDestroy()
       HandleDestroy__8wxWindowFv

+      ;wxWindow::Freeze()
+      Freeze__8wxWindowFv

       ;wxWindow::DoPopupMenu(wxMenu*,int,int)
       DoPopupMenu__8wxWindowFP6wxMenuiT2
       ;wxWindow::DoPopupMenu(wxMenu*,int,int)
       DoPopupMenu__8wxWindowFP6wxMenuiT2

+      ;wxWindow::DoCaptureMouse()
+      DoCaptureMouse__8wxWindowFv

       ;wxWindow::UnpackCommand(void*,void*,unsigned short*,unsigned long*,unsigned short*)
       UnpackCommand__8wxWindowFPvT1PUsPUlT3
       ;wxDlgProc(unsigned long,unsigned int,void*,void*)
       ;wxWindow::UnpackCommand(void*,void*,unsigned short*,unsigned long*,unsigned short*)
       UnpackCommand__8wxWindowFPvT1PUsPUlT3
       ;wxDlgProc(unsigned long,unsigned int,void*,void*)


@@ -14495,6 +15027,8 @@ EXPORTS
       sm_eventTable__8wxWindow
       ;wxWindow::sm_classwxWindow
       sm_classwxWindow__8wxWindow
       sm_eventTable__8wxWindow
       ;wxWindow::sm_classwxWindow
       sm_classwxWindow__8wxWindow

+      ;wxWindowCreationHook::wxWindowCreationHook(wxWindow*)
+      __ct__20wxWindowCreationHookFP8wxWindow

       ;wxWindow::SetScrollPos(int,int,unsigned long)
       SetScrollPos__8wxWindowFiT1Ul
       ;wxCharCodeWXToOS2(int,unsigned long*)
       ;wxWindow::SetScrollPos(int,int,unsigned long)
       SetScrollPos__8wxWindowFiT1Ul
       ;wxCharCodeWXToOS2(int,unsigned long*)


@@ -14517,29 +15051,27 @@ EXPORTS
       GetScrollThumb__8wxWindowCFi
       ;wxWindow::DoGetClientSize(int*,int*) const
       DoGetClientSize__8wxWindowCFPiT1
       GetScrollThumb__8wxWindowCFi
       ;wxWindow::DoGetClientSize(int*,int*) const
       DoGetClientSize__8wxWindowCFPiT1

+      ;wxWindowBase::GetCapture()
+      GetCapture__12wxWindowBaseFv

       ;wxWindow::SetFocus()
       SetFocus__8wxWindowFv
       ;wxWindow::SetFocus()
       SetFocus__8wxWindowFv

-      ;wxWindow::ReleaseMouse()
-      ReleaseMouse__8wxWindowFv

       ;wxWindow::OS2OnMeasureItem(int,void**)
       OS2OnMeasureItem__8wxWindowFiPPv
       ;wxWindow::OS2DestroyWindow()
       OS2DestroyWindow__8wxWindowFv
       ;wxWindow::OS2OnMeasureItem(int,void**)
       OS2OnMeasureItem__8wxWindowFiPPv
       ;wxWindow::OS2DestroyWindow()
       OS2DestroyWindow__8wxWindowFv

-      ;wxWindow::HandleWindowParams(_WNDPARAMS*,void*)
-      HandleWindowParams__8wxWindowFP10_WNDPARAMSPv
-      ;wxWindow::HandlePresParamChanged(void*)
-      HandlePresParamChanged__8wxWindowFPv
-      ;wxWindow::HandleKeyDown(unsigned short,void*)
-      HandleKeyDown__8wxWindowFUsPv
+      ;wxWindow::IsMouseInWindow() const
+      IsMouseInWindow__8wxWindowCFv

       ;wxWindow::Clear()
       Clear__8wxWindowFv
       ;wxWindow::Clear()
       Clear__8wxWindowFv

-      ;wxWindow::CaptureMouse()
-      CaptureMouse__8wxWindowFv

       ;wxRemoveHandleAssociation(wxWindow*)
       wxRemoveHandleAssociation__FP8wxWindow
       wxWndHook
       ;wxWindow::Reparent(wxWindow*)
       Reparent__8wxWindowFP8wxWindow
       ;wxRemoveHandleAssociation(wxWindow*)
       wxRemoveHandleAssociation__FP8wxWindow
       wxWndHook
       ;wxWindow::Reparent(wxWindow*)
       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


@@ -14565,8 +15097,6 @@ EXPORTS
       HandleSysCommand__8wxWindowFPvT1
       ;wxWindow::HandleSize(int,int,unsigned int)
       HandleSize__8wxWindowFiT1Ui
       HandleSysCommand__8wxWindowFPvT1
       ;wxWindow::HandleSize(int,int,unsigned int)
       HandleSize__8wxWindowFiT1Ui

-      ;wxWindow::AdjustForParentClientOrigin(int&,int&,int)
-      AdjustForParentClientOrigin__8wxWindowFRiT1i

       ;wxWindow::Init()
       Init__8wxWindowFv
       ;wxGetMousePosition()
       ;wxWindow::Init()
       Init__8wxWindowFv
       ;wxGetMousePosition()


@@ -14589,11 +15119,17 @@ 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*)
       wxAssociateWinWithHandle__FUlP8wxWindow
       s_currentMsg
       ;wxWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__8wxWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxAssociateWinWithHandle(unsigned long,wxWindow*)
       wxAssociateWinWithHandle__FUlP8wxWindow
       s_currentMsg

+      ;wxWindow::OS2Create(char*,const char*,unsigned long,const wxPoint&,const wxSize&,void*,unsigned long,unsigned long)
+      OS2Create__8wxWindowFPcPCcUlRC7wxPointRC6wxSizePvN23
+      ;wxWindow::GetOS2ParentHeight(wxWindow*)
+      GetOS2ParentHeight__8wxWindowFP8wxWindow

       ;wxWindow::Refresh(unsigned long,const wxRect*)
       Refresh__8wxWindowFUlPC6wxRect
       ;wxWindow::SetScrollbar(int,int,int,int,unsigned long)
       ;wxWindow::Refresh(unsigned long,const wxRect*)
       Refresh__8wxWindowFUlPC6wxRect
       ;wxWindow::SetScrollbar(int,int,int,int,unsigned long)


@@ -14619,12 +15155,16 @@ EXPORTS
       ;wxWindow::WarpPointer(int,int)
       WarpPointer__8wxWindowFiT1
       wxCurrentPopupMenu
       ;wxWindow::WarpPointer(int,int)
       WarpPointer__8wxWindowFiT1
       wxCurrentPopupMenu

+      ;wxWindow::MoveChildren(int)
+      MoveChildren__8wxWindowFi

       ;wxWindow::HandleShow(unsigned long,int)
       HandleShow__8wxWindowFUli
       ;wxWindow::HandleMove(int,int)
       HandleMove__8wxWindowFiT1
       ;wxWindow::HandleMouseEvent(unsigned int,int,int,unsigned int)
       HandleMouseEvent__8wxWindowFUiiT2T1
       ;wxWindow::HandleShow(unsigned long,int)
       HandleShow__8wxWindowFUli
       ;wxWindow::HandleMove(int,int)
       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)


@@ -14637,10 +15177,16 @@ EXPORTS
       __dt__8wxWindowFv
       ;wxGetActiveWindow()
       wxGetActiveWindow__Fv
       __dt__8wxWindowFv
       ;wxGetActiveWindow()
       wxGetActiveWindow__Fv

+      ;wxCheckWindowWndProc(unsigned long,void*(*)(unsigned long,unsigned long,void*,void*))
+      wxCheckWindowWndProc__FUlPFUlT1PvT3_Pv
+      ;wxWindow::Thaw()
+      Thaw__8wxWindowFv

       ;wxWindow::OS2WindowProc(unsigned int,void*,void*)
       OS2WindowProc__8wxWindowFUiPvT2
       ;wxWindow::OS2TranslateMessage(void**)
       OS2TranslateMessage__8wxWindowFPPv
       ;wxWindow::OS2WindowProc(unsigned int,void*,void*)
       OS2WindowProc__8wxWindowFUiPvT2
       ;wxWindow::OS2TranslateMessage(void**)
       OS2TranslateMessage__8wxWindowFPPv

+      ;wxWindow::OS2ShouldPreProcessMessage(void**)
+      OS2ShouldPreProcessMessage__8wxWindowFPPv

       ;wxWindow::OS2DefWindowProc(unsigned int,void*,void*)
       OS2DefWindowProc__8wxWindowFUiPvT2
       ;wxWindow::HandleMinimize()
       ;wxWindow::OS2DefWindowProc(unsigned int,void*,void*)
       OS2DefWindowProc__8wxWindowFUiPvT2
       ;wxWindow::HandleMinimize()


@@ -14651,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


@@ -14667,47 +15211,27 @@ EXPORTS
       ScrollWindow__8wxWindowFiT1PC6wxRect
       ;wxWindow::OnIdle(wxIdleEvent&)
       OnIdle__8wxWindowFR11wxIdleEvent
       ScrollWindow__8wxWindowFiT1PC6wxRect
       ;wxWindow::OnIdle(wxIdleEvent&)
       OnIdle__8wxWindowFR11wxIdleEvent

-      ;wxWindow::HandleChar(unsigned short,void*,unsigned long)
-      HandleChar__8wxWindowFUsPvUl
+      ;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::OS2Create(unsigned long,char*,const char*,unsigned long,long,long,long,long,unsigned long,unsigned long,unsigned long,void*,void*,unsigned long)
-      OS2Create__8wxWindowFUlPcPCcT1lN35N31PvT12_T1
+      ;wxWindow::HandleKeyUp(void*,void*)
+      HandleKeyUp__8wxWindowFPvT1

       ;wxWindow::DoMoveWindow(int,int,int,int)
       DoMoveWindow__8wxWindowFiN31
       ;wxWindow::DoClientToScreen(int*,int*) const
       DoClientToScreen__8wxWindowCFPiT1
       ;wxWindow::DoMoveWindow(int,int,int,int)
       DoMoveWindow__8wxWindowFiN31
       ;wxWindow::DoClientToScreen(int*,int*) const
       DoClientToScreen__8wxWindowCFPiT1

-      ;wxWindow::OS2DetachWindowMenu()
-      OS2DetachWindowMenu__8wxWindowFv
+      ;wxWindowBase::FindFocus()
+      FindFocus__12wxWindowBaseFv

       ;wxWindow::OS2OnDrawItem(int,void**)
       OS2OnDrawItem__8wxWindowFiPPv
       ;wxWindow::OS2OnDrawItem(int,void**)
       OS2OnDrawItem__8wxWindowFiPPv

-      ;wxWindow::HandleKeyUp(unsigned short,void*)
-      HandleKeyUp__8wxWindowFUsPv

       ;wxWindow::GetCharWidth() const
       GetCharWidth__8wxWindowCFv
       ;wxWindow::GetCharWidth() const
       GetCharWidth__8wxWindowCFv

-      ;wxWindowBase::FindFocus()
-      FindFocus__12wxWindowBaseFv
+      ;wxWindow::DoReleaseMouse()
+      DoReleaseMouse__8wxWindowFv

       ;wxWindow::SetTitle(const wxString&)
       SetTitle__8wxWindowFRC8wxString
       ;wxWindow::sm_eventTableEntries
       sm_eventTableEntries__8wxWindow
       ;wxWindow::SetTitle(const wxString&)
       SetTitle__8wxWindowFRC8wxString
       ;wxWindow::sm_eventTableEntries
       sm_eventTableEntries__8wxWindow

-  ;From object file:  ..\os2\xpmhand.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxXPMDataHandler::Create(wxBitmap*,void*,long,int,int,int)
-      Create__16wxXPMDataHandlerFP8wxBitmapPvliN24
-      __vft16wxXPMDataHandler8wxObject
-      ;wxConstructorForwxXPMFileHandler()
-      wxConstructorForwxXPMFileHandler__Fv
-      __vft16wxXPMFileHandler8wxObject
-      ;wxConstructorForwxXPMDataHandler()
-      wxConstructorForwxXPMDataHandler__Fv
-      ;wxXPMFileHandler::LoadFile(wxBitmap*,const wxString&,long,int,int)
-      LoadFile__16wxXPMFileHandlerFP8wxBitmapRC8wxStringliT4
-      ;wxXPMFileHandler::SaveFile(wxBitmap*,const wxString&,int,const wxPalette*)
-      SaveFile__16wxXPMFileHandlerFP8wxBitmapRC8wxStringiPC9wxPalette
-      ;wxXPMDataHandler::sm_classwxXPMDataHandler
-      sm_classwxXPMDataHandler__16wxXPMDataHandler
-      ;wxXPMFileHandler::sm_classwxXPMFileHandler
-      sm_classwxXPMFileHandler__16wxXPMFileHandler