From 0eae5d09992c634488c5be14d5a378d6e1dedb71 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 2 Sep 2006 19:46:44 +0000 Subject: [PATCH] Start adding some properties for getter/setter methods git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/_accel.i | 5 ++++ wxPython/src/_bitmap.i | 11 +++++++ wxPython/src/_brush.i | 5 ++++ wxPython/src/_button.i | 8 ++++++ wxPython/src/_checkbox.i | 4 +++ wxPython/src/_choice.i | 4 +++ wxPython/src/_clipbrd.i | 2 ++ wxPython/src/_cmndlgs.i | 9 ++++++ wxPython/src/_colour.i | 4 +++ wxPython/src/_combobox.i | 7 +++++ wxPython/src/_config.i | 11 +++++++ wxPython/src/_control.i | 5 ++++ wxPython/src/_dataobj.i | 15 ++++++++++ wxPython/src/_datectrl.i | 3 ++ wxPython/src/_datetime.i | 32 +++++++++++++++++++++ wxPython/src/_dc.i | 29 +++++++++++++++++++ wxPython/src/_defs.i | 4 +-- wxPython/src/_display.i | 7 +++++ wxPython/src/_dnd.i | 6 ++++ wxPython/src/_dragimg.i | 2 ++ wxPython/src/_event.i | 17 +++++++++++ wxPython/src/_listbox.i | 2 ++ wxPython/src/_misc.i | 5 ++++ wxPython/src/_notebook.i | 20 +++++++++++++ wxPython/src/_picker.i | 7 +++++ wxPython/src/_sashwin.i | 4 +++ wxPython/src/_sizers.i | 1 + wxPython/src/_toplvl.i | 4 +++ wxPython/src/_window.i | 62 +++++++++++++++++++++++++++++++++++++++- 29 files changed, 291 insertions(+), 4 deletions(-) diff --git a/wxPython/src/_accel.i b/wxPython/src/_accel.i index f9b6c2f12a..cc39208d4b 100644 --- a/wxPython/src/_accel.i +++ b/wxPython/src/_accel.i @@ -81,6 +81,11 @@ public: DocDeclStr( int , GetCommand(), "Get the AcceleratorEntry's command ID.", ""); + + %property(Command, GetCommand, doc="See `GetCommand`"); + %property(Flags, GetFlags, doc="See `GetFlags`"); + %property(KeyCode, GetKeyCode, doc="See `GetKeyCode`"); + }; diff --git a/wxPython/src/_bitmap.i b/wxPython/src/_bitmap.i index 86edf04d2a..b32898110f 100644 --- a/wxPython/src/_bitmap.i +++ b/wxPython/src/_bitmap.i @@ -312,6 +312,15 @@ the ``type`` parameter.", ""); bool __eq__(const wxBitmap* other) { return other ? (*self == *other) : false; } bool __ne__(const wxBitmap* other) { return other ? (*self != *other) : true; } } + + %property(Depth, GetDepth, SetDepth, doc="See `GetDepth` and `SetDepth`"); + %property(Height, GetHeight, SetHeight, doc="See `GetHeight` and `SetHeight`"); + %property(Mask, GetMask, SetMask, doc="See `GetMask` and `SetMask`"); + %property(Palette, GetPalette, doc="See `GetPalette`"); + %property(Size, GetSize, SetSize, doc="See `GetSize` and `SetSize`"); + %property(SubBitmap, GetSubBitmap, doc="See `GetSubBitmap`"); + %property(Width, GetWidth, SetWidth, doc="See `GetWidth` and `SetWidth`"); + }; @@ -588,6 +597,8 @@ public: pixels.nextPixel() pixels.MoveTo(self, 0, y) } + + %property(Pixels, GetPixels, doc="See `GetPixels`"); }; diff --git a/wxPython/src/_brush.i b/wxPython/src/_brush.i index 99fbe50fb9..621faac4a0 100644 --- a/wxPython/src/_brush.i +++ b/wxPython/src/_brush.i @@ -112,6 +112,11 @@ uninitialised bitmap (`wx.Bitmap.Ok` returns False).", ""); #endif %pythoncode { def __nonzero__(self): return self.Ok() } + + %property(Colour, GetColour, SetColour, doc="See `GetColour` and `SetColour`"); + %property(Stipple, GetStipple, SetStipple, doc="See `GetStipple` and `SetStipple`"); + %property(Style, GetStyle, SetStyle, doc="See `GetStyle` and `SetStyle`"); + }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_button.i b/wxPython/src/_button.i index 6cd296576c..d29dd2c2a3 100644 --- a/wxPython/src/_button.i +++ b/wxPython/src/_button.i @@ -306,6 +306,14 @@ supported in wxMSW.", ""); void SetMargins(int x, int y); int GetMarginX() const; int GetMarginY() const; + + %property(BitmapDisabled, GetBitmapDisabled, SetBitmapDisabled, doc="See `GetBitmapDisabled` and `SetBitmapDisabled`"); + %property(BitmapFocus, GetBitmapFocus, SetBitmapFocus, doc="See `GetBitmapFocus` and `SetBitmapFocus`"); + %property(BitmapHover, GetBitmapHover, SetBitmapHover, doc="See `GetBitmapHover` and `SetBitmapHover`"); + %property(BitmapLabel, GetBitmapLabel, SetBitmapLabel, doc="See `GetBitmapLabel` and `SetBitmapLabel`"); + %property(BitmapSelected, GetBitmapSelected, SetBitmapSelected, doc="See `GetBitmapSelected` and `SetBitmapSelected`"); + %property(MarginX, GetMarginX, doc="See `GetMarginX`"); + %property(MarginY, GetMarginY, doc="See `GetMarginY`"); }; diff --git a/wxPython/src/_checkbox.i b/wxPython/src/_checkbox.i index 1b553a151b..2e6287c00a 100644 --- a/wxPython/src/_checkbox.i +++ b/wxPython/src/_checkbox.i @@ -154,6 +154,10 @@ state.", ""); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(ThreeStateValue, Get3StateValue, Set3StateValue, doc="See `Get3StateValue` and `Set3StateValue`"); + %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`"); + }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_choice.i b/wxPython/src/_choice.i index 365dda2c5a..b642a6b784 100644 --- a/wxPython/src/_choice.i +++ b/wxPython/src/_choice.i @@ -86,6 +86,10 @@ function.", ""); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + + %property(CurrentSelection, GetCurrentSelection, doc="See `GetCurrentSelection`"); + }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_clipbrd.i b/wxPython/src/_clipbrd.i index d3ca994dbc..b11ac31e96 100644 --- a/wxPython/src/_clipbrd.i +++ b/wxPython/src/_clipbrd.i @@ -122,6 +122,8 @@ normal clipboard, if primary is True.", ""); DocDeclStr( static wxClipboard *, Get(), "Returns global instance (wxTheClipboard) of the object.", ""); + + %property(Data, GetData, SetData, doc="See `GetData` and `SetData`"); }; diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i index 255839ecd3..daf8fa19c2 100644 --- a/wxPython/src/_cmndlgs.i +++ b/wxPython/src/_cmndlgs.i @@ -72,6 +72,11 @@ black.", ""); "Sets the i'th custom colour for the colour dialog. i should be an integer between 0 and 15. The default custom colours are all invalid colours.", ""); + + %property(ChooseFull, GetChooseFull, SetChooseFull, doc="See `GetChooseFull` and `SetChooseFull`"); + %property(Colour, GetColour, SetColour, doc="See `GetColour` and `SetColour`"); + %property(CustomColour, GetCustomColour, SetCustomColour, doc="See `GetCustomColour` and `SetCustomColour`"); + }; @@ -95,6 +100,8 @@ instance.", ""); DocDeclStr( wxColourData& , GetColourData(), "Returns a reference to the `wx.ColourData` used by the dialog.", ""); + + %property(ColourData, GetColourData, doc="See `GetColourData`"); }; @@ -175,6 +182,8 @@ public: void , SetPath(const wxString& path), "Sets the default path.", ""); + %property(Message, GetMessage, SetMessage, doc="See `GetMessage` and `SetMessage`"); + %property(Path, GetPath, SetPath, doc="See `GetPath` and `SetPath`"); }; diff --git a/wxPython/src/_colour.i b/wxPython/src/_colour.i index 61ba3726fd..37f638b23c 100644 --- a/wxPython/src/_colour.i +++ b/wxPython/src/_colour.i @@ -202,6 +202,10 @@ is returned if the pixel is invalid (on X, unallocated).", ""); __safe_for_unpickling__ = True def __reduce__(self): return (Colour, self.Get(True)) } + + %property(Pixel, GetPixel, doc="See `GetPixel`"); + %property(RGB, GetRGB, SetRGB, doc="See `GetRGB` and `SetRGB`"); + }; %pythoncode { diff --git a/wxPython/src/_combobox.i b/wxPython/src/_combobox.i index d842914b93..ad99e2eb26 100644 --- a/wxPython/src/_combobox.i +++ b/wxPython/src/_combobox.i @@ -246,6 +246,13 @@ redone. Only available on Windows.", ""); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(CurrentSelection, GetCurrentSelection, doc="See `GetCurrentSelection`"); + %property(InsertionPoint, GetInsertionPoint, SetInsertionPoint, doc="See `GetInsertionPoint` and `SetInsertionPoint`"); + %property(LastPosition, GetLastPosition, doc="See `GetLastPosition`"); + %property(Mark, GetMark, SetMark, doc="See `GetMark` and `SetMark`"); + %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`"); + }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_config.i b/wxPython/src/_config.i index 1c8b100ff3..f3f4d306a8 100644 --- a/wxPython/src/_config.i +++ b/wxPython/src/_config.i @@ -371,6 +371,17 @@ time)", ""); long , GetStyle() const, "", ""); + %property(AppName, GetAppName, SetAppName, doc="See `GetAppName` and `SetAppName`"); + %property(EntryType, GetEntryType, doc="See `GetEntryType`"); + %property(FirstEntry, GetFirstEntry, doc="See `GetFirstEntry`"); + %property(FirstGroup, GetFirstGroup, doc="See `GetFirstGroup`"); + %property(NextEntry, GetNextEntry, doc="See `GetNextEntry`"); + %property(NextGroup, GetNextGroup, doc="See `GetNextGroup`"); + %property(NumberOfEntries, GetNumberOfEntries, doc="See `GetNumberOfEntries`"); + %property(NumberOfGroups, GetNumberOfGroups, doc="See `GetNumberOfGroups`"); + %property(Path, GetPath, SetPath, doc="See `GetPath` and `SetPath`"); + %property(Style, GetStyle, SetStyle, doc="See `GetStyle` and `SetStyle`"); + %property(VendorName, GetVendorName, SetVendorName, doc="See `GetVendorName` and `SetVendorName`"); }; diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i index 8e53cee9db..9ecfec7c4f 100644 --- a/wxPython/src/_control.i +++ b/wxPython/src/_control.i @@ -115,6 +115,11 @@ __init__ as a plain old wx.Control is not very useful.", ""); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(Alignment, GetAlignment, doc="See `GetAlignment`"); + %property(Label, GetLabel, doc="See `GetLabel`"); + %property(LabelText, GetLabelText, doc="See `GetLabelText`"); + }; diff --git a/wxPython/src/_dataobj.i b/wxPython/src/_dataobj.i index 3d1608edcd..e4a7cc1c04 100644 --- a/wxPython/src/_dataobj.i +++ b/wxPython/src/_dataobj.i @@ -122,6 +122,9 @@ standard format).", ""); DocDeclStr( void , SetId(const wxString& format), "Sets the format to be the custom format identified by the given name.", ""); + + %property(Id, GetId, SetId, doc="See `GetId` and `SetId`"); + %property(Type, GetType, SetType, doc="See `GetType` and `SetType`"); }; @@ -310,6 +313,11 @@ in the given direction.", ""); } } + %property(AllFormats, GetAllFormats, doc="See `GetAllFormats`"); + %property(DataHere, GetDataHere, doc="See `GetDataHere`"); + %property(DataSize, GetDataSize, doc="See `GetDataSize`"); + %property(FormatCount, GetFormatCount, doc="See `GetFormatCount`"); + %property(PreferredFormat, GetPreferredFormat, doc="See `GetPreferredFormat`"); }; @@ -397,6 +405,7 @@ derived class if the object supports setting its data. } } + %property(Format, GetFormat, SetFormat, doc="See `GetFormat` and `SetFormat`"); }; @@ -532,6 +541,7 @@ format of the data object within the composite that recieved data from the clipboard or the DnD operation. You can use this method to find out what kind of data object was recieved.", ""); + %property(ReceivedFormat, GetReceivedFormat, doc="See `GetReceivedFormat`"); }; //--------------------------------------------------------------------------- @@ -649,6 +659,7 @@ internals. Use this method to get data in bitmap form from the when the data object receives data. Usually there will be no reason to override this function.", ""); + %property(Bitmap, GetBitmap, SetBitmap, doc="See `GetBitmap` and `SetBitmap`"); }; @@ -799,6 +810,10 @@ public: return obj; } } + + %property(Data, GetData, SetData, doc="See `GetData` and `SetData`"); + %property(Size, GetSize, doc="See `GetSize`"); + }; diff --git a/wxPython/src/_datectrl.i b/wxPython/src/_datectrl.i index fa6ded1e2b..fbd21bd7c9 100644 --- a/wxPython/src/_datectrl.i +++ b/wxPython/src/_datectrl.i @@ -169,6 +169,9 @@ If there is no range or there is no upper limit, then the } } + %property(LowerLimit, GetLowerLimit, doc="See `GetLowerLimit`"); + %property(UpperLimit, GetUpperLimit, doc="See `GetUpperLimit`"); + %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`"); }; diff --git a/wxPython/src/_datetime.i b/wxPython/src/_datetime.i index 322c03a7eb..78b03d2e45 100644 --- a/wxPython/src/_datetime.i +++ b/wxPython/src/_datetime.i @@ -883,6 +883,32 @@ public: else: return "INVALID DateTime" } + + %property(Day, GetDay, SetDay, doc="See `GetDay` and `SetDay`"); + %property(DayOfYear, GetDayOfYear, doc="See `GetDayOfYear`"); + %property(Hour, GetHour, SetHour, doc="See `GetHour` and `SetHour`"); + %property(JDN, GetJDN, SetJDN, doc="See `GetJDN` and `SetJDN`"); + %property(JulianDayNumber, GetJulianDayNumber, doc="See `GetJulianDayNumber`"); + %property(LastMonthDay, GetLastMonthDay, doc="See `GetLastMonthDay`"); + %property(LastWeekDay, GetLastWeekDay, doc="See `GetLastWeekDay`"); + %property(MJD, GetMJD, doc="See `GetMJD`"); + %property(Millisecond, GetMillisecond, SetMillisecond, doc="See `GetMillisecond` and `SetMillisecond`"); + %property(Minute, GetMinute, SetMinute, doc="See `GetMinute` and `SetMinute`"); + %property(ModifiedJulianDayNumber, GetModifiedJulianDayNumber, doc="See `GetModifiedJulianDayNumber`"); + %property(Month, GetMonth, SetMonth, doc="See `GetMonth` and `SetMonth`"); + %property(NextWeekDay, GetNextWeekDay, doc="See `GetNextWeekDay`"); + %property(PrevWeekDay, GetPrevWeekDay, doc="See `GetPrevWeekDay`"); + %property(RataDie, GetRataDie, doc="See `GetRataDie`"); + %property(Second, GetSecond, SetSecond, doc="See `GetSecond` and `SetSecond`"); + %property(Ticks, GetTicks, doc="See `GetTicks`"); + %property(Week, GetWeek, doc="See `GetWeek`"); + %property(WeekDay, GetWeekDay, doc="See `GetWeekDay`"); + %property(WeekDayInSameWeek, GetWeekDayInSameWeek, doc="See `GetWeekDayInSameWeek`"); + %property(WeekOfMonth, GetWeekOfMonth, doc="See `GetWeekOfMonth`"); + %property(WeekOfYear, GetWeekOfYear, doc="See `GetWeekOfYear`"); + %property(Year, GetYear, SetYear, doc="See `GetYear` and `SetYear`"); + %property(YearDay, GetYearDay, doc="See `GetYearDay`"); + }; //--------------------------------------------------------------------------- @@ -1162,6 +1188,12 @@ public: bool __eq__(const wxDateSpan* other) { return other ? (*self == *other) : false; } bool __ne__(const wxDateSpan* other) { return other ? (*self != *other) : true; } } + + %property(Days, GetDays, SetDays, doc="See `GetDays` and `SetDays`"); + %property(Months, GetMonths, SetMonths, doc="See `GetMonths` and `SetMonths`"); + %property(TotalDays, GetTotalDays, doc="See `GetTotalDays`"); + %property(Weeks, GetWeeks, SetWeeks, doc="See `GetWeeks` and `SetWeeks`"); + %property(Years, GetYears, SetYears, doc="See `GetYears` and `SetYears`"); }; diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i index c41e802be7..ae2a5ad49e 100644 --- a/wxPython/src/_dc.i +++ b/wxPython/src/_dc.i @@ -1171,6 +1171,35 @@ box doesn't contain anything.", ""); return self._DrawTextList(textList, coords, foregrounds, backgrounds) } + %property(Background, GetBackground, SetBackground, doc="See `GetBackground` and `SetBackground`"); + %property(BackgroundMode, GetBackgroundMode, SetBackgroundMode, doc="See `GetBackgroundMode` and `SetBackgroundMode`"); + %property(BoundingBox, GetBoundingBox, doc="See `GetBoundingBox`"); + %property(Brush, GetBrush, SetBrush, doc="See `GetBrush` and `SetBrush`"); + %property(CharHeight, GetCharHeight, doc="See `GetCharHeight`"); + %property(CharWidth, GetCharWidth, doc="See `GetCharWidth`"); + %property(ClippingBox, GetClippingBox, doc="See `GetClippingBox`"); + %property(ClippingRect, GetClippingRect, SetClippingRect, doc="See `GetClippingRect` and `SetClippingRect`"); + %property(Depth, GetDepth, doc="See `GetDepth`"); + %property(DeviceOrigin, GetDeviceOrigin, SetDeviceOrigin, doc="See `GetDeviceOrigin` and `SetDeviceOrigin`"); + %property(Font, GetFont, SetFont, doc="See `GetFont` and `SetFont`"); + %property(FullTextExtent, GetFullTextExtent, doc="See `GetFullTextExtent`"); + %property(LogicalFunction, GetLogicalFunction, SetLogicalFunction, doc="See `GetLogicalFunction` and `SetLogicalFunction`"); + %property(LogicalOrigin, GetLogicalOrigin, SetLogicalOrigin, doc="See `GetLogicalOrigin` and `SetLogicalOrigin`"); + %property(LogicalScale, GetLogicalScale, SetLogicalScale, doc="See `GetLogicalScale` and `SetLogicalScale`"); + %property(MapMode, GetMapMode, SetMapMode, doc="See `GetMapMode` and `SetMapMode`"); + %property(MultiLineTextExtent, GetMultiLineTextExtent, doc="See `GetMultiLineTextExtent`"); + %property(Optimization, GetOptimization, SetOptimization, doc="See `GetOptimization` and `SetOptimization`"); + %property(PPI, GetPPI, doc="See `GetPPI`"); + %property(PartialTextExtents, GetPartialTextExtents, doc="See `GetPartialTextExtents`"); + %property(Pen, GetPen, SetPen, doc="See `GetPen` and `SetPen`"); + %property(Pixel, GetPixel, doc="See `GetPixel`"); + %property(PixelPoint, GetPixelPoint, doc="See `GetPixelPoint`"); + %property(Size, GetSize, doc="See `GetSize`"); + %property(SizeMM, GetSizeMM, doc="See `GetSizeMM`"); + %property(TextBackground, GetTextBackground, SetTextBackground, doc="See `GetTextBackground` and `SetTextBackground`"); + %property(TextExtent, GetTextExtent, doc="See `GetTextExtent`"); + %property(TextForeground, GetTextForeground, SetTextForeground, doc="See `GetTextForeground` and `SetTextForeground`"); + %property(UserScale, GetUserScale, SetUserScale, doc="See `GetUserScale` and `SetUserScale`"); }; diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index a7e862a515..db35ec1875 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -159,9 +159,7 @@ typedef unsigned long wxUIntPtr; %define %property(NAME, STUFF...) - %pythoncode { - NAME = property(STUFF) - } + %pythoncode { NAME = property(STUFF) } %enddef //---------------------------------------------------------------------- diff --git a/wxPython/src/_display.i b/wxPython/src/_display.i index 6277cad3f5..fb8433d933 100644 --- a/wxPython/src/_display.i +++ b/wxPython/src/_display.i @@ -234,6 +234,13 @@ Returns True if succeeded, False otherwise", ""); } } // end of %extend + + %property(ClientArea, GetClientArea, doc="See `GetClientArea`"); + %property(CurrentMode, GetCurrentMode, doc="See `GetCurrentMode`"); + %property(Geometry, GetGeometry, doc="See `GetGeometry`"); + %property(Modes, GetModes, doc="See `GetModes`"); + %property(Name, GetName, doc="See `GetName`"); + }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_dnd.i b/wxPython/src/_dnd.i index 01a908c031..aadde3843c 100644 --- a/wxPython/src/_dnd.i +++ b/wxPython/src/_dnd.i @@ -86,6 +86,8 @@ public: bool GiveFeedback(wxDragResult effect); %MAKE_BASE_FUNC(DropSource, GiveFeedback); + + %property(DataObject, GetDataObject, SetData, doc="See `GetDataObject` and `SetData`"); }; @@ -176,6 +178,10 @@ public: // returns default action for drag and drop or // wxDragNone if this not specified wxDragResult GetDefaultAction(); + + %property(Data, GetData, doc="See `GetData`"); + %property(DataObject, GetDataObject, SetDataObject, doc="See `GetDataObject` and `SetDataObject`"); + %property(DefaultAction, GetDefaultAction, SetDefaultAction, doc="See `GetDefaultAction` and `SetDefaultAction`"); }; diff --git a/wxPython/src/_dragimg.i b/wxPython/src/_dragimg.i index d0d6eca9e7..94f0d19fdf 100644 --- a/wxPython/src/_dragimg.i +++ b/wxPython/src/_dragimg.i @@ -95,6 +95,8 @@ public: // Erase and redraw simultaneously if possible virtual bool RedrawImage(const wxPoint& oldPos, const wxPoint& newPos, bool eraseOld, bool drawNew); + + %property(ImageRect, GetImageRect, doc="See `GetImageRect`"); }; diff --git a/wxPython/src/_event.i b/wxPython/src/_event.i index 614030cf29..a0b5fc1a42 100644 --- a/wxPython/src/_event.i +++ b/wxPython/src/_event.i @@ -603,6 +603,12 @@ deselection), or a boolean value representing the value of a checkbox.", ""); virtual wxEvent *Clone() const; + %property(ClientData, GetClientData, SetClientData, doc="See `GetClientData` and `SetClientData`"); + %property(ClientObject, GetClientObject, SetClientObject, doc="See `GetClientObject` and `SetClientObject`"); + %property(ExtraLong, GetExtraLong, SetExtraLong, doc="See `GetExtraLong` and `SetExtraLong`"); + %property(Int, GetInt, SetInt, doc="See `GetInt` and `SetInt`"); + %property(Selection, GetSelection, doc="See `GetSelection`"); + %property(String, GetString, SetString, doc="See `GetString` and `SetString`"); }; //--------------------------------------------------------------------------- @@ -1587,6 +1593,7 @@ public: wxWindow *, GetWindow() const, "The window which has just received the focus.", ""); + %property(Window, GetWindow, doc="See `GetWindow`"); }; //--------------------------------------------------------------------------- @@ -1631,6 +1638,7 @@ public: "Returns true if the application or window is being activated, false otherwise.", ""); + %property(Active, GetActive, doc="See `GetActive`"); }; @@ -1791,6 +1799,9 @@ event. Vetoing a window close event is not possible if the calling code wishes to force the application to exit, and so this function must be called to check this.", ""); + %property(LoggingOff, GetLoggingOff, SetLoggingOff, doc="See `GetLoggingOff` and `SetLoggingOff`"); + %property(Veto, GetVeto, doc="See `GetVeto`"); + }; @@ -1901,6 +1912,10 @@ public: return list; } } + + %property(Files, GetFiles, doc="See `GetFiles`"); + %property(NumberOfFiles, GetNumberOfFiles, doc="See `GetNumberOfFiles`"); + %property(Position, GetPosition, doc="See `GetPosition`"); }; @@ -2383,6 +2398,7 @@ be shown.", ""); void , SetPosition(const wxPoint& pos), "Sets the position at which the menu should be shown.", ""); + %property(Position, GetPosition, SetPosition, doc="See `GetPosition` and `SetPosition`"); }; //--------------------------------------------------------------------------- @@ -2576,6 +2592,7 @@ public: "Sets the date carried by the event, normally only used by the library internally.", ""); + %property(Date, GetDate, SetDate, doc="See `GetDate` and `SetDate`"); }; diff --git a/wxPython/src/_listbox.i b/wxPython/src/_listbox.i index 5f9005b7e9..4a0be69b3e 100644 --- a/wxPython/src/_listbox.i +++ b/wxPython/src/_listbox.i @@ -206,6 +206,8 @@ public: #if defined(__WXMSW__) || defined(__WXGTK__) int GetItemHeight(); #endif + + %property(ItemHeight, GetItemHeight, doc="See `GetItemHeight`"); }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_misc.i b/wxPython/src/_misc.i index 70f209d1f0..cf0257d4d6 100644 --- a/wxPython/src/_misc.i +++ b/wxPython/src/_misc.i @@ -87,6 +87,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`"); + }; diff --git a/wxPython/src/_notebook.i b/wxPython/src/_notebook.i index e654aa9ffa..77c6a4cb27 100644 --- a/wxPython/src/_notebook.i +++ b/wxPython/src/_notebook.i @@ -166,6 +166,19 @@ wx.NB_HITTEST flags.", ""); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(ControlMargin, GetControlMargin, SetControlMargin, doc="See `GetControlMargin` and `SetControlMargin`"); + %property(ControlSizer, GetControlSizer, doc="See `GetControlSizer`"); + %property(CurrentPage, GetCurrentPage, doc="See `GetCurrentPage`"); + %property(FitToCurrentPage, GetFitToCurrentPage, SetFitToCurrentPage, doc="See `GetFitToCurrentPage` and `SetFitToCurrentPage`"); + %property(ImageList, GetImageList, SetImageList, doc="See `GetImageList` and `SetImageList`"); + %property(InternalBorder, GetInternalBorder, SetInternalBorder, doc="See `GetInternalBorder` and `SetInternalBorder`"); + %property(Page, GetPage, doc="See `GetPage`"); + %property(PageCount, GetPageCount, doc="See `GetPageCount`"); + %property(PageImage, GetPageImage, SetPageImage, doc="See `GetPageImage` and `SetPageImage`"); + %property(PageText, GetPageText, SetPageText, doc="See `GetPageText` and `SetPageText`"); + %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`"); + }; @@ -182,6 +195,10 @@ public: // the page that was selected before the change (-1 if none) int GetOldSelection() const; void SetOldSelection(int nOldSel); + + %property(OldSelection, GetOldSelection, SetOldSelection, doc="See `GetOldSelection` and `SetOldSelection`"); + %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`"); + }; @@ -423,6 +440,9 @@ public: wxChoice* GetChoiceCtrl() const; virtual bool DeleteAllPages(); + + %property(ChoiceCtrl, GetChoiceCtrl, doc="See `GetChoiceCtrl`"); + }; diff --git a/wxPython/src/_picker.i b/wxPython/src/_picker.i index 5314d3686b..d13755e138 100644 --- a/wxPython/src/_picker.i +++ b/wxPython/src/_picker.i @@ -200,6 +200,7 @@ public: void , SetColour(const wxColour& col), "Set the displayed colour.", ""); + %property(Colour, GetColour, SetColour, doc="See `GetColour` and `SetColour`"); }; @@ -216,6 +217,8 @@ public: wxColour GetColour() const; void SetColour(const wxColour &c); + + %property(Colour, GetColour, SetColour, doc="See `GetColour` and `SetColour`"); }; @@ -331,6 +334,10 @@ public: // Returns the filtered value currently placed in the text control (if present). wxString GetTextCtrlValue() const; + + %property(Path, GetPath, SetPath, doc="See `GetPath` and `SetPath`"); + %property(TextCtrlValue, GetTextCtrlValue, doc="See `GetTextCtrlValue`"); + }; diff --git a/wxPython/src/_sashwin.i b/wxPython/src/_sashwin.i index 2ae31351a8..7c8f4418cc 100644 --- a/wxPython/src/_sashwin.i +++ b/wxPython/src/_sashwin.i @@ -223,6 +223,10 @@ public: // Set by the app void SetRect(const wxRect& rect); wxRect GetRect() const; + + %property(Flags, GetFlags, SetFlags, doc="See `GetFlags` and `SetFlags`"); + %property(Rect, GetRect, SetRect, doc="See `GetRect` and `SetRect`"); + }; diff --git a/wxPython/src/_sizers.i b/wxPython/src/_sizers.i index 9726d7b4fc..c7bb1356a6 100644 --- a/wxPython/src/_sizers.i +++ b/wxPython/src/_sizers.i @@ -1087,6 +1087,7 @@ sizer.", ""); void , SetOrientation(int orient), "Resets the orientation of the sizer.", ""); + %property(Orientation, GetOrientation, SetOrientation, doc="See `GetOrientation` and `SetOrientation`"); }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i index 836b7dd90c..00f54823ce 100644 --- a/wxPython/src/_toplvl.i +++ b/wxPython/src/_toplvl.i @@ -399,6 +399,10 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(AffirmativeId, GetAffirmativeId, SetAffirmativeId, doc="See `GetAffirmativeId` and `SetAffirmativeId`"); + %property(EscapeId, GetEscapeId, SetEscapeId, doc="See `GetEscapeId` and `SetEscapeId`"); + %property(ReturnCode, GetReturnCode, SetReturnCode, doc="See `GetReturnCode` and `SetReturnCode`"); }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i index 97d4150f96..acce307be4 100644 --- a/wxPython/src/_window.i +++ b/wxPython/src/_window.i @@ -2022,9 +2022,69 @@ opaque.", ""); def SendSizeEvent(self): self.GetEventHandler().ProcessEvent(wx.SizeEvent((-1,-1))) } -}; + + %property(AcceleratorTable, GetAcceleratorTable, SetAcceleratorTable, doc="See `GetAcceleratorTable` and `SetAcceleratorTable`"); + %property(AdjustedBestSize, GetAdjustedBestSize, doc="See `GetAdjustedBestSize`"); + %property(AutoLayout, GetAutoLayout, SetAutoLayout, doc="See `GetAutoLayout` and `SetAutoLayout`"); + %property(BackgroundColour, GetBackgroundColour, SetBackgroundColour, doc="See `GetBackgroundColour` and `SetBackgroundColour`"); + %property(BackgroundStyle, GetBackgroundStyle, SetBackgroundStyle, doc="See `GetBackgroundStyle` and `SetBackgroundStyle`"); + %property(BestFittingSize, GetBestFittingSize, SetBestFittingSize, doc="See `GetBestFittingSize` and `SetBestFittingSize`"); + %property(BestSize, GetBestSize, doc="See `GetBestSize`"); + %property(BestVirtualSize, GetBestVirtualSize, doc="See `GetBestVirtualSize`"); + %property(Border, GetBorder, doc="See `GetBorder`"); + %property(Caret, GetCaret, SetCaret, doc="See `GetCaret` and `SetCaret`"); + %property(CharHeight, GetCharHeight, doc="See `GetCharHeight`"); + %property(CharWidth, GetCharWidth, doc="See `GetCharWidth`"); + %property(Children, GetChildren, doc="See `GetChildren`"); + %property(ClientAreaOrigin, GetClientAreaOrigin, doc="See `GetClientAreaOrigin`"); + %property(ClientRect, GetClientRect, SetClientRect, doc="See `GetClientRect` and `SetClientRect`"); + %property(ClientSize, GetClientSize, SetClientSize, doc="See `GetClientSize` and `SetClientSize`"); + %property(Constraints, GetConstraints, SetConstraints, doc="See `GetConstraints` and `SetConstraints`"); + %property(ContainingSizer, GetContainingSizer, SetContainingSizer, doc="See `GetContainingSizer` and `SetContainingSizer`"); + %property(Cursor, GetCursor, SetCursor, doc="See `GetCursor` and `SetCursor`"); + %property(DefaultAttributes, GetDefaultAttributes, doc="See `GetDefaultAttributes`"); + %property(DropTarget, GetDropTarget, SetDropTarget, doc="See `GetDropTarget` and `SetDropTarget`"); + %property(EventHandler, GetEventHandler, SetEventHandler, doc="See `GetEventHandler` and `SetEventHandler`"); + %property(ExtraStyle, GetExtraStyle, SetExtraStyle, doc="See `GetExtraStyle` and `SetExtraStyle`"); + %property(Font, GetFont, SetFont, doc="See `GetFont` and `SetFont`"); + %property(ForegroundColour, GetForegroundColour, SetForegroundColour, doc="See `GetForegroundColour` and `SetForegroundColour`"); + %property(FullTextExtent, GetFullTextExtent, doc="See `GetFullTextExtent`"); + %property(GrandParent, GetGrandParent, doc="See `GetGrandParent`"); + %property(Handle, GetHandle, doc="See `GetHandle`"); + %property(HelpText, GetHelpText, SetHelpText, doc="See `GetHelpText` and `SetHelpText`"); + %property(HelpTextAtPoint, GetHelpTextAtPoint, doc="See `GetHelpTextAtPoint`"); + %property(Id, GetId, SetId, doc="See `GetId` and `SetId`"); + %property(Label, GetLabel, SetLabel, doc="See `GetLabel` and `SetLabel`"); + %property(MaxHeight, GetMaxHeight, doc="See `GetMaxHeight`"); + %property(MaxSize, GetMaxSize, SetMaxSize, doc="See `GetMaxSize` and `SetMaxSize`"); + %property(MaxWidth, GetMaxWidth, doc="See `GetMaxWidth`"); + %property(MinHeight, GetMinHeight, doc="See `GetMinHeight`"); + %property(MinSize, GetMinSize, SetMinSize, doc="See `GetMinSize` and `SetMinSize`"); + %property(MinWidth, GetMinWidth, doc="See `GetMinWidth`"); + %property(Name, GetName, SetName, doc="See `GetName` and `SetName`"); + %property(Parent, GetParent, doc="See `GetParent`"); + %property(Position, GetPosition, SetPosition, doc="See `GetPosition` and `SetPosition`"); + %property(Rect, GetRect, SetRect, doc="See `GetRect` and `SetRect`"); + %property(ScreenPosition, GetScreenPosition, doc="See `GetScreenPosition`"); + %property(ScreenRect, GetScreenRect, doc="See `GetScreenRect`"); + %property(ScrollPos, GetScrollPos, SetScrollPos, doc="See `GetScrollPos` and `SetScrollPos`"); + %property(ScrollRange, GetScrollRange, doc="See `GetScrollRange`"); + %property(ScrollThumb, GetScrollThumb, doc="See `GetScrollThumb`"); + %property(Size, GetSize, SetSize, doc="See `GetSize` and `SetSize`"); + %property(Sizer, GetSizer, SetSizer, doc="See `GetSizer` and `SetSizer`"); + %property(TextExtent, GetTextExtent, doc="See `GetTextExtent`"); + %property(ThemeEnabled, GetThemeEnabled, SetThemeEnabled, doc="See `GetThemeEnabled` and `SetThemeEnabled`"); + %property(ToolTip, GetToolTip, SetToolTip, doc="See `GetToolTip` and `SetToolTip`"); + %property(UpdateClientRect, GetUpdateClientRect, doc="See `GetUpdateClientRect`"); + %property(UpdateRegion, GetUpdateRegion, doc="See `GetUpdateRegion`"); + %property(Validator, GetValidator, SetValidator, doc="See `GetValidator` and `SetValidator`"); + %property(VirtualSize, GetVirtualSize, SetVirtualSize, doc="See `GetVirtualSize` and `SetVirtualSize`"); + %property(WindowStyle, GetWindowStyle, SetWindowStyle, doc="See `GetWindowStyle` and `SetWindowStyle`"); + %property(WindowStyleFlag, GetWindowStyleFlag, SetWindowStyleFlag, doc="See `GetWindowStyleFlag` and `SetWindowStyleFlag`"); + %property(WindowVariant, GetWindowVariant, SetWindowVariant, doc="See `GetWindowVariant` and `SetWindowVariant`"); +}; -- 2.47.2