X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81d19f3ea57d7a3e60af1a8c352114709f26f246..761e1e0702fb50aca31fb7a38dcb0f00ae4d2ac6:/src/os2/wx23.def?ds=sidebyside

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index c35afce4db..8f05577557 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:  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
@@ -237,8 +237,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 +253,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&)
@@ -1621,6 +1621,8 @@ EXPORTS
       wxConstructorForwxPaintEvent__Fv
       ;wxConstructorForwxNotifyEvent()
       wxConstructorForwxNotifyEvent__Fv
+      ;wxConstructorForwxDisplayChangedEvent()
+      wxConstructorForwxDisplayChangedEvent__Fv
       ;wxConstructorForwxContextMenuEvent()
       wxConstructorForwxContextMenuEvent__Fv
       ;wxConstructorForwxCloseEvent()
@@ -1722,6 +1724,7 @@ EXPORTS
       wxEVT_MENU_HIGHLIGHT
       wxEVT_KEY_UP
       wxEVT_JOY_BUTTON_UP
+      wxEVT_DISPLAY_CHANGED
       wxEVT_COMMAND_SCROLLBAR_UPDATED
       wxEVT_COMMAND_RADIOBUTTON_SELECTED
       ;wxWindowCreateEvent::sm_classwxWindowCreateEvent
@@ -1736,6 +1739,8 @@ EXPORTS
       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 +1777,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,8 +2064,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
@@ -2117,6 +2120,8 @@ EXPORTS
       AppendDir__10wxFileNameFRC8wxString
       ;wxFileName::SplitPath(const wxString&,wxString*,wxString*,wxString*,wxString*,wxPathFormat)
       SplitPath__10wxFileNameFRC8wxStringP8wxStringN3212wxPathFormat
+      ;wxFileName::Normalize(int,const wxString&,wxPathFormat)
+      Normalize__10wxFileNameFiRC8wxString12wxPathFormat
       ;wxFileName::Mkdir(int,unsigned long)
       Mkdir__10wxFileNameFiUl
       ;wxFileName::MakeRelativeTo(const wxString&,wxPathFormat)
@@ -2167,10 +2172,12 @@ EXPORTS
       ms_root__16wxLocalFSHandler
       ;wxFileSystemHandler::GetMimeTypeFromExt(const wxString&)
       GetMimeTypeFromExt__19wxFileSystemHandlerFRC8wxString
-      ;wxFileSystem::m_Handlers
-      m_Handlers__12wxFileSystem
+      ;wxFSFile::sm_classwxFSFile
+      sm_classwxFSFile__8wxFSFile
       ;wxFileSystemModule::sm_classwxFileSystemModule
       sm_classwxFileSystemModule__18wxFileSystemModule
+      ;wxFileSystem::m_Handlers
+      m_Handlers__12wxFileSystem
       ;wxFileSystemHandler::FindNext()
       FindNext__19wxFileSystemHandlerFv
       ;wxFileSystem::CleanUpHandlers()
@@ -2242,6 +2249,8 @@ EXPORTS
       __ne__10wxFontBaseCFRC6wxFont
       ;wxFontBase::GetFamilyString() const
       GetFamilyString__10wxFontBaseCFv
+      ;wxFontBase::SetDefaultEncoding(wxFontEncoding)
+      SetDefaultEncoding__10wxFontBaseF14wxFontEncoding
       ;wxFontBase::IsFixedWidth() const
       IsFixedWidth__10wxFontBaseCFv
       ;wxFontBase::New(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
@@ -2764,6 +2773,22 @@ EXPORTS
       Destroy__17wxStringHashTableFv
       ;wxHashTable::Get(long,const char*) const
       Get__11wxHashTableCFlPCc
+  ;From object file:  ..\common\hashmap.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;_wxHashTableBase2::CopyHashTable(_wxHashTable_NodeBase**,unsigned int,_wxHashTableBase2*,_wxHashTable_NodeBase**,unsigned long(*)(_wxHashTableBase2*,_wxHashTable_NodeBase*),_wxHashTable_NodeBase*(*)(_wxHashTable_NodeBase*))
+      CopyHashTable__17_wxHashTableBase2FPP21_wxHashTable_NodeBaseUiP17_wxHashTableBase2T1PFP17_wxHashTableBase2P21_wxHashTable_NodeBase_UlPFP21_wxHashTable_NodeBase_P21_wxHashTable_NodeBase
+      ;wxStringHash::wxCharStringHash(const char*)
+      wxCharStringHash__12wxStringHashFPCc
+      ;_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*))
+      DeleteNodes__17_wxHashTableBase2FUiPP21_wxHashTable_NodeBasePFP21_wxHashTable_NodeBase_v
+      ;_wxHashTableBase2::GetNextPrime(unsigned long)
+      GetNextPrime__17_wxHashTableBase2FUl
+      ;_wxHashTableBase2::GetPreviousPrime(unsigned long)
+      GetPreviousPrime__17_wxHashTableBase2FUl
   ;From object file:  ..\common\helpbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHelpControllerBase::sm_classwxHelpControllerBase
