Compile fix when not using WXR resources.

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

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index bd9843acb1de3e43fe0e041a5841437e606901f8..d51892b12484ce5eb9035ce26394b7f681f81c43 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,17 +4,66 @@ 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):
       ;wxOnAssert(const char*,int,const char*)
       wxOnAssert__FPCciT1
       ;wxAppBase::OnInitGui()
       OnInitGui__9wxAppBaseFv
   ;From object file:  ..\common\appcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxOnAssert(const char*,int,const char*)
       wxOnAssert__FPCciT1
       ;wxAppBase::OnInitGui()
       OnInitGui__9wxAppBaseFv

+      ;wxAppBase::OnInitCmdLine(wxCmdLineParser&)
+      OnInitCmdLine__9wxAppBaseFR15wxCmdLineParser
+      ;wxAppBase::OnCmdLineParsed(wxCmdLineParser&)
+      OnCmdLineParsed__9wxAppBaseFR15wxCmdLineParser

       __vft9wxAppBase8wxObject
       __vft9wxAppBase8wxObject

+      ;wxAppBase::OnCmdLineHelp(wxCmdLineParser&)
+      OnCmdLineHelp__9wxAppBaseFR15wxCmdLineParser

       ;wxTrap()
       wxTrap__Fv
       ;wxAppBase::OnAssert(const char*,int,const char*)
       ;wxTrap()
       wxTrap__Fv
       ;wxAppBase::OnAssert(const char*,int,const char*)


@@ -27,13 +76,18 @@ EXPORTS
       __ct__9wxAppBaseFv
       ;wxAppBase::OnInit()
       OnInit__9wxAppBaseFv
       __ct__9wxAppBaseFv
       ;wxAppBase::OnInit()
       OnInit__9wxAppBaseFv

+      ;wxAppBase::~wxAppBase()
+      __dt__9wxAppBaseFv

       ;wxAppBase::ProcessPendingEvents()
       ProcessPendingEvents__9wxAppBaseFv
       ;wxAppBase::ProcessPendingEvents()
       ProcessPendingEvents__9wxAppBaseFv

+      ;wxAppBase::OnCmdLineError(wxCmdLineParser&)
+      OnCmdLineError__9wxAppBaseFR15wxCmdLineParser

       ;wxAppBase::SetActive(unsigned long,wxWindow*)
       SetActive__9wxAppBaseFUlP8wxWindow
       ;wxAppBase::SetActive(unsigned long,wxWindow*)
       SetActive__9wxAppBaseFUlP8wxWindow

-  ;From object file:  ..\common\bmpbase.cpp

   ;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


@@ -54,7 +108,111 @@ 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
   ;From object file:  ..\common\cmdline.cpp

+    ;PUBDEFs (Symbols available from object file):
+      ;wxCmdLineParser::EnableLongOptions(unsigned long)
+      EnableLongOptions__15wxCmdLineParserFUl
+      ;wxArrayParams::Index(const wxCmdLineParam&,unsigned long) const
+      Index__13wxArrayParamsCFRC14wxCmdLineParamUl
+      ;wxCmdLineParser::Found(const wxString&,long*) const
+      Found__15wxCmdLineParserCFRC8wxStringPl
+      ;wxArrayParams::RemoveAt(unsigned int)
+      RemoveAt__13wxArrayParamsFUi
+      ;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**)
+      SetCmdLine__15wxCmdLineParserFiPPc
+      ;wxArrayOptions::wxArrayOptions(const wxArrayOptions&)
+      __ct__14wxArrayOptionsFRC14wxArrayOptions
+      ;wxCmdLineParser::SetSwitchChars(const wxString&)
+      SetSwitchChars__15wxCmdLineParserFRC8wxString
+      ;wxCmdLineParser::SetDesc(const wxCmdLineEntryDesc*)
+      SetDesc__15wxCmdLineParserFPC18wxCmdLineEntryDesc
+      ;wxCmdLineParser::Found(const wxString&,wxString*) const
+      Found__15wxCmdLineParserCFRC8wxStringP8wxString
+      ;wxCmdLineParserData::FindOptionByLongName(const wxString&)
+      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
+      ;wxCmdLineParserData::wxCmdLineParserData()
+      __ct__19wxCmdLineParserDataFv
+      ;wxCmdLineParser::SetCmdLine(const wxString&)
+      SetCmdLine__15wxCmdLineParserFRC8wxString
+      ;wxArrayParams::wxArrayParams(const wxArrayParams&)
+      __ct__13wxArrayParamsFRC13wxArrayParams
+      ;wxArrayOptions::operator=(const wxArrayOptions&)
+      __as__14wxArrayOptionsFRC14wxArrayOptions
+      ;wxCmdLineParserData::SetArguments(const wxString&)
+      SetArguments__19wxCmdLineParserDataFRC8wxString
+      ;wxCmdLineParser::ConvertStringToArgs(const char*)
+      ConvertStringToArgs__15wxCmdLineParserFPCc
+      ;wxArrayOptions::Insert(const wxCmdLineOption&,unsigned int)
+      Insert__14wxArrayOptionsFRC15wxCmdLineOptionUi
+      ;wxArrayParams::Add(const wxCmdLineParam&)
+      Add__13wxArrayParamsFRC14wxCmdLineParam
+      ;wxArrayParams::DoEmpty()
+      DoEmpty__13wxArrayParamsFv
+      ;wxArrayOptions::~wxArrayOptions()
+      __dt__14wxArrayOptionsFv
+      ;wxCmdLineParser::Usage()
+      Usage__15wxCmdLineParserFv
+      ;wxCmdLineParserData::SetArguments(int,char**)
+      SetArguments__19wxCmdLineParserDataFiPPc
+      ;wxCmdLineParser::Found(const wxString&) const
+      Found__15wxCmdLineParserCFRC8wxString
+      ;wxCmdLineParser::Parse(unsigned long)
+      Parse__15wxCmdLineParserFUl
+      ;wxCmdLineParser::AddParam(const wxString&,wxCmdLineParamType,int)
+      AddParam__15wxCmdLineParserFRC8wxString18wxCmdLineParamTypei
+      ;wxCmdLineParser::GetParam(unsigned int) const
+      GetParam__15wxCmdLineParserCFUi
+      ;wxCmdLineParser::Found(const wxString&,wxDateTime*) const
+      Found__15wxCmdLineParserCFRC8wxStringP10wxDateTime
+      ;wxCmdLineParser::Init()
+      Init__15wxCmdLineParserFv
+      ;wxCmdLineParser::~wxCmdLineParser()
+      __dt__15wxCmdLineParserFv
+      ;wxArrayParams::~wxArrayParams()
+      __dt__13wxArrayParamsFv
+      ;wxArrayParams::operator=(const wxArrayParams&)
+      __as__13wxArrayParamsFRC13wxArrayParams
+      ;wxCmdLineParser::AddOption(const wxString&,const wxString&,const wxString&,wxCmdLineParamType,int)
+      AddOption__15wxCmdLineParserFRC8wxStringN2118wxCmdLineParamTypei
+      ;wxArrayOptions::DoEmpty()
+      DoEmpty__14wxArrayOptionsFv
+      ;wxCmdLineParser::GetParamCount() const
+      GetParamCount__15wxCmdLineParserCFv
+      ;wxArrayOptions::DoCopy(const wxArrayOptions&)
+      DoCopy__14wxArrayOptionsFRC14wxArrayOptions
+      ;wxCmdLineParser::SetLogo(const wxString&)
+      SetLogo__15wxCmdLineParserFRC8wxString
+      ;wxCmdLineParserData::FindOption(const wxString&)
+      FindOption__19wxCmdLineParserDataFRC8wxString
+      ;wxArrayParams::DoCopy(const wxArrayParams&)
+      DoCopy__13wxArrayParamsFRC13wxArrayParams

   ;From object file:  ..\common\cmndata.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxColourData::GetCustomColour(int)
   ;From object file:  ..\common\cmndata.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxColourData::GetCustomColour(int)


@@ -122,8 +280,6 @@ EXPORTS
       wxConstructorForwxPrintData__Fv
       ;wxPageSetupDialogData::~wxPageSetupDialogData()
       __dt__21wxPageSetupDialogDataFv
       wxConstructorForwxPrintData__Fv
       ;wxPageSetupDialogData::~wxPageSetupDialogData()
       __dt__21wxPageSetupDialogDataFv

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

       ;wxPrintData::operator=(const wxPrintData&)
       __as__11wxPrintDataFRC11wxPrintData
       ;wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData&)
       ;wxPrintData::operator=(const wxPrintData&)
       __as__11wxPrintDataFRC11wxPrintData
       ;wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData&)


@@ -140,6 +296,8 @@ EXPORTS
       __ct__21wxPageSetupDialogDataFv
       ;wxPrintDialogData::wxPrintDialogData()
       __ct__17wxPrintDialogDataFv
       __ct__21wxPageSetupDialogDataFv
       ;wxPrintDialogData::wxPrintDialogData()
       __ct__17wxPrintDialogDataFv

+      ;wxColourData::SetCustomColour(int,const wxColour&)
+      SetCustomColour__12wxColourDataFiRC8wxColour

   ;From object file:  ..\common\cmdproc.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCommandProcessor::UndoCommand(wxCommand&)
   ;From object file:  ..\common\cmdproc.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCommandProcessor::UndoCommand(wxCommand&)


@@ -182,24 +340,24 @@ EXPORTS
       ClearCommands__18wxCommandProcessorFv
   ;From object file:  ..\common\config.cpp
     ;PUBDEFs (Symbols available from object file):
       ClearCommands__18wxCommandProcessorFv
   ;From object file:  ..\common\config.cpp
     ;PUBDEFs (Symbols available from object file):

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

       ;wxConfigBase::Read(const wxString&,wxString*,const wxString&) const
       Read__12wxConfigBaseCFRC8wxStringP8wxStringT1
       ;wxConfigBase::Read(const wxString&,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*)


@@ -208,12 +366,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()


@@ -224,6 +386,10 @@ 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
       ;wxConfigBase::Read(const wxString&,int*) const
       Read__12wxConfigBaseCFRC8wxStringPi
       ;wxConfigBase::ms_bAutoCreate


@@ -326,10 +492,14 @@ EXPORTS
       Create__13wxControlBaseFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxControlBase::CreateControl(wxWindowBase*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       CreateControl__13wxControlBaseFP12wxWindowBaseiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       Create__13wxControlBaseFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxControlBase::CreateControl(wxWindowBase*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       CreateControl__13wxControlBaseFP12wxWindowBaseiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString

+      ;wxControlBase::~wxControlBase()
+      __dt__13wxControlBaseFv

       ;wxControlBase::InheritAttributes()
       InheritAttributes__13wxControlBaseFv
       ;wxStaticBitmapBase::DoGetBestClientSize() const
       DoGetBestClientSize__18wxStaticBitmapBaseCFv
       ;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
       ;wxControlBase::InitCommandEvent(wxCommandEvent&) const
       InitCommandEvent__13wxControlBaseCFR14wxCommandEvent
   ;From object file:  ..\common\ctrlsub.cpp


@@ -340,10 +510,15 @@ EXPORTS
       GetClientObject__15wxItemContainerCFi
       ;wxItemContainer::SetClientData(int,void*)
       SetClientData__15wxItemContainerFiPv
       GetClientObject__15wxItemContainerCFi
       ;wxItemContainer::SetClientData(int,void*)
       SetClientData__15wxItemContainerFiPv

+      ;wxItemContainer::Append(const wxArrayString&)
+      Append__15wxItemContainerFRC13wxArrayString
+      ;wxItemContainer::~wxItemContainer()
+      __dt__15wxItemContainerFv

       ;wxItemContainer::GetStringSelection() const
       GetStringSelection__15wxItemContainerCFv
       ;wxItemContainer::SetClientObject(int,wxClientData*)
       SetClientObject__15wxItemContainerFiP12wxClientData
       ;wxItemContainer::GetStringSelection() const
       GetStringSelection__15wxItemContainerCFv
       ;wxItemContainer::SetClientObject(int,wxClientData*)
       SetClientObject__15wxItemContainerFiP12wxClientData

+      __vft15wxItemContainer

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


@@ -650,6 +825,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()


@@ -674,6 +851,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)


@@ -694,10 +875,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)


@@ -761,8 +944,29 @@ EXPORTS
       CreateButtonSizer__12wxDialogBaseFl
       ;wxDialogBase::Init()
       Init__12wxDialogBaseFv
       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

   ;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


@@ -819,6 +1023,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


@@ -1079,12 +1285,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&)


@@ -1173,42 +1383,149 @@ EXPORTS
       ActivateView__12wxDocManagerFP6wxViewUlT2
       ;wxDocument::OnOpenDocument(const wxString&)
       OnOpenDocument__10wxDocumentFRC8wxString
       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::IndexForInsert(long,int(*)(const void*,const void*)) const
-      IndexForInsert__11wxBaseArrayCFlPFPCvT1_i
-      ;wxBaseArray::wxBaseArray()
-      __ct__11wxBaseArrayFv
-      ;wxBaseArray::Clear()
-      Clear__11wxBaseArrayFv
-      ;wxBaseArray::Insert(long,unsigned int)
-      Insert__11wxBaseArrayFlUi
-      ;wxBaseArray::wxBaseArray(const wxBaseArray&)
-      __ct__11wxBaseArrayFRC11wxBaseArray
-      ;wxBaseArray::Add(long,int(*)(const void*,const void*))
-      Add__11wxBaseArrayFlPFPCvT1_i
-      ;wxBaseArray::Shrink()
-      Shrink__11wxBaseArrayFv
-      ;wxBaseArray::operator=(const wxBaseArray&)
-      __as__11wxBaseArrayFRC11wxBaseArray
-      ;wxBaseArray::RemoveAt(unsigned int)
-      RemoveAt__11wxBaseArrayFUi
-      ;wxBaseArray::Index(long,int(*)(const void*,const void*)) const
-      Index__11wxBaseArrayCFlPFPCvT1_i
-      ;wxBaseArray::Grow()
-      Grow__11wxBaseArrayFv
-      ;wxBaseArray::Index(long,unsigned long) const
-      Index__11wxBaseArrayCFlUl
-      ;wxBaseArray::Alloc(unsigned int)
-      Alloc__11wxBaseArrayFUi
+      ;wxBaseArrayPtrVoid::Index(const void*,unsigned long) const
+      Index__18wxBaseArrayPtrVoidCFPCvUl
+      ;wxBaseArrayInt::Add(int)
+      Add__14wxBaseArrayIntFi
+      ;wxBaseArrayLong::Insert(long,unsigned int)
+      Insert__15wxBaseArrayLongFlUi
+      ;wxBaseArrayInt::Insert(int,unsigned int)
+      Insert__14wxBaseArrayIntFiUi
+      ;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::Alloc(unsigned int)
+      Alloc__18wxBaseArrayPtrVoidFUi
+      ;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
+      ;wxBaseArrayPtrVoid::Grow()
+      Grow__18wxBaseArrayPtrVoidFv
+      ;wxBaseArrayPtrVoid::Clear()
+      Clear__18wxBaseArrayPtrVoidFv
+      ;wxBaseArrayShort::Remove(short)
+      Remove__16wxBaseArrayShortFs
+      ;wxBaseArrayPtrVoid::operator=(const wxBaseArrayPtrVoid&)
+      __as__18wxBaseArrayPtrVoidFRC18wxBaseArrayPtrVoid
+      ;wxBaseArrayShort::Insert(short,unsigned int)
+      Insert__16wxBaseArrayShortFsUi
+      ;wxBaseArrayPtrVoid::RemoveAt(unsigned int)
+      RemoveAt__18wxBaseArrayPtrVoidFUi
+      ;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
+      ;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
+      ;wxBaseArrayShort::Add(short)
+      Add__16wxBaseArrayShortFs
+      ;wxBaseArrayInt::operator=(const wxBaseArrayInt&)
+      __as__14wxBaseArrayIntFRC14wxBaseArrayInt
+      ;wxBaseArrayInt::wxBaseArrayInt(const wxBaseArrayInt&)
+      __ct__14wxBaseArrayIntFRC14wxBaseArrayInt
+      ;wxBaseArrayLong::Remove(long)
+      Remove__15wxBaseArrayLongFl
+      ;wxBaseArrayShort::Sort(int(*)(const void*,const void*))
+      Sort__16wxBaseArrayShortFPFPCvT1_i
+      ;wxBaseArrayPtrVoid::Sort(int(*)(const void*,const void*))
+      Sort__18wxBaseArrayPtrVoidFPFPCvT1_i
+      ;wxBaseArrayInt::IndexForInsert(int,int(*)(const void*,const void*)) const
+      IndexForInsert__14wxBaseArrayIntCFiPFPCvT1_i
+      ;wxBaseArrayShort::Alloc(unsigned int)
+      Alloc__16wxBaseArrayShortFUi
+      ;wxBaseArrayPtrVoid::Shrink()
+      Shrink__18wxBaseArrayPtrVoidFv
+      ;wxBaseArrayPtrVoid::Remove(const void*)
+      Remove__18wxBaseArrayPtrVoidFPCv
+      ;wxBaseArrayShort::Grow()
+      Grow__16wxBaseArrayShortFv
+      ;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
+      ;wxBaseArrayLong::Add(long)
+      Add__15wxBaseArrayLongFl
+      ;wxBaseArrayInt::Sort(int(*)(const void*,const void*))
+      Sort__14wxBaseArrayIntFPFPCvT1_i
+      ;wxBaseArrayLong::Sort(int(*)(const void*,const void*))
+      Sort__15wxBaseArrayLongFPFPCvT1_i
+      ;wxBaseArrayLong::RemoveAt(unsigned int)
+      RemoveAt__15wxBaseArrayLongFUi
+      ;wxBaseArrayPtrVoid::Insert(const void*,unsigned int)
+      Insert__18wxBaseArrayPtrVoidFPCvUi
+      ;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
+      ;wxBaseArrayInt::Alloc(unsigned int)
+      Alloc__14wxBaseArrayIntFUi
+      ;wxBaseArrayLong::Add(long,int(*)(const void*,const void*))
+      Add__15wxBaseArrayLongFlPFPCvT1_i
+      ;wxBaseArrayLong::wxBaseArrayLong()
+      __ct__15wxBaseArrayLongFv
+      ;wxBaseArrayLong::Grow()
+      Grow__15wxBaseArrayLongFv
+      ;wxBaseArrayInt::Grow()
+      Grow__14wxBaseArrayIntFv
+      ;wxBaseArrayShort::Clear()
+      Clear__16wxBaseArrayShortFv
+      ;wxBaseArrayPtrVoid::Add(const void*)
+      Add__18wxBaseArrayPtrVoidFPCv
+      ;wxBaseArrayLong::Index(long,unsigned long) const
+      Index__15wxBaseArrayLongCFlUl
+      ;wxBaseArrayShort::wxBaseArrayShort(const wxBaseArrayShort&)
+      __ct__16wxBaseArrayShortFRC16wxBaseArrayShort
+      ;wxBaseArrayShort::RemoveAt(unsigned int)
+      RemoveAt__16wxBaseArrayShortFUi
+      ;wxBaseArrayInt::Remove(int)
+      Remove__14wxBaseArrayIntFi
+      ;wxBaseArrayInt::RemoveAt(unsigned int)
+      RemoveAt__14wxBaseArrayIntFUi
+      ;wxBaseArrayShort::Add(short,int(*)(const void*,const void*))
+      Add__16wxBaseArrayShortFsPFPCvT1_i
+      ;wxBaseArrayInt::wxBaseArrayInt()
+      __ct__14wxBaseArrayIntFv
+      ;wxBaseArrayLong::~wxBaseArrayLong()
+      __dt__15wxBaseArrayLongFv
+      ;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)


