A few tweaks and cleanups

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

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index 4c284cf302250aeab6e6d0e92a2e1f9d46f0dffb..c4f7f11547cb50d9bd35a270c42bf740416e5e05 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,10 +4,53 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
 CODE LOADONCALL
 
 EXPORTS

-;From library:  H:\Dev\Wx2\WxWindows\lib\wx.lib
+;From library:  F:\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*)
   ;From object file:  ..\common\appcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxOnAssert(const char*,int,const char*)


@@ -856,147 +899,6 @@ EXPORTS
       __ls__18wxDataOutputStreamFi
       ;wxDataOutputStream::operator<<(const wxString&)
       __ls__18wxDataOutputStreamFRC8wxString
       __ls__18wxDataOutputStreamFi
       ;wxDataOutputStream::operator<<(const wxString&)
       __ls__18wxDataOutputStreamFRC8wxString

-  ;From object file:  ..\common\dbtable.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxDbTable::bindParams(unsigned long)
-      bindParams__9wxDbTableFUl
-      ;wxDbTable::ClearMemberVar(unsigned short,unsigned long)
-      ClearMemberVar__9wxDbTableFUsUl
-      ;wxDbTable::BuildSelectStmt(char*,int,unsigned long)
-      BuildSelectStmt__9wxDbTableFPciUl
-      ;wxDbTable::GetNewCursor(unsigned long,unsigned long)
-      GetNewCursor__9wxDbTableFUlT1
-      __vft9wxDbTable
-      ;wxDbTable::operator--(int)
-      __mm__9wxDbTableFi
-      ;wxDbTable::GetCol(const int) const
-      GetCol__9wxDbTableCFCi
-      ;wxDbTable::wxDbTable(wxDb*,const wxString&,const unsigned short,const wxString&,unsigned long,const wxString&)
-      __ct__9wxDbTableFP4wxDbRC8wxStringCUsT2UlT2
-      ;wxDbTable::SetCursor(void**)
-      SetCursor__9wxDbTableFPPv
-      ;wxDbTable::CreateIndex(const wxString&,unsigned long,unsigned short,wxDbIdxDef*,unsigned long)
-      CreateIndex__9wxDbTableFRC8wxStringUlUsP10wxDbIdxDefT2
-      ;wxDbTable::query(int,unsigned long,unsigned long,const wxString&)
-      query__9wxDbTableFiUlT2RC8wxString
-      ;wxDbTable::SetRowMode(const wxDbTable::rowmode_t)
-      SetRowMode__9wxDbTableFCQ2_9wxDbTable9rowmode_t
-      ;wxDbTable::Open(unsigned long,unsigned long)
-      Open__9wxDbTableFUlT1
-      TablesInUse
-      ;wxDbTable::Query(unsigned long,unsigned long)
-      Query__9wxDbTableFUlT1
-      ;wxDbTable::QueryMatching(unsigned long,unsigned long)
-      QueryMatching__9wxDbTableFUlT1
-      ;wxDbColDef::wxDbColDef()
-      __ct__10wxDbColDefFv
-      ;wxDbTable::cleanup()
-      cleanup__9wxDbTableFv
-      ;wxDbTable::~wxDbTable()
-      __dt__9wxDbTableFv
-      ;wxDbTable::GetLast()
-      GetLast__9wxDbTableFv
-      ;wxDbTable::DeleteMatching()
-      DeleteMatching__9wxDbTableFv
-      ;wxDbTable::CanUpdByROWID()
-      CanUpdByROWID__9wxDbTableFv
-      ;wxDbTable::BuildDeleteStmt(char*,int,const wxString&)
-      BuildDeleteStmt__9wxDbTableFPciRC8wxString
-      ;wxDbTable::Update(const wxString&)
-      Update__9wxDbTableFRC8wxString
-      ;wxDbTable::UpdateWhere(const wxString&)
-      UpdateWhere__9wxDbTableFRC8wxString
-      ;wxDbTable::SetColDefs(unsigned short,const wxString&,int,void*,short,int,unsigned long,unsigned long,unsigned long,unsigned long)
-      SetColDefs__9wxDbTableFUsRC8wxStringiPvsT3UlN37
-      ;wxDbTable::SetColDefs(wxDbColInf*,unsigned short)
-      SetColDefs__9wxDbTableFP10wxDbColInfUs
-      ;wxDbTable::DeleteWhere(const wxString&)
-      DeleteWhere__9wxDbTableFRC8wxString
-      ;wxDbTable::BuildSelectStmt(wxString&,int,unsigned long)
-      BuildSelectStmt__9wxDbTableFR8wxStringiUl
-      ;wxDbTable::SetColNull(const wxString&,unsigned long)
-      SetColNull__9wxDbTableFRC8wxStringUl
-      ;wxDbTable::CreateTable(unsigned long)
-      CreateTable__9wxDbTableFUl
-      ;wxDbTable::ClearMemberVars(unsigned long)
-      ClearMemberVars__9wxDbTableFUl
-      ;wxDbTable::QueryOnKeyFields(unsigned long,unsigned long)
-      QueryOnKeyFields__9wxDbTableFUlT1
-      ;wxDbTable::SetKey(const GenericKey&)
-      SetKey__9wxDbTableFRC10GenericKey
-      ;wxDbColDef::Initialize()
-      Initialize__10wxDbColDefFv
-      ;wxDbTable::initialize(wxDb*,const wxString&,const unsigned short,const wxString&,unsigned long,const wxString&)
-      initialize__9wxDbTableFP4wxDbRC8wxStringCUsT2UlT2
-      ;wxDbTable::bindCols(void*)
-      bindCols__9wxDbTableFPv
-      ;wxDbTable::Update()
-      Update__9wxDbTableFv
-      ;wxDbTable::IsCursorClosedOnCommit()
-      IsCursorClosedOnCommit__9wxDbTableFv
-      ;wxDbTable::GetRowNum()
-      GetRowNum__9wxDbTableFv
-      ;wxDbTable::GetPrev()
-      GetPrev__9wxDbTableFv
-      ;wxDbTable::execUpdate(const wxString&)
-      execUpdate__9wxDbTableFRC8wxString
-      ;wxDbTable::IsColNull(unsigned short) const
-      IsColNull__9wxDbTableCFUs
-      ;wxDbTable::DropIndex(const wxString&)
-      DropIndex__9wxDbTableFRC8wxString
-      ;wxDbTable::SetColNull(unsigned short,unsigned long)
-      SetColNull__9wxDbTableFUsUl
-      lastTableID
-      ;wxDbTable::SetCol(const int,const wxVariant)
-      SetCol__9wxDbTableFCiC9wxVariant
-      ;wxDbTable::SetOrderByColNums(unsigned short,...)
-      SetOrderByColNums__9wxDbTableFUse
-      ;wxDbTable::wxDbTable(wxDb*,const wxString&,const unsigned short,const char*,unsigned long,const wxString&)
-      __ct__9wxDbTableFP4wxDbRC8wxStringCUsPCcUlT2
-      ;wxDbTable::bindUpdateParams()
-      bindUpdateParams__9wxDbTableFv
-      ;wxDbTable::Refresh()
-      Refresh__9wxDbTableFv
-      ;wxDbTable::Insert()
-      Insert__9wxDbTableFv
-      ;wxDbTable::DeleteCursor(void**)
-      DeleteCursor__9wxDbTableFPPv
-      ;wxDbTable::CanSelectForUpdate()
-      CanSelectForUpdate__9wxDbTableFv
-      ;wxDbTable::BuildDeleteStmt(wxString&,int,const wxString&)
-      BuildDeleteStmt__9wxDbTableFR8wxStringiRC8wxString
-      ;wxDbTable::Count(const wxString&)
-      Count__9wxDbTableFRC8wxString
-      ;wxDbTable::BuildUpdateStmt(char*,int,const wxString&)
-      BuildUpdateStmt__9wxDbTableFPciRC8wxString
-      ;wxDbTable::BuildWhereClause(wxString&,int,const wxString&,unsigned long)
-      BuildWhereClause__9wxDbTableFR8wxStringiRC8wxStringUl
-      ;wxDbTable::SetQueryTimeout(unsigned long)
-      SetQueryTimeout__9wxDbTableFUl
-      ;wxDbTable::BuildWhereClause(char*,int,const wxString&,unsigned long)
-      BuildWhereClause__9wxDbTableFPciRC8wxStringUl
-      ;csstrncpyt(char*,const char*,int)
-      csstrncpyt__FPcPCci
-      ;wxDbTable::bindInsertParams()
-      bindInsertParams__9wxDbTableFv
-      ;wxDbTable::GetKey()
-      GetKey__9wxDbTableFv
-      ;wxDbTable::GetFirst()
-      GetFirst__9wxDbTableFv
-      ;wxDbTable::DropTable()
-      DropTable__9wxDbTableFv
-      ;wxDbTable::Delete()
-      Delete__9wxDbTableFv
-      ;wxDbTable::CloseCursor(void*)
-      CloseCursor__9wxDbTableFPv
-      ;wxDbTable::getRec(unsigned short)
-      getRec__9wxDbTableFUs
-      ;wxDbTable::execDelete(const wxString&)
-      execDelete__9wxDbTableFRC8wxString
-      ;wxDbTable::QueryBySqlStmt(const wxString&)
-      QueryBySqlStmt__9wxDbTableFRC8wxString
-      ;wxDbTable::BuildUpdateStmt(wxString&,int,const wxString&)
-      BuildUpdateStmt__9wxDbTableFR8wxStringiRC8wxString

   ;From object file:  ..\common\dcbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDCBase::DoDrawCheckMark(int,int,int,int)
   ;From object file:  ..\common\dcbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDCBase::DoDrawCheckMark(int,int,int,int)


