fixed memory leak in colour parsing code

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

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index f8d20512be15aae6ca46fcb04d34e32c1d773406..e2bf74f35c1ce5bc6e387e67b7badeada40d0994 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -201,10 +201,10 @@ EXPORTS
       __ct__12wxColourDataFRC12wxColourData
       ;wxPrintData::operator=(const wxPrintSetupData&)
       __as__11wxPrintDataFRC16wxPrintSetupData
       __ct__12wxColourDataFRC12wxColourData
       ;wxPrintData::operator=(const wxPrintSetupData&)
       __as__11wxPrintDataFRC16wxPrintSetupData

-      ;wxConstructorForwxPrintDialogData()
-      wxConstructorForwxPrintDialogData__Fv

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

+      ;wxConstructorForwxPrintDialogData()
+      wxConstructorForwxPrintDialogData__Fv

       ;wxPageSetupDialogData::wxPageSetupDialogData()
       __ct__21wxPageSetupDialogDataFv
       ;wxPrintDialogData::wxPrintDialogData()
       ;wxPageSetupDialogData::wxPageSetupDialogData()
       __ct__21wxPageSetupDialogDataFv
       ;wxPrintDialogData::wxPrintDialogData()


@@ -746,6 +746,12 @@ EXPORTS
       wx_spline_push__FdN71
       ;wx_spline_pop(double*,double*,double*,double*,double*,double*,double*,double*)
       wx_spline_pop__FPdN71
       wx_spline_push__FdN71
       ;wx_spline_pop(double*,double*,double*,double*,double*,double*,double*,double*)
       wx_spline_pop__FPdN71

+  ;From object file:  ..\common\dircmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxDir::GetAllFiles(const wxString&,wxArrayString*,const wxString&,int)
+      GetAllFiles__5wxDirFRC8wxStringP13wxArrayStringT1i
+      ;wxDir::Traverse(wxDirTraverser&,const wxString&,int) const
+      Traverse__5wxDirCFR14wxDirTraverserRC8wxStringi

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


@@ -1361,6 +1367,7 @@ EXPORTS
       Connect__12wxEvtHandlerFiN21M8wxObjectFR7wxEvent_vP8wxObject
       wxEVT_SOCKET
       wxEVT_SCROLLWIN_PAGEUP
       Connect__12wxEvtHandlerFiN21M8wxObjectFR7wxEvent_vP8wxObject
       wxEVT_SOCKET
       wxEVT_SCROLLWIN_PAGEUP

+      wxEVT_MOUSEWHEEL

       wxEVT_MIDDLE_UP
       wxEVT_MENU_INIT
       wxEVT_HELP
       wxEVT_MIDDLE_UP
       wxEVT_MENU_INIT
       wxEVT_HELP


@@ -1490,6 +1497,8 @@ EXPORTS
       wxConstructorForwxPaintEvent__Fv
       ;wxConstructorForwxNotifyEvent()
       wxConstructorForwxNotifyEvent__Fv
       wxConstructorForwxPaintEvent__Fv
       ;wxConstructorForwxNotifyEvent()
       wxConstructorForwxNotifyEvent__Fv

+      ;wxConstructorForwxContextMenuEvent()
+      wxConstructorForwxContextMenuEvent__Fv

       ;wxConstructorForwxCloseEvent()
       wxConstructorForwxCloseEvent__Fv
       ;wxEvtHandler::sm_classwxEvtHandler
       ;wxConstructorForwxCloseEvent()
       wxConstructorForwxCloseEvent__Fv
       ;wxEvtHandler::sm_classwxEvtHandler


@@ -1503,6 +1512,7 @@ EXPORTS
       CopyObject__14wxCommandEventCFR8wxObject
       wxEVT_SCROLL_LINEUP
       wxEVT_PAINT
       CopyObject__14wxCommandEventCFR8wxObject
       wxEVT_SCROLL_LINEUP
       wxEVT_PAINT

+      wxEVT_NULL

       wxEVT_NC_RIGHT_UP
       wxEVT_NC_PAINT
       wxEVT_LEFT_UP
       wxEVT_NC_RIGHT_UP
       wxEVT_NC_PAINT
       wxEVT_LEFT_UP


@@ -1614,6 +1624,8 @@ EXPORTS
       sm_classwxIdleEvent__11wxIdleEvent
       ;wxDropFilesEvent::sm_classwxDropFilesEvent
       sm_classwxDropFilesEvent__16wxDropFilesEvent
       sm_classwxIdleEvent__11wxIdleEvent
       ;wxDropFilesEvent::sm_classwxDropFilesEvent
       sm_classwxDropFilesEvent__16wxDropFilesEvent

+      ;wxContextMenuEvent::sm_classwxContextMenuEvent
+      sm_classwxContextMenuEvent__18wxContextMenuEvent

       ;wxActivateEvent::sm_classwxActivateEvent
       sm_classwxActivateEvent__15wxActivateEvent
       __vft15wxUpdateUIEvent8wxObject
       ;wxActivateEvent::sm_classwxActivateEvent
       sm_classwxActivateEvent__15wxActivateEvent
       __vft15wxUpdateUIEvent8wxObject


@@ -2295,6 +2307,8 @@ EXPORTS
       wxConstructorForwxPenList__Fv
       ;wxGetDisplaySizeMM()
       wxGetDisplaySizeMM__Fv
       wxConstructorForwxPenList__Fv
       ;wxGetDisplaySizeMM()
       wxGetDisplaySizeMM__Fv

+      ;wxGetClientDisplayRect()
+      wxGetClientDisplayRect__Fv

       ;wxDeleteStockObjects()
       wxDeleteStockObjects__Fv
       ;wxConstructorForwxBitmapList()
       ;wxDeleteStockObjects()
       wxDeleteStockObjects__Fv
       ;wxConstructorForwxBitmapList()


@@ -2716,14 +2730,14 @@ EXPORTS
       GetImageCount__14wxImageHandlerFR13wxInputStream
       ;wxImage::ConvertToMono(unsigned char,unsigned char,unsigned char) const
       ConvertToMono__7wxImageCFUcN21
       GetImageCount__14wxImageHandlerFR13wxInputStream
       ;wxImage::ConvertToMono(unsigned char,unsigned char,unsigned char) const
       ConvertToMono__7wxImageCFUcN21

-      ;wxImage::ConvertToBitmap() const
-      ConvertToBitmap__7wxImageCFv
+      ;wxImage::GetHeight() const
+      GetHeight__7wxImageCFv

       ;wxImage::SetData(unsigned char*,int,int)
       SetData__7wxImageFPUciT2
       ;wxImage::GetMaskBlue() const
       GetMaskBlue__7wxImageCFv
       ;wxImage::SetData(unsigned char*,int,int)
       SetData__7wxImageFPUciT2
       ;wxImage::GetMaskBlue() const
       GetMaskBlue__7wxImageCFv

-      ;wxImage::GetHeight() const
-      GetHeight__7wxImageCFv
+      ;wxImage::ConvertToBitmap() const
+      ConvertToBitmap__7wxImageCFv

       ;wxImage::CleanUpHandlers()
       CleanUpHandlers__7wxImageFv
       ;wxImageHandler::CanRead(const wxString&)
       ;wxImage::CleanUpHandlers()
       CleanUpHandlers__7wxImageFv
       ;wxImageHandler::CanRead(const wxString&)


@@ -2838,6 +2852,37 @@ EXPORTS
       ;wxPNMHandler::DoCanRead(wxInputStream&)
       DoCanRead__12wxPNMHandlerFR13wxInputStream
   ;From object file:  ..\common\imagtiff.cpp
       ;wxPNMHandler::DoCanRead(wxInputStream&)
       DoCanRead__12wxPNMHandlerFR13wxInputStream
   ;From object file:  ..\common\imagtiff.cpp

+    ;PUBDEFs (Symbols available from object file):
+      ;wxTIFFHandler::DoCanRead(wxInputStream&)
+      DoCanRead__13wxTIFFHandlerFR13wxInputStream
+      ;TIFFwxOpen(wxOutputStream&,const char*,const char*)
+      TIFFwxOpen__FR14wxOutputStreamPCcT2
+      ;wxTIFFHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
+      LoadFile__13wxTIFFHandlerFP7wxImageR13wxInputStreamUli
+      ;wxTIFFHandler::GetImageCount(wxInputStream&)
+      GetImageCount__13wxTIFFHandlerFR13wxInputStream
+      ;TIFFwxOpen(wxInputStream&,const char*,const char*)
+      TIFFwxOpen__FR13wxInputStreamPCcT2
+      ;wxTIFFHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
+      SaveFile__13wxTIFFHandlerFP7wxImageR14wxOutputStreamUl
+      __vft13wxTIFFHandler8wxObject
+      ;wxConstructorForwxTIFFHandler()
+      wxConstructorForwxTIFFHandler__Fv
+      ;wxTIFFHandler::sm_classwxTIFFHandler
+      sm_classwxTIFFHandler__13wxTIFFHandler
+  ;From object file:  ..\common\imagxpm.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxConstructorForwxXPMHandler()
+      wxConstructorForwxXPMHandler__Fv
+      ;wxXPMHandler::sm_classwxXPMHandler
+      sm_classwxXPMHandler__12wxXPMHandler
+      __vft12wxXPMHandler8wxObject
+      ;wxXPMHandler::DoCanRead(wxInputStream&)
+      DoCanRead__12wxXPMHandlerFR13wxInputStream
+      ;wxXPMHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
+      SaveFile__12wxXPMHandlerFP7wxImageR14wxOutputStreamUl
+      ;wxXPMHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
+      LoadFile__12wxXPMHandlerFP7wxImageR13wxInputStreamUli

   ;From object file:  ..\common\intl.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxLocale::Init(int,int)
   ;From object file:  ..\common\intl.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxLocale::Init(int,int)


@@ -3080,6 +3125,8 @@ EXPORTS
       wxLogTrace__FUlPCce
       ;wxLogStatus(const char*,...)
       wxLogStatus__FPCce
       wxLogTrace__FUlPCce
       ;wxLogStatus(const char*,...)
       wxLogStatus__FPCce