@@ -1217,8 +1534,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()


@@ -1235,12 +1550,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


@@ -1259,24 +1577,19 @@ EXPORTS
       GetAllEquivalents__19wxEncodingConverterF14wxFontEncoding
       ;wxEncodingConverter::wxEncodingConverter()
       __ct__19wxEncodingConverterFv
       GetAllEquivalents__19wxEncodingConverterF14wxFontEncoding
       ;wxEncodingConverter::wxEncodingConverter()
       __ct__19wxEncodingConverterFv

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

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

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

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

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

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


@@ -1291,15 +1604,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)


@@ -1312,7 +1619,7 @@ EXPORTS
       wxConstructorForwxNcPaintEvent__Fv
       wxEVT_SET_CURSOR
       wxEVT_SCROLLWIN_LINEDOWN
       wxConstructorForwxNcPaintEvent__Fv
       wxEVT_SET_CURSOR
       wxEVT_SCROLLWIN_LINEDOWN

-      wxEVT_MENU_CHAR
+      wxEVT_MENU_OPEN

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


@@ -1331,6 +1638,8 @@ EXPORTS
       wxConstructorForwxDropFilesEvent__Fv
       ;wxEvtHandler::sm_eventTableEntries
       sm_eventTableEntries__12wxEvtHandler
       wxConstructorForwxDropFilesEvent__Fv
       ;wxEvtHandler::sm_eventTableEntries
       sm_eventTableEntries__12wxEvtHandler

+      ;wxEvtHandler::DoGetClientData() const
+      DoGetClientData__12wxEvtHandlerCFv

       ;wxChildFocusEvent::wxChildFocusEvent(wxWindow*)
       __ct__17wxChildFocusEventFP8wxWindow
       ;wxFindFocusDescendant(wxWindow*)
       ;wxChildFocusEvent::wxChildFocusEvent(wxWindow*)
       __ct__17wxChildFocusEventFP8wxWindow
       ;wxFindFocusDescendant(wxWindow*)


@@ -1347,7 +1656,6 @@ EXPORTS
       wxEVT_SCROLLWIN_PAGEUP
       wxEVT_MOUSEWHEEL
       wxEVT_MIDDLE_UP
       wxEVT_SCROLLWIN_PAGEUP
       wxEVT_MOUSEWHEEL
       wxEVT_MIDDLE_UP

-      wxEVT_MENU_INIT

       wxEVT_HELP
       wxEVT_ERASE_BACKGROUND
       wxEVT_DETAILED_HELP
       wxEVT_HELP
       wxEVT_ERASE_BACKGROUND
       wxEVT_DETAILED_HELP


@@ -1370,15 +1678,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


@@ -1393,6 +1692,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


@@ -1441,23 +1742,9 @@ EXPORTS
       sm_classwxIconizeEvent__14wxIconizeEvent
       ;wxChildFocusEvent::sm_classwxChildFocusEvent
       sm_classwxChildFocusEvent__17wxChildFocusEvent
       sm_classwxIconizeEvent__14wxIconizeEvent
       ;wxChildFocusEvent::sm_classwxChildFocusEvent
       sm_classwxChildFocusEvent__17wxChildFocusEvent

-      __vft16wxScrollWinEvent8wxObject
-      __vft13wxNotifyEvent8wxObject
-      __vft12wxMouseEvent8wxObject

       __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


@@ -1471,25 +1758,31 @@ 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
+      ;wxEvtHandler::ProcessEvent(wxEvent&)
+      ProcessEvent__12wxEvtHandlerFR7wxEvent

       wxEVT_SCROLL_LINEUP
       wxEVT_PAINT
       wxEVT_NULL
       wxEVT_SCROLL_LINEUP
       wxEVT_PAINT
       wxEVT_NULL


@@ -1515,25 +1808,8 @@ 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::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


@@ -1584,15 +1860,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


@@ -1607,23 +1883,19 @@ EXPORTS
       sm_classwxIdleEvent__11wxIdleEvent
       ;wxDropFilesEvent::sm_classwxDropFilesEvent
       sm_classwxDropFilesEvent__16wxDropFilesEvent
       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


@@ -1642,6 +1914,8 @@ EXPORTS
       wxConstructorForwxChildFocusEvent__Fv
       ;wxEvtHandler::sm_eventTable
       sm_eventTable__12wxEvtHandler
       wxConstructorForwxChildFocusEvent__Fv
       ;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


@@ -1733,10 +2007,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxFileConfigGroup::SetLine(wxFileConfigLineList*)
       SetLine__17wxFileConfigGroupFP20wxFileConfigLineList
     ;PUBDEFs (Symbols available from object file):
       ;wxFileConfigGroup::SetLine(wxFileConfigLineList*)
       SetLine__17wxFileConfigGroupFP20wxFileConfigLineList

-      ;wxFileConfig::Write(const wxString&,long)
-      Write__12wxFileConfigFRC8wxStringl
-      ;wxFileConfig::Read(const wxString&,long*) const
-      Read__12wxFileConfigCFRC8wxStringPl

       ;wxFileConfig::LineListRemove(wxFileConfigLineList*)
       LineListRemove__12wxFileConfigFP20wxFileConfigLineList
       ;wxFileConfig::GetNextGroup(wxString&,long&) const
       ;wxFileConfig::LineListRemove(wxFileConfigLineList*)
       LineListRemove__12wxFileConfigFP20wxFileConfigLineList
       ;wxFileConfig::GetNextGroup(wxString&,long&) const


@@ -1745,8 +2015,6 @@ EXPORTS
       GetFirstEntry__12wxFileConfigCFR8wxStringRl
       ;wxFileConfig::DeleteEntry(const wxString&,unsigned long)
       DeleteEntry__12wxFileConfigFRC8wxStringUl
       GetFirstEntry__12wxFileConfigCFR8wxStringRl
       ;wxFileConfig::DeleteEntry(const wxString&,unsigned long)
       DeleteEntry__12wxFileConfigFRC8wxStringUl

-      ;wxFileConfig::Write(const wxString&,const wxString&)
-      Write__12wxFileConfigFRC8wxStringT1

       ;wxFileConfigGroup::~wxFileConfigGroup()
       __dt__17wxFileConfigGroupFv
       ;wxFileConfigEntry::SetDirty()
       ;wxFileConfigGroup::~wxFileConfigGroup()
       __dt__17wxFileConfigGroupFv
       ;wxFileConfigEntry::SetDirty()


@@ -1761,6 +2029,8 @@ EXPORTS
       FindEntry__17wxFileConfigGroupCFPCc
       ;wxFileConfigEntry::SetValue(const wxString&,unsigned long)
       SetValue__17wxFileConfigEntryFRC8wxStringUl
       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()
       ;wxFileConfig::RenameGroup(const wxString&,const wxString&)
       RenameGroup__12wxFileConfigFRC8wxStringT1
       ;wxFileConfig::Init()


@@ -1769,16 +2039,20 @@ EXPORTS
       GetLastGroupLine__17wxFileConfigGroupFv
       ;wxFileConfig::LineListAppend(const wxString&)
       LineListAppend__12wxFileConfigFRC8wxString
       GetLastGroupLine__17wxFileConfigGroupFv
       ;wxFileConfig::LineListAppend(const wxString&)
       LineListAppend__12wxFileConfigFRC8wxString

+      ;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
+      ;wxFileConfig::DoReadLong(const wxString&,long*) const
+      DoReadLong__12wxFileConfigCFRC8wxStringPl

       ;wxFileConfig::LineListInsert(const wxString&,wxFileConfigLineList*)
       LineListInsert__12wxFileConfigFRC8wxStringP20wxFileConfigLineList
       ;wxFileConfig::Flush(unsigned long)
       Flush__12wxFileConfigFUl
       ;wxFileConfig::LineListInsert(const wxString&,wxFileConfigLineList*)
       LineListInsert__12wxFileConfigFRC8wxStringP20wxFileConfigLineList
       ;wxFileConfig::Flush(unsigned long)
       Flush__12wxFileConfigFUl

-      ;wxFileConfig::Read(const wxString&,wxString*,const wxString&) const
-      Read__12wxFileConfigCFRC8wxStringP8wxStringT1
+      ;wxFileConfig::DoWriteLong(const wxString&,long)
+      DoWriteLong__12wxFileConfigFRC8wxStringl
+      ;wxFileConfig::DoWriteString(const wxString&,const wxString&)
+      DoWriteString__12wxFileConfigFRC8wxStringT1

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


@@ -1810,10 +2084,10 @@ EXPORTS
       GetGroupLine__17wxFileConfigGroupFv
       ;wxFileConfig::HasEntry(const wxString&) const
       HasEntry__12wxFileConfigCFRC8wxString
       GetGroupLine__17wxFileConfigGroupFv
       ;wxFileConfig::HasEntry(const wxString&) const
       HasEntry__12wxFileConfigCFRC8wxString

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

       ;wxFileConfigGroup::DeleteEntry(const char*)
       DeleteEntry__17wxFileConfigGroupFPCc
       ;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
       ;wxFileConfigEntry::SetLine(wxFileConfigLineList*)
       ;wxFileConfig::wxFileConfig(const wxString&,const wxString&,const wxString&,const wxString&,long)
       __ct__12wxFileConfigFRC8wxStringN31l
       ;wxFileConfigEntry::SetLine(wxFileConfigLineList*)


@@ -1932,24 +2206,20 @@ 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::SetPath(const wxString&,wxPathFormat)
+      SetPath__10wxFileNameFRC8wxString12wxPathFormat

       ;wxFileName::IsWild(wxPathFormat)
       IsWild__10wxFileNameF12wxPathFormat
       ;wxFileName::IsWild(wxPathFormat)
       IsWild__10wxFileNameF12wxPathFormat

-      ;wxFileName::Assign(const wxString&,const wxString&,const wxString&,wxPathFormat)
-      Assign__10wxFileNameFRC8wxStringN2112wxPathFormat
+      ;wxFileName::GetTimes(wxDateTime*,wxDateTime*,wxDateTime*) const
+      GetTimes__10wxFileNameCFP10wxDateTimeN21

       ;wxFileName::Clear()
       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)
       ;wxFileName::PrependDir(const wxString&)
       PrependDir__10wxFileNameFRC8wxString
       ;wxFileName::GetPathSeparators(wxPathFormat)


@@ -1958,18 +2228,26 @@ EXPORTS
       Mkdir__10wxFileNameFRC8wxStringiUl
       ;wxFileName::IsPathSeparator(char,wxPathFormat)
       IsPathSeparator__10wxFileNameFc12wxPathFormat
       Mkdir__10wxFileNameFRC8wxStringiUl
       ;wxFileName::IsPathSeparator(char,wxPathFormat)
       IsPathSeparator__10wxFileNameFc12wxPathFormat

-      ;wxFileName::IsAbsolute(wxPathFormat)
-      IsAbsolute__10wxFileNameF12wxPathFormat

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

+      ;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::GetVolumeSeparator(wxPathFormat)
+      GetVolumeSeparator__10wxFileNameF12wxPathFormat

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


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

+      ;wxFileName::SplitPath(const wxString&,wxString*,wxString*,wxString*,wxString*,wxPathFormat)
+      SplitPath__10wxFileNameFRC8wxStringP8wxStringN3212wxPathFormat
+      ;wxFileName::Normalize(int,const wxString&,wxPathFormat)
+      Normalize__10wxFileNameFiRC8wxString12wxPathFormat

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

-      ;wxFileName::IsRelative(wxPathFormat)
-      IsRelative__10wxFileNameF12wxPathFormat
+      ;wxFileName::MakeRelativeTo(const wxString&,wxPathFormat)
+      MakeRelativeTo__10wxFileNameFRC8wxString12wxPathFormat
+      ;wxFileName::AssignDir(const wxString&,wxPathFormat)
+      AssignDir__10wxFileNameFRC8wxString12wxPathFormat
+      ;wxFileName::SetTimes(const wxDateTime*,const wxDateTime*,const wxDateTime*)
+      SetTimes__10wxFileNameFPC10wxDateTimeN21

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


@@ -2006,16 +2292,16 @@ EXPORTS
       GetFormat__10wxFileNameF12wxPathFormat
       ;wxFileName::Assign(const wxFileName&)
       Assign__10wxFileNameFRC10wxFileName
       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


@@ -2030,10 +2316,12 @@ EXPORTS
       ms_root__16wxLocalFSHandler
       ;wxFileSystemHandler::GetMimeTypeFromExt(const wxString&)
       GetMimeTypeFromExt__19wxFileSystemHandlerFRC8wxString
       ms_root__16wxLocalFSHandler
       ;wxFileSystemHandler::GetMimeTypeFromExt(const wxString&)
       GetMimeTypeFromExt__19wxFileSystemHandlerFRC8wxString

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

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

+      ;wxFileSystem::m_Handlers
+      m_Handlers__12wxFileSystem

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


@@ -2076,31 +2364,43 @@ 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):
       ;wxFontMapper::GetConfig()
   ;From object file:  ..\common\fontmap.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxFontMapper::GetConfig()


@@ -2175,6 +2475,8 @@ EXPORTS
       ShowMenuHelp__11wxFrameBaseFP11wxStatusBari
       ;wxFrameBase::GetEventTable() const
       GetEventTable__11wxFrameBaseCFv
       ShowMenuHelp__11wxFrameBaseFP11wxStatusBari
       ;wxFrameBase::GetEventTable() const
       GetEventTable__11wxFrameBaseCFv

+      ;wxFrameBase::~wxFrameBase()
+      __dt__11wxFrameBaseFv

       ;wxFrameBase::AttachMenuBar(wxMenuBar*)
       AttachMenuBar__11wxFrameBaseFP9wxMenuBar
       __vft11wxFrameBase8wxObject
       ;wxFrameBase::AttachMenuBar(wxMenuBar*)
       AttachMenuBar__11wxFrameBaseFP9wxMenuBar
       __vft11wxFrameBase8wxObject


@@ -2318,6 +2620,8 @@ EXPORTS
       __vft11wxGaugeBase8wxObject
       ;wxGaugeBase::SetValue(int)
       SetValue__11wxGaugeBaseFi
       __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*)


@@ -2432,12 +2736,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


@@ -2448,6 +2756,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&)


