X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f70adc9c1ade91476f7c4cff24deeae1d2e09be..ef397583dfdf7ba59ecb0a72659c455f04523c97:/src/os2/wx23.def?ds=sidebyside

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index 886a079aef..b563a5a96e 100644
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
-;From library:  ..\\..\\LIB\WX.lib
+;From library:  F:\DEV\WX2\WXWINDOWS\LIB\WX.lib
   ;From object file:  dummy.cpp
     ;PUBDEFs (Symbols available from object file):
       wxDummyChar
@@ -201,10 +201,10 @@ EXPORTS
       __ct__12wxColourDataFRC12wxColourData
       ;wxPrintData::operator=(const wxPrintSetupData&)
       __as__11wxPrintDataFRC16wxPrintSetupData
-      ;wxConstructorForwxPrintDialogData()
-      wxConstructorForwxPrintDialogData__Fv
       ;wxPrintData::~wxPrintData()
       __dt__11wxPrintDataFv
+      ;wxConstructorForwxPrintDialogData()
+      wxConstructorForwxPrintDialogData__Fv
       ;wxPageSetupDialogData::wxPageSetupDialogData()
       __ct__21wxPageSetupDialogDataFv
       ;wxPrintDialogData::wxPrintDialogData()
@@ -1361,6 +1361,7 @@ EXPORTS
       Connect__12wxEvtHandlerFiN21M8wxObjectFR7wxEvent_vP8wxObject
       wxEVT_SOCKET
       wxEVT_SCROLLWIN_PAGEUP
+      wxEVT_MOUSEWHEEL
       wxEVT_MIDDLE_UP
       wxEVT_MENU_INIT
       wxEVT_HELP
@@ -1503,6 +1504,7 @@ EXPORTS
       CopyObject__14wxCommandEventCFR8wxObject
       wxEVT_SCROLL_LINEUP
       wxEVT_PAINT
+      wxEVT_NULL
       wxEVT_NC_RIGHT_UP
       wxEVT_NC_PAINT
       wxEVT_LEFT_UP
@@ -1650,7 +1652,7 @@ EXPORTS
       wxEVT_NC_LEFT_DCLICK
       wxEVT_INIT_DIALOG
       wxEVT_COMMAND_SET_FOCUS
-  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\extended.c
+  ;From object file:  F:\DEV\WX2\WXWINDOWS\src\common\extended.c
     ;PUBDEFs (Symbols available from object file):
       ConvertToIeeeExtended
       ConvertFromIeeeExtended
@@ -1827,8 +1829,8 @@ EXPORTS
       DeleteEntry__11ConfigGroupFPCc
   ;From object file:  ..\common\filefn.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxCopyFile(const wxString&,const wxString&)
-      wxCopyFile__FRC8wxStringT1
+      ;wxCopyFile(const wxString&,const wxString&,unsigned long)
+      wxCopyFile__FRC8wxStringT1Ul
       ;wxSplitPath(const char*,wxString*,wxString*,wxString*)
       wxSplitPath__FPCcP8wxStringN22
       ;wxPathList::Add(const wxString&)
@@ -1923,12 +1925,12 @@ EXPORTS
       IsWild__10wxFileNameF12wxPathFormat
       ;wxFileName::Assign(const wxString&,const wxString&,const wxString&,wxPathFormat)
       Assign__10wxFileNameFRC8wxStringN2112wxPathFormat
-      ;wxFileName::Mkdir(int)
-      Mkdir__10wxFileNameFi
       ;wxFileName::Clear()
       Clear__10wxFileNameFv
       ;wxFileName::wxFileExists()
       wxFileExists__10wxFileNameFv
+      ;wxFileName::GetModificationTime()
+      GetModificationTime__10wxFileNameFv
       ;wxFileName::GetFullName() const
       GetFullName__10wxFileNameCFv
       ;wxFileName::AssignHomeDir()
@@ -1939,14 +1941,14 @@ EXPORTS
       PrependDir__10wxFileNameFRC8wxString
       ;wxFileName::GetPathSeparators(wxPathFormat)
       GetPathSeparators__10wxFileNameF12wxPathFormat