@@ -1488,40 +1390,142 @@ EXPORTS
       wxDirSelectorPromptStr
   ;From object file:  ..\common\dynarray.cpp
     ;PUBDEFs (Symbols available from object file):
       wxDirSelectorPromptStr
   ;From object file:  ..\common\dynarray.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxBaseArray::Add(long)
-      Add__11wxBaseArrayFl
-      ;wxBaseArray::Remove(long)
-      Remove__11wxBaseArrayFl
-      ;wxBaseArray::~wxBaseArray()
-      __dt__11wxBaseArrayFv
-      ;wxBaseArray::Sort(int(*)(const void*,const void*))
-      Sort__11wxBaseArrayFPFPCvT1_i
-      ;wxBaseArray::IndexForInsert(long,int(*)(const void*,const void*)) const
-      IndexForInsert__11wxBaseArrayCFlPFPCvT1_i
-      ;wxBaseArray::wxBaseArray()
-      __ct__11wxBaseArrayFv
-      ;wxBaseArray::Clear()
-      Clear__11wxBaseArrayFv
-      ;wxBaseArray::Insert(long,unsigned int)
-      Insert__11wxBaseArrayFlUi
-      ;wxBaseArray::wxBaseArray(const wxBaseArray&)
-      __ct__11wxBaseArrayFRC11wxBaseArray
-      ;wxBaseArray::Add(long,int(*)(const void*,const void*))
-      Add__11wxBaseArrayFlPFPCvT1_i
-      ;wxBaseArray::Shrink()
-      Shrink__11wxBaseArrayFv
-      ;wxBaseArray::operator=(const wxBaseArray&)
-      __as__11wxBaseArrayFRC11wxBaseArray
-      ;wxBaseArray::RemoveAt(unsigned int)
-      RemoveAt__11wxBaseArrayFUi
-      ;wxBaseArray::Index(long,int(*)(const void*,const void*)) const
-      Index__11wxBaseArrayCFlPFPCvT1_i
-      ;wxBaseArray::Grow()
-      Grow__11wxBaseArrayFv
-      ;wxBaseArray::Index(long,unsigned long) const
-      Index__11wxBaseArrayCFlUl
-      ;wxBaseArray::Alloc(unsigned int)
-      Alloc__11wxBaseArrayFUi
+      ;wxBaseArrayPtrVoid::Index(const void*,unsigned long) const
+      Index__18wxBaseArrayPtrVoidCFPCvUl
+      ;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)


@@ -1602,6 +1606,7 @@ EXPORTS
       sm_classwxCloseEvent__12wxCloseEvent
       ;wxCommandEvent::wxCommandEvent(int,int)
       __ct__14wxCommandEventFiT1
       sm_classwxCloseEvent__12wxCloseEvent
       ;wxCommandEvent::wxCommandEvent(int,int)
       __ct__14wxCommandEventFiT1

+      wxEVT_MENU_CLOSE

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


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


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


@@ -1705,6 +1709,8 @@ EXPORTS
       wxConstructorForwxSysColourChangedEvent__Fv
       ;wxConstructorForwxNavigationKeyEvent()
       wxConstructorForwxNavigationKeyEvent__Fv
       wxConstructorForwxSysColourChangedEvent__Fv
       ;wxConstructorForwxNavigationKeyEvent()
       wxConstructorForwxNavigationKeyEvent__Fv

+      ;wxConstructorForwxMouseCaptureChangedEvent()
+      wxConstructorForwxMouseCaptureChangedEvent__Fv

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


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

-      wxEVT_POPUP_MENU_INIT

       wxEVT_PALETTE_CHANGED
       wxEVT_NC_MIDDLE_UP
       wxEVT_MENU_HIGHLIGHT
       wxEVT_PALETTE_CHANGED
       wxEVT_NC_MIDDLE_UP
       wxEVT_MENU_HIGHLIGHT