@@ -2875,8 +2900,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
@@ -2905,6 +2928,8 @@ EXPORTS
       Copy__7wxImageCFv
       ;wxImage::GetOptionInt(const wxString&) const
       GetOptionInt__7wxImageCFRC8wxString
+      ;wxImage::SaveFile(wxOutputStream&,const wxString&) const
+      SaveFile__7wxImageCFR14wxOutputStreamRC8wxString
       ;wxImage::FindHandlerMime(const wxString&)
       FindHandlerMime__7wxImageFRC8wxString
       ;wxImage::Mirror(unsigned long) const
@@ -2912,6 +2937,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
@@ -2922,12 +2949,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
@@ -2936,8 +2963,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)
@@ -2948,8 +2973,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()
@@ -2978,8 +3003,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
@@ -2991,6 +3014,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
@@ -3011,6 +3036,8 @@ EXPORTS
       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
@@ -3019,16 +3046,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)
@@ -3138,6 +3163,8 @@ EXPORTS
       __vft12wxPNGHandler8wxObject
       ;wxConstructorForwxPNGHandler()
       wxConstructorForwxPNGHandler__Fv
+      wx_png_error
+      wx_png_warning
       _PNG_stream_reader
       ;wxPNGHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
       SaveFile__12wxPNGHandlerFP7wxImageR14wxOutputStreamUl
@@ -3148,8 +3175,6 @@ EXPORTS
       _PNG_stream_writer
       ;wxPNGHandler::sm_classwxPNGHandler
       sm_classwxPNGHandler__12wxPNGHandler
-      png_silent_error
-      png_silent_warning
   ;From object file:  ..\common\imagpnm.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPNMHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
@@ -3359,11 +3384,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()
@@ -3392,6 +3421,8 @@ EXPORTS
       FirstThat__10wxListBaseFPFPv_i
       ;wxNodeBase::~wxNodeBase()
       __dt__10wxNodeBaseFv
+      ;wxConstructorForwxList()
+      wxConstructorForwxList__Fv
       ;wxStringList::Sort()
       Sort__12wxStringListFv
       ;wxListBase::Find(void*) const
@@ -3400,6 +3431,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
@@ -4113,8 +4146,12 @@ EXPORTS
       wxCreateDynamicObject__FPCc
       ;wxObject::Dump(ostream&)
       Dump__8wxObjectFR7ostream
+      ;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&)
@@ -4124,6 +4161,8 @@ EXPORTS
       UnRef__8wxObjectFv
       ;wxClassInfo::CleanUpClasses()
       CleanUpClasses__11wxClassInfoFv
+      ;wxObject::AllocExclusive()
+      AllocExclusive__8wxObjectFv
       ;wxObject::IsKindOf(wxClassInfo*) const
       IsKindOf__8wxObjectCFP11wxClassInfo
       ;wxClassInfo::FindClass(const char*)
@@ -5771,7 +5810,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
@@ -6572,6 +6611,8 @@ EXPORTS
       SetForegroundColour__12wxWindowBaseFRC8wxColour
       ;wxWindowBase::SetBackgroundColour(const wxColour&)
       SetBackgroundColour__12wxWindowBaseFRC8wxColour