@@ -2508,12 +2818,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


@@ -2605,6 +2917,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


@@ -2618,6 +2946,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&)


@@ -2654,17 +2984,56 @@ EXPORTS
       wxInitAllImageHandlers__Fv
   ;From object file:  ..\common\imagbmp.cpp
     ;PUBDEFs (Symbols available from object file):
       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)


@@ -2675,8 +3044,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


@@ -2705,25 +3072,35 @@ 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::GetImageCount(wxInputStream&,long)
+      GetImageCount__7wxImageFR13wxInputStreaml
+      ;wxImage::FindFirstUnusedColour(unsigned char*,unsigned char*,unsigned char*,unsigned char,unsigned char,unsigned char) const
+      FindFirstUnusedColour__7wxImageCFPUcN21UcN24

       ;wxImage::Scale(int,int) const
       Scale__7wxImageCFiT1
       ;wxImage::sm_handlers
       sm_handlers__7wxImage
       ;wxImage::wxImage(const wxImage&)
       __ct__7wxImageFRC7wxImage
       ;wxImage::Scale(int,int) const
       Scale__7wxImageCFiT1
       ;wxImage::sm_handlers
       sm_handlers__7wxImage
       ;wxImage::wxImage(const wxImage&)
       __ct__7wxImageFRC7wxImage

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

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

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

       ;wxImageHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
       LoadFile__14wxImageHandlerFP7wxImageR13wxInputStreamUli
       ;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


@@ -2732,24 +3109,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()


@@ -2772,8 +3145,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


@@ -2781,12 +3152,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


@@ -2803,32 +3178,36 @@ EXPORTS
       CleanUpHandlers__7wxImageFv
       ;wxImageHandler::CanRead(const wxString&)
       CanRead__14wxImageHandlerFRC8wxString
       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::wxImage(const wxBitmap&)
+      __ct__7wxImageFRC8wxBitmap
+      ;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
   ;From object file:  ..\common\imaggif.cpp
       ;wxImage::HasOption(const wxString&) const
       HasOption__7wxImageCFRC8wxString
   ;From object file:  ..\common\imaggif.cpp


@@ -2844,14 +3223,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&)


@@ -2859,8 +3279,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


@@ -2887,16 +3309,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)


@@ -2914,16 +3338,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


@@ -2931,6 +3362,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()


@@ -2946,44 +3379,44 @@ 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
       ;wxLanguageInfoArray::Insert(const wxLanguageInfo&,unsigned int)
       Insert__19wxLanguageInfoArrayFRC14wxLanguageInfoUi
       ;wxLocale::Init(int,int)
       Init__8wxLocaleFiT1
       ;wxLocaleModule::sm_classwxLocaleModule
       sm_classwxLocaleModule__14wxLocaleModule
       ;wxLanguageInfoArray::Insert(const wxLanguageInfo&,unsigned int)
       Insert__19wxLanguageInfoArrayFRC14wxLanguageInfoUi

-      ;wxMsgCatalog::wxMsgCatalog()
-      __ct__12wxMsgCatalogFv
+      ;wxLocale::GetSystemEncoding()
+      GetSystemEncoding__8wxLocaleFv

       ;wxLocale::~wxLocale()
       __dt__8wxLocaleFv
       ;wxLocale::GetSystemLanguage()
       GetSystemLanguage__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
       ;wxLocale::CreateLanguagesDB()
       CreateLanguagesDB__8wxLocaleFv
       ;wxLanguageInfoArray::Index(const wxLanguageInfo&,unsigned long) const
       Index__19wxLanguageInfoArrayCFRC14wxLanguageInfoUl
       ;wxLanguageInfoArray::wxLanguageInfoArray(const wxLanguageInfoArray&)
       __ct__19wxLanguageInfoArrayFRC19wxLanguageInfoArray

-      ;wxMsgCatalog::~wxMsgCatalog()
-      __dt__12wxMsgCatalogFv
+      ;wxMsgCatalogFile::~wxMsgCatalogFile()
+      __dt__16wxMsgCatalogFileFv

       ;wxConstructorForwxLocaleModule()
       wxConstructorForwxLocaleModule__Fv
       ;wxLocale::GetSysName() const
       GetSysName__8wxLocaleCFv
       ;wxLanguageInfoArray::DoEmpty()
       DoEmpty__19wxLanguageInfoArrayFv
       ;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
+      ;wxMsgCatalogFile::wxMsgCatalogFile()
+      __ct__16wxMsgCatalogFileFv

       ;wxLocale::wxLocale()
       __ct__8wxLocaleFv
       ;wxLocale::wxLocale()
       __ct__8wxLocaleFv

+      ;wxLocale::InitLanguagesDB()
+      InitLanguagesDB__8wxLocaleFv

       ;wxLocale::GetSystemEncodingName()
       GetSystemEncodingName__8wxLocaleFv
       ;wxLanguageInfoArray::Add(const wxLanguageInfo&)
       ;wxLocale::GetSystemEncodingName()
       GetSystemEncodingName__8wxLocaleFv
       ;wxLanguageInfoArray::Add(const wxLanguageInfo&)


@@ -2996,12 +3429,16 @@ EXPORTS
       GetString__8wxLocaleCFPCcT1
       ;wxLocale::ms_languagesDB
       ms_languagesDB__8wxLocale
       GetString__8wxLocaleCFPCcT1
       ;wxLocale::ms_languagesDB
       ms_languagesDB__8wxLocale

+      ;wxMsgCatalogFile::Load(const char*,const char*)
+      Load__16wxMsgCatalogFileFPCcT1

       ;wxGetLocale()
       wxGetLocale__Fv
       ;NoTransErr::ms_suppressCount
       ms_suppressCount__10NoTransErr
       ;wxLanguageInfoArray::~wxLanguageInfoArray()
       __dt__19wxLanguageInfoArrayFv
       ;wxGetLocale()
       wxGetLocale__Fv
       ;NoTransErr::ms_suppressCount
       ms_suppressCount__10NoTransErr
       ;wxLanguageInfoArray::~wxLanguageInfoArray()
       __dt__19wxLanguageInfoArrayFv

+      ;wxMsgCatalogFile::GetCharset() const
+      GetCharset__16wxMsgCatalogFileCFv

       ;wxLocale::DestroyLanguagesDB()
       DestroyLanguagesDB__8wxLocaleFv
       ;wxMsgCatalog::GetString(const char*) const
       ;wxLocale::DestroyLanguagesDB()
       DestroyLanguagesDB__8wxLocaleFv
       ;wxMsgCatalog::GetString(const char*) const


@@ -3014,12 +3451,10 @@ EXPORTS
       __as__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
       ;wxLanguageInfoArray::RemoveAt(unsigned int)
       RemoveAt__19wxLanguageInfoArrayFUi
       __as__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
       ;wxLanguageInfoArray::RemoveAt(unsigned int)
       RemoveAt__19wxLanguageInfoArrayFUi

-      ;wxMsgCatalog::GetHash(const char*)
-      GetHash__12wxMsgCatalogFPCc
-      ;wxLocale::IsLoaded(const char*) const
-      IsLoaded__8wxLocaleCFPCc

       ;wxLocale::AddCatalogLookupPathPrefix(const wxString&)
       AddCatalogLookupPathPrefix__8wxLocaleFRC8wxString
       ;wxLocale::AddCatalogLookupPathPrefix(const wxString&)
       AddCatalogLookupPathPrefix__8wxLocaleFRC8wxString

+      ;wxLocale::IsLoaded(const char*) const
+      IsLoaded__8wxLocaleCFPCc

   ;From object file:  ..\common\ipcbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxConnectionBase::sm_classwxConnectionBase
   ;From object file:  ..\common\ipcbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxConnectionBase::sm_classwxConnectionBase


@@ -3092,14 +3527,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()


@@ -3128,6 +3569,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


@@ -3136,6 +3579,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


@@ -3155,6 +3600,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


@@ -3185,10 +3631,12 @@ EXPORTS
       Flush__5wxLogFv
       ;wxLogChain::Flush()
       Flush__10wxLogChainFv
       Flush__5wxLogFv
       ;wxLogChain::Flush()
       Flush__10wxLogChainFv

-      ;wxLog::SetActiveTarget(wxLog*)
-      SetActiveTarget__5wxLogFP5wxLog
+      ;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
       ;wxLogVerbose(const char*,...)
       ;wxLogWarning(const char*,...)
       wxLogWarning__FPCce
       ;wxLogVerbose(const char*,...)


@@ -3199,10 +3647,18 @@ EXPORTS
       wxLogStatus__FPCce
       ;wxLog::ClearTraceMasks()
       ClearTraceMasks__5wxLogFv
       wxLogStatus__FPCce
       ;wxLog::ClearTraceMasks()
       ClearTraceMasks__5wxLogFv

-      ;wxLog::RemoveTraceMask(const wxString&)
-      RemoveTraceMask__5wxLogFRC8wxString
+      ;wxVLogError(const char*,char*)
+      wxVLogError__FPCcPc
+      ;wxVLogTrace(unsigned long,const char*,char*)
+      wxVLogTrace__FUlPCcPc
+      ;wxVLogTrace(const char*,const char*,char*)
+      wxVLogTrace__FPCcT1Pc
+      ;wxVLogDebug(const char*,char*)
+      wxVLogDebug__FPCcPc

       ;wxLog::ms_bVerbose
       ms_bVerbose__5wxLog
       ;wxLog::ms_bVerbose
       ms_bVerbose__5wxLog

+      ;wxLog::RemoveTraceMask(const wxString&)
+      RemoveTraceMask__5wxLogFRC8wxString

       ;wxSysErrorMsg(unsigned long)
       wxSysErrorMsg__FUl
       ;wxLog::DoLogString(const char*,long)
       ;wxSysErrorMsg(unsigned long)
       wxSysErrorMsg__FUl
       ;wxLog::DoLogString(const char*,long)


@@ -3215,27 +3671,41 @@ EXPORTS
       wxLogSysError__FPCce
       ;wxLog::DontCreateOnDemand()
       DontCreateOnDemand__5wxLogFv
       wxLogSysError__FPCce
       ;wxLog::DontCreateOnDemand()
       DontCreateOnDemand__5wxLogFv

-      ;wxLog::TimeStamp(wxString*)
-      TimeStamp__5wxLogFP8wxString
+      ;wxVLogWarning(const char*,char*)
+      wxVLogWarning__FPCcPc
+      ;wxVLogStatus(const char*,char*)
+      wxVLogStatus__FPCcPc
+      ;wxVLogMessage(const char*,char*)
+      wxVLogMessage__FPCcPc

       __vft10wxLogChain5wxLog
       ;wxLogChain::wxLogChain(wxLog*)
       __ct__10wxLogChainFP5wxLog
       __vft10wxLogChain5wxLog
       ;wxLogChain::wxLogChain(wxLog*)
       __ct__10wxLogChainFP5wxLog

+      ;wxLog::TimeStamp(wxString*)
+      TimeStamp__5wxLogFP8wxString

       ;wxLogInfo(const char*,...)
       wxLogInfo__FPCce
       ;wxLogSysError(long,const char*,...)
       wxLogSysError__FlPCce
       ;wxLogStream::wxLogStream(ostream*)
       __ct__11wxLogStreamFP7ostream
       ;wxLogInfo(const char*,...)
       wxLogInfo__FPCce
       ;wxLogSysError(long,const char*,...)
       wxLogSysError__FlPCce
       ;wxLogStream::wxLogStream(ostream*)
       __ct__11wxLogStreamFP7ostream

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

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

-      ;wxLogChain::SetLog(wxLog*)
-      SetLog__10wxLogChainFP5wxLog
+      ;wxVLogInfo(const char*,char*)
+      wxVLogInfo__FPCcPc
+      ;wxVLogSysError(const char*,char*)
+      wxVLogSysError__FPCcPc
+      ;wxVLogFatalError(const char*,char*)
+      wxVLogFatalError__FPCcPc

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

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

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


@@ -3252,6 +3722,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


@@ -3265,14 +3741,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


@@ -3283,12 +3781,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::ToString() const
       ToString__12wxLongLongWxCFv
       ;wxLongLongWx::operator-(const wxLongLongWx&) const
       __mi__12wxLongLongWxCFRC12wxLongLongWx
       ;wxLongLongWx::Negate()
       Negate__12wxLongLongWxFv
       ;wxLongLongWx::ToString() const
       ToString__12wxLongLongWxCFv
       ;wxLongLongWx::operator-(const wxLongLongWx&) const
       __mi__12wxLongLongWxCFRC12wxLongLongWx

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

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


@@ -3299,6 +3805,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


@@ -3307,28 +3815,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&)


@@ -3509,6 +4045,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


@@ -3698,6 +4236,8 @@ 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*)
       ;wxModule::CleanUpModules()
       CleanUpModules__8wxModuleFv
       ;wxModule::RegisterModule(wxModule*)


@@ -3754,42 +4294,27 @@ EXPORTS
   ;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

-      ;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::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*)
       ;wxObject::IsKindOf(wxClassInfo*) const
       IsKindOf__8wxObjectCFP11wxClassInfo
       ;wxClassInfo::FindClass(const char*)


@@ -3798,48 +4323,8 @@ EXPORTS
       sm_classwxObject__8wxObject
       ;wxObject::operator new(unsigned int,char*,int)
       __nw__8wxObjectFUiPci
       sm_classwxObject__8wxObject
       ;wxObject::operator new(unsigned int,char*,int)
       __nw__8wxObjectFUiPci

-      ;wxObject::wxObject()
-      __ct__8wxObjectFv
-      ;wxObject::~wxObject()
-      __dt__8wxObjectFv

       ;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):


@@ -4279,10 +4764,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&)


@@ -4291,6 +4778,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()


@@ -4307,8 +4796,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


@@ -4426,30 +4917,6 @@ 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\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*)


@@ -4467,18 +4934,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
       ;wxNotebookSizer::RecalcSizes()
       RecalcSizes__15wxNotebookSizerFv
       ;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()


@@ -4511,6 +4982,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()


@@ -4527,12 +5000,15 @@ EXPORTS
       Remove__7wxSizerFP8wxWindow
       ;wxSizer::FitSize(wxWindow*)
       FitSize__7wxSizerFP8wxWindow
       Remove__7wxSizerFP8wxWindow
       ;wxSizer::FitSize(wxWindow*)
       FitSize__7wxSizerFP8wxWindow

-      __vft15wxNotebookSizer8wxObject
+      ;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()


@@ -4563,10 +5039,13 @@ EXPORTS
       sm_classwxFlexGridSizer__15wxFlexGridSizer
       ;wxBoxSizer::sm_classwxBoxSizer
       sm_classwxBoxSizer__10wxBoxSizer
       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

       ;wxSizerItem::wxSizerItem(wxWindow*,int,int,int,wxObject*)
       __ct__11wxSizerItemFP8wxWindowiN22P8wxObject
       __vft16wxStaticBoxSizer8wxObject
       ;wxSizerItem::wxSizerItem(wxWindow*,int,int,int,wxObject*)
       __ct__11wxSizerItemFP8wxWindowiN22P8wxObject
       __vft16wxStaticBoxSizer8wxObject


@@ -4599,8 +5078,6 @@ EXPORTS
       SetTimeout__12wxSocketBaseFl
       ;wxSocketEvent::sm_classwxSocketEvent
       sm_classwxSocketEvent__13wxSocketEvent
       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)


@@ -4625,6 +5102,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()


@@ -4635,18 +5114,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)


@@ -4665,6 +5143,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


@@ -4676,10 +5155,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)


@@ -4704,57 +5187,36 @@ 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::FreeWidths()
+      FreeWidths__15wxStatusBarBaseFv
+      __vft15wxStatusBarBase8wxObject
+      ;wxStatusBarBase::InitWidths()
+      InitWidths__15wxStatusBarBaseFv
+      ;wxStatusBar::sm_classwxStatusBar
+      sm_classwxStatusBar__11wxStatusBar
+      ;wxStatusBarBase::~wxStatusBarBase()
+      __dt__15wxStatusBarBaseFv
+      ;wxStatusBarBase::SetStatusWidths(int,const int*)
+      SetStatusWidths__15wxStatusBarBaseFiPCi
+      ;wxStatusBarBase::CalculateAbsWidths(int) const
+      CalculateAbsWidths__15wxStatusBarBaseCFi
+      ;wxStatusBarBase::wxStatusBarBase()
+      __ct__15wxStatusBarBaseFv
+      ;wxStatusBarBase::SetFieldsCount(int,const int*)
+      SetFieldsCount__15wxStatusBarBaseFiPCi
+      ;wxConstructorForwxStatusBar()
+      wxConstructorForwxStatusBar__Fv

   ;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
-      __vft8wxCSConv8wxMBConv
-      ;wxMBConv::cMB2WC(const char*) const
-      cMB2WC__8wxMBConvCFPCc
-      ;wxCSConv::SetName(const char*)
-      SetName__8wxCSConvFPCc
-      ;wxMBConvUTF7::MB2WC(wchar_t*,const char*,unsigned int) const
-      MB2WC__12wxMBConvUTF7CFPwPCcUi
-      ;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
       wxConvCurrent

