From: Robin Dunn Date: Fri, 4 Feb 2005 19:15:02 +0000 (+0000) Subject: the window takes ownership of the caret X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e981e2b5556f1361edf0784584e1ce4c23ef89ab the window takes ownership of the caret git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/src/__misc_rename.i b/wxPython/src/__misc_rename.i index 3811dc1bd7..dda9e983ed 100644 --- a/wxPython/src/__misc_rename.i +++ b/wxPython/src/__misc_rename.i @@ -163,8 +163,6 @@ %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; diff --git a/wxPython/src/_misc.i b/wxPython/src/_misc.i index 0ed3fe558b..ef64c3ef7b 100644 --- a/wxPython/src/_misc.i +++ b/wxPython/src/_misc.i @@ -43,8 +43,16 @@ MustHaveApp(wxCaret); class wxCaret { public: wxCaret(wxWindow* window, const wxSize& size); - ~wxCaret(); - +// ~wxCaret(); Window takes ownership + + %extend { + DocStr(Destroy, + "Deletes the C++ object this Python object is a proxy for.", ""); + void Destroy() { + delete self; + } + } + bool IsOk(); bool IsVisible(); @@ -70,17 +78,11 @@ public: void Hide(); %pythoncode { def __nonzero__(self): return self.IsOk() } -}; -%inline %{ - int wxCaret_GetBlinkTime() { - return wxCaret::GetBlinkTime(); - } + static int GetBlinkTime(); + static void SetBlinkTime(int milliseconds); +}; - void wxCaret_SetBlinkTime(int milliseconds) { - wxCaret::SetBlinkTime(milliseconds); - } -%} //---------------------------------------------------------------------------