X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d115ca5ef3d29bd2571992020163889f30dcc7c7..e981e2b5556f1361edf0784584e1ce4c23ef89ab:/wxPython/src/_misc.i

diff --git a/wxPython/src/_misc.i b/wxPython/src/_misc.i
index ac6d122ece..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);
-    }
-%}
 
 //---------------------------------------------------------------------------
 
@@ -207,7 +209,7 @@ public:
 //---------------------------------------------------------------------------
 // Experimental...
 
-
+#if 0
 
 %{
 #ifdef __WXMSW__
@@ -295,5 +297,7 @@ void wxDrawWindowOnDC(wxWindow* window, const wxDC& dc, int method)
 
 %}
 
+#endif
+
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------