wxUniversal fixes:

[wxWidgets.git] / src / os2 / wx23.def
diff --git a/src/os2/wx23.def b/src/os2/wx23.def

index 1d4803ddd8e279122f51b163d2cae62449ea2a62..e1835626716fcc70a20640c016b605fde95adce8 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,10 +4,53 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
  CODE LOADONCALL
  
  EXPORTS
-;From library:  H:\DEV\WX2\WXWINDOWS\LIB\wx.lib
+;From library:  F:\DEV\WX2\WXWINDOWS\LIB\wx.lib
    ;From object file:  dummy.cpp
      ;PUBDEFs (Symbols available from object file):
        wxDummyChar
+  ;From object file:  ..\common\artprov.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxArtProviderCache::GetBitmap(const wxString&,wxBitmap*)
+      GetBitmap__18wxArtProviderCacheFRC8wxStringP8wxBitmap
+      ;wxArtProviderCache::Clear()
+      Clear__18wxArtProviderCacheFv
+      ;wxConstructorForwxArtProviderModule()
+      wxConstructorForwxArtProviderModule__Fv
+      ;wxArtProvider::PopProvider()
+      PopProvider__13wxArtProviderFv
+      ;wxArtProvider::CleanUpProviders()
+      CleanUpProviders__13wxArtProviderFv
+      ;wxArtProviderCache::ConstructHashID(const wxString&,const wxString&,const wxSize&)
+      ConstructHashID__18wxArtProviderCacheFRC8wxStringT1RC6wxSize
+      __vft24wxwxArtProvidersListNode10wxNodeBase
+      ;wxArtProvider::GetBitmap(const wxString&,const wxString&,const wxSize&)
+      GetBitmap__13wxArtProviderFRC8wxStringT1RC6wxSize
+      ;wxArtProvider::RemoveProvider(wxArtProvider*)
+      RemoveProvider__13wxArtProviderFP13wxArtProvider
+      ;wxArtProvider::GetIcon(const wxString&,const wxString&,const wxSize&)
+      GetIcon__13wxArtProviderFRC8wxStringT1RC6wxSize
+      ;wxArtProviderModule::sm_classwxArtProviderModule
+      sm_classwxArtProviderModule__19wxArtProviderModule
+      ;wxArtProvider::PushProvider(wxArtProvider*)
+      PushProvider__13wxArtProviderFP13wxArtProvider
+      ;wxArtProvider::sm_providers
+      sm_providers__13wxArtProvider
+      ;wxArtProvider::sm_classwxArtProvider
+      sm_classwxArtProvider__13wxArtProvider
+      ;wxwxArtProvidersListNode::DeleteData()
+      DeleteData__24wxwxArtProvidersListNodeFv
+      ;wxArtProvider::sm_cache
+      sm_cache__13wxArtProvider
+  ;From object file:  ..\common\artstd.cpp
+    ;PUBDEFs (Symbols available from object file):
+      g_ArtProviderModule
+      ;wxDefaultArtProviderModule::sm_classwxDefaultArtProviderModule
+      sm_classwxDefaultArtProviderModule__26wxDefaultArtProviderModule
+      __vft20wxDefaultArtProvider8wxObject
+      ;wxDefaultArtProvider::CreateBitmap(const wxString&,const wxString&,const wxSize&)
+      CreateBitmap__20wxDefaultArtProviderFRC8wxStringT1RC6wxSize
+      ;wxConstructorForwxDefaultArtProviderModule()
+      wxConstructorForwxDefaultArtProviderModule__Fv
    ;From object file:  ..\common\appcmn.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxOnAssert(const char*,int,const char*)
@@ -237,8 +280,6 @@ EXPORTS
        wxConstructorForwxPrintData__Fv
        ;wxPageSetupDialogData::~wxPageSetupDialogData()
        __dt__21wxPageSetupDialogDataFv
-      ;wxColourData::SetCustomColour(int,wxColour&)
-      SetCustomColour__12wxColourDataFiR8wxColour
        ;wxPrintData::operator=(const wxPrintData&)
        __as__11wxPrintDataFRC11wxPrintData
        ;wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData&)
@@ -255,6 +296,8 @@ EXPORTS
        __ct__21wxPageSetupDialogDataFv
        ;wxPrintDialogData::wxPrintDialogData()
        __ct__17wxPrintDialogDataFv
+      ;wxColourData::SetCustomColour(int,const wxColour&)
+      SetCustomColour__12wxColourDataFiRC8wxColour
    ;From object file:  ..\common\cmdproc.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxCommandProcessor::UndoCommand(wxCommand&)
@@ -1347,40 +1390,142 @@ EXPORTS
        wxDirSelectorPromptStr
    ;From object file:  ..\common\dynarray.cpp
      ;PUBDEFs (Symbols available from object file):
-      ;wxBaseArray::Add(long)
-      Add__11wxBaseArrayFl
-      ;wxBaseArray::Remove(long)
-      Remove__11wxBaseArrayFl
-      ;wxBaseArray::~wxBaseArray()
-      __dt__11wxBaseArrayFv
-      ;wxBaseArray::Sort(int(*)(const void*,const void*))
-      Sort__11wxBaseArrayFPFPCvT1_i
-      ;wxBaseArray::IndexForInsert(long,int(*)(const void*,const void*)) const
-      IndexForInsert__11wxBaseArrayCFlPFPCvT1_i
-      ;wxBaseArray::wxBaseArray()
-      __ct__11wxBaseArrayFv
-      ;wxBaseArray::Clear()
-      Clear__11wxBaseArrayFv
-      ;wxBaseArray::Insert(long,unsigned int)
-      Insert__11wxBaseArrayFlUi
-      ;wxBaseArray::wxBaseArray(const wxBaseArray&)
-      __ct__11wxBaseArrayFRC11wxBaseArray
-      ;wxBaseArray::Add(long,int(*)(const void*,const void*))
-      Add__11wxBaseArrayFlPFPCvT1_i
-      ;wxBaseArray::Shrink()
-      Shrink__11wxBaseArrayFv
-      ;wxBaseArray::operator=(const wxBaseArray&)
-      __as__11wxBaseArrayFRC11wxBaseArray
-      ;wxBaseArray::RemoveAt(unsigned int)
-      RemoveAt__11wxBaseArrayFUi
-      ;wxBaseArray::Index(long,int(*)(const void*,const void*)) const
-      Index__11wxBaseArrayCFlPFPCvT1_i
-      ;wxBaseArray::Grow()
-      Grow__11wxBaseArrayFv
-      ;wxBaseArray::Index(long,unsigned long) const
-      Index__11wxBaseArrayCFlUl
-      ;wxBaseArray::Alloc(unsigned int)
-      Alloc__11wxBaseArrayFUi
+      ;wxBaseArrayPtrVoid::Index(const void*,unsigned long) const
+      Index__18wxBaseArrayPtrVoidCFPCvUl
+      ;wxBaseArrayInt::Add(int)
+      Add__14wxBaseArrayIntFi
+      ;wxBaseArrayLong::Insert(long,unsigned int)
+      Insert__15wxBaseArrayLongFlUi
+      ;wxBaseArrayInt::Insert(int,unsigned int)
+      Insert__14wxBaseArrayIntFiUi
+      ;wxBaseArrayLong::Index(long,int(*)(const void*,const void*)) const
+      Index__15wxBaseArrayLongCFlPFPCvT1_i
+      ;wxBaseArrayInt::Index(int,int(*)(const void*,const void*)) const
+      Index__14wxBaseArrayIntCFiPFPCvT1_i
+      ;wxBaseArrayPtrVoid::Alloc(unsigned int)
+      Alloc__18wxBaseArrayPtrVoidFUi
+      ;wxBaseArrayPtrVoid::Add(const void*,int(*)(const void*,const void*))
+      Add__18wxBaseArrayPtrVoidFPCvPFPCvT1_i
+      ;wxBaseArrayShort::~wxBaseArrayShort()
+      __dt__16wxBaseArrayShortFv
+      ;wxBaseArrayPtrVoid::~wxBaseArrayPtrVoid()
+      __dt__18wxBaseArrayPtrVoidFv
+      ;wxBaseArrayInt::~wxBaseArrayInt()
+      __dt__14wxBaseArrayIntFv
+      ;wxBaseArrayShort::Shrink()
+      Shrink__16wxBaseArrayShortFv
+      ;wxBaseArrayInt::Shrink()
+      Shrink__14wxBaseArrayIntFv
+      ;wxBaseArrayPtrVoid::Grow()
+      Grow__18wxBaseArrayPtrVoidFv
+      ;wxBaseArrayPtrVoid::Clear()
+      Clear__18wxBaseArrayPtrVoidFv
+      ;wxBaseArrayShort::Remove(short)
+      Remove__16wxBaseArrayShortFs
+      ;wxBaseArrayPtrVoid::operator=(const wxBaseArrayPtrVoid&)
+      __as__18wxBaseArrayPtrVoidFRC18wxBaseArrayPtrVoid
+      ;wxBaseArrayShort::Insert(short,unsigned int)
+      Insert__16wxBaseArrayShortFsUi
+      ;wxBaseArrayPtrVoid::RemoveAt(unsigned int)
+      RemoveAt__18wxBaseArrayPtrVoidFUi
+      ;wxBaseArrayShort::Index(short,int(*)(const void*,const void*)) const
+      Index__16wxBaseArrayShortCFsPFPCvT1_i
+      ;wxBaseArrayShort::IndexForInsert(short,int(*)(const void*,const void*)) const
+      IndexForInsert__16wxBaseArrayShortCFsPFPCvT1_i
+      ;wxBaseArrayLong::IndexForInsert(long,int(*)(const void*,const void*)) const
+      IndexForInsert__15wxBaseArrayLongCFlPFPCvT1_i
+      ;wxBaseArrayLong::Alloc(unsigned int)
+      Alloc__15wxBaseArrayLongFUi
+      ;wxBaseArrayInt::Add(int,int(*)(const void*,const void*))
+      Add__14wxBaseArrayIntFiPFPCvT1_i
+      ;wxBaseArrayShort::wxBaseArrayShort()
+      __ct__16wxBaseArrayShortFv
+      ;wxBaseArrayPtrVoid::wxBaseArrayPtrVoid()
+      __ct__18wxBaseArrayPtrVoidFv
+      ;wxBaseArrayInt::Clear()
+      Clear__14wxBaseArrayIntFv
+      ;wxBaseArrayShort::Add(short)
+      Add__16wxBaseArrayShortFs
+      ;wxBaseArrayInt::operator=(const wxBaseArrayInt&)
+      __as__14wxBaseArrayIntFRC14wxBaseArrayInt
+      ;wxBaseArrayInt::wxBaseArrayInt(const wxBaseArrayInt&)
+      __ct__14wxBaseArrayIntFRC14wxBaseArrayInt
+      ;wxBaseArrayLong::Remove(long)
+      Remove__15wxBaseArrayLongFl
+      ;wxBaseArrayShort::Sort(int(*)(const void*,const void*))
+      Sort__16wxBaseArrayShortFPFPCvT1_i
+      ;wxBaseArrayPtrVoid::Sort(int(*)(const void*,const void*))
+      Sort__18wxBaseArrayPtrVoidFPFPCvT1_i
+      ;wxBaseArrayInt::IndexForInsert(int,int(*)(const void*,const void*)) const
+      IndexForInsert__14wxBaseArrayIntCFiPFPCvT1_i
+      ;wxBaseArrayShort::Alloc(unsigned int)
+      Alloc__16wxBaseArrayShortFUi
+      ;wxBaseArrayPtrVoid::Shrink()
+      Shrink__18wxBaseArrayPtrVoidFv
+      ;wxBaseArrayPtrVoid::Remove(const void*)
+      Remove__18wxBaseArrayPtrVoidFPCv
+      ;wxBaseArrayShort::Grow()
+      Grow__16wxBaseArrayShortFv
+      ;wxBaseArrayShort::operator=(const wxBaseArrayShort&)
+      __as__16wxBaseArrayShortFRC16wxBaseArrayShort
+      ;wxBaseArrayPtrVoid::wxBaseArrayPtrVoid(const wxBaseArrayPtrVoid&)
+      __ct__18wxBaseArrayPtrVoidFRC18wxBaseArrayPtrVoid
+      ;wxBaseArrayShort::Index(short,unsigned long) const
+      Index__16wxBaseArrayShortCFsUl
+      ;wxBaseArrayInt::Index(int,unsigned long) const
+      Index__14wxBaseArrayIntCFiUl
+      ;wxBaseArrayLong::Add(long)
+      Add__15wxBaseArrayLongFl
+      ;wxBaseArrayInt::Sort(int(*)(const void*,const void*))
+      Sort__14wxBaseArrayIntFPFPCvT1_i
+      ;wxBaseArrayLong::Sort(int(*)(const void*,const void*))
+      Sort__15wxBaseArrayLongFPFPCvT1_i
+      ;wxBaseArrayLong::RemoveAt(unsigned int)
+      RemoveAt__15wxBaseArrayLongFUi
+      ;wxBaseArrayPtrVoid::Insert(const void*,unsigned int)
+      Insert__18wxBaseArrayPtrVoidFPCvUi
+      ;wxBaseArrayPtrVoid::Index(const void*,int(*)(const void*,const void*)) const
+      Index__18wxBaseArrayPtrVoidCFPCvPFPCvT1_i
+      ;wxBaseArrayPtrVoid::IndexForInsert(const void*,int(*)(const void*,const void*)) const
+      IndexForInsert__18wxBaseArrayPtrVoidCFPCvPFPCvT1_i
+      ;wxBaseArrayInt::Alloc(unsigned int)
+      Alloc__14wxBaseArrayIntFUi
+      ;wxBaseArrayLong::Add(long,int(*)(const void*,const void*))
+      Add__15wxBaseArrayLongFlPFPCvT1_i
+      ;wxBaseArrayLong::wxBaseArrayLong()
+      __ct__15wxBaseArrayLongFv
+      ;wxBaseArrayLong::Grow()
+      Grow__15wxBaseArrayLongFv
+      ;wxBaseArrayInt::Grow()
+      Grow__14wxBaseArrayIntFv
+      ;wxBaseArrayShort::Clear()
+      Clear__16wxBaseArrayShortFv
+      ;wxBaseArrayPtrVoid::Add(const void*)
+      Add__18wxBaseArrayPtrVoidFPCv
+      ;wxBaseArrayLong::Index(long,unsigned long) const
+      Index__15wxBaseArrayLongCFlUl
+      ;wxBaseArrayShort::wxBaseArrayShort(const wxBaseArrayShort&)
+      __ct__16wxBaseArrayShortFRC16wxBaseArrayShort
+      ;wxBaseArrayShort::RemoveAt(unsigned int)
+      RemoveAt__16wxBaseArrayShortFUi
+      ;wxBaseArrayInt::Remove(int)
+      Remove__14wxBaseArrayIntFi
+      ;wxBaseArrayInt::RemoveAt(unsigned int)
+      RemoveAt__14wxBaseArrayIntFUi
+      ;wxBaseArrayShort::Add(short,int(*)(const void*,const void*))
+      Add__16wxBaseArrayShortFsPFPCvT1_i
+      ;wxBaseArrayInt::wxBaseArrayInt()
+      __ct__14wxBaseArrayIntFv
+      ;wxBaseArrayLong::~wxBaseArrayLong()
+      __dt__15wxBaseArrayLongFv
+      ;wxBaseArrayLong::Shrink()
+      Shrink__15wxBaseArrayLongFv
+      ;wxBaseArrayLong::Clear()
+      Clear__15wxBaseArrayLongFv
+      ;wxBaseArrayLong::operator=(const wxBaseArrayLong&)
+      __as__15wxBaseArrayLongFRC15wxBaseArrayLong
+      ;wxBaseArrayLong::wxBaseArrayLong(const wxBaseArrayLong&)
+      __ct__15wxBaseArrayLongFRC15wxBaseArrayLong
    ;From object file:  ..\common\dynlib.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxLibrary::wxLibrary(unsigned long)
