bitwise vs. logical operator

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

diff --git a/wxPython/src/_misc.i b/wxPython/src/_misc.i
index fa233350d36452c74f6cf6cf625c0f390b207104..45ae59fd43f4d3829db38949ffb0e8a54c4e949d 100644 (file)
--- a/wxPython/src/_misc.i
+++ b/wxPython/src/_misc.i
@@ -38,6 +38,9 @@ public:
 
     static void Enable(bool flag);
     static void SetDelay(long milliseconds);
 
     static void Enable(bool flag);
     static void SetDelay(long milliseconds);

+
+    %property(Tip, GetTip, SetTip, doc="See `GetTip` and `SetTip`");
+    %property(Window, GetWindow, doc="See `GetWindow`");

 };
 #endif
 
 };
 #endif
 


@@ -51,7 +54,7 @@ public:
     ~wxCaret(); 
 
     %extend {
     ~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() {
         DocStr(Destroy,
                "Deletes the C++ object this Python object is a proxy for.", "");
         void Destroy() {


@@ -137,7 +140,8 @@ class  wxStopWatch
 public:
     // ctor starts the stop watch
     wxStopWatch();
 public:
     // ctor starts the stop watch
     wxStopWatch();

-
+    ~wxStopWatch();
+    

     // start the stop watch at the moment t0
     void Start(long t0 = 0);
 
     // start the stop watch at the moment t0
     void Start(long t0 = 0);
 


@@ -363,9 +367,13 @@ public:
     int GetOSMajorVersion() const;
     int GetOSMinorVersion() const;
 
     int GetOSMajorVersion() const;
     int GetOSMinorVersion() const;
 

+    bool CheckOSVersion(int major, int minor) const;
+        

     int GetToolkitMajorVersion() const;
     int GetToolkitMinorVersion() const;
 
     int GetToolkitMajorVersion() const;
     int GetToolkitMinorVersion() const;
 

+    bool CheckToolkitVersion(int major, int minor) const;
+    

     bool IsUsingUniversalWidgets() const;
 
     wxOperatingSystemId GetOperatingSystemId() const;
     bool IsUsingUniversalWidgets() const;
 
     wxOperatingSystemId GetOperatingSystemId() const;