-      ;wxMBConv::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__8wxMBConvCFPcPCwUi
-      ;wxCSConv::~wxCSConv()
-      __dt__8wxCSConvFv
-      wxConvUTF7
-      wxConvUTF8
-      wxConvLocal
-      ;wxMBConvFile::MB2WC(wchar_t*,const char*,unsigned int) const
-      MB2WC__12wxMBConvFileCFPwPCcUi

       wxConvFile
       wxConvFile

-      ;wxCSConv::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__8wxCSConvCFPcPCwUi
-      ;wxMBConvUTF7::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__12wxMBConvUTF7CFPcPCwUi
-      ;wxMBConvFile::WC2MB(char*,const wchar_t*,unsigned int) const
-      WC2MB__12wxMBConvFileCFPcPCwUi
-      ;wxCSConv::MB2WC(wchar_t*,const char*,unsigned int) const
-      MB2WC__8wxCSConvCFPwPCcUi
-      ;wxCSConv::LoadNow()
-      LoadNow__8wxCSConvFv
-      ;wxCSConv::wxCSConv(const char*)
-      __ct__8wxCSConvFPCc

       wxConvLibc
       wxConvLibc

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

   ;From object file:  ..\common\stream.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxStreamBuffer::SetBufferIO(void*,unsigned int,unsigned long)
       SetBufferIO__14wxStreamBufferFPvUiUl
   ;From object file:  ..\common\stream.cpp
     ;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&)


@@ -4820,11 +5282,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&)


@@ -4835,8 +5299,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


@@ -4859,10 +5321,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*)


@@ -4899,8 +5361,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


@@ -4948,20 +5408,22 @@ 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 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::SetCount(unsigned int)
+      SetCount__13wxArrayStringFUi

       ;wxArrayString::Remove(unsigned int)
       Remove__13wxArrayStringFUi
       ;wxString::Format(const char*,...)
       ;wxArrayString::Remove(unsigned int)
       Remove__13wxArrayStringFUi
       ;wxString::Format(const char*,...)


@@ -4988,8 +5450,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


@@ -5008,6 +5468,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&)


@@ -5026,8 +5488,6 @@ 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
       ;wxVsnprintf(char*,unsigned int,const char*,char*)
       ;wxString::find(char,unsigned int) const
       find__8wxStringCFcUi
       ;wxVsnprintf(char*,unsigned int,const char*,char*)


@@ -5044,6 +5504,8 @@ EXPORTS
       find__8wxStringCFRC8wxStringUi
       ;wxString::UngetWriteBuf(unsigned int)
       UngetWriteBuf__8wxStringFUi
       find__8wxStringCFRC8wxStringUi
       ;wxString::UngetWriteBuf(unsigned int)
       UngetWriteBuf__8wxStringFUi

+      ;wxString::ToLong(long*,int) const
+      ToLong__8wxStringCFPli

       ;wxArrayString::Insert(const wxString&,unsigned int)
       Insert__13wxArrayStringFRC8wxStringUi
       ;wxString::GetWriteBuf(unsigned int)
       ;wxArrayString::Insert(const wxString&,unsigned int)
       Insert__13wxArrayStringFRC8wxStringUi
       ;wxString::GetWriteBuf(unsigned int)


@@ -5054,6 +5516,7 @@ EXPORTS
       AllocBeforeWrite__8wxStringFUi
       ;wxString::InitWith(const char*,unsigned int,unsigned int)
       InitWith__8wxStringFPCcUiT2
       AllocBeforeWrite__8wxStringFUi
       ;wxString::InitWith(const char*,unsigned int,unsigned int)
       InitWith__8wxStringFPCcUiT2

+      wxStringCompareFunction

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


@@ -5070,8 +5533,6 @@ EXPORTS
       __pl__FRC8wxStringPCc
       ;wxArrayString::operator==(const wxArrayString&) const
       __eq__13wxArrayStringCFRC13wxArrayString
       __pl__FRC8wxStringPCc
       ;wxArrayString::operator==(const wxArrayString&) const
       __eq__13wxArrayStringCFRC13wxArrayString

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

       ;wxString::StartsWith(const char*,wxString*) const
       StartsWith__8wxStringCFPCcP8wxString
       ;wxArrayString::Remove(const char*)
       ;wxString::StartsWith(const char*,wxString*) const
       StartsWith__8wxStringCFPCcP8wxString
       ;wxArrayString::Remove(const char*)


@@ -5080,8 +5541,6 @@ EXPORTS
       ConcatSelf__8wxStringFiPCc
       ;wxArrayString::Add(const wxString&)
       Add__13wxArrayStringFRC8wxString
       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*,...)


@@ -5108,12 +5567,16 @@ 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
       ;wxSnprintf(char*,unsigned int,const char*,...)
       wxSnprintf__FPcUiPCce
       ;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()


@@ -5122,8 +5585,6 @@ 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
       ;wxArrayString::Free()
       ;wxString::Lower() const
       Lower__8wxStringCFv
       ;wxArrayString::Free()


@@ -5228,6 +5689,8 @@ EXPORTS
       SetToggle__13wxToolBarBaseFiUl
       ;wxToolBarBase::GetToolShortHelp(int) const
       GetToolShortHelp__13wxToolBarBaseCFi
       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


@@ -5239,6 +5702,35 @@ 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)
   ;From object file:  ..\common\textcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTextCtrlBase::operator<<(double)


@@ -5252,6 +5744,8 @@ 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
       wxEVT_COMMAND_TEXT_ENTER
       ;wxTextCtrlBase::wxTextCtrlBase()
       __ct__14wxTextCtrlBaseFv
       wxEVT_COMMAND_TEXT_ENTER


@@ -5267,6 +5761,8 @@ EXPORTS
       sm_classwxTextUrlEvent__14wxTextUrlEvent
       ;wxTextCtrlBase::~wxTextCtrlBase()
       __dt__14wxTextCtrlBaseFv
       sm_classwxTextUrlEvent__14wxTextUrlEvent
       ;wxTextCtrlBase::~wxTextCtrlBase()
       __dt__14wxTextCtrlBaseFv

+      ;wxTextCtrlBase::GetStringSelection() const
+      GetStringSelection__14wxTextCtrlBaseCFv

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


@@ -5282,38 +5778,25 @@ EXPORTS
       ;wxTextCtrlBase::operator<<(const char)
       __ls__14wxTextCtrlBaseFCc
       __vft14wxTextCtrlBase8wxObject
       ;wxTextCtrlBase::operator<<(const char)
       __ls__14wxTextCtrlBaseFCc
       __vft14wxTextCtrlBase8wxObject

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

       ;wxTextCtrlBase::SetStyle(long,long,const wxTextAttr&)
       SetStyle__14wxTextCtrlBaseFlT1RC10wxTextAttr
   ;From object file:  ..\common\textfile.cpp
     ;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::Read(wxMBConv&)
-      Read__10wxTextFileFR8wxMBConv
-      ;wxTextFile::GuessType() const
-      GuessType__10wxTextFileCFv
-      ;wxTextFile::~wxTextFile()
-      __dt__10wxTextFileFv
-      ;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::Open(const wxString&,wxMBConv&)
-      Open__10wxTextFileFRC8wxStringR8wxMBConv
-      ;wxTextFile::Write(wxTextFileType,wxMBConv&)
-      Write__10wxTextFileF14wxTextFileTypeR8wxMBConv
-      ;wxTextFile::Open(wxMBConv&)
-      Open__10wxTextFileFR8wxMBConv
-      ;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


@@ -5331,6 +5814,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)


@@ -5363,23 +5848,31 @@ EXPORTS
       SendIconizeEvent__20wxTopLevelWindowBaseFUl
       ;wxTopLevelWindowBase::sm_eventTable
       sm_eventTable__20wxTopLevelWindowBase
       SendIconizeEvent__20wxTopLevelWindowBaseFUl
       ;wxTopLevelWindowBase::sm_eventTable
       sm_eventTable__20wxTopLevelWindowBase

+      ;wxConstructorForwxTopLevelWindow()
+      wxConstructorForwxTopLevelWindow__Fv

       ;wxTopLevelWindowBase::DoClientToScreen(int*,int*) const
       DoClientToScreen__20wxTopLevelWindowBaseCFPiT1
       ;wxTopLevelWindowBase::DoClientToScreen(int*,int*) const
       DoClientToScreen__20wxTopLevelWindowBaseCFPiT1

-      ;wxTopLevelWindowBase::GetEventTable() const
-      GetEventTable__20wxTopLevelWindowBaseCFv

       ;wxTopLevelWindowBase::wxTopLevelWindowBase()
       __ct__20wxTopLevelWindowBaseFv
       ;wxTopLevelWindowBase::wxTopLevelWindowBase()
       __ct__20wxTopLevelWindowBaseFv

+      ;wxTopLevelWindowBase::GetEventTable() const
+      GetEventTable__20wxTopLevelWindowBaseCFv

       ;wxTopLevelWindowBase::OnSize(wxSizeEvent&)
       OnSize__20wxTopLevelWindowBaseFR11wxSizeEvent
       __vft20wxTopLevelWindowBase8wxObject
       ;wxTopLevelWindowBase::sm_eventTableEntries
       sm_eventTableEntries__20wxTopLevelWindowBase
       ;wxTopLevelWindowBase::OnSize(wxSizeEvent&)
       OnSize__20wxTopLevelWindowBaseFR11wxSizeEvent
       __vft20wxTopLevelWindowBase8wxObject
       ;wxTopLevelWindowBase::sm_eventTableEntries
       sm_eventTableEntries__20wxTopLevelWindowBase

+      ;wxTopLevelWindowBase::~wxTopLevelWindowBase()
+      __dt__20wxTopLevelWindowBaseFv

       ;wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__20wxTopLevelWindowBaseFR12wxCloseEvent
       ;wxTopLevelWindowBase::DoScreenToClient(int*,int*) const
       DoScreenToClient__20wxTopLevelWindowBaseCFPiT1
       ;wxTopLevelWindowBase::Destroy()
       Destroy__20wxTopLevelWindowBaseFv
       ;wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__20wxTopLevelWindowBaseFR12wxCloseEvent
       ;wxTopLevelWindowBase::DoScreenToClient(int*,int*) const
       DoScreenToClient__20wxTopLevelWindowBaseCFPiT1
       ;wxTopLevelWindowBase::Destroy()
       Destroy__20wxTopLevelWindowBaseFv

+      ;wxTopLevelWindowBase::GetMaxSize() const
+      GetMaxSize__20wxTopLevelWindowBaseCFv
+      ;wxTopLevelWindow::sm_classwxTopLevelWindow
+      sm_classwxTopLevelWindow__16wxTopLevelWindow

   ;From object file:  ..\common\treebase.cpp
     ;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


@@ -5555,8 +6048,6 @@ 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()
       ;wxDecToHex(int)
       wxDecToHex__Fi
       ;wxNow()


@@ -5577,60 +6068,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

-      ;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*)


@@ -5774,6 +6275,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)


@@ -5788,6 +6291,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


@@ -5812,6 +6316,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&)


@@ -5822,12 +6328,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


@@ -5850,12 +6360,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&)


@@ -5884,6 +6398,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


@@ -5946,6 +6462,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&)


@@ -6019,18 +6537,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&)


@@ -6088,6 +6612,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


@@ -6118,6 +6644,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


@@ -6251,6 +6779,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*)


@@ -6261,8 +6791,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*)


@@ -6275,8 +6809,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()


@@ -6289,6 +6821,8 @@ 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::FindWindow(long)
       FindWindow__12wxWindowBaseFl
       ;wxWindowBase::IsExposed(int,int) const
       ;wxWindowBase::FindWindow(long)
       FindWindow__12wxWindowBaseFl
       ;wxWindowBase::IsExposed(int,int) const


@@ -6306,16 +6840,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&)


@@ -6334,22 +6870,18 @@ EXPORTS
       GetClientSizeConstraint__12wxWindowBaseCFPiT1
       ;wxWindowBase::DoHitTest(int,int) const
       DoHitTest__12wxWindowBaseCFiT1
       GetClientSizeConstraint__12wxWindowBaseCFPiT1
       ;wxWindowBase::DoHitTest(int,int) const
       DoHitTest__12wxWindowBaseCFiT1

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

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

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

       ;wxWindowBase::IsTopLevel() const
       IsTopLevel__12wxWindowBaseCFv
       ;wxWindowBase::GetUpdateClientRect() const
       GetUpdateClientRect__12wxWindowBaseCFv
       ;wxWindowBase::GetHelpText() const
       GetHelpText__12wxWindowBaseCFv
       ;wxWindowBase::IsTopLevel() const
       IsTopLevel__12wxWindowBaseCFv
       ;wxWindowBase::GetUpdateClientRect() const
       GetUpdateClientRect__12wxWindowBaseCFv
       ;wxWindowBase::GetHelpText() const
       GetHelpText__12wxWindowBaseCFv

-      ;wxWindowBase::DoGetClientData() const
-      DoGetClientData__12wxWindowBaseCFv
+      ;wxWindowBase::GetAncestorWithCustomPalette() const
+      GetAncestorWithCustomPalette__12wxWindowBaseCFv

       ;wxWindowBase::SetFont(const wxFont&)
       SetFont__12wxWindowBaseFRC6wxFont
       ;wxWindowBase::MakeModal(unsigned long)
       ;wxWindowBase::SetFont(const wxFont&)
       SetFont__12wxWindowBaseFRC6wxFont
       ;wxWindowBase::MakeModal(unsigned long)


@@ -6382,13 +6914,10 @@ EXPORTS
       SetHelpText__12wxWindowBaseFRC8wxString
   ;From object file:  ..\common\wxchar.cpp
     ;PUBDEFs (Symbols available from object file):
       SetHelpText__12wxWindowBaseFRC8wxString
   ;From object file:  ..\common\wxchar.cpp
     ;PUBDEFs (Symbols available from object file):

-      wcslen
-      ;wxMB2WC(wchar_t*,const char*,unsigned int)
-      wxMB2WC__FPwPCcUi
-      ;wxWC2MB(char*,const wchar_t*,unsigned int)
-      wxWC2MB__FPcPCwUi

       ;wxOKlibc()
       wxOKlibc__Fv
       ;wxOKlibc()
       wxOKlibc__Fv

+      ;wcslen(const wchar_t*)
+      wcslen__FPCw

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


@@ -6601,8 +7130,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&)


@@ -6616,6 +7145,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()


@@ -6637,6 +7170,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)


@@ -6657,6 +7192,8 @@ EXPORTS
       GetYearControl__14wxCalendarCtrlCFv
       ;wxYearSpinCtrl::GetEventTable() const
       GetEventTable__14wxYearSpinCtrlCFv
       GetYearControl__14wxCalendarCtrlCFv
       ;wxYearSpinCtrl::GetEventTable() const
       GetEventTable__14wxYearSpinCtrlCFv

+      ;wxCalendarCtrl::GetDateCoord(const wxDateTime&,int*,int*) const
+      GetDateCoord__14wxCalendarCtrlCFRC10wxDateTimePiT2

       ;wxCalendarCtrl::OnYearChange(wxSpinEvent&)
       OnYearChange__14wxCalendarCtrlFR11wxSpinEvent
       wxEVT_CALENDAR_DAY_CHANGED
       ;wxCalendarCtrl::OnYearChange(wxSpinEvent&)
       OnYearChange__14wxCalendarCtrlFR11wxSpinEvent
       wxEVT_CALENDAR_DAY_CHANGED


@@ -6673,10 +7210,12 @@ EXPORTS
       __vft14wxCalendarCtrl8wxObject
       ;wxCalendarCtrl::OnPaint(wxPaintEvent&)
       OnPaint__14wxCalendarCtrlFR12wxPaintEvent
       __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


@@ -6692,8 +7231,11 @@ 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
       ;wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl*)
       ;wxCalendarCtrl::GetStartDate() const
       GetStartDate__14wxCalendarCtrlCFv
       ;wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl*)


@@ -6702,10 +7244,14 @@ EXPORTS
       sm_eventTable__15wxMonthComboBox
       ;wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl*)
       __ct__14wxYearSpinCtrlFP14wxCalendarCtrl
       sm_eventTable__15wxMonthComboBox
       ;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)


@@ -6857,6 +7403,26 @@ 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):
       __vft23wxPostScriptPrintDialog8wxObject
   ;From object file:  ..\generic\dcpsg.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft23wxPostScriptPrintDialog8wxObject


@@ -7028,10 +7594,39 @@ 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::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


@@ -7040,8 +7635,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()


@@ -7050,6 +7643,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)


@@ -7060,10 +7655,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