@@ -1876,6 +1881,8 @@ EXPORTS
       sm_classwxScrollWinEvent__16wxScrollWinEvent
       ;wxNcPaintEvent::sm_classwxNcPaintEvent
       sm_classwxNcPaintEvent__14wxNcPaintEvent
       sm_classwxScrollWinEvent__16wxScrollWinEvent
       ;wxNcPaintEvent::sm_classwxNcPaintEvent
       sm_classwxNcPaintEvent__14wxNcPaintEvent

+      ;wxMouseCaptureChangedEvent::sm_classwxMouseCaptureChangedEvent
+      sm_classwxMouseCaptureChangedEvent__26wxMouseCaptureChangedEvent

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


@@ -1918,7 +1925,7 @@ EXPORTS
       wxEVT_NC_LEFT_DCLICK
       wxEVT_INIT_DIALOG
       wxEVT_COMMAND_SET_FOCUS
       wxEVT_NC_LEFT_DCLICK
       wxEVT_INIT_DIALOG
       wxEVT_COMMAND_SET_FOCUS

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

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


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

-      ;wxFileName::IsWild(wxPathFormat)
-      IsWild__10wxFileNameF12wxPathFormat

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


@@ -2221,12 +2226,12 @@ EXPORTS
       PrependDir__10wxFileNameFRC8wxString
       ;wxFileName::GetPathSeparators(wxPathFormat)
       GetPathSeparators__10wxFileNameF12wxPathFormat
       PrependDir__10wxFileNameFRC8wxString
       ;wxFileName::GetPathSeparators(wxPathFormat)
       GetPathSeparators__10wxFileNameF12wxPathFormat

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

       ;wxFileName::IsPathSeparator(char,wxPathFormat)
       IsPathSeparator__10wxFileNameFc12wxPathFormat
       ;wxFileName::GetFullPath(wxPathFormat) const
       GetFullPath__10wxFileNameCF12wxPathFormat
       ;wxFileName::IsPathSeparator(char,wxPathFormat)
       IsPathSeparator__10wxFileNameFc12wxPathFormat
       ;wxFileName::GetFullPath(wxPathFormat) const
       GetFullPath__10wxFileNameCF12wxPathFormat

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

       ;wxFileName::Touch()
       Touch__10wxFileNameFv
       ;wxFileName::FileName(const wxString&)
       ;wxFileName::Touch()
       Touch__10wxFileNameFv
       ;wxFileName::FileName(const wxString&)


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

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

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

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

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


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

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

       ;wxFileName::MakeRelativeTo(const wxString&,wxPathFormat)
       MakeRelativeTo__10wxFileNameFRC8wxString12wxPathFormat
       ;wxFileName::AssignDir(const wxString&,wxPathFormat)
       AssignDir__10wxFileNameFRC8wxString12wxPathFormat
       ;wxFileName::MakeRelativeTo(const wxString&,wxPathFormat)
       MakeRelativeTo__10wxFileNameFRC8wxString12wxPathFormat
       ;wxFileName::AssignDir(const wxString&,wxPathFormat)
       AssignDir__10wxFileNameFRC8wxString12wxPathFormat

+      ;wxFileName::Mkdir(int,int)
+      Mkdir__10wxFileNameFiT1

       ;wxFileName::SetTimes(const wxDateTime*,const wxDateTime*,const wxDateTime*)
       SetTimes__10wxFileNameFPC10wxDateTimeN21
       ;wxFileName::Rmdir()
       ;wxFileName::SetTimes(const wxDateTime*,const wxDateTime*,const wxDateTime*)
       SetTimes__10wxFileNameFPC10wxDateTimeN21
       ;wxFileName::Rmdir()


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

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

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


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

+      ;wxConstructorForwxFontMapperModule()
+      wxConstructorForwxFontMapperModule__Fv
+      __vft12wxFontMapper

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

-      __vft12wxFontMapper

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


@@ -2413,13 +2422,20 @@ EXPORTS
       CharsetToEncoding__12wxFontMapperFRC8wxStringUl
       ;wxFontMapper::GetAltForEncoding(wxFontEncoding,wxFontEncoding*,const wxString&,unsigned long)
       GetAltForEncoding__12wxFontMapperF14wxFontEncodingP14wxFontEncodingRC8wxStringUl
       CharsetToEncoding__12wxFontMapperFRC8wxStringUl
       ;wxFontMapper::GetAltForEncoding(wxFontEncoding,wxFontEncoding*,const wxString&,unsigned long)
       GetAltForEncoding__12wxFontMapperF14wxFontEncodingP14wxFontEncodingRC8wxStringUl

+      ;wxFontMapperModule::sm_classwxFontMapperModule
+      sm_classwxFontMapperModule__18wxFontMapperModule

       ;wxFontMapper::ChangePath(const wxString&,wxString*)
       ChangePath__12wxFontMapperFRC8wxStringP8wxString
       ;wxFontMapper::GetEncodingName(wxFontEncoding)
       GetEncodingName__12wxFontMapperF14wxFontEncoding
       ;wxFontMapper::~wxFontMapper()
       __dt__12wxFontMapperFv
       ;wxFontMapper::ChangePath(const wxString&,wxString*)
       ChangePath__12wxFontMapperFRC8wxStringP8wxString
       ;wxFontMapper::GetEncodingName(wxFontEncoding)
       GetEncodingName__12wxFontMapperF14wxFontEncoding
       ;wxFontMapper::~wxFontMapper()
       __dt__12wxFontMapperFv

-      wxTheFontMapper
+      ;wxFontMapper::sm_instance
+      sm_instance__12wxFontMapper
+      ;wxFontMapper::Set(wxFontMapper*)
+      Set__12wxFontMapperFP12wxFontMapper
+      ;wxFontMapper::Get()
+      Get__12wxFontMapperFv

       ;wxFontMapper::GetDefaultConfigPath()
       GetDefaultConfigPath__12wxFontMapperFv
       ;wxFontMapper::GetEncodingDescription(wxFontEncoding)
       ;wxFontMapper::GetDefaultConfigPath()
       GetDefaultConfigPath__12wxFontMapperFv
       ;wxFontMapper::GetEncodingDescription(wxFontEncoding)


@@ -2975,6 +2991,36 @@ EXPORTS
       GetContentType__6wxHTTPFv
       ;wxHTTP::Abort()
       Abort__6wxHTTPFv
       GetContentType__6wxHTTPFv
       ;wxHTTP::Abort()
       Abort__6wxHTTPFv