+      ;wxLog::ClearTraceMasks()
+      ClearTraceMasks__5wxLogFv

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


@@ -3092,6 +3139,8 @@ EXPORTS
       wxLogTrace__FPCcT1e
       ;wxLogSysError(const char*,...)
       wxLogSysError__FPCce
       wxLogTrace__FPCcT1e
       ;wxLogSysError(const char*,...)
       wxLogSysError__FPCce

+      ;wxLog::DontCreateOnDemand()
+      DontCreateOnDemand__5wxLogFv

       ;Trap()
       Trap__Fv
       ;wxLog::TimeStamp(wxString*)
       ;Trap()
       Trap__Fv
       ;wxLog::TimeStamp(wxString*)


@@ -3462,6 +3511,10 @@ EXPORTS
       GetIcon__10wxFileTypeCFP6wxIconP8wxStringPi
       ;wxArrayFileTypeInfo::Add(const wxFileTypeInfo&)
       Add__19wxArrayFileTypeInfoFRC14wxFileTypeInfo
       GetIcon__10wxFileTypeCFP6wxIconP8wxStringPi
       ;wxArrayFileTypeInfo::Add(const wxFileTypeInfo&)
       Add__19wxArrayFileTypeInfoFRC14wxFileTypeInfo

+      ;wxFileTypeInfo::wxFileTypeInfo(const wxArrayString&)
+      __ct__14wxFileTypeInfoFRC13wxArrayString
+      ;wxMimeTypesManager::Initialize(int,const wxString&)
+      Initialize__18wxMimeTypesManagerFiRC8wxString

       ;wxFileType::GetPrintCommand(wxString*,const wxFileType::MessageParameters&) const
       GetPrintCommand__10wxFileTypeCFP8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxMimeTypesManager::GetFileTypeFromMimeType(const wxString&)
       ;wxFileType::GetPrintCommand(wxString*,const wxFileType::MessageParameters&) const
       GetPrintCommand__10wxFileTypeCFP8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxMimeTypesManager::GetFileTypeFromMimeType(const wxString&)


@@ -3472,6 +3525,8 @@ EXPORTS
       Associate__18wxMimeTypesManagerFRC14wxFileTypeInfo
       ;wxFileTypeInfo::wxFileTypeInfo(const char*,const char*,const char*,const char*,...)
       __ct__14wxFileTypeInfoFPCcN31e
       Associate__18wxMimeTypesManagerFRC14wxFileTypeInfo
       ;wxFileTypeInfo::wxFileTypeInfo(const char*,const char*,const char*,const char*,...)
       __ct__14wxFileTypeInfoFPCcN31e

+      ;wxFileType::SetDefaultIcon(const wxString&,int)
+      SetDefaultIcon__10wxFileTypeFRC8wxStringi

       ;wxArrayFileTypeInfo::DoCopy(const wxArrayFileTypeInfo&)
       DoCopy__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo
       ;wxMimeTypesManager::ReadMimeTypes(const wxString&)
       ;wxArrayFileTypeInfo::DoCopy(const wxArrayFileTypeInfo&)
       DoCopy__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo
       ;wxMimeTypesManager::ReadMimeTypes(const wxString&)


@@ -3480,6 +3535,8 @@ EXPORTS
       ExpandCommand__10wxFileTypeFRC8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxMimeTypesManager::IsOfType(const wxString&,const wxString&)
       IsOfType__18wxMimeTypesManagerFRC8wxStringT1
       ExpandCommand__10wxFileTypeFRC8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxMimeTypesManager::IsOfType(const wxString&,const wxString&)
       IsOfType__18wxMimeTypesManagerFRC8wxStringT1

+      ;wxMimeTypesManager::Unassociate(wxFileType*)
+      Unassociate__18wxMimeTypesManagerFP10wxFileType

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


@@ -3497,6 +3554,8 @@ EXPORTS
       GetDescription__10wxFileTypeCFP8wxString
       ;wxArrayFileTypeInfo::Index(const wxFileTypeInfo&,unsigned long) const
       Index__19wxArrayFileTypeInfoCFRC14wxFileTypeInfoUl
       GetDescription__10wxFileTypeCFP8wxString
       ;wxArrayFileTypeInfo::Index(const wxFileTypeInfo&,unsigned long) const
       Index__19wxArrayFileTypeInfoCFRC14wxFileTypeInfoUl

+      ;wxFileType::SetCommand(const wxString&,const wxString&,unsigned long)
+      SetCommand__10wxFileTypeFRC8wxStringT1Ul

       ;wxMimeTypesManager::ReadMailcap(const wxString&,unsigned long)
       ReadMailcap__18wxMimeTypesManagerFRC8wxStringUl
       ;wxArrayFileTypeInfo::Insert(const wxFileTypeInfo&,unsigned int)
       ;wxMimeTypesManager::ReadMailcap(const wxString&,unsigned long)
       ReadMailcap__18wxMimeTypesManagerFRC8wxStringUl
       ;wxArrayFileTypeInfo::Insert(const wxFileTypeInfo&,unsigned int)


@@ -3521,6 +3580,8 @@ EXPORTS
       __dt__18wxMimeTypesManagerFv
       ;wxMimeTypesManager::wxMimeTypesManager()
       __ct__18wxMimeTypesManagerFv
       __dt__18wxMimeTypesManagerFv
       ;wxMimeTypesManager::wxMimeTypesManager()
       __ct__18wxMimeTypesManagerFv

+      ;wxMimeTypesManager::ClearData()
+      ClearData__18wxMimeTypesManagerFv

       ;wxArrayFileTypeInfo::operator=(const wxArrayFileTypeInfo&)
       __as__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo
       ;wxFileType::GetOpenCommand(wxString*,const wxFileType::MessageParameters&) const
       ;wxArrayFileTypeInfo::operator=(const wxArrayFileTypeInfo&)
       __as__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo
       ;wxFileType::GetOpenCommand(wxString*,const wxFileType::MessageParameters&) const


@@ -3580,23 +3641,21 @@ EXPORTS
       OnSysTell__20wxMemoryOutputStreamCFv
   ;From object file:  ..\common\object.cpp
     ;PUBDEFs (Symbols available from object file):
       OnSysTell__20wxMemoryOutputStreamCFv
   ;From object file:  ..\common\object.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxObject::Nid
-      Nid__8wxObject

       __vft8wxObject
       ;wxCreateStoredObject(wxInputStream&)
       wxCreateStoredObject__FR13wxInputStream
       __vft15wxObjectRefData
       ;wxCreateDynamicObject(const char*)
       wxCreateDynamicObject__FPCc
       __vft8wxObject
       ;wxCreateStoredObject(wxInputStream&)
       wxCreateStoredObject__FR13wxInputStream
       __vft15wxObjectRefData
       ;wxCreateDynamicObject(const char*)
       wxCreateDynamicObject__FPCc

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

       ;wxObject::Dump(ostream&)
       Dump__8wxObjectFR7ostream
       wxTrue
       ;wxObject::LoadObject(wxObjectInputStream&)
       LoadObject__8wxObjectFR19wxObjectInputStream
       ;wxObject::Dump(ostream&)
       Dump__8wxObjectFR7ostream
       wxTrue
       ;wxObject::LoadObject(wxObjectInputStream&)
       LoadObject__8wxObjectFR19wxObjectInputStream

-      ;wxClassInfo::FindClass(char*)
-      FindClass__11wxClassInfoFPc
+      ;wxClassInfo::IsKindOf(const wxClassInfo*) const
+      IsKindOf__11wxClassInfoCFPC11wxClassInfo

       ;wxClassInfo::sm_classTable
       sm_classTable__11wxClassInfo
       ;wxObject::CopyObject(wxObject&) const
       ;wxClassInfo::sm_classTable
       sm_classTable__11wxClassInfo
       ;wxObject::CopyObject(wxObject&) const


@@ -3611,8 +3670,6 @@ EXPORTS
       sm_first__11wxClassInfo
       ;wxObject::Ref(const wxObject&)
       Ref__8wxObjectFRC8wxObject
       sm_first__11wxClassInfo
       ;wxObject::Ref(const wxObject&)
       Ref__8wxObjectFRC8wxObject

-      ;wxClassInfo::wxClassInfo(char*,char*,char*,int,wxObject*(*)())
-      __ct__11wxClassInfoFPcN21iPFv_P8wxObject

       wxFalse
       ;wxObjectRefData::wxObjectRefData()
       __ct__15wxObjectRefDataFv
       wxFalse
       ;wxObjectRefData::wxObjectRefData()
       __ct__15wxObjectRefDataFv


@@ -3624,6 +3681,8 @@ EXPORTS
       CleanUpClasses__11wxClassInfoFv
       ;wxObject::IsKindOf(wxClassInfo*) const
       IsKindOf__8wxObjectCFP11wxClassInfo
       CleanUpClasses__11wxClassInfoFv
       ;wxObject::IsKindOf(wxClassInfo*) const
       IsKindOf__8wxObjectCFP11wxClassInfo

+      ;wxClassInfo::FindClass(const char*)
+      FindClass__11wxClassInfoFPCc

       ;wxObject::sm_classwxObject
       sm_classwxObject__8wxObject
       ;wxObject::operator new(unsigned int,char*,int)
       ;wxObject::sm_classwxObject
       sm_classwxObject__8wxObject
       ;wxObject::operator new(unsigned int,char*,int)


@@ -3634,8 +3693,6 @@ EXPORTS
       __dt__8wxObjectFv
       ;wxClassInfo::InitializeClasses()
       InitializeClasses__11wxClassInfoFv
       __dt__8wxObjectFv
       ;wxClassInfo::InitializeClasses()
       InitializeClasses__11wxClassInfoFv

-      ;wxClassInfo::IsKindOf(wxClassInfo*) const
-      IsKindOf__11wxClassInfoCFP11wxClassInfo

   ;From object file:  ..\common\objstrm.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxObjectOutputStream::AddChild(wxObject*)
   ;From object file:  ..\common\objstrm.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxObjectOutputStream::AddChild(wxObject*)


