X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09c4bfc330047c420e86159ee84fc5aa3ab2b166..9e477492e29e03c02827b1e42a16cb09a13f5149:/wxPython/src/_misc.i?ds=sidebyside diff --git a/wxPython/src/_misc.i b/wxPython/src/_misc.i index fdf10bbbef..45ae59fd43 100644 --- 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); + + %property(Tip, GetTip, SetTip, doc="See `GetTip` and `SetTip`"); + %property(Window, GetWindow, doc="See `GetWindow`"); }; #endif @@ -51,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() { @@ -87,6 +90,11 @@ public: static int GetBlinkTime(); static void SetBlinkTime(int milliseconds); + + %property(Position, GetPosition, doc="See `GetPosition`"); + %property(Size, GetSize, SetSize, doc="See `GetSize` and `SetSize`"); + %property(Window, GetWindow, doc="See `GetWindow`"); + }; @@ -132,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); @@ -177,6 +186,10 @@ public: 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`"); }; @@ -269,11 +282,13 @@ enum wxPortId wxPORT_GTK = 1 << 3, // wxGTK, using GTK+ 1.x, 2.x, GPE or Maemo wxPORT_MGL = 1 << 4, // wxMGL, using wxUniversal wxPORT_X11 = 1 << 5, // wxX11, using wxUniversal - wxPORT_OS2 = 1 << 6, // wxOS2, using OS/2 Presentation Manager + wxPORT_PM = 1 << 6, // wxOS2, using OS/2 Presentation Manager + wxPORT_OS2 = wxPORT_PM, // wxOS2, using OS/2 Presentation Manager wxPORT_MAC = 1 << 7, // wxMac, using Carbon or Classic Mac API wxPORT_COCOA = 1 << 8, // wxCocoa, using Cocoa NextStep/Mac API wxPORT_WINCE = 1 << 9, // wxWinCE, toolkit is WinCE SDK API - wxPORT_PALMOS = 1 << 10 // wxPalmOS, toolkit is PalmOS API + wxPORT_PALMOS = 1 << 10, // wxPalmOS, toolkit is PalmOS API + wxPORT_DFB = 1 << 11 // wxDFB, using wxUniversal }; // architecture of the operating system @@ -352,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; @@ -388,6 +407,22 @@ public: // ----------------- 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`"); + };