+  ;From object file:  ..\common\iconbndl.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxIconArray::DoCopy(const wxIconArray&)
+      DoCopy__11wxIconArrayFRC11wxIconArray
+      ;wxIconArray::Insert(const wxIcon&,unsigned int)
+      Insert__11wxIconArrayFRC6wxIconUi
+      ;wxIconArray::~wxIconArray()
+      __dt__11wxIconArrayFv
+      ;wxIconBundle::DeleteIcons()
+      DeleteIcons__12wxIconBundleFv
+      ;wxIconArray::Add(const wxIcon&)
+      Add__11wxIconArrayFRC6wxIcon
+      ;wxIconArray::Index(const wxIcon&,unsigned long) const
+      Index__11wxIconArrayCFRC6wxIconUl
+      ;wxIconBundle::operator=(const wxIconBundle&)
+      __as__12wxIconBundleFRC12wxIconBundle
+      ;wxIconArray::RemoveAt(unsigned int)
+      RemoveAt__11wxIconArrayFUi
+      ;wxIconArray::DoEmpty()
+      DoEmpty__11wxIconArrayFv
+      ;wxIconBundle::AddIcon(const wxIcon&)
+      AddIcon__12wxIconBundleFRC6wxIcon
+      ;wxIconBundle::AddIcon(const wxString&,long)
+      AddIcon__12wxIconBundleFRC8wxStringl
+      ;wxIconBundle::GetIcon(const wxSize&) const
+      GetIcon__12wxIconBundleCFRC6wxSize
+      ;wxIconArray::wxIconArray(const wxIconArray&)
+      __ct__11wxIconArrayFRC11wxIconArray
+      ;wxIconArray::operator=(const wxIconArray&)
+      __as__11wxIconArrayFRC11wxIconArray

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


@@ -3069,6 +3115,8 @@ EXPORTS
       Copy__7wxImageCFv
       ;wxImage::GetOptionInt(const wxString&) const
       GetOptionInt__7wxImageCFRC8wxString
       Copy__7wxImageCFv
       ;wxImage::GetOptionInt(const wxString&) const
       GetOptionInt__7wxImageCFRC8wxString

+      ;wxImage::SaveFile(const wxString&) const
+      SaveFile__7wxImageCFRC8wxString

       ;wxImage::SaveFile(wxOutputStream&,const wxString&) const
       SaveFile__7wxImageCFR14wxOutputStreamRC8wxString
       ;wxImage::FindHandlerMime(const wxString&)
       ;wxImage::SaveFile(wxOutputStream&,const wxString&) const
       SaveFile__7wxImageCFR14wxOutputStreamRC8wxString
       ;wxImage::FindHandlerMime(const wxString&)


@@ -3167,16 +3215,12 @@ EXPORTS
       SetData__7wxImageFPUciT2
       ;wxImage::GetMaskBlue() const
       GetMaskBlue__7wxImageCFv
       SetData__7wxImageFPUciT2
       ;wxImage::GetMaskBlue() const
       GetMaskBlue__7wxImageCFv

-      ;wxImage::ConvertToBitmap() const
-      ConvertToBitmap__7wxImageCFv

       ;wxImage::CleanUpHandlers()
       CleanUpHandlers__7wxImageFv
       ;wxImageHandler::CanRead(const wxString&)
       CanRead__14wxImageHandlerFRC8wxString
       ;wxImageHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__14wxImageHandlerFP7wxImageR14wxOutputStreamUl
       ;wxImage::CleanUpHandlers()
       CleanUpHandlers__7wxImageFv
       ;wxImageHandler::CanRead(const wxString&)
       CanRead__14wxImageHandlerFRC8wxString
       ;wxImageHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__14wxImageHandlerFP7wxImageR14wxOutputStreamUl

-      ;wxImage::wxImage(const wxBitmap&)
-      __ct__7wxImageFRC8wxBitmap

       ;wxImage::CountColours(unsigned long) const
       CountColours__7wxImageCFUl
       ;wxImage::wxImage(const wxString&,long,int)
       ;wxImage::CountColours(unsigned long) const
       CountColours__7wxImageCFUl
       ;wxImage::wxImage(const wxString&,long,int)


@@ -3205,6 +3249,10 @@ EXPORTS
       AddHandler__7wxImageFP14wxImageHandler
       ;wxImage::HasOption(const wxString&) const
       HasOption__7wxImageCFRC8wxString
       AddHandler__7wxImageFP14wxImageHandler
       ;wxImage::HasOption(const wxString&) const
       HasOption__7wxImageCFRC8wxString

+  ;From object file:  ..\common\imagfill.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxDoFloodFill(wxDC*,int,int,const wxColour&,int)
+      wxDoFloodFill__FP4wxDCiT2RC8wxColourT2

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


@@ -3374,44 +3422,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&)


@@ -3424,12 +3472,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


@@ -3442,12 +3494,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


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

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

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

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

       ;wxVLogInfo(const char*,char*)
       wxVLogInfo__FPCcPc
       ;wxVLogInfo(const char*,char*)
       wxVLogInfo__FPCcPc

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

       ;wxLog::ms_suspendCount
       ms_suspendCount__5wxLog
       ;wxLog::ms_bAutoCreate
       ;wxLog::ms_suspendCount
       ms_suspendCount__5wxLog
       ;wxLog::ms_bAutoCreate


@@ -4036,6 +4088,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


@@ -4753,6 +4807,8 @@ 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

+      ;wxSockAddress::Init()
+      Init__13wxSockAddressFv

       ;wxIPV4address::Hostname()
       Hostname__13wxIPV4addressFv
       ;wxIPV4address::AnyAddress()
       ;wxIPV4address::Hostname()
       Hostname__13wxIPV4addressFv
       ;wxIPV4address::AnyAddress()


@@ -5089,6 +5145,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()


@@ -5108,6 +5166,8 @@ EXPORTS
       __vft12wxSocketBase8wxObject
       ;wxSocketBase::WaitForRead(long,long)
       WaitForRead__12wxSocketBaseFlT1
       __vft12wxSocketBase8wxObject
       ;wxSocketBase::WaitForRead(long,long)
       WaitForRead__12wxSocketBaseFlT1

+      ;wxSocketBase::m_countInit
+      m_countInit__12wxSocketBase

       ;wxSocketBase::_Read(void*,unsigned int)
       _Read__12wxSocketBaseFPvUi
       ;wxSocketBase::Write(const void*,unsigned int)
       ;wxSocketBase::_Read(void*,unsigned int)
       _Read__12wxSocketBaseFPvUi
       ;wxSocketBase::Write(const void*,unsigned int)


@@ -5138,10 +5198,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)


@@ -5189,9 +5253,13 @@ EXPORTS
       wxConstructorForwxStatusBar__Fv
   ;From object file:  ..\common\strconv.cpp
     ;PUBDEFs (Symbols available from object file):
       wxConstructorForwxStatusBar__Fv
   ;From object file:  ..\common\strconv.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxStrConvModule::sm_classwxStrConvModule
+      sm_classwxStrConvModule__15wxStrConvModule

       wxConvCurrent
       wxConvFile
       wxConvLibc
       wxConvCurrent
       wxConvFile
       wxConvLibc

+      ;wxConstructorForwxStrConvModule()
+      wxConstructorForwxStrConvModule__Fv

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