+      ;wxWindowBase::RemoveEventHandler(wxEvtHandler*)
+      RemoveEventHandler__12wxWindowBaseFP12wxEvtHandler
       ;wxWindowBase::Destroy()
       Destroy__12wxWindowBaseFv
       ;wxWindowBase::SetConstraints(wxLayoutConstraints*)
@@ -6586,6 +6627,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*)
@@ -6669,6 +6712,8 @@ EXPORTS
       GetUpdateClientRect__12wxWindowBaseCFv
       ;wxWindowBase::GetHelpText() const
       GetHelpText__12wxWindowBaseCFv
+      ;wxWindowBase::GetAncestorWithCustomPalette() const
+      GetAncestorWithCustomPalette__12wxWindowBaseCFv
       ;wxWindowBase::SetFont(const wxFont&)
       SetFont__12wxWindowBaseFRC6wxFont
       ;wxWindowBase::MakeModal(unsigned long)
@@ -7361,6 +7406,35 @@ EXPORTS
       DoDrawText__14wxPostScriptDCFRC8wxStringiT2
       ;wxPostScriptDC::ms_PSScaleFactor
       ms_PSScaleFactor__14wxPostScriptDC
+  ;From object file:  ..\generic\dirdlgg.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxGenericDirDialog::OnOK(wxCommandEvent&)
+      OnOK__18wxGenericDirDialogFR14wxCommandEvent
+      ;wxGenericDirDialog::OnTreeSelected(wxTreeEvent&)
+      OnTreeSelected__18wxGenericDirDialogFR11wxTreeEvent
+      ;wxGenericDirDialog::OnShowHidden(wxCommandEvent&)
+      OnShowHidden__18wxGenericDirDialogFR14wxCommandEvent
+      ;wxGenericDirDialog::GetEventTable() const
+      GetEventTable__18wxGenericDirDialogCFv
+      ;wxGenericDirDialog::GetPath() const
+      GetPath__18wxGenericDirDialogCFv
+      ;wxGenericDirDialog::OnNew(wxCommandEvent&)
+      OnNew__18wxGenericDirDialogFR14wxCommandEvent
+      __vft18wxGenericDirDialog8wxObject
+      ;wxGenericDirDialog::wxGenericDirDialog(wxWindow*,const wxString&,const wxString&,long,const wxPoint&,const wxSize&,const wxString&)
+      __ct__18wxGenericDirDialogFP8wxWindowRC8wxStringT2lRC7wxPointRC6wxSizeT2
+      ;wxGenericDirDialog::ShowModal()
+      ShowModal__18wxGenericDirDialogFv
+      ;wxGenericDirDialog::SetPath(const wxString&)
+      SetPath__18wxGenericDirDialogFRC8wxString
+      ;wxGenericDirDialog::sm_eventTable
+      sm_eventTable__18wxGenericDirDialog
+      ;wxGenericDirDialog::sm_eventTableEntries
+      sm_eventTableEntries__18wxGenericDirDialog
+      ;wxGenericDirDialog::OnCloseWindow(wxCloseEvent&)
+      OnCloseWindow__18wxGenericDirDialogFR12wxCloseEvent
+      ;wxGenericDirDialog::OnTreeKeyDown(wxTreeEvent&)
+      OnTreeKeyDown__18wxGenericDirDialogFR11wxTreeEvent
   ;From object file:  ..\generic\dirctrlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDirItemData::wxDirItemData(const wxString&,const wxString&,unsigned long)
@@ -8615,42 +8689,6 @@ EXPORTS
       sm_eventTableEntries__11wxHelpFrame
       ;wxHelpFrame::~wxHelpFrame()
       __dt__11wxHelpFrameFv
