applied (slightly modified) wxGLApp patch for MSW

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

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index 75703b92d77be5b7353c7e27850eebfb176038ee..94f6c92c244ef426faeaadbd0e60090b64960eb5 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
-;From library:  F:\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
@@ -229,6 +229,24 @@ EXPORTS
       ;wxConfigBase::ms_bAutoCreate
       ms_bAutoCreate__12wxConfigBase
       __vft12wxConfigBase
+  ;From object file:  ..\common\containr.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxControlContainer::HandleOnFocus(wxFocusEvent&)
+      HandleOnFocus__18wxControlContainerFR12wxFocusEvent
+      ;wxControlContainer::DoSetFocus()
+      DoSetFocus__18wxControlContainerFv
+      ;wxControlContainer::wxControlContainer(wxWindow*)
+      __ct__18wxControlContainerFP8wxWindow
+      ;wxControlContainer::SetLastFocus(wxWindow*)
+      SetLastFocus__18wxControlContainerFP8wxWindow
+      ;wxControlContainer::HandleOnNavigationKey(wxNavigationKeyEvent&)
+      HandleOnNavigationKey__18wxControlContainerFR20wxNavigationKeyEvent
+      ;wxControlContainer::HandleOnWindowDestroy(wxWindowBase*)
+      HandleOnWindowDestroy__18wxControlContainerFP12wxWindowBase
+      ;wxControlContainer::SetFocusToChild()
+      SetFocusToChild__18wxControlContainerFv
+      ;wxSetFocusToChild(wxWindow*,wxWindow**)
+      wxSetFocusToChild__FP8wxWindowPP8wxWindow
   ;From object file:  ..\common\cshelp.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxContextHelpButton::wxContextHelpButton(wxWindow*,int,const wxPoint&,const wxSize&,long)
@@ -732,11 +750,17 @@ EXPORTS
       GetAllFiles__5wxDirFRC8wxStringP13wxArrayStringT1i
       ;wxDir::Traverse(wxDirTraverser&,const wxString&,int) const
       Traverse__5wxDirCFR14wxDirTraverserRC8wxStringi
+      ;wxDir::HasFiles(const wxString&)
+      HasFiles__5wxDirFRC8wxString
+      ;wxDir::HasSubDirs(const wxString&)
+      HasSubDirs__5wxDirFRC8wxString
   ;From object file:  ..\common\dndcmn.cpp
   ;From object file:  ..\common\dlgcmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDialogBase::CreateButtonSizer(long)
       CreateButtonSizer__12wxDialogBaseFl
+      ;wxDialogBase::Init()
+      Init__12wxDialogBaseFv
       ;wxDialogBase::CreateTextSizer(const wxString&)
       CreateTextSizer__12wxDialogBaseFRC8wxString
   ;From object file:  ..\common\dobjcmn.cpp
@@ -1307,14 +1331,16 @@ EXPORTS
       wxConstructorForwxDropFilesEvent__Fv
       ;wxEvtHandler::sm_eventTableEntries
       sm_eventTableEntries__12wxEvtHandler
-      ;wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow*)
-      __ct__20wxWindowDestroyEventFP8wxWindow
+      ;wxChildFocusEvent::wxChildFocusEvent(wxWindow*)
+      __ct__17wxChildFocusEventFP8wxWindow
       ;wxFindFocusDescendant(wxWindow*)
       wxFindFocusDescendant__FP8wxWindow
       wxEVT_RIGHT_DCLICK
       wxEVT_ENTER_WINDOW
       wxEVT_COMMAND_LEFT_CLICK
       wxEVT_CHAR_HOOK
+      ;wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow*)
+      __ct__20wxWindowDestroyEventFP8wxWindow
       ;wxEvtHandler::Connect(int,int,int,void( wxObject::*)(wxEvent&),wxObject*)
       Connect__12wxEvtHandlerFiN21M8wxObjectFR7wxEvent_vP8wxObject
       wxEVT_SOCKET
@@ -1388,6 +1414,7 @@ EXPORTS
       __dt__12wxEvtHandlerFv
       ;wxEvtHandler::GetEventTable() const
       GetEventTable__12wxEvtHandlerCFv
+      wxEVT_CHILD_FOCUS
       wxEVT_NC_LEAVE_WINDOW
       wxEVT_DROP_FILES
       wxEVT_COMMAND_RIGHT_CLICK
@@ -1412,6 +1439,8 @@ EXPORTS
       sm_classwxMoveEvent__11wxMoveEvent
       ;wxIconizeEvent::sm_classwxIconizeEvent
       sm_classwxIconizeEvent__14wxIconizeEvent
+      ;wxChildFocusEvent::sm_classwxChildFocusEvent
+      sm_classwxChildFocusEvent__17wxChildFocusEvent
       __vft16wxScrollWinEvent8wxObject
       __vft13wxNotifyEvent8wxObject
       __vft12wxMouseEvent8wxObject
@@ -1609,6 +1638,8 @@ EXPORTS
       wxConstructorForwxQueryNewPaletteEvent__Fv
       ;wxConstructorForwxFocusEvent()
       wxConstructorForwxFocusEvent__Fv