@@ -7080,36 +7677,20 @@ EXPORTS
       FillFilterList__19wxDirFilterListCtrlFRC8wxStringi
       ;wxGenericDirCtrl::SetupSections()
       SetupSections__16wxGenericDirCtrlFv
       FillFilterList__19wxDirFilterListCtrlFRC8wxStringi
       ;wxGenericDirCtrl::SetupSections()
       SetupSections__16wxGenericDirCtrlFv

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

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

-      __vft15wxDirItemDataEx12wxClientData
+      ;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&)


@@ -7118,12 +7699,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)


@@ -7134,6 +7711,8 @@ 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


@@ -7141,8 +7720,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxGenericFontDialog::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__19wxGenericFontDialogFR12wxCloseEvent
     ;PUBDEFs (Symbols available from object file):
       ;wxGenericFontDialog::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__19wxGenericFontDialogFR12wxCloseEvent

-      ;wxGenericFontDialog::OnPaint(wxPaintEvent&)
-      OnPaint__19wxGenericFontDialogFR12wxPaintEvent

       ;wxGenericFontDialog::wxGenericFontDialog(wxWindow*,wxFontData*)
       __ct__19wxGenericFontDialogFP8wxWindowP10wxFontData
       ;wxFontStyleIntToString(int)
       ;wxGenericFontDialog::wxGenericFontDialog(wxWindow*,wxFontData*)
       __ct__19wxGenericFontDialogFP8wxWindowP10wxFontData
       ;wxFontStyleIntToString(int)


@@ -7151,15 +7728,18 @@ EXPORTS
       Create__19wxGenericFontDialogFP8wxWindowP10wxFontData
       ;wxGenericFontDialog::GetEventTable() const
       GetEventTable__19wxGenericFontDialogCFv
       Create__19wxGenericFontDialogFP8wxWindowP10wxFontData
       ;wxGenericFontDialog::GetEventTable() const
       GetEventTable__19wxGenericFontDialogCFv

+      ;wxFontPreviewer::sm_eventTable
+      sm_eventTable__15wxFontPreviewer

       ;wxGenericFontDialog::~wxGenericFontDialog()
       __dt__19wxGenericFontDialogFv
       ;wxFontWeightStringToInt(char*)
       wxFontWeightStringToInt__FPc
       ;wxGenericFontDialog::~wxGenericFontDialog()
       __dt__19wxGenericFontDialogFv
       ;wxFontWeightStringToInt(char*)
       wxFontWeightStringToInt__FPc

+      __vft15wxFontPreviewer8wxObject

       __vft19wxGenericFontDialog8wxObject
       ;wxFontFamilyIntToString(int)
       wxFontFamilyIntToString__Fi
       __vft19wxGenericFontDialog8wxObject
       ;wxFontFamilyIntToString(int)
       wxFontFamilyIntToString__Fi

-      ;wxGenericFontDialog::PaintFontBackground(wxDC&)
-      PaintFontBackground__19wxGenericFontDialogFR4wxDC
+      ;wxFontPreviewer::OnPaint(wxPaintEvent&)
+      OnPaint__15wxFontPreviewerFR12wxPaintEvent

       ;wxGenericFontDialog::OnChangeFont(wxCommandEvent&)
       OnChangeFont__19wxGenericFontDialogFR14wxCommandEvent
       ;wxGenericFontDialog::ShowModal()
       ;wxGenericFontDialog::OnChangeFont(wxCommandEvent&)
       OnChangeFont__19wxGenericFontDialogFR14wxCommandEvent
       ;wxGenericFontDialog::ShowModal()


@@ -7170,6 +7750,8 @@ EXPORTS
       sm_eventTable__19wxGenericFontDialog
       ;wxFontWeightIntToString(int)
       wxFontWeightIntToString__Fi
       sm_eventTable__19wxGenericFontDialog
       ;wxFontWeightIntToString(int)
       wxFontWeightIntToString__Fi

+      ;wxFontPreviewer::GetEventTable() const
+      GetEventTable__15wxFontPreviewerCFv

       ;wxConstructorForwxGenericFontDialog()
       wxConstructorForwxGenericFontDialog__Fv
       ;wxFontFamilyStringToInt(char*)
       ;wxConstructorForwxGenericFontDialog()
       wxConstructorForwxGenericFontDialog__Fv
       ;wxFontFamilyStringToInt(char*)


@@ -7178,12 +7760,12 @@ EXPORTS
       wxFontStyleStringToInt__FPc
       ;wxGenericFontDialog::wxGenericFontDialog()
       __ct__19wxGenericFontDialogFv
       wxFontStyleStringToInt__FPc
       ;wxGenericFontDialog::wxGenericFontDialog()
       __ct__19wxGenericFontDialogFv

+      ;wxFontPreviewer::sm_eventTableEntries
+      sm_eventTableEntries__15wxFontPreviewer

       ;wxGenericFontDialog::InitializeFont()
       InitializeFont__19wxGenericFontDialogFv
       ;wxGenericFontDialog::CreateWidgets()
       CreateWidgets__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
       ;wxGenericFontDialog::sm_classwxGenericFontDialog
       sm_classwxGenericFontDialog__19wxGenericFontDialog
   ;From object file:  ..\generic\fdrepdlg.cpp


@@ -7299,8 +7881,8 @@ EXPORTS
       DeselectCol__6wxGridFi
       ;wxGridTableBase::AppendCols(unsigned int)
       AppendCols__15wxGridTableBaseFUi
       DeselectCol__6wxGridFi
       ;wxGridTableBase::AppendCols(unsigned int)
       AppendCols__15wxGridTableBaseFUi

-      ;wxGridStringArray::DoEmpty()
-      DoEmpty__17wxGridStringArrayFv
+      ;wxGridCellAttr::Init(wxGridCellAttr*)
+      Init__14wxGridCellAttrFP14wxGridCellAttr

       wxEVT_GRID_EDITOR_SHOWN
       ;wxConstructorForwxGridEditorCreatedEvent()
       wxConstructorForwxGridEditorCreatedEvent__Fv
       wxEVT_GRID_EDITOR_SHOWN
       ;wxConstructorForwxGridEditorCreatedEvent()
       wxConstructorForwxGridEditorCreatedEvent__Fv


@@ -7339,6 +7921,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*)


@@ -8263,72 +8847,6 @@ 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):
       __vft11wxImageList8wxObject
   ;From object file:  ..\generic\imaglist.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft11wxImageList8wxObject


@@ -8430,8 +8948,6 @@ EXPORTS
       DeleteItem__16wxListMainWindowFl
       ;wxListLineDataArray::wxListLineDataArray(const wxListLineDataArray&)
       __ct__19wxListLineDataArrayFRC19wxListLineDataArray
       DeleteItem__16wxListMainWindowFl
       ;wxListLineDataArray::wxListLineDataArray(const wxListLineDataArray&)
       __ct__19wxListLineDataArrayFRC19wxListLineDataArray

-      ;wxListEvent::wxListEvent(int,int)
-      __ct__11wxListEventFiT1

       ;wxListItemData::SetSize(int,int)
       SetSize__14wxListItemDataFiT1
       ;wxListLineData::SetItem(int,const wxListItem&)
       ;wxListItemData::SetSize(int,int)
       SetSize__14wxListItemDataFiT1
       ;wxListLineData::SetItem(int,const wxListItem&)


@@ -8482,12 +8998,15 @@ EXPORTS
       GetItemCount__10wxListCtrlCFv
       ;wxListMainWindow::GetImageSize(int,int&,int&) const
       GetImageSize__16wxListMainWindowCFiRiT2
       GetItemCount__10wxListCtrlCFv
       ;wxListMainWindow::GetImageSize(int,int&,int&) const
       GetImageSize__16wxListMainWindowCFiRiT2

+      ;wxListCtrl::Freeze()
+      Freeze__10wxListCtrlFv

       ;wxListHeaderWindow::DoDrawRect(wxDC*,int,int,int,int)
       DoDrawRect__18wxListHeaderWindowFP4wxDCiN32
       wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
       wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK
       ;wxListMainWindow::GetItemRect(long,wxRect&)
       GetItemRect__16wxListMainWindowFlR6wxRect
       ;wxListHeaderWindow::DoDrawRect(wxDC*,int,int,int,int)
       DoDrawRect__18wxListHeaderWindowFP4wxDCiN32
       wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
       wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK
       ;wxListMainWindow::GetItemRect(long,wxRect&)
       GetItemRect__16wxListMainWindowFlR6wxRect

+      wxEVT_COMMAND_LIST_ITEM_FOCUSED

       wxEVT_COMMAND_LIST_ITEM_DESELECTED
       wxEVT_COMMAND_LIST_ITEM_ACTIVATED
       wxEVT_COMMAND_LIST_CACHE_HINT
       wxEVT_COMMAND_LIST_ITEM_DESELECTED
       wxEVT_COMMAND_LIST_ITEM_ACTIVATED
       wxEVT_COMMAND_LIST_CACHE_HINT


@@ -8504,8 +9023,6 @@ EXPORTS
       OnKeyDown__16wxListMainWindowFR10wxKeyEvent
       ;wxListMainWindow::OnArrowChar(unsigned int,const wxKeyEvent&)
       OnArrowChar__16wxListMainWindowFUiRC10wxKeyEvent
       OnKeyDown__16wxListMainWindowFR10wxKeyEvent
       ;wxListMainWindow::OnArrowChar(unsigned int,const wxKeyEvent&)
       OnArrowChar__16wxListMainWindowFUiRC10wxKeyEvent

-      ;wxListEvent::CopyObject(wxObject&) const
-      CopyObject__11wxListEventCFR8wxObject

       ;wxListLineDataArray::operator=(const wxListLineDataArray&)
       __as__19wxListLineDataArrayFRC19wxListLineDataArray
       wxEVT_COMMAND_LIST_INSERT_ITEM
       ;wxListLineDataArray::operator=(const wxListLineDataArray&)
       __as__19wxListLineDataArrayFRC19wxListLineDataArray
       wxEVT_COMMAND_LIST_INSERT_ITEM


@@ -8594,7 +9111,6 @@ EXPORTS
       sm_classwxListCtrl__10wxListCtrl
       __vft18wxListHeaderWindow8wxObject
       __vft17wxListRenameTimer8wxObject
       sm_classwxListCtrl__10wxListCtrl
       __vft18wxListHeaderWindow8wxObject
       __vft17wxListRenameTimer8wxObject

-      __vft11wxListEvent8wxObject

       ;wxListMainWindow::SortItems(int(*)(long,long,long),long)
       SortItems__16wxListMainWindowFPFlN21_il
       ;wxListCtrl::SetSingleStyle(long,unsigned long)
       ;wxListMainWindow::SortItems(int(*)(long,long,long),long)
       SortItems__16wxListMainWindowFPFlN21_il
       ;wxListCtrl::SetSingleStyle(long,unsigned long)


@@ -8635,8 +9151,6 @@ EXPORTS
       RemoveAt__19wxListLineDataArrayFUi
       ;wxListMainWindow::RefreshLines(unsigned int,unsigned int)
       RefreshLines__16wxListMainWindowFUiT1
       RemoveAt__19wxListLineDataArrayFUi
       ;wxListMainWindow::RefreshLines(unsigned int,unsigned int)
       RefreshLines__16wxListMainWindowFUiT1

-      ;wxListMainWindow::OnFocusLine(unsigned int)
-      OnFocusLine__16wxListMainWindowFUi

       ;wxListCtrl::InsertItem(long,int)
       InsertItem__10wxListCtrlFli
       ;wxListMainWindow::GetVisibleLinesRange(unsigned int*,unsigned int*)
       ;wxListCtrl::InsertItem(long,int)
       InsertItem__10wxListCtrlFli
       ;wxListMainWindow::GetVisibleLinesRange(unsigned int*,unsigned int*)


@@ -8649,6 +9163,8 @@ EXPORTS
       DrawImage__16wxListMainWindowFiP4wxDCN21
       ;wxListCtrl::DeleteColumn(int)
       DeleteColumn__10wxListCtrlFi
       DrawImage__16wxListMainWindowFiP4wxDCN21
       ;wxListCtrl::DeleteColumn(int)
       DeleteColumn__10wxListCtrlFi

+      ;wxListMainWindow::ChangeCurrent(unsigned int)
+      ChangeCurrent__16wxListMainWindowFUi

       ;wxListCtrl::Arrange(int)
       Arrange__10wxListCtrlFi
       ;wxListCtrl::GetNextItem(long,int,int) const
       ;wxListCtrl::Arrange(int)
       Arrange__10wxListCtrlFi
       ;wxListCtrl::GetNextItem(long,int,int) const


@@ -8661,8 +9177,14 @@ EXPORTS
       __vft16wxListMainWindow14wxScrollHelper
       ;wxListMainWindow::UpdateCurrent()
       UpdateCurrent__16wxListMainWindowFv
       __vft16wxListMainWindow14wxScrollHelper
       ;wxListMainWindow::UpdateCurrent()
       UpdateCurrent__16wxListMainWindowFv

+      ;wxListMainWindow::Thaw()
+      Thaw__16wxListMainWindowFv
+      ;wxListCtrl::Thaw()
+      Thaw__10wxListCtrlFv

       ;wxListCtrl::SetItem(long,int,const wxString&,int)
       SetItem__10wxListCtrlFliRC8wxStringT2
       ;wxListCtrl::SetItem(long,int,const wxString&,int)
       SetItem__10wxListCtrlFliRC8wxStringT2

+      ;wxListMainWindow::SetFocus()
+      SetFocus__16wxListMainWindowFv

       ;wxListMainWindow::InitScrolling()
       InitScrolling__16wxListMainWindowFv
       ;wxListItemData::GetY() const
       ;wxListMainWindow::InitScrolling()
       InitScrolling__16wxListMainWindowFv
       ;wxListItemData::GetY() const


@@ -8685,6 +9207,8 @@ EXPORTS
       GetBackgroundColour__10wxListCtrlCFv
       ;wxListLineData::GetAttr() const
       GetAttr__14wxListLineDataCFv
       GetBackgroundColour__10wxListCtrlCFv
       ;wxListLineData::GetAttr() const
       GetAttr__14wxListLineDataCFv

+      ;wxListMainWindow::Freeze()
+      Freeze__16wxListMainWindowFv

       ;wxListCtrl::CreateHeaderWindow()
       CreateHeaderWindow__10wxListCtrlFv
       ;wxListLineData::SetText(int,const wxString)
       ;wxListCtrl::CreateHeaderWindow()
       CreateHeaderWindow__10wxListCtrlFv
       ;wxListLineData::SetText(int,const wxString)


@@ -8742,8 +9266,6 @@ EXPORTS
       RefreshItems__10wxListCtrlFlT1
       ;wxListMainWindow::RefreshAfter(unsigned int)
       RefreshAfter__16wxListMainWindowFUi
       RefreshItems__10wxListCtrlFlT1
       ;wxListMainWindow::RefreshAfter(unsigned int)
       RefreshAfter__16wxListMainWindowFUi

-      ;wxListMainWindow::OnUnfocusLine(unsigned int)
-      OnUnfocusLine__16wxListMainWindowFUi

       ;wxListLineData::InitItems(int)
       InitItems__14wxListLineDataFi
       ;wxListMainWindow::GetLineY(unsigned int) const
       ;wxListLineData::InitItems(int)
       InitItems__14wxListLineDataFi
       ;wxListMainWindow::GetLineY(unsigned int) const


@@ -9007,6 +9529,8 @@ EXPORTS
       __dt__11wxLogWindowFv
       ;wxLogGui::Clear()
       Clear__8wxLogGuiFv
       __dt__11wxLogWindowFv
       ;wxLogGui::Clear()
       Clear__8wxLogGuiFv

+      ;wxVLogStatus(wxFrame*,const char*,char*)
+      wxVLogStatus__FP7wxFramePCcPc

       __vft8wxLogGui5wxLog
       ;wxLogDialog::OnOk(wxCommandEvent&)
       OnOk__11wxLogDialogFR14wxCommandEvent
       __vft8wxLogGui5wxLog
       ;wxLogDialog::OnOk(wxCommandEvent&)
       OnOk__11wxLogDialogFR14wxCommandEvent


@@ -9027,6 +9551,22 @@ EXPORTS
       ;wxLogWindow::wxLogWindow(wxFrame*,const char*,unsigned long,unsigned long)
       __ct__11wxLogWindowFP7wxFramePCcUlT3
   ;From object file:  ..\generic\numdlgg.cpp
       ;wxLogWindow::wxLogWindow(wxFrame*,const char*,unsigned long,unsigned long)
       __ct__11wxLogWindowFP7wxFramePCcUlT3
   ;From object file:  ..\generic\numdlgg.cpp