-  ;From object file:  ..\generic\helpxlp.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxXLPHelpController::DisplayContents()
-      DisplayContents__19wxXLPHelpControllerFv
-      ;wxXLPHelpController::Quit()
-      Quit__19wxXLPHelpControllerFv
-      ;wxXLPHelpController::DisplayBlock(long)
-      DisplayBlock__19wxXLPHelpControllerFl
-      __vft19wxXLPHelpController8wxObject
-      __vft19wxXLPHelpConnection8wxObject
-      ;wxXLPHelpController::DisplaySection(int)
-      DisplaySection__19wxXLPHelpControllerFi
-      ;wxXLPHelpConnection::wxXLPHelpConnection(wxXLPHelpController*)
-      __ct__19wxXLPHelpConnectionFP19wxXLPHelpController
-      ;wxXLPHelpController::OnQuit()
-      OnQuit__19wxXLPHelpControllerFv
-      ;wxXLPHelpClient::sm_classwxXLPHelpClient
-      sm_classwxXLPHelpClient__15wxXLPHelpClient
-      ;wxXLPHelpController::Initialize(const wxString&,int)
-      Initialize__19wxXLPHelpControllerFRC8wxStringi
-      ;wxXLPHelpController::~wxXLPHelpController()
-      __dt__19wxXLPHelpControllerFv
-      ;wxXLPHelpController::Run()
-      Run__19wxXLPHelpControllerFv
-      ;wxXLPHelpConnection::OnDisconnect()
-      OnDisconnect__19wxXLPHelpConnectionFv
-      ;wxXLPHelpController::LoadFile(const wxString&)
-      LoadFile__19wxXLPHelpControllerFRC8wxString
-      ;wxXLPHelpController::KeywordSearch(const wxString&)
-      KeywordSearch__19wxXLPHelpControllerFRC8wxString
-      ;wxXLPHelpController::wxXLPHelpController()
-      __ct__19wxXLPHelpControllerFv
-      ;wxXLPHelpController::sm_classwxXLPHelpController
-      sm_classwxXLPHelpController__19wxXLPHelpController
-      ;wxXLPHelpConnection::sm_classwxXLPHelpConnection
-      sm_classwxXLPHelpConnection__19wxXLPHelpConnection
   ;From object file:  ..\generic\imaglist.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft11wxImageList8wxObject
@@ -9353,6 +9391,22 @@ EXPORTS
       ;wxLogWindow::wxLogWindow(wxFrame*,const char*,unsigned long,unsigned long)
       __ct__11wxLogWindowFP7wxFramePCcUlT3
   ;From object file:  ..\generic\numdlgg.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxGetNumberFromUser(const wxString&,const wxString&,const wxString&,long,long,long,wxWindow*,const wxPoint&)
+      wxGetNumberFromUser__FRC8wxStringN21lN24P8wxWindowRC7wxPoint
+      ;wxNumberEntryDialog::GetEventTable() const
+      GetEventTable__19wxNumberEntryDialogCFv
+      ;wxNumberEntryDialog::sm_eventTableEntries
+      sm_eventTableEntries__19wxNumberEntryDialog
+      ;wxNumberEntryDialog::OnOK(wxCommandEvent&)
+      OnOK__19wxNumberEntryDialogFR14wxCommandEvent
+      ;wxNumberEntryDialog::wxNumberEntryDialog(wxWindow*,const wxString&,const wxString&,const wxString&,long,long,long,const wxPoint&)
+      __ct__19wxNumberEntryDialogFP8wxWindowRC8wxStringN22lN25RC7wxPoint
+      ;wxNumberEntryDialog::OnCancel(wxCommandEvent&)
+      OnCancel__19wxNumberEntryDialogFR14wxCommandEvent
+      __vft19wxNumberEntryDialog8wxObject
+      ;wxNumberEntryDialog::sm_eventTable
+      sm_eventTable__19wxNumberEntryDialog
   ;From object file:  ..\generic\panelg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPanel::OnSysColourChanged(wxSysColourChangedEvent&)
@@ -9673,6 +9727,8 @@ EXPORTS
       RemoveChild__16wxSplitterWindowFP12wxWindowBase
       ;wxSplitterWindow::ReplaceWindow(wxWindow*,wxWindow*)
       ReplaceWindow__16wxSplitterWindowFP8wxWindowT1
+      ;wxSplitterWindow::AdjustSashPosition(int) const
+      AdjustSashPosition__16wxSplitterWindowCFi
       ;wxSplitterWindow::GetDefaultItem() const
       GetDefaultItem__16wxSplitterWindowCFv
       ;wxSplitterWindow::InitColours()
@@ -9685,6 +9741,10 @@ EXPORTS
       __vft16wxSplitterWindow8wxObject
       ;wxSplitterWindow::OnSetCursor(wxSetCursorEvent&)
       OnSetCursor__16wxSplitterWindowFR16wxSetCursorEvent
