move the include of collpane.h to the main header

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

diff --git a/wxPython/src/_misc.i b/wxPython/src/_misc.i
index 11ca06c834e5857d682668aac722606bb7e65eac..45ae59fd43f4d3829db38949ffb0e8a54c4e949d 100644 (file)
--- a/wxPython/src/_misc.i
+++ b/wxPython/src/_misc.i
@@ -54,7 +54,7 @@ public:
     ~wxCaret(); 
 
     %extend {
-        %pythonAppend Destroy "args[0].thisown = 0"
+        %pythonPrepend Destroy "args[0].this.own(False)"
         DocStr(Destroy,
                "Deletes the C++ object this Python object is a proxy for.", "");
         void Destroy() {
@@ -140,7 +140,8 @@ class  wxStopWatch
 public:
     // ctor starts the stop watch
     wxStopWatch();
-
+    ~wxStopWatch();
+    
     // start the stop watch at the moment t0
     void Start(long t0 = 0);
 
@@ -366,9 +367,13 @@ public:
     int GetOSMajorVersion() const;
     int GetOSMinorVersion() const;
 
+    bool CheckOSVersion(int major, int minor) const;
+        
     int GetToolkitMajorVersion() const;
     int GetToolkitMinorVersion() const;
 
+    bool CheckToolkitVersion(int major, int minor) const;
+    
     bool IsUsingUniversalWidgets() const;
 
     wxOperatingSystemId GetOperatingSystemId() const;