+      ;wxConstructorForwxChildFocusEvent()
+      wxConstructorForwxChildFocusEvent__Fv
       ;wxEvtHandler::sm_eventTable
       sm_eventTable__12wxEvtHandler
       wxEVT_LEFT_DCLICK
@@ -1995,6 +2026,8 @@ EXPORTS
       sm_classwxFileSystem__12wxFileSystem
       ;wxLocalFSHandler::FindNext()
       FindNext__16wxLocalFSHandlerFv
+      ;wxLocalFSHandler::ms_root
+      ms_root__16wxLocalFSHandler
       ;wxFileSystemHandler::GetMimeTypeFromExt(const wxString&)
       GetMimeTypeFromExt__19wxFileSystemHandlerFRC8wxString
       ;wxFileSystem::m_Handlers
@@ -2106,8 +2139,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxFrameBase::OnIdle(wxIdleEvent&)
       OnIdle__11wxFrameBaseFR11wxIdleEvent
-      ;wxFrameBase::DoScreenToClient(int*,int*) const
-      DoScreenToClient__11wxFrameBaseCFPiT1
       ;wxFrameBase::DeleteAllBars()
       DeleteAllBars__11wxFrameBaseFv
       ;wxFrameBase::SetMenuBar(wxMenuBar*)
@@ -2120,12 +2151,6 @@ EXPORTS
       OnCreateToolBar__11wxFrameBaseFliRC8wxString
       ;wxFrameBase::OnCreateStatusBar(int,long,int,const wxString&)
       OnCreateStatusBar__11wxFrameBaseFilT1RC8wxString
-      ;wxFrameBase::MakeModal(unsigned long)
-      MakeModal__11wxFrameBaseFUl
-      ;wxFrameBase::OnSize(wxSizeEvent&)
-      OnSize__11wxFrameBaseFR11wxSizeEvent
-      ;wxFrameBase::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__11wxFrameBaseFR12wxCloseEvent
       ;wxFrameBase::sm_eventTable
       sm_eventTable__11wxFrameBase
       ;wxFrameBase::GetClientAreaOrigin() const
@@ -2152,17 +2177,11 @@ EXPORTS
       GetEventTable__11wxFrameBaseCFv
       ;wxFrameBase::AttachMenuBar(wxMenuBar*)
       AttachMenuBar__11wxFrameBaseFP9wxMenuBar
-      ;wxFrameBase::SendIconizeEvent(unsigned long)
-      SendIconizeEvent__11wxFrameBaseFUl
       __vft11wxFrameBase8wxObject
-      ;wxFrameBase::DoClientToScreen(int*,int*) const
-      DoClientToScreen__11wxFrameBaseCFPiT1
-      ;wxFrameBase::sm_eventTableEntries
-      sm_eventTableEntries__11wxFrameBase
       ;wxFrameBase::SetStatusText(const wxString&,int)
       SetStatusText__11wxFrameBaseFRC8wxStringi