+      ;wxSplitterWindow::DoSplit(wxSplitMode,wxWindow*,wxWindow*,int)
+      DoSplit__16wxSplitterWindowF11wxSplitModeP8wxWindowT2i
+      ;wxSplitterWindow::SetMinimumPaneSize(int)
+      SetMinimumPaneSize__16wxSplitterWindowFi
       ;wxSplitterWindow::DrawSashTracker(int,int)
       DrawSashTracker__16wxSplitterWindowFiT1
       ;wxConstructorForwxSplitterWindow()
@@ -9698,8 +9758,8 @@ EXPORTS
       OnSashPosChanged__16wxSplitterWindowFR15wxSplitterEvent
       ;wxSplitterEvent::sm_classwxSplitterEvent
       sm_classwxSplitterEvent__15wxSplitterEvent
-      ;wxSplitterWindow::SplitHorizontally(wxWindow*,wxWindow*,int)
-      SplitHorizontally__16wxSplitterWindowFP8wxWindowT1i
+      ;wxSplitterWindow::GetWindowSize() const
+      GetWindowSize__16wxSplitterWindowCFv
       ;wxSplitterWindow::SizeWindows()
       SizeWindows__16wxSplitterWindowFv
       ;wxSplitterWindow::SendUnsplitEvent(wxWindow*)
@@ -9713,6 +9773,8 @@ EXPORTS
       OnIdle__16wxSplitterWindowFR11wxIdleEvent
       ;wxSplitterWindow::OnDoubleClick(wxSplitterEvent&)
       OnDoubleClick__16wxSplitterWindowFR15wxSplitterEvent
+      ;wxSplitterWindow::DoSetSashPosition(int)
+      DoSetSashPosition__16wxSplitterWindowFi
       ;wxSplitterWindow::Init()
       Init__16wxSplitterWindowFv
       ;wxSplitterWindow::GetEventTable() const
@@ -9734,8 +9796,6 @@ EXPORTS
       SetSashPosition__16wxSplitterWindowFiUl
       ;wxSplitterWindow::SashHitTest(int,int,int)
       SashHitTest__16wxSplitterWindowFiN21
-      ;wxSplitterWindow::SplitVertically(wxWindow*,wxWindow*,int)
-      SplitVertically__16wxSplitterWindowFP8wxWindowT1i
       ;wxConstructorForwxSplitterEvent()
       wxConstructorForwxSplitterEvent__Fv
       ;wxSplitterWindow::DrawSash(wxDC&)
@@ -10538,6 +10598,8 @@ EXPORTS
       SetEncoding__20wxHtmlEntitiesParserF14wxFontEncoding
       ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
       PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
+      ;wxHtmlParser::OpenURL(wxHtmlURLType,const wxString&) const
+      OpenURL__12wxHtmlParserCF13wxHtmlURLTypeRC8wxString
       ;wxHtmlTextPieces::RemoveAt(unsigned int)
       RemoveAt__16wxHtmlTextPiecesFUi
       wxHtmlEntityCompare
@@ -10910,6 +10972,14 @@ EXPORTS
       _link_dummy_func_m_pre__Fv
       ;wxConstructorForHTML_ModulePre()
       wxConstructorForHTML_ModulePre__Fv
+  ;From object file:  ..\html\m_style.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;HTML_ModuleStyleTag::sm_classHTML_ModuleStyleTag
+      sm_classHTML_ModuleStyleTag__19HTML_ModuleStyleTag
+      ;_link_dummy_func_m_style()
+      _link_dummy_func_m_style__Fv
+      ;wxConstructorForHTML_ModuleStyleTag()
+      wxConstructorForHTML_ModuleStyleTag__Fv
   ;From object file:  ..\html\m_tables.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTableCell::ReallocRows(int)
@@ -10957,8 +11027,6 @@ EXPORTS
       SetInputEncoding__15wxHtmlWinParserF14wxFontEncoding
       ;wxHtmlWinParser::SetLink(const wxHtmlLinkInfo&)
       SetLink__15wxHtmlWinParserFRC14wxHtmlLinkInfo