@@ -1461,6 +1606,7 @@ EXPORTS
        sm_classwxCloseEvent__12wxCloseEvent
        ;wxCommandEvent::wxCommandEvent(int,int)
        __ct__14wxCommandEventFiT1
+      wxEVT_MENU_CLOSE
        wxEVT_MAXIMIZE
        wxEVT_ACTIVATE
        ;wxScrollWinEvent::wxScrollWinEvent(int,int,int)
@@ -1473,7 +1619,7 @@ EXPORTS
        wxConstructorForwxNcPaintEvent__Fv
        wxEVT_SET_CURSOR
        wxEVT_SCROLLWIN_LINEDOWN
-      wxEVT_MENU_CHAR
+      wxEVT_MENU_OPEN
        wxEVT_END_SESSION
        wxEVT_COMMAND_ENTER
        ;wxConstructorForwxShowEvent()
@@ -1510,7 +1656,6 @@ EXPORTS
        wxEVT_SCROLLWIN_PAGEUP
        wxEVT_MOUSEWHEEL
        wxEVT_MIDDLE_UP
-      wxEVT_MENU_INIT
        wxEVT_HELP
        wxEVT_ERASE_BACKGROUND
        wxEVT_DETAILED_HELP
@@ -1564,6 +1709,8 @@ EXPORTS
        wxConstructorForwxSysColourChangedEvent__Fv
        ;wxConstructorForwxNavigationKeyEvent()
        wxConstructorForwxNavigationKeyEvent__Fv
+      ;wxConstructorForwxMouseCaptureChangedEvent()
+      wxConstructorForwxMouseCaptureChangedEvent__Fv
        ;wxConstructorForwxHelpEvent()
        wxConstructorForwxHelpEvent__Fv
        ;wxEvtHandler::~wxEvtHandler()
@@ -1621,6 +1768,8 @@ EXPORTS
        wxConstructorForwxPaintEvent__Fv
        ;wxConstructorForwxNotifyEvent()
        wxConstructorForwxNotifyEvent__Fv
+      ;wxConstructorForwxDisplayChangedEvent()
+      wxConstructorForwxDisplayChangedEvent__Fv
        ;wxConstructorForwxContextMenuEvent()
        wxConstructorForwxContextMenuEvent__Fv
        ;wxConstructorForwxCloseEvent()
@@ -1716,12 +1865,12 @@ EXPORTS
        ;wxEvent::wxEvent(const wxEvent&)
        __ct__7wxEventFRC7wxEvent
        wxEVT_RIGHT_UP
-      wxEVT_POPUP_MENU_INIT
        wxEVT_PALETTE_CHANGED
        wxEVT_NC_MIDDLE_UP
        wxEVT_MENU_HIGHLIGHT
        wxEVT_KEY_UP
        wxEVT_JOY_BUTTON_UP
+      wxEVT_DISPLAY_CHANGED
        wxEVT_COMMAND_SCROLLBAR_UPDATED
        wxEVT_COMMAND_RADIOBUTTON_SELECTED
        ;wxWindowCreateEvent::sm_classwxWindowCreateEvent
@@ -1732,10 +1881,14 @@ EXPORTS
        sm_classwxScrollWinEvent__16wxScrollWinEvent
        ;wxNcPaintEvent::sm_classwxNcPaintEvent
        sm_classwxNcPaintEvent__14wxNcPaintEvent
+      ;wxMouseCaptureChangedEvent::sm_classwxMouseCaptureChangedEvent
+      sm_classwxMouseCaptureChangedEvent__26wxMouseCaptureChangedEvent
        ;wxIdleEvent::sm_classwxIdleEvent
        sm_classwxIdleEvent__11wxIdleEvent
        ;wxDropFilesEvent::sm_classwxDropFilesEvent
        sm_classwxDropFilesEvent__16wxDropFilesEvent
+      ;wxDisplayChangedEvent::sm_classwxDisplayChangedEvent
+      sm_classwxDisplayChangedEvent__21wxDisplayChangedEvent
        ;wxContextMenuEvent::sm_classwxContextMenuEvent
        sm_classwxContextMenuEvent__18wxContextMenuEvent
        ;wxActivateEvent::sm_classwxActivateEvent
@@ -1772,7 +1925,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
@@ -2059,10 +2212,6 @@ EXPORTS
        Assign__10wxFileNameFRC8wxString12wxPathFormat
        ;wxFileName::SetPath(const wxString&,wxPathFormat)
        SetPath__10wxFileNameFRC8wxString12wxPathFormat
-      ;wxFileName::Normalize(wxPathNormalize,const wxString&,wxPathFormat)
-      Normalize__10wxFileNameF15wxPathNormalizeRC8wxString12wxPathFormat
-      ;wxFileName::IsWild(wxPathFormat)
-      IsWild__10wxFileNameF12wxPathFormat
        ;wxFileName::GetTimes(wxDateTime*,wxDateTime*,wxDateTime*) const
        GetTimes__10wxFileNameCFP10wxDateTimeN21
        ;wxFileName::Clear()
@@ -2077,12 +2226,12 @@ EXPORTS
        PrependDir__10wxFileNameFRC8wxString
        ;wxFileName::GetPathSeparators(wxPathFormat)
        GetPathSeparators__10wxFileNameF12wxPathFormat
-      ;wxFileName::Mkdir(const wxString&,int,unsigned long)
-      Mkdir__10wxFileNameFRC8wxStringiUl
        ;wxFileName::IsPathSeparator(char,wxPathFormat)
        IsPathSeparator__10wxFileNameFc12wxPathFormat
        ;wxFileName::GetFullPath(wxPathFormat) const
        GetFullPath__10wxFileNameCF12wxPathFormat
+      ;wxFileName::Mkdir(const wxString&,int,int)
+      Mkdir__10wxFileNameFRC8wxStringiT2
        ;wxFileName::Touch()
        Touch__10wxFileNameFv
        ;wxFileName::FileName(const wxString&)
@@ -2099,10 +2248,10 @@ EXPORTS
        Assign__10wxFileNameFRC8wxStringN3112wxPathFormat
        ;wxFileName::SameAs(const wxFileName&,wxPathFormat)
        SameAs__10wxFileNameFRC10wxFileName12wxPathFormat
+      ;wxFileName::IsAbsolute(wxPathFormat) const
+      IsAbsolute__10wxFileNameCF12wxPathFormat
        ;wxFileName::GetVolumeSeparator(wxPathFormat)
        GetVolumeSeparator__10wxFileNameF12wxPathFormat
-      ;wxFileName::GetPath(unsigned long,wxPathFormat) const
-      GetPath__10wxFileNameCFUl12wxPathFormat
        ;wxFileName::RemoveDir(int)
        RemoveDir__10wxFileNameFi
        ;wxFileName::wxPathExists()
@@ -2117,12 +2266,14 @@ EXPORTS
        AppendDir__10wxFileNameFRC8wxString
        ;wxFileName::SplitPath(const wxString&,wxString*,wxString*,wxString*,wxString*,wxPathFormat)
        SplitPath__10wxFileNameFRC8wxStringP8wxStringN3212wxPathFormat
-      ;wxFileName::Mkdir(int,unsigned long)
-      Mkdir__10wxFileNameFiUl
+      ;wxFileName::Normalize(int,const wxString&,wxPathFormat)
+      Normalize__10wxFileNameFiRC8wxString12wxPathFormat
        ;wxFileName::MakeRelativeTo(const wxString&,wxPathFormat)
        MakeRelativeTo__10wxFileNameFRC8wxString12wxPathFormat
        ;wxFileName::AssignDir(const wxString&,wxPathFormat)
        AssignDir__10wxFileNameFRC8wxString12wxPathFormat
+      ;wxFileName::Mkdir(int,int)
+      Mkdir__10wxFileNameFiT1
        ;wxFileName::SetTimes(const wxDateTime*,const wxDateTime*,const wxDateTime*)
        SetTimes__10wxFileNameFPC10wxDateTimeN21
        ;wxFileName::Rmdir()
@@ -2139,6 +2290,8 @@ EXPORTS
        SplitPath__10wxFileNameFRC8wxStringP8wxStringN2212wxPathFormat
        ;wxFileName::IsCaseSensitive(wxPathFormat)
        IsCaseSensitive__10wxFileNameF12wxPathFormat
+      ;wxFileName::GetPath(int,wxPathFormat) const
+      GetPath__10wxFileNameCFi12wxPathFormat
        ;wxFileName::GetFormat(wxPathFormat)
        GetFormat__10wxFileNameF12wxPathFormat
        ;wxFileName::Assign(const wxFileName&)
@@ -2254,9 +2407,11 @@ EXPORTS
        FromUserString__16wxNativeFontInfoFRC8wxString
    ;From object file:  ..\common\fontmap.cpp
      ;PUBDEFs (Symbols available from object file):
+      ;wxConstructorForwxFontMapperModule()
+      wxConstructorForwxFontMapperModule__Fv
+      __vft12wxFontMapper
        ;wxFontMapper::GetConfig()
        GetConfig__12wxFontMapperFv
-      __vft12wxFontMapper
        ;wxFontMapper::GetConfigPath()
        GetConfigPath__12wxFontMapperFv
        ;wxFontMapper::RestorePath(const wxString&)
@@ -2267,13 +2422,20 @@ EXPORTS
        CharsetToEncoding__12wxFontMapperFRC8wxStringUl
        ;wxFontMapper::GetAltForEncoding(wxFontEncoding,wxFontEncoding*,const wxString&,unsigned long)
        GetAltForEncoding__12wxFontMapperF14wxFontEncodingP14wxFontEncodingRC8wxStringUl
+      ;wxFontMapperModule::sm_classwxFontMapperModule
+      sm_classwxFontMapperModule__18wxFontMapperModule
        ;wxFontMapper::ChangePath(const wxString&,wxString*)
        ChangePath__12wxFontMapperFRC8wxStringP8wxString
        ;wxFontMapper::GetEncodingName(wxFontEncoding)
        GetEncodingName__12wxFontMapperF14wxFontEncoding
        ;wxFontMapper::~wxFontMapper()
        __dt__12wxFontMapperFv
-      wxTheFontMapper
+      ;wxFontMapper::sm_instance
+      sm_instance__12wxFontMapper
+      ;wxFontMapper::Set(wxFontMapper*)
+      Set__12wxFontMapperFP12wxFontMapper
+      ;wxFontMapper::Get()
+      Get__12wxFontMapperFv
        ;wxFontMapper::GetDefaultConfigPath()
        GetDefaultConfigPath__12wxFontMapperFv
        ;wxFontMapper::GetEncodingDescription(wxFontEncoding)
@@ -2774,8 +2936,8 @@ EXPORTS
        CopyHashTable__17_wxHashTableBase2FPP21_wxHashTable_NodeBaseUiP17_wxHashTableBase2T1PFP17_wxHashTableBase2P21_wxHashTable_NodeBase_UlPFP21_wxHashTable_NodeBase_P21_wxHashTable_NodeBase
        ;wxStringHash::wxCharStringHash(const char*)
        wxCharStringHash__12wxStringHashFPCc
-      ;_wxHashTableBase2::s_primes
-      s_primes__17_wxHashTableBase2
+      ;_wxHashTableBase2::ms_primes
+      ms_primes__17_wxHashTableBase2
        ;_wxHashTableBase2::DummyProcessNode(_wxHashTable_NodeBase*)
        DummyProcessNode__17_wxHashTableBase2FP21_wxHashTable_NodeBase
        ;_wxHashTableBase2::DeleteNodes(unsigned int,_wxHashTable_NodeBase**,void(*)(_wxHashTable_NodeBase*))
@@ -2829,6 +2991,36 @@ EXPORTS
        GetContentType__6wxHTTPFv
        ;wxHTTP::Abort()
        Abort__6wxHTTPFv
+  ;From object file:  ..\common\iconbndl.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxIconArray::DoCopy(const wxIconArray&)
+      DoCopy__11wxIconArrayFRC11wxIconArray
+      ;wxIconArray::Insert(const wxIcon&,unsigned int)
+      Insert__11wxIconArrayFRC6wxIconUi
+      ;wxIconArray::~wxIconArray()
+      __dt__11wxIconArrayFv
+      ;wxIconBundle::DeleteIcons()
+      DeleteIcons__12wxIconBundleFv
+      ;wxIconArray::Add(const wxIcon&)
+      Add__11wxIconArrayFRC6wxIcon
+      ;wxIconArray::Index(const wxIcon&,unsigned long) const
+      Index__11wxIconArrayCFRC6wxIconUl
+      ;wxIconBundle::operator=(const wxIconBundle&)
+      __as__12wxIconBundleFRC12wxIconBundle
+      ;wxIconArray::RemoveAt(unsigned int)
+      RemoveAt__11wxIconArrayFUi
+      ;wxIconArray::DoEmpty()
+      DoEmpty__11wxIconArrayFv
+      ;wxIconBundle::AddIcon(const wxIcon&)
+      AddIcon__12wxIconBundleFRC6wxIcon
+      ;wxIconBundle::AddIcon(const wxString&,long)
+      AddIcon__12wxIconBundleFRC8wxStringl
+      ;wxIconBundle::GetIcon(const wxSize&) const
+      GetIcon__12wxIconBundleCFRC6wxSize
+      ;wxIconArray::wxIconArray(const wxIconArray&)
+      __ct__11wxIconArrayFRC11wxIconArray
+      ;wxIconArray::operator=(const wxIconArray&)
+      __as__11wxIconArrayFRC11wxIconArray
    ;From object file:  ..\common\imagall.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxInitAllImageHandlers()