@@ -4313,6 +4370,8 @@ EXPORTS
       CalcMin__11wxSizerItemFv
       ;wxSizer::Remove(wxWindow*)
       Remove__7wxSizerFP8wxWindow
       CalcMin__11wxSizerItemFv
       ;wxSizer::Remove(wxWindow*)
       Remove__7wxSizerFP8wxWindow

+      ;wxSizer::FitSize(wxWindow*)
+      FitSize__7wxSizerFP8wxWindow

       __vft7wxSizer8wxObject
       ;wxSizer::Remove(int)
       Remove__7wxSizerFi
       __vft7wxSizer8wxObject
       ;wxSizer::Remove(int)
       Remove__7wxSizerFi


@@ -4330,6 +4389,8 @@ EXPORTS
       CreateArrays__15wxFlexGridSizerFv
       ;wxSizer::SetSizeHints(wxWindow*)
       SetSizeHints__7wxSizerFP8wxWindow
       CreateArrays__15wxFlexGridSizerFv
       ;wxSizer::SetSizeHints(wxWindow*)
       SetSizeHints__7wxSizerFP8wxWindow

+      ;wxSizer::GetMaxWindowSize(wxWindow*)
+      GetMaxWindowSize__7wxSizerFP8wxWindow

       ;wxSizer::Add(wxSizer*,int,int,int,wxObject*)
       Add__7wxSizerFP7wxSizeriN22P8wxObject
       ;wxSizer::Prepend(int,int,int,int,int,wxObject*)
       ;wxSizer::Add(wxSizer*,int,int,int,wxObject*)
       Add__7wxSizerFP7wxSizeriN22P8wxObject
       ;wxSizer::Prepend(int,int,int,int,int,wxObject*)


@@ -6193,6 +6254,14 @@ EXPORTS
       DeleteAttributeValue__6wxExprFRC8wxString
       ;wxExpr::AttributeValue(const wxString&) const
       AttributeValue__6wxExprCFRC8wxString
       DeleteAttributeValue__6wxExprFRC8wxString
       ;wxExpr::AttributeValue(const wxString&) const
       AttributeValue__6wxExprCFRC8wxString

+  ;From object file:  ..\common\xpmdecod.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxXPMDecoder::CanRead(wxInputStream&)
+      CanRead__12wxXPMDecoderFR13wxInputStream
+      ;wxXPMDecoder::ReadFile(wxInputStream&)
+      ReadFile__12wxXPMDecoderFR13wxInputStream
+      ;wxXPMDecoder::ReadData(const char**)
+      ReadData__12wxXPMDecoderFPPCc

   ;From object file:  ..\common\y_tab.c
     ;PUBDEFs (Symbols available from object file):
       wxExprCleanUp
   ;From object file:  ..\common\y_tab.c
     ;PUBDEFs (Symbols available from object file):
       wxExprCleanUp


@@ -6710,6 +6779,8 @@ EXPORTS
       __vft16wxGenericDirCtrl8wxObject
       ;wxGenericDirDialog::OnTreeSelected(wxTreeEvent&)
       OnTreeSelected__18wxGenericDirDialogFR11wxTreeEvent
       __vft16wxGenericDirCtrl8wxObject
       ;wxGenericDirDialog::OnTreeSelected(wxTreeEvent&)
       OnTreeSelected__18wxGenericDirDialogFR11wxTreeEvent

+      ;setdrive(int)
+      setdrive__Fi

       ;wxDirFilterListCtrl::Init()
       Init__19wxDirFilterListCtrlFv
       ;wxConstructorForwxGenericDirCtrl()
       ;wxDirFilterListCtrl::Init()
       Init__19wxDirFilterListCtrlFv
       ;wxConstructorForwxGenericDirCtrl()


@@ -6804,16 +6875,12 @@ EXPORTS
       ExtractWildcard__16wxGenericDirCtrlFRC8wxStringiR8wxStringT3
   ;From object file:  ..\generic\dragimgg.cpp
     ;PUBDEFs (Symbols available from object file):
       ExtractWildcard__16wxGenericDirCtrlFRC8wxStringiR8wxStringT3
   ;From object file:  ..\generic\dragimgg.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxGenericDragImage::Create(const wxBitmap&,const wxCursor&,const wxPoint&)
-      Create__18wxGenericDragImageFRC8wxBitmapRC8wxCursorRC7wxPoint
-      ;wxGenericDragImage::Move(const wxPoint&)
-      Move__18wxGenericDragImageFRC7wxPoint

       ;wxGenericDragImage::BeginDrag(const wxPoint&,wxWindow*,unsigned long,wxRect*)
       BeginDrag__18wxGenericDragImageFRC7wxPointP8wxWindowUlP6wxRect
       ;wxGenericDragImage::BeginDrag(const wxPoint&,wxWindow*,unsigned long,wxRect*)
       BeginDrag__18wxGenericDragImageFRC7wxPointP8wxWindowUlP6wxRect

+      ;wxGenericDragImage::Move(const wxPoint&)
+      Move__18wxGenericDragImageFRC7wxPoint

       ;wxGenericDragImage::~wxGenericDragImage()
       __dt__18wxGenericDragImageFv
       ;wxGenericDragImage::~wxGenericDragImage()
       __dt__18wxGenericDragImageFv

-      ;wxGenericDragImage::Create(const wxIcon&,const wxCursor&,const wxPoint&)
-      Create__18wxGenericDragImageFRC6wxIconRC8wxCursorRC7wxPoint

       ;wxGenericDragImage::BeginDrag(const wxPoint&,wxWindow*,wxWindow*)
       BeginDrag__18wxGenericDragImageFRC7wxPointP8wxWindowT2
       ;wxGenericDragImage::Show()
       ;wxGenericDragImage::BeginDrag(const wxPoint&,wxWindow*,wxWindow*)
       BeginDrag__18wxGenericDragImageFRC7wxPointP8wxWindowT2
       ;wxGenericDragImage::Show()


@@ -6823,28 +6890,32 @@ EXPORTS
       ;wxGenericDragImage::Create(const wxTreeCtrl&,wxTreeItemId&)
       Create__18wxGenericDragImageFRC10wxTreeCtrlR12wxTreeItemId
       __vft18wxGenericDragImage8wxObject
       ;wxGenericDragImage::Create(const wxTreeCtrl&,wxTreeItemId&)
       Create__18wxGenericDragImageFRC10wxTreeCtrlR12wxTreeItemId
       __vft18wxGenericDragImage8wxObject

+      ;wxGenericDragImage::Create(const wxCursor&)
+      Create__18wxGenericDragImageFRC8wxCursor

       ;wxConstructorForwxGenericDragImage()
       wxConstructorForwxGenericDragImage__Fv
       ;wxGenericDragImage::RedrawImage(const wxPoint&,const wxPoint&,unsigned long,unsigned long)
       RedrawImage__18wxGenericDragImageFRC7wxPointT1UlT3
       ;wxConstructorForwxGenericDragImage()
       wxConstructorForwxGenericDragImage__Fv
       ;wxGenericDragImage::RedrawImage(const wxPoint&,const wxPoint&,unsigned long,unsigned long)
       RedrawImage__18wxGenericDragImageFRC7wxPointT1UlT3

-      ;wxGenericDragImage::Create(const wxString&,const wxCursor&,const wxPoint&)
-      Create__18wxGenericDragImageFRC8wxStringRC8wxCursorRC7wxPoint

       ;wxGenericDragImage::GetImageRect(const wxPoint&) const
       GetImageRect__18wxGenericDragImageCFRC7wxPoint
       ;wxGenericDragImage::Init()
       Init__18wxGenericDragImageFv
       ;wxGenericDragImage::EndDrag()
       EndDrag__18wxGenericDragImageFv
       ;wxGenericDragImage::GetImageRect(const wxPoint&) const
       GetImageRect__18wxGenericDragImageCFRC7wxPoint
       ;wxGenericDragImage::Init()
       Init__18wxGenericDragImageFv
       ;wxGenericDragImage::EndDrag()
       EndDrag__18wxGenericDragImageFv

+      ;wxGenericDragImage::Create(const wxString&,const wxCursor&)
+      Create__18wxGenericDragImageFRC8wxStringRC8wxCursor
+      ;wxGenericDragImage::Create(const wxBitmap&,const wxCursor&)
+      Create__18wxGenericDragImageFRC8wxBitmapRC8wxCursor

       ;wxGenericDragImage::UpdateBackingFromWindow(wxDC&,wxMemoryDC&,const wxRect&,const wxRect&) const
       UpdateBackingFromWindow__18wxGenericDragImageCFR4wxDCR10wxMemoryDCRC6wxRectT3
       ;wxGenericDragImage::UpdateBackingFromWindow(wxDC&,wxMemoryDC&,const wxRect&,const wxRect&) const
       UpdateBackingFromWindow__18wxGenericDragImageCFR4wxDCR10wxMemoryDCRC6wxRectT3

-      ;wxGenericDragImage::Create(const wxCursor&,const wxPoint&)
-      Create__18wxGenericDragImageFRC8wxCursorRC7wxPoint
-      ;wxGenericDragImage::DoDrawImage(wxDC&,const wxPoint&) const
-      DoDrawImage__18wxGenericDragImageCFR4wxDCRC7wxPoint

       ;wxGenericDragImage::Create(const wxListCtrl&,long)
       Create__18wxGenericDragImageFRC10wxListCtrll
       ;wxGenericDragImage::Create(const wxListCtrl&,long)
       Create__18wxGenericDragImageFRC10wxListCtrll

+      ;wxGenericDragImage::DoDrawImage(wxDC&,const wxPoint&) const
+      DoDrawImage__18wxGenericDragImageCFR4wxDCRC7wxPoint

       ;wxGenericDragImage::sm_classwxGenericDragImage
       sm_classwxGenericDragImage__18wxGenericDragImage
       ;wxGenericDragImage::sm_classwxGenericDragImage
       sm_classwxGenericDragImage__18wxGenericDragImage

+      ;wxGenericDragImage::Create(const wxIcon&,const wxCursor&)
+      Create__18wxGenericDragImageFRC6wxIconRC8wxCursor

   ;From object file:  ..\generic\fontdlgg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxGenericFontDialog::OnCloseWindow(wxCloseEvent&)
   ;From object file:  ..\generic\fontdlgg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxGenericFontDialog::OnCloseWindow(wxCloseEvent&)