-      ;wxFrameBase::Destroy()
-      Destroy__11wxFrameBaseFv
+      ;wxFrameBase::sm_eventTableEntries
+      sm_eventTableEntries__11wxFrameBase
       ;wxFrameBase::New(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       New__11wxFrameBaseFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
   ;From object file:  ..\common\fs_inet.cpp
@@ -3266,6 +3285,8 @@ EXPORTS
       __ad__12wxLongLongWxCFRC12wxLongLongWx
       ;wxLongLongWx::Negate()
       Negate__12wxLongLongWxFv
+      ;wxLongLongWx::ToString() const
+      ToString__12wxLongLongWxCFv
       ;wxLongLongWx::operator-(const wxLongLongWx&) const
       __mi__12wxLongLongWxCFRC12wxLongLongWx
       ;wxLongLongWx::operator&=(const wxLongLongWx&)
@@ -4900,14 +4921,14 @@ EXPORTS
       GetFromBuffer__14wxStreamBufferFPvUi
       ;wxInputStream::AllocSpaceWBack(unsigned int)
       AllocSpaceWBack__13wxInputStreamFUi
-      ;wxStreamBuffer::ResetBuffer()
-      ResetBuffer__14wxStreamBufferFv
       ;wxOutputStream::wxOutputStream()
       __ct__14wxOutputStreamFv
       ;wxBufferedInputStream::TellI() const
       TellI__21wxBufferedInputStreamCFv
       ;wxBufferedOutputStream::Sync()
       Sync__22wxBufferedOutputStreamFv
+      ;wxStreamBuffer::ResetBuffer()
+      ResetBuffer__14wxStreamBufferFv
       ;wxStreamBuffer::Read(wxStreamBuffer*)
       Read__14wxStreamBufferFP14wxStreamBuffer
       ;wxBufferedInputStream::Peek()
@@ -5254,6 +5275,7 @@ EXPORTS
       wxEVT_COMMAND_TEXT_UPDATED
       ;wxConstructorForwxTextUrlEvent()
       wxConstructorForwxTextUrlEvent__Fv
+      wxEVT_COMMAND_TEXT_MAXLEN
       ;wxTextCtrlBase::SelectAll()
       SelectAll__14wxTextCtrlBaseFv
       ;wxTextCtrlBase::SaveFile(const wxString&)
@@ -5265,16 +5287,12 @@ EXPORTS
       SetStyle__14wxTextCtrlBaseFlT1RC10wxTextAttr
   ;From object file:  ..\common\textfile.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxTextFile::Read(wxMBConv&)
+      Read__10wxTextFileFR8wxMBConv
       ;wxTextFile::GuessType() const
       GuessType__10wxTextFileCFv
-      ;wxTextFile::Open(const wxString&)
-      Open__10wxTextFileFRC8wxString
       ;wxTextFile::~wxTextFile()
       __dt__10wxTextFileFv
-      ;wxTextFile::Open()
-      Open__10wxTextFileFv
-      ;wxTextFile::Write(wxTextFileType)
-      Write__10wxTextFileF14wxTextFileType
       ;wxTextFile::typeDefault
       typeDefault__10wxTextFile
       ;wxTextFile::Exists() const
@@ -5285,8 +5303,12 @@ EXPORTS
       GetEOL__10wxTextFileF14wxTextFileType
       ;wxTextFile::Translate(const wxString&,wxTextFileType)
       Translate__10wxTextFileFRC8wxString14wxTextFileType
-      ;wxTextFile::Read()
-      Read__10wxTextFileFv
+      ;wxTextFile::Open(const wxString&,wxMBConv&)
+      Open__10wxTextFileFRC8wxStringR8wxMBConv
+      ;wxTextFile::Write(wxTextFileType,wxMBConv&)
+      Write__10wxTextFileF14wxTextFileTypeR8wxMBConv
+      ;wxTextFile::Open(wxMBConv&)
+      Open__10wxTextFileFR8wxMBConv
       ;wxTextFile::Close()
       Close__10wxTextFileFv
       ;wxTextFile::wxTextFile(const wxString&)
@@ -5336,6 +5358,29 @@ EXPORTS
       CountTokens__17wxStringTokenizerCFv
       ;wxStringTokenizer::Reinit(const wxString&)
       Reinit__17wxStringTokenizerFRC8wxString
+  ;From object file:  ..\common\toplvcmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxTopLevelWindowBase::SendIconizeEvent(unsigned long)
+      SendIconizeEvent__20wxTopLevelWindowBaseFUl
+      ;wxTopLevelWindowBase::sm_eventTable
+      sm_eventTable__20wxTopLevelWindowBase
+      ;wxTopLevelWindowBase::DoClientToScreen(int*,int*) const
+      DoClientToScreen__20wxTopLevelWindowBaseCFPiT1
+      ;wxTopLevelWindowBase::GetEventTable() const
+      GetEventTable__20wxTopLevelWindowBaseCFv
+      ;wxTopLevelWindowBase::wxTopLevelWindowBase()
+      __ct__20wxTopLevelWindowBaseFv
+      ;wxTopLevelWindowBase::OnSize(wxSizeEvent&)
+      OnSize__20wxTopLevelWindowBaseFR11wxSizeEvent
+      __vft20wxTopLevelWindowBase8wxObject
+      ;wxTopLevelWindowBase::sm_eventTableEntries
+      sm_eventTableEntries__20wxTopLevelWindowBase
+      ;wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent&)
+      OnCloseWindow__20wxTopLevelWindowBaseFR12wxCloseEvent
+      ;wxTopLevelWindowBase::DoScreenToClient(int*,int*) const
+      DoScreenToClient__20wxTopLevelWindowBaseCFPiT1
+      ;wxTopLevelWindowBase::Destroy()
+      Destroy__20wxTopLevelWindowBaseFv
   ;From object file:  ..\common\treebase.cpp
     ;PUBDEFs (Symbols available from object file):
       wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT
@@ -6288,6 +6333,8 @@ EXPORTS
       GetClientSizeConstraint__12wxWindowBaseCFPiT1
       ;wxWindowBase::DoHitTest(int,int) const
       DoHitTest__12wxWindowBaseCFiT1
+      ;wxWindowBase::AdjustForParentClientOrigin(int&,int&,int)
+      AdjustForParentClientOrigin__12wxWindowBaseFRiT1i
       ;wxWindowBase::DoGetBestSize() const
       DoGetBestSize__12wxWindowBaseCFv
       ;wxWindowBase::TransferDataFromWindow()
@@ -8424,6 +8471,8 @@ EXPORTS
       OnRenameAccept__16wxListMainWindowFv
       ;wxListRenameTimer::Notify()
       Notify__17wxListRenameTimerFv
+      ;wxListHeaderWindow::Init()
+      Init__18wxListHeaderWindowFv
       ;wxListHeaderData::GetWidth() const
       GetWidth__16wxListHeaderDataCFv
       ;wxListCtrl::GetTopItem() const
@@ -8434,6 +8483,7 @@ EXPORTS
       GetImageSize__16wxListMainWindowCFiRiT2
       ;wxListHeaderWindow::DoDrawRect(wxDC*,int,int,int,int)
       DoDrawRect__18wxListHeaderWindowFP4wxDCiN32
+      wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
       wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK
       ;wxListMainWindow::GetItemRect(long,wxRect&)
       GetItemRect__16wxListMainWindowFlR6wxRect
@@ -8492,8 +8542,6 @@ EXPORTS
       CacheLineData__16wxListMainWindowFUi
       ;wxwxListItemDataListNode::DeleteData()
       DeleteData__24wxwxListItemDataListNodeFv