@@ -5604,8 +5672,6 @@ EXPORTS
       __dt__17wxToolBarToolBaseFv
       ;wxToolBarBase::ClearTools()
       ClearTools__13wxToolBarBaseFv
       __dt__17wxToolBarToolBaseFv
       ;wxToolBarBase::ClearTools()
       ClearTools__13wxToolBarBaseFv

-      ;wxToolBarBase::InsertTool(unsigned int,int,const wxBitmap&,const wxBitmap&,unsigned long,wxObject*,const wxString&,const wxString&)
-      InsertTool__13wxToolBarBaseFUiiRC8wxBitmapT3UlP8wxObjectRC8wxStringT7

       ;wxToolBarToolBase::Enable(unsigned long)
       Enable__17wxToolBarToolBaseFUl
       ;wxToolBarBase::SetToolClientData(int,wxObject*)
       ;wxToolBarToolBase::Enable(unsigned long)
       Enable__17wxToolBarToolBaseFUl
       ;wxToolBarBase::SetToolClientData(int,wxObject*)


@@ -5624,6 +5690,8 @@ EXPORTS
       Toggle__17wxToolBarToolBaseFUl
       __vft17wxToolBarToolBase8wxObject
       __vft13wxToolBarBase8wxObject
       Toggle__17wxToolBarToolBaseFUl
       __vft17wxToolBarToolBase8wxObject
       __vft13wxToolBarBase8wxObject

+      ;wxToolBarBase::InsertTool(unsigned int,int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,const wxString&,const wxString&,wxObject*)
+      InsertTool__13wxToolBarBaseFUiiRC8wxStringRC8wxBitmapT410wxItemKindN23P8wxObject

       ;wxToolBarBase::InsertControl(unsigned int,wxControl*)
       InsertControl__13wxToolBarBaseFUiP9wxControl
       ;wxToolBarBase::SetMargins(int,int)
       ;wxToolBarBase::InsertControl(unsigned int,wxControl*)
       InsertControl__13wxToolBarBaseFUiP9wxControl
       ;wxToolBarBase::SetMargins(int,int)


@@ -5642,6 +5710,8 @@ EXPORTS
       OnIdle__13wxToolBarBaseFR11wxIdleEvent
       ;wxToolBarBase::AddControl(wxControl*)
       AddControl__13wxToolBarBaseFP9wxControl
       OnIdle__13wxToolBarBaseFR11wxIdleEvent
       ;wxToolBarBase::AddControl(wxControl*)
       AddControl__13wxToolBarBaseFP9wxControl

+      ;wxToolBarBase::DoAddTool(int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,const wxString&,const wxString&,wxObject*,int,int)
+      DoAddTool__13wxToolBarBaseFiRC8wxStringRC8wxBitmapT310wxItemKindN22P8wxObjectN21

       ;wxToolBarBase::InsertSeparator(unsigned int)
       InsertSeparator__13wxToolBarBaseFUi
       ;wxToolBarBase::GetToolState(int) const
       ;wxToolBarBase::InsertSeparator(unsigned int)
       InsertSeparator__13wxToolBarBaseFUi
       ;wxToolBarBase::GetToolState(int) const


@@ -5660,14 +5730,14 @@ EXPORTS
       GetEventTable__13wxToolBarBaseCFv
       ;wxToolBarBase::DoToolbarUpdates()
       DoToolbarUpdates__13wxToolBarBaseFv
       GetEventTable__13wxToolBarBaseCFv
       ;wxToolBarBase::DoToolbarUpdates()
       DoToolbarUpdates__13wxToolBarBaseFv

-      ;wxToolBarBase::AddTool(int,const wxBitmap&,const wxBitmap&,unsigned long,int,int,wxObject*,const wxString&,const wxString&)
-      AddTool__13wxToolBarBaseFiRC8wxBitmapT2UlN21P8wxObjectRC8wxStringT8

       ;wxToolBarBase::ToggleTool(int,unsigned long)
       ToggleTool__13wxToolBarBaseFiUl
       ;wxToolBarBase::SetToggle(int,unsigned long)
       SetToggle__13wxToolBarBaseFiUl
       ;wxToolBarBase::GetToolShortHelp(int) const
       GetToolShortHelp__13wxToolBarBaseCFi
       ;wxToolBarBase::ToggleTool(int,unsigned long)
       ToggleTool__13wxToolBarBaseFiUl
       ;wxToolBarBase::SetToggle(int,unsigned long)
       SetToggle__13wxToolBarBaseFiUl
       ;wxToolBarBase::GetToolShortHelp(int) const
       GetToolShortHelp__13wxToolBarBaseCFi

+      ;wxCreateGreyedImage(const wxImage&,wxImage&)
+      wxCreateGreyedImage__FRC7wxImageR7wxImage

       ;wxToolBarBase::sm_eventTable
       sm_eventTable__13wxToolBarBase
       ;wxToolBarBase::sm_classwxToolBarBase
       ;wxToolBarBase::sm_eventTable
       sm_eventTable__13wxToolBarBase
       ;wxToolBarBase::sm_classwxToolBarBase


@@ -5754,6 +5824,8 @@ EXPORTS
       SaveFile__14wxTextCtrlBaseFRC8wxString
       ;wxTextCtrlBase::operator<<(const char)
       __ls__14wxTextCtrlBaseFCc
       SaveFile__14wxTextCtrlBaseFRC8wxString
       ;wxTextCtrlBase::operator<<(const char)
       __ls__14wxTextCtrlBaseFCc

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

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


@@ -5846,6 +5918,8 @@ EXPORTS
       DoScreenToClient__20wxTopLevelWindowBaseCFPiT1
       ;wxTopLevelWindowBase::Destroy()
       Destroy__20wxTopLevelWindowBaseFv
       DoScreenToClient__20wxTopLevelWindowBaseCFPiT1
       ;wxTopLevelWindowBase::Destroy()
       Destroy__20wxTopLevelWindowBaseFv

+      ;wxTopLevelWindowBase::GetMaxSize() const
+      GetMaxSize__20wxTopLevelWindowBaseCFv

       ;wxTopLevelWindow::sm_classwxTopLevelWindow
       sm_classwxTopLevelWindow__16wxTopLevelWindow
   ;From object file:  ..\common\treebase.cpp
       ;wxTopLevelWindow::sm_classwxTopLevelWindow
       sm_classwxTopLevelWindow__16wxTopLevelWindow
   ;From object file:  ..\common\treebase.cpp


@@ -5953,7 +6027,7 @@ EXPORTS
       Read32__17wxTextInputStreamFv
       ;wxTextInputStream::SkipIfEndOfLine(char)
       SkipIfEndOfLine__17wxTextInputStreamFc
       Read32__17wxTextInputStreamFv
       ;wxTextInputStream::SkipIfEndOfLine(char)
       SkipIfEndOfLine__17wxTextInputStreamFc

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

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


@@ -6796,6 +6870,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


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

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

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