@@ -2895,8 +3087,6 @@ EXPORTS
        FindHandler__7wxImageFl
        ;wxImage::FindHandler(const wxString&,long)
        FindHandler__7wxImageFRC8wxStringl
-      ;wxImage::CountColours(unsigned long)
-      CountColours__7wxImageFUl
        ;wxImage::wxImage(int,int)
        __ct__7wxImageFiT1
        ;wxImageModule::sm_classwxImageModule
@@ -2925,6 +3115,10 @@ EXPORTS
        Copy__7wxImageCFv
        ;wxImage::GetOptionInt(const wxString&) const
        GetOptionInt__7wxImageCFRC8wxString
+      ;wxImage::SaveFile(const wxString&) const
+      SaveFile__7wxImageCFRC8wxString
+      ;wxImage::SaveFile(wxOutputStream&,const wxString&) const
+      SaveFile__7wxImageCFR14wxOutputStreamRC8wxString
        ;wxImage::FindHandlerMime(const wxString&)
        FindHandlerMime__7wxImageFRC8wxString
        ;wxImage::Mirror(unsigned long) const
@@ -2932,6 +3126,8 @@ EXPORTS
        __vft14wxImageHandler8wxObject
        ;wxImage::GetImageCount(wxInputStream&,long)
        GetImageCount__7wxImageFR13wxInputStreaml
+      ;wxImage::FindFirstUnusedColour(unsigned char*,unsigned char*,unsigned char*,unsigned char,unsigned char,unsigned char) const
+      FindFirstUnusedColour__7wxImageCFPUcN21UcN24
        ;wxImage::Scale(int,int) const
        Scale__7wxImageCFiT1
        ;wxImage::sm_handlers
@@ -2942,12 +3138,12 @@ EXPORTS
        __ct__7wxImageFR13wxInputStreamRC8wxStringi
        ;wxImage::SetPalette(const wxPalette&)
        SetPalette__7wxImageFRC9wxPalette
-      ;wxImage::SaveFile(wxOutputStream&,int)
-      SaveFile__7wxImageFR14wxOutputStreami
        ;wxImage::LoadFile(const wxString&,long,int)
        LoadFile__7wxImageFRC8wxStringli
        ;wxImageHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
        LoadFile__14wxImageHandlerFP7wxImageR13wxInputStreamUli
+      ;wxImage::ComputeHistogram(wxImageHistogram&) const
+      ComputeHistogram__7wxImageCFR16wxImageHistogram
        ;wxImageRefData::~wxImageRefData()
        __dt__14wxImageRefDataFv
        ;wxImage::HasPalette() const
@@ -2956,8 +3152,6 @@ EXPORTS
        GetMaskGreen__7wxImageCFv
        ;wxImage::SetRGB(int,int,unsigned char,unsigned char,unsigned char)
        SetRGB__7wxImageFiT1UcN23
-      ;wxImage::SaveFile(wxOutputStream&,const wxString&)
-      SaveFile__7wxImageFR14wxOutputStreamRC8wxString
        ;wxImage::CanRead(const wxString&)
        CanRead__7wxImageFRC8wxString
        ;wxImage::GetImageCount(const wxString&,long)
@@ -2968,8 +3162,8 @@ EXPORTS
        ;wxImage::Replace(unsigned char,unsigned char,unsigned char,unsigned char,unsigned char,unsigned char)
        Replace__7wxImageFUcN51
        wxNullImage
-      ;wxImage::SaveFile(const wxString&,int)
-      SaveFile__7wxImageFRC8wxStringi
+      ;wxImage::SaveFile(const wxString&,const wxString&) const
+      SaveFile__7wxImageCFRC8wxStringT1
        ;wxImage::LoadFile(const wxString&,const wxString&,int)
        LoadFile__7wxImageFRC8wxStringT1i
        ;wxImageRefData::wxImageRefData()
@@ -2998,8 +3192,6 @@ EXPORTS
        SetMask__7wxImageFUl
        ;wxImage::Rotate90(unsigned long) const
        Rotate90__7wxImageCFUl
-      ;wxImage::FindFirstUnusedColour(unsigned char*,unsigned char*,unsigned char*,unsigned char,unsigned char,unsigned char)
-      FindFirstUnusedColour__7wxImageFPUcN21UcN24
        ;wxImage::Create(int,int)
        Create__7wxImageFiT1
        __vft14wxImageRefData15wxObjectRefData
@@ -3011,6 +3203,8 @@ EXPORTS
        SetOption__7wxImageFRC8wxStringT1
        ;wxImage::SetMaskColour(unsigned char,unsigned char,unsigned char)
        SetMaskColour__7wxImageFUcN21
+      ;wxImage::SaveFile(wxOutputStream&,int) const
+      SaveFile__7wxImageCFR14wxOutputStreami
        ;wxImageHandler::GetImageCount(wxInputStream&)
        GetImageCount__14wxImageHandlerFR13wxInputStream
        ;wxImage::ConvertToMono(unsigned char,unsigned char,unsigned char) const
@@ -3021,16 +3215,14 @@ EXPORTS
        SetData__7wxImageFPUciT2
        ;wxImage::GetMaskBlue() const
        GetMaskBlue__7wxImageCFv
-      ;wxImage::ConvertToBitmap() const
-      ConvertToBitmap__7wxImageCFv
        ;wxImage::CleanUpHandlers()
        CleanUpHandlers__7wxImageFv
        ;wxImageHandler::CanRead(const wxString&)
        CanRead__14wxImageHandlerFRC8wxString
        ;wxImageHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
        SaveFile__14wxImageHandlerFP7wxImageR14wxOutputStreamUl
-      ;wxImage::wxImage(const wxBitmap&)
-      __ct__7wxImageFRC8wxBitmap
+      ;wxImage::CountColours(unsigned long) const
+      CountColours__7wxImageCFUl
        ;wxImage::wxImage(const wxString&,long,int)
        __ct__7wxImageFRC8wxStringli
        ;wxImage::sm_classwxImage
@@ -3039,16 +3231,14 @@ EXPORTS
        __ct__7wxImageFR13wxInputStreamli
        ;wxImage::SetOption(const wxString&,int)
        SetOption__7wxImageFRC8wxStringi
-      ;wxImage::SaveFile(const wxString&,const wxString&)
-      SaveFile__7wxImageFRC8wxStringT1
+      ;wxImage::SaveFile(const wxString&,int) const
+      SaveFile__7wxImageCFRC8wxStringi
        ;wxImage::LoadFile(wxInputStream&,long,int)
        LoadFile__7wxImageFR13wxInputStreamli
        ;wxImage::LoadFile(wxInputStream&,const wxString&,int)
        LoadFile__7wxImageFR13wxInputStreamRC8wxStringi
        ;wxImage::GetBlue(int,int) const
        GetBlue__7wxImageCFiT1
-      ;wxImage::ComputeHistogram(wxHashTable&)
-      ComputeHistogram__7wxImageFR11wxHashTable
        ;wxImage::CanRead(wxInputStream&)
        CanRead__7wxImageFR13wxInputStream
        ;wxImage::SetMaskFromImage(const wxImage&,unsigned char,unsigned char,unsigned char)
@@ -3059,6 +3249,10 @@ EXPORTS
        AddHandler__7wxImageFP14wxImageHandler
        ;wxImage::HasOption(const wxString&) const
        HasOption__7wxImageCFRC8wxString
+  ;From object file:  ..\common\imagfill.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxDoFloodFill(wxDC*,int,int,const wxColour&,int)
+      wxDoFloodFill__FP4wxDCiT2RC8wxColourT2
    ;From object file:  ..\common\imaggif.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxGIFHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
@@ -3228,44 +3422,44 @@ EXPORTS
        LoadFile__12wxXPMHandlerFP7wxImageR13wxInputStreamUli
    ;From object file:  ..\common\intl.cpp
      ;PUBDEFs (Symbols available from object file):
+      ;wxMsgCatalogFile::FillHash(wxMessagesHash&,unsigned long) const
+      FillHash__16wxMsgCatalogFileCFR14wxMessagesHashUl
        ;wxLocale::Init(int,int)
        Init__8wxLocaleFiT1
        ;wxLocaleModule::sm_classwxLocaleModule
        sm_classwxLocaleModule__14wxLocaleModule
        ;wxLanguageInfoArray::Insert(const wxLanguageInfo&,unsigned int)
        Insert__19wxLanguageInfoArrayFRC14wxLanguageInfoUi
-      ;wxMsgCatalog::wxMsgCatalog()
-      __ct__12wxMsgCatalogFv
+      ;wxLocale::GetSystemEncoding()
+      GetSystemEncoding__8wxLocaleFv
        ;wxLocale::~wxLocale()
        __dt__8wxLocaleFv
        ;wxLocale::GetSystemLanguage()
        GetSystemLanguage__8wxLocaleFv
-      ;wxLocale::GetSystemEncoding()
-      GetSystemEncoding__8wxLocaleFv
        ;wxLocale::CreateLanguagesDB()
        CreateLanguagesDB__8wxLocaleFv
        ;wxLanguageInfoArray::Index(const wxLanguageInfo&,unsigned long) const
        Index__19wxLanguageInfoArrayCFRC14wxLanguageInfoUl
        ;wxLanguageInfoArray::wxLanguageInfoArray(const wxLanguageInfoArray&)
        __ct__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
-      ;wxMsgCatalog::~wxMsgCatalog()
-      __dt__12wxMsgCatalogFv
+      ;wxMsgCatalogFile::~wxMsgCatalogFile()
+      __dt__16wxMsgCatalogFileFv
        ;wxConstructorForwxLocaleModule()
        wxConstructorForwxLocaleModule__Fv
        ;wxLocale::GetSysName() const
        GetSysName__8wxLocaleCFv
        ;wxLanguageInfoArray::DoEmpty()
        DoEmpty__19wxLanguageInfoArrayFv
-      ;wxMsgCatalog::ConvertEncoding()
-      ConvertEncoding__12wxMsgCatalogFv
        ;wxLocale::AddCatalog(const char*)
        AddCatalog__8wxLocaleFPCc
        ;wxMsgCatalog::Load(const char*,const char*,unsigned long)
        Load__12wxMsgCatalogFPCcT1Ul
-      ;wxLocale::InitLanguagesDB()
-      InitLanguagesDB__8wxLocaleFv
+      ;wxMsgCatalogFile::wxMsgCatalogFile()
+      __ct__16wxMsgCatalogFileFv
        ;wxLocale::wxLocale()
        __ct__8wxLocaleFv
+      ;wxLocale::InitLanguagesDB()
+      InitLanguagesDB__8wxLocaleFv
        ;wxLocale::GetSystemEncodingName()
        GetSystemEncodingName__8wxLocaleFv
        ;wxLanguageInfoArray::Add(const wxLanguageInfo&)
@@ -3278,12 +3472,16 @@ EXPORTS
        GetString__8wxLocaleCFPCcT1
        ;wxLocale::ms_languagesDB
        ms_languagesDB__8wxLocale
+      ;wxMsgCatalogFile::Load(const char*,const char*)
+      Load__16wxMsgCatalogFileFPCcT1
        ;wxGetLocale()
        wxGetLocale__Fv
        ;NoTransErr::ms_suppressCount
        ms_suppressCount__10NoTransErr
        ;wxLanguageInfoArray::~wxLanguageInfoArray()
        __dt__19wxLanguageInfoArrayFv
+      ;wxMsgCatalogFile::GetCharset() const
+      GetCharset__16wxMsgCatalogFileCFv
        ;wxLocale::DestroyLanguagesDB()
        DestroyLanguagesDB__8wxLocaleFv
        ;wxMsgCatalog::GetString(const char*) const
@@ -3296,12 +3494,10 @@ EXPORTS
        __as__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
        ;wxLanguageInfoArray::RemoveAt(unsigned int)
        RemoveAt__19wxLanguageInfoArrayFUi
-      ;wxMsgCatalog::GetHash(const char*)
-      GetHash__12wxMsgCatalogFPCc
-      ;wxLocale::IsLoaded(const char*) const
-      IsLoaded__8wxLocaleCFPCc
        ;wxLocale::AddCatalogLookupPathPrefix(const wxString&)
        AddCatalogLookupPathPrefix__8wxLocaleFRC8wxString
+      ;wxLocale::IsLoaded(const char*) const
+      IsLoaded__8wxLocaleCFPCc
    ;From object file:  ..\common\ipcbase.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxConnectionBase::sm_classwxConnectionBase
@@ -3379,11 +3575,15 @@ EXPORTS
    ;From object file:  ..\common\list.cpp
      ;PUBDEFs (Symbols available from object file):
        __vft10wxListBase8wxObject
+      ;wxList::sm_classwxList
+      sm_classwxList__6wxList
        ;wxListBase::LastThat(int(*)(void*))
        LastThat__10wxListBaseFPFPv_i
        __vft16wxStringListNode10wxNodeBase
        ;wxListBase::Clear()
        Clear__10wxListBaseFv
+      ;wxConstructorForwxStringList()
+      wxConstructorForwxStringList__Fv
        ;wxListBase::DeleteObject(void*)
        DeleteObject__10wxListBaseFPv
        ;wxObjectListNode::DeleteData()
@@ -3412,6 +3612,8 @@ EXPORTS
        FirstThat__10wxListBaseFPFPv_i
        ;wxNodeBase::~wxNodeBase()
        __dt__10wxNodeBaseFv
+      ;wxConstructorForwxList()
+      wxConstructorForwxList__Fv
        ;wxStringList::Sort()
        Sort__12wxStringListFv
        ;wxListBase::Find(void*) const
@@ -3420,6 +3622,8 @@ EXPORTS
        Delete__12wxStringListFPCc
        ;wxStringList::Member(const char*) const
        Member__12wxStringListCFPCc
+      ;wxStringList::sm_classwxStringList
+      sm_classwxStringList__12wxStringList
        ;wxNodeBase::wxNodeBase(wxListBase*,wxNodeBase*,wxNodeBase*,void*,const wxListKey&)
        __ct__10wxNodeBaseFP10wxListBaseP10wxNodeBaseT2PvRC9wxListKey
        __vft10wxNodeBase
@@ -3527,14 +3731,16 @@ EXPORTS
        wxLogSysError__FlPCce
        ;wxLogStream::wxLogStream(ostream*)
        __ct__11wxLogStreamFP7ostream
+      ;wxLog::SetLogBuffer(char*,unsigned int)
+      SetLogBuffer__5wxLogFPcUi
        ;wxLogPassThrough::wxLogPassThrough()
        __ct__16wxLogPassThroughFv
