reverted Julian's unintentional breakage of wxChoice

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

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index d479372745acc27b1219824ac6f9146d9ce46951..faaea4fd6379f70771846ad6a71bae267b89a7d7 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:  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*)
   ;From object file:  ..\common\appcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxOnAssert(const char*,int,const char*)


@@ -2165,8 +2208,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()


@@ -2203,6 +2244,8 @@ 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::GetPath(unsigned long,wxPathFormat) const
       ;wxFileName::GetVolumeSeparator(wxPathFormat)
       GetVolumeSeparator__10wxFileNameF12wxPathFormat
       ;wxFileName::GetPath(unsigned long,wxPathFormat) const


@@ -2360,9 +2403,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&)


@@ -2373,6 +2418,8 @@ 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)
       ;wxFontMapper::ChangePath(const wxString&,wxString*)
       ChangePath__12wxFontMapperFRC8wxStringP8wxString
       ;wxFontMapper::GetEncodingName(wxFontEncoding)


@@ -2935,6 +2982,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()


@@ -3029,6 +3106,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&)


@@ -3127,16 +3206,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)


@@ -3165,6 +3240,14 @@ 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):
+      ;wxImage::MatchBoundaryPixel(int,int,int,int,const wxColour&,const wxColour&)
+      MatchBoundaryPixel__7wxImageFiN31RC8wxColourT5
+      ;wxImage::DoFloodFill(int,int,const wxBrush&,const wxColour&,int,int)
+      DoFloodFill__7wxImageFiT1RC7wxBrushRC8wxColourN21
+      ;wxImage::MatchPixel(int,int,int,int,const wxColour&)
+      MatchPixel__7wxImageFiN31RC8wxColour

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


@@ -3334,44 +3417,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&)


@@ -3384,12 +3467,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


@@ -3402,12 +3489,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


@@ -3998,6 +4083,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


@@ -5161,9 +5248,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)


@@ -5576,8 +5667,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*)


@@ -5596,6 +5685,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)


@@ -5614,6 +5705,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


@@ -5632,8 +5725,6 @@ 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)
       ;wxToolBarBase::ToggleTool(int,unsigned long)
       ToggleTool__13wxToolBarBaseFiUl
       ;wxToolBarBase::SetToggle(int,unsigned long)


@@ -7056,24 +7147,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()


@@ -7213,6 +7286,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()


@@ -7354,6 +7429,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


@@ -8778,36 +8873,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


@@ -9192,6 +9257,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&)


@@ -9676,8 +9743,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


@@ -9763,6 +9828,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


@@ -9798,10 +9865,8 @@ EXPORTS
       GetEventTable__23wxGenericScrolledWindowCFv
       ;wxGenericScrolledWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__23wxGenericScrolledWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       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&)


@@ -11308,8 +11373,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


@@ -13168,6 +13231,8 @@ 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)
       ;wxMenu::OS2Command(unsigned int,unsigned short)
       OS2Command__6wxMenuFUiUs
       ;wxMenuBar::EnableTop(unsigned int,unsigned long)


@@ -13206,25 +13271,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):


@@ -14291,8 +14366,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()


@@ -14309,6 +14382,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()


@@ -14340,8 +14417,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()


@@ -14424,8 +14499,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)


@@ -14457,6 +14530,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()


@@ -14529,6 +14604,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()


@@ -14621,13 +14698,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)