@@ -6841,14 +6919,10 @@ 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
       ;wxWindowBase::IsTopLevel() const
       IsTopLevel__12wxWindowBaseCFv
       ;wxWindowBase::GetUpdateClientRect() const


@@ -7080,24 +7154,6 @@ EXPORTS
       __vft16wxZipInputStream12wxStreamBase
       ;wxZipInputStream::Eof() const
       Eof__16wxZipInputStreamCFv
       __vft16wxZipInputStream12wxStreamBase
       ;wxZipInputStream::Eof() const
       Eof__16wxZipInputStreamCFv

-  ;From object file:  ..\common\zstream.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxZlibInputStream::wxZlibInputStream(wxInputStream&)
-      __ct__17wxZlibInputStreamFR13wxInputStream
-      ;wxZlibOutputStream::wxZlibOutputStream(wxOutputStream&,int)
-      __ct__18wxZlibOutputStreamFR14wxOutputStreami
-      ;wxZlibInputStream::OnSysRead(void*,unsigned int)
-      OnSysRead__17wxZlibInputStreamFPvUi
-      ;wxZlibOutputStream::Sync()
-      Sync__18wxZlibOutputStreamFv
-      ;wxZlibOutputStream::OnSysWrite(const void*,unsigned int)
-      OnSysWrite__18wxZlibOutputStreamFPCvUi
-      __vft18wxZlibOutputStream12wxStreamBase
-      ;wxZlibInputStream::~wxZlibInputStream()
-      __dt__17wxZlibInputStreamFv
-      ;wxZlibOutputStream::~wxZlibOutputStream()
-      __dt__18wxZlibOutputStreamFv
-      __vft17wxZlibInputStream12wxStreamBase

   ;From object file:  ..\generic\busyinfo.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxBusyInfo::~wxBusyInfo()
   ;From object file:  ..\generic\busyinfo.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxBusyInfo::~wxBusyInfo()


@@ -7237,6 +7293,8 @@ EXPORTS
       GetEventTable__14wxCalendarCtrlCFv
       ;wxCalendarCtrl::GetMonthControl() const
       GetMonthControl__14wxCalendarCtrlCFv
       GetEventTable__14wxCalendarCtrlCFv
       ;wxCalendarCtrl::GetMonthControl() const
       GetMonthControl__14wxCalendarCtrlCFv

+      ;wxCalendarCtrl::Destroy()
+      Destroy__14wxCalendarCtrlFv

   ;From object file:  ..\generic\caret.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCaret::Blink()
   ;From object file:  ..\generic\caret.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxCaret::Blink()


@@ -7378,6 +7436,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


@@ -7564,6 +7642,8 @@ EXPORTS
       ;wxGenericDirDialog::OnNew(wxCommandEvent&)
       OnNew__18wxGenericDirDialogFR14wxCommandEvent
       __vft18wxGenericDirDialog8wxObject
       ;wxGenericDirDialog::OnNew(wxCommandEvent&)
       OnNew__18wxGenericDirDialogFR14wxCommandEvent
       __vft18wxGenericDirDialog8wxObject

+      ;wxGenericDirDialog::OnGoHome(wxCommandEvent&)
+      OnGoHome__18wxGenericDirDialogFR14wxCommandEvent

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


@@ -7630,12 +7710,16 @@ EXPORTS
       SetFilterIndex__16wxGenericDirCtrlFi
       ;wxDirFilterListCtrl::FillFilterList(const wxString&,int)
       FillFilterList__19wxDirFilterListCtrlFRC8wxStringi
       SetFilterIndex__16wxGenericDirCtrlFi
       ;wxDirFilterListCtrl::FillFilterList(const wxString&,int)
       FillFilterList__19wxDirFilterListCtrlFRC8wxStringi

+      ;wxGenericDirCtrl::ReCreateTree()
+      ReCreateTree__16wxGenericDirCtrlFv

       ;wxGenericDirCtrl::SetupSections()
       SetupSections__16wxGenericDirCtrlFv
       ;wxGenericDirCtrl::ShowHidden(unsigned long)
       ShowHidden__16wxGenericDirCtrlFUl
       ;wxGenericDirCtrl::OnCollapseItem(wxTreeEvent&)
       OnCollapseItem__16wxGenericDirCtrlFR11wxTreeEvent
       ;wxGenericDirCtrl::SetupSections()
       SetupSections__16wxGenericDirCtrlFv
       ;wxGenericDirCtrl::ShowHidden(unsigned long)
       ShowHidden__16wxGenericDirCtrlFUl
       ;wxGenericDirCtrl::OnCollapseItem(wxTreeEvent&)
       OnCollapseItem__16wxGenericDirCtrlFR11wxTreeEvent

+      ;wxGenericDirCtrl::CollapseDir(wxTreeItemId)
+      CollapseDir__16wxGenericDirCtrlF12wxTreeItemId

       ;wxDirItemData::HasSubDirs() const
       HasSubDirs__13wxDirItemDataCFv
       ;wxGenericDirCtrl::GetPath() const
       ;wxDirItemData::HasSubDirs() const
       HasSubDirs__13wxDirItemDataCFv
       ;wxGenericDirCtrl::GetPath() const


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


@@ -9216,6 +9270,8 @@ EXPORTS
       __vft16wxListMainWindow8wxObject
       ;wxListCtrl::SetFont(const wxFont&)
       SetFont__10wxListCtrlFRC6wxFont
       __vft16wxListMainWindow8wxObject
       ;wxListCtrl::SetFont(const wxFont&)
       SetFont__10wxListCtrlFRC6wxFont

+      ;wxListHeaderWindow::SendListEvent(int,wxPoint)
+      SendListEvent__18wxListHeaderWindowFi7wxPoint

       ;wxListCtrl::ResizeReportView(unsigned long)
       ResizeReportView__10wxListCtrlFUl
       ;wxListMainWindow::OnSetFocus(wxFocusEvent&)
       ;wxListCtrl::ResizeReportView(unsigned long)
       ResizeReportView__10wxListCtrlFUl
       ;wxListMainWindow::OnSetFocus(wxFocusEvent&)


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

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

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


@@ -9787,6 +9841,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


@@ -9816,14 +9872,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&)


@@ -11330,8 +11386,6 @@ EXPORTS
       ;wxMsgArray::RemoveAt(unsigned int)
       RemoveAt__10wxMsgArrayFUi
       wxGetInstance
       ;wxMsgArray::RemoveAt(unsigned int)
       RemoveAt__10wxMsgArrayFUi
       wxGetInstance

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

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


@@ -11525,6 +11579,8 @@ EXPORTS
       MakeOwnerDrawn__8wxButtonFv
       ;wxButton::WindowProc(unsigned int,void*,void*)
       WindowProc__8wxButtonFUiPvT2
       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()


@@ -11885,7 +11941,6 @@ EXPORTS
       wxGaugeNameStr
       wxGREEN
       wxFrameNameStr
       wxGaugeNameStr
       wxGREEN
       wxFrameNameStr