+    ;PUBDEFs (Symbols available from object file):
+      ;wxGetNumberFromUser(const wxString&,const wxString&,const wxString&,long,long,long,wxWindow*,const wxPoint&)
+      wxGetNumberFromUser__FRC8wxStringN21lN24P8wxWindowRC7wxPoint
+      ;wxNumberEntryDialog::GetEventTable() const
+      GetEventTable__19wxNumberEntryDialogCFv
+      ;wxNumberEntryDialog::sm_eventTableEntries
+      sm_eventTableEntries__19wxNumberEntryDialog
+      ;wxNumberEntryDialog::OnOK(wxCommandEvent&)
+      OnOK__19wxNumberEntryDialogFR14wxCommandEvent
+      ;wxNumberEntryDialog::wxNumberEntryDialog(wxWindow*,const wxString&,const wxString&,const wxString&,long,long,long,const wxPoint&)
+      __ct__19wxNumberEntryDialogFP8wxWindowRC8wxStringN22lN25RC7wxPoint
+      ;wxNumberEntryDialog::OnCancel(wxCommandEvent&)
+      OnCancel__19wxNumberEntryDialogFR14wxCommandEvent
+      __vft19wxNumberEntryDialog8wxObject
+      ;wxNumberEntryDialog::sm_eventTable
+      sm_eventTable__19wxNumberEntryDialog

   ;From object file:  ..\generic\panelg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPanel::OnSysColourChanged(wxSysColourChangedEvent&)
   ;From object file:  ..\generic\panelg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPanel::OnSysColourChanged(wxSysColourChangedEvent&)


@@ -9044,6 +9584,8 @@ EXPORTS
       __vft7wxPanel8wxObject
       ;wxPanel::GetEventTable() const
       GetEventTable__7wxPanelCFv
       __vft7wxPanel8wxObject
       ;wxPanel::GetEventTable() const
       GetEventTable__7wxPanelCFv

+      ;wxPanel::InitDialog()
+      InitDialog__7wxPanelFv

       ;wxPanel::OnChildFocus(wxChildFocusEvent&)
       OnChildFocus__7wxPanelFR17wxChildFocusEvent
       ;wxPanel::sm_eventTable
       ;wxPanel::OnChildFocus(wxChildFocusEvent&)
       OnChildFocus__7wxPanelFR17wxChildFocusEvent
       ;wxPanel::sm_eventTable


@@ -9260,6 +9802,8 @@ EXPORTS
       sm_eventTable__23wxGenericScrolledWindow
       ;wxAutoScrollTimer::wxAutoScrollTimer(wxWindow*,wxScrollHelper*,int,int,int)
       __ct__17wxAutoScrollTimerFP8wxWindowP14wxScrollHelperiN23
       sm_eventTable__23wxGenericScrolledWindow
       ;wxAutoScrollTimer::wxAutoScrollTimer(wxWindow*,wxScrollHelper*,int,int,int)
       __ct__17wxAutoScrollTimerFP8wxWindowP14wxScrollHelperiN23

+      ;wxScrollHelper::DoCalcUnscrolledPosition(int,int,int*,int*) const
+      DoCalcUnscrolledPosition__14wxScrollHelperCFiT1PiT3

       ;wxScrollHelper::HandleOnScroll(wxScrollWinEvent&)
       HandleOnScroll__14wxScrollHelperFR16wxScrollWinEvent
       __vft17wxAutoScrollTimer8wxObject
       ;wxScrollHelper::HandleOnScroll(wxScrollWinEvent&)
       HandleOnScroll__14wxScrollHelperFR16wxScrollWinEvent
       __vft17wxAutoScrollTimer8wxObject


@@ -9289,14 +9833,14 @@ EXPORTS
       ;wxScrollHelper::GetTargetWindow() const
       GetTargetWindow__14wxScrollHelperCFv
       __vft14wxScrollHelper
       ;wxScrollHelper::GetTargetWindow() const
       GetTargetWindow__14wxScrollHelperCFv
       __vft14wxScrollHelper

+      ;wxGenericScrolledWindow::Layout()
+      Layout__23wxGenericScrolledWindowFv

       ;wxGenericScrolledWindow::GetEventTable() const
       GetEventTable__23wxGenericScrolledWindowCFv
       ;wxGenericScrolledWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__23wxGenericScrolledWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxGenericScrolledWindow::GetEventTable() const
       GetEventTable__23wxGenericScrolledWindowCFv
       ;wxGenericScrolledWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__23wxGenericScrolledWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString

-      ;wxScrollHelper::CalcUnscrolledPosition(int,int,int*,int*) const
-      CalcUnscrolledPosition__14wxScrollHelperCFiT1PiT3
-      ;wxScrollHelper::CalcScrolledPosition(int,int,int*,int*) const
-      CalcScrolledPosition__14wxScrollHelperCFiT1PiT3
+      ;wxScrollHelper::DoCalcScrolledPosition(int,int,int*,int*) const
+      DoCalcScrolledPosition__14wxScrollHelperCFiT1PiT3

       ;wxScrollHelper::HandleOnMouseEnter(wxMouseEvent&)
       HandleOnMouseEnter__14wxScrollHelperFR12wxMouseEvent
       ;wxScrollHelper::HandleOnMouseLeave(wxMouseEvent&)
       ;wxScrollHelper::HandleOnMouseEnter(wxMouseEvent&)
       HandleOnMouseEnter__14wxScrollHelperFR12wxMouseEvent
       ;wxScrollHelper::HandleOnMouseLeave(wxMouseEvent&)


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

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

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


@@ -9345,6 +9887,8 @@ EXPORTS
       RemoveChild__16wxSplitterWindowFP12wxWindowBase
       ;wxSplitterWindow::ReplaceWindow(wxWindow*,wxWindow*)
       ReplaceWindow__16wxSplitterWindowFP8wxWindowT1
       RemoveChild__16wxSplitterWindowFP12wxWindowBase
       ;wxSplitterWindow::ReplaceWindow(wxWindow*,wxWindow*)
       ReplaceWindow__16wxSplitterWindowFP8wxWindowT1

+      ;wxSplitterWindow::AdjustSashPosition(int) const
+      AdjustSashPosition__16wxSplitterWindowCFi

       ;wxSplitterWindow::GetDefaultItem() const
       GetDefaultItem__16wxSplitterWindowCFv
       ;wxSplitterWindow::InitColours()
       ;wxSplitterWindow::GetDefaultItem() const
       GetDefaultItem__16wxSplitterWindowCFv
       ;wxSplitterWindow::InitColours()


@@ -9355,8 +9899,12 @@ EXPORTS
       OnFocus__16wxSplitterWindowFR12wxFocusEvent
       wxEVT_COMMAND_SPLITTER_UNSPLIT
       __vft16wxSplitterWindow8wxObject
       OnFocus__16wxSplitterWindowFR12wxFocusEvent
       wxEVT_COMMAND_SPLITTER_UNSPLIT
       __vft16wxSplitterWindow8wxObject

-      ;wxSplitterWindow::OnSetCursor(wxSetCursorEvent&)
-      OnSetCursor__16wxSplitterWindowFR16wxSetCursorEvent
+      ;wxSplitterWindow::DoSplit(wxSplitMode,wxWindow*,wxWindow*,int)
+      DoSplit__16wxSplitterWindowF11wxSplitModeP8wxWindowT2i
+      ;wxSplitterWindow::SetMinimumPaneSize(int)
+      SetMinimumPaneSize__16wxSplitterWindowFi
+      ;wxSplitterWindow::OnSashPositionChange(int)
+      OnSashPositionChange__16wxSplitterWindowFi

       ;wxSplitterWindow::DrawSashTracker(int,int)
       DrawSashTracker__16wxSplitterWindowFiT1
       ;wxConstructorForwxSplitterWindow()
       ;wxSplitterWindow::DrawSashTracker(int,int)
       DrawSashTracker__16wxSplitterWindowFiT1
       ;wxConstructorForwxSplitterWindow()


@@ -9366,16 +9914,14 @@ EXPORTS
       ;wxSplitterWindow::SetFocus()
       SetFocus__16wxSplitterWindowFv
       wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING
       ;wxSplitterWindow::SetFocus()
       SetFocus__16wxSplitterWindowFv
       wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING

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

       ;wxSplitterEvent::sm_classwxSplitterEvent
       sm_classwxSplitterEvent__15wxSplitterEvent
       ;wxSplitterEvent::sm_classwxSplitterEvent
       sm_classwxSplitterEvent__15wxSplitterEvent

-      ;wxSplitterWindow::SplitHorizontally(wxWindow*,wxWindow*,int)
-      SplitHorizontally__16wxSplitterWindowFP8wxWindowT1i
+      ;wxSplitterWindow::OnDoubleClickSash(int,int)
+      OnDoubleClickSash__16wxSplitterWindowFiT1
+      ;wxSplitterWindow::GetWindowSize() const
+      GetWindowSize__16wxSplitterWindowCFv

       ;wxSplitterWindow::SizeWindows()
       SizeWindows__16wxSplitterWindowFv
       ;wxSplitterWindow::SizeWindows()
       SizeWindows__16wxSplitterWindowFv

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

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


@@ -9383,10 +9929,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&)


@@ -9406,59 +9956,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)


@@ -9587,6 +10131,8 @@ EXPORTS
       OnOK__17wxTextEntryDialogFR14wxCommandEvent
       ;wxTextEntryDialog::sm_classwxTextEntryDialog
       sm_classwxTextEntryDialog__17wxTextEntryDialog
       OnOK__17wxTextEntryDialogFR14wxCommandEvent
       ;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


@@ -9617,41 +10163,6 @@ EXPORTS
       ;wxTipDialog::wxTipDialog(wxWindow*,wxTipProvider*,unsigned long)
       __ct__11wxTipDialogFP8wxWindowP13wxTipProviderUl
   ;From object file:  ..\generic\tipwin.cpp
       ;wxTipDialog::wxTipDialog(wxWindow*,wxTipProvider*,unsigned long)
       __ct__11wxTipDialogFP8wxWindowP13wxTipProviderUl
   ;From object file:  ..\generic\tipwin.cpp

-    ;PUBDEFs (Symbols available from object file):
-      ;wxTipWindow::OnKillFocus(wxFocusEvent&)
-      OnKillFocus__11wxTipWindowFR12wxFocusEvent
-      ;wxTipWindow::wxTipWindow(wxWindow*,const wxString&,int,wxTipWindow**)
-      __ct__11wxTipWindowFP8wxWindowRC8wxStringiPP11wxTipWindow
-      ;wxTipWindowView::sm_eventTable
-      sm_eventTable__15wxTipWindowView
-      ;wxTipWindowView::OnMouseClick(wxMouseEvent&)
-      OnMouseClick__15wxTipWindowViewFR12wxMouseEvent
-      __vft11wxTipWindow8wxObject
-      ;wxTipWindowView::GetEventTable() const
-      GetEventTable__15wxTipWindowViewCFv
-      ;wxTipWindow::OnMouseClick(wxMouseEvent&)
-      OnMouseClick__11wxTipWindowFR12wxMouseEvent
-      ;wxTipWindowView::OnKillFocus(wxFocusEvent&)
-      OnKillFocus__15wxTipWindowViewFR12wxFocusEvent
-      ;wxTipWindow::GetEventTable() const
-      GetEventTable__11wxTipWindowCFv
-      ;wxTipWindow::~wxTipWindow()
-      __dt__11wxTipWindowFv
-      ;wxTipWindow::sm_eventTable
-      sm_eventTable__11wxTipWindow
-      ;wxTipWindowView::OnPaint(wxPaintEvent&)
-      OnPaint__15wxTipWindowViewFR12wxPaintEvent
-      __vft15wxTipWindowView8wxObject
-      ;wxTipWindowView::wxTipWindowView(wxWindow*)
-      __ct__15wxTipWindowViewFP8wxWindow
-      ;wxTipWindow::sm_eventTableEntries
-      sm_eventTableEntries__11wxTipWindow
-      ;wxTipWindow::OnActivate(wxActivateEvent&)
-      OnActivate__11wxTipWindowFR15wxActivateEvent
-      ;wxTipWindowView::Adjust(const wxString&,int)
-      Adjust__15wxTipWindowViewFRC8wxStringi
-      ;wxTipWindowView::sm_eventTableEntries
-      sm_eventTableEntries__15wxTipWindowView

   ;From object file:  ..\generic\treectlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTreeRenameTimer::wxTreeRenameTimer(wxGenericTreeCtrl*)
   ;From object file:  ..\generic\treectlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTreeRenameTimer::wxTreeRenameTimer(wxGenericTreeCtrl*)


@@ -9723,8 +10234,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*)


@@ -9885,12 +10394,14 @@ 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::RefreshSelectedUnder(wxGenericTreeItem*)
       RefreshSelectedUnder__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem*,wxGenericTreeItem*)
       SelectItemRange__17wxGenericTreeCtrlFP17wxGenericTreeItemT1
       ;wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem*)
       RefreshSelectedUnder__17wxGenericTreeCtrlFP17wxGenericTreeItem

+      ;wxGenericTreeCtrl::RefreshLine(wxGenericTreeItem*)
+      RefreshLine__17wxGenericTreeCtrlFP17wxGenericTreeItem

       ;wxGenericTreeCtrl::DrawDropEffect(wxGenericTreeItem*)
       DrawDropEffect__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxTreeRenameTimer::Notify()
       ;wxGenericTreeCtrl::DrawDropEffect(wxGenericTreeItem*)
       DrawDropEffect__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxTreeRenameTimer::Notify()


@@ -9907,7 +10418,6 @@ EXPORTS
       ;wxGenericTreeCtrl::FillArray(wxGenericTreeItem*,wxArrayTreeItemIds&) const
       FillArray__17wxGenericTreeCtrlCFP17wxGenericTreeItemR18wxArrayTreeItemIds
   ;From object file:  ..\generic\treelay.cpp
       ;wxGenericTreeCtrl::FillArray(wxGenericTreeItem*,wxArrayTreeItemIds&) const
       FillArray__17wxGenericTreeCtrlCFP17wxGenericTreeItemR18wxArrayTreeItemIds
   ;From object file:  ..\generic\treelay.cpp

-  ;From object file:  ..\generic\wizard.cpp

   ;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&)


@@ -9998,6 +10508,7 @@ EXPORTS
       Insert__18wxHtmlBookRecArrayFRC16wxHtmlBookRecordUi
       ;wxHtmlBookRecArray::~wxHtmlBookRecArray()
       __dt__18wxHtmlBookRecArrayFv
       Insert__18wxHtmlBookRecArrayFRC16wxHtmlBookRecordUi
       ;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&)


@@ -10252,8 +10763,11 @@ EXPORTS
       SetEncoding__20wxHtmlEntitiesParserF14wxFontEncoding
       ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
       PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
       SetEncoding__20wxHtmlEntitiesParserF14wxFontEncoding
       ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
       PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString

+      ;wxHtmlParser::OpenURL(wxHtmlURLType,const wxString&) const
+      OpenURL__12wxHtmlParserCF13wxHtmlURLTypeRC8wxString

       ;wxHtmlTextPieces::RemoveAt(unsigned int)
       RemoveAt__16wxHtmlTextPiecesFUi
       ;wxHtmlTextPieces::RemoveAt(unsigned int)
       RemoveAt__16wxHtmlTextPiecesFUi

+      wxHtmlEntityCompare

       ;wxHtmlEntitiesParser::GetCharForCode(unsigned int)
       GetCharForCode__20wxHtmlEntitiesParserFUi
       ;wxHtmlParser::CreateDOMSubTree(wxHtmlTag*,int,int,wxHtmlTagsCache*)
       ;wxHtmlEntitiesParser::GetCharForCode(unsigned int)
       GetCharForCode__20wxHtmlEntitiesParserFUi
       ;wxHtmlParser::CreateDOMSubTree(wxHtmlTag*,int,int,wxHtmlTagsCache*)


@@ -10286,8 +10800,8 @@ EXPORTS
       ;wxHtmlTag::GetParam(const wxString&,unsigned long) const
       GetParam__9wxHtmlTagCFRC8wxStringUl
       __vft9wxHtmlTag8wxObject
       ;wxHtmlTag::GetParam(const wxString&,unsigned long) const
       GetParam__9wxHtmlTagCFRC8wxStringUl
       __vft9wxHtmlTag8wxObject

-      ;wxHtmlTag::ScanParam(const wxString&,char*,void*) const
-      ScanParam__9wxHtmlTagCFRC8wxStringPcPv
+      ;wxHtmlTag::ScanParam(const wxString&,const char*,void*) const
+      ScanParam__9wxHtmlTagCFRC8wxStringPCcPv

       ;wxHtmlTag::GetNextTag() const
       GetNextTag__9wxHtmlTagCFv
       ;wxHtmlTagsCache::wxHtmlTagsCache(const wxString&)
       ;wxHtmlTag::GetNextTag() const
       GetNextTag__9wxHtmlTagCFv
       ;wxHtmlTagsCache::wxHtmlTagsCache(const wxString&)


@@ -10342,10 +10856,12 @@ 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::Insert(const wxHtmlHistoryItem&,unsigned int)
       ;wxHtmlHistoryArray::Index(const wxHtmlHistoryItem&,unsigned long) const
       Index__18wxHtmlHistoryArrayCFRC17wxHtmlHistoryItemUl
       ;wxHtmlHistoryArray::Insert(const wxHtmlHistoryItem&,unsigned int)