-      ;wxVLogFatalError(const char*,char*)
-      wxVLogFatalError__FPCcPc
-      ;wxVLogSysError(const char*,char*)
-      wxVLogSysError__FPCcPc
        ;wxVLogInfo(const char*,char*)
        wxVLogInfo__FPCcPc
+      ;wxVLogSysError(const char*,char*)
+      wxVLogSysError__FPCcPc
+      ;wxVLogFatalError(const char*,char*)
+      wxVLogFatalError__FPCcPc
        ;wxLog::ms_suspendCount
        ms_suspendCount__5wxLog
        ;wxLog::ms_bAutoCreate
@@ -3882,6 +4088,8 @@ EXPORTS
        SetHelpString__13wxMenuBarBaseFiRC8wxString
        ;wxMenuBase::Insert(unsigned int,wxMenuItem*)
        Insert__10wxMenuBaseFUiP10wxMenuItem
+      ;wxMenuItemBase::wxMenuItemBase(wxMenu*,int,const wxString&,const wxString&,wxItemKind,wxMenu*)
+      __ct__14wxMenuItemBaseFP6wxMenuiRC8wxStringT310wxItemKindT1
        ;wxMenuBase::Remove(wxMenuItem*)
        Remove__10wxMenuBaseFP10wxMenuItem
        ;wxMenuBase::IsChecked(int) const
@@ -4133,12 +4341,12 @@ EXPORTS
        wxCreateDynamicObject__FPCc
        ;wxObject::Dump(ostream&)
        Dump__8wxObjectFR7ostream
-      ;wxObject::CloneRefData(wxObjectRefData*) const
-      CloneRefData__8wxObjectCFP15wxObjectRefData
        ;wxObject::CreateRefData() const
        CreateRefData__8wxObjectCFv
        ;wxClassInfo::sm_classTable
        sm_classTable__11wxClassInfo
+      ;wxObject::CloneRefData(const wxObjectRefData*) const
+      CloneRefData__8wxObjectCFPC15wxObjectRefData
        ;wxClassInfo::sm_first
        sm_first__11wxClassInfo
        ;wxObject::Ref(const wxObject&)
@@ -4599,10 +4807,12 @@ EXPORTS
    ;From object file:  ..\common\sckaddr.cpp
      ;PUBDEFs (Symbols available from object file):
        __vft13wxSockAddress8wxObject
-      ;wxIPV4address::AnyAddress()
-      AnyAddress__13wxIPV4addressFv
+      ;wxSockAddress::Init()
+      Init__13wxSockAddressFv
        ;wxIPV4address::Hostname()
        Hostname__13wxIPV4addressFv
+      ;wxIPV4address::AnyAddress()
+      AnyAddress__13wxIPV4addressFv
        ;wxSockAddress::SetAddress(_GAddress*)
        SetAddress__13wxSockAddressFP9_GAddress
        ;wxSockAddress::operator=(const wxSockAddress&)
@@ -4629,6 +4839,8 @@ EXPORTS
        __ct__13wxIPV4addressFv
        ;wxIPV4address::Service()
        Service__13wxIPV4addressFv
+      ;wxIPV4address::Clone() const
+      Clone__13wxIPV4addressCFv
        ;wxSockAddress::wxSockAddress(const wxSockAddress&)
        __ct__13wxSockAddressFRC13wxSockAddress
        __vft13wxIPV4address8wxObject
@@ -4791,6 +5003,8 @@ EXPORTS
        Fit__7wxSizerFP8wxWindow
        ;wxSizer::GetMinWindowSize(wxWindow*)
        GetMinWindowSize__7wxSizerFP8wxWindow
+      ;wxSizer::FitInside(wxWindow*)
+      FitInside__7wxSizerFP8wxWindow
        ;wxSizer::Prepend(wxWindow*,int,int,int,wxObject*)
        Prepend__7wxSizerFP8wxWindowiN22P8wxObject
        __vft15wxFlexGridSizer8wxObject
@@ -4877,6 +5091,10 @@ EXPORTS
        DoSetItemMinSize__7wxSizerFP7wxSizeriT2
        ;wxSizerItem::DeleteWindows()
        DeleteWindows__11wxSizerItemFv
+      ;wxSizer::GetMinClientSize(wxWindow*)
+      GetMinClientSize__7wxSizerFP8wxWindow
+      ;wxSizer::GetMaxClientSize(wxWindow*)
+      GetMaxClientSize__7wxSizerFP8wxWindow
        ;wxSizerItem::wxSizerItem(wxWindow*,int,int,int,wxObject*)
        __ct__11wxSizerItemFP8wxWindowiN22P8wxObject
        __vft16wxStaticBoxSizer8wxObject
@@ -4901,8 +5119,12 @@ EXPORTS
        SetItemBounds__11wxGridSizerFP11wxSizerItemiN32
        ;wxGridSizer::CalcMin()
        CalcMin__11wxGridSizerFv
+      ;wxSizer::VirtualFitSize(wxWindow*)
+      VirtualFitSize__7wxSizerFP8wxWindow
        ;wxNotebookSizer::wxNotebookSizer(wxNotebook*)
        __ct__15wxNotebookSizerFP10wxNotebook
+      ;wxSizer::SetVirtualSizeHints(wxWindow*)
+      SetVirtualSizeHints__7wxSizerFP8wxWindow
    ;From object file:  ..\common\socket.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxSocketBase::SetTimeout(long)
@@ -4933,6 +5155,8 @@ EXPORTS
        __dt__14wxSocketClientFv
        ;wxSocketBase::RestoreState()
        RestoreState__12wxSocketBaseFv
+      ;wxSocketBase::IsInitialized()
+      IsInitialized__12wxSocketBaseFv
        ;wxSocketBase::Init()
        Init__12wxSocketBaseFv
        ;wxSocketBase::Discard()
@@ -4952,6 +5176,8 @@ EXPORTS
        __vft12wxSocketBase8wxObject
        ;wxSocketBase::WaitForRead(long,long)
        WaitForRead__12wxSocketBaseFlT1
+      ;wxSocketBase::m_countInit
+      m_countInit__12wxSocketBase
        ;wxSocketBase::_Read(void*,unsigned int)
        _Read__12wxSocketBaseFPvUi
        ;wxSocketBase::Write(const void*,unsigned int)
@@ -4982,10 +5208,14 @@ EXPORTS
        Unread__12wxSocketBaseFPCvUi
        ;wxSocketBase::OnRequest(wxSocketNotify)
        OnRequest__12wxSocketBaseF14wxSocketNotify
-      ;wxSocketBase::wxSocketBase()
-      __ct__12wxSocketBaseFv
+      ;wxSocketBase::Initialize()
+      Initialize__12wxSocketBaseFv
        ;wxConstructorForwxSocketModule()
        wxConstructorForwxSocketModule__Fv
+      ;wxSocketBase::wxSocketBase()
+      __ct__12wxSocketBaseFv
+      ;wxSocketBase::Shutdown()
+      Shutdown__12wxSocketBaseFv
        ;wxSocketBase::GetPeer(wxSockAddress&) const
        GetPeer__12wxSocketBaseCFR13wxSockAddress
        ;wxSocketBase::Notify(unsigned long)
@@ -5033,9 +5263,13 @@ EXPORTS
        wxConstructorForwxStatusBar__Fv
    ;From object file:  ..\common\strconv.cpp
      ;PUBDEFs (Symbols available from object file):
+      ;wxStrConvModule::sm_classwxStrConvModule
+      sm_classwxStrConvModule__15wxStrConvModule
        wxConvCurrent
        wxConvFile
        wxConvLibc
+      ;wxConstructorForwxStrConvModule()
+      wxConstructorForwxStrConvModule__Fv
    ;From object file:  ..\common\stream.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxStreamBuffer::SetBufferIO(void*,unsigned int,unsigned long)
@@ -5448,8 +5682,6 @@ EXPORTS
        __dt__17wxToolBarToolBaseFv
        ;wxToolBarBase::ClearTools()
        ClearTools__13wxToolBarBaseFv
-      ;wxToolBarBase::InsertTool(unsigned int,int,const wxBitmap&,const wxBitmap&,unsigned long,wxObject*,const wxString&,const wxString&)
-      InsertTool__13wxToolBarBaseFUiiRC8wxBitmapT3UlP8wxObjectRC8wxStringT7
        ;wxToolBarToolBase::Enable(unsigned long)
        Enable__17wxToolBarToolBaseFUl
        ;wxToolBarBase::SetToolClientData(int,wxObject*)
@@ -5468,6 +5700,8 @@ EXPORTS
        Toggle__17wxToolBarToolBaseFUl
        __vft17wxToolBarToolBase8wxObject
        __vft13wxToolBarBase8wxObject
+      ;wxToolBarBase::InsertTool(unsigned int,int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,const wxString&,const wxString&,wxObject*)
+      InsertTool__13wxToolBarBaseFUiiRC8wxStringRC8wxBitmapT410wxItemKindN23P8wxObject
        ;wxToolBarBase::InsertControl(unsigned int,wxControl*)
        InsertControl__13wxToolBarBaseFUiP9wxControl
        ;wxToolBarBase::SetMargins(int,int)
@@ -5486,6 +5720,8 @@ EXPORTS
        OnIdle__13wxToolBarBaseFR11wxIdleEvent
        ;wxToolBarBase::AddControl(wxControl*)
        AddControl__13wxToolBarBaseFP9wxControl
+      ;wxToolBarBase::DoAddTool(int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,const wxString&,const wxString&,wxObject*,int,int)
+      DoAddTool__13wxToolBarBaseFiRC8wxStringRC8wxBitmapT310wxItemKindN22P8wxObjectN21
        ;wxToolBarBase::InsertSeparator(unsigned int)
        InsertSeparator__13wxToolBarBaseFUi
        ;wxToolBarBase::GetToolState(int) const
@@ -5504,14 +5740,14 @@ EXPORTS
        GetEventTable__13wxToolBarBaseCFv
        ;wxToolBarBase::DoToolbarUpdates()
        DoToolbarUpdates__13wxToolBarBaseFv
-      ;wxToolBarBase::AddTool(int,const wxBitmap&,const wxBitmap&,unsigned long,int,int,wxObject*,const wxString&,const wxString&)
-      AddTool__13wxToolBarBaseFiRC8wxBitmapT2UlN21P8wxObjectRC8wxStringT8
        ;wxToolBarBase::ToggleTool(int,unsigned long)
        ToggleTool__13wxToolBarBaseFiUl
        ;wxToolBarBase::SetToggle(int,unsigned long)
        SetToggle__13wxToolBarBaseFiUl
        ;wxToolBarBase::GetToolShortHelp(int) const
        GetToolShortHelp__13wxToolBarBaseCFi
+      ;wxCreateGreyedImage(const wxImage&,wxImage&)
+      wxCreateGreyedImage__FRC7wxImageR7wxImage
        ;wxToolBarBase::sm_eventTable
        sm_eventTable__13wxToolBarBase
        ;wxToolBarBase::sm_classwxToolBarBase
@@ -5598,6 +5834,8 @@ EXPORTS
        SaveFile__14wxTextCtrlBaseFRC8wxString
        ;wxTextCtrlBase::operator<<(const char)
        __ls__14wxTextCtrlBaseFCc
+      ;wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent&)
+      EmulateKeyPress__14wxTextCtrlBaseFRC10wxKeyEvent
        __vft14wxTextCtrlBase8wxObject
        ;wxTextAttr::Combine(const wxTextAttr&,const wxTextAttr&,const wxTextCtrlBase*)
        Combine__10wxTextAttrFRC10wxTextAttrT1PC14wxTextCtrlBase
@@ -5690,6 +5928,8 @@ EXPORTS
        DoScreenToClient__20wxTopLevelWindowBaseCFPiT1
        ;wxTopLevelWindowBase::Destroy()
        Destroy__20wxTopLevelWindowBaseFv
+      ;wxTopLevelWindowBase::GetMaxSize() const
+      GetMaxSize__20wxTopLevelWindowBaseCFv
        ;wxTopLevelWindow::sm_classwxTopLevelWindow
        sm_classwxTopLevelWindow__16wxTopLevelWindow
    ;From object file:  ..\common\treebase.cpp
@@ -5797,7 +6037,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
@@ -6010,6 +6250,8 @@ EXPORTS
        __ct__15wxTextValidatorFlP8wxString
        ;wxTextValidator::Validate(wxWindow*)
        Validate__15wxTextValidatorFP8wxWindow
+      ;wxTextValidator::IsNotInCharExcludeList(const wxString&)
+      IsNotInCharExcludeList__15wxTextValidatorFRC8wxString
        ;wxConstructorForwxTextValidator()
        wxConstructorForwxTextValidator__Fv
        ;wxTextValidator::sm_eventTable
@@ -6019,6 +6261,8 @@ EXPORTS
        ;wxTextValidator::SetIncludeList(const wxStringList&)
        SetIncludeList__15wxTextValidatorFRC12wxStringList
        __vft15wxTextValidator8wxObject
+      ;wxTextValidator::IsInCharIncludeList(const wxString&)
+      IsInCharIncludeList__15wxTextValidatorFRC8wxString
        ;wxTextValidator::SetExcludeList(const wxStringList&)
        SetExcludeList__15wxTextValidatorFRC12wxStringList
        ;wxTextValidator::OnChar(wxKeyEvent&)
@@ -6614,6 +6858,8 @@ EXPORTS
        ms_winCaptureNext__12wxWindowBase
        ;wxWindowBase::ms_lastControlId
        ms_lastControlId__12wxWindowBase
+      ;wxWindowBase::SetPalette(const wxPalette&)
+      SetPalette__12wxWindowBaseFRC9wxPalette
        ;wxWindowBase::RemoveConstraintReference(wxWindowBase*)
        RemoveConstraintReference__12wxWindowBaseFP12wxWindowBase
        ;wxWindowBase::LayoutPhase2(int*)
@@ -6638,6 +6884,10 @@ EXPORTS
        SetToolTip__12wxWindowBaseFRC8wxString
        ;wxWindowBase::ConvertPixelsToDialog(const wxPoint&)
        ConvertPixelsToDialog__12wxWindowBaseFRC7wxPoint
+      ;wxWindowBase::SetSizer(wxSizer*,unsigned long)
+      SetSizer__12wxWindowBaseFP7wxSizerUl
+      ;wxWindowBase::SetSizerAndFit(wxSizer*,unsigned long)
+      SetSizerAndFit__12wxWindowBaseFP7wxSizerUl
        ;wxWindowBase::FindWindow(long)
        FindWindow__12wxWindowBaseFl
        ;wxWindowBase::IsExposed(int,int) const
@@ -6647,6 +6897,8 @@ EXPORTS
        ;wxWindowBase::sm_classwxWindowBase
        sm_classwxWindowBase__12wxWindowBase
        __vft16wxWindowListNode10wxNodeBase