@@ -8772,61 +8843,65 @@ EXPORTS
       sm_eventTableEntries__12wxSashWindow
   ;From object file:  ..\generic\scrolwin.cpp
     ;PUBDEFs (Symbols available from object file):
       sm_eventTableEntries__12wxSashWindow
   ;From object file:  ..\generic\scrolwin.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxScrolledWindow::GetScrollPageSize(int) const
-      GetScrollPageSize__16wxScrolledWindowCFi
-      ;wxScrolledWindow::Scroll(int,int)
-      Scroll__16wxScrolledWindowFiT1
-      ;wxScrolledWindow::GetEventTable() const
-      GetEventTable__16wxScrolledWindowCFv
-      ;wxScrolledWindow::SetTargetWindow(wxWindow*)
-      SetTargetWindow__16wxScrolledWindowFP8wxWindow
-      ;wxScrolledWindow::sm_eventTable
-      sm_eventTable__16wxScrolledWindow
-      ;wxScrolledWindow::OnScroll(wxScrollWinEvent&)
-      OnScroll__16wxScrolledWindowFR16wxScrollWinEvent
-      ;wxScrolledWindow::SetScrollPageSize(int,int)
-      SetScrollPageSize__16wxScrolledWindowFiT1
-      ;wxScrolledWindow::AdjustScrollbars()
-      AdjustScrollbars__16wxScrolledWindowFv
-      ;wxScrolledWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
-      Create__16wxScrolledWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
-      ;wxScrolledWindow::PrepareDC(wxDC&)
-      PrepareDC__16wxScrolledWindowFR4wxDC
-      ;wxScrolledWindow::CalcUnscrolledPosition(int,int,int*,int*) const
-      CalcUnscrolledPosition__16wxScrolledWindowCFiT1PiT3
-      ;wxScrolledWindow::OnPaint(wxPaintEvent&)
-      OnPaint__16wxScrolledWindowFR12wxPaintEvent
-      ;wxScrolledWindow::OnChar(wxKeyEvent&)
-      OnChar__16wxScrolledWindowFR10wxKeyEvent
-      ;wxConstructorForwxScrolledWindow()
-      wxConstructorForwxScrolledWindow__Fv
-      ;wxScrolledWindow::wxScrolledWindow()
-      __ct__16wxScrolledWindowFv
-      ;wxScrolledWindow::CalcScrollInc(wxScrollWinEvent&)
-      CalcScrollInc__16wxScrolledWindowFR16wxScrollWinEvent
-      __vft16wxScrolledWindow8wxObject
-      ;wxScrolledWindow::OnSize(wxSizeEvent&)
-      OnSize__16wxScrolledWindowFR11wxSizeEvent
-      ;wxScrolledWindow::GetScrollPixelsPerUnit(int*,int*) const
-      GetScrollPixelsPerUnit__16wxScrolledWindowCFPiT1
-      ;wxScrolledWindow::GetVirtualSize(int*,int*) const
-      GetVirtualSize__16wxScrolledWindowCFPiT1
-      ;wxScrolledWindow::EnableScrolling(unsigned long,unsigned long)
-      EnableScrolling__16wxScrolledWindowFUlT1
-      ;wxScrolledWindow::~wxScrolledWindow()
-      __dt__16wxScrolledWindowFv
-      ;wxScrolledWindow::GetTargetWindow()
-      GetTargetWindow__16wxScrolledWindowFv
+      ;wxGenericScrolledWindow::OnChar(wxKeyEvent&)
+      OnChar__23wxGenericScrolledWindowFR10wxKeyEvent
+      __vft23wxGenericScrolledWindow8wxObject
+      ;wxGenericScrolledWindow::GetVirtualSize(int*,int*) const
+      GetVirtualSize__23wxGenericScrolledWindowCFPiT1
+      ;wxGenericScrolledWindow::sm_eventTable
+      sm_eventTable__23wxGenericScrolledWindow
+      ;wxGenericScrolledWindow::OnScroll(wxScrollWinEvent&)
+      OnScroll__23wxGenericScrolledWindowFR16wxScrollWinEvent
+      ;wxGenericScrolledWindow::OnSize(wxSizeEvent&)
+      OnSize__23wxGenericScrolledWindowFR11wxSizeEvent
+      ;wxGenericScrolledWindow::CalcScrollInc(wxScrollWinEvent&)
+      CalcScrollInc__23wxGenericScrolledWindowFR16wxScrollWinEvent
+      ;wxGenericScrolledWindow::Scroll(int,int)
+      Scroll__23wxGenericScrolledWindowFiT1
+      ;wxGenericScrolledWindow::GetViewStart(int*,int*) const
+      GetViewStart__23wxGenericScrolledWindowCFPiT1
+      ;wxGenericScrolledWindow::EnableScrolling(unsigned long,unsigned long)
+      EnableScrolling__23wxGenericScrolledWindowFUlT1
+      ;wxConstructorForwxGenericScrolledWindow()
+      wxConstructorForwxGenericScrolledWindow__Fv
+      ;wxGenericScrolledWindow::PrepareDC(wxDC&)
+      PrepareDC__23wxGenericScrolledWindowFR4wxDC
+      ;wxGenericScrolledWindow::sm_eventTableEntries
+      sm_eventTableEntries__23wxGenericScrolledWindow
+      ;wxGenericScrolledWindow::CalcUnscrolledPosition(int,int,int*,int*) const
+      CalcUnscrolledPosition__23wxGenericScrolledWindowCFiT1PiT3
+      ;wxGenericScrolledWindow::SetScrollbars(int,int,int,int,int,int,unsigned long)
+      SetScrollbars__23wxGenericScrolledWindowFiN51Ul
+      ;wxGenericScrolledWindow::GetEventTable() const
+      GetEventTable__23wxGenericScrolledWindowCFv
+      ;wxGenericScrolledWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
+      Create__23wxGenericScrolledWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
+      ;wxGenericScrolledWindow::SetTargetWindow(wxWindow*)
+      SetTargetWindow__23wxGenericScrolledWindowFP8wxWindow
+      ;wxGenericScrolledWindow::CalcScrolledPosition(int,int,int*,int*) const
+      CalcScrolledPosition__23wxGenericScrolledWindowCFiT1PiT3
+      ;wxGenericScrolledWindow::GetScrollPageSize(int) const
+      GetScrollPageSize__23wxGenericScrolledWindowCFi
+      ;wxGenericScrolledWindow::SetScrollPageSize(int,int)
+      SetScrollPageSize__23wxGenericScrolledWindowFiT1
+      ;wxGenericScrolledWindow::~wxGenericScrolledWindow()
+      __dt__23wxGenericScrolledWindowFv

       ;wxScrolledWindow::sm_classwxScrolledWindow
       sm_classwxScrolledWindow__16wxScrolledWindow
       ;wxScrolledWindow::sm_classwxScrolledWindow
       sm_classwxScrolledWindow__16wxScrolledWindow

-      ;wxScrolledWindow::SetScrollbars(int,int,int,int,int,int,unsigned long)
-      SetScrollbars__16wxScrolledWindowFiN51Ul
-      ;wxScrolledWindow::GetViewStart(int*,int*) const
-      GetViewStart__16wxScrolledWindowCFPiT1
-      ;wxScrolledWindow::CalcScrolledPosition(int,int,int*,int*) const
-      CalcScrolledPosition__16wxScrolledWindowCFiT1PiT3
-      ;wxScrolledWindow::sm_eventTableEntries
-      sm_eventTableEntries__16wxScrolledWindow
+      ;wxGenericScrolledWindow::OnPaint(wxPaintEvent&)
+      OnPaint__23wxGenericScrolledWindowFR12wxPaintEvent
+      ;wxGenericScrolledWindow::OnMouseWheel(wxMouseEvent&)
+      OnMouseWheel__23wxGenericScrolledWindowFR12wxMouseEvent
+      ;wxGenericScrolledWindow::GetScrollPixelsPerUnit(int*,int*) const
+      GetScrollPixelsPerUnit__23wxGenericScrolledWindowCFPiT1
+      ;wxGenericScrolledWindow::wxGenericScrolledWindow()
+      __ct__23wxGenericScrolledWindowFv
+      ;wxGenericScrolledWindow::GetTargetWindow()
+      GetTargetWindow__23wxGenericScrolledWindowFv
+      ;wxGenericScrolledWindow::AdjustScrollbars()
+      AdjustScrollbars__23wxGenericScrolledWindowFv
+      ;wxGenericScrolledWindow::sm_classwxGenericScrolledWindow
+      sm_classwxGenericScrolledWindow__23wxGenericScrolledWindow

   ;From object file:  ..\generic\splitter.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSplitterWindow::OnSize(wxSizeEvent&)
   ;From object file:  ..\generic\splitter.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSplitterWindow::OnSize(wxSizeEvent&)


@@ -9229,6 +9304,8 @@ EXPORTS
       sm_eventTableEntries__17wxGenericTreeCtrl
       ;wxGenericTreeCtrl::SetItemFont(const wxTreeItemId&,const wxFont&)
       SetItemFont__17wxGenericTreeCtrlFRC12wxTreeItemIdRC6wxFont
       sm_eventTableEntries__17wxGenericTreeCtrl
       ;wxGenericTreeCtrl::SetItemFont(const wxTreeItemId&,const wxFont&)
       SetItemFont__17wxGenericTreeCtrlFRC12wxTreeItemIdRC6wxFont

+      ;wxGenericTreeCtrl::SetFont(const wxFont&)
+      SetFont__17wxGenericTreeCtrlFRC6wxFont

       ;wxGenericTreeCtrl::OnPaint(wxPaintEvent&)
       OnPaint__17wxGenericTreeCtrlFR12wxPaintEvent
       ;wxTreeTextCtrl::OnKeyUp(wxKeyEvent&)
       ;wxGenericTreeCtrl::OnPaint(wxPaintEvent&)
       OnPaint__17wxGenericTreeCtrlFR12wxPaintEvent
       ;wxTreeTextCtrl::OnKeyUp(wxKeyEvent&)