+      ;wxFileName::Mkdir(const wxString&,int,unsigned long)
+      Mkdir__10wxFileNameFRC8wxStringiUl
       ;wxFileName::IsPathSeparator(char,wxPathFormat)
       IsPathSeparator__10wxFileNameFc12wxPathFormat
       ;wxFileName::IsAbsolute(wxPathFormat)
       IsAbsolute__10wxFileNameF12wxPathFormat
       ;wxFileName::GetFullPath(wxPathFormat) const
       GetFullPath__10wxFileNameCF12wxPathFormat
-      ;wxFileName::Mkdir(const wxString&,int)
-      Mkdir__10wxFileNameFRC8wxStringi
       ;wxFileName::FileName(const wxString&)
       FileName__10wxFileNameFRC8wxString
       ;wxFileName::wxPathExists(const wxString&)
@@ -1963,14 +1965,20 @@ EXPORTS
       wxPathExists__10wxFileNameFv
       ;wxFileName::SetCwd()
       SetCwd__10wxFileNameFv
+      ;wxFileName::GetShortPath() const
+      GetShortPath__10wxFileNameCFv
       ;wxFileName::GetHomeDir()
       GetHomeDir__10wxFileNameFv
       ;wxFileName::AppendDir(const wxString&)
       AppendDir__10wxFileNameFRC8wxString
+      ;wxFileName::Mkdir(int,unsigned long)
+      Mkdir__10wxFileNameFiUl
       ;wxFileName::IsRelative(wxPathFormat)
       IsRelative__10wxFileNameF12wxPathFormat
       ;wxFileName::Rmdir()
       Rmdir__10wxFileNameFv
+      ;wxFileName::GetLongPath() const
+      GetLongPath__10wxFileNameCFv
       ;wxFileName::wxFileExists(const wxString&)
       wxFileExists__10wxFileNameFRC8wxString
       ;wxFileName::InsertDir(int,const wxString&)
@@ -2289,6 +2297,8 @@ EXPORTS
       wxConstructorForwxPenList__Fv
       ;wxGetDisplaySizeMM()
       wxGetDisplaySizeMM__Fv
+      ;wxGetClientDisplayRect()
+      wxGetClientDisplayRect__Fv
       ;wxDeleteStockObjects()
       wxDeleteStockObjects__Fv
       ;wxConstructorForwxBitmapList()
@@ -2662,6 +2672,7 @@ EXPORTS
       __vft7wxImage8wxObject
       ;wxImage::wxImage(const wxString&,const wxString&)
       __ct__7wxImageFRC8wxStringT1
+      wxNullImage
       ;wxImage::SaveFile(const wxString&,int)
       SaveFile__7wxImageFRC8wxStringi
       ;wxImage::Replace(unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char)
@@ -2707,6 +2718,8 @@ EXPORTS
       SetMaskColour__7wxImageFUcN21
       ;wxImageHandler::GetImageCount(wxInputStream&)
       GetImageCount__14wxImageHandlerFR13wxInputStream
+      ;wxImage::ConvertToMono(unsigned char,unsigned char,unsigned char) const
+      ConvertToMono__7wxImageCFUcN21
       ;wxImage::ConvertToBitmap() const
       ConvertToBitmap__7wxImageCFv
       ;wxImage::SetData(unsigned char*,int,int)
@@ -2829,22 +2842,61 @@ EXPORTS
       ;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)
       Init__8wxLocaleFiT1
+      ;wxLocaleModule::sm_classwxLocaleModule
+      sm_classwxLocaleModule__14wxLocaleModule
       ;wxLanguageInfoArray::Insert(const wxLanguageInfo&,unsigned int)
       Insert__19wxLanguageInfoArrayFRC14wxLanguageInfoUi
       ;wxMsgCatalog::wxMsgCatalog()
       __ct__12wxMsgCatalogFv
       ;wxLocale::~wxLocale()
       __dt__8wxLocaleFv