-      ;wxConstructorForwxListHeaderData()
-      wxConstructorForwxListHeaderData__Fv
       ;wxConstructorForwxListCtrl()
       wxConstructorForwxListCtrl__Fv
       list_ctrl_compare_func_2
@@ -8503,6 +8551,8 @@ EXPORTS
       __ct__18wxListHeaderWindowFv
       ;wxListLineData::SetAttr(wxListItemAttr*)
       SetAttr__14wxListLineDataFP14wxListItemAttr
+      ;wxListMainWindow::RefreshSelected()
+      RefreshSelected__16wxListMainWindowFv
       ;wxListMainWindow::OnRenameTimer()
       OnRenameTimer__16wxListMainWindowFv
       ;wxListItemData::GetX() const
@@ -8522,6 +8572,7 @@ EXPORTS
       wxEVT_COMMAND_LIST_SET_INFO
       wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK
       wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS
+      wxEVT_COMMAND_LIST_COL_DRAGGING
       ;wxListHeaderWindow::sm_eventTable
       sm_eventTable__18wxListHeaderWindow
       ;wxListHeaderWindow::sm_eventTableEntries
@@ -8637,6 +8688,7 @@ EXPORTS
       CreateHeaderWindow__10wxListCtrlFv
       ;wxListLineData::SetText(int,const wxString)
       SetText__14wxListLineDataFiC8wxString
+      wxEVT_COMMAND_LIST_COL_RIGHT_CLICK
       ;wxListMainWindow::sm_eventTable
       sm_eventTable__16wxListMainWindow
       ;wxListHeaderWindow::sm_classwxListHeaderWindow
@@ -8713,8 +8765,8 @@ EXPORTS
       DeleteColumn__16wxListMainWindowFi
       ;wxListLineData::CalculateSize(wxDC*,int)
       CalculateSize__14wxListLineDataFP4wxDCi
-      ;wxListCtrl::~wxListCtrl()
-      __dt__10wxListCtrlFv
+      ;wxListItem::wxListItem()
+      __ct__10wxListItemFv
       wxSizeTCmpFn
       ;wxConstructorForwxListItem()
       wxConstructorForwxListItem__Fv
@@ -8722,14 +8774,16 @@ EXPORTS
       __dt__19wxListLineDataArrayFv
       ;wxListItemData::~wxListItemData()
       __dt__14wxListItemDataFv
-      ;wxListItem::wxListItem()
-      __ct__10wxListItemFv
+      ;wxListCtrl::~wxListCtrl()
+      __dt__10wxListCtrlFv
       ;wxListCtrl::SetItemImage(long,int,int)
       SetItemImage__10wxListCtrlFliT2
       ;wxListCtrl::SetForegroundColour(const wxColour&)
       SetForegroundColour__10wxListCtrlFRC8wxColour
       ;wxListMainWindow::Init()
       Init__16wxListMainWindowFv
+      ;wxListHeaderData::Init()
+      Init__16wxListHeaderDataFv
       ;wxListCtrl::GetSelectedItemCount() const
       GetSelectedItemCount__10wxListCtrlCFv
       ;wxListHeaderWindow::GetEventTable() const
@@ -8792,8 +8846,6 @@ EXPORTS
       DrawInReportMode__14wxListLineDataFP4wxDCRC6wxRectT2Ul
       ;wxListLineData::GetText(int) const
       GetText__14wxListLineDataCFi
-      ;wxListHeaderData::sm_classwxListHeaderData
-      sm_classwxListHeaderData__16wxListHeaderData
       __vft26wxwxListHeaderDataListNode10wxNodeBase
       __vft24wxwxListItemDataListNode10wxNodeBase
       ;wxListLineData::SetPosition(int,int,int,int)
@@ -8882,6 +8934,7 @@ EXPORTS
       ClearAll__10wxListCtrlFv
       ;wxListItemData::wxListItemData(wxListMainWindow*)
       __ct__14wxListItemDataFP16wxListMainWindow
+      wxEVT_COMMAND_LIST_COL_END_DRAG
       wxEVT_COMMAND_LIST_COL_CLICK
       wxEVT_COMMAND_LIST_BEGIN_RDRAG
       wxEVT_COMMAND_LIST_BEGIN_DRAG
@@ -8985,15 +9038,19 @@ EXPORTS
       Init__7wxPanelFv
       ;wxPanel::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__7wxPanelFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
+      ;wxPanel::SetDefaultItem(wxWindow*)
+      SetDefaultItem__7wxPanelFP8wxWindow
       __vft7wxPanel8wxObject
       ;wxPanel::GetEventTable() const
       GetEventTable__7wxPanelCFv
-      ;wxPanel::InitDialog()
-      InitDialog__7wxPanelFv
-      ;wxPanel::sm_classwxPanel
-      sm_classwxPanel__7wxPanel
+      ;wxPanel::OnChildFocus(wxChildFocusEvent&)
+      OnChildFocus__7wxPanelFR17wxChildFocusEvent
       ;wxPanel::sm_eventTable
       sm_eventTable__7wxPanel
+      ;wxPanel::sm_classwxPanel
+      sm_classwxPanel__7wxPanel
+      ;wxPanel::~wxPanel()
+      __dt__7wxPanelFv
       ;wxPanel::OnNavigationKey(wxNavigationKeyEvent&)
       OnNavigationKey__7wxPanelFR20wxNavigationKeyEvent
       ;wxPanel::OnFocus(wxFocusEvent&)
