From 203bfdca0c885d6ac295e4ffea1c95d80fe75b85 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 9 Sep 2006 22:57:42 +0000 Subject: [PATCH] more properties git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/_cmndlgs.i | 5 +++++ wxPython/src/_event.i | 20 ++++++++++++++++++++ wxPython/src/_font.i | 8 ++++++++ wxPython/src/_mdi.i | 7 ++++++- wxPython/src/_menu.i | 32 +++++++++++++++++++++++++++++++- wxPython/src/_notebook.i | 3 +++ 6 files changed, 73 insertions(+), 2 deletions(-) diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i index c00b23f787..cb5b1984a7 100644 --- a/wxPython/src/_cmndlgs.i +++ b/wxPython/src/_cmndlgs.i @@ -440,6 +440,8 @@ If an item is selected then its index will appear in the list.", ""); return wxArrayInt2PyList_helper(self->GetSelections()); } } + + %property(Selections, GetSelections, SetSelections, doc="See `GetSelections` and `SetSelections`"); }; @@ -558,6 +560,9 @@ public: "Constructor. Use ShowModal method to show the dialog.", ""); long GetValue(); + + %property(Value, GetValue, doc="See `GetValue`"); + }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_event.i b/wxPython/src/_event.i index 6d06bd26e9..4b51c06857 100644 --- a/wxPython/src/_event.i +++ b/wxPython/src/_event.i @@ -1104,6 +1104,15 @@ public: int m_wheelRotation; int m_wheelDelta; int m_linesPerAction; + + %property(Button, GetButton, doc="See `GetButton`"); + %property(LinesPerAction, GetLinesPerAction, doc="See `GetLinesPerAction`"); + %property(LogicalPosition, GetLogicalPosition, doc="See `GetLogicalPosition`"); + %property(Position, GetPosition, doc="See `GetPosition`"); + %property(WheelDelta, GetWheelDelta, doc="See `GetWheelDelta`"); + %property(WheelRotation, GetWheelRotation, doc="See `GetWheelRotation`"); + %property(X, GetX, doc="See `GetX`"); + %property(Y, GetY, doc="See `GetY`"); }; //--------------------------------------------------------------------------- @@ -1495,6 +1504,10 @@ public: m_pos = property(GetPosition, SetPosition) m_rect = property(GetRect, SetRect) } + + %property(Position, GetPosition, SetPosition, doc="See `GetPosition` and `SetPosition`"); + %property(Rect, GetRect, SetRect, doc="See `GetRect` and `SetRect`"); + }; //--------------------------------------------------------------------------- @@ -1740,6 +1753,8 @@ be used with the OPEN and CLOSE events.", ""); "Returns the menu which is being opened or closed. This method should only be used with the OPEN and CLOSE events.", ""); + %property(Menu, GetMenu, doc="See `GetMenu`"); + %property(MenuId, GetMenuId, doc="See `GetMenuId`"); }; //--------------------------------------------------------------------------- @@ -2180,6 +2195,7 @@ public: "Returns the window that gained the capture, or ``None`` if it was a non-wxWidgets window.", ""); + %property(CapturedWindow, GetCapturedWindow, doc="See `GetCapturedWindow`"); }; //--------------------------------------------------------------------------- @@ -2346,6 +2362,10 @@ This is required for proper navogation over radio buttons.", ""); WinChange, FromTab }; + + %property(CurrentFocus, GetCurrentFocus, SetCurrentFocus, doc="See `GetCurrentFocus` and `SetCurrentFocus`"); + %property(Direction, GetDirection, SetDirection, doc="See `GetDirection` and `SetDirection`"); + }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_font.i b/wxPython/src/_font.i index fe0746eecf..82a49c1355 100644 --- a/wxPython/src/_font.i +++ b/wxPython/src/_font.i @@ -278,6 +278,14 @@ public: // hopefully be understood by the user) bool FromUserString(const wxString& s); wxString ToUserString() const; + + %property(Encoding, GetEncoding, SetEncoding, doc="See `GetEncoding` and `SetEncoding`"); + %property(FaceName, GetFaceName, SetFaceName, doc="See `GetFaceName` and `SetFaceName`"); + %property(Family, GetFamily, SetFamily, doc="See `GetFamily` and `SetFamily`"); + %property(PointSize, GetPointSize, SetPointSize, doc="See `GetPointSize` and `SetPointSize`"); + %property(Style, GetStyle, SetStyle, doc="See `GetStyle` and `SetStyle`"); + %property(Underlined, GetUnderlined, SetUnderlined, doc="See `GetUnderlined` and `SetUnderlined`"); + %property(Weight, GetWeight, SetWeight, doc="See `GetWeight` and `SetWeight`"); }; diff --git a/wxPython/src/_mdi.i b/wxPython/src/_mdi.i index 9264b85389..8f34991457 100644 --- a/wxPython/src/_mdi.i +++ b/wxPython/src/_mdi.i @@ -65,7 +65,7 @@ public: void Cascade(); wxMDIChildFrame* GetActiveChild(); wxMDIClientWindow* GetClientWindow(); - wxWindow* GetToolBar(); +// wxWindow* GetToolBar(); // TODO: This isn't handled by the standard event-table system... //wxMDIClientWindow* OnCreateClient(); @@ -77,6 +77,11 @@ public: void SetToolBar(wxToolBar* toolbar); #endif void Tile(wxOrientation orient = wxHORIZONTAL); + + %property(ActiveChild, GetActiveChild, doc="See `GetActiveChild`"); + %property(ClientWindow, GetClientWindow, doc="See `GetClientWindow`"); +// %property(ToolBar, GetToolBar, doc="See `GetToolBar`"); + }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_menu.i b/wxPython/src/_menu.i index d1122ce95a..50a3f6e7fc 100644 --- a/wxPython/src/_menu.i +++ b/wxPython/src/_menu.i @@ -214,6 +214,17 @@ public: // set/get the parent of this menu void SetParent(wxMenu *parent); wxMenu *GetParent() const; + + %property(EventHandler, GetEventHandler, SetEventHandler, doc="See `GetEventHandler` and `SetEventHandler`"); + %property(HelpString, GetHelpString, SetHelpString, doc="See `GetHelpString` and `SetHelpString`"); + %property(InvokingWindow, GetInvokingWindow, SetInvokingWindow, doc="See `GetInvokingWindow` and `SetInvokingWindow`"); + %property(MenuBar, GetMenuBar, doc="See `GetMenuBar`"); + %property(MenuItemCount, GetMenuItemCount, doc="See `GetMenuItemCount`"); + %property(MenuItems, GetMenuItems, doc="See `GetMenuItems`"); + %property(Parent, GetParent, SetParent, doc="See `GetParent` and `SetParent`"); + %property(Style, GetStyle, doc="See `GetStyle`"); + %property(Title, GetTitle, SetTitle, doc="See `GetTitle` and `SetTitle`"); + }; //--------------------------------------------------------------------------- @@ -335,8 +346,11 @@ public: for m, l in items: self.Append(m, l) } - %property(Menus, GetMenus, SetMenus); + %property(Frame, GetFrame, doc="See `GetFrame`"); + %property(Menu, GetMenu, doc="See `GetMenu`"); + %property(MenuCount, GetMenuCount, doc="See `GetMenuCount`"); + %property(Menus, GetMenus, SetMenus, doc="See `GetMenus` and `SetMenus`"); }; //--------------------------------------------------------------------------- @@ -452,6 +466,22 @@ public: void ResetOwnerDrawn() {} } #endif + + %property(Accel, GetAccel, SetAccel, doc="See `GetAccel` and `SetAccel`"); + %property(BackgroundColour, GetBackgroundColour, SetBackgroundColour, doc="See `GetBackgroundColour` and `SetBackgroundColour`"); + %property(Bitmap, GetBitmap, SetBitmap, doc="See `GetBitmap` and `SetBitmap`"); + %property(DisabledBitmap, GetDisabledBitmap, SetDisabledBitmap, doc="See `GetDisabledBitmap` and `SetDisabledBitmap`"); + %property(Font, GetFont, SetFont, doc="See `GetFont` and `SetFont`"); + %property(Help, GetHelp, SetHelp, doc="See `GetHelp` and `SetHelp`"); + %property(Id, GetId, SetId, doc="See `GetId` and `SetId`"); + %property(Kind, GetKind, SetKind, doc="See `GetKind` and `SetKind`"); + %property(Label, GetLabel, doc="See `GetLabel`"); + %property(MarginWidth, GetMarginWidth, SetMarginWidth, doc="See `GetMarginWidth` and `SetMarginWidth`"); + %property(Menu, GetMenu, SetMenu, doc="See `GetMenu` and `SetMenu`"); + %property(SubMenu, GetSubMenu, SetSubMenu, doc="See `GetSubMenu` and `SetSubMenu`"); + %property(Text, GetText, SetText, doc="See `GetText` and `SetText`"); + %property(TextColour, GetTextColour, SetTextColour, doc="See `GetTextColour` and `SetTextColour`"); + }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_notebook.i b/wxPython/src/_notebook.i index e62c154d4f..32325974a3 100644 --- a/wxPython/src/_notebook.i +++ b/wxPython/src/_notebook.i @@ -272,6 +272,9 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(RowCount, GetRowCount, doc="See `GetRowCount`"); + %property(ThemeBackgroundColour, GetThemeBackgroundColour, doc="See `GetThemeBackgroundColour`"); }; -- 2.47.2