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 cf0257d4d6a1aa40e6746207e6e902f9176a19b8..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);
 


@@ -182,6 +186,10 @@ public:
     int GetCount() const;
     %pythoncode { GetNoHistoryFiles = GetCount }
 
     int GetCount() const;
     %pythoncode { GetNoHistoryFiles = GetCount }
 

+    %property(Count, GetCount, doc="See `GetCount`");
+    %property(HistoryFile, GetHistoryFile, doc="See `GetHistoryFile`");
+    %property(MaxFiles, GetMaxFiles, doc="See `GetMaxFiles`");
+    %property(NoHistoryFiles, GetNoHistoryFiles, doc="See `GetNoHistoryFiles`");

 };
 
 
 };
 
 


@@ -359,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;


@@ -395,6 +407,22 @@ public:
     // -----------------
 
     bool IsOk() const;
     // -----------------
 
     bool IsOk() const;

+
+    %property(ArchName, GetArchName, doc="See `GetArchName`");
+    %property(Architecture, GetArchitecture, SetArchitecture, doc="See `GetArchitecture` and `SetArchitecture`");
+    %property(Endianness, GetEndianness, SetEndianness, doc="See `GetEndianness` and `SetEndianness`");
+    %property(EndiannessName, GetEndiannessName, doc="See `GetEndiannessName`");
+    %property(OSMajorVersion, GetOSMajorVersion, doc="See `GetOSMajorVersion`");
+    %property(OSMinorVersion, GetOSMinorVersion, doc="See `GetOSMinorVersion`");
+    %property(OperatingSystemFamilyName, GetOperatingSystemFamilyName, doc="See `GetOperatingSystemFamilyName`");
+    %property(OperatingSystemId, GetOperatingSystemId, SetOperatingSystemId, doc="See `GetOperatingSystemId` and `SetOperatingSystemId`");
+    %property(OperatingSystemIdName, GetOperatingSystemIdName, doc="See `GetOperatingSystemIdName`");
+    %property(PortId, GetPortId, SetPortId, doc="See `GetPortId` and `SetPortId`");
+    %property(PortIdName, GetPortIdName, doc="See `GetPortIdName`");
+    %property(PortIdShortName, GetPortIdShortName, doc="See `GetPortIdShortName`");
+    %property(ToolkitMajorVersion, GetToolkitMajorVersion, doc="See `GetToolkitMajorVersion`");
+    %property(ToolkitMinorVersion, GetToolkitMinorVersion, doc="See `GetToolkitMinorVersion`");
+    

 };
 
 
 };