@@ -9004,10 +9061,8 @@ EXPORTS
       wxConstructorForwxPanel__Fv
       ;wxPanel::SetFocus()
       SetFocus__7wxPanelFv
-      ;wxPanel::SetFocusToChild()
-      SetFocusToChild__7wxPanelFv
-      ;wxSetFocusToChild(wxWindow*,wxWindow**)
-      wxSetFocusToChild__FP8wxWindowPP8wxWindow
+      ;wxPanel::GetDefaultItem() const
+      GetDefaultItem__7wxPanelCFv
   ;From object file:  ..\generic\printps.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPostScriptPrintPreview::wxPostScriptPrintPreview(wxPrintout*,wxPrintout*,wxPrintDialogData*)
@@ -9196,8 +9251,12 @@ EXPORTS
       EnableScrolling__14wxScrollHelperFUlT1
       ;wxAutoScrollTimer::Notify()
       Notify__17wxAutoScrollTimerFv
+      ;wxScrollHelper::DeleteEvtHandler()
+      DeleteEvtHandler__14wxScrollHelperFv
       ;wxScrollHelper::wxScrollHelper(wxWindow*)
       __ct__14wxScrollHelperFP8wxWindow
+      ;wxGenericScrolledWindow::sm_eventTable
+      sm_eventTable__23wxGenericScrolledWindow
       ;wxAutoScrollTimer::wxAutoScrollTimer(wxWindow*,wxScrollHelper*,int,int,int)
       __ct__17wxAutoScrollTimerFP8wxWindowP14wxScrollHelperiN23
       ;wxScrollHelper::HandleOnScroll(wxScrollWinEvent&)
@@ -9218,6 +9277,8 @@ EXPORTS
       StopAutoScrolling__14wxScrollHelperFv
       ;wxScrollHelper::AdjustScrollbars()
       AdjustScrollbars__14wxScrollHelperFv
+      ;wxGenericScrolledWindow::sm_eventTableEntries
+      sm_eventTableEntries__23wxGenericScrolledWindow
       ;wxScrollHelper::HandleOnSize(wxSizeEvent&)
       HandleOnSize__14wxScrollHelperFR11wxSizeEvent
       ;wxScrollHelper::HandleOnPaint(wxPaintEvent&)
@@ -9227,6 +9288,8 @@ EXPORTS
       ;wxScrollHelper::GetTargetWindow() const
       GetTargetWindow__14wxScrollHelperCFv
       __vft14wxScrollHelper
+      ;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
@@ -9256,33 +9319,51 @@ EXPORTS
       __vft24wxScrollHelperEvtHandler8wxObject
       ;wxScrollHelper::SetScrollbars(int,int,int,int,int,int,unsigned long)
       SetScrollbars__14wxScrollHelperFiN51Ul
+      ;wxGenericScrolledWindow::OnPaint(wxPaintEvent&)
+      OnPaint__23wxGenericScrolledWindowFR12wxPaintEvent
       ;wxScrollHelper::GetScrollPageSize(int) const
       GetScrollPageSize__14wxScrollHelperCFi
       ;wxScrollHelper::SetWindow(wxWindow*)
       SetWindow__14wxScrollHelperFP8wxWindow
       ;wxGenericScrolledWindow::sm_classwxGenericScrolledWindow
       sm_classwxGenericScrolledWindow__23wxGenericScrolledWindow
+      ;wxScrollHelper::DoSetTargetWindow(wxWindow*)
+      DoSetTargetWindow__14wxScrollHelperFP8wxWindow
   ;From object file:  ..\generic\spinctlg.cpp
   ;From object file:  ..\generic\splitter.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxSplitterWindow::OnSize(wxSizeEvent&)
-      OnSize__16wxSplitterWindowFR11wxSizeEvent
+      ;wxSplitterWindow::OnNavigationKey(wxNavigationKeyEvent&)
+      OnNavigationKey__16wxSplitterWindowFR20wxNavigationKeyEvent
       ;wxSplitterWindow::OnUnsplitEvent(wxSplitterEvent&)
       OnUnsplitEvent__16wxSplitterWindowFR15wxSplitterEvent
+      ;wxSplitterWindow::OnSize(wxSizeEvent&)
+      OnSize__16wxSplitterWindowFR11wxSizeEvent
+      ;wxSplitterWindow::OnChildFocus(wxChildFocusEvent&)
+      OnChildFocus__16wxSplitterWindowFR17wxChildFocusEvent
+      ;wxSplitterWindow::RemoveChild(wxWindowBase*)
+      RemoveChild__16wxSplitterWindowFP12wxWindowBase
       ;wxSplitterWindow::ReplaceWindow(wxWindow*,wxWindow*)
       ReplaceWindow__16wxSplitterWindowFP8wxWindowT1
+      ;wxSplitterWindow::GetDefaultItem() const
+      GetDefaultItem__16wxSplitterWindowCFv
       ;wxSplitterWindow::InitColours()
       InitColours__16wxSplitterWindowFv