-      ;wxHtmlWinParser::CanOpenURL(const wxString&) const
-      CanOpenURL__15wxHtmlWinParserCFRC8wxString
       __vft15wxHtmlWinParser8wxObject
       ;wxHtmlWinParser::CloseContainer()
       CloseContainer__15wxHtmlWinParserFv
@@ -10985,6 +11053,8 @@ EXPORTS
       OnInit__16wxHtmlTagsModuleFv
       ;wxHtmlWinParser::CreateCurrentFont()
       CreateCurrentFont__15wxHtmlWinParserFv
+      ;wxHtmlWinParser::OpenURL(wxHtmlURLType,const wxString&) const
+      OpenURL__15wxHtmlWinParserCF13wxHtmlURLTypeRC8wxString
       ;wxHtmlWinParser::SetFontFace(const wxString&)
       SetFontFace__15wxHtmlWinParserFRC8wxString
   ;From object file:  ..\generic\msgdlgg.cpp
@@ -11191,8 +11261,6 @@ EXPORTS
       wxInvertMask__FUliT2
       ;wxMask::wxMask()
       __ct__6wxMaskFv
-      ;wxBitmap::wxBitmap(const char**)
-      __ct__8wxBitmapFPPCc
       ;wxMask::sm_classwxMask
       sm_classwxMask__6wxMask
       __vft8wxBitmap8wxObject
@@ -11235,8 +11303,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
@@ -11510,12 +11578,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
@@ -12109,15 +12177,6 @@ EXPORTS
       Open__5wxDirFRC8wxString
       ;wxDir::GetName() const
       GetName__5wxDirCFv
-  ;From object file:  ..\os2\dirdlg.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxDirDialog::sm_classwxDirDialog
-      sm_classwxDirDialog__11wxDirDialog
-      __vft11wxDirDialog8wxObject
-      ;wxDirDialog::ShowModal()
-      ShowModal__11wxDirDialogFv
-      ;wxDirDialog::wxDirDialog(wxWindow*,const wxString&,const wxString&,long,const wxPoint&)
-      __ct__11wxDirDialogFP8wxWindowRC8wxStringT2lRC7wxPoint
   ;From object file:  ..\os2\dnd.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDropTarget::OnData(int,int,wxDragResult)
@@ -12218,10 +12277,10 @@ EXPORTS
       SetPS__6wxFontFUl
       ;wxNativeFontInfo::SetStyle(wxFontStyle)
       SetStyle__16wxNativeFontInfoF11wxFontStyle
-      ;wxNativeFontInfo::GetPointSize() const
-      GetPointSize__16wxNativeFontInfoCFv
       ;wxNativeFontInfo::GetStyle() const
       GetStyle__16wxNativeFontInfoCFv
+      ;wxNativeFontInfo::GetPointSize() const
+      GetPointSize__16wxNativeFontInfoCFv
       ;wxNativeFontInfo::GetFamily() const
       GetFamily__16wxNativeFontInfoCFv
       ;wxNativeFontInfo::GetFaceName() const
@@ -12317,12 +12376,12 @@ EXPORTS
       wxTestFontEncoding__FRC20wxNativeEncodingInfo
       ;wxCreateFontFromLogFont(const _FATTRS*,_FONTMETRICS* const,_FACENAMEDESC*)
       wxCreateFontFromLogFont__FPC7_FATTRSCP12_FONTMETRICSP13_FACENAMEDESC
+      ;wxFillLogFont(_FATTRS*,_FACENAMEDESC*,unsigned long*,unsigned long*,long*,wxString&,wxFont*)
+      wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCPUlT3PlR8wxStringP6wxFont
       ;wxGetNativeFontEncoding(wxFontEncoding,wxNativeEncodingInfo*)
       wxGetNativeFontEncoding__F14wxFontEncodingP20wxNativeEncodingInfo
       ;wxOS2SelectMatchingFontByName(_FATTRS*,_FACENAMEDESC*,_FONTMETRICS*,int,const wxFont*)
       wxOS2SelectMatchingFontByName__FP7_FATTRSP13_FACENAMEDESCP12_FONTMETRICSiPC6wxFont