+      ;wxLocale::GetSystemLanguage()
+      GetSystemLanguage__8wxLocaleFv
+      ;wxLocale::CreateLanguagesDB()
+      CreateLanguagesDB__8wxLocaleFv
       ;wxLanguageInfoArray::Index(const wxLanguageInfo&,unsigned long) const
       Index__19wxLanguageInfoArrayCFRC14wxLanguageInfoUl
       ;wxLanguageInfoArray::wxLanguageInfoArray(const wxLanguageInfoArray&)
       __ct__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
       ;wxMsgCatalog::~wxMsgCatalog()
       __dt__12wxMsgCatalogFv
+      ;wxConstructorForwxLocaleModule()
+      wxConstructorForwxLocaleModule__Fv
       ;wxLocale::GetSysName() const
       GetSysName__8wxLocaleCFv
       ;wxLanguageInfoArray::DoEmpty()
@@ -2855,10 +2907,10 @@ EXPORTS
       AddCatalog__8wxLocaleFPCc
       ;wxMsgCatalog::Load(const char*,const char*,unsigned long)
       Load__12wxMsgCatalogFPCcT1Ul
-      ;wxLocale::wxLocale()
-      __ct__8wxLocaleFv
       ;wxLocale::InitLanguagesDB()
       InitLanguagesDB__8wxLocaleFv
+      ;wxLocale::wxLocale()
+      __ct__8wxLocaleFv
       ;wxLanguageInfoArray::Add(const wxLanguageInfo&)
       Add__19wxLanguageInfoArrayFRC14wxLanguageInfo
       ;wxLocale::AddLanguage(const wxLanguageInfo&)
@@ -2867,14 +2919,16 @@ EXPORTS
       Init__8wxLocaleFPCcN21UlT4
       ;wxLocale::GetString(const char*,const char*) const
       GetString__8wxLocaleCFPCcT1
+      ;wxLocale::ms_languagesDB
+      ms_languagesDB__8wxLocale
       ;wxGetLocale()
       wxGetLocale__Fv
       ;NoTransErr::ms_suppressCount
       ms_suppressCount__10NoTransErr
       ;wxLanguageInfoArray::~wxLanguageInfoArray()
       __dt__19wxLanguageInfoArrayFv
-      ;wxLocale::GetSystemLanguage() const
-      GetSystemLanguage__8wxLocaleCFv
+      ;wxLocale::DestroyLanguagesDB()
+      DestroyLanguagesDB__8wxLocaleFv
       ;wxMsgCatalog::GetString(const char*) const
       GetString__12wxMsgCatalogCFPCc
       ;wxLocale::FindCatalog(const char*) const
@@ -3443,6 +3497,10 @@ EXPORTS
       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&)
@@ -3453,6 +3511,8 @@ EXPORTS
       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&)
@@ -3461,6 +3521,8 @@ EXPORTS
       ExpandCommand__10wxFileTypeFRC8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxMimeTypesManager::IsOfType(const wxString&,const wxString&)
       IsOfType__18wxMimeTypesManagerFRC8wxStringT1
+      ;wxMimeTypesManager::Unassociate(wxFileType*)
+      Unassociate__18wxMimeTypesManagerFP10wxFileType
       ;wxArrayFileTypeInfo::DoEmpty()
       DoEmpty__19wxArrayFileTypeInfoFv
       wxTheMimeTypesManager
@@ -3478,6 +3540,8 @@ EXPORTS
       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)
@@ -3502,6 +3566,8 @@ EXPORTS
       __dt__18wxMimeTypesManagerFv
       ;wxMimeTypesManager::wxMimeTypesManager()
       __ct__18wxMimeTypesManagerFv
+      ;wxMimeTypesManager::ClearData()
+      ClearData__18wxMimeTypesManagerFv
       ;wxArrayFileTypeInfo::operator=(const wxArrayFileTypeInfo&)
       __as__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo
       ;wxFileType::GetOpenCommand(wxString*,const wxFileType::MessageParameters&) const
@@ -3561,23 +3627,21 @@ EXPORTS
       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
-      ;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
-      ;wxClassInfo::FindClass(char*)
-      FindClass__11wxClassInfoFPc
+      ;wxClassInfo::IsKindOf(const wxClassInfo*) const
+      IsKindOf__11wxClassInfoCFPC11wxClassInfo
       ;wxClassInfo::sm_classTable
       sm_classTable__11wxClassInfo
       ;wxObject::CopyObject(wxObject&) const