-      ;wxSplitterWindow::OnSetCursor(wxSetCursorEvent&)
-      OnSetCursor__16wxSplitterWindowFR16wxSetCursorEvent
+      ;wxSplitterWindow::SetDefaultItem(wxWindow*)
+      SetDefaultItem__16wxSplitterWindowFP8wxWindow
+      ;wxSplitterWindow::OnFocus(wxFocusEvent&)
+      OnFocus__16wxSplitterWindowFR12wxFocusEvent
       wxEVT_COMMAND_SPLITTER_UNSPLIT
       __vft16wxSplitterWindow8wxObject
+      ;wxSplitterWindow::OnSetCursor(wxSetCursorEvent&)
+      OnSetCursor__16wxSplitterWindowFR16wxSetCursorEvent
       ;wxSplitterWindow::DrawSashTracker(int,int)
       DrawSashTracker__16wxSplitterWindowFiT1
       ;wxConstructorForwxSplitterWindow()
       wxConstructorForwxSplitterWindow__Fv
       ;wxSplitterWindow::~wxSplitterWindow()
       __dt__16wxSplitterWindowFv
+      ;wxSplitterWindow::SetFocus()
+      SetFocus__16wxSplitterWindowFv
       wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING
       ;wxSplitterWindow::OnSashPosChanged(wxSplitterEvent&)
       OnSashPosChanged__16wxSplitterWindowFR15wxSplitterEvent
@@ -9602,12 +9683,18 @@ EXPORTS
       RefreshSubtree__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem*,wxDC&,int,int&)
       PaintLevel__17wxGenericTreeCtrlFP17wxGenericTreeItemR4wxDCiRi
+      ;wxGenericTreeItem::HitTest(const wxPoint&,const wxGenericTreeCtrl*,int&,int)
+      HitTest__17wxGenericTreeItemFRC7wxPointPC17wxGenericTreeCtrlRii
       ;wxGenericTreeCtrl::OnRenameTimer()
       OnRenameTimer__17wxGenericTreeCtrlFv
       ;wxConstructorForwxGenericTreeCtrl()
       wxConstructorForwxGenericTreeCtrl__Fv
+      ;wxGenericTreeCtrl::RefreshSelected()
+      RefreshSelected__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::GetFirstVisibleItem() const
       GetFirstVisibleItem__17wxGenericTreeCtrlCFv
+      ;wxGenericTreeCtrl::CalculateLineHeight()
+      CalculateLineHeight__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::AdjustMyScrollbars()
       AdjustMyScrollbars__17wxGenericTreeCtrlFv
       ;wxGenericTreeItem::SetText(const wxString&)
@@ -9618,8 +9705,6 @@ EXPORTS
       Edit__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxTreeTextCtrl::sm_eventTableEntries
       sm_eventTableEntries__14wxTreeTextCtrl
-      ;wxTreeTextCtrl::sm_classwxTreeTextCtrl
-      sm_classwxTreeTextCtrl__14wxTreeTextCtrl
       __vft17wxGenericTreeCtrl8wxObject
       ;wxGenericTreeCtrl::SetItemBold(const wxTreeItemId&,unsigned long)
       SetItemBold__17wxGenericTreeCtrlFRC12wxTreeItemIdUl
@@ -9651,6 +9736,8 @@ EXPORTS
       __dt__17wxGenericTreeCtrlFv
       ;wxConstructorForwxTreeCtrl()
       wxConstructorForwxTreeCtrl__Fv
+      ;wxGenericTreeCtrl::SetForegroundColour(const wxColour&)
+      SetForegroundColour__17wxGenericTreeCtrlFRC8wxColour
       ;wxGenericTreeCtrl::GetStateImageList() const
       GetStateImageList__17wxGenericTreeCtrlCFv
       ;wxGenericTreeCtrl::GetImageList() const
@@ -9667,6 +9754,8 @@ EXPORTS
       SetItemFont__17wxGenericTreeCtrlFRC12wxTreeItemIdRC6wxFont
       ;wxGenericTreeCtrl::SetFont(const wxFont&)
       SetFont__17wxGenericTreeCtrlFRC6wxFont
+      ;wxGenericTreeCtrl::SetButtonsImageList(wxImageList*)
+      SetButtonsImageList__17wxGenericTreeCtrlFP11wxImageList
       ;wxGenericTreeCtrl::OnPaint(wxPaintEvent&)
       OnPaint__17wxGenericTreeCtrlFR12wxPaintEvent
       ;wxTreeTextCtrl::OnKeyUp(wxKeyEvent&)
@@ -9691,18 +9780,18 @@ EXPORTS
       DrawBorder__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeCtrl::Delete(const wxTreeItemId&)
       Delete__17wxGenericTreeCtrlFRC12wxTreeItemId
+      ;wxGenericTreeCtrl::AssignButtonsImageList(wxImageList*)
+      AssignButtonsImageList__17wxGenericTreeCtrlFP11wxImageList
       ;wxGenericTreeCtrl::HitTest(const wxPoint&,int&)
       HitTest__17wxGenericTreeCtrlFRC7wxPointRi
-      ;wxGenericTreeItem::HitTest(const wxPoint&,const wxGenericTreeCtrl*,int&)
-      HitTest__17wxGenericTreeItemFRC7wxPointPC17wxGenericTreeCtrlRi
       ;wxGenericTreeCtrl::GetItemImage(const wxTreeItemId&,wxTreeItemIcon) const
       GetItemImage__17wxGenericTreeCtrlCFRC12wxTreeItemId14wxTreeItemIcon
