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:
@@ -105,7 +105,6 @@
|
||||
%rename(Bell) wxBell;
|
||||
%rename(EndBusyCursor) wxEndBusyCursor;
|
||||
%rename(GetElapsedTime) wxGetElapsedTime;
|
||||
%rename(GetMousePosition) wxGetMousePosition;
|
||||
%rename(IsBusy) wxIsBusy;
|
||||
%rename(Now) wxNow;
|
||||
%rename(Shell) wxShell;
|
||||
@@ -151,12 +150,15 @@
|
||||
%rename(SetCursor) wxSetCursor;
|
||||
%rename(GetXDisplay) wxGetXDisplay;
|
||||
%rename(BeginBusyCursor) wxBeginBusyCursor;
|
||||
%rename(GetMousePosition) wxGetMousePosition;
|
||||
%rename(GetActiveWindow) wxGetActiveWindow;
|
||||
%rename(GenericFindWindowAtPoint) wxGenericFindWindowAtPoint;
|
||||
%rename(FindWindowAtPoint) wxFindWindowAtPoint;
|
||||
%rename(GetTopLevelParent) wxGetTopLevelParent;
|
||||
%rename(LaunchDefaultBrowser) wxLaunchDefaultBrowser;
|
||||
%rename(GetKeyState) wxGetKeyState;
|
||||
%rename(MouseState) wxMouseState;
|
||||
%rename(GetMouseState) wxGetMouseState;
|
||||
%rename(WakeUpMainThread) wxWakeUpMainThread;
|
||||
%rename(MutexGuiEnter) wxMutexGuiEnter;
|
||||
%rename(MutexGuiLeave) wxMutexGuiLeave;
|
||||
|
Reference in New Issue
Block a user