@@ -3592,8 +3656,6 @@ EXPORTS
       sm_first__11wxClassInfo
       ;wxObject::Ref(const wxObject&)
       Ref__8wxObjectFRC8wxObject
-      ;wxClassInfo::wxClassInfo(char*,char*,char*,int,wxObject*(*)())
-      __ct__11wxClassInfoFPcN21iPFv_P8wxObject
       wxFalse
       ;wxObjectRefData::wxObjectRefData()
       __ct__15wxObjectRefDataFv
@@ -3605,6 +3667,8 @@ EXPORTS
       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)
@@ -3615,8 +3679,6 @@ EXPORTS
       __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*)
@@ -4294,6 +4356,8 @@ EXPORTS
       CalcMin__11wxSizerItemFv
       ;wxSizer::Remove(wxWindow*)
       Remove__7wxSizerFP8wxWindow
+      ;wxSizer::FitSize(wxWindow*)
+      FitSize__7wxSizerFP8wxWindow
       __vft7wxSizer8wxObject
       ;wxSizer::Remove(int)
       Remove__7wxSizerFi
@@ -4311,6 +4375,8 @@ EXPORTS
       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*)
@@ -5197,7 +5263,7 @@ EXPORTS
       Read32__17wxTextInputStreamFv
       ;wxTextInputStream::SkipIfEndOfLine(char)
       SkipIfEndOfLine__17wxTextInputStreamFc
-  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\unzip.c
+  ;From object file:  F:\DEV\WX2\WXWINDOWS\src\common\unzip.c
     ;PUBDEFs (Symbols available from object file):
       unzReadCurrentFile
       unzGetCurrentFileInfo
@@ -6174,6 +6240,14 @@ EXPORTS
       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
@@ -6691,6 +6765,8 @@ EXPORTS
       __vft16wxGenericDirCtrl8wxObject
       ;wxGenericDirDialog::OnTreeSelected(wxTreeEvent&)
       OnTreeSelected__18wxGenericDirDialogFR11wxTreeEvent
+      ;setdrive(int)
+      setdrive__Fi
       ;wxDirFilterListCtrl::Init()
       Init__19wxDirFilterListCtrlFv
       ;wxConstructorForwxGenericDirCtrl()
@@ -6785,16 +6861,12 @@ EXPORTS
       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::Move(const wxPoint&)
+      Move__18wxGenericDragImageFRC7wxPoint
       ;wxGenericDragImage::~wxGenericDragImage()
       __dt__18wxGenericDragImageFv
-      ;wxGenericDragImage::Create(const wxIcon&,const wxCursor&,const wxPoint&)
-      Create__18wxGenericDragImageFRC6wxIconRC8wxCursorRC7wxPoint
       ;wxGenericDragImage::BeginDrag(const wxPoint&,wxWindow*,wxWindow*)
       BeginDrag__18wxGenericDragImageFRC7wxPointP8wxWindowT2
       ;wxGenericDragImage::Show()
@@ -6804,28 +6876,32 @@ EXPORTS
       ;wxGenericDragImage::Create(const wxTreeCtrl&,wxTreeItemId&)
       Create__18wxGenericDragImageFRC10wxTreeCtrlR12wxTreeItemId
       __vft18wxGenericDragImage8wxObject
+      ;wxGenericDragImage::Create(const wxCursor&)
+      Create__18wxGenericDragImageFRC8wxCursor
       ;wxConstructorForwxGenericDragImage()
       wxConstructorForwxGenericDragImage__Fv
       ;wxGenericDragImage::RedrawImage(const wxPoint&,const wxPoint&,unsigned long,unsigned long)
       RedrawImage__18wxGenericDragImageFRC7wxPointT1UlT3
-      ;wxGenericDragImage::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::Create(const wxString&,const wxCursor&)
+      Create__18wxGenericDragImageFRC8wxStringRC8wxCursor
+      ;wxGenericDragImage::Create(const wxBitmap&,const wxCursor&)
+      Create__18wxGenericDragImageFRC8wxBitmapRC8wxCursor
       ;wxGenericDragImage::UpdateBackingFromWindow(wxDC&,wxMemoryDC&,const wxRect&,const wxRect&) const
       UpdateBackingFromWindow__18wxGenericDragImageCFR4wxDCR10wxMemoryDCRC6wxRectT3