@@ -10397,11 +10913,13 @@ EXPORTS
       ReadCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
       ;wxHtmlWindow::OnIdle(wxIdleEvent&)
       OnIdle__12wxHtmlWindowFR11wxIdleEvent
       ReadCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
       ;wxHtmlWindow::OnIdle(wxIdleEvent&)
       OnIdle__12wxHtmlWindowFR11wxIdleEvent

-      ;wxHtmlWindow::CreateLayout()
-      CreateLayout__12wxHtmlWindowFv
+      ;wxHtmlWindow::Init()
+      Init__12wxHtmlWindowFv

       ;wxConstructorForwxHtmlWindow()
       wxConstructorForwxHtmlWindow__Fv
       __vft12wxHtmlWindow14wxScrollHelper
       ;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


@@ -10413,14 +10931,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)


@@ -10543,19 +11061,23 @@ 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
       ;CoordArray::DoEmpty()
       DoEmpty__10CoordArrayFv
       ;HTML_ModuleImage::sm_classHTML_ModuleImage
       sm_classHTML_ModuleImage__16HTML_ModuleImage
       ;_link_dummy_func_m_image()
       _link_dummy_func_m_image__Fv
       ;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

+      ;wxHtmlImageCell::Layout(int)
+      Layout__15wxHtmlImageCellFi

       ;wxHtmlImageMapCell::GetLink(int,int) const
       GetLink__18wxHtmlImageMapCellCFiT1
       ;CoordArray::Index(const int&,unsigned long) const
       ;wxHtmlImageMapCell::GetLink(int,int) const
       GetLink__18wxHtmlImageMapCellCFiT1
       ;CoordArray::Index(const int&,unsigned long) const


@@ -10566,6 +11088,10 @@ EXPORTS
       Insert__10CoordArrayFRCiUi
       ;wxHtmlImageCell::GetLink(int,int) const
       GetLink__15wxHtmlImageCellCFiT1
       Insert__10CoordArrayFRCiUi
       ;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


@@ -10611,6 +11137,14 @@ 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)
   ;From object file:  ..\html\m_tables.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTableCell::ReallocRows(int)


@@ -10640,6 +11174,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*)


@@ -10682,8 +11218,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


@@ -10763,18 +11299,16 @@ 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
       ;wxMsgArray::Insert(const _QMSG&,unsigned int)
       Insert__10wxMsgArrayFRC5_QMSGUi
       ;wxApp::HandleSockets()
       HandleSockets__5wxAppFv

-      ;wxYieldIfNeeded()
-      wxYieldIfNeeded__Fv

       wxDEFAULT_MDIPARENTFRAME_ICON
       ;wxApp::wxApp()
       __ct__5wxAppFv
       wxDEFAULT_MDIPARENTFRAME_ICON
       ;wxApp::wxApp()
       __ct__5wxAppFv


@@ -10797,8 +11331,6 @@ EXPORTS
       RemoveSocketHandler__5wxAppFi
       ;wxMsgArray::DoEmpty()
       DoEmpty__10wxMsgArrayFv
       RemoveSocketHandler__5wxAppFi
       ;wxMsgArray::DoEmpty()
       DoEmpty__10wxMsgArrayFv

-      ;wxYield()
-      wxYield__Fv

       wxSTD_FRAME_ICON
       wxDEFAULT_FRAME_ICON
       ;wxApp::ProcessIdle()
       wxSTD_FRAME_ICON
       wxDEFAULT_FRAME_ICON
       ;wxApp::ProcessIdle()


@@ -10809,16 +11341,11 @@ EXPORTS
       Initialized__5wxAppFv
       ;wxApp::GetEventTable() const
       GetEventTable__5wxAppCFv
       Initialized__5wxAppFv
       ;wxApp::GetEventTable() const
       GetEventTable__5wxAppCFv

-      wxFrameClassNameNoRedraw

       ;wxSetInstance(unsigned long)
       wxSetInstance__FUl
       ;wxMsgArray::RemoveAt(unsigned int)
       RemoveAt__10wxMsgArrayFUi
       ;wxSetInstance(unsigned long)
       wxSetInstance__FUl
       ;wxMsgArray::RemoveAt(unsigned int)
       RemoveAt__10wxMsgArrayFUi

-      wxMDIChildFrameClassName

       wxGetInstance
       wxGetInstance

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

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


@@ -10828,7 +11355,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


@@ -10838,7 +11364,6 @@ EXPORTS
       Initialize__5wxAppFUl
       ;wxAppBase::m_appInitFn
       m_appInitFn__9wxAppBase
       Initialize__5wxAppFUl
       ;wxAppBase::m_appInitFn
       m_appInitFn__9wxAppBase

-      wxCanvasClassName

       ;wxApp::DoMessage()
       DoMessage__5wxAppFv
       ;wxExit()
       ;wxApp::DoMessage()
       DoMessage__5wxAppFv
       ;wxExit()


@@ -10849,7 +11374,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


@@ -10900,8 +11424,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


@@ -10944,8 +11466,8 @@ EXPORTS
       wxConstructorForwxBitmap__Fv
       ;wxConstructorForwxMask()
       wxConstructorForwxMask__Fv
       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


@@ -11013,6 +11535,12 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxButton::Command(wxCommandEvent&)
       Command__8wxButtonFR14wxCommandEvent
     ;PUBDEFs (Symbols available from object file):
       ;wxButton::Command(wxCommandEvent&)
       Command__8wxButtonFR14wxCommandEvent

+      ;wxButton::MakeOwnerDrawn()
+      MakeOwnerDrawn__8wxButtonFv
+      ;wxButton::WindowProc(unsigned int,void*,void*)
+      WindowProc__8wxButtonFUiPvT2
+      ;wxButton::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__8wxButtonCFlPUl

       ;wxButton::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
       OnCtlColor__8wxButtonFUlT1UiT3PvT5
       ;wxButton::~wxButton()
       ;wxButton::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
       OnCtlColor__8wxButtonFUlT1UiT3PvT5
       ;wxButton::~wxButton()


@@ -11052,8 +11580,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


@@ -11147,6 +11673,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&)


@@ -11215,12 +11743,12 @@ EXPORTS
       __vft8wxColour8wxObject
       ;wxColour::wxColour(unsigned char,unsigned char,unsigned char)
       __ct__8wxColourFUcN21
       __vft8wxColour8wxObject
       ;wxColour::wxColour(unsigned char,unsigned char,unsigned char)
       __ct__8wxColourFUcN21

-      ;wxColour::wxColour(const wxColour&)
-      __ct__8wxColourFRC8wxColour
-      ;wxColour::sm_classwxColour
-      sm_classwxColour__8wxColour

       ;wxColour::~wxColour()
       __dt__8wxColourFv
       ;wxColour::~wxColour()
       __dt__8wxColourFv

+      ;wxColour::sm_classwxColour
+      sm_classwxColour__8wxColour
+      ;wxColour::wxColour(const wxColour&)
+      __ct__8wxColourFRC8wxColour

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


@@ -11238,12 +11766,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)


@@ -11256,22 +11787,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&)


@@ -11284,6 +11816,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


@@ -11291,6 +11825,8 @@ 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):

+      ;wxCursor::wxCursor(const wxImage&)
+      __ct__8wxCursorFRC7wxImage

       ;wxCursorRefData::~wxCursorRefData()
       __dt__15wxCursorRefDataFv
       ;wxCursor::wxCursor(const wxString&,long,int,int)
       ;wxCursorRefData::~wxCursorRefData()
       __dt__15wxCursorRefDataFv
       ;wxCursor::wxCursor(const wxString&,long,int,int)


@@ -11341,12 +11877,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


@@ -11356,12 +11895,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


@@ -11380,9 +11919,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


@@ -11396,17 +11938,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


@@ -11415,6 +11958,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()


@@ -11617,6 +12161,8 @@ EXPORTS
       DoCopy__13wxArrayDCInfoFRC13wxArrayDCInfo
       ;wxArrayDCInfo::Add(const wxPaintDCInfo&)
       Add__13wxArrayDCInfoFRC13wxPaintDCInfo
       DoCopy__13wxArrayDCInfoFRC13wxArrayDCInfo
       ;wxArrayDCInfo::Add(const wxPaintDCInfo&)
       Add__13wxArrayDCInfoFRC13wxPaintDCInfo

+      ;wxWindowDC::DoGetSize(int*,int*) const
+      DoGetSize__10wxWindowDCCFPiT1

       ;wxPaintDC::wxPaintDC()
       __ct__9wxPaintDCFv
       ;wxArrayDCInfo::operator=(const wxArrayDCInfo&)
       ;wxPaintDC::wxPaintDC()
       __ct__9wxPaintDCFv
       ;wxArrayDCInfo::operator=(const wxArrayDCInfo&)


@@ -11625,6 +12171,7 @@ EXPORTS
       __ct__10wxClientDCFP8wxWindow
       ;wxPaintDC::FindDCInCache(wxWindow*)
       FindDCInCache__9wxPaintDCFP8wxWindow
       __ct__10wxClientDCFP8wxWindow
       ;wxPaintDC::FindDCInCache(wxWindow*)
       FindDCInCache__9wxPaintDCFP8wxWindow

+      __vft10wxWindowDC8wxObject

       ;wxArrayDCInfo::Insert(const wxPaintDCInfo&,unsigned int)
       Insert__13wxArrayDCInfoFRC13wxPaintDCInfoUi
       ;wxConstructorForwxWindowDC()
       ;wxArrayDCInfo::Insert(const wxPaintDCInfo&,unsigned int)
       Insert__13wxArrayDCInfoFRC13wxPaintDCInfoUi
       ;wxConstructorForwxWindowDC()


@@ -11651,6 +12198,8 @@ EXPORTS
       sm_classwxPaintDC__9wxPaintDC
       __vft10wxClientDC8wxObject
       __vft9wxPaintDC8wxObject
       sm_classwxPaintDC__9wxPaintDC
       __vft10wxClientDC8wxObject
       __vft9wxPaintDC8wxObject

+      ;wxClientDC::DoGetSize(int*,int*) const
+      DoGetSize__10wxClientDCCFPiT1

       ;wxArrayDCInfo::~wxArrayDCInfo()
       __dt__13wxArrayDCInfoFv
       ;wxConstructorForwxClientDC()
       ;wxArrayDCInfo::~wxArrayDCInfo()
       __dt__13wxArrayDCInfoFv
       ;wxConstructorForwxClientDC()


@@ -11718,6 +12267,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()


@@ -11728,10 +12280,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&)


@@ -11745,8 +12293,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()


@@ -11760,10 +12306,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&)


@@ -11778,7 +12320,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


@@ -11809,15 +12350,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)


@@ -11869,12 +12401,18 @@ EXPORTS
       sm_classwxFileDialog__12wxFileDialog
   ;From object file:  ..\os2\font.cpp
     ;PUBDEFs (Symbols available from object file):
       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


@@ -11883,9 +12421,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()


@@ -11894,6 +12438,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)


@@ -11902,27 +12448,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()


@@ -11931,10 +12501,14 @@ 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()
   ;From object file:  ..\os2\fontdlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxConstructorForwxFontDialog()


@@ -11967,113 +12541,99 @@ 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
+      ;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):

-      ;wxFrameOS2::OS2Create(int,wxWindow*,const char*,wxWindow*,const char*,int,int,int,int,long)
-      OS2Create__10wxFrameOS2FiP8wxWindowPCcT2T3N41l
-      ;wxFrameOS2::OnActivate(wxActivateEvent&)
-      OnActivate__10wxFrameOS2FR15wxActivateEvent
-      ;wxFrameOS2::Iconize(unsigned long)
-      Iconize__10wxFrameOS2FUl
-      ;wxFrameOS2::DoSetClientSize(int,int)
-      DoSetClientSize__10wxFrameOS2FiT1
-      ;wxFrameOS2::HandleSize(int,int,unsigned int)
-      HandleSize__10wxFrameOS2FiT1Ui
-      ;wxFrameOS2::Restore()
-      Restore__10wxFrameOS2Fv
-      ;wxFrameOS2::sm_eventTableEntries
-      sm_eventTableEntries__10wxFrameOS2
-      ;wxFrameOS2::m_bUseNativeStatusBar
-      m_bUseNativeStatusBar__10wxFrameOS2
-      ;wxFrameOS2::IsIconized() const
-      IsIconized__10wxFrameOS2CFv
-      ;wxFrameOS2::HandlePaint()
-      HandlePaint__10wxFrameOS2Fv
-      ;wxFrameOS2::DetachMenuBar()
-      DetachMenuBar__10wxFrameOS2Fv
-      ;wxFrameOS2::CreateToolBar(long,int,const wxString&)
-      CreateToolBar__10wxFrameOS2FliRC8wxString
-      ;wxFrameOS2::Maximize(unsigned long)
-      Maximize__10wxFrameOS2FUl
-      ;wxFrameOS2::OnSysColourChanged(wxSysColourChangedEvent&)
-      OnSysColourChanged__10wxFrameOS2FR23wxSysColourChangedEvent
-      ;wxFrameOS2::HandleMenuSelect(unsigned short,unsigned short,unsigned long)
-      HandleMenuSelect__10wxFrameOS2FUsT1Ul
-      ;wxFrameOS2::HandleCommand(unsigned short,unsigned short,unsigned long)
-      HandleCommand__10wxFrameOS2FUsT1Ul
-      ;wxFrameOS2::DoGetClientSize(int*,int*) const
-      DoGetClientSize__10wxFrameOS2CFPiT1
-      ;wxFrameOS2::DoGetSize(int*,int*) const
-      DoGetSize__10wxFrameOS2CFPiT1
-      ;wxFrameOS2::~wxFrameOS2()
-      __dt__10wxFrameOS2Fv
+      ;wxFrame::HandleMenuSelect(unsigned short,unsigned short,unsigned long)
+      HandleMenuSelect__7wxFrameFUsT1Ul
+      ;wxFrame::OS2TranslateMessage(void**)
+      OS2TranslateMessage__7wxFrameFPPv
+      ;wxFrame::HandlePaint()
+      HandlePaint__7wxFrameFv
+      ;wxFrame::OnCreateStatusBar(int,long,int,const wxString&)
+      OnCreateStatusBar__7wxFrameFilT1RC8wxString
+      ;wxFrame::OnActivate(wxActivateEvent&)
+      OnActivate__7wxFrameFR15wxActivateEvent
+      __vft7wxFrame8wxObject
+      ;wxFrame::DoSetClientSize(int,int)
+      DoSetClientSize__7wxFrameFiT1
+      ;wxFrame::HandleSize(int,int,unsigned int)
+      HandleSize__7wxFrameFiT1Ui

       ;wxConstructorForwxFrame()
       wxConstructorForwxFrame__Fv
       ;wxConstructorForwxFrame()
       wxConstructorForwxFrame__Fv

-      ;wxFrameOS2::InternalSetMenuBar()
-      InternalSetMenuBar__10wxFrameOS2Fv
-      ;wxFrameOS2::GetClient()
-      GetClient__10wxFrameOS2Fv
-      ;wxFrameOS2::AttachMenuBar(wxMenuBar*)
-      AttachMenuBar__10wxFrameOS2FP9wxMenuBar
-      ;wxFrameOS2::SetClient(wxWindow*)
-      SetClient__10wxFrameOS2FP8wxWindow
-      ;wxFrameOS2::ShowFullScreen(unsigned long,long)
-      ShowFullScreen__10wxFrameOS2FUll
-      ;wxFrameOS2::SetClient(unsigned long)
-      SetClient__10wxFrameOS2FUl
-      ;wxFrameOS2::IconizeChildFrames(unsigned long)
-      IconizeChildFrames__10wxFrameOS2FUl
+      ;wxFrame::Raise()
+      Raise__7wxFrameFv
+      ;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::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_classwxFrame
       sm_classwxFrame__7wxFrame