@@ -9512,6 +9589,8 @@ EXPORTS
       wxConstructorForwxHtmlHelpData__Fv
       ;wxHtmlSearchStatus::wxHtmlSearchStatus(wxHtmlHelpData*,const wxString&,unsigned long,unsigned long,const wxString&)
       __ct__18wxHtmlSearchStatusFP14wxHtmlHelpDataRC8wxStringUlT3T2
       wxConstructorForwxHtmlHelpData__Fv
       ;wxHtmlSearchStatus::wxHtmlSearchStatus(wxHtmlHelpData*,const wxString&,unsigned long,unsigned long,const wxString&)
       __ct__18wxHtmlSearchStatusFP14wxHtmlHelpDataRC8wxStringUlT3T2

+      ;wxHtmlBookRecord::GetFullPath(const wxString&) const
+      GetFullPath__16wxHtmlBookRecordCFRC8wxString

       ;wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord*,wxFileSystem&,const wxString&,const wxString&)
       LoadMSProject__14wxHtmlHelpDataFP16wxHtmlBookRecordR12wxFileSystemRC8wxStringT3
       __vft14wxSearchEngine8wxObject
       ;wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord*,wxFileSystem&,const wxString&,const wxString&)
       LoadMSProject__14wxHtmlHelpDataFP16wxHtmlBookRecordR12wxFileSystemRC8wxStringT3
       __vft14wxSearchEngine8wxObject


@@ -9730,6 +9809,8 @@ EXPORTS
       DoneParser__12wxHtmlParserFv
       ;wxHtmlParser::AddTagHandler(wxHtmlTagHandler*)
       AddTagHandler__12wxHtmlParserFP16wxHtmlTagHandler
       DoneParser__12wxHtmlParserFv
       ;wxHtmlParser::AddTagHandler(wxHtmlTagHandler*)
       AddTagHandler__12wxHtmlParserFP16wxHtmlTagHandler

+      ;wxHtmlParser::SetSource(const wxString&)
+      SetSource__12wxHtmlParserFRC8wxString

       ;wxHtmlParser::PopTagHandler()
       PopTagHandler__12wxHtmlParserFv
       ;wxHtmlTagHandler::sm_classwxHtmlTagHandler
       ;wxHtmlParser::PopTagHandler()
       PopTagHandler__12wxHtmlParserFv
       ;wxHtmlTagHandler::sm_classwxHtmlTagHandler


@@ -9769,38 +9850,45 @@ EXPORTS
       sm_classwxHtmlTag__9wxHtmlTag
   ;From object file:  ..\html\htmlwin.cpp
     ;PUBDEFs (Symbols available from object file):
       sm_classwxHtmlTag__9wxHtmlTag
   ;From object file:  ..\html\htmlwin.cpp
     ;PUBDEFs (Symbols available from object file):

-      ;wxHtmlWindow::SetFonts(wxString,wxString,const int*)
-      SetFonts__12wxHtmlWindowF8wxStringT1PCi
+      ;wxHtmlHistoryArray::RemoveAt(unsigned int)
+      RemoveAt__18wxHtmlHistoryArrayFUi

       ;wxHtmlWinModule::sm_classwxHtmlWinModule
       sm_classwxHtmlWinModule__15wxHtmlWinModule
       ;wxHtmlWinModule::sm_classwxHtmlWinModule
       sm_classwxHtmlWinModule__15wxHtmlWinModule

+      ;wxHtmlWindow::SetFonts(wxString,wxString,const int*)
+      SetFonts__12wxHtmlWindowF8wxStringT1PCi
+      ;wxHtmlHistoryArray::DoCopy(const wxHtmlHistoryArray&)
+      DoCopy__18wxHtmlHistoryArrayFRC18wxHtmlHistoryArray
+      ;wxHtmlHistoryArray::Add(const wxHtmlHistoryItem&)
+      Add__18wxHtmlHistoryArrayFRC17wxHtmlHistoryItem
+      ;wxHtmlHistoryArray::~wxHtmlHistoryArray()
+      __dt__18wxHtmlHistoryArrayFv

       ;wxHtmlWindow::~wxHtmlWindow()
       __dt__12wxHtmlWindowFv
       ;wxHtmlWindow::HistoryCanForward()
       HistoryCanForward__12wxHtmlWindowFv
       ;wxHtmlWindow::HistoryBack()
       HistoryBack__12wxHtmlWindowFv
       ;wxHtmlWindow::~wxHtmlWindow()
       __dt__12wxHtmlWindowFv
       ;wxHtmlWindow::HistoryCanForward()
       HistoryCanForward__12wxHtmlWindowFv
       ;wxHtmlWindow::HistoryBack()
       HistoryBack__12wxHtmlWindowFv

+      ;wxwxHtmlProcessorListNode::DeleteData()
+      DeleteData__25wxwxHtmlProcessorListNodeFv
+      ;wxHtmlWindow::AddGlobalProcessor(wxHtmlProcessor*)
+      AddGlobalProcessor__12wxHtmlWindowFP15wxHtmlProcessor

       ;wxHtmlWindow::AddFilter(wxHtmlFilter*)
       AddFilter__12wxHtmlWindowFP12wxHtmlFilter
       ;wxHtmlWindow::OnDraw(wxDC&)
       OnDraw__12wxHtmlWindowFR4wxDC
       ;wxHtmlWindow::m_Filters
       m_Filters__12wxHtmlWindow
       ;wxHtmlWindow::AddFilter(wxHtmlFilter*)
       AddFilter__12wxHtmlWindowFP12wxHtmlFilter
       ;wxHtmlWindow::OnDraw(wxDC&)
       OnDraw__12wxHtmlWindowFR4wxDC
       ;wxHtmlWindow::m_Filters
       m_Filters__12wxHtmlWindow

-      ;HtmlHistoryArray::Index(const HtmlHistoryItem&,unsigned long) const
-      Index__16HtmlHistoryArrayCFRC15HtmlHistoryItemUl
-      ;HtmlHistoryArray::RemoveAt(unsigned int)
-      RemoveAt__16HtmlHistoryArrayFUi
-      ;HtmlHistoryArray::operator=(const HtmlHistoryArray&)
-      __as__16HtmlHistoryArrayFRC16HtmlHistoryArray
-      ;HtmlHistoryArray::Insert(const HtmlHistoryItem&,unsigned int)
-      Insert__16HtmlHistoryArrayFRC15HtmlHistoryItemUi
-      ;HtmlHistoryArray::DoCopy(const HtmlHistoryArray&)
-      DoCopy__16HtmlHistoryArrayFRC16HtmlHistoryArray
-      ;HtmlHistoryArray::Add(const HtmlHistoryItem&)
-      Add__16HtmlHistoryArrayFRC15HtmlHistoryItem
-      ;HtmlHistoryArray::DoEmpty()
-      DoEmpty__16HtmlHistoryArrayFv
+      ;wxHtmlHistoryArray::Index(const wxHtmlHistoryItem&,unsigned long) const
+      Index__18wxHtmlHistoryArrayCFRC17wxHtmlHistoryItemUl
+      ;wxHtmlHistoryArray::Insert(const wxHtmlHistoryItem&,unsigned int)
+      Insert__18wxHtmlHistoryArrayFRC17wxHtmlHistoryItemUi
+      __vft25wxwxHtmlProcessorListNode10wxNodeBase
+      ;wxHtmlHistoryArray::DoEmpty()
+      DoEmpty__18wxHtmlHistoryArrayFv

       ;wxConstructorForwxHtmlWinModule()
       wxConstructorForwxHtmlWinModule__Fv
       ;wxConstructorForwxHtmlWinModule()
       wxConstructorForwxHtmlWinModule__Fv

+      ;wxHtmlProcessor::sm_classwxHtmlProcessor
+      sm_classwxHtmlProcessor__15wxHtmlProcessor

       ;wxHtmlWindow::HistoryClear()
       HistoryClear__12wxHtmlWindowFv
       ;wxHtmlWindow::GetEventTable() const
       ;wxHtmlWindow::HistoryClear()
       HistoryClear__12wxHtmlWindowFv
       ;wxHtmlWindow::GetEventTable() const


@@ -9821,6 +9909,10 @@ EXPORTS
       OnSize__12wxHtmlWindowFR11wxSizeEvent
       ;wxHtmlWindow::OnMouseEvent(wxMouseEvent&)
       OnMouseEvent__12wxHtmlWindowFR12wxMouseEvent
       OnSize__12wxHtmlWindowFR11wxSizeEvent
       ;wxHtmlWindow::OnMouseEvent(wxMouseEvent&)
       OnMouseEvent__12wxHtmlWindowFR12wxMouseEvent

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

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


@@ -9835,21 +9927,21 @@ EXPORTS
       ReadCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
       ;wxHtmlWindow::OnIdle(wxIdleEvent&)
       OnIdle__12wxHtmlWindowFR11wxIdleEvent
       ReadCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
       ;wxHtmlWindow::OnIdle(wxIdleEvent&)
       OnIdle__12wxHtmlWindowFR11wxIdleEvent

-      ;HtmlHistoryArray::~HtmlHistoryArray()
-      __dt__16HtmlHistoryArrayFv
-      ;wxConstructorForwxHtmlWindow()
-      wxConstructorForwxHtmlWindow__Fv

       ;wxHtmlWindow::CreateLayout()
       CreateLayout__12wxHtmlWindowFv
       ;wxHtmlWindow::CreateLayout()
       CreateLayout__12wxHtmlWindowFv

+      ;wxConstructorForwxHtmlWindow()
+      wxConstructorForwxHtmlWindow__Fv

       ;wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo&)
       OnLinkClicked__12wxHtmlWindowFRC14wxHtmlLinkInfo
       ;wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo&)
       OnLinkClicked__12wxHtmlWindowFRC14wxHtmlLinkInfo

+      ;wxHtmlWindow::m_GlobalProcessors
+      m_GlobalProcessors__12wxHtmlWindow

       __vft12wxHtmlWindow8wxObject
       __vft12wxHtmlWindow8wxObject