-      ;wxGenericDragImage::Create(const wxCursor&,const wxPoint&)
-      Create__18wxGenericDragImageFRC8wxCursorRC7wxPoint
-      ;wxGenericDragImage::DoDrawImage(wxDC&,const wxPoint&) const
-      DoDrawImage__18wxGenericDragImageCFR4wxDCRC7wxPoint
       ;wxGenericDragImage::Create(const wxListCtrl&,long)
       Create__18wxGenericDragImageFRC10wxListCtrll
+      ;wxGenericDragImage::DoDrawImage(wxDC&,const wxPoint&) const
+      DoDrawImage__18wxGenericDragImageCFR4wxDCRC7wxPoint
       ;wxGenericDragImage::sm_classwxGenericDragImage
       sm_classwxGenericDragImage__18wxGenericDragImage
+      ;wxGenericDragImage::Create(const wxIcon&,const wxCursor&)
+      Create__18wxGenericDragImageFRC6wxIconRC8wxCursor
   ;From object file:  ..\generic\fontdlgg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxGenericFontDialog::OnCloseWindow(wxCloseEvent&)
@@ -8753,61 +8829,65 @@ EXPORTS
       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::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&)
@@ -9210,6 +9290,8 @@ EXPORTS
       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&)
@@ -9493,6 +9575,8 @@ EXPORTS
       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
@@ -9711,6 +9795,8 @@ EXPORTS
       DoneParser__12wxHtmlParserFv
       ;wxHtmlParser::AddTagHandler(wxHtmlTagHandler*)
       AddTagHandler__12wxHtmlParserFP16wxHtmlTagHandler
+      ;wxHtmlParser::SetSource(const wxString&)
+      SetSource__12wxHtmlParserFRC8wxString
       ;wxHtmlParser::PopTagHandler()
       PopTagHandler__12wxHtmlParserFv
       ;wxHtmlTagHandler::sm_classwxHtmlTagHandler
@@ -9750,38 +9836,45 @@ EXPORTS
       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
+      ;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
+      ;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
-      ;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
+      ;wxHtmlProcessor::sm_classwxHtmlProcessor
+      sm_classwxHtmlProcessor__15wxHtmlProcessor
       ;wxHtmlWindow::HistoryClear()
       HistoryClear__12wxHtmlWindowFv
       ;wxHtmlWindow::GetEventTable() const
@@ -9802,6 +9895,10 @@ EXPORTS
       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()
@@ -9816,21 +9913,21 @@ EXPORTS
       ReadCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
       ;wxHtmlWindow::OnIdle(wxIdleEvent&)
       OnIdle__12wxHtmlWindowFR11wxIdleEvent
-      ;HtmlHistoryArray::~HtmlHistoryArray()
-      __dt__16HtmlHistoryArrayFv
-      ;wxConstructorForwxHtmlWindow()
-      wxConstructorForwxHtmlWindow__Fv
       ;wxHtmlWindow::CreateLayout()
       CreateLayout__12wxHtmlWindowFv
+      ;wxConstructorForwxHtmlWindow()
+      wxConstructorForwxHtmlWindow__Fv
       ;wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo&)
       OnLinkClicked__12wxHtmlWindowFRC14wxHtmlLinkInfo
+      ;wxHtmlWindow::m_GlobalProcessors
+      m_GlobalProcessors__12wxHtmlWindow
       __vft12wxHtmlWindow8wxObject
-      ;HtmlHistoryArray::HtmlHistoryArray(const HtmlHistoryArray&)
-      __ct__16HtmlHistoryArrayFRC16HtmlHistoryArray
       ;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
@@ -10023,19 +10120,12 @@ EXPORTS
       _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
-      ;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)
@@ -10329,10 +10419,14 @@ EXPORTS
       __ct__15wxBitmapRefDataFv
       ;wxMask::Create(const wxBitmap&,const wxColour&)
       Create__6wxMaskFRC8wxBitmapRC8wxColour