-      ;wxFrameOS2::GetEventTable() const
-      GetEventTable__10wxFrameOS2CFv
-      ;wxFrameOS2::SetMenuBar(wxMenuBar*)
-      SetMenuBar__10wxFrameOS2FP9wxMenuBar
-      ;wxFrameOS2::PositionStatusBar()
-      PositionStatusBar__10wxFrameOS2Fv
-      ;wxFrameOS2::OS2WindowProc(unsigned int,void*,void*)
-      OS2WindowProc__10wxFrameOS2FUiPvT2
-      ;wxFrameOS2::OS2TranslateMessage(void**)
-      OS2TranslateMessage__10wxFrameOS2FPPv
-      ;wxFrameOS2::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
-      Create__10wxFrameOS2FP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
-      ;wxFrameOS2::Show(unsigned long)
-      Show__10wxFrameOS2FUl
-      __vft10wxFrameOS28wxObject
-      ;wxFrameOS2::DoShowWindow(int)
-      DoShowWindow__10wxFrameOS2Fi
-      ;wxFrameOS2::Init()
-      Init__10wxFrameOS2Fv
-      ;wxFrameOS2::sm_eventTable
-      sm_eventTable__10wxFrameOS2
-      ;wxFrameOS2::DoGetPosition(int*,int*) const
-      DoGetPosition__10wxFrameOS2CFPiT1
-      ;wxFrameOS2::IsMaximized() const
-      IsMaximized__10wxFrameOS2CFv
-      ;wxFrameOS2::SetIcon(const wxIcon&)
-      SetIcon__10wxFrameOS2FRC6wxIcon
-      ;wxFrameOS2::PositionToolBar()
-      PositionToolBar__10wxFrameOS2Fv
-      ;wxFrameOS2::GetClientAreaOrigin() const
-      GetClientAreaOrigin__10wxFrameOS2CFv
-      ;wxFrameOS2::OnCreateStatusBar(int,long,int,const wxString&)
-      OnCreateStatusBar__10wxFrameOS2FilT1RC8wxString
-      wxFrameWndProc
+      ;wxFrame::~wxFrame()
+      __dt__7wxFrameFv
+      ;wxFrame::GetClient()
+      GetClient__7wxFrameFv
+      ;wxFrame::HandleCommand(unsigned short,unsigned short,unsigned long)
+      HandleCommand__7wxFrameFUsT1Ul
+      ;wxFrame::PositionStatusBar()
+      PositionStatusBar__7wxFrameFv
+      ;wxFrame::PositionToolBar()
+      PositionToolBar__7wxFrameFv
+      ;wxFrame::OS2WindowProc(unsigned int,void*,void*)
+      OS2WindowProc__7wxFrameFUiPvT2
+      ;wxFrame::InternalSetMenuBar()
+      InternalSetMenuBar__7wxFrameFv
+      ;wxFrame::GetDefaultIcon() const
+      GetDefaultIcon__7wxFrameCFv
+      ;wxFrame::CreateToolBar(long,int,const wxString&)
+      CreateToolBar__7wxFrameFliRC8wxString
+      ;wxFrame::IconizeChildFrames(unsigned long)
+      IconizeChildFrames__7wxFrameFUl
+      ;wxFrame::SetClient(unsigned long)
+      SetClient__7wxFrameFUl
+      ;wxFrame::DoGetClientSize(int*,int*) const
+      DoGetClientSize__7wxFrameCFPiT1
+      ;wxFrame::Init()
+      Init__7wxFrameFv
+      ;wxFrame::SetMenuBar(wxMenuBar*)
+      SetMenuBar__7wxFrameFP9wxMenuBar
+      ;wxFrame::GetEventTable() const
+      GetEventTable__7wxFrameCFv
+      ;wxFrame::DetachMenuBar()
+      DetachMenuBar__7wxFrameFv

       wxFrameMainWndProc
       wxFrameMainWndProc

+      wxFrameWndProc
+      ;wxFrame::SetClient(wxWindow*)
+      SetClient__7wxFrameFP8wxWindow

   ;From object file:  ..\os2\gauge.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft7wxGauge8wxObject
   ;From object file:  ..\os2\gauge.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft7wxGauge8wxObject


@@ -12083,6 +12643,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&)


@@ -12091,16 +12652,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


@@ -12437,16 +12998,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&)


@@ -12685,25 +13242,35 @@ EXPORTS
       GetRealId__10wxMenuItemCFv
       ;wxMenuItem::SetCheckable(unsigned long)
       SetCheckable__10wxMenuItemFUl
       GetRealId__10wxMenuItemCFv
       ;wxMenuItem::SetCheckable(unsigned long)
       SetCheckable__10wxMenuItemFUl

-      ;wxMenuItemBase::New(wxMenu*,int,const wxString&,const wxString&,unsigned long,wxMenu*)
-      New__14wxMenuItemBaseFP6wxMenuiRC8wxStringT3UlT1
+      ;wxMenuItem::SetRadioGroupEnd(int)
+      SetRadioGroupEnd__10wxMenuItemFi

       ;wxMenuItem::IsChecked() const
       IsChecked__10wxMenuItemCFv
       ;wxMenuItem::IsChecked() const
       IsChecked__10wxMenuItemCFv

+      ;wxMenuItem::SetAsRadioGroupStart()
+      SetAsRadioGroupStart__10wxMenuItemFv

       ;wxMenuItemBase::GetLabelFromText(const wxString&)
       GetLabelFromText__14wxMenuItemBaseFRC8wxString
       ;wxMenuItem::SetText(const wxString&)
       SetText__10wxMenuItemFRC8wxString
       ;wxMenuItemBase::GetLabelFromText(const wxString&)
       GetLabelFromText__14wxMenuItemBaseFRC8wxString
       ;wxMenuItem::SetText(const wxString&)
       SetText__10wxMenuItemFRC8wxString

+      ;wxMenuItemBase::New(wxMenu*,int,const wxString&,const wxString&,wxItemKind,wxMenu*)
+      New__14wxMenuItemBaseFP6wxMenuiRC8wxStringT310wxItemKindT1
+      ;wxMenuItem::wxMenuItem(wxMenu*,int,const wxString&,const wxString&,wxItemKind,wxMenu*)
+      __ct__10wxMenuItemFP6wxMenuiRC8wxStringT310wxItemKindT1

       ;wxMenuItem::Check(unsigned long)
       Check__10wxMenuItemFUl
       __vft10wxMenuItem8wxObject
       ;wxMenuItem::wxMenuItem(wxMenu*,int,const wxString&,const wxString&,unsigned long,wxMenu*)
       __ct__10wxMenuItemFP6wxMenuiRC8wxStringT3UlT1
       ;wxMenuItem::Check(unsigned long)
       Check__10wxMenuItemFUl
       __vft10wxMenuItem8wxObject
       ;wxMenuItem::wxMenuItem(wxMenu*,int,const wxString&,const wxString&,unsigned long,wxMenu*)
       __ct__10wxMenuItemFP6wxMenuiRC8wxStringT3UlT1

+      ;wxMenuItem::SetRadioGroupStart(int)
+      SetRadioGroupStart__10wxMenuItemFi

       ;wxConstructorForwxMenuItem()
       wxConstructorForwxMenuItem__Fv
       ;wxMenuItem::~wxMenuItem()
       __dt__10wxMenuItemFv
       ;wxMenuItem::Enable(unsigned long)
       Enable__10wxMenuItemFUl
       ;wxConstructorForwxMenuItem()
       wxConstructorForwxMenuItem__Fv
       ;wxMenuItem::~wxMenuItem()
       __dt__10wxMenuItemFv
       ;wxMenuItem::Enable(unsigned long)
       Enable__10wxMenuItemFUl

+      ;wxMenuItem::Init()
+      Init__10wxMenuItemFv

       __vft10wxMenuItem12wxOwnerDrawn
   ;From object file:  ..\os2\metafile.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft10wxMenuItem12wxOwnerDrawn
   ;From object file:  ..\os2\metafile.cpp
     ;PUBDEFs (Symbols available from object file):


@@ -13057,38 +13624,40 @@ 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::GetColumnCount() const
       GetColumnCount__10wxRadioBoxCFv
       ;wxRadioBox::SetFocus()
       SetFocus__10wxRadioBoxFv
       ;wxRadioBox::OS2Command(unsigned int,unsigned short)
       OS2Command__10wxRadioBoxFUiUs

-      ;wxRadioBox::SetLabel(int,wxBitmap*)
-      SetLabel__10wxRadioBoxFiP8wxBitmap

       ;wxRadioBox::SubclassRadioButton(unsigned long)
       SubclassRadioButton__10wxRadioBoxFUl
       __vft10wxRadioBox14wxRadioBoxBase
       ;wxRadioBox::SubclassRadioButton(unsigned long)
       SubclassRadioButton__10wxRadioBoxFUl
       __vft10wxRadioBox14wxRadioBoxBase


@@ -13104,39 +13673,50 @@ EXPORTS
       Create__10wxRadioBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizeT2PC8wxStringT2lRC11wxValidatorT3
       ;wxRadioBox::FindString(const wxString&) const
       FindString__10wxRadioBoxCFRC8wxString
       Create__10wxRadioBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizeT2PC8wxStringT2lRC11wxValidatorT3
       ;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::GetCount() const
-      GetCount__10wxRadioBoxCFv

       ;wxRadioBox::~wxRadioBox()
       __dt__10wxRadioBoxFv
       ;wxRadioBox::GetNumVer() const
       GetNumVer__10wxRadioBoxCFv
       ;wxRadioBox::~wxRadioBox()
       __dt__10wxRadioBoxFv
       ;wxRadioBox::GetNumVer() const
       GetNumVer__10wxRadioBoxCFv

-      ;wxRadioBtnWndProc(unsigned long,unsigned int,void*,void*)
-      wxRadioBtnWndProc__FUlUiPvT3
-      ;wxRadioBox::Show(int,unsigned long)
-      Show__10wxRadioBoxFiUl
+      ;wxRadioBox::GetCount() const
+      GetCount__10wxRadioBoxCFv

       ;wxRadioBox::Command(wxCommandEvent&)
       Command__10wxRadioBoxFR14wxCommandEvent
       ;wxRadioBox::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::WindowProc(unsigned int,void*,void*)
+      WindowProc__10wxRadioBoxFUiPvT2

       ;wxRadioBox::SetString(int,const wxString&)
       SetString__10wxRadioBoxFiRC8wxString
       ;wxRadioBox::SetString(int,const wxString&)
       SetString__10wxRadioBoxFiRC8wxString

-      ;wxRadioBox::SetLabel(int,const wxString&)
-      SetLabel__10wxRadioBoxFiRC8wxString
+      wxRadioBtnWndProc

   ;From object file:  ..\os2\radiobut.cpp
     ;PUBDEFs (Symbols available from object file):
   ;From object file:  ..\os2\radiobut.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxRadioButton::SetFocus()
+      SetFocus__13wxRadioButtonFv

       ;wxRadioButton::sm_classwxRadioButton
       sm_classwxRadioButton__13wxRadioButton
       ;wxRadioButton::OS2Command(unsigned int,unsigned short)
       OS2Command__13wxRadioButtonFUiUs
       ;wxRadioButton::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
       __vft13wxRadioButton8wxObject
       ;wxRadioButton::Command(wxCommandEvent&)
       Command__13wxRadioButtonFR14wxCommandEvent
       __vft13wxRadioButton8wxObject


@@ -13152,16 +13732,22 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxRegion::Combine(const wxRect&,wxRegionOp)
       Combine__8wxRegionFRC6wxRect10wxRegionOp
     ;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()


@@ -13207,11 +13793,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


@@ -13253,23 +13839,27 @@ EXPORTS
       sm_classwxSystemSettingsModule__22wxSystemSettingsModule
       ;wxSystemSettingsModule::OnInit()
       OnInit__22wxSystemSettingsModuleFv
       sm_classwxSystemSettingsModule__22wxSystemSettingsModule
       ;wxSystemSettingsModule::OnInit()
       OnInit__22wxSystemSettingsModuleFv

+      ;wxSystemSettingsNative::GetFont(wxSystemFont)
+      GetFont__22wxSystemSettingsNativeF12wxSystemFont

       __vft22wxSystemSettingsModule8wxObject
       __vft22wxSystemSettingsModule8wxObject

-      ;wxSystemSettings::GetSystemColour(int)
-      GetSystemColour__16wxSystemSettingsFi
-      ;wxSystemSettings::GetSystemMetric(int)
-      GetSystemMetric__16wxSystemSettingsFi
+      ;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::GetSystemFont(int)
-      GetSystemFont__16wxSystemSettingsFi
+      ;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)


@@ -13280,8 +13870,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


@@ -13305,6 +13893,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()


@@ -13321,10 +13911,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


@@ -13339,13 +13929,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()


@@ -13360,27 +13948,44 @@ 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::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&)


@@ -13406,31 +14011,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&)


@@ -13450,8 +14049,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


@@ -13623,13 +14225,17 @@ 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&)
       ;wxTextCtrl::OnUpdateCopy(wxUpdateUIEvent&)
       OnUpdateCopy__10wxTextCtrlFR15wxUpdateUIEvent
       ;wxTextCtrl::OnCut(wxCommandEvent&)


@@ -13666,6 +14272,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


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

-      ;wxThread::Create()
-      Create__8wxThreadFv

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


@@ -13788,13 +14394,11 @@ EXPORTS
       TryLock__7wxMutexFv
       ;wxThread::This()
       This__8wxThreadFv
       TryLock__7wxMutexFv
       ;wxThread::This()
       This__8wxThreadFv

-      ;wxThreadInternal::Create(wxThread*)
-      Create__16wxThreadInternalFP8wxThread
+      ;wxThread::Sleep(unsigned long)
+      Sleep__8wxThreadFUl

       __vft8wxThread
       ;wxThread::wxThread(wxThreadKind)
       __ct__8wxThreadF12wxThreadKind
       __vft8wxThread
       ;wxThread::wxThread(wxThreadKind)
       __ct__8wxThreadF12wxThreadKind

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

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


@@ -13814,6 +14418,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()


@@ -13928,6 +14536,51 @@ EXPORTS
       Remove__9wxToolTipFv
       ;wxToolTip::hwndTT
       hwndTT__9wxToolTip
       Remove__9wxToolTipFv
       ;wxToolTip::hwndTT
       hwndTT__9wxToolTip

+  ;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::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::Iconize(unsigned long)
+      Iconize__19wxTopLevelWindowOS2FUl
+      ;wxTopLevelWindowOS2::DoSetClientSize(int,int)
+      DoSetClientSize__19wxTopLevelWindowOS2FiT1
+      ;wxTopLevelWindowOS2::IsMaximized() const
+      IsMaximized__19wxTopLevelWindowOS2CFv
+      ;wxTopLevelWindowOS2::SetIcon(const wxIcon&)
+      SetIcon__19wxTopLevelWindowOS2FRC6wxIcon
+      ;wxTopLevelWindowOS2::Restore()
+      Restore__19wxTopLevelWindowOS2Fv
+      ;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::IsIconized() const
+      IsIconized__19wxTopLevelWindowOS2CFv
+      ;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


@@ -13949,8 +14602,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&)


@@ -13969,8 +14620,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*)


@@ -13986,12 +14635,12 @@ 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()
       ;wxKill(long,wxSignal,wxKillError*)
       wxKill__Fl8wxSignalP11wxKillError
       ;wxBell()


@@ -14018,13 +14667,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)


@@ -14052,6 +14701,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*)


@@ -14068,6 +14719,10 @@ EXPORTS
       HandleMouseMove__8wxWindowFiT1Ui
       ;wxWindow::Raise()
       Raise__8wxWindowFv
       HandleMouseMove__8wxWindowFiT1Ui
       ;wxWindow::Raise()
       Raise__8wxWindowFv

+      ;wxWindowCreationHook::~wxWindowCreationHook()
+      __dt__20wxWindowCreationHookFv
+      ;wxWindow::Update()
+      Update__8wxWindowFv

       ;wxWindow::UnsubclassWin()
       UnsubclassWin__8wxWindowFv
       ;wxWindow::Lower()
       ;wxWindow::UnsubclassWin()
       UnsubclassWin__8wxWindowFv
       ;wxWindow::Lower()


@@ -14076,8 +14731,12 @@ EXPORTS
       HandleMaximize__8wxWindowFv
       ;wxWindow::HandleDestroy()
       HandleDestroy__8wxWindowFv
       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*)


@@ -14086,6 +14745,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*)


@@ -14112,27 +14773,25 @@ EXPORTS
       GetCapture__12wxWindowBaseFv
       ;wxWindow::SetFocus()
       SetFocus__8wxWindowFv
       GetCapture__12wxWindowBaseFv
       ;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::IsMouseInWindow() const
+      IsMouseInWindow__8wxWindowCFv
+      ;wxWindow::HandleKeyUp(unsigned long,void*)
+      HandleKeyUp__8wxWindowFUlPv

       ;wxWindow::HandleKeyDown(unsigned short,void*)
       HandleKeyDown__8wxWindowFUsPv
       ;wxWindow::Clear()
       Clear__8wxWindowFv
       ;wxWindow::HandleKeyDown(unsigned short,void*)
       HandleKeyDown__8wxWindowFUsPv
       ;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::Enable(unsigned long)
       Enable__8wxWindowFUl
       wxWinHandleList
       ;wxWindow::Enable(unsigned long)
       Enable__8wxWindowFUl
       wxWinHandleList


@@ -14185,6 +14844,10 @@ EXPORTS
       ;wxAssociateWinWithHandle(unsigned long,wxWindow*)
       wxAssociateWinWithHandle__FUlP8wxWindow
       s_currentMsg
       ;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)


@@ -14210,6 +14873,8 @@ 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)
       ;wxWindow::HandleShow(unsigned long,int)
       HandleShow__8wxWindowFUli
       ;wxWindow::HandleMove(int,int)


@@ -14228,10 +14893,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()


@@ -14258,47 +14929,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::HandleChar(unsigned long,void*,unsigned long)
+      HandleChar__8wxWindowFUlPvT1

       ;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