-      ;HtmlHistoryArray::HtmlHistoryArray(const HtmlHistoryArray&)
-      __ct__16HtmlHistoryArrayFRC16HtmlHistoryArray

       ;wxHtmlWindow::HistoryCanBack()
       HistoryCanBack__12wxHtmlWindowFv
       ;wxHtmlWindow::HistoryForward()
       HistoryForward__12wxHtmlWindowFv
       ;wxHtmlWindow::HistoryCanBack()
       HistoryCanBack__12wxHtmlWindowFv
       ;wxHtmlWindow::HistoryForward()
       HistoryForward__12wxHtmlWindowFv

+      ;wxHtmlWindow::AddProcessor(wxHtmlProcessor*)
+      AddProcessor__12wxHtmlWindowFP15wxHtmlProcessor

       ;wxHtmlWindow::wxHtmlWindow(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       __ct__12wxHtmlWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxHtmlWindow::sm_eventTableEntries
       ;wxHtmlWindow::wxHtmlWindow(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       __ct__12wxHtmlWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxHtmlWindow::sm_eventTableEntries


@@ -10042,19 +10134,12 @@ EXPORTS
       _link_dummy_func_m_meta__Fv
   ;From object file:  ..\html\m_pre.cpp
     ;PUBDEFs (Symbols available from object file):
       _link_dummy_func_m_meta__Fv
   ;From object file:  ..\html\m_pre.cpp
     ;PUBDEFs (Symbols available from object file):

-      __vft13wxHtmlPRECell8wxObject

       ;HTML_ModulePre::sm_classHTML_ModulePre
       sm_classHTML_ModulePre__14HTML_ModulePre
       ;_link_dummy_func_m_pre()
       _link_dummy_func_m_pre__Fv
       ;wxConstructorForHTML_ModulePre()
       wxConstructorForHTML_ModulePre__Fv
       ;HTML_ModulePre::sm_classHTML_ModulePre
       sm_classHTML_ModulePre__14HTML_ModulePre
       ;_link_dummy_func_m_pre()
       _link_dummy_func_m_pre__Fv
       ;wxConstructorForHTML_ModulePre()
       wxConstructorForHTML_ModulePre__Fv

-      ;wxHtmlPRECell::~wxHtmlPRECell()
-      __dt__13wxHtmlPRECellFv
-      ;wxHtmlPRECell::Draw(wxDC&,int,int,int,int)
-      Draw__13wxHtmlPRECellFR4wxDCiN32
-      ;wxHtmlPRECell::wxHtmlPRECell(const wxString&,wxDC&)
-      __ct__13wxHtmlPRECellFRC8wxStringR4wxDC

   ;From object file:  ..\html\m_tables.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTableCell::ReallocRows(int)
   ;From object file:  ..\html\m_tables.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTableCell::ReallocRows(int)


@@ -10182,11 +10267,15 @@ EXPORTS
       wxTheApp
       ;wxApp::sm_classwxApp
       sm_classwxApp__5wxApp
       wxTheApp
       ;wxApp::sm_classwxApp
       sm_classwxApp__5wxApp

-      ;wxConstructorForwxApp()
-      wxConstructorForwxApp__Fv
+      ;wxAppRemoveSocketHandler(int)
+      wxAppRemoveSocketHandler__Fi
+      ;wxAppAddSocketHandler(int,int,void(*)(void*),void*)
+      wxAppAddSocketHandler__FiT1PFPv_vPv

       ;wxWakeUpIdle()
       wxWakeUpIdle__Fv
       wxSTD_MDICHILDFRAME_ICON
       ;wxWakeUpIdle()
       wxWakeUpIdle__Fv
       wxSTD_MDICHILDFRAME_ICON

+      ;wxConstructorForwxApp()
+      wxConstructorForwxApp__Fv

       vHabmain
       ;wxApp::~wxApp()
       __dt__5wxAppFv
       vHabmain
       ;wxApp::~wxApp()
       __dt__5wxAppFv


@@ -10194,6 +10283,8 @@ EXPORTS
       Pending__5wxAppFv
       ;wxApp::DeletePendingObjects()
       DeletePendingObjects__5wxAppFv
       Pending__5wxAppFv
       ;wxApp::DeletePendingObjects()
       DeletePendingObjects__5wxAppFv

+      ;wxApp::AddSocketHandler(int,int,void(*)(void*),void*)
+      AddSocketHandler__5wxAppFiT1PFPv_vPv

       CANTREGISTERCLASS
       ;wxApp::RegisterWindowClasses(unsigned long)
       RegisterWindowClasses__5wxAppFUl
       CANTREGISTERCLASS
       ;wxApp::RegisterWindowClasses(unsigned long)
       RegisterWindowClasses__5wxAppFUl


@@ -10207,11 +10298,13 @@ EXPORTS
       wxMDIFrameClassName
       ;wxMsgArray::Insert(const _QMSG&,unsigned int)
       Insert__10wxMsgArrayFRC5_QMSGUi
       wxMDIFrameClassName
       ;wxMsgArray::Insert(const _QMSG&,unsigned int)
       Insert__10wxMsgArrayFRC5_QMSGUi

-      ;wxApp::wxApp()
-      __ct__5wxAppFv
+      ;wxApp::HandleSockets()
+      HandleSockets__5wxAppFv

       ;wxYieldIfNeeded()
       wxYieldIfNeeded__Fv
       wxDEFAULT_MDIPARENTFRAME_ICON
       ;wxYieldIfNeeded()
       wxYieldIfNeeded__Fv
       wxDEFAULT_MDIPARENTFRAME_ICON

+      ;wxApp::wxApp()
+      __ct__5wxAppFv

       ;wxApp::SendIdleEvents()
       SendIdleEvents__5wxAppFv
       ;wxApp::ProcessMessage(void**)
       ;wxApp::SendIdleEvents()
       SendIdleEvents__5wxAppFv
       ;wxApp::ProcessMessage(void**)


@@ -10227,6 +10320,8 @@ EXPORTS
       DoCopy__10wxMsgArrayFRC10wxMsgArray
       ;wxMsgArray::operator=(const wxMsgArray&)
       __as__10wxMsgArrayFRC10wxMsgArray
       DoCopy__10wxMsgArrayFRC10wxMsgArray
       ;wxMsgArray::operator=(const wxMsgArray&)
       __as__10wxMsgArrayFRC10wxMsgArray

+      ;wxApp::RemoveSocketHandler(int)
+      RemoveSocketHandler__5wxAppFi

       ;wxYield()
       wxYield__Fv
       wxSTD_FRAME_ICON
       ;wxYield()
       wxYield__Fv
       wxSTD_FRAME_ICON


@@ -10583,8 +10678,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxClipboard::IsSupported(wxDataFormat)
       IsSupported__11wxClipboardF12wxDataFormat
     ;PUBDEFs (Symbols available from object file):
       ;wxClipboard::IsSupported(wxDataFormat)
       IsSupported__11wxClipboardF12wxDataFormat

-      ;wxClipboard::GetData(wxDataObject*)
-      GetData__11wxClipboardFP12wxDataObject

       ;wxGetClipboardFormatName(wxDataFormat,char*,int)
       wxGetClipboardFormatName__F12wxDataFormatPci
       ;wxClipboard::wxClipboard()
       ;wxGetClipboardFormatName(wxDataFormat,char*,int)
       wxGetClipboardFormatName__F12wxDataFormatPci
       ;wxClipboard::wxClipboard()


@@ -10622,6 +10715,8 @@ EXPORTS
       Flush__11wxClipboardFv
       ;wxIsClipboardFormatAvailable(wxDataFormat)
       wxIsClipboardFormatAvailable__F12wxDataFormat
       Flush__11wxClipboardFv
       ;wxIsClipboardFormatAvailable(wxDataFormat)
       wxIsClipboardFormatAvailable__F12wxDataFormat

+      ;wxClipboard::GetData(wxDataObject&)
+      GetData__11wxClipboardFR12wxDataObject

       ;wxClipboard::~wxClipboard()
       __dt__11wxClipboardFv
       ;wxClipboard::Clear()
       ;wxClipboard::~wxClipboard()
       __dt__11wxClipboardFv
       ;wxClipboard::Clear()


@@ -10694,8 +10789,6 @@ EXPORTS
       sm_eventTable__9wxControl
       ;wxControl::OS2CreateControl(const char*,unsigned long,const wxPoint&,const wxSize&,const wxString&,unsigned long)
       OS2CreateControl__9wxControlFPCcUlRC7wxPointRC6wxSizeRC8wxStringT2
       sm_eventTable__9wxControl
       ;wxControl::OS2CreateControl(const char*,unsigned long,const wxPoint&,const wxSize&,const wxString&,unsigned long)
       OS2CreateControl__9wxControlFPCcUlRC7wxPointRC6wxSizeRC8wxStringT2

-      ;wxControl::OS2OnNotify(int,void*,void**)
-      OS2OnNotify__9wxControlFiPvPPv

       ;wxControl::GetExStyle(unsigned long&) const
       GetExStyle__9wxControlCFRUl
       ;wxControl::sm_eventTableEntries
       ;wxControl::GetExStyle(unsigned long&) const
       GetExStyle__9wxControlCFRUl
       ;wxControl::sm_eventTableEntries


@@ -10708,6 +10801,8 @@ EXPORTS
       Create__9wxControlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxControl::ProcessCommand(wxCommandEvent&)
       ProcessCommand__9wxControlFR14wxCommandEvent
       Create__9wxControlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxControl::ProcessCommand(wxCommandEvent&)
       ProcessCommand__9wxControlFR14wxCommandEvent

+      ;wxControl::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
+      OnCtlColor__9wxControlFUlT1UiT3PvT5

       ;wxControl::wxControl()
       __ct__9wxControlFv
       ;wxControl::GetEventTable() const
       ;wxControl::wxControl()
       __ct__9wxControlFv
       ;wxControl::GetEventTable() const


@@ -11037,6 +11132,8 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxConstructorForwxPaintDC()
       wxConstructorForwxPaintDC__Fv
     ;PUBDEFs (Symbols available from object file):
       ;wxConstructorForwxPaintDC()
       wxConstructorForwxPaintDC__Fv

+      ;wxWindowDC::InitDC()
+      InitDC__10wxWindowDCFv

       ;wxArrayDCInfo::DoCopy(const wxArrayDCInfo&)
       DoCopy__13wxArrayDCInfoFRC13wxArrayDCInfo
       ;wxArrayDCInfo::Add(const wxPaintDCInfo&)
       ;wxArrayDCInfo::DoCopy(const wxArrayDCInfo&)
       DoCopy__13wxArrayDCInfoFRC13wxArrayDCInfo
       ;wxArrayDCInfo::Add(const wxPaintDCInfo&)


@@ -11047,7 +11144,8 @@ EXPORTS
       __as__13wxArrayDCInfoFRC13wxArrayDCInfo
       ;wxClientDC::wxClientDC(wxWindow*)
       __ct__10wxClientDCFP8wxWindow
       __as__13wxArrayDCInfoFRC13wxArrayDCInfo
       ;wxClientDC::wxClientDC(wxWindow*)
       __ct__10wxClientDCFP8wxWindow

-      __vft10wxWindowDC8wxObject
+      ;wxPaintDC::FindDCInCache(wxWindow*)
+      FindDCInCache__9wxPaintDCFP8wxWindow

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


@@ -11066,15 +11164,10 @@ EXPORTS
       FindInCache__9wxPaintDCCFPUi
       ;wxArrayDCInfo::DoEmpty()
       DoEmpty__13wxArrayDCInfoFv
       FindInCache__9wxPaintDCCFPUi
       ;wxArrayDCInfo::DoEmpty()
       DoEmpty__13wxArrayDCInfoFv

-      ;wxWindowDC::~wxWindowDC()
-      __dt__10wxWindowDCFv
-      ;wxClientDC::~wxClientDC()
-      __dt__10wxClientDCFv

       ;wxClientDC::sm_classwxClientDC
       sm_classwxClientDC__10wxClientDC
       ;wxPaintDC::sm_classwxPaintDC
       sm_classwxPaintDC__9wxPaintDC
       ;wxClientDC::sm_classwxClientDC
       sm_classwxClientDC__10wxClientDC
       ;wxPaintDC::sm_classwxPaintDC
       sm_classwxPaintDC__9wxPaintDC

-      __vft10wxClientDC8wxObject

       __vft9wxPaintDC8wxObject
       ;wxArrayDCInfo::~wxArrayDCInfo()
       __dt__13wxArrayDCInfoFv
       __vft9wxPaintDC8wxObject
       ;wxArrayDCInfo::~wxArrayDCInfo()
       __dt__13wxArrayDCInfoFv


@@ -11096,24 +11189,30 @@ EXPORTS
       ;wxMemoryDC::SelectObject(const wxBitmap&)
       SelectObject__10wxMemoryDCFRC8wxBitmap
       __vft10wxMemoryDC8wxObject
       ;wxMemoryDC::SelectObject(const wxBitmap&)
       SelectObject__10wxMemoryDCFRC8wxBitmap
       __vft10wxMemoryDC8wxObject

+      ;wxMemoryDC::Init()
+      Init__10wxMemoryDCFv

       ;wxMemoryDC::DoGetSize(int*,int*) const
       DoGetSize__10wxMemoryDCCFPiT1
       ;wxMemoryDC::wxMemoryDC(wxDC*)
       __ct__10wxMemoryDCFP4wxDC
       ;wxMemoryDC::DoGetSize(int*,int*) const
       DoGetSize__10wxMemoryDCCFPiT1
       ;wxMemoryDC::wxMemoryDC(wxDC*)
       __ct__10wxMemoryDCFP4wxDC

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

       ;wxMemoryDC::wxMemoryDC()
       __ct__10wxMemoryDCFv
       ;wxMemoryDC::sm_classwxMemoryDC
       sm_classwxMemoryDC__10wxMemoryDC
       ;wxConstructorForwxMemoryDC()
       wxConstructorForwxMemoryDC__Fv
       ;wxMemoryDC::wxMemoryDC()
       __ct__10wxMemoryDCFv
       ;wxMemoryDC::sm_classwxMemoryDC
       sm_classwxMemoryDC__10wxMemoryDC
       ;wxConstructorForwxMemoryDC()
       wxConstructorForwxMemoryDC__Fv

-      ;wxMemoryDC::~wxMemoryDC()
-      __dt__10wxMemoryDCFv
+      ;wxMemoryDC::CreateCompatible(wxDC*)
+      CreateCompatible__10wxMemoryDCFP4wxDC

   ;From object file:  ..\os2\dcprint.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPrinterDC::EndDoc()
       EndDoc__11wxPrinterDCFv
       ;wxPrinterDC::EndPage()
       EndPage__11wxPrinterDCFv
   ;From object file:  ..\os2\dcprint.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPrinterDC::EndDoc()
       EndDoc__11wxPrinterDCFv
       ;wxPrinterDC::EndPage()
       EndPage__11wxPrinterDCFv

+      ;wxPrinterDC::DoBlit(int,int,int,int,wxDC*,int,int,int,unsigned long)
+      DoBlit__11wxPrinterDCFiN31P4wxDCN31Ul

       ;wxGetPrinterDC(const wxPrintData&)
       wxGetPrinterDC__FRC11wxPrintData
       ;wxPrinterDC::sm_classwxPrinterDC
       ;wxGetPrinterDC(const wxPrintData&)
       wxGetPrinterDC__FRC11wxPrintData
       ;wxPrinterDC::sm_classwxPrinterDC


@@ -11127,17 +11226,16 @@ EXPORTS
       StartPage__11wxPrinterDCFv
       ;wxPrinterDC::StartDoc(const wxString&)
       StartDoc__11wxPrinterDCFRC8wxString
       StartPage__11wxPrinterDCFv
       ;wxPrinterDC::StartDoc(const wxString&)
       StartDoc__11wxPrinterDCFRC8wxString

+      ;wxPrinterDC::DoDrawBitmap(const wxBitmap&,int,int,unsigned long)
+      DoDrawBitmap__11wxPrinterDCFRC8wxBitmapiT2Ul

       ;wxPrinterDC::wxPrinterDC(const wxPrintData&)
       __ct__11wxPrinterDCFRC11wxPrintData
       ;wxPrinterDC::wxPrinterDC(const wxPrintData&)
       __ct__11wxPrinterDCFRC11wxPrintData

-      ;wxPrinterDC::~wxPrinterDC()
-      __dt__11wxPrinterDCFv
+      ;wxPrinterDC::Init()
+      Init__11wxPrinterDCFv

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

-      ;wxScreenDC::~wxScreenDC()
-      __dt__10wxScreenDCFv

       ;wxConstructorForwxScreenDC()
       wxConstructorForwxScreenDC__Fv
       ;wxConstructorForwxScreenDC()
       wxConstructorForwxScreenDC__Fv

-      __vft10wxScreenDC8wxObject

       ;wxScreenDC::sm_classwxScreenDC
       sm_classwxScreenDC__10wxScreenDC
       ;wxScreenDC::wxScreenDC()
       ;wxScreenDC::sm_classwxScreenDC
       sm_classwxScreenDC__10wxScreenDC
       ;wxScreenDC::wxScreenDC()


@@ -11148,20 +11246,16 @@ EXPORTS
       SetModal__8wxDialogFUl
       ;wxDialog::OnCancel(wxCommandEvent&)
       OnCancel__8wxDialogFR14wxCommandEvent
       SetModal__8wxDialogFUl
       ;wxDialog::OnCancel(wxCommandEvent&)
       OnCancel__8wxDialogFR14wxCommandEvent

-      ;wxDialog::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
-      OnCtlColor__8wxDialogFUlT1UiT3PvT5
+      ;wxDialog::DoGetPosition(int*,int*) const
+      DoGetPosition__8wxDialogCFPiT1

       ;wxDialog::IsIconized() const
       IsIconized__8wxDialogCFv
       ;wxDialog::IsModal() const
       IsModal__8wxDialogCFv
       ;wxDialog::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       Create__8wxDialogFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
       ;wxDialog::IsIconized() const
       IsIconized__8wxDialogCFv
       ;wxDialog::IsModal() const
       IsModal__8wxDialogCFv
       ;wxDialog::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       Create__8wxDialogFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3

-      ;wxDialog::SetTitle(const wxString&)
-      SetTitle__8wxDialogFRC8wxString
-      ;wxDialog::OnPaint(wxPaintEvent&)
-      OnPaint__8wxDialogFR12wxPaintEvent
-      ;wxDialog::OnSize(wxSizeEvent&)
-      OnSize__8wxDialogFR11wxSizeEvent
+      ;wxDialog::IsModalShowing() const
+      IsModalShowing__8wxDialogCFv

       wxModalDialogs
       ;wxDialog::sm_eventTableEntries
       sm_eventTableEntries__8wxDialog
       wxModalDialogs
       ;wxDialog::sm_eventTableEntries
       sm_eventTableEntries__8wxDialog


@@ -11171,8 +11265,8 @@ EXPORTS
       OnCloseWindow__8wxDialogFR12wxCloseEvent
       ;wxDialog::DoSetClientSize(int,int)
       DoSetClientSize__8wxDialogFiT1
       OnCloseWindow__8wxDialogFR12wxCloseEvent
       ;wxDialog::DoSetClientSize(int,int)
       DoSetClientSize__8wxDialogFiT1

-      ;wxDialog::GetPosition(int*,int*) const
-      GetPosition__8wxDialogCFPiT1
+      ;wxDialog::Init()
+      Init__8wxDialogFv

       ;wxDialog::ShowModal()
       ShowModal__8wxDialogFv
       ;wxDialog::sm_classwxDialog
       ;wxDialog::ShowModal()
       ShowModal__8wxDialogFv
       ;wxDialog::sm_classwxDialog


@@ -11182,12 +11276,8 @@ EXPORTS
       __vft8wxDialog8wxObject
       ;wxDialog::OnSysColourChanged(wxSysColourChangedEvent&)
       OnSysColourChanged__8wxDialogFR23wxSysColourChangedEvent
       __vft8wxDialog8wxObject
       ;wxDialog::OnSysColourChanged(wxSysColourChangedEvent&)
       OnSysColourChanged__8wxDialogFR23wxSysColourChangedEvent

-      ;wxDialog::Centre(int)
-      Centre__8wxDialogFi
-      ;wxDialog::wxDialog()
-      __ct__8wxDialogFv
-      ;wxDialog::GetTitle() const
-      GetTitle__8wxDialogCFv
+      ;wxDialog::DoShowModal()
+      DoShowModal__8wxDialogFv

       ;wxDialog::Destroy()
       Destroy__8wxDialogFv
       ;wxDialog::Iconize(unsigned long)
       ;wxDialog::Destroy()
       Destroy__8wxDialogFv
       ;wxDialog::Iconize(unsigned long)


@@ -11204,12 +11294,8 @@ EXPORTS
       wxConstructorForwxDialog__Fv
       ;wxDialog::OS2WindowProc(unsigned int,void*,void*)
       OS2WindowProc__8wxDialogFUiPvT2
       wxConstructorForwxDialog__Fv
       ;wxDialog::OS2WindowProc(unsigned int,void*,void*)
       OS2WindowProc__8wxDialogFUiPvT2

-      ;wxDialog::IsShown() const
-      IsShown__8wxDialogCFv

       ;wxDialog::GetEventTable() const
       GetEventTable__8wxDialogCFv
       ;wxDialog::GetEventTable() const
       GetEventTable__8wxDialogCFv

-      ;wxDialog::Fit()
-      Fit__8wxDialogFv

       wxModelessWindows
       ;wxDialog::sm_eventTable
       sm_eventTable__8wxDialog
       wxModelessWindows
       ;wxDialog::sm_eventTable
       sm_eventTable__8wxDialog


@@ -11239,6 +11325,8 @@ EXPORTS
       __ct__9wxDirDataFRC8wxString
       ;wxDir::Open(const wxString&)
       Open__5wxDirFRC8wxString
       __ct__9wxDirDataFRC8wxString
       ;wxDir::Open(const wxString&)
       Open__5wxDirFRC8wxString

+      ;wxDir::GetName() const
+      GetName__5wxDirCFv

   ;From object file:  ..\os2\dirdlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDirDialog::sm_classwxDirDialog
   ;From object file:  ..\os2\dirdlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDirDialog::sm_classwxDirDialog


@@ -11305,6 +11393,8 @@ EXPORTS
       OS2SelectMatchingFontByName__6wxFontFv
       ;wxFont::IsFree() const
       IsFree__6wxFontCFv
       OS2SelectMatchingFontByName__6wxFontFv
       ;wxFont::IsFree() const
       IsFree__6wxFontCFv

+      ;wxFont::GetHFONT() const
+      GetHFONT__6wxFontCFv

       ;wxFont::GetFamily() const
       GetFamily__6wxFontCFv
       ;wxFont::GetFaceName() const
       ;wxFont::GetFamily() const
       GetFamily__6wxFontCFv
       ;wxFont::GetFaceName() const


@@ -11607,8 +11697,6 @@ EXPORTS
       GSocket_Shutdown
       GSocket_GetPeer
       GAddress_new
       GSocket_Shutdown
       GSocket_GetPeer
       GAddress_new

-      ;_GAddress_Init_UNIX(_GAddress*)
-      _GAddress_Init_UNIX__FP9_GAddress

       GSocket_SetNonBlocking
       GAddress_INET_SetAnyAddress
       GAddress_INET_GetHostAddress
       GSocket_SetNonBlocking
       GAddress_INET_SetAnyAddress
       GAddress_INET_GetHostAddress


@@ -11620,7 +11708,6 @@ EXPORTS
       _GAddress_Init_INET
       GSocket_Read
       GSocket_Connect
       _GAddress_Init_INET
       GSocket_Read
       GSocket_Connect

-      GAddress_UNIX_GetPath

       GAddress_INET_GetPort
       GSocket_destroy
       _GAddress_translate_from
       GAddress_INET_GetPort
       GSocket_destroy
       _GAddress_translate_from


@@ -11634,7 +11721,6 @@ EXPORTS
       _GSocket_Output_Timeout
       _GSocket_Detected_Read
       GSocket_SetTimeout
       _GSocket_Output_Timeout
       _GSocket_Detected_Read
       GSocket_SetTimeout

-      GAddress_UNIX_SetPath

       GAddress_INET_SetPort
       _GSocket_Recv_Stream
       _GSocket_Detected_Write
       GAddress_INET_SetPort
       _GSocket_Recv_Stream
       _GSocket_Detected_Write


@@ -11643,6 +11729,14 @@ EXPORTS
       GSocket_SetServer
       GSocket_UnsetCallback
       _GAddress_translate_to
       GSocket_SetServer
       GSocket_UnsetCallback
       _GAddress_translate_to

+  ;From object file:  ..\os2\gsockpm.c
+    ;PUBDEFs (Symbols available from object file):
+      _GSocket_GUI_Destroy
+      _GSocket_Install_Callback
+      _GSocket_Disable_Events
+      _GSocket_GUI_Init
+      _GSocket_Uninstall_Callback
+      _GSocket_Enable_Events

   ;From object file:  ..\os2\helpwin.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxWinHelpController::Initialize(const wxString&)
   ;From object file:  ..\os2\helpwin.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxWinHelpController::Initialize(const wxString&)


@@ -12855,10 +12949,10 @@ EXPORTS
       Create__12wxStaticTextFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
       ;wxStaticText::sm_classwxStaticText
       sm_classwxStaticText__12wxStaticText
       Create__12wxStaticTextFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
       ;wxStaticText::sm_classwxStaticText
       sm_classwxStaticText__12wxStaticText

-      ;wxStaticText::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
-      OnCtlColor__12wxStaticTextFUlT1UiT3PvT5

       ;wxConstructorForwxStaticText()
       wxConstructorForwxStaticText__Fv
       ;wxConstructorForwxStaticText()
       wxConstructorForwxStaticText__Fv

+      ;wxStaticText::SetFont(const wxFont&)
+      SetFont__12wxStaticTextFRC6wxFont

       __vft12wxStaticText8wxObject
       ;wxStaticText::DoGetBestSize() const
       DoGetBestSize__12wxStaticTextCFv
       __vft12wxStaticText8wxObject
       ;wxStaticText::DoGetBestSize() const
       DoGetBestSize__12wxStaticTextCFv


@@ -13106,14 +13200,18 @@ EXPORTS
       OnDropFiles__10wxTextCtrlFR16wxDropFilesEvent
       ;wxTextCtrl::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
       OnCtlColor__10wxTextCtrlFUlT1UiT3PvT5
       OnDropFiles__10wxTextCtrlFR16wxDropFilesEvent
       ;wxTextCtrl::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
       OnCtlColor__10wxTextCtrlFUlT1UiT3PvT5

-      ;wxTextCtrl::GetInsertionPoint() const
-      GetInsertionPoint__10wxTextCtrlCFv
+      ;wxTextCtrl::AdjustSpaceLimit()
+      AdjustSpaceLimit__10wxTextCtrlFv

       ;wxTextCtrl::Undo()
       Undo__10wxTextCtrlFv
       ;wxTextCtrl::Undo()
       Undo__10wxTextCtrlFv

+      ;wxTextCtrl::SetForegroundColour(const wxColour&)
+      SetForegroundColour__10wxTextCtrlFRC8wxColour
+      ;wxTextCtrl::SetBackgroundColour(const wxColour&)
+      SetBackgroundColour__10wxTextCtrlFRC8wxColour

       ;wxTextCtrl::PositionToXY(long,long*,long*) const
       PositionToXY__10wxTextCtrlCFlPlT2
       ;wxTextCtrl::PositionToXY(long,long*,long*) const
       PositionToXY__10wxTextCtrlCFlPlT2

-      ;wxTextCtrl::AdjustSpaceLimit()
-      AdjustSpaceLimit__10wxTextCtrlFv
+      ;wxTextCtrl::GetInsertionPoint() const
+      GetInsertionPoint__10wxTextCtrlCFv

       ;wxTextCtrl::SetValue(const wxString&)
       SetValue__10wxTextCtrlFRC8wxString
       ;wxTextCtrl::WriteText(const wxString&)
       ;wxTextCtrl::SetValue(const wxString&)
       SetValue__10wxTextCtrlFRC8wxString
       ;wxTextCtrl::WriteText(const wxString&)


@@ -13383,9 +13481,13 @@ EXPORTS
       wxFatalError__FRC8wxStringT1
       ;wxDisplaySize(int*,int*)
       wxDisplaySize__FPiT1
       wxFatalError__FRC8wxStringT1
       ;wxDisplaySize(int*,int*)
       wxDisplaySize__FPiT1

+      ;wxClientDisplayRect(int*,int*,int*,int*)
+      wxClientDisplayRect__FPiN31

       ;wxDisplayDepth()
       wxDisplayDepth__Fv
       gs_wxBusyCursor
       ;wxDisplayDepth()
       wxDisplayDepth__Fv
       gs_wxBusyCursor

+      ;wxSetEnv(const wxString&,const char*)
+      wxSetEnv__FRC8wxStringPCc

       ;wxGetHomeDir(wxString*)
       wxGetHomeDir__FP8wxString
       ;wxUsleep(unsigned long)
       ;wxGetHomeDir(wxString*)
       wxGetHomeDir__FP8wxString
       ;wxUsleep(unsigned long)


@@ -13418,6 +13520,8 @@ EXPORTS
       wxIsBusy__Fv
       ;wxGetFreeMemory()
       wxGetFreeMemory__Fv
       wxIsBusy__Fv
       ;wxGetFreeMemory()
       wxGetFreeMemory__Fv

+      ;wxGetEnv(const wxString&,wxString*)
+      wxGetEnv__FRC8wxStringP8wxString

   ;From object file:  ..\os2\utilsexc.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxExecute(char**,unsigned long,wxProcess*)
   ;From object file:  ..\os2\utilsexc.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxExecute(char**,unsigned long,wxProcess*)