+      ;wxBitmap::ConvertToImage() const
+      ConvertToImage__8wxBitmapCFv
       ;wxBitmap::wxBitmap(void*,long,int,int,int)
       __ct__8wxBitmapFPvliN23
       ;wxBitmap::LoadFile(const wxString&,long)
       LoadFile__8wxBitmapFRC8wxStringl
+      ;wxBitmap::CreateFromImage(const wxImage&,int)
+      CreateFromImage__8wxBitmapFRC7wxImagei
       ;wxBitmap::SetPalette(const wxPalette&)
       SetPalette__8wxBitmapFRC9wxPalette
       ;wxBitmapHandler::Save(wxGDIImage*,const wxString&,int)
@@ -10560,8 +10654,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxClipboard::IsSupported(wxDataFormat)
       IsSupported__11wxClipboardF12wxDataFormat
-      ;wxClipboard::GetData(wxDataObject*)
-      GetData__11wxClipboardFP12wxDataObject
       ;wxGetClipboardFormatName(wxDataFormat,char*,int)
       wxGetClipboardFormatName__F12wxDataFormatPci
       ;wxClipboard::wxClipboard()
@@ -10599,6 +10691,8 @@ EXPORTS
       Flush__11wxClipboardFv
       ;wxIsClipboardFormatAvailable(wxDataFormat)
       wxIsClipboardFormatAvailable__F12wxDataFormat
+      ;wxClipboard::GetData(wxDataObject&)
+      GetData__11wxClipboardFR12wxDataObject
       ;wxClipboard::~wxClipboard()
       __dt__11wxClipboardFv
       ;wxClipboard::Clear()
@@ -10671,8 +10765,6 @@ EXPORTS
       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
@@ -10685,6 +10777,8 @@ EXPORTS
       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
@@ -11014,6 +11108,8 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxConstructorForwxPaintDC()
       wxConstructorForwxPaintDC__Fv
+      ;wxWindowDC::InitDC()
+      InitDC__10wxWindowDCFv
       ;wxArrayDCInfo::DoCopy(const wxArrayDCInfo&)
       DoCopy__13wxArrayDCInfoFRC13wxArrayDCInfo
       ;wxArrayDCInfo::Add(const wxPaintDCInfo&)
@@ -11024,7 +11120,8 @@ EXPORTS
       __as__13wxArrayDCInfoFRC13wxArrayDCInfo
       ;wxClientDC::wxClientDC(wxWindow*)
       __ct__10wxClientDCFP8wxWindow
-      __vft10wxWindowDC8wxObject
+      ;wxPaintDC::FindDCInCache(wxWindow*)
+      FindDCInCache__9wxPaintDCFP8wxWindow
       ;wxArrayDCInfo::Insert(const wxPaintDCInfo&,unsigned int)
       Insert__13wxArrayDCInfoFRC13wxPaintDCInfoUi
       ;wxConstructorForwxWindowDC()
@@ -11043,15 +11140,10 @@ EXPORTS
       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
-      __vft10wxClientDC8wxObject
       __vft9wxPaintDC8wxObject
       ;wxArrayDCInfo::~wxArrayDCInfo()
       __dt__13wxArrayDCInfoFv
@@ -11073,24 +11165,30 @@ EXPORTS
       ;wxMemoryDC::SelectObject(const wxBitmap&)
       SelectObject__10wxMemoryDCFRC8wxBitmap
       __vft10wxMemoryDC8wxObject
+      ;wxMemoryDC::Init()
+      Init__10wxMemoryDCFv
       ;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()
-      __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
+      ;wxPrinterDC::DoBlit(int,int,int,int,wxDC*,int,int,int,unsigned long)
+      DoBlit__11wxPrinterDCFiN31P4wxDCN31Ul
       ;wxGetPrinterDC(const wxPrintData&)
       wxGetPrinterDC__FRC11wxPrintData
       ;wxPrinterDC::sm_classwxPrinterDC
@@ -11104,17 +11202,16 @@ EXPORTS
       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()
