wxHotkeyModifier --> wxKeyModifier

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

diff --git a/wxPython/src/__misc_rename.i b/wxPython/src/__misc_rename.i
index 63047cb483ce8cb90280e59520e7c215ae8035fa..7de659f613d1526b8c5ae767f5c08c3a621102e0 100644 (file)
--- a/wxPython/src/__misc_rename.i
+++ b/wxPython/src/__misc_rename.i
@@ -99,6 +99,9 @@
 %rename(NewId)                              wxNewId;
 %rename(RegisterId)                         wxRegisterId;
 %rename(GetCurrentId)                       wxGetCurrentId;
 %rename(NewId)                              wxNewId;
 %rename(RegisterId)                         wxRegisterId;
 %rename(GetCurrentId)                       wxGetCurrentId;

+%rename(IsStockID)                          wxIsStockID;
+%rename(IsStockLabel)                       wxIsStockLabel;
+%rename(GetStockLabel)                      wxGetStockLabel;

 %rename(Bell)                               wxBell;
 %rename(EndBusyCursor)                      wxEndBusyCursor;
 %rename(GetElapsedTime)                     wxGetElapsedTime;
 %rename(Bell)                               wxBell;
 %rename(EndBusyCursor)                      wxEndBusyCursor;
 %rename(GetElapsedTime)                     wxGetElapsedTime;


@@ -114,7 +117,8 @@
 %rename(SHUTDOWN_REBOOT)                    wxSHUTDOWN_REBOOT;
 %rename(Shutdown)                           wxShutdown;
 %rename(Sleep)                              wxSleep;
 %rename(SHUTDOWN_REBOOT)                    wxSHUTDOWN_REBOOT;
 %rename(Shutdown)                           wxShutdown;
 %rename(Sleep)                              wxSleep;

-%rename(Usleep)                             wxUsleep;
+%rename(MilliSleep)                         wxMilliSleep;
+%rename(MicroSleep)                         wxMicroSleep;

 %rename(EnableTopLevelWindows)              wxEnableTopLevelWindows;
 %rename(StripMenuCodes)                     wxStripMenuCodes;
 %rename(GetEmailAddress)                    wxGetEmailAddress;
 %rename(EnableTopLevelWindows)              wxEnableTopLevelWindows;
 %rename(StripMenuCodes)                     wxStripMenuCodes;
 %rename(GetEmailAddress)                    wxGetEmailAddress;


@@ -135,7 +139,6 @@
 %rename(GetSingleChoice)                    wxGetSingleChoice;
 %rename(GetSingleChoiceIndex)               wxGetSingleChoiceIndex;
 %rename(MessageBox)                         wxMessageBox;
 %rename(GetSingleChoice)                    wxGetSingleChoice;
 %rename(GetSingleChoiceIndex)               wxGetSingleChoiceIndex;
 %rename(MessageBox)                         wxMessageBox;

-%rename(GetNumberFromUser)                  wxGetNumberFromUser;

 %rename(ColourDisplay)                      wxColourDisplay;
 %rename(DisplayDepth)                       wxDisplayDepth;
 %rename(GetDisplayDepth)                    wxGetDisplayDepth;
 %rename(ColourDisplay)                      wxColourDisplay;
 %rename(DisplayDepth)                       wxDisplayDepth;
 %rename(GetDisplayDepth)                    wxGetDisplayDepth;


@@ -146,11 +149,13 @@
 %rename(ClientDisplayRect)                  wxClientDisplayRect;
 %rename(GetClientDisplayRect)               wxGetClientDisplayRect;
 %rename(SetCursor)                          wxSetCursor;
 %rename(ClientDisplayRect)                  wxClientDisplayRect;
 %rename(GetClientDisplayRect)               wxGetClientDisplayRect;
 %rename(SetCursor)                          wxSetCursor;

+%rename(GetXDisplay)                        wxGetXDisplay;

 %rename(BeginBusyCursor)                    wxBeginBusyCursor;
 %rename(GetActiveWindow)                    wxGetActiveWindow;
 %rename(GenericFindWindowAtPoint)           wxGenericFindWindowAtPoint;
 %rename(FindWindowAtPoint)                  wxFindWindowAtPoint;
 %rename(GetTopLevelParent)                  wxGetTopLevelParent;
 %rename(BeginBusyCursor)                    wxBeginBusyCursor;
 %rename(GetActiveWindow)                    wxGetActiveWindow;
 %rename(GenericFindWindowAtPoint)           wxGenericFindWindowAtPoint;
 %rename(FindWindowAtPoint)                  wxFindWindowAtPoint;
 %rename(GetTopLevelParent)                  wxGetTopLevelParent;

+%rename(LaunchDefaultBrowser)               wxLaunchDefaultBrowser;

 %rename(GetKeyState)                        wxGetKeyState;
 %rename(WakeUpMainThread)                   wxWakeUpMainThread;
 %rename(MutexGuiEnter)                      wxMutexGuiEnter;
 %rename(GetKeyState)                        wxGetKeyState;
 %rename(WakeUpMainThread)                   wxWakeUpMainThread;
 %rename(MutexGuiEnter)                      wxMutexGuiEnter;


@@ -159,8 +164,6 @@
 %rename(Thread_IsMain)                      wxThread_IsMain;
 %rename(ToolTip)                            wxToolTip;
 %rename(Caret)                              wxCaret;
 %rename(Thread_IsMain)                      wxThread_IsMain;
 %rename(ToolTip)                            wxToolTip;
 %rename(Caret)                              wxCaret;