+      ;wxWindowBase::SetVirtualSizeHints(int,int,int,int)
+      SetVirtualSizeHints__12wxWindowBaseFiN31
        ;wxWindowBase::SetSizeHints(int,int,int,int,int,int)
        SetSizeHints__12wxWindowBaseFiN51
        ;wxWindowBase::MoveConstraint(int,int)
@@ -6655,6 +6907,8 @@ EXPORTS
        LayoutPhase1__12wxWindowBaseFPi
        ;wxWindowBase::GetPositionConstraint(int*,int*) const
        GetPositionConstraint__12wxWindowBaseCFPiT1
+      ;wxWindowBase::AdjustForParentClientOrigin(int&,int&,int) const
+      AdjustForParentClientOrigin__12wxWindowBaseCFRiT1i
        ;wxWindowBase::TransferDataToWindow()
        TransferDataToWindow__12wxWindowBaseFv
        ;wxWindowBase::ReleaseMouse()
@@ -6681,22 +6935,22 @@ EXPORTS
        SetSizeConstraint__12wxWindowBaseFiN31
        ;wxWindowBase::GetClientSizeConstraint(int*,int*) const
        GetClientSizeConstraint__12wxWindowBaseCFPiT1
+      ;wxWindowBase::DoSetVirtualSize(int,int)
+      DoSetVirtualSize__12wxWindowBaseFiT1
        ;wxWindowBase::DoHitTest(int,int) const
        DoHitTest__12wxWindowBaseCFiT1
-      ;wxWindowBase::AdjustForParentClientOrigin(int&,int&,int)
-      AdjustForParentClientOrigin__12wxWindowBaseFRiT1i
        ;wxWindowBase::DoGetBestSize() const
        DoGetBestSize__12wxWindowBaseCFv
        ;wxWindowBase::TransferDataFromWindow()
        TransferDataFromWindow__12wxWindowBaseFv
-      ;wxWindowBase::SetSizer(wxSizer*)
-      SetSizer__12wxWindowBaseFP7wxSizer
        ;wxWindowBase::IsTopLevel() const
        IsTopLevel__12wxWindowBaseCFv
        ;wxWindowBase::GetUpdateClientRect() const
        GetUpdateClientRect__12wxWindowBaseCFv
        ;wxWindowBase::GetHelpText() const
        GetHelpText__12wxWindowBaseCFv
+      ;wxWindowBase::GetAncestorWithCustomPalette() const
+      GetAncestorWithCustomPalette__12wxWindowBaseCFv
        ;wxWindowBase::SetFont(const wxFont&)
        SetFont__12wxWindowBaseFRC6wxFont
        ;wxWindowBase::MakeModal(unsigned long)
@@ -6723,6 +6977,8 @@ EXPORTS
        GetBorder__12wxWindowBaseCFv
        ;wxWindowBase::Fit()
        Fit__12wxWindowBaseFv
+      ;wxWindowBase::DoGetVirtualSize() const
+      DoGetVirtualSize__12wxWindowBaseCFv
        ;wxWindowBase::DeleteRelatedConstraints()
        DeleteRelatedConstraints__12wxWindowBaseFv
        ;wxWindowBase::SetHelpText(const wxString&)
@@ -6920,24 +7176,6 @@ EXPORTS
        __vft16wxZipInputStream12wxStreamBase
        ;wxZipInputStream::Eof() const
        Eof__16wxZipInputStreamCFv
-  ;From object file:  ..\common\zstream.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxZlibInputStream::wxZlibInputStream(wxInputStream&)
-      __ct__17wxZlibInputStreamFR13wxInputStream
-      ;wxZlibOutputStream::wxZlibOutputStream(wxOutputStream&,int)
-      __ct__18wxZlibOutputStreamFR14wxOutputStreami
-      ;wxZlibInputStream::OnSysRead(void*,unsigned int)
-      OnSysRead__17wxZlibInputStreamFPvUi
-      ;wxZlibOutputStream::Sync()
-      Sync__18wxZlibOutputStreamFv
-      ;wxZlibOutputStream::OnSysWrite(const void*,unsigned int)
-      OnSysWrite__18wxZlibOutputStreamFPCvUi
-      __vft18wxZlibOutputStream12wxStreamBase
-      ;wxZlibInputStream::~wxZlibInputStream()
-      __dt__17wxZlibInputStreamFv
-      ;wxZlibOutputStream::~wxZlibOutputStream()
-      __dt__18wxZlibOutputStreamFv
-      __vft17wxZlibInputStream12wxStreamBase
    ;From object file:  ..\generic\busyinfo.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxBusyInfo::~wxBusyInfo()
@@ -7077,6 +7315,8 @@ EXPORTS
        GetEventTable__14wxCalendarCtrlCFv
        ;wxCalendarCtrl::GetMonthControl() const
        GetMonthControl__14wxCalendarCtrlCFv
+      ;wxCalendarCtrl::Destroy()
+      Destroy__14wxCalendarCtrlFv
    ;From object file:  ..\generic\caret.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxCaret::Blink()
@@ -7218,6 +7458,26 @@ EXPORTS
        CalculateMeasurements__21wxGenericColourDialogFv
        ;wxGenericColourDialog::sm_classwxGenericColourDialog
        sm_classwxGenericColourDialog__21wxGenericColourDialog
+  ;From object file:  ..\generic\dcbuffer.cpp
+    ;PUBDEFs (Symbols available from object file):
+      __vft17wxBufferedPaintDC8wxObject
+      ;wxBufferedDC::wxBufferedDC(wxDC*,const wxBitmap&)
+      __ct__12wxBufferedDCFP4wxDCRC8wxBitmap
+      ;wxBufferedPaintDC::wxBufferedPaintDC(wxWindow*,const wxBitmap&)
+      __ct__17wxBufferedPaintDCFP8wxWindowRC8wxBitmap
+      ;wxBufferedDC::~wxBufferedDC()
+      __dt__12wxBufferedDCFv
+      __vft12wxBufferedDC8wxObject
+      ;wxBufferedDC::wxBufferedDC(wxDC*,const wxSize&)
+      __ct__12wxBufferedDCFP4wxDCRC6wxSize
+      ;wxBufferedDC::UnMask()
+      UnMask__12wxBufferedDCFv
+      ;wxBufferedDC::Init(wxDC*,const wxBitmap&)
+      Init__12wxBufferedDCFP4wxDCRC8wxBitmap
+      ;wxBufferedDC::Init(wxDC*,const wxSize&)
+      Init__12wxBufferedDCFP4wxDCRC6wxSize
+      ;wxBufferedPaintDC::~wxBufferedPaintDC()
+      __dt__17wxBufferedPaintDCFv
    ;From object file:  ..\generic\dcpsg.cpp
      ;PUBDEFs (Symbols available from object file):
        __vft23wxPostScriptPrintDialog8wxObject
@@ -7404,6 +7664,8 @@ EXPORTS
        ;wxGenericDirDialog::OnNew(wxCommandEvent&)
        OnNew__18wxGenericDirDialogFR14wxCommandEvent
        __vft18wxGenericDirDialog8wxObject
+      ;wxGenericDirDialog::OnGoHome(wxCommandEvent&)
+      OnGoHome__18wxGenericDirDialogFR14wxCommandEvent
        ;wxGenericDirDialog::wxGenericDirDialog(wxWindow*,const wxString&,const wxString&,long,const wxPoint&,const wxSize&,const wxString&)
        __ct__18wxGenericDirDialogFP8wxWindowRC8wxStringT2lRC7wxPointRC6wxSizeT2
        ;wxGenericDirDialog::ShowModal()
@@ -7470,12 +7732,16 @@ EXPORTS
        SetFilterIndex__16wxGenericDirCtrlFi
        ;wxDirFilterListCtrl::FillFilterList(const wxString&,int)
        FillFilterList__19wxDirFilterListCtrlFRC8wxStringi
+      ;wxGenericDirCtrl::ReCreateTree()
+      ReCreateTree__16wxGenericDirCtrlFv
        ;wxGenericDirCtrl::SetupSections()
        SetupSections__16wxGenericDirCtrlFv
        ;wxGenericDirCtrl::ShowHidden(unsigned long)
        ShowHidden__16wxGenericDirCtrlFUl
        ;wxGenericDirCtrl::OnCollapseItem(wxTreeEvent&)
        OnCollapseItem__16wxGenericDirCtrlFR11wxTreeEvent
+      ;wxGenericDirCtrl::CollapseDir(wxTreeItemId)
+      CollapseDir__16wxGenericDirCtrlF12wxTreeItemId
        ;wxDirItemData::HasSubDirs() const
        HasSubDirs__13wxDirItemDataCFv
        ;wxGenericDirCtrl::GetPath() const
@@ -7683,7 +7949,8 @@ EXPORTS
        wxConstructorForwxGridEditorCreatedEvent__Fv
        ;wxConstructorForwxGridCornerLabelWindow()
        wxConstructorForwxGridCornerLabelWindow__Fv
-      __vft24wxGridCellStringRenderer16wxGridCellWorker
+      __vft22wxGridCellNumberEditor21wxClientDataContainer
+      __vft22wxGridCellBoolRenderer21wxClientDataContainer
        ;wxGrid::~wxGrid()
        __dt__6wxGridFv
        ;wxGridCellWithAttrArray::~wxGridCellWithAttrArray()
@@ -7874,9 +8141,11 @@ EXPORTS
        ;wxGridCellBoolRenderer::ms_sizeCheckMark
        ms_sizeCheckMark__22wxGridCellBoolRenderer
        __vft6wxGrid14wxScrollHelper
-      __vft24wxGridCellNumberRenderer16wxGridCellWorker
-      __vft22wxGridCellBoolRenderer16wxGridCellWorker
-      __vft20wxGridCellTextEditor16wxGridCellWorker
+      __vft22wxGridCellChoiceEditor21wxClientDataContainer
+      __vft22wxGridCellAttrProvider21wxClientDataContainer
+      __vft21wxGridCellFloatEditor21wxClientDataContainer
+      __vft20wxGridCellTextEditor21wxClientDataContainer
+      __vft15wxGridTableBase21wxClientDataContainer
        ;wxGridCellAttrProvider::~wxGridCellAttrProvider()
        __dt__22wxGridCellAttrProviderFv
        ;wxGridTypeRegistry::~wxGridTypeRegistry()
@@ -8071,11 +8340,9 @@ EXPORTS
        wxConstructorForwxGridRowLabelWindow__Fv
        ;wxGridCellEditorEvtHandler::sm_classwxGridCellEditorEvtHandler
        sm_classwxGridCellEditorEvtHandler__26wxGridCellEditorEvtHandler
-      __vft22wxGridCellNumberEditor16wxGridCellWorker
-      __vft22wxGridCellAttrProvider
-      __vft21wxGridCellFloatEditor16wxGridCellWorker
-      __vft20wxGridCellBoolEditor16wxGridCellWorker
-      __vft16wxGridCellWorker
+      __vft24wxGridCellStringRenderer21wxClientDataContainer
+      __vft24wxGridCellNumberRenderer21wxClientDataContainer
+      __vft20wxGridCellBoolEditor21wxClientDataContainer
        ;wxGridStringTable::~wxGridStringTable()
        __dt__17wxGridStringTableFv
        ;wxGridWindow::~wxGridWindow()
@@ -8259,7 +8526,8 @@ EXPORTS
        __dt__16wxGridCellEditorFv
        ;wxConstructorForwxGridStringTable()
        wxConstructorForwxGridStringTable__Fv
-      __vft16wxGridCellEditor16wxGridCellWorker
+      __vft17wxGridStringTable21wxClientDataContainer
+      __vft16wxGridCellEditor21wxClientDataContainer
        ;wxGridStringTable::wxGridStringTable()
        __ct__17wxGridStringTableFv
        ;wxGrid::ShowCellEditControl()
@@ -8445,8 +8713,8 @@ EXPORTS
        wxConstructorForwxGridColLabelWindow__Fv
        ;wxGridCellEditorEvtHandler::sm_eventTableEntries
        sm_eventTableEntries__26wxGridCellEditorEvtHandler
-      __vft23wxGridCellFloatRenderer16wxGridCellWorker
-      __vft22wxGridCellChoiceEditor16wxGridCellWorker
+      __vft23wxGridCellFloatRenderer21wxClientDataContainer
+      __vft16wxGridCellWorker21wxClientDataContainer
        ;wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
        __dt__22wxGridRowOrColAttrDataFv
        ;wxGridCellCoordsArray::~wxGridCellCoordsArray()
@@ -8535,11 +8803,12 @@ EXPORTS
        Draw__22wxGridCellEnumRendererFR6wxGridR14wxGridCellAttrR4wxDCRC6wxRectiT5Ul
        ;wxGridCellDateTimeRenderer::wxGridCellDateTimeRenderer(wxString,wxString)
        __ct__26wxGridCellDateTimeRendererF8wxStringT1
+      __vft20wxGridCellEnumEditor21wxClientDataContainer
        ;wxGridCellDateTimeRenderer::Draw(wxGrid&,wxGridCellAttr&,wxDC&,const wxRect&,int,int,unsigned long)
        Draw__26wxGridCellDateTimeRendererFR6wxGridR14wxGridCellAttrR4wxDCRC6wxRectiT5Ul
        ;wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid&,wxGridCellAttr&,wxDC&,int,int)
        GetBestSize__32wxGridCellAutoWrapStringRendererFR6wxGridR14wxGridCellAttrR4wxDCiT4
-      __vft32wxGridCellAutoWrapStringRenderer16wxGridCellWorker
+      __vft22wxGridCellEnumRenderer21wxClientDataContainer
        ;wxGridCellDateTimeRenderer::SetParameters(const wxString&)
        SetParameters__26wxGridCellDateTimeRendererFRC8wxString
        ;wxGridCellEnumRenderer::SetParameters(const wxString&)
@@ -8552,8 +8821,8 @@ EXPORTS
        Draw__32wxGridCellAutoWrapStringRendererFR6wxGridR14wxGridCellAttrR4wxDCRC6wxRectiT5Ul
        ;wxGridCellDateTimeRenderer::Clone() const
        Clone__26wxGridCellDateTimeRendererCFv
-      __vft22wxGridCellEnumRenderer16wxGridCellWorker
-      __vft20wxGridCellEnumEditor16wxGridCellWorker
+      __vft30wxGridCellAutoWrapStringEditor21wxClientDataContainer
+      __vft26wxGridCellDateTimeRenderer21wxClientDataContainer
        ;wxGridCellDateTimeRenderer::GetString(wxGrid&,int,int)
        GetString__26wxGridCellDateTimeRendererFR6wxGridiT2
        ;wxGridCellEnumRenderer::GetString(wxGrid&,int,int)
