From 7012bb9f03e0012c32485655b7af4345b490bf4d Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 12 Sep 2006 03:20:12 +0000 Subject: [PATCH] more properties git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/_app.i | 18 ++++++++- wxPython/src/_bitmap.i | 5 +++ wxPython/src/_cmndlgs.i | 3 ++ wxPython/src/_dc.i | 2 + wxPython/src/_event.i | 17 ++++++++- wxPython/src/_gdicmn.i | 22 +++++++++++ wxPython/src/_misc.i | 16 ++++++++ wxPython/src/_obj.i | 2 + wxPython/src/_palette.i | 2 + wxPython/src/_panel.i | 5 +++ wxPython/src/_pen.i | 8 ++++ wxPython/src/_picker.i | 10 +++++ wxPython/src/_printfw.i | 79 +++++++++++++++++++++++++++++++++++++++ wxPython/src/_process.i | 11 ++++++ wxPython/src/_pseudodc.i | 4 ++ wxPython/src/_radio.i | 8 ++++ wxPython/src/_region.i | 11 ++++++ wxPython/src/_renderer.i | 3 ++ wxPython/src/_sashwin.i | 21 ++++++++++- wxPython/src/_scrolbar.i | 5 +++ wxPython/src/_sizers.i | 26 +++++++++++++ wxPython/src/_slider.i | 10 +++++ wxPython/src/_spin.i | 10 +++++ wxPython/src/_splitter.i | 16 ++++++++ wxPython/src/_statusbar.i | 8 +++- wxPython/src/_toplvl.i | 6 +++ 26 files changed, 323 insertions(+), 5 deletions(-) diff --git a/wxPython/src/_app.i b/wxPython/src/_app.i index 27790ba05e..780754c0c3 100644 --- a/wxPython/src/_app.i +++ b/wxPython/src/_app.i @@ -297,7 +297,7 @@ it wasn't found at all. Raises an exception on non-Windows platforms.", ""); #endif %extend { - DocStr(DisplayAvailable, + DocStr(IsDisplayAvailable, "Tests if it is possible to create a GUI in the current environment. This will mean different things on the different platforms. @@ -312,10 +312,24 @@ This will mean different things on the different platforms. * On MS Windows... ", ""); - static bool DisplayAvailable() { + static bool IsDisplayAvailable() { return wxPyTestDisplayAvailable(); } } + + + %property(AppName, GetAppName, SetAppName, doc="See `GetAppName` and `SetAppName`"); + %property(AssertMode, GetAssertMode, SetAssertMode, doc="See `GetAssertMode` and `SetAssertMode`"); + %property(ClassName, GetClassName, SetClassName, doc="See `GetClassName` and `SetClassName`"); + %property(ExitOnFrameDelete, GetExitOnFrameDelete, SetExitOnFrameDelete, doc="See `GetExitOnFrameDelete` and `SetExitOnFrameDelete`"); + %property(LayoutDirection, GetLayoutDirection, doc="See `GetLayoutDirection`"); + %property(PrintMode, GetPrintMode, SetPrintMode, doc="See `GetPrintMode` and `SetPrintMode`"); + %property(TopWindow, GetTopWindow, SetTopWindow, doc="See `GetTopWindow` and `SetTopWindow`"); + %property(Traits, GetTraits, doc="See `GetTraits`"); + %property(UseBestVisual, GetUseBestVisual, SetUseBestVisual, doc="See `GetUseBestVisual` and `SetUseBestVisual`"); + %property(VendorName, GetVendorName, SetVendorName, doc="See `GetVendorName` and `SetVendorName`"); + + %property(Active, IsActive); }; diff --git a/wxPython/src/_bitmap.i b/wxPython/src/_bitmap.i index b32898110f..f4b5ba82b8 100644 --- a/wxPython/src/_bitmap.i +++ b/wxPython/src/_bitmap.i @@ -532,6 +532,11 @@ public: // the distance between two rows int GetRowStride() const { return m_stride; } + %property(Height, GetHeight, doc="See `GetHeight`"); + %property(Origin, GetOrigin, doc="See `GetOrigin`"); + %property(RowStride, GetRowStride, doc="See `GetRowStride`"); + %property(Size, GetSize, doc="See `GetSize`"); + %property(Width, GetWidth, doc="See `GetWidth`"); }; diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i index cb5b1984a7..d2cb1632ff 100644 --- a/wxPython/src/_cmndlgs.i +++ b/wxPython/src/_cmndlgs.i @@ -488,6 +488,9 @@ public: DocDeclStr( void , SetSelection(int sel), "Set the current selected item to sel", ""); + + %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`"); + %property(StringSelection, GetStringSelection, doc="See `GetStringSelection`"); }; diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i index ae2a5ad49e..1977e7d003 100644 --- a/wxPython/src/_dc.i +++ b/wxPython/src/_dc.i @@ -1561,6 +1561,8 @@ output. Default is 720ppi.", ""); DocDeclStr( static int , GetResolution(), "Return resolution used in PostScript output.", ""); + + %property(PrintData, GetPrintData, SetPrintData, doc="See `GetPrintData` and `SetPrintData`"); }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_event.i b/wxPython/src/_event.i index 4b51c06857..c5a444a1cb 100644 --- a/wxPython/src/_event.i +++ b/wxPython/src/_event.i @@ -720,6 +720,9 @@ the scrollbar.", ""); void SetOrientation(int orient); void SetPosition(int pos); + + %property(Orientation, GetOrientation, SetOrientation, doc="See `GetOrientation` and `SetOrientation`"); + %property(Position, GetPosition, SetPosition, doc="See `GetPosition` and `SetPosition`"); }; @@ -768,6 +771,9 @@ need to query the window itself for the current position in that case.", ""); void SetOrientation(int orient); void SetPosition(int pos); + + %property(Orientation, GetOrientation, SetOrientation, doc="See `GetOrientation` and `SetOrientation`"); + %property(Position, GetPosition, SetPosition, doc="See `GetPosition` and `SetPosition`"); }; //--------------------------------------------------------------------------- @@ -1155,6 +1161,9 @@ public: bool , HasCursor() const, "Returns true if the cursor specified by this event is a valid cursor.", ""); + %property(Cursor, GetCursor, SetCursor, doc="See `GetCursor` and `SetCursor`"); + %property(X, GetX, doc="See `GetX`"); + %property(Y, GetY, doc="See `GetY`"); }; //--------------------------------------------------------------------------- @@ -1472,9 +1481,11 @@ event.", ""); } } -public: wxSize m_size; wxRect m_rect; + + %property(Rect, GetRect, SetRect, doc="See `GetRect` and `SetRect`"); + %property(Size, GetSize, SetSize, doc="See `GetSize` and `SetSize`"); }; @@ -1853,6 +1864,7 @@ public: void SetShow(bool show); bool GetShow() const; + %property(Show, GetShow, SetShow, doc="See `GetShow` and `SetShow`"); }; @@ -2257,6 +2269,7 @@ public: void SetChangedWindow(wxWindow* win); wxWindow* GetChangedWindow(); + %property(ChangedWindow, GetChangedWindow, SetChangedWindow, doc="See `GetChangedWindow` and `SetChangedWindow`"); }; //--------------------------------------------------------------------------- @@ -2280,6 +2293,8 @@ public: "App should set this if it changes the palette.", ""); bool GetPaletteRealized() const; + + %property(PaletteRealized, GetPaletteRealized, SetPaletteRealized, doc="See `GetPaletteRealized` and `SetPaletteRealized`"); }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i index 20c67d6bf7..d1be49859b 100644 --- a/wxPython/src/_gdicmn.i +++ b/wxPython/src/_gdicmn.i @@ -708,6 +708,22 @@ usually, but not necessarily, the larger one.", ""); __safe_for_unpickling__ = True def __reduce__(self): return (wx.Rect, self.Get()) } + + + %property(Bottom, GetBottom, SetBottom, doc="See `GetBottom` and `SetBottom`"); + %property(BottomRight, GetBottomRight, SetBottomRight, doc="See `GetBottomRight` and `SetBottomRight`"); + %property(Height, GetHeight, SetHeight, doc="See `GetHeight` and `SetHeight`"); + %property(Left, GetLeft, SetLeft, doc="See `GetLeft` and `SetLeft`"); + %property(Position, GetPosition, SetPosition, doc="See `GetPosition` and `SetPosition`"); + %property(Right, GetRight, SetRight, doc="See `GetRight` and `SetRight`"); + %property(Size, GetSize, SetSize, doc="See `GetSize` and `SetSize`"); + %property(Top, GetTop, SetTop, doc="See `GetTop` and `SetTop`"); + %property(TopLeft, GetTopLeft, SetTopLeft, doc="See `GetTopLeft` and `SetTopLeft`"); + %property(Width, GetWidth, SetWidth, doc="See `GetWidth` and `SetWidth`"); + %property(X, GetX, SetX, doc="See `GetX` and `SetX`"); + %property(Y, GetY, SetY, doc="See `GetY` and `SetY`"); + + %property(Empty, IsEmpty, doc="See `IsEmpty`"); }; @@ -857,6 +873,12 @@ public: __safe_for_unpickling__ = True def __reduce__(self): return (wx.Point2D, self.Get()) } + + %property(Floor, GetFloor, doc="See `GetFloor`"); + %property(Rounded, GetRounded, doc="See `GetRounded`"); + %property(VectorAngle, GetVectorAngle, SetVectorAngle, doc="See `GetVectorAngle` and `SetVectorAngle`"); + %property(VectorLength, GetVectorLength, SetVectorLength, doc="See `GetVectorLength` and `SetVectorLength`"); + }; diff --git a/wxPython/src/_misc.i b/wxPython/src/_misc.i index 681174477f..fa233350d3 100644 --- a/wxPython/src/_misc.i +++ b/wxPython/src/_misc.i @@ -399,6 +399,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`"); + }; diff --git a/wxPython/src/_obj.i b/wxPython/src/_obj.i index cb77d13273..52620e7726 100644 --- a/wxPython/src/_obj.i +++ b/wxPython/src/_obj.i @@ -37,6 +37,8 @@ public: delete self; } } + + %property(ClassName, GetClassName, doc="See `GetClassName`"); }; diff --git a/wxPython/src/_palette.i b/wxPython/src/_palette.i index 1ce21e1b3c..ca1c1c28e7 100644 --- a/wxPython/src/_palette.i +++ b/wxPython/src/_palette.i @@ -36,6 +36,8 @@ public: bool Ok(); %pythoncode { def __nonzero__(self): return self.Ok() } + + %property(ColoursCount, GetColoursCount, doc="See `GetColoursCount`"); }; diff --git a/wxPython/src/_panel.i b/wxPython/src/_panel.i index 881ceefcec..e9acfd82b4 100644 --- a/wxPython/src/_panel.i +++ b/wxPython/src/_panel.i @@ -197,6 +197,11 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(ScaleX, GetScaleX, doc="See `GetScaleX`"); + %property(ScaleY, GetScaleY, doc="See `GetScaleY`"); + %property(TargetWindow, GetTargetWindow, SetTargetWindow, doc="See `GetTargetWindow` and `SetTargetWindow`"); + %property(ViewStart, GetViewStart, doc="See `GetViewStart`"); }; diff --git a/wxPython/src/_pen.i b/wxPython/src/_pen.i index e0fca1cb17..a3e5066184 100644 --- a/wxPython/src/_pen.i +++ b/wxPython/src/_pen.i @@ -111,6 +111,14 @@ public: bool __ne__(const wxPen* other) { return other ? (*self != *other) : true; } } %pythoncode { def __nonzero__(self): return self.Ok() } + + %property(Cap, GetCap, SetCap, doc="See `GetCap` and `SetCap`"); + %property(Colour, GetColour, SetColour, doc="See `GetColour` and `SetColour`"); + %property(DashCount, GetDashCount, doc="See `GetDashCount`"); + %property(Dashes, GetDashes, SetDashes, doc="See `GetDashes` and `SetDashes`"); + %property(Join, GetJoin, SetJoin, doc="See `GetJoin` and `SetJoin`"); + %property(Style, GetStyle, SetStyle, doc="See `GetStyle` and `SetStyle`"); + %property(Width, GetWidth, SetWidth, doc="See `GetWidth` and `SetWidth`"); }; diff --git a/wxPython/src/_picker.i b/wxPython/src/_picker.i index 8859e174a2..d3ca422fcf 100644 --- a/wxPython/src/_picker.i +++ b/wxPython/src/_picker.i @@ -119,6 +119,16 @@ etc).", ""); wxControl *, GetPickerCtrl(), "", ""); + + %property(InternalMargin, GetInternalMargin, SetInternalMargin, doc="See `GetInternalMargin` and `SetInternalMargin`"); + %property(PickerCtrl, GetPickerCtrl, doc="See `GetPickerCtrl`"); + %property(PickerCtrlProportion, GetPickerCtrlProportion, SetPickerCtrlProportion, doc="See `GetPickerCtrlProportion` and `SetPickerCtrlProportion`"); + %property(TextCtrl, GetTextCtrl, doc="See `GetTextCtrl`"); + %property(TextCtrlProportion, GetTextCtrlProportion, SetTextCtrlProportion, doc="See `GetTextCtrlProportion` and `SetTextCtrlProportion`"); + + %property(TextCtrlGrowable, IsTextCtrlGrowable, SetTextCtrlGrowable, doc="See `IsTextCtrlGrowable` and `SetTextCtrlGrowable`"); + %property(PickerCtrlGrowable, IsPickerCtrlGrowable, SetPickerCtrlGrowable, doc="See `IsPickerCtrlGrowable` and `SetPickerCtrlGrowable`"); + }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i index 43c734854a..0cfff0be6b 100644 --- a/wxPython/src/_printfw.i +++ b/wxPython/src/_printfw.i @@ -154,6 +154,19 @@ public: void SetPrinterTranslation(long x, long y); #endif + %property(Bin, GetBin, SetBin, doc="See `GetBin` and `SetBin`"); + %property(Collate, GetCollate, SetCollate, doc="See `GetCollate` and `SetCollate`"); + %property(Colour, GetColour, SetColour, doc="See `GetColour` and `SetColour`"); + %property(Duplex, GetDuplex, SetDuplex, doc="See `GetDuplex` and `SetDuplex`"); + %property(Filename, GetFilename, SetFilename, doc="See `GetFilename` and `SetFilename`"); + %property(NoCopies, GetNoCopies, SetNoCopies, doc="See `GetNoCopies` and `SetNoCopies`"); + %property(Orientation, GetOrientation, SetOrientation, doc="See `GetOrientation` and `SetOrientation`"); + %property(PaperId, GetPaperId, SetPaperId, doc="See `GetPaperId` and `SetPaperId`"); + %property(PaperSize, GetPaperSize, SetPaperSize, doc="See `GetPaperSize` and `SetPaperSize`"); + %property(PrintMode, GetPrintMode, SetPrintMode, doc="See `GetPrintMode` and `SetPrintMode`"); + %property(PrinterName, GetPrinterName, SetPrinterName, doc="See `GetPrinterName` and `SetPrinterName`"); + %property(PrivData, GetPrivData, SetPrivData, doc="See `GetPrivData` and `SetPrivData`"); + %property(Quality, GetQuality, SetQuality, doc="See `GetQuality` and `SetQuality`"); }; //--------------------------------------------------------------------------- @@ -209,6 +222,24 @@ public: void CalculatePaperSizeFromId(); %pythoncode { def __nonzero__(self): return self.Ok() } + + %property(DefaultInfo, GetDefaultInfo, SetDefaultInfo, doc="See `GetDefaultInfo` and `SetDefaultInfo`"); + %property(DefaultMinMargins, GetDefaultMinMargins, SetDefaultMinMargins, doc="See `GetDefaultMinMargins` and `SetDefaultMinMargins`"); + +// %property(EnableHelp, GetEnableHelp, doc="See `GetEnableHelp`"); +// %property(EnableMargins, GetEnableMargins, doc="See `GetEnableMargins`"); +// %property(EnableOrientation, GetEnableOrientation, doc="See `GetEnableOrientation`"); +// %property(EnablePaper, GetEnablePaper, doc="See `GetEnablePaper`"); +// %property(EnablePrinter, GetEnablePrinter, doc="See `GetEnablePrinter`"); + + %property(MarginBottomRight, GetMarginBottomRight, SetMarginBottomRight, doc="See `GetMarginBottomRight` and `SetMarginBottomRight`"); + %property(MarginTopLeft, GetMarginTopLeft, SetMarginTopLeft, doc="See `GetMarginTopLeft` and `SetMarginTopLeft`"); + %property(MinMarginBottomRight, GetMinMarginBottomRight, SetMinMarginBottomRight, doc="See `GetMinMarginBottomRight` and `SetMinMarginBottomRight`"); + %property(MinMarginTopLeft, GetMinMarginTopLeft, SetMinMarginTopLeft, doc="See `GetMinMarginTopLeft` and `SetMinMarginTopLeft`"); + %property(PaperId, GetPaperId, SetPaperId, doc="See `GetPaperId` and `SetPaperId`"); + %property(PaperSize, GetPaperSize, SetPaperSize, doc="See `GetPaperSize` and `SetPaperSize`"); + %property(PrintData, GetPrintData, SetPrintData, doc="See `GetPrintData` and `SetPrintData`"); + }; @@ -230,6 +261,10 @@ public: int ShowModal(); %pythoncode { def Destroy(self): pass } + + %property(PageSetupData, GetPageSetupData, doc="See `GetPageSetupData`"); + %property(PageSetupDialogData, GetPageSetupDialogData, doc="See `GetPageSetupDialogData`"); + }; //--------------------------------------------------------------------------- @@ -286,6 +321,21 @@ public: void SetPrintData(const wxPrintData& printData); %pythoncode { def __nonzero__(self): return self.Ok() } + + %property(AllPages, GetAllPages, SetAllPages, doc="See `GetAllPages` and `SetAllPages`"); + %property(Collate, GetCollate, SetCollate, doc="See `GetCollate` and `SetCollate`"); +// %property(EnableHelp, GetEnableHelp, doc="See `GetEnableHelp`"); +// %property(EnablePageNumbers, GetEnablePageNumbers, doc="See `GetEnablePageNumbers`"); +// %property(EnablePrintToFile, GetEnablePrintToFile, doc="See `GetEnablePrintToFile`"); +// %property(EnableSelection, GetEnableSelection, doc="See `GetEnableSelection`"); + %property(FromPage, GetFromPage, SetFromPage, doc="See `GetFromPage` and `SetFromPage`"); + %property(MaxPage, GetMaxPage, SetMaxPage, doc="See `GetMaxPage` and `SetMaxPage`"); + %property(MinPage, GetMinPage, SetMinPage, doc="See `GetMinPage` and `SetMinPage`"); + %property(NoCopies, GetNoCopies, SetNoCopies, doc="See `GetNoCopies` and `SetNoCopies`"); + %property(PrintData, GetPrintData, SetPrintData, doc="See `GetPrintData` and `SetPrintData`"); + %property(PrintToFile, GetPrintToFile, SetPrintToFile, doc="See `GetPrintToFile` and `SetPrintToFile`"); + %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`"); + %property(ToPage, GetToPage, SetToPage, doc="See `GetToPage` and `SetToPage`"); }; @@ -314,6 +364,10 @@ public: virtual wxDC *GetPrintDC(); %pythoncode { def Destroy(self): pass } + + %property(PrintDC, GetPrintDC, doc="See `GetPrintDC`"); + %property(PrintData, GetPrintData, doc="See `GetPrintData`"); + %property(PrintDialogData, GetPrintDialogData, doc="See `GetPrintDialogData`"); }; @@ -348,6 +402,8 @@ public: bool GetAbort(); static wxPrinterError GetLastError(); + %property(Abort, GetAbort, doc="See `GetAbort`"); + %property(PrintDialogData, GetPrintDialogData, doc="See `GetPrintDialogData`"); }; @@ -476,6 +532,14 @@ public: %MAKE_BASE_FUNC(Printout, OnEndPrinting); %MAKE_BASE_FUNC(Printout, OnPreparePrinting); %MAKE_BASE_FUNC(Printout, GetPageInfo); + + + %property(DC, GetDC, SetDC, doc="See `GetDC` and `SetDC`"); + %property(PPIPrinter, GetPPIPrinter, SetPPIPrinter, doc="See `GetPPIPrinter` and `SetPPIPrinter`"); + %property(PPIScreen, GetPPIScreen, SetPPIScreen, doc="See `GetPPIScreen` and `SetPPIScreen`"); + %property(PageSizeMM, GetPageSizeMM, SetPageSizeMM, doc="See `GetPageSizeMM` and `SetPageSizeMM`"); + %property(PageSizePixels, GetPageSizePixels, SetPageSizePixels, doc="See `GetPageSizePixels` and `SetPageSizePixels`"); + %property(Title, GetTitle, doc="See `GetTitle`"); }; //--------------------------------------------------------------------------- @@ -518,6 +582,8 @@ public: void CreateCanvas(); wxPreviewControlBar* GetControlBar() const; + + %property(ControlBar, GetControlBar, doc="See `GetControlBar`"); }; @@ -566,6 +632,9 @@ public: void OnFirst(); void OnLast(); void OnGoto(); + + %property(PrintPreview, GetPrintPreview, doc="See `GetPrintPreview`"); + %property(ZoomControl, GetZoomControl, SetZoomControl, doc="See `GetZoomControl` and `SetZoomControl`"); }; @@ -630,6 +699,16 @@ public: virtual void DetermineScaling(); %pythoncode { def __nonzero__(self): return self.Ok() } + + %property(Canvas, GetCanvas, SetCanvas, doc="See `GetCanvas` and `SetCanvas`"); + %property(CurrentPage, GetCurrentPage, SetCurrentPage, doc="See `GetCurrentPage` and `SetCurrentPage`"); + %property(Frame, GetFrame, SetFrame, doc="See `GetFrame` and `SetFrame`"); + %property(MaxPage, GetMaxPage, doc="See `GetMaxPage`"); + %property(MinPage, GetMinPage, doc="See `GetMinPage`"); + %property(PrintDialogData, GetPrintDialogData, doc="See `GetPrintDialogData`"); + %property(Printout, GetPrintout, SetPrintout, doc="See `GetPrintout` and `SetPrintout`"); + %property(PrintoutForPrinting, GetPrintoutForPrinting, doc="See `GetPrintoutForPrinting`"); + %property(Zoom, GetZoom, SetZoom, doc="See `GetZoom` and `SetZoom`"); }; diff --git a/wxPython/src/_process.i b/wxPython/src/_process.i index b256ae7114..1156a96784 100644 --- a/wxPython/src/_process.i +++ b/wxPython/src/_process.i @@ -130,6 +130,14 @@ public: // return True if any input is available on the child process stdout/err bool IsInputAvailable() const; bool IsErrorAvailable() const; + + %property(ErrorStream, GetErrorStream, doc="See `GetErrorStream`"); + %property(InputStream, GetInputStream, doc="See `GetInputStream`"); + %property(OutputStream, GetOutputStream, doc="See `GetOutputStream`"); + + %property(InputOpened, IsInputOpened); + %property(InputAvailable, IsInputAvailable); + %property(ErrorAvailable, IsErrorAvailable); }; //--------------------------------------------------------------------------- @@ -141,6 +149,9 @@ public: int GetPid(); int GetExitCode(); int m_pid, m_exitcode; + + %property(ExitCode, GetExitCode, doc="See `GetExitCode`"); + %property(Pid, GetPid, doc="See `GetPid`"); }; diff --git a/wxPython/src/_pseudodc.i b/wxPython/src/_pseudodc.i index bd40ea6768..d027df3ed0 100644 --- a/wxPython/src/_pseudodc.i +++ b/wxPython/src/_pseudodc.i @@ -578,4 +578,8 @@ a logical operation. wx.INVERT is commonly used for drawing rubber bands or moving outlines, since drawing twice reverts to the original colour. ", ""); + + + %property(IdBounds, GetIdBounds, SetIdBounds, doc="See `GetIdBounds` and `SetIdBounds`"); + %property(Len, GetLen, doc="See `GetLen`"); }; diff --git a/wxPython/src/_radio.i b/wxPython/src/_radio.i index a04aa32bdf..0294f6cf85 100644 --- a/wxPython/src/_radio.i +++ b/wxPython/src/_radio.i @@ -99,6 +99,12 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(ColumnCount, GetColumnCount, doc="See `GetColumnCount`"); + %property(Count, GetCount, doc="See `GetCount`"); + %property(RowCount, GetRowCount, doc="See `GetRowCount`"); + %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`"); + %property(StringSelection, GetStringSelection, SetStringSelection, doc="See `GetStringSelection` and `SetStringSelection`"); }; @@ -135,6 +141,8 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`"); }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_region.i b/wxPython/src/_region.i index e7d68c7351..25fc06628b 100644 --- a/wxPython/src/_region.i +++ b/wxPython/src/_region.i @@ -96,6 +96,9 @@ public: %Rename(UnionBitmapColour, bool, Union(const wxBitmap& bmp, const wxColour& transColour, int tolerance = 0)); + + + %property(Box, GetBox, doc="See `GetBox`"); }; @@ -126,6 +129,14 @@ public: return self->operator bool(); } }; + + %property(H, GetH, doc="See `GetH`"); + %property(Height, GetHeight, doc="See `GetHeight`"); + %property(Rect, GetRect, doc="See `GetRect`"); + %property(W, GetW, doc="See `GetW`"); + %property(Width, GetWidth, doc="See `GetWidth`"); + %property(X, GetX, doc="See `GetX`"); + %property(Y, GetY, doc="See `GetY`"); }; diff --git a/wxPython/src/_renderer.i b/wxPython/src/_renderer.i index 3ee0740e0f..7c0754a968 100644 --- a/wxPython/src/_renderer.i +++ b/wxPython/src/_renderer.i @@ -274,7 +274,10 @@ renderer. Returns the previous renderer used with Set or None.", ""); virtual wxRendererVersion , GetVersion() const, "Returns the version of the renderer. Will be used for ensuring compatibility of dynamically loaded renderers.", ""); + + %property(SplitterParams, GetSplitterParams, doc="See `GetSplitterParams`"); + %property(Version, GetVersion, doc="See `GetVersion`"); }; diff --git a/wxPython/src/_sashwin.i b/wxPython/src/_sashwin.i index 7c8f4418cc..a38c88ea68 100644 --- a/wxPython/src/_sashwin.i +++ b/wxPython/src/_sashwin.i @@ -112,6 +112,13 @@ public: // Resizes subwindows void SizeWindows(); + + %property(DefaultBorderSize, GetDefaultBorderSize, SetDefaultBorderSize, doc="See `GetDefaultBorderSize` and `SetDefaultBorderSize`"); + %property(ExtraBorderSize, GetExtraBorderSize, SetExtraBorderSize, doc="See `GetExtraBorderSize` and `SetExtraBorderSize`"); + %property(MaximumSizeX, GetMaximumSizeX, SetMaximumSizeX, doc="See `GetMaximumSizeX` and `SetMaximumSizeX`"); + %property(MaximumSizeY, GetMaximumSizeY, SetMaximumSizeY, doc="See `GetMaximumSizeY` and `SetMaximumSizeY`"); + %property(MinimumSizeX, GetMinimumSizeX, SetMinimumSizeX, doc="See `GetMinimumSizeX` and `SetMinimumSizeX`"); + %property(MinimumSizeY, GetMinimumSizeY, SetMinimumSizeY, doc="See `GetMinimumSizeY` and `SetMinimumSizeY`"); }; @@ -138,6 +145,10 @@ public: //// dragging the top below the bottom) void SetDragStatus(wxSashDragStatus status); wxSashDragStatus GetDragStatus() const; + + %property(DragRect, GetDragRect, SetDragRect, doc="See `GetDragRect` and `SetDragRect`"); + %property(DragStatus, GetDragStatus, SetDragStatus, doc="See `GetDragStatus` and `SetDragStatus`"); + %property(Edge, GetEdge, SetEdge, doc="See `GetEdge` and `SetEdge`"); }; @@ -207,6 +218,12 @@ public: void SetAlignment(wxLayoutAlignment align); wxLayoutAlignment GetAlignment() const; + + %property(Alignment, GetAlignment, SetAlignment, doc="See `GetAlignment` and `SetAlignment`"); + %property(Flags, GetFlags, SetFlags, doc="See `GetFlags` and `SetFlags`"); + %property(Orientation, GetOrientation, SetOrientation, doc="See `GetOrientation` and `SetOrientation`"); + %property(RequestedLength, GetRequestedLength, SetRequestedLength, doc="See `GetRequestedLength` and `SetRequestedLength`"); + %property(Size, GetSize, SetSize, doc="See `GetSize` and `SetSize`"); }; @@ -226,7 +243,6 @@ public: %property(Flags, GetFlags, SetFlags, doc="See `GetFlags` and `SetFlags`"); %property(Rect, GetRect, SetRect, doc="See `GetRect` and `SetRect`"); - }; @@ -266,6 +282,9 @@ public: void SetAlignment(wxLayoutAlignment alignment); void SetDefaultSize(const wxSize& size); void SetOrientation(wxLayoutOrientation orientation); + + %property(Alignment, GetAlignment, SetAlignment, doc="See `GetAlignment` and `SetAlignment`"); + %property(Orientation, GetOrientation, SetOrientation, doc="See `GetOrientation` and `SetOrientation`"); }; diff --git a/wxPython/src/_scrolbar.i b/wxPython/src/_scrolbar.i index 2bcc4eddb5..a02af38c63 100644 --- a/wxPython/src/_scrolbar.i +++ b/wxPython/src/_scrolbar.i @@ -61,6 +61,11 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(PageSize, GetPageSize, doc="See `GetPageSize`"); + %property(Range, GetRange, doc="See `GetRange`"); + %property(ThumbPosition, GetThumbPosition, SetThumbPosition, doc="See `GetThumbPosition` and `SetThumbPosition`"); + %property(ThumbSize, GetThumbSize, doc="See `GetThumbSize`"); }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_sizers.i b/wxPython/src/_sizers.i index d69a2c20a4..1108fcbb18 100644 --- a/wxPython/src/_sizers.i +++ b/wxPython/src/_sizers.i @@ -283,6 +283,20 @@ isn't any.", ""); self->SetUserData(data); } } + + %property(Border, GetBorder, SetBorder, doc="See `GetBorder` and `SetBorder`"); + %property(Flag, GetFlag, SetFlag, doc="See `GetFlag` and `SetFlag`"); + %property(MinSize, GetMinSize, doc="See `GetMinSize`"); + %property(MinSizeWithBorder, GetMinSizeWithBorder, doc="See `GetMinSizeWithBorder`"); + %property(Position, GetPosition, doc="See `GetPosition`"); + %property(Proportion, GetProportion, SetProportion, doc="See `GetProportion` and `SetProportion`"); + %property(Ratio, GetRatio, SetRatio, doc="See `GetRatio` and `SetRatio`"); + %property(Rect, GetRect, doc="See `GetRect`"); + %property(Size, GetSize, doc="See `GetSize`"); + %property(Sizer, GetSizer, SetSizer, doc="See `GetSizer` and `SetSizer`"); + %property(Spacer, GetSpacer, SetSpacer, doc="See `GetSpacer` and `SetSpacer`"); + %property(UserData, GetUserData, SetUserData, doc="See `GetUserData` and `SetUserData`"); + %property(Window, GetWindow, SetWindow, doc="See `GetWindow` and `SetWindow`"); }; @@ -1052,6 +1066,11 @@ the item.", ""); void , ShowItems(bool show), "Recursively call `wx.SizerItem.Show` on all sizer items.", ""); + %property(Children, GetChildren, doc="See `GetChildren`"); + %property(ContainingWindow, GetContainingWindow, SetContainingWindow, doc="See `GetContainingWindow` and `SetContainingWindow`"); + %property(MinSize, GetMinSize, SetMinSize, doc="See `GetMinSize` and `SetMinSize`"); + %property(Position, GetPosition, doc="See `GetPosition`"); + %property(Size, GetSize, doc="See `GetSize`"); }; @@ -1194,6 +1213,7 @@ public: wxStaticBox *, GetStaticBox(), "Returns the static box associated with this sizer.", ""); + %property(StaticBox, GetStaticBox, doc="See `GetStaticBox`"); }; //--------------------------------------------------------------------------- @@ -1473,6 +1493,12 @@ specifc manner.", ""); wxButton* GetNegativeButton() const; wxButton* GetCancelButton() const; wxButton* GetHelpButton() const; + + %property(AffirmativeButton, GetAffirmativeButton, SetAffirmativeButton, doc="See `GetAffirmativeButton` and `SetAffirmativeButton`"); + %property(ApplyButton, GetApplyButton, doc="See `GetApplyButton`"); + %property(CancelButton, GetCancelButton, SetCancelButton, doc="See `GetCancelButton` and `SetCancelButton`"); + %property(HelpButton, GetHelpButton, doc="See `GetHelpButton`"); + %property(NegativeButton, GetNegativeButton, SetNegativeButton, doc="See `GetNegativeButton` and `SetNegativeButton`"); }; diff --git a/wxPython/src/_slider.i b/wxPython/src/_slider.i index 366f977114..544af4c90f 100644 --- a/wxPython/src/_slider.i +++ b/wxPython/src/_slider.i @@ -104,6 +104,16 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(LineSize, GetLineSize, SetLineSize, doc="See `GetLineSize` and `SetLineSize`"); + %property(Max, GetMax, SetMax, doc="See `GetMax` and `SetMax`"); + %property(Min, GetMin, SetMin, doc="See `GetMin` and `SetMin`"); + %property(PageSize, GetPageSize, SetPageSize, doc="See `GetPageSize` and `SetPageSize`"); + %property(SelEnd, GetSelEnd, doc="See `GetSelEnd`"); + %property(SelStart, GetSelStart, doc="See `GetSelStart`"); + %property(ThumbLength, GetThumbLength, SetThumbLength, doc="See `GetThumbLength` and `SetThumbLength`"); + %property(TickFreq, GetTickFreq, SetTickFreq, doc="See `GetTickFreq` and `SetTickFreq`"); + %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`"); }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_spin.i b/wxPython/src/_spin.i index dd8283985c..fc01e4fa48 100644 --- a/wxPython/src/_spin.i +++ b/wxPython/src/_spin.i @@ -72,6 +72,10 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(Max, GetMax, SetMax, doc="See `GetMax` and `SetMax`"); + %property(Min, GetMin, SetMin, doc="See `GetMin` and `SetMin`"); + %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`"); }; @@ -119,6 +123,10 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(Max, GetMax, doc="See `GetMax`"); + %property(Min, GetMin, doc="See `GetMin`"); + %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`"); }; @@ -132,6 +140,8 @@ public: // get the current value of the control int GetPosition() const; void SetPosition(int pos); + + %property(Position, GetPosition, SetPosition, doc="See `GetPosition` and `SetPosition`"); }; diff --git a/wxPython/src/_splitter.i b/wxPython/src/_splitter.i index 824ed58205..5628c60404 100644 --- a/wxPython/src/_splitter.i +++ b/wxPython/src/_splitter.i @@ -364,10 +364,22 @@ the window may be unsplit even if minimum size is non-zero.", ""); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(BorderSize, GetBorderSize, SetBorderSize, doc="See `GetBorderSize` and `SetBorderSize`"); + %property(MinimumPaneSize, GetMinimumPaneSize, SetMinimumPaneSize, doc="See `GetMinimumPaneSize` and `SetMinimumPaneSize`"); + %property(NeedUpdating, GetNeedUpdating, SetNeedUpdating, doc="See `GetNeedUpdating` and `SetNeedUpdating`"); + %property(SashGravity, GetSashGravity, SetSashGravity, doc="See `GetSashGravity` and `SetSashGravity`"); + %property(SashPosition, GetSashPosition, SetSashPosition, doc="See `GetSashPosition` and `SetSashPosition`"); + %property(SashSize, GetSashSize, SetSashSize, doc="See `GetSashSize` and `SetSashSize`"); + %property(SplitMode, GetSplitMode, SetSplitMode, doc="See `GetSplitMode` and `SetSplitMode`"); + %property(Window1, GetWindow1, doc="See `GetWindow1`"); + %property(Window2, GetWindow2, doc="See `GetWindow2`"); }; + + DocStr(wxSplitterEvent, "This class represents the events generated by a splitter control.", ""); @@ -409,6 +421,10 @@ EVT_SPLITTER_DCLICK event.", ""); "Returns the y coordinate of the double-click point in a EVT_SPLITTER_DCLICK event.", ""); + %property(SashPosition, GetSashPosition, SetSashPosition, doc="See `GetSashPosition` and `SetSashPosition`"); + %property(WindowBeingRemoved, GetWindowBeingRemoved, doc="See `GetWindowBeingRemoved`"); + %property(X, GetX, doc="See `GetX`"); + %property(Y, GetY, doc="See `GetY`"); }; diff --git a/wxPython/src/_statusbar.i b/wxPython/src/_statusbar.i index f5ddb06411..8cc9caab24 100644 --- a/wxPython/src/_statusbar.i +++ b/wxPython/src/_statusbar.i @@ -110,7 +110,13 @@ public: for i in range(len(items)): self.SetStatusText(items[i], i) } - %property(Fields, GetFields, SetFields); + + %property(BorderX, GetBorderX, doc="See `GetBorderX`"); + %property(BorderY, GetBorderY, doc="See `GetBorderY`"); + %property(FieldRect, GetFieldRect, doc="See `GetFieldRect`"); + %property(Fields, GetFields, SetFields, doc="See `GetFields` and `SetFields`"); + %property(FieldsCount, GetFieldsCount, SetFieldsCount, doc="See `GetFieldsCount` and `SetFieldsCount`"); + %property(StatusText, GetStatusText, SetStatusText, doc="See `GetStatusText` and `SetStatusText`"); }; diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i index e3d24ec192..bc5bd903df 100644 --- a/wxPython/src/_toplvl.i +++ b/wxPython/src/_toplvl.i @@ -471,6 +471,8 @@ public: void SetBitmap(const wxBitmap& bitmap); wxBitmap& GetBitmap(); + + %property(Bitmap, GetBitmap, SetBitmap, doc="See `GetBitmap` and `SetBitmap`"); }; @@ -492,6 +494,10 @@ public: long GetSplashStyle() const; wxSplashScreenWindow* GetSplashWindow() const; int GetTimeout() const; + + %property(SplashStyle, GetSplashStyle, doc="See `GetSplashStyle`"); + %property(SplashWindow, GetSplashWindow, doc="See `GetSplashWindow`"); + %property(Timeout, GetTimeout, doc="See `GetTimeout`"); };