-      ;wxConstructorForwxTreeTextCtrl()
-      wxConstructorForwxTreeTextCtrl__Fv
       ;wxGenericTreeItem::~wxGenericTreeItem()
       __dt__17wxGenericTreeItemFv
       ;wxGenericTreeCtrl::Unselect()
       Unselect__17wxGenericTreeCtrlFv
+      ;wxGenericTreeCtrl::SetBackgroundColour(const wxColour&)
+      SetBackgroundColour__17wxGenericTreeCtrlFRC8wxColour
       ;wxGenericTreeCtrl::OnRenameAccept()
       OnRenameAccept__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::GetEventTable() const
@@ -9734,8 +9823,6 @@ EXPORTS
       OnKillFocus__14wxTreeTextCtrlFR12wxFocusEvent
       ;wxGenericTreeCtrl::OnChar(wxKeyEvent&)
       OnChar__17wxGenericTreeCtrlFR10wxKeyEvent
-      ;wxGenericTreeCtrl::GetPrev(const wxTreeItemId&) const
-      GetPrev__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::GetPrevVisible(const wxTreeItemId&) const
       GetPrevVisible__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::GetPrevSibling(const wxTreeItemId&) const
@@ -9756,8 +9843,6 @@ EXPORTS
       SetItemData__17wxGenericTreeCtrlFRC12wxTreeItemIdP14wxTreeItemData
       ;wxGenericTreeCtrl::SetIndent(unsigned int)
       SetIndent__17wxGenericTreeCtrlFUi
-      ;wxGenericTreeItem::SetCross(int,int)
-      SetCross__17wxGenericTreeItemFiT1
       ;wxGenericTreeCtrl::OnCompareItems(const wxTreeItemId&,const wxTreeItemId&)
       OnCompareItems__17wxGenericTreeCtrlFRC12wxTreeItemIdT1
       ;wxGenericTreeCtrl::InsertItem(const wxTreeItemId&,unsigned int,const wxString&,int,int,wxTreeItemData*)
@@ -9776,6 +9861,8 @@ EXPORTS
       SetItemImage__17wxGenericTreeCtrlFRC12wxTreeItemIdi14wxTreeItemIcon
       ;wxGenericTreeCtrl::SelectItem(const wxTreeItemId&,unsigned long,unsigned long)
       SelectItem__17wxGenericTreeCtrlFRC12wxTreeItemIdUlT2
+      ;wxGenericTreeCtrl::GetButtonsImageList() const
+      GetButtonsImageList__17wxGenericTreeCtrlCFv
       ;wxGenericTreeCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__17wxGenericTreeCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxGenericTreeCtrl::PaintItem(wxGenericTreeItem*,wxDC&)
@@ -9787,6 +9874,8 @@ EXPORTS
       __vft17wxTreeRenameTimer8wxObject
       ;wxGenericTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem*,wxGenericTreeItem*,unsigned long)
       TagAllChildrenUntilLast__17wxGenericTreeCtrlFP17wxGenericTreeItemT1Ul
+      ;wxGenericTreeCtrl::SetWindowStyle(const long)
+      SetWindowStyle__17wxGenericTreeCtrlFCl
       ;wxGenericTreeCtrl::GetNextVisible(const wxTreeItemId&) const
       GetNextVisible__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::GetItemData(const wxTreeItemId&) const
@@ -9799,6 +9888,8 @@ EXPORTS
       RefreshLine__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem*,wxGenericTreeItem*)
       SelectItemRange__17wxGenericTreeCtrlFP17wxGenericTreeItemT1
+      ;wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem*)
+      RefreshSelectedUnder__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::DrawDropEffect(wxGenericTreeItem*)
       DrawDropEffect__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxTreeRenameTimer::Notify()
@@ -9810,8 +9901,6 @@ EXPORTS
       SetItemTextColour__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxColour
       ;wxGenericTreeCtrl::SetItemBackgroundColour(const wxTreeItemId&,const wxColour&)
       SetItemBackgroundColour__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxColour
-      ;wxGenericTreeItem::Reset()
-      Reset__17wxGenericTreeItemFv
       ;wxTreeTextCtrl::GetEventTable() const
       GetEventTable__14wxTreeTextCtrlCFv
       ;wxGenericTreeCtrl::FillArray(wxGenericTreeItem*,wxArrayTreeItemIds&) const
@@ -10009,6 +10098,8 @@ EXPORTS
       __vft14wxHtmlFontCell8wxObject
       ;wxHtmlContainerCell::OnMouseClick(wxWindow*,int,int,const wxMouseEvent&)
       OnMouseClick__19wxHtmlContainerCellFP8wxWindowiT2RC12wxMouseEvent
+      ;wxHtmlContainerCell::GetHorizontalConstraints(int*,int*) const
+      GetHorizontalConstraints__19wxHtmlContainerCellCFPiT1
       ;wxHtmlCell::~wxHtmlCell()
       __dt__10wxHtmlCellFv
       ;wxHtmlContainerCell::Find(int,const void*) const