-%rename(Caret_GetBlinkTime)                 wxCaret_GetBlinkTime;
-%rename(Caret_SetBlinkTime)                 wxCaret_SetBlinkTime;

 %rename(BusyCursor)                         wxBusyCursor;
 %rename(WindowDisabler)                     wxWindowDisabler;
 %rename(BusyInfo)                           wxBusyInfo;
 %rename(BusyCursor)                         wxBusyCursor;
 %rename(WindowDisabler)                     wxWindowDisabler;
 %rename(BusyInfo)                           wxBusyInfo;


@@ -203,20 +206,9 @@
 %rename(LogGui)                             wxLogGui;
 %rename(LogWindow)                          wxLogWindow;
 %rename(LogChain)                           wxLogChain;
 %rename(LogGui)                             wxLogGui;
 %rename(LogWindow)                          wxLogWindow;
 %rename(LogChain)                           wxLogChain;

+%rename(LogBuffer)                          wxLogBuffer;

 %rename(SysErrorCode)                       wxSysErrorCode;
 %rename(SysErrorMsg)                        wxSysErrorMsg;
 %rename(SysErrorCode)                       wxSysErrorCode;
 %rename(SysErrorMsg)                        wxSysErrorMsg;

-%rename(LogFatalError)                      wxLogFatalError;
-%rename(LogError)                           wxLogError;
-%rename(LogWarning)                         wxLogWarning;
-%rename(LogMessage)                         wxLogMessage;
-%rename(LogInfo)                            wxLogInfo;
-%rename(LogDebug)                           wxLogDebug;
-%rename(LogVerbose)                         wxLogVerbose;
-%rename(LogStatus)                          wxLogStatus;
-%rename(LogSysError)                        wxLogSysError;
-%rename(LogTrace)                           wxLogTrace;
-%rename(LogTrace)                           wxLogTrace;
-%rename(LogGeneric)                         wxLogGeneric;

 %rename(SafeShowMessage)                    wxSafeShowMessage;
 %rename(LogNull)                            wxLogNull;
 %rename(PyLog)                              wxPyLog;
 %rename(SafeShowMessage)                    wxSafeShowMessage;
 %rename(LogNull)                            wxLogNull;
 %rename(PyLog)                              wxPyLog;


@@ -227,6 +219,8 @@
 %rename(KILL_ACCESS_DENIED)                 wxKILL_ACCESS_DENIED;
 %rename(KILL_NO_PROCESS)                    wxKILL_NO_PROCESS;
 %rename(KILL_ERROR)                         wxKILL_ERROR;
 %rename(KILL_ACCESS_DENIED)                 wxKILL_ACCESS_DENIED;
 %rename(KILL_NO_PROCESS)                    wxKILL_NO_PROCESS;
 %rename(KILL_ERROR)                         wxKILL_ERROR;

+%rename(KILL_NOCHILDREN)                    wxKILL_NOCHILDREN;
+%rename(KILL_CHILDREN)                      wxKILL_CHILDREN;

 %rename(SIGNONE)                            wxSIGNONE;
 %rename(SIGHUP)                             wxSIGHUP;
 %rename(SIGINT)                             wxSIGINT;
 %rename(SIGNONE)                            wxSIGNONE;
 %rename(SIGHUP)                             wxSIGHUP;
 %rename(SIGINT)                             wxSIGINT;


@@ -249,7 +243,9 @@
 %rename(EXEC_SYNC)                          wxEXEC_SYNC;
 %rename(EXEC_NOHIDE)                        wxEXEC_NOHIDE;
 %rename(EXEC_MAKE_GROUP_LEADER)             wxEXEC_MAKE_GROUP_LEADER;
 %rename(EXEC_SYNC)                          wxEXEC_SYNC;
 %rename(EXEC_NOHIDE)                        wxEXEC_NOHIDE;
 %rename(EXEC_MAKE_GROUP_LEADER)             wxEXEC_MAKE_GROUP_LEADER;

+%rename(EXEC_NODISABLE)                     wxEXEC_NODISABLE;

 %rename(Execute)                            wxExecute;
 %rename(Execute)                            wxExecute;

+%rename(Kill)                               wxKill;

 %rename(JOYSTICK1)                          wxJOYSTICK1;
 %rename(JOYSTICK2)                          wxJOYSTICK2;
 %rename(JOY_BUTTON_ANY)                     wxJOY_BUTTON_ANY;
 %rename(JOYSTICK1)                          wxJOYSTICK1;
 %rename(JOYSTICK2)                          wxJOYSTICK2;
 %rename(JOY_BUTTON_ANY)                     wxJOY_BUTTON_ANY;


@@ -334,10 +330,10 @@
 %rename(DragCancel)                         wxDragCancel;
 %rename(IsDragResultOk)                     wxIsDragResultOk;
 %rename(Clipboard)                          wxClipboard;
 %rename(DragCancel)                         wxDragCancel;
 %rename(IsDragResultOk)                     wxIsDragResultOk;
 %rename(Clipboard)                          wxClipboard;

-%rename(TheClipboard)                       wxTheClipboard;

 %rename(ClipboardLocker)                    wxClipboardLocker;
 %rename(VideoMode)                          wxVideoMode;
 %rename(DefaultVideoMode)                   wxDefaultVideoMode;
 %rename(Display)                            wxDisplay;
 %rename(ClipboardLocker)                    wxClipboardLocker;
 %rename(VideoMode)                          wxVideoMode;
 %rename(DefaultVideoMode)                   wxDefaultVideoMode;
 %rename(Display)                            wxDisplay;

+%rename(StandardPaths)                      wxStandardPaths;

 
 #endif
 
 #endif