-      ;wxFillLogFont(_FATTRS*,_FACENAMEDESC*,unsigned long,long*,wxString&,wxFont*)
-      wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCUlPlR8wxStringP6wxFont
       ;wxGpiStrcmp(char*,char*)
       wxGpiStrcmp__FPcT1
       ;wxNativeEncodingInfo::FromString(const wxString&)
@@ -12331,8 +12390,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxFrame::HandleMenuSelect(unsigned short,unsigned short,unsigned long)
       HandleMenuSelect__7wxFrameFUsT1Ul
-      ;wxFrame::SendSizeEvent()
-      SendSizeEvent__7wxFrameFv
       ;wxFrame::OS2TranslateMessage(void**)
       OS2TranslateMessage__7wxFrameFPPv
       ;wxFrame::HandlePaint()
@@ -13492,6 +13549,8 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxRegion::Combine(const wxRect&,wxRegionOp)
       Combine__8wxRegionFRC6wxRect10wxRegionOp
+      ;wxRegion::Offset(int,int)
+      Offset__8wxRegionFiT1
       ;wxRegion::GetBox() const
       GetBox__8wxRegionCFv
       ;wxRegionIterator::operator++()
@@ -13504,6 +13563,8 @@ EXPORTS
       __ct__8wxRegionFRC7wxPointT1
       ;wxRegion::Contains(int,int) const
       Contains__8wxRegionCFiT1
+      ;wxRegion::CloneData(const wxObjectRefData*) const
+      CloneData__8wxRegionCFPC15wxObjectRefData
       ;wxRegionIterator::GetY() const
       GetY__16wxRegionIteratorCFv
       ;wxConstructorForwxRegion()
@@ -13549,6 +13610,8 @@ EXPORTS
       __ct__16wxRegionIteratorFRC8wxRegion
       ;wxRegionIterator::GetH() const
       GetH__16wxRegionIteratorCFv
+      ;wxRegion::CreateData() const
+      CreateData__8wxRegionCFv
       ;wxRegion::SetPS(unsigned long)
       SetPS__8wxRegionFUl
       __vft16wxRegionIterator8wxObject
@@ -14019,6 +14082,8 @@ EXPORTS
       Cut__10wxTextCtrlFv
       ;wxTextCtrl::SetInsertionPointEnd()
       SetInsertionPointEnd__10wxTextCtrlFv
+      ;wxTextCtrl::OS2ShouldPreProcessMessage(void**)
+      OS2ShouldPreProcessMessage__10wxTextCtrlFPPv
       ;wxTextCtrl::DiscardEdits()
       DiscardEdits__10wxTextCtrlFv
       ;wxTextCtrl::CanUndo() const
@@ -14296,26 +14361,24 @@ EXPORTS
       DoShowWindow__19wxTopLevelWindowOS2Fi
       ;wxTopLevelWindowOS2::Init()
       Init__19wxTopLevelWindowOS2Fv
+      ;wxTopLevelWindowOS2::m_sbInitialized
+      m_sbInitialized__19wxTopLevelWindowOS2
       ;wxTopLevelWindowOS2::OS2GetCreateWindowFlags(long*) const
       OS2GetCreateWindowFlags__19wxTopLevelWindowOS2CFPl
       ;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&)
@@ -14324,6 +14387,8 @@ EXPORTS
       Show__19wxTopLevelWindowOS2FUl
       ;wxTopLevelWindowOS2::IsIconized() const
       IsIconized__19wxTopLevelWindowOS2CFv
+      ;wxTopLevelWindowOS2::SendSizeEvent()
+      SendSizeEvent__19wxTopLevelWindowOS2Fv
       wxDlgProc
       wxModelessWindows
   ;From object file:  ..\os2\utils.cpp
@@ -14650,6 +14715,8 @@ EXPORTS
       OS2WindowProc__8wxWindowFUiPvT2
       ;wxWindow::OS2TranslateMessage(void**)
       OS2TranslateMessage__8wxWindowFPPv
+      ;wxWindow::OS2ShouldPreProcessMessage(void**)
+      OS2ShouldPreProcessMessage__8wxWindowFPPv
       ;wxWindow::OS2DefWindowProc(unsigned int,void*,void*)
       OS2DefWindowProc__8wxWindowFUiPvT2
       ;wxWindow::HandleMinimize()
@@ -14698,21 +14765,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