@@ -10042,6 +10133,8 @@ EXPORTS
       GetLink__19wxHtmlContainerCellCFiT1
       ;wxHtmlContainerCell::GetIndent(int) const
       GetIndent__19wxHtmlContainerCellCFi
+      ;wxHtmlCell::FindCellByPos(int,int) const
+      FindCellByPos__10wxHtmlCellCFiT1
       ;wxHtmlWordCell::Draw(wxDC&,int,int,int,int)
       Draw__14wxHtmlWordCellFR4wxDCiN32
       ;wxHtmlContainerCell::Draw(wxDC&,int,int,int,int)
@@ -10054,16 +10147,20 @@ EXPORTS
       __vft16wxHtmlColourCell8wxObject
       ;wxHtmlContainerCell::AdjustPagebreak(int*) const
       AdjustPagebreak__19wxHtmlContainerCellCFPi
+      ;wxHtmlContainerCell::FindCellByPos(int,int) const
+      FindCellByPos__19wxHtmlContainerCellCFiT1
       ;wxHtmlColourCell::DrawInvisible(wxDC&,int,int)
       DrawInvisible__16wxHtmlColourCellFR4wxDCiT2
       ;wxHtmlContainerCell::SetAlign(const wxHtmlTag&)
       SetAlign__19wxHtmlContainerCellFRC9wxHtmlTag
-      ;wxHtmlContainerCell::GetIndentUnits(int) const
-      GetIndentUnits__19wxHtmlContainerCellCFi
+      ;wxHtmlCell::GetHorizontalConstraints(int*,int*) const
+      GetHorizontalConstraints__10wxHtmlCellCFPiT1
       ;wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow*,int)
       __ct__16wxHtmlWidgetCellFP8wxWindowi
       ;wxHtmlWidgetCell::Layout(int)
       Layout__16wxHtmlWidgetCellFi
+      ;wxHtmlContainerCell::GetIndentUnits(int) const
+      GetIndentUnits__19wxHtmlContainerCellCFi
       ;wxHtmlCell::wxHtmlCell()
       __ct__10wxHtmlCellFv
       ;wxHtmlCell::Find(int,const void*) const
@@ -10148,12 +10245,12 @@ EXPORTS
       PopTagHandler__12wxHtmlParserFv
       ;wxHtmlParser::CreateDOMTree()
       CreateDOMTree__12wxHtmlParserFv
-      ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
-      PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
-      ;wxHtmlEntitiesParser::SetEncoding(wxFontEncoding)
-      SetEncoding__20wxHtmlEntitiesParserF14wxFontEncoding
       ;wxHtmlEntitiesParser::Parse(const wxString&)
       Parse__20wxHtmlEntitiesParserFRC8wxString
+      ;wxHtmlEntitiesParser::SetEncoding(wxFontEncoding)
+      SetEncoding__20wxHtmlEntitiesParserF14wxFontEncoding
+      ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
+      PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
       ;wxHtmlTextPieces::RemoveAt(unsigned int)
       RemoveAt__16wxHtmlTextPiecesFUi
       ;wxHtmlEntitiesParser::GetCharForCode(unsigned int)
@@ -10232,6 +10329,8 @@ EXPORTS
       __dt__18wxHtmlHistoryArrayFv
       ;wxHtmlWindow::~wxHtmlWindow()
       __dt__12wxHtmlWindowFv
+      ;wxHtmlWindow::OnCellMouseHover(wxHtmlCell*,int,int)
+      OnCellMouseHover__12wxHtmlWindowFP10wxHtmlCelliT2
       ;wxHtmlWindow::HistoryCanForward()
       HistoryCanForward__12wxHtmlWindowFv
       ;wxHtmlWindow::HistoryBack()
@@ -10273,6 +10372,8 @@ EXPORTS
       m_DefaultFilter__12wxHtmlWindow
       ;wxHtmlWindow::OnSetTitle(const wxString&)
       OnSetTitle__12wxHtmlWindowFRC8wxString
+      ;wxHtmlWindow::OnCellClicked(wxHtmlCell*,int,int,const wxMouseEvent&)
+      OnCellClicked__12wxHtmlWindowFP10wxHtmlCelliT2RC12wxMouseEvent
       ;wxHtmlWindow::OnSize(wxSizeEvent&)
       OnSize__12wxHtmlWindowFR11wxSizeEvent
       ;wxHtmlWindow::OnMouseEvent(wxMouseEvent&)
@@ -10513,6 +10614,8 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlTableCell::ReallocRows(int)
       ReallocRows__15wxHtmlTableCellFi
+      ;wxHtmlTableCell::ComputeMinMaxWidths()
+      ComputeMinMaxWidths__15wxHtmlTableCellFv
       ;wxConstructorForHTML_ModuleTables()
       wxConstructorForHTML_ModuleTables__Fv
       __vft15wxHtmlTableCell8wxObject
@@ -14054,8 +14157,6 @@ EXPORTS
       HandleSysCommand__8wxWindowFPvT1
       ;wxWindow::HandleSize(int,int,unsigned int)
       HandleSize__8wxWindowFiT1Ui
-      ;wxWindow::AdjustForParentClientOrigin(int&,int&,int)
-      AdjustForParentClientOrigin__8wxWindowFRiT1i
       ;wxWindow::Init()
       Init__8wxWindowFv
       ;wxGetMousePosition()