@@ -8570,8 +8839,7 @@ EXPORTS
        GetTextLines__32wxGridCellAutoWrapStringRendererFR6wxGridR4wxDCR14wxGridCellAttrRC6wxRectiT5
        ;wxGridCellEnumRenderer::Clone() const
        Clone__22wxGridCellEnumRendererCFv
-      __vft30wxGridCellAutoWrapStringEditor16wxGridCellWorker
-      __vft26wxGridCellDateTimeRenderer16wxGridCellWorker
+      __vft32wxGridCellAutoWrapStringRenderer21wxClientDataContainer
    ;From object file:  ..\generic\gridsel.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxGridSelection::SelectBlock(int,int,int,int,unsigned long,unsigned long,unsigned long,unsigned long,unsigned long)
@@ -8642,36 +8910,6 @@ EXPORTS
        LoadFile__24wxHTMLHelpControllerBaseFRC8wxString
        ;wxHTMLHelpControllerBase::KeywordSearch(const wxString&)
        KeywordSearch__24wxHTMLHelpControllerBaseFRC8wxString
-  ;From object file:  ..\generic\helpwxht.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxHelpControllerHtml::GetFrameParameters(wxSize*,wxPoint*,unsigned long*)
-      GetFrameParameters__20wxHelpControllerHtmlFP6wxSizeP7wxPointPUl
-      __vft20wxHelpControllerHtml8wxObject
-      ;wxHelpFrame::sm_eventTable
-      sm_eventTable__11wxHelpFrame
-      ;wxHelpFrame::OnButton(wxCommandEvent&)
-      OnButton__11wxHelpFrameFR14wxCommandEvent
-      ;wxHelpControllerHtml::sm_classwxHelpControllerHtml
-      sm_classwxHelpControllerHtml__20wxHelpControllerHtml
-      __vft11wxHelpFrame8wxObject
-      ;wxHelpFrame::OnClose(wxCloseEvent&)
-      OnClose__11wxHelpFrameFR12wxCloseEvent
-      ;wxHelpControllerHtml::wxHelpControllerHtml()
-      __ct__20wxHelpControllerHtmlFv
-      ;wxHelpControllerHtml::~wxHelpControllerHtml()
-      __dt__20wxHelpControllerHtmlFv
-      ;wxHelpControllerHtml::DisplayHelp(const wxString&)
-      DisplayHelp__20wxHelpControllerHtmlFRC8wxString
-      ;wxHelpFrame::wxHelpFrame(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,wxHelpControllerHtml*)
-      __ct__11wxHelpFrameFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizeP20wxHelpControllerHtml
-      ;wxHelpFrame::GetEventTable() const
-      GetEventTable__11wxHelpFrameCFv
-      ;wxHelpControllerHtml::SetFrameParameters(const wxString&,const wxSize&,const wxPoint&,unsigned long)
-      SetFrameParameters__20wxHelpControllerHtmlFRC8wxStringRC6wxSizeRC7wxPointUl
-      ;wxHelpFrame::sm_eventTableEntries
-      sm_eventTableEntries__11wxHelpFrame
-      ;wxHelpFrame::~wxHelpFrame()
-      __dt__11wxHelpFrameFv
    ;From object file:  ..\generic\imaglist.cpp
      ;PUBDEFs (Symbols available from object file):
        __vft11wxImageList8wxObject
@@ -9008,6 +9246,8 @@ EXPORTS
        Thaw__10wxListCtrlFv
        ;wxListCtrl::SetItem(long,int,const wxString&,int)
        SetItem__10wxListCtrlFliRC8wxStringT2
+      ;wxListMainWindow::SetFocus()
+      SetFocus__16wxListMainWindowFv
        ;wxListMainWindow::InitScrolling()
        InitScrolling__16wxListMainWindowFv
        ;wxListItemData::GetY() const
@@ -9054,6 +9294,8 @@ EXPORTS
        __vft16wxListMainWindow8wxObject
        ;wxListCtrl::SetFont(const wxFont&)
        SetFont__10wxListCtrlFRC6wxFont
+      ;wxListHeaderWindow::SendListEvent(int,wxPoint)
+      SendListEvent__18wxListHeaderWindowFi7wxPoint
        ;wxListCtrl::ResizeReportView(unsigned long)
        ResizeReportView__10wxListCtrlFUl
        ;wxListMainWindow::OnSetFocus(wxFocusEvent&)
@@ -9538,8 +9780,6 @@ EXPORTS
        __ct__16wxProgressDialogFRC8wxStringT1iP8wxWindowT3
        ;wxProgressDialog::CreateLabel(const wxString&,wxWindow**)
        CreateLabel__16wxProgressDialogFRC8wxStringPP8wxWindow
-      ;wxProgressDialog::OnShow(wxShowEvent&)
-      OnShow__16wxProgressDialogFR11wxShowEvent
        __vft16wxProgressDialog8wxObject
        ;wxProgressDialog::GetEventTable() const
        GetEventTable__16wxProgressDialogCFv
@@ -9625,6 +9865,8 @@ EXPORTS
        sm_eventTable__23wxGenericScrolledWindow
        ;wxAutoScrollTimer::wxAutoScrollTimer(wxWindow*,wxScrollHelper*,int,int,int)
        __ct__17wxAutoScrollTimerFP8wxWindowP14wxScrollHelperiN23
+      ;wxScrollHelper::DoCalcUnscrolledPosition(int,int,int*,int*) const
+      DoCalcUnscrolledPosition__14wxScrollHelperCFiT1PiT3
        ;wxScrollHelper::HandleOnScroll(wxScrollWinEvent&)
        HandleOnScroll__14wxScrollHelperFR16wxScrollWinEvent
        __vft17wxAutoScrollTimer8wxObject
@@ -9634,6 +9876,8 @@ EXPORTS
        GetScrollPixelsPerUnit__14wxScrollHelperCFPiT1
        ;wxScrollHelper::Scroll(int,int)
        Scroll__14wxScrollHelperFiT1
+      ;wxGenericScrolledWindow::DoSetVirtualSize(int,int)
+      DoSetVirtualSize__23wxGenericScrolledWindowFiT1
        ;wxScrollHelper::~wxScrollHelper()
        __dt__14wxScrollHelperFv
        ;wxConstructorForwxGenericScrolledWindow()
@@ -9649,19 +9893,19 @@ EXPORTS
        HandleOnSize__14wxScrollHelperFR11wxSizeEvent
        ;wxScrollHelper::HandleOnPaint(wxPaintEvent&)
        HandleOnPaint__14wxScrollHelperFR12wxPaintEvent
-      ;wxScrollHelper::GetVirtualSize(int*,int*) const
-      GetVirtualSize__14wxScrollHelperCFPiT1
+      ;wxScrollHelper::SetScrollRate(int,int)
+      SetScrollRate__14wxScrollHelperFiT1
        ;wxScrollHelper::GetTargetWindow() const
        GetTargetWindow__14wxScrollHelperCFv
        __vft14wxScrollHelper
+      ;wxGenericScrolledWindow::Layout()
+      Layout__23wxGenericScrolledWindowFv
        ;wxGenericScrolledWindow::GetEventTable() const
        GetEventTable__23wxGenericScrolledWindowCFv
        ;wxGenericScrolledWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
        Create__23wxGenericScrolledWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
-      ;wxScrollHelper::CalcUnscrolledPosition(int,int,int*,int*) const
-      CalcUnscrolledPosition__14wxScrollHelperCFiT1PiT3
-      ;wxScrollHelper::CalcScrolledPosition(int,int,int*,int*) const
-      CalcScrolledPosition__14wxScrollHelperCFiT1PiT3
+      ;wxScrollHelper::DoCalcScrolledPosition(int,int,int*,int*) const
+      DoCalcScrolledPosition__14wxScrollHelperCFiT1PiT3
        ;wxScrollHelper::HandleOnMouseEnter(wxMouseEvent&)
        HandleOnMouseEnter__14wxScrollHelperFR12wxMouseEvent
        ;wxScrollHelper::HandleOnMouseLeave(wxMouseEvent&)
@@ -9700,8 +9944,6 @@ EXPORTS
      ;PUBDEFs (Symbols available from object file):
        ;wxSplitterWindow::OnNavigationKey(wxNavigationKeyEvent&)
        OnNavigationKey__16wxSplitterWindowFR20wxNavigationKeyEvent
-      ;wxSplitterWindow::OnUnsplitEvent(wxSplitterEvent&)
-      OnUnsplitEvent__16wxSplitterWindowFR15wxSplitterEvent
        ;wxSplitterWindow::OnSize(wxSizeEvent&)
        OnSize__16wxSplitterWindowFR11wxSizeEvent
        ;wxSplitterWindow::OnChildFocus(wxChildFocusEvent&)
@@ -9710,6 +9952,8 @@ EXPORTS
        RemoveChild__16wxSplitterWindowFP12wxWindowBase
        ;wxSplitterWindow::ReplaceWindow(wxWindow*,wxWindow*)
        ReplaceWindow__16wxSplitterWindowFP8wxWindowT1
+      ;wxSplitterWindow::AdjustSashPosition(int) const
+      AdjustSashPosition__16wxSplitterWindowCFi
        ;wxSplitterWindow::GetDefaultItem() const
        GetDefaultItem__16wxSplitterWindowCFv
        ;wxSplitterWindow::InitColours()
@@ -9720,8 +9964,12 @@ EXPORTS
        OnFocus__16wxSplitterWindowFR12wxFocusEvent
        wxEVT_COMMAND_SPLITTER_UNSPLIT
        __vft16wxSplitterWindow8wxObject
-      ;wxSplitterWindow::OnSetCursor(wxSetCursorEvent&)
-      OnSetCursor__16wxSplitterWindowFR16wxSetCursorEvent
+      ;wxSplitterWindow::DoSplit(wxSplitMode,wxWindow*,wxWindow*,int)
+      DoSplit__16wxSplitterWindowF11wxSplitModeP8wxWindowT2i
+      ;wxSplitterWindow::SetMinimumPaneSize(int)
+      SetMinimumPaneSize__16wxSplitterWindowFi
+      ;wxSplitterWindow::OnSashPositionChange(int)
+      OnSashPositionChange__16wxSplitterWindowFi
        ;wxSplitterWindow::DrawSashTracker(int,int)
        DrawSashTracker__16wxSplitterWindowFiT1
        ;wxConstructorForwxSplitterWindow()
@@ -9731,16 +9979,14 @@ EXPORTS
        ;wxSplitterWindow::SetFocus()
        SetFocus__16wxSplitterWindowFv
        wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING
-      ;wxSplitterWindow::OnSashPosChanged(wxSplitterEvent&)
-      OnSashPosChanged__16wxSplitterWindowFR15wxSplitterEvent
        ;wxSplitterEvent::sm_classwxSplitterEvent
        sm_classwxSplitterEvent__15wxSplitterEvent
-      ;wxSplitterWindow::SplitHorizontally(wxWindow*,wxWindow*,int)
-      SplitHorizontally__16wxSplitterWindowFP8wxWindowT1i
+      ;wxSplitterWindow::OnDoubleClickSash(int,int)
+      OnDoubleClickSash__16wxSplitterWindowFiT1
+      ;wxSplitterWindow::GetWindowSize() const
+      GetWindowSize__16wxSplitterWindowCFv
        ;wxSplitterWindow::SizeWindows()
        SizeWindows__16wxSplitterWindowFv
-      ;wxSplitterWindow::SendUnsplitEvent(wxWindow*)
-      SendUnsplitEvent__16wxSplitterWindowFP8wxWindow
        ;wxSplitterWindow::sm_eventTableEntries
        sm_eventTableEntries__16wxSplitterWindow
        ;wxSplitterWindow::OnPaint(wxPaintEvent&)
@@ -9748,10 +9994,14 @@ EXPORTS
        wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED
        ;wxSplitterWindow::OnIdle(wxIdleEvent&)
        OnIdle__16wxSplitterWindowFR11wxIdleEvent
-      ;wxSplitterWindow::OnDoubleClick(wxSplitterEvent&)
-      OnDoubleClick__16wxSplitterWindowFR15wxSplitterEvent
+      ;wxSplitterWindow::DoSetSashPosition(int)
+      DoSetSashPosition__16wxSplitterWindowFi
+      ;wxSplitterWindow::ConvertSashPosition(int) const
+      ConvertSashPosition__16wxSplitterWindowCFi
        ;wxSplitterWindow::Init()
        Init__16wxSplitterWindowFv
+      ;wxSplitterWindow::SetResizeCursor()
+      SetResizeCursor__16wxSplitterWindowFv
        ;wxSplitterWindow::GetEventTable() const
        GetEventTable__16wxSplitterWindowCFv
        ;wxSplitterWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
@@ -9771,14 +10021,16 @@ EXPORTS
        SetSashPosition__16wxSplitterWindowFiUl
        ;wxSplitterWindow::SashHitTest(int,int,int)
        SashHitTest__16wxSplitterWindowFiN21
-      ;wxSplitterWindow::SplitVertically(wxWindow*,wxWindow*,int)
-      SplitVertically__16wxSplitterWindowFP8wxWindowT1i
+      ;wxSplitterWindow::OnSashPositionChanging(int)
+      OnSashPositionChanging__16wxSplitterWindowFi
        ;wxConstructorForwxSplitterEvent()
        wxConstructorForwxSplitterEvent__Fv
        ;wxSplitterWindow::DrawSash(wxDC&)
        DrawSash__16wxSplitterWindowFR4wxDC
        ;wxSplitterWindow::Unsplit(wxWindow*)
        Unsplit__16wxSplitterWindowFP8wxWindow
+      ;wxSplitterWindow::OnUnsplit(wxWindow*)
+      OnUnsplit__16wxSplitterWindowFP8wxWindow
    ;From object file:  ..\generic\statusbr.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxStatusBar::GetFieldRect(int,wxRect&) const
@@ -9944,6 +10196,8 @@ EXPORTS
        OnOK__17wxTextEntryDialogFR14wxCommandEvent
        ;wxTextEntryDialog::sm_classwxTextEntryDialog
        sm_classwxTextEntryDialog__17wxTextEntryDialog
+      ;wxTextEntryDialog::SetValue(const wxString&)
+      SetValue__17wxTextEntryDialogFRC8wxString
        ;wxTextEntryDialog::GetEventTable() const
        GetEventTable__17wxTextEntryDialogCFv
        ;wxTextEntryDialog::sm_eventTableEntries
@@ -11158,8 +11412,6 @@ EXPORTS
        ;wxMsgArray::RemoveAt(unsigned int)
        RemoveAt__10wxMsgArrayFUi
        wxGetInstance
