Another merge of 2.6 changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-01-17 05:42:30 +00:00
parent f3ebbc0ac8
commit 4617be085f
21 changed files with 241 additions and 43 deletions

View File

@@ -1073,6 +1073,8 @@ wxEventLoop = wx._core.EventLoop
wxEventLoopPtr = wx._core.EventLoopPtr
wxEventLoop_GetActive = wx._core.EventLoop_GetActive
wxEventLoop_SetActive = wx._core.EventLoop_SetActive
wxEventLoopActivator = wx._core.EventLoopActivator
wxEventLoopActivatorPtr = wx._core.EventLoopActivatorPtr
wxAcceleratorEntry = wx._core.AcceleratorEntry
wxAcceleratorEntryPtr = wx._core.AcceleratorEntryPtr
wxAcceleratorTable = wx._core.AcceleratorTable