-      __dt__11wxPrinterDCFv
+      ;wxPrinterDC::Init()
+      Init__11wxPrinterDCFv
   ;From object file:  ..\os2\dcscreen.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxScreenDC::~wxScreenDC()
-      __dt__10wxScreenDCFv
       ;wxConstructorForwxScreenDC()
       wxConstructorForwxScreenDC__Fv
-      __vft10wxScreenDC8wxObject
       ;wxScreenDC::sm_classwxScreenDC
       sm_classwxScreenDC__10wxScreenDC
       ;wxScreenDC::wxScreenDC()
@@ -11125,20 +11222,16 @@ EXPORTS
       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::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
@@ -11148,8 +11241,8 @@ EXPORTS
       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
@@ -11159,12 +11252,8 @@ EXPORTS
       __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)
@@ -11181,12 +11270,8 @@ EXPORTS
       wxConstructorForwxDialog__Fv
       ;wxDialog::OS2WindowProc(unsigned int,void*,void*)
       OS2WindowProc__8wxDialogFUiPvT2
-      ;wxDialog::IsShown() const
-      IsShown__8wxDialogCFv
       ;wxDialog::GetEventTable() const
       GetEventTable__8wxDialogCFv
-      ;wxDialog::Fit()
-      Fit__8wxDialogFv
       wxModelessWindows
       ;wxDialog::sm_eventTable
       sm_eventTable__8wxDialog
@@ -11282,6 +11367,8 @@ EXPORTS
       OS2SelectMatchingFontByName__6wxFontFv
       ;wxFont::IsFree() const
       IsFree__6wxFontCFv
+      ;wxFont::GetHFONT() const
+      GetHFONT__6wxFontCFv
       ;wxFont::GetFamily() const
       GetFamily__6wxFontCFv
       ;wxFont::GetFaceName() const
@@ -12003,8 +12090,12 @@ EXPORTS
       sm_classwxMenu__6wxMenu
       ;wxMenu::UpdateAccel(wxMenuItem*)
       UpdateAccel__6wxMenuFP10wxMenuItem
+      ;wxMenuBar::FindItem(int,unsigned long,wxMenu**) const
+      FindItem__9wxMenuBarCFiUlPP6wxMenu
       ;wxMenuBar::FindItem(int,wxMenu**) const
       FindItem__9wxMenuBarCFiPP6wxMenu
+      ;wxMenu::FindItem(int,unsigned long,wxMenu**) const
+      FindItem__6wxMenuCFiUlPP6wxMenu
       ;wxMenu::DoInsertOrAppend(wxMenuItem*,unsigned int)
       DoInsertOrAppend__6wxMenuFP10wxMenuItemUi
       ;wxMenuBar::Detach()
@@ -12828,10 +12919,10 @@ EXPORTS
       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
+      ;wxStaticText::SetFont(const wxFont&)
+      SetFont__12wxStaticTextFRC6wxFont
       __vft12wxStaticText8wxObject
       ;wxStaticText::DoGetBestSize() const
       DoGetBestSize__12wxStaticTextCFv
@@ -13079,14 +13170,18 @@ EXPORTS
       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::SetForegroundColour(const wxColour&)
+      SetForegroundColour__10wxTextCtrlFRC8wxColour
+      ;wxTextCtrl::SetBackgroundColour(const wxColour&)
+      SetBackgroundColour__10wxTextCtrlFRC8wxColour
       ;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&)
@@ -13356,9 +13451,13 @@ EXPORTS
       wxFatalError__FRC8wxStringT1
       ;wxDisplaySize(int*,int*)
       wxDisplaySize__FPiT1
+      ;wxClientDisplayRect(int*,int*,int*,int*)
+      wxClientDisplayRect__FPiN31
       ;wxDisplayDepth()
       wxDisplayDepth__Fv
       gs_wxBusyCursor
+      ;wxSetEnv(const wxString&,const char*)
+      wxSetEnv__FRC8wxStringPCc
       ;wxGetHomeDir(wxString*)
       wxGetHomeDir__FP8wxString
       ;wxUsleep(unsigned long)
@@ -13391,6 +13490,8 @@ EXPORTS
       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*)