-      ;wxApp::GetStdIcon(int) const
-      GetStdIcon__5wxAppCFi
        ;wxMsgArray::~wxMsgArray()
        __dt__10wxMsgArrayFv
        wxSTD_MDIPARENTFRAME_ICON
@@ -11238,8 +11490,6 @@ EXPORTS
        wxInvertMask__FUliT2
        ;wxMask::wxMask()
        __ct__6wxMaskFv
-      ;wxBitmap::wxBitmap(const char**)
-      __ct__8wxBitmapFPPCc
        ;wxMask::sm_classwxMask
        sm_classwxMask__6wxMask
        __vft8wxBitmap8wxObject
@@ -11282,8 +11532,8 @@ EXPORTS
        wxConstructorForwxBitmap__Fv
        ;wxConstructorForwxMask()
        wxConstructorForwxMask__Fv
-      ;wxBitmap::wxBitmap(char**)
-      __ct__8wxBitmapFPPc
+      ;wxBitmap::CreateFromXpm(const char**)
+      CreateFromXpm__8wxBitmapFPPCc
        ;wxBitmap::SetMask(wxMask*)
        SetMask__8wxBitmapFP6wxMask
    ;From object file:  ..\os2\bmpbuttn.cpp
@@ -11355,6 +11605,8 @@ EXPORTS
        MakeOwnerDrawn__8wxButtonFv
        ;wxButton::WindowProc(unsigned int,void*,void*)
        WindowProc__8wxButtonFUiPvT2
+      ;wxButton::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__8wxButtonCFlPUl
        ;wxButton::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
        OnCtlColor__8wxButtonFUlT1UiT3PvT5
        ;wxButton::~wxButton()
@@ -11557,12 +11809,12 @@ EXPORTS
        __vft8wxColour8wxObject
        ;wxColour::wxColour(unsigned char,unsigned char,unsigned char)
        __ct__8wxColourFUcN21
-      ;wxColour::wxColour(const wxColour&)
-      __ct__8wxColourFRC8wxColour
-      ;wxColour::sm_classwxColour
-      sm_classwxColour__8wxColour
        ;wxColour::~wxColour()
        __dt__8wxColourFv
+      ;wxColour::sm_classwxColour
+      sm_classwxColour__8wxColour
+      ;wxColour::wxColour(const wxColour&)
+      __ct__8wxColourFRC8wxColour
    ;From object file:  ..\os2\combobox.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxComboBox::sm_classwxComboBox
@@ -11608,16 +11860,16 @@ EXPORTS
      ;PUBDEFs (Symbols available from object file):
        ;wxControl::OnEraseBackground(wxEraseEvent&)
        OnEraseBackground__9wxControlFR12wxEraseEvent
+      ;wxControl::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__9wxControlCFlPUl
        ;wxControl::sm_eventTable
        sm_eventTable__9wxControl
        ;wxControl::OS2CreateControl(const char*,unsigned long,const wxPoint&,const wxSize&,const wxString&,unsigned long)
        OS2CreateControl__9wxControlFPCcUlRC7wxPointRC6wxSizeRC8wxStringT2
-      ;wxControl::GetExStyle(unsigned long&) const
-      GetExStyle__9wxControlCFRUl
-      ;wxControl::sm_eventTableEntries
-      sm_eventTableEntries__9wxControl
        ;wxControl::sm_classwxControl
        sm_classwxControl__9wxControl
+      ;wxControl::sm_eventTableEntries
+      sm_eventTableEntries__9wxControl
        ;wxControl::DoGetBestSize() const
        DoGetBestSize__9wxControlCFv
        ;wxControl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
@@ -11630,15 +11882,17 @@ EXPORTS
        __ct__9wxControlFv
        ;wxControl::GetEventTable() const
        GetEventTable__9wxControlCFv
+      ;wxControl::OS2CreateControl(const char*,const wxString&,const wxPoint&,const wxSize&,long)
+      OS2CreateControl__9wxControlFPCcRC8wxStringRC7wxPointRC6wxSizel
        ;wxFindMaxSize(unsigned long,_RECTL*)
        wxFindMaxSize__FUlP6_RECTL
        __vft9wxControl8wxObject
        ;wxControl::~wxControl()
        __dt__9wxControlFv