-      wxFatalErrorStr

       wxDefaultPosition
       wxBitmapRadioButtonNameStr
       wxTheBitmapList
       wxDefaultPosition
       wxBitmapRadioButtonNameStr
       wxTheBitmapList


@@ -11935,7 +11990,6 @@ EXPORTS
       wxStatusLineNameStr
       wxRadioBoxNameStr
       wxLIGHT_GREY_PEN
       wxStatusLineNameStr
       wxRadioBoxNameStr
       wxLIGHT_GREY_PEN

-      wxInternalErrorStr

       wxGREY_PEN
       wxFileSelectorDefaultWildcardStr
       wxDoubleToStringStr
       wxGREY_PEN
       wxFileSelectorDefaultWildcardStr
       wxDoubleToStringStr


@@ -12087,6 +12141,8 @@ EXPORTS
       QueryTextBkColor__FUl
       ;wxDC::SelectOldObjects(unsigned long)
       SelectOldObjects__4wxDCFUl
       QueryTextBkColor__FUl
       ;wxDC::SelectOldObjects(unsigned long)
       SelectOldObjects__4wxDCFUl

+      ;wxDC::DoSelectPalette(unsigned long)
+      DoSelectPalette__4wxDCFUl

       ;SetBkMode(unsigned long,int)
       SetBkMode__FUli
       ;wxDC::DoSetClippingRegion(int,int,int,int)
       ;SetBkMode(unsigned long,int)
       SetBkMode__FUli
       ;wxDC::DoSetClippingRegion(int,int,int,int)


@@ -12109,6 +12165,8 @@ EXPORTS
       DoDrawIcon__4wxDCFRC6wxIconiT2
       ;wxDC::StartPage()
       StartPage__4wxDCFv
       DoDrawIcon__4wxDCFRC6wxIconiT2
       ;wxDC::StartPage()
       StartPage__4wxDCFv

+      ;wxDC::InitializePalette()
+      InitializePalette__4wxDCFv

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


@@ -12147,6 +12205,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&)


@@ -12155,6 +12215,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()


@@ -12181,6 +12242,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()


@@ -12248,6 +12311,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()


@@ -13182,14 +13248,18 @@ EXPORTS
       sm_classwxMenuBar__9wxMenuBar
       ;wxMenuBar::RebuildAccelTable()
       RebuildAccelTable__9wxMenuBarFv
       sm_classwxMenuBar__9wxMenuBar
       ;wxMenuBar::RebuildAccelTable()
       RebuildAccelTable__9wxMenuBarFv

+      ;wxMenu::EndRadioGroup()
+      EndRadioGroup__6wxMenuFv

       ;wxMenu::OS2Command(unsigned int,unsigned short)
       OS2Command__6wxMenuFUiUs
       ;wxMenuBar::EnableTop(unsigned int,unsigned long)
       EnableTop__9wxMenuBarFUiUl
       ;wxMenu::OS2Command(unsigned int,unsigned short)
       OS2Command__6wxMenuFUiUs
       ;wxMenuBar::EnableTop(unsigned int,unsigned long)
       EnableTop__9wxMenuBarFUiUl

-      ;wxMenu::DoAppend(wxMenuItem*)
-      DoAppend__6wxMenuFP10wxMenuItem
+      ;wxMenu::Attach(wxMenuBarBase*)
+      Attach__6wxMenuFP13wxMenuBarBase

       ;wxMenu::DoRemove(wxMenuItem*)
       DoRemove__6wxMenuFP10wxMenuItem
       ;wxMenu::DoRemove(wxMenuItem*)
       DoRemove__6wxMenuFP10wxMenuItem

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

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


@@ -13220,25 +13290,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):


@@ -14210,6 +14290,8 @@ EXPORTS
       OnCut__10wxTextCtrlFR14wxCommandEvent
       ;wxTextCtrl::OnCopy(wxCommandEvent&)
       OnCopy__10wxTextCtrlFR14wxCommandEvent
       OnCut__10wxTextCtrlFR14wxCommandEvent
       ;wxTextCtrl::OnCopy(wxCommandEvent&)
       OnCopy__10wxTextCtrlFR14wxCommandEvent

+      ;wxTextCtrl::EmulateKeyPress(const wxKeyEvent&)
+      EmulateKeyPress__10wxTextCtrlFRC10wxKeyEvent

       ;wxConstructorForwxTextCtrl()
       wxConstructorForwxTextCtrl__Fv
       ;wxTextCtrl::wxTextCtrl()
       ;wxConstructorForwxTextCtrl()
       wxConstructorForwxTextCtrl__Fv
       ;wxTextCtrl::wxTextCtrl()


@@ -14305,8 +14387,6 @@ EXPORTS
   ;From object file:  ..\os2\thread.cpp
     ;PUBDEFs (Symbols available from object file):
       p_wxMainMutex
   ;From object file:  ..\os2\thread.cpp
     ;PUBDEFs (Symbols available from object file):
       p_wxMainMutex

-      ;wxCondition::Wait(unsigned long,unsigned long)
-      Wait__11wxConditionFUlT1

       ;wxCriticalSection::Leave()
       Leave__17wxCriticalSectionFv
       ;wxMutex::~wxMutex()
       ;wxCriticalSection::Leave()
       Leave__17wxCriticalSectionFv
       ;wxMutex::~wxMutex()


@@ -14323,6 +14403,10 @@ EXPORTS
       GetId__8wxThreadCFv
       ;wxThread::Delete(void**)
       Delete__8wxThreadFPPv
       GetId__8wxThreadCFv
       ;wxThread::Delete(void**)
       Delete__8wxThreadFPPv

+      ;wxCondition::wxCondition(wxMutex&)
+      __ct__11wxConditionFR7wxMutex
+      ;wxCondition::Wait(unsigned long)
+      Wait__11wxConditionFUl

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


@@ -14354,8 +14438,6 @@ EXPORTS
       wxGuiOwnedByMainThread__Fv
       ;wxCriticalSection::~wxCriticalSection()
       __dt__17wxCriticalSectionFv
       wxGuiOwnedByMainThread__Fv
       ;wxCriticalSection::~wxCriticalSection()
       __dt__17wxCriticalSectionFv

-      ;wxCondition::wxCondition()
-      __ct__11wxConditionFv

       ;wxThread::Yield()
       Yield__8wxThreadFv
       ;wxMutex::TryLock()
       ;wxThread::Yield()
       Yield__8wxThreadFv
       ;wxMutex::TryLock()


@@ -14438,8 +14520,6 @@ EXPORTS
       sm_eventTable__9wxToolBar
       ;wxToolBar::GetToolSize() const
       GetToolSize__9wxToolBarCFv
       sm_eventTable__9wxToolBar
       ;wxToolBar::GetToolSize() const
       GetToolSize__9wxToolBarCFv

