another merge from WX_2_6_BRANCH

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-01-06 07:05:15 +00:00
parent 2091f5e71a
commit 095315e20d
41 changed files with 3008 additions and 38638 deletions

View File

@@ -139,7 +139,6 @@ wxGetStockLabel = wx._misc.GetStockLabel
wxBell = wx._misc.Bell
wxEndBusyCursor = wx._misc.EndBusyCursor
wxGetElapsedTime = wx._misc.GetElapsedTime
wxGetMousePosition = wx._misc.GetMousePosition
wxIsBusy = wx._misc.IsBusy
wxNow = wx._misc.Now
wxShell = wx._misc.Shell
@@ -185,12 +184,17 @@ wxGetClientDisplayRect = wx._misc.GetClientDisplayRect
wxSetCursor = wx._misc.SetCursor
wxGetXDisplay = wx._misc.GetXDisplay
wxBeginBusyCursor = wx._misc.BeginBusyCursor
wxGetMousePosition = wx._misc.GetMousePosition
FindWindowAtPointer = wx._misc.FindWindowAtPointer
wxGetActiveWindow = wx._misc.GetActiveWindow
wxGenericFindWindowAtPoint = wx._misc.GenericFindWindowAtPoint
wxFindWindowAtPoint = wx._misc.FindWindowAtPoint
wxGetTopLevelParent = wx._misc.GetTopLevelParent
wxLaunchDefaultBrowser = wx._misc.LaunchDefaultBrowser
wxGetKeyState = wx._misc.GetKeyState
wxMouseState = wx._misc.MouseState
wxMouseStatePtr = wx._misc.MouseStatePtr
wxGetMouseState = wx._misc.GetMouseState
wxWakeUpMainThread = wx._misc.WakeUpMainThread
wxMutexGuiEnter = wx._misc.MutexGuiEnter
wxMutexGuiLeave = wx._misc.MutexGuiLeave