-      ;wxControl::OS2CreateControl(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
-      OS2CreateControl__9wxControlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
    ;From object file:  ..\os2\cursor.cpp
      ;PUBDEFs (Symbols available from object file):
+      ;wxCursor::wxCursor(const wxImage&)
+      __ct__8wxCursorFRC7wxImage
        ;wxCursorRefData::~wxCursorRefData()
        __dt__15wxCursorRefDataFv
        ;wxCursor::wxCursor(const wxString&,long,int,int)
@@ -11713,7 +11967,6 @@ EXPORTS
        wxGaugeNameStr
        wxGREEN
        wxFrameNameStr
-      wxFatalErrorStr
        wxDefaultPosition
        wxBitmapRadioButtonNameStr
        wxTheBitmapList
@@ -11763,7 +12016,6 @@ EXPORTS
        wxStatusLineNameStr
        wxRadioBoxNameStr
        wxLIGHT_GREY_PEN
-      wxInternalErrorStr
        wxGREY_PEN
        wxFileSelectorDefaultWildcardStr
        wxDoubleToStringStr
@@ -11915,6 +12167,8 @@ EXPORTS
        QueryTextBkColor__FUl
        ;wxDC::SelectOldObjects(unsigned long)
        SelectOldObjects__4wxDCFUl
+      ;wxDC::DoSelectPalette(unsigned long)
+      DoSelectPalette__4wxDCFUl
        ;SetBkMode(unsigned long,int)
        SetBkMode__FUli
        ;wxDC::DoSetClippingRegion(int,int,int,int)
@@ -11937,6 +12191,8 @@ EXPORTS
        DoDrawIcon__4wxDCFRC6wxIconiT2
        ;wxDC::StartPage()
        StartPage__4wxDCFv
+      ;wxDC::InitializePalette()
+      InitializePalette__4wxDCFv
        ;wxDC::GetCharWidth() const
        GetCharWidth__4wxDCCFv
        ;wxDC::DoDrawRotatedText(const wxString&,int,int,double)
@@ -11975,6 +12231,8 @@ EXPORTS
        DoCopy__13wxArrayDCInfoFRC13wxArrayDCInfo
        ;wxArrayDCInfo::Add(const wxPaintDCInfo&)
        Add__13wxArrayDCInfoFRC13wxPaintDCInfo
+      ;wxWindowDC::DoGetSize(int*,int*) const
+      DoGetSize__10wxWindowDCCFPiT1
        ;wxPaintDC::wxPaintDC()
        __ct__9wxPaintDCFv
        ;wxArrayDCInfo::operator=(const wxArrayDCInfo&)
@@ -11983,6 +12241,7 @@ EXPORTS
        __ct__10wxClientDCFP8wxWindow
        ;wxPaintDC::FindDCInCache(wxWindow*)
        FindDCInCache__9wxPaintDCFP8wxWindow
+      __vft10wxWindowDC8wxObject
        ;wxArrayDCInfo::Insert(const wxPaintDCInfo&,unsigned int)
        Insert__13wxArrayDCInfoFRC13wxPaintDCInfoUi
        ;wxConstructorForwxWindowDC()
@@ -12009,6 +12268,8 @@ EXPORTS
        sm_classwxPaintDC__9wxPaintDC
        __vft10wxClientDC8wxObject
        __vft9wxPaintDC8wxObject
+      ;wxClientDC::DoGetSize(int*,int*) const
+      DoGetSize__10wxClientDCCFPiT1
        ;wxArrayDCInfo::~wxArrayDCInfo()
        __dt__13wxArrayDCInfoFv
        ;wxConstructorForwxClientDC()
@@ -12076,6 +12337,9 @@ EXPORTS
      ;PUBDEFs (Symbols available from object file):
        ;wxConstructorForwxScreenDC()
        wxConstructorForwxScreenDC__Fv
+      __vft10wxScreenDC8wxObject
+      ;wxScreenDC::DoGetSize(int*,int*) const
+      DoGetSize__10wxScreenDCCFPiT1
        ;wxScreenDC::sm_classwxScreenDC
        sm_classwxScreenDC__10wxScreenDC
        ;wxScreenDC::wxScreenDC()
@@ -13010,14 +13274,18 @@ EXPORTS
        sm_classwxMenuBar__9wxMenuBar
        ;wxMenuBar::RebuildAccelTable()
        RebuildAccelTable__9wxMenuBarFv
+      ;wxMenu::EndRadioGroup()
+      EndRadioGroup__6wxMenuFv
        ;wxMenu::OS2Command(unsigned int,unsigned short)
        OS2Command__6wxMenuFUiUs
        ;wxMenuBar::EnableTop(unsigned int,unsigned long)
        EnableTop__9wxMenuBarFUiUl
-      ;wxMenu::DoAppend(wxMenuItem*)
-      DoAppend__6wxMenuFP10wxMenuItem
+      ;wxMenu::Attach(wxMenuBarBase*)
+      Attach__6wxMenuFP13wxMenuBarBase
        ;wxMenu::DoRemove(wxMenuItem*)
        DoRemove__6wxMenuFP10wxMenuItem
+      ;wxMenu::DoAppend(wxMenuItem*)
+      DoAppend__6wxMenuFP10wxMenuItem
        ;wxMenu::CopyAccels(wxAcceleratorEntry*) const
        CopyAccels__6wxMenuCFP18wxAcceleratorEntry
        ;wxMenuBar::Refresh()
@@ -13048,25 +13316,35 @@ EXPORTS
        GetRealId__10wxMenuItemCFv
        ;wxMenuItem::SetCheckable(unsigned long)
        SetCheckable__10wxMenuItemFUl
-      ;wxMenuItemBase::New(wxMenu*,int,const wxString&,const wxString&,unsigned long,wxMenu*)
-      New__14wxMenuItemBaseFP6wxMenuiRC8wxStringT3UlT1
+      ;wxMenuItem::SetRadioGroupEnd(int)
+      SetRadioGroupEnd__10wxMenuItemFi
        ;wxMenuItem::IsChecked() const
        IsChecked__10wxMenuItemCFv
+      ;wxMenuItem::SetAsRadioGroupStart()
+      SetAsRadioGroupStart__10wxMenuItemFv
        ;wxMenuItemBase::GetLabelFromText(const wxString&)
        GetLabelFromText__14wxMenuItemBaseFRC8wxString
        ;wxMenuItem::SetText(const wxString&)
        SetText__10wxMenuItemFRC8wxString
+      ;wxMenuItemBase::New(wxMenu*,int,const wxString&,const wxString&,wxItemKind,wxMenu*)
+      New__14wxMenuItemBaseFP6wxMenuiRC8wxStringT310wxItemKindT1
+      ;wxMenuItem::wxMenuItem(wxMenu*,int,const wxString&,const wxString&,wxItemKind,wxMenu*)
+      __ct__10wxMenuItemFP6wxMenuiRC8wxStringT310wxItemKindT1
        ;wxMenuItem::Check(unsigned long)
        Check__10wxMenuItemFUl
        __vft10wxMenuItem8wxObject
        ;wxMenuItem::wxMenuItem(wxMenu*,int,const wxString&,const wxString&,unsigned long,wxMenu*)
        __ct__10wxMenuItemFP6wxMenuiRC8wxStringT3UlT1
+      ;wxMenuItem::SetRadioGroupStart(int)
+      SetRadioGroupStart__10wxMenuItemFi
        ;wxConstructorForwxMenuItem()
        wxConstructorForwxMenuItem__Fv
        ;wxMenuItem::~wxMenuItem()
        __dt__10wxMenuItemFv
        ;wxMenuItem::Enable(unsigned long)
        Enable__10wxMenuItemFUl
+      ;wxMenuItem::Init()
+      Init__10wxMenuItemFv
        __vft10wxMenuItem12wxOwnerDrawn
    ;From object file:  ..\os2\metafile.cpp
      ;PUBDEFs (Symbols available from object file):
@@ -13528,8 +13806,6 @@ EXPORTS
      ;PUBDEFs (Symbols available from object file):
        ;wxRegion::Combine(const wxRect&,wxRegionOp)
        Combine__8wxRegionFRC6wxRect10wxRegionOp
-      ;wxRegion::CloneData(wxObjectRefData*) const
-      CloneData__8wxRegionCFP15wxObjectRefData
        ;wxRegion::Offset(int,int)
        Offset__8wxRegionFiT1
        ;wxRegion::GetBox() const
@@ -13544,6 +13820,8 @@ EXPORTS
        __ct__8wxRegionFRC7wxPointT1
        ;wxRegion::Contains(int,int) const
        Contains__8wxRegionCFiT1
+      ;wxRegion::CloneData(const wxObjectRefData*) const
+      CloneData__8wxRegionCFPC15wxObjectRefData
        ;wxRegionIterator::GetY() const
        GetY__16wxRegionIteratorCFv
        ;wxConstructorForwxRegion()
@@ -13845,8 +14123,11 @@ EXPORTS
      ;PUBDEFs (Symbols available from object file):
        ;wxStaticLine::sm_classwxStaticLine
        sm_classwxStaticLine__12wxStaticLine
+      ;wxStaticLine::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__12wxStaticLineCFlPUl
        ;wxConstructorForwxStaticLine()
        wxConstructorForwxStaticLine__Fv
+      __vft12wxStaticLine8wxObject
        ;wxStaticLine::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
        Create__12wxStaticLineFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
    ;From object file:  ..\os2\tabctrl.cpp
@@ -14016,21 +14297,29 @@ EXPORTS
        Copy__10wxTextCtrlFv
        ;wxTextCtrl::SetStyle(long,long,const wxTextAttr&)
        SetStyle__10wxTextCtrlFlT1RC10wxTextAttr
+      ;wxTextCtrl::SetFocus()
+      SetFocus__10wxTextCtrlFv
        ;wxTextCtrl::CanRedo() const
        CanRedo__10wxTextCtrlCFv
-      ;wxTextCtrl::SetEditable(unsigned long)
-      SetEditable__10wxTextCtrlFUl
+      ;wxTextCtrl::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__10wxTextCtrlCFlPUl
        ;wxTextCtrl::sm_classwxTextCtrl
        sm_classwxTextCtrl__10wxTextCtrl
        __vft10wxTextCtrl8wxObject
        ;wxTextCtrl::ShowPosition(long)
        ShowPosition__10wxTextCtrlFl
+      ;wxTextCtrl::SetWindowStyleFlag(long)
+      SetWindowStyleFlag__10wxTextCtrlFl
+      ;wxTextCtrl::SetEditable(unsigned long)
+      SetEditable__10wxTextCtrlFUl
        ;wxTextCtrl::OnUpdateCopy(wxUpdateUIEvent&)
        OnUpdateCopy__10wxTextCtrlFR15wxUpdateUIEvent
        ;wxTextCtrl::OnCut(wxCommandEvent&)
        OnCut__10wxTextCtrlFR14wxCommandEvent
        ;wxTextCtrl::OnCopy(wxCommandEvent&)
        OnCopy__10wxTextCtrlFR14wxCommandEvent
+      ;wxTextCtrl::EmulateKeyPress(const wxKeyEvent&)
+      EmulateKeyPress__10wxTextCtrlFRC10wxKeyEvent
        ;wxConstructorForwxTextCtrl()
        wxConstructorForwxTextCtrl__Fv
        ;wxTextCtrl::wxTextCtrl()
@@ -14126,8 +14415,6 @@ EXPORTS
    ;From object file:  ..\os2\thread.cpp
      ;PUBDEFs (Symbols available from object file):
        p_wxMainMutex
-      ;wxCondition::Wait(unsigned long,unsigned long)
-      Wait__11wxConditionFUlT1
        ;wxCriticalSection::Leave()
        Leave__17wxCriticalSectionFv
        ;wxMutex::~wxMutex()
@@ -14144,6 +14431,10 @@ EXPORTS
        GetId__8wxThreadCFv
        ;wxThread::Delete(void**)
        Delete__8wxThreadFPPv
+      ;wxCondition::wxCondition(wxMutex&)
+      __ct__11wxConditionFR7wxMutex
+      ;wxCondition::Wait(unsigned long)
+      Wait__11wxConditionFUl
        ;wxThreadInternal::OS2ThreadStart(wxThread*)
        OS2ThreadStart__16wxThreadInternalFP8wxThread
        ;wxMutex::Lock()
@@ -14175,8 +14466,6 @@ EXPORTS
        wxGuiOwnedByMainThread__Fv
        ;wxCriticalSection::~wxCriticalSection()
        __dt__17wxCriticalSectionFv
-      ;wxCondition::wxCondition()
-      __ct__11wxConditionFv
        ;wxThread::Yield()
        Yield__8wxThreadFv
        ;wxMutex::TryLock()
@@ -14259,8 +14548,6 @@ EXPORTS
        sm_eventTable__9wxToolBar
        ;wxToolBar::GetToolSize() const
        GetToolSize__9wxToolBarCFv
-      ;wxToolBar::CreateTool(int,const wxBitmap&,const wxBitmap&,unsigned long,wxObject*,const wxString&,const wxString&)
-      CreateTool__9wxToolBarFiRC8wxBitmapT2UlP8wxObjectRC8wxStringT6
        ;wxToolBar::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
        Create__9wxToolBarFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
        ;wxToolBar::OS2Command(unsigned int,unsigned short)
@@ -14292,6 +14579,8 @@ EXPORTS
        GetEventTable__9wxToolBarCFv
        ;wxToolBar::OS2WindowProc(unsigned int,void*,void*)
        OS2WindowProc__9wxToolBarFUiPvT2
+      ;wxToolBar::CreateTool(int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,wxObject*,const wxString&,const wxString&)
+      CreateTool__9wxToolBarFiRC8wxStringRC8wxBitmapT310wxItemKindP8wxObjectN22
        ;wxToolBar::OnSysColourChanged(wxSysColourChangedEvent&)
        OnSysColourChanged__9wxToolBarFR23wxSysColourChangedEvent
        ;wxConstructorForwxToolBar()
@@ -14327,6 +14616,8 @@ EXPORTS
        hwndTT__9wxToolTip
    ;From object file:  ..\os2\toplevel.cpp
      ;PUBDEFs (Symbols available from object file):
+      ;wxTopLevelWindowOS2::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__19wxTopLevelWindowOS2CFlPUl
        __vft19wxTopLevelWindowOS28wxObject
        ;wxTopLevelWindowOS2::CreateFrame(const wxString&,const wxPoint&,const wxSize&)
        CreateFrame__19wxTopLevelWindowOS2FRC8wxStringRC7wxPointRC6wxSize
@@ -14340,32 +14631,30 @@ EXPORTS
        DoShowWindow__19wxTopLevelWindowOS2Fi
        ;wxTopLevelWindowOS2::Init()
        Init__19wxTopLevelWindowOS2Fv
-      ;wxTopLevelWindowOS2::OS2GetCreateWindowFlags(long*) const
-      OS2GetCreateWindowFlags__19wxTopLevelWindowOS2CFPl
+      ;wxTopLevelWindowOS2::m_sbInitialized
+      m_sbInitialized__19wxTopLevelWindowOS2
        ;wxTopLevelWindowOS2::Iconize(unsigned long)
        Iconize__19wxTopLevelWindowOS2FUl
        ;wxTopLevelWindowOS2::DoSetClientSize(int,int)
        DoSetClientSize__19wxTopLevelWindowOS2FiT1
-      ;wxTopLevelWindowOS2::AlterChildPos()
-      AlterChildPos__19wxTopLevelWindowOS2Fv
+      ;wxTopLevelWindowOS2::IsMaximized() const
+      IsMaximized__19wxTopLevelWindowOS2CFv
        ;wxTopLevelWindowOS2::SetIcon(const wxIcon&)
        SetIcon__19wxTopLevelWindowOS2FRC6wxIcon
        ;wxTopLevelWindowOS2::Restore()
        Restore__19wxTopLevelWindowOS2Fv
-      ;wxTopLevelWindowOS2::IsMaximized() const
-      IsMaximized__19wxTopLevelWindowOS2CFv
        ;wxTopLevelWindowOS2::Maximize(unsigned long)
        Maximize__19wxTopLevelWindowOS2FUl
        ;wxTopLevelWindowOS2::EnableCloseButton(unsigned long)
        EnableCloseButton__19wxTopLevelWindowOS2FUl
-      ;wxTopLevelWindowOS2::UpdateInternalSize(wxWindow*,int)
-      UpdateInternalSize__19wxTopLevelWindowOS2FP8wxWindowi
        ;wxTopLevelWindowOS2::DoGetClientSize(int*,int*) const
        DoGetClientSize__19wxTopLevelWindowOS2CFPiT1
        ;wxTopLevelWindowOS2::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
        Create__19wxTopLevelWindowOS2FP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
        ;wxTopLevelWindowOS2::Show(unsigned long)
        Show__19wxTopLevelWindowOS2FUl
+      ;wxTopLevelWindowOS2::SetIcons(const wxIconBundle&)
+      SetIcons__19wxTopLevelWindowOS2FRC12wxIconBundle
        ;wxTopLevelWindowOS2::IsIconized() const
        IsIconized__19wxTopLevelWindowOS2CFv
        ;wxTopLevelWindowOS2::SendSizeEvent()
@@ -14393,8 +14682,6 @@ EXPORTS
        wxColourDisplay__Fv
        ;wxCheckForInterrupt(wxWindow*)
        wxCheckForInterrupt__FP8wxWindow
-      ;wxDebugMsg(const char*,...)
-      wxDebugMsg__FPCce
        ;wxWriteResource(const wxString&,const wxString&,int,const wxString&)
        wxWriteResource__FRC8wxStringT1iT1
        ;wxGetResource(const wxString&,const wxString&,float*,const wxString&)
@@ -14413,8 +14700,6 @@ EXPORTS
        wxGetWindowClass__FUl
        ;wxGetUserId(char*,int)
        wxGetUserId__FPci
-      ;wxFatalError(const wxString&,const wxString&)
-      wxFatalError__FRC8wxStringT1
        ;wxDisplaySize(int*,int*)
        wxDisplaySize__FPiT1
        ;wxClientDisplayRect(int*,int*,int*,int*)
@@ -14436,8 +14721,6 @@ EXPORTS
        wxGetHostName__FPci
        ;wxGetResource(const wxString&,const wxString&,int*,const wxString&)
        wxGetResource__FRC8wxStringT1PiT1
-      ;wxError(const wxString&,const wxString&)
-      wxError__FRC8wxStringT1
        ;wxKill(long,wxSignal,wxKillError*)
        wxKill__Fl8wxSignalP11wxKillError
        ;wxBell()
@@ -14464,13 +14747,13 @@ EXPORTS
        wxGetEnv__FRC8wxStringP8wxString
    ;From object file:  ..\os2\utilsexc.cpp
      ;PUBDEFs (Symbols available from object file):
-      ;wxExecute(char**,unsigned long,wxProcess*)
-      wxExecute__FPPcUlP9wxProcess
-      ;wxExecute(const wxString&,unsigned long,wxProcess*)
-      wxExecute__FRC8wxStringUlP9wxProcess
+      ;wxExecute(char**,int,wxProcess*)
+      wxExecute__FPPciP9wxProcess
        ;wxGetFullHostName(char*,int)
        wxGetFullHostName__FPci
        wxExecuteWindowCbk
+      ;wxExecute(const wxString&,int,wxProcess*)
+      wxExecute__FRC8wxStringiP9wxProcess
    ;From object file:  ..\os2\wave.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxWave::Create(const wxString&,unsigned long)
@@ -14498,6 +14781,8 @@ EXPORTS
        UnpackActivate__8wxWindowFPvT1PUsPUl
        ;wxWindow::SubclassWin(unsigned long)
        SubclassWin__8wxWindowFUl
+      ;wxWindow::SetWindowStyleFlag(long)
+      SetWindowStyleFlag__8wxWindowFl
        ;wxWindow::HandleInitDialog(unsigned long)
        HandleInitDialog__8wxWindowFUl
        ;wxWindow::HandleGetMinMaxInfo(_SWP*)
@@ -14506,6 +14791,8 @@ EXPORTS
        HandleEraseBkgnd__8wxWindowFUl
        ;wxWindow::HandleCreate(void*,unsigned long*)
        HandleCreate__8wxWindowFPvPUl
+      ;wxWindow::HandleChar(void*,void*,unsigned long)
+      HandleChar__8wxWindowFPvT1Ul
        ;wxWindow::DoGetPosition(int*,int*) const
        DoGetPosition__8wxWindowCFPiT1
        ;wxCharCodeOS2ToWX(int)
@@ -14574,10 +14861,6 @@ EXPORTS
        OS2DestroyWindow__8wxWindowFv
        ;wxWindow::IsMouseInWindow() const
        IsMouseInWindow__8wxWindowCFv
-      ;wxWindow::HandleKeyUp(unsigned long,void*)
-      HandleKeyUp__8wxWindowFUlPv
-      ;wxWindow::HandleKeyDown(unsigned short,void*)
-      HandleKeyDown__8wxWindowFUsPv
        ;wxWindow::Clear()
        Clear__8wxWindowFv
        ;wxRemoveHandleAssociation(wxWindow*)
@@ -14587,6 +14870,8 @@ EXPORTS
        Reparent__8wxWindowFP8wxWindow
        ;wxWindow::OS2GetCreateWindowCoords(const wxPoint&,const wxSize&,int&,int&,int&,int&) const
        OS2GetCreateWindowCoords__8wxWindowCFRC7wxPointRC6wxSizeRiN33
+      ;wxWindow::CreateKeyEvent(int,int,void*,void*) const
+      CreateKeyEvent__8wxWindowCFiT1PvT3
        ;wxWindow::Enable(unsigned long)
        Enable__8wxWindowFUl
        wxWinHandleList
@@ -14676,6 +14961,8 @@ EXPORTS
        HandleMove__8wxWindowFiT1
        ;wxWindow::HandleMouseEvent(unsigned int,int,int,unsigned int)
        HandleMouseEvent__8wxWindowFUiiT2T1
+      ;wxWindow::HandleKeyDown(void*,void*)
+      HandleKeyDown__8wxWindowFPvT1
        ;wxWindow::GetScrollRange(int) const
        GetScrollRange__8wxWindowCFi
        ;wxWindow::DoSetSize(int,int,int,int,int)
@@ -14708,8 +14995,6 @@ EXPORTS
        GetTitle__8wxWindowCFv
        ;wxWindow::GetCharHeight() const
        GetCharHeight__8wxWindowCFv
-      ;wxWindow::CreateKeyEvent(int,int,void*) const
-      CreateKeyEvent__8wxWindowCFiT1Pv
        ;wxWindow::OS2Command(unsigned int,unsigned short)
        OS2Command__8wxWindowFUiUs
        wxWndProc
@@ -14724,12 +15009,14 @@ EXPORTS
        ScrollWindow__8wxWindowFiT1PC6wxRect
        ;wxWindow::OnIdle(wxIdleEvent&)
        OnIdle__8wxWindowFR11wxIdleEvent
+      ;wxWindow::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__8wxWindowCFlPUl
        ;wxWindow::HandleActivate(int,unsigned long)
        HandleActivate__8wxWindowFiUl
        ;wxWindow::FindItemByHWND(unsigned long,unsigned long) const
        FindItemByHWND__8wxWindowCFUlT1
-      ;wxWindow::HandleChar(unsigned long,void*,unsigned long)
-      HandleChar__8wxWindowFUlPvT1
+      ;wxWindow::HandleKeyUp(void*,void*)
+      HandleKeyUp__8wxWindowFPvT1
        ;wxWindow::DoMoveWindow(int,int,int,int)
        DoMoveWindow__8wxWindowFiN31
        ;wxWindow::DoClientToScreen(int*,int*) const
@@ -14746,21 +15033,3 @@ EXPORTS
        SetTitle__8wxWindowFRC8wxString
        ;wxWindow::sm_eventTableEntries
        sm_eventTableEntries__8wxWindow
-  ;From object file:  ..\os2\xpmhand.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxXPMDataHandler::Create(wxBitmap*,void*,long,int,int,int)
-      Create__16wxXPMDataHandlerFP8wxBitmapPvliN24
-      __vft16wxXPMDataHandler8wxObject
-      ;wxConstructorForwxXPMFileHandler()
-      wxConstructorForwxXPMFileHandler__Fv
-      __vft16wxXPMFileHandler8wxObject
-      ;wxConstructorForwxXPMDataHandler()
-      wxConstructorForwxXPMDataHandler__Fv
-      ;wxXPMFileHandler::LoadFile(wxBitmap*,const wxString&,long,int,int)
-      LoadFile__16wxXPMFileHandlerFP8wxBitmapRC8wxStringliT4
-      ;wxXPMFileHandler::SaveFile(wxBitmap*,const wxString&,int,const wxPalette*)
-      SaveFile__16wxXPMFileHandlerFP8wxBitmapRC8wxStringiPC9wxPalette
-      ;wxXPMDataHandler::sm_classwxXPMDataHandler
-      sm_classwxXPMDataHandler__16wxXPMDataHandler
-      ;wxXPMFileHandler::sm_classwxXPMFileHandler
-      sm_classwxXPMFileHandler__16wxXPMFileHandler