-      ;wxToolBar::CreateTool(int,const wxBitmap&,const wxBitmap&,unsigned long,wxObject*,const wxString&,const wxString&)
-      CreateTool__9wxToolBarFiRC8wxBitmapT2UlP8wxObjectRC8wxStringT6

       ;wxToolBar::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__9wxToolBarFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxToolBar::OS2Command(unsigned int,unsigned short)
       ;wxToolBar::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__9wxToolBarFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxToolBar::OS2Command(unsigned int,unsigned short)


@@ -14471,6 +14551,8 @@ EXPORTS
       GetEventTable__9wxToolBarCFv
       ;wxToolBar::OS2WindowProc(unsigned int,void*,void*)
       OS2WindowProc__9wxToolBarFUiPvT2
       GetEventTable__9wxToolBarCFv
       ;wxToolBar::OS2WindowProc(unsigned int,void*,void*)
       OS2WindowProc__9wxToolBarFUiPvT2

+      ;wxToolBar::CreateTool(int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,wxObject*,const wxString&,const wxString&)
+      CreateTool__9wxToolBarFiRC8wxStringRC8wxBitmapT310wxItemKindP8wxObjectN22

       ;wxToolBar::OnSysColourChanged(wxSysColourChangedEvent&)
       OnSysColourChanged__9wxToolBarFR23wxSysColourChangedEvent
       ;wxConstructorForwxToolBar()
       ;wxToolBar::OnSysColourChanged(wxSysColourChangedEvent&)
       OnSysColourChanged__9wxToolBarFR23wxSysColourChangedEvent
       ;wxConstructorForwxToolBar()


@@ -14543,6 +14625,8 @@ EXPORTS
       Create__19wxTopLevelWindowOS2FP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
       ;wxTopLevelWindowOS2::Show(unsigned long)
       Show__19wxTopLevelWindowOS2FUl
       Create__19wxTopLevelWindowOS2FP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
       ;wxTopLevelWindowOS2::Show(unsigned long)
       Show__19wxTopLevelWindowOS2FUl

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

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


@@ -14570,8 +14654,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&)


@@ -14590,8 +14672,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*)


@@ -14613,8 +14693,6 @@ EXPORTS
       wxGetHostName__FPci
       ;wxGetResource(const wxString&,const wxString&,int*,const wxString&)
       wxGetResource__FRC8wxStringT1PiT1
       wxGetHostName__FPci
       ;wxGetResource(const wxString&,const wxString&,int*,const wxString&)
       wxGetResource__FRC8wxStringT1PiT1

-      ;wxError(const wxString&,const wxString&)
-      wxError__FRC8wxStringT1

       ;wxKill(long,wxSignal,wxKillError*)
       wxKill__Fl8wxSignalP11wxKillError
       ;wxBell()
       ;wxKill(long,wxSignal,wxKillError*)
       wxKill__Fl8wxSignalP11wxKillError
       ;wxBell()


@@ -14641,13 +14719,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)


@@ -14753,10 +14831,6 @@ EXPORTS
       OS2DestroyWindow__8wxWindowFv
       ;wxWindow::IsMouseInWindow() const
       IsMouseInWindow__8wxWindowCFv
       OS2DestroyWindow__8wxWindowFv
       ;wxWindow::IsMouseInWindow() const
       IsMouseInWindow__8wxWindowCFv

-      ;wxWindow::HandleKeyUp(unsigned long,void*)
-      HandleKeyUp__8wxWindowFUlPv
-      ;wxWindow::HandleKeyDown(unsigned short,void*)
-      HandleKeyDown__8wxWindowFUsPv

       ;wxWindow::Clear()
       Clear__8wxWindowFv
       ;wxRemoveHandleAssociation(wxWindow*)
       ;wxWindow::Clear()
       Clear__8wxWindowFv
       ;wxRemoveHandleAssociation(wxWindow*)


@@ -14766,6 +14840,8 @@ EXPORTS
       Reparent__8wxWindowFP8wxWindow
       ;wxWindow::OS2GetCreateWindowCoords(const wxPoint&,const wxSize&,int&,int&,int&,int&) const
       OS2GetCreateWindowCoords__8wxWindowCFRC7wxPointRC6wxSizeRiN33
       Reparent__8wxWindowFP8wxWindow
       ;wxWindow::OS2GetCreateWindowCoords(const wxPoint&,const wxSize&,int&,int&,int&,int&) const
       OS2GetCreateWindowCoords__8wxWindowCFRC7wxPointRC6wxSizeRiN33

+      ;wxWindow::CreateKeyEvent(int,int,void*,void*) const
+      CreateKeyEvent__8wxWindowCFiT1PvT3

       ;wxWindow::Enable(unsigned long)
       Enable__8wxWindowFUl
       wxWinHandleList
       ;wxWindow::Enable(unsigned long)
       Enable__8wxWindowFUl
       wxWinHandleList


@@ -14855,6 +14931,8 @@ EXPORTS
       HandleMove__8wxWindowFiT1
       ;wxWindow::HandleMouseEvent(unsigned int,int,int,unsigned int)
       HandleMouseEvent__8wxWindowFUiiT2T1
       HandleMove__8wxWindowFiT1
       ;wxWindow::HandleMouseEvent(unsigned int,int,int,unsigned int)
       HandleMouseEvent__8wxWindowFUiiT2T1

+      ;wxWindow::HandleKeyDown(void*,void*)
+      HandleKeyDown__8wxWindowFPvT1

       ;wxWindow::GetScrollRange(int) const
       GetScrollRange__8wxWindowCFi
       ;wxWindow::DoSetSize(int,int,int,int,int)
       ;wxWindow::GetScrollRange(int) const
       GetScrollRange__8wxWindowCFi
       ;wxWindow::DoSetSize(int,int,int,int,int)


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

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

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


@@ -14909,8 +14985,10 @@ EXPORTS
       HandleActivate__8wxWindowFiUl
       ;wxWindow::FindItemByHWND(unsigned long,unsigned long) const
       FindItemByHWND__8wxWindowCFUlT1
       HandleActivate__8wxWindowFiUl
       ;wxWindow::FindItemByHWND(unsigned long,unsigned long) const
       FindItemByHWND__8wxWindowCFUlT1

-      ;wxWindow::HandleChar(unsigned long,void*,unsigned long)
-      HandleChar__8wxWindowFUlPvT1
+      ;wxWindow::HandleKeyUp(void*,void*)
+      HandleKeyUp__8wxWindowFPvT1
+      ;wxWindow::HandleChar(void*,void*,unsigned long)
+      HandleChar__8wxWindowFPvT1Ul

       ;wxWindow::DoMoveWindow(int,int,int,int)
       DoMoveWindow__8wxWindowFiN31
       ;wxWindow::DoClientToScreen(int*,int*) const
       ;wxWindow::DoMoveWindow(int,int,int,int)
       DoMoveWindow__8wxWindowFiN31
       ;wxWindow::DoClientToScreen(int*,int*) const