another merge from WX_2_6_BRANCH

[wxWidgets.git] / wxPython / src / __misc_rename.i

diff --git a/wxPython/src/__misc_rename.i b/wxPython/src/__misc_rename.i
index 7de659f613d1526b8c5ae767f5c08c3a621102e0..a5c2c83ee4207d2c31ac077daa0ea8934c587357 100644 (file)
--- a/wxPython/src/__misc_rename.i
+++ b/wxPython/src/__misc_rename.i
@@ -105,7 +105,6 @@
 %rename(Bell)                               wxBell;
 %rename(EndBusyCursor)                      wxEndBusyCursor;
 %rename(GetElapsedTime)                     wxGetElapsedTime;
 %rename(Bell)                               wxBell;
 %rename(EndBusyCursor)                      wxEndBusyCursor;
 %rename(GetElapsedTime)                     wxGetElapsedTime;

-%rename(GetMousePosition)                   wxGetMousePosition;

 %rename(IsBusy)                             wxIsBusy;
 %rename(Now)                                wxNow;
 %rename(Shell)                              wxShell;
 %rename(IsBusy)                             wxIsBusy;
 %rename(Now)                                wxNow;
 %rename(Shell)                              wxShell;


@@ -151,12 +150,15 @@
 %rename(SetCursor)                          wxSetCursor;
 %rename(GetXDisplay)                        wxGetXDisplay;
 %rename(BeginBusyCursor)                    wxBeginBusyCursor;
 %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(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;
 %rename(WakeUpMainThread)                   wxWakeUpMainThread;
 %rename(MutexGuiEnter)                      wxMutexGuiEnter;
 %rename(MutexGuiLeave)                      wxMutexGuiLeave;