From e70b4d2db930a297f0625b7d43109f793fd3338a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 26 Sep 2006 00:26:35 +0000 Subject: [PATCH] Add properties git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/animate/animate.i | 18 ++++ wxPython/contrib/animate/gtk/animate.py | 17 +++ wxPython/contrib/animate/mac/animate.py | 17 +++ wxPython/contrib/animate/msw/animate.py | 17 +++ wxPython/contrib/gizmos/_treelist.i | 21 ++++ wxPython/contrib/gizmos/gizmos.i | 20 ++++ wxPython/contrib/gizmos/gtk/gizmos.py | 38 +++++++ wxPython/contrib/gizmos/mac/gizmos.py | 38 +++++++ wxPython/contrib/gizmos/msw/gizmos.py | 38 +++++++ wxPython/contrib/glcanvas/glcanvas.i | 2 + wxPython/contrib/glcanvas/gtk/glcanvas.py | 1 + wxPython/contrib/glcanvas/mac/glcanvas.py | 1 + wxPython/contrib/glcanvas/msw/glcanvas.py | 1 + wxPython/contrib/stc/gtk/stc.py | 107 +++++++++++++++++++ wxPython/contrib/stc/mac/stc.py | 107 +++++++++++++++++++ wxPython/contrib/stc/msw/stc.py | 107 +++++++++++++++++++ wxPython/contrib/stc/stc.i | 113 ++++++++++++++++++++ wxPython/src/_xml.i | 16 +++ wxPython/src/_xmlhandler.i | 10 ++ wxPython/src/_xmlres.i | 4 + wxPython/src/grid.i | 103 ++++++++++++++++-- wxPython/src/gtk/grid.py | 93 ++++++++++++++-- wxPython/src/gtk/grid_wrap.cpp | 70 ------------ wxPython/src/gtk/html.py | 105 ++++++++++++++++++ wxPython/src/gtk/media.py | 5 + wxPython/src/gtk/richtext.py | 41 +++++++ wxPython/src/gtk/webkit.py | 5 + wxPython/src/gtk/wizard.py | 8 ++ wxPython/src/gtk/xrc.py | 25 +++++ wxPython/src/html.i | 124 +++++++++++++++++++++- wxPython/src/mac/grid.py | 93 ++++++++++++++-- wxPython/src/mac/grid_wrap.cpp | 70 ------------ wxPython/src/mac/html.py | 105 ++++++++++++++++++ wxPython/src/mac/media.py | 5 + wxPython/src/mac/richtext.py | 41 +++++++ wxPython/src/mac/webkit.py | 5 + wxPython/src/mac/wizard.py | 8 ++ wxPython/src/mac/xrc.py | 25 +++++ wxPython/src/media.i | 5 + wxPython/src/msw/grid.py | 93 ++++++++++++++-- wxPython/src/msw/grid_wrap.cpp | 70 ------------ wxPython/src/msw/html.py | 105 ++++++++++++++++++ wxPython/src/msw/media.py | 5 + wxPython/src/msw/richtext.py | 41 +++++++ wxPython/src/msw/webkit.py | 5 + wxPython/src/msw/wizard.py | 8 ++ wxPython/src/msw/xrc.py | 25 +++++ wxPython/src/richtext.i | 45 ++++++++ wxPython/src/webkit.i | 7 ++ wxPython/src/wizard.i | 15 ++- 50 files changed, 1799 insertions(+), 249 deletions(-) diff --git a/wxPython/contrib/animate/animate.i b/wxPython/contrib/animate/animate.i index c676b04347..b0ff5713f7 100644 --- a/wxPython/contrib/animate/animate.i +++ b/wxPython/contrib/animate/animate.i @@ -149,6 +149,17 @@ public: wxBitmap& GetBackingStore(); + %property(Animation, GetAnimation, SetAnimation, doc="See `GetAnimation` and `SetAnimation`"); + %property(BackingStore, GetBackingStore, doc="See `GetBackingStore`"); + %property(CurrentFrame, GetCurrentFrame, SetCurrentFrame, doc="See `GetCurrentFrame` and `SetCurrentFrame`"); + %property(CustomBackgroundColour, GetCustomBackgroundColour, SetCustomBackgroundColour, doc="See `GetCustomBackgroundColour` and `SetCustomBackgroundColour`"); + %property(DestroyAnimation, GetDestroyAnimation, SetDestroyAnimation, doc="See `GetDestroyAnimation` and `SetDestroyAnimation`"); + %property(DisposalMethod, GetDisposalMethod, doc="See `GetDisposalMethod`"); + %property(FrameCount, GetFrameCount, doc="See `GetFrameCount`"); + %property(LogicalScreenSize, GetLogicalScreenSize, doc="See `GetLogicalScreenSize`"); + %property(Looped, GetLooped, SetLooped, doc="See `GetLooped` and `SetLooped`"); + %property(Position, GetPosition, SetPosition, doc="See `GetPosition` and `SetPosition`"); + %property(Window, GetWindow, SetWindow, doc="See `GetWindow` and `SetWindow`"); }; @@ -187,6 +198,10 @@ public: virtual bool IsValid() const; virtual bool LoadFile(const wxString& filename); + + %property(DisposalMethod, GetDisposalMethod, doc="See `GetDisposalMethod`"); + %property(FrameCount, GetFrameCount, doc="See `GetFrameCount`"); + %property(LogicalScreenSize, GetLogicalScreenSize, doc="See `GetLogicalScreenSize`"); }; @@ -317,6 +332,9 @@ public: const wxString& GetFilename() const; void SetFilename(const wxString& filename); + %property(Animation, GetAnimation, doc="See `GetAnimation`"); + %property(Filename, GetFilename, SetFilename, doc="See `GetFilename` and `SetFilename`"); + %property(Player, GetPlayer, doc="See `GetPlayer`"); }; //--------------------------------------------------------------------------- diff --git a/wxPython/contrib/animate/gtk/animate.py b/wxPython/contrib/animate/gtk/animate.py index fb0716f052..258a21ba17 100644 --- a/wxPython/contrib/animate/gtk/animate.py +++ b/wxPython/contrib/animate/gtk/animate.py @@ -233,6 +233,17 @@ class AnimationPlayer(_core.Object): """GetBackingStore(self) -> Bitmap""" return _animate.AnimationPlayer_GetBackingStore(*args, **kwargs) + Animation = property(GetAnimation,SetAnimation,doc="See `GetAnimation` and `SetAnimation`") + BackingStore = property(GetBackingStore,doc="See `GetBackingStore`") + CurrentFrame = property(GetCurrentFrame,SetCurrentFrame,doc="See `GetCurrentFrame` and `SetCurrentFrame`") + CustomBackgroundColour = property(GetCustomBackgroundColour,SetCustomBackgroundColour,doc="See `GetCustomBackgroundColour` and `SetCustomBackgroundColour`") + DestroyAnimation = property(GetDestroyAnimation,SetDestroyAnimation,doc="See `GetDestroyAnimation` and `SetDestroyAnimation`") + DisposalMethod = property(GetDisposalMethod,doc="See `GetDisposalMethod`") + FrameCount = property(GetFrameCount,doc="See `GetFrameCount`") + LogicalScreenSize = property(GetLogicalScreenSize,doc="See `GetLogicalScreenSize`") + Looped = property(GetLooped,SetLooped,doc="See `GetLooped` and `SetLooped`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") + Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") _animate.AnimationPlayer_swigregister(AnimationPlayer) cvar = _animate.cvar AnimationControlNameStr = cvar.AnimationControlNameStr @@ -284,6 +295,9 @@ class AnimationBase(_core.Object): """LoadFile(self, String filename) -> bool""" return _animate.AnimationBase_LoadFile(*args, **kwargs) + DisposalMethod = property(GetDisposalMethod,doc="See `GetDisposalMethod`") + FrameCount = property(GetFrameCount,doc="See `GetFrameCount`") + LogicalScreenSize = property(GetLogicalScreenSize,doc="See `GetLogicalScreenSize`") _animate.AnimationBase_swigregister(AnimationBase) class GIFAnimation(AnimationBase): @@ -357,6 +371,9 @@ class GIFAnimationCtrl(_core.Control): """SetFilename(self, String filename)""" return _animate.GIFAnimationCtrl_SetFilename(*args, **kwargs) + Animation = property(GetAnimation,doc="See `GetAnimation`") + Filename = property(GetFilename,SetFilename,doc="See `GetFilename` and `SetFilename`") + Player = property(GetPlayer,doc="See `GetPlayer`") _animate.GIFAnimationCtrl_swigregister(GIFAnimationCtrl) def PreGIFAnimationCtrl(*args, **kwargs): diff --git a/wxPython/contrib/animate/mac/animate.py b/wxPython/contrib/animate/mac/animate.py index fb0716f052..258a21ba17 100644 --- a/wxPython/contrib/animate/mac/animate.py +++ b/wxPython/contrib/animate/mac/animate.py @@ -233,6 +233,17 @@ class AnimationPlayer(_core.Object): """GetBackingStore(self) -> Bitmap""" return _animate.AnimationPlayer_GetBackingStore(*args, **kwargs) + Animation = property(GetAnimation,SetAnimation,doc="See `GetAnimation` and `SetAnimation`") + BackingStore = property(GetBackingStore,doc="See `GetBackingStore`") + CurrentFrame = property(GetCurrentFrame,SetCurrentFrame,doc="See `GetCurrentFrame` and `SetCurrentFrame`") + CustomBackgroundColour = property(GetCustomBackgroundColour,SetCustomBackgroundColour,doc="See `GetCustomBackgroundColour` and `SetCustomBackgroundColour`") + DestroyAnimation = property(GetDestroyAnimation,SetDestroyAnimation,doc="See `GetDestroyAnimation` and `SetDestroyAnimation`") + DisposalMethod = property(GetDisposalMethod,doc="See `GetDisposalMethod`") + FrameCount = property(GetFrameCount,doc="See `GetFrameCount`") + LogicalScreenSize = property(GetLogicalScreenSize,doc="See `GetLogicalScreenSize`") + Looped = property(GetLooped,SetLooped,doc="See `GetLooped` and `SetLooped`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") + Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") _animate.AnimationPlayer_swigregister(AnimationPlayer) cvar = _animate.cvar AnimationControlNameStr = cvar.AnimationControlNameStr @@ -284,6 +295,9 @@ class AnimationBase(_core.Object): """LoadFile(self, String filename) -> bool""" return _animate.AnimationBase_LoadFile(*args, **kwargs) + DisposalMethod = property(GetDisposalMethod,doc="See `GetDisposalMethod`") + FrameCount = property(GetFrameCount,doc="See `GetFrameCount`") + LogicalScreenSize = property(GetLogicalScreenSize,doc="See `GetLogicalScreenSize`") _animate.AnimationBase_swigregister(AnimationBase) class GIFAnimation(AnimationBase): @@ -357,6 +371,9 @@ class GIFAnimationCtrl(_core.Control): """SetFilename(self, String filename)""" return _animate.GIFAnimationCtrl_SetFilename(*args, **kwargs) + Animation = property(GetAnimation,doc="See `GetAnimation`") + Filename = property(GetFilename,SetFilename,doc="See `GetFilename` and `SetFilename`") + Player = property(GetPlayer,doc="See `GetPlayer`") _animate.GIFAnimationCtrl_swigregister(GIFAnimationCtrl) def PreGIFAnimationCtrl(*args, **kwargs): diff --git a/wxPython/contrib/animate/msw/animate.py b/wxPython/contrib/animate/msw/animate.py index fb0716f052..258a21ba17 100644 --- a/wxPython/contrib/animate/msw/animate.py +++ b/wxPython/contrib/animate/msw/animate.py @@ -233,6 +233,17 @@ class AnimationPlayer(_core.Object): """GetBackingStore(self) -> Bitmap""" return _animate.AnimationPlayer_GetBackingStore(*args, **kwargs) + Animation = property(GetAnimation,SetAnimation,doc="See `GetAnimation` and `SetAnimation`") + BackingStore = property(GetBackingStore,doc="See `GetBackingStore`") + CurrentFrame = property(GetCurrentFrame,SetCurrentFrame,doc="See `GetCurrentFrame` and `SetCurrentFrame`") + CustomBackgroundColour = property(GetCustomBackgroundColour,SetCustomBackgroundColour,doc="See `GetCustomBackgroundColour` and `SetCustomBackgroundColour`") + DestroyAnimation = property(GetDestroyAnimation,SetDestroyAnimation,doc="See `GetDestroyAnimation` and `SetDestroyAnimation`") + DisposalMethod = property(GetDisposalMethod,doc="See `GetDisposalMethod`") + FrameCount = property(GetFrameCount,doc="See `GetFrameCount`") + LogicalScreenSize = property(GetLogicalScreenSize,doc="See `GetLogicalScreenSize`") + Looped = property(GetLooped,SetLooped,doc="See `GetLooped` and `SetLooped`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") + Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") _animate.AnimationPlayer_swigregister(AnimationPlayer) cvar = _animate.cvar AnimationControlNameStr = cvar.AnimationControlNameStr @@ -284,6 +295,9 @@ class AnimationBase(_core.Object): """LoadFile(self, String filename) -> bool""" return _animate.AnimationBase_LoadFile(*args, **kwargs) + DisposalMethod = property(GetDisposalMethod,doc="See `GetDisposalMethod`") + FrameCount = property(GetFrameCount,doc="See `GetFrameCount`") + LogicalScreenSize = property(GetLogicalScreenSize,doc="See `GetLogicalScreenSize`") _animate.AnimationBase_swigregister(AnimationBase) class GIFAnimation(AnimationBase): @@ -357,6 +371,9 @@ class GIFAnimationCtrl(_core.Control): """SetFilename(self, String filename)""" return _animate.GIFAnimationCtrl_SetFilename(*args, **kwargs) + Animation = property(GetAnimation,doc="See `GetAnimation`") + Filename = property(GetFilename,SetFilename,doc="See `GetFilename` and `SetFilename`") + Player = property(GetPlayer,doc="See `GetPlayer`") _animate.GIFAnimationCtrl_swigregister(GIFAnimationCtrl) def PreGIFAnimationCtrl(*args, **kwargs): diff --git a/wxPython/contrib/gizmos/_treelist.i b/wxPython/contrib/gizmos/_treelist.i index 105f25b90d..42e43cd050 100644 --- a/wxPython/contrib/gizmos/_treelist.i +++ b/wxPython/contrib/gizmos/_treelist.i @@ -118,6 +118,13 @@ public: void SetEditable (bool edit); void SetShown(bool shown); + %property(Alignment, GetAlignment, SetAlignment, doc="See `GetAlignment` and `SetAlignment`"); + %property(Image, GetImage, SetImage, doc="See `GetImage` and `SetImage`"); + %property(SelectedImage, GetSelectedImage, SetSelectedImage, doc="See `GetSelectedImage` and `SetSelectedImage`"); + %property(Text, GetText, SetText, doc="See `GetText` and `SetText`"); + %property(Width, GetWidth, SetWidth, doc="See `GetWidth` and `SetWidth`"); + %property(Editable, IsEditable, SetEditable); + %property(Shown, IsShown, SetShown); }; @@ -678,6 +685,20 @@ public: wxWindow* GetHeaderWindow() const; wxScrolledWindow* GetMainWindow() const; + %property(ButtonsImageList, GetButtonsImageList, SetButtonsImageList, doc="See `GetButtonsImageList` and `SetButtonsImageList`"); + %property(ColumnCount, GetColumnCount, doc="See `GetColumnCount`"); + %property(Count, GetCount, doc="See `GetCount`"); + %property(HeaderWindow, GetHeaderWindow, doc="See `GetHeaderWindow`"); + %property(ImageList, GetImageList, SetImageList, doc="See `GetImageList` and `SetImageList`"); + %property(Indent, GetIndent, SetIndent, doc="See `GetIndent` and `SetIndent`"); + %property(LineSpacing, GetLineSpacing, SetLineSpacing, doc="See `GetLineSpacing` and `SetLineSpacing`"); + %property(MainColumn, GetMainColumn, SetMainColumn, doc="See `GetMainColumn` and `SetMainColumn`"); + %property(MainWindow, GetMainWindow, doc="See `GetMainWindow`"); + %property(Next, GetNext, doc="See `GetNext`"); + %property(RootItem, GetRootItem, doc="See `GetRootItem`"); + %property(Selection, GetSelection, doc="See `GetSelection`"); + %property(Selections, GetSelections, doc="See `GetSelections`"); + %property(StateImageList, GetStateImageList, SetStateImageList, doc="See `GetStateImageList` and `SetStateImageList`"); }; //---------------------------------------------------------------------- diff --git a/wxPython/contrib/gizmos/gizmos.i b/wxPython/contrib/gizmos/gizmos.i index faf2636617..65ddbbc35a 100644 --- a/wxPython/contrib/gizmos/gizmos.i +++ b/wxPython/contrib/gizmos/gizmos.i @@ -206,6 +206,14 @@ public: wxBitmapButton* GetUpButton(); wxBitmapButton* GetDownButton(); wxBitmapButton* GetEditButton(); + + %property(DelButton, GetDelButton, doc="See `GetDelButton`"); + %property(DownButton, GetDownButton, doc="See `GetDownButton`"); + %property(EditButton, GetEditButton, doc="See `GetEditButton`"); + %property(ListCtrl, GetListCtrl, doc="See `GetListCtrl`"); + %property(NewButton, GetNewButton, doc="See `GetNewButton`"); + %property(Strings, GetStrings, SetStrings, doc="See `GetStrings` and `SetStrings`"); + %property(UpButton, GetUpButton, doc="See `GetUpButton`"); }; @@ -255,6 +263,9 @@ public: // events happen such as node expansion void SetCompanionWindow(wxWindow* companion); wxWindow* GetCompanionWindow() const; + + %property(CompanionWindow, GetCompanionWindow, SetCompanionWindow, doc="See `GetCompanionWindow` and `SetCompanionWindow`"); + %property(ScrolledWindow, GetScrolledWindow, doc="See `GetScrolledWindow`"); }; @@ -315,6 +326,8 @@ public: wxRemotelyScrolledTreeCtrl* GetTreeCtrl() const; void SetTreeCtrl(wxRemotelyScrolledTreeCtrl* treeCtrl); + + %property(TreeCtrl, GetTreeCtrl, SetTreeCtrl, doc="See `GetTreeCtrl` and `SetTreeCtrl`"); }; @@ -409,6 +422,9 @@ public: void SetDrawFaded(bool DrawFaded, bool Redraw = true); void SetValue(const wxString &Value, bool Redraw = true); + %property(Alignment, GetAlignment, SetAlignment, doc="See `GetAlignment` and `SetAlignment`"); + %property(DrawFaded, GetDrawFaded, SetDrawFaded, doc="See `GetDrawFaded` and `SetDrawFaded`"); + %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`"); }; @@ -465,6 +481,10 @@ public: void SetCustomScale( float sx, float sy ); void GetCustomScale( float* OUTPUT, float* OUTPUT ) const; + %property(Alignment, GetAlignment, SetAlignment, doc="See `GetAlignment` and `SetAlignment`"); + %property(Bitmap, GetBitmap, SetBitmap, doc="See `GetBitmap` and `SetBitmap`"); + %property(Icon, GetIcon, SetIcon, doc="See `GetIcon` and `SetIcon`"); + %property(Scale, GetScale, SetScale, doc="See `GetScale` and `SetScale`"); }; diff --git a/wxPython/contrib/gizmos/gtk/gizmos.py b/wxPython/contrib/gizmos/gtk/gizmos.py index 592f85aeae..5ebfc2316a 100644 --- a/wxPython/contrib/gizmos/gtk/gizmos.py +++ b/wxPython/contrib/gizmos/gtk/gizmos.py @@ -175,6 +175,13 @@ class EditableListBox(_windows.Panel): """GetEditButton(self) -> BitmapButton""" return _gizmos.EditableListBox_GetEditButton(*args, **kwargs) + DelButton = property(GetDelButton,doc="See `GetDelButton`") + DownButton = property(GetDownButton,doc="See `GetDownButton`") + EditButton = property(GetEditButton,doc="See `GetEditButton`") + ListCtrl = property(GetListCtrl,doc="See `GetListCtrl`") + NewButton = property(GetNewButton,doc="See `GetNewButton`") + Strings = property(GetStrings,SetStrings,doc="See `GetStrings` and `SetStrings`") + UpButton = property(GetUpButton,doc="See `GetUpButton`") _gizmos.EditableListBox_swigregister(EditableListBox) class RemotelyScrolledTreeCtrl(_controls.TreeCtrl): @@ -213,6 +220,8 @@ class RemotelyScrolledTreeCtrl(_controls.TreeCtrl): """GetCompanionWindow(self) -> Window""" return _gizmos.RemotelyScrolledTreeCtrl_GetCompanionWindow(*args, **kwargs) + CompanionWindow = property(GetCompanionWindow,SetCompanionWindow,doc="See `GetCompanionWindow` and `SetCompanionWindow`") + ScrolledWindow = property(GetScrolledWindow,doc="See `GetScrolledWindow`") _gizmos.RemotelyScrolledTreeCtrl_swigregister(RemotelyScrolledTreeCtrl) class TreeCompanionWindow(_core.Window): @@ -239,6 +248,7 @@ class TreeCompanionWindow(_core.Window): """SetTreeCtrl(self, RemotelyScrolledTreeCtrl treeCtrl)""" return _gizmos.TreeCompanionWindow_SetTreeCtrl(*args, **kwargs) + TreeCtrl = property(GetTreeCtrl,SetTreeCtrl,doc="See `GetTreeCtrl` and `SetTreeCtrl`") _gizmos.TreeCompanionWindow_swigregister(TreeCompanionWindow) class ThinSplitterWindow(_windows.SplitterWindow): @@ -323,6 +333,9 @@ class LEDNumberCtrl(_core.Control): """SetValue(self, String Value, bool Redraw=True)""" return _gizmos.LEDNumberCtrl_SetValue(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + DrawFaded = property(GetDrawFaded,SetDrawFaded,doc="See `GetDrawFaded` and `SetDrawFaded`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _gizmos.LEDNumberCtrl_swigregister(LEDNumberCtrl) def PreLEDNumberCtrl(*args, **kwargs): @@ -430,6 +443,13 @@ class TreeListColumnInfo(_core.Object): """SetShown(self, bool shown)""" return _gizmos.TreeListColumnInfo_SetShown(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + Image = property(GetImage,SetImage,doc="See `GetImage` and `SetImage`") + SelectedImage = property(GetSelectedImage,SetSelectedImage,doc="See `GetSelectedImage` and `SetSelectedImage`") + Text = property(GetText,SetText,doc="See `GetText` and `SetText`") + Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") + Editable = property(IsEditable,SetEditable) + Shown = property(IsShown,SetShown) _gizmos.TreeListColumnInfo_swigregister(TreeListColumnInfo) TreeListCtrlNameStr = cvar.TreeListCtrlNameStr @@ -906,6 +926,20 @@ class TreeListCtrl(_core.Control): """GetMainWindow(self) -> ScrolledWindow""" return _gizmos.TreeListCtrl_GetMainWindow(*args, **kwargs) + ButtonsImageList = property(GetButtonsImageList,SetButtonsImageList,doc="See `GetButtonsImageList` and `SetButtonsImageList`") + ColumnCount = property(GetColumnCount,doc="See `GetColumnCount`") + Count = property(GetCount,doc="See `GetCount`") + HeaderWindow = property(GetHeaderWindow,doc="See `GetHeaderWindow`") + ImageList = property(GetImageList,SetImageList,doc="See `GetImageList` and `SetImageList`") + Indent = property(GetIndent,SetIndent,doc="See `GetIndent` and `SetIndent`") + LineSpacing = property(GetLineSpacing,SetLineSpacing,doc="See `GetLineSpacing` and `SetLineSpacing`") + MainColumn = property(GetMainColumn,SetMainColumn,doc="See `GetMainColumn` and `SetMainColumn`") + MainWindow = property(GetMainWindow,doc="See `GetMainWindow`") + Next = property(GetNext,doc="See `GetNext`") + RootItem = property(GetRootItem,doc="See `GetRootItem`") + Selection = property(GetSelection,doc="See `GetSelection`") + Selections = property(GetSelections,doc="See `GetSelections`") + StateImageList = property(GetStateImageList,SetStateImageList,doc="See `GetStateImageList` and `SetStateImageList`") _gizmos.TreeListCtrl_swigregister(TreeListCtrl) def PreTreeListCtrl(*args, **kwargs): @@ -982,6 +1016,10 @@ class StaticPicture(_core.Control): """GetCustomScale(self, float OUTPUT, float OUTPUT)""" return _gizmos.StaticPicture_GetCustomScale(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + Bitmap = property(GetBitmap,SetBitmap,doc="See `GetBitmap` and `SetBitmap`") + Icon = property(GetIcon,SetIcon,doc="See `GetIcon` and `SetIcon`") + Scale = property(GetScale,SetScale,doc="See `GetScale` and `SetScale`") _gizmos.StaticPicture_swigregister(StaticPicture) def PreStaticPicture(*args, **kwargs): diff --git a/wxPython/contrib/gizmos/mac/gizmos.py b/wxPython/contrib/gizmos/mac/gizmos.py index 592f85aeae..5ebfc2316a 100644 --- a/wxPython/contrib/gizmos/mac/gizmos.py +++ b/wxPython/contrib/gizmos/mac/gizmos.py @@ -175,6 +175,13 @@ class EditableListBox(_windows.Panel): """GetEditButton(self) -> BitmapButton""" return _gizmos.EditableListBox_GetEditButton(*args, **kwargs) + DelButton = property(GetDelButton,doc="See `GetDelButton`") + DownButton = property(GetDownButton,doc="See `GetDownButton`") + EditButton = property(GetEditButton,doc="See `GetEditButton`") + ListCtrl = property(GetListCtrl,doc="See `GetListCtrl`") + NewButton = property(GetNewButton,doc="See `GetNewButton`") + Strings = property(GetStrings,SetStrings,doc="See `GetStrings` and `SetStrings`") + UpButton = property(GetUpButton,doc="See `GetUpButton`") _gizmos.EditableListBox_swigregister(EditableListBox) class RemotelyScrolledTreeCtrl(_controls.TreeCtrl): @@ -213,6 +220,8 @@ class RemotelyScrolledTreeCtrl(_controls.TreeCtrl): """GetCompanionWindow(self) -> Window""" return _gizmos.RemotelyScrolledTreeCtrl_GetCompanionWindow(*args, **kwargs) + CompanionWindow = property(GetCompanionWindow,SetCompanionWindow,doc="See `GetCompanionWindow` and `SetCompanionWindow`") + ScrolledWindow = property(GetScrolledWindow,doc="See `GetScrolledWindow`") _gizmos.RemotelyScrolledTreeCtrl_swigregister(RemotelyScrolledTreeCtrl) class TreeCompanionWindow(_core.Window): @@ -239,6 +248,7 @@ class TreeCompanionWindow(_core.Window): """SetTreeCtrl(self, RemotelyScrolledTreeCtrl treeCtrl)""" return _gizmos.TreeCompanionWindow_SetTreeCtrl(*args, **kwargs) + TreeCtrl = property(GetTreeCtrl,SetTreeCtrl,doc="See `GetTreeCtrl` and `SetTreeCtrl`") _gizmos.TreeCompanionWindow_swigregister(TreeCompanionWindow) class ThinSplitterWindow(_windows.SplitterWindow): @@ -323,6 +333,9 @@ class LEDNumberCtrl(_core.Control): """SetValue(self, String Value, bool Redraw=True)""" return _gizmos.LEDNumberCtrl_SetValue(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + DrawFaded = property(GetDrawFaded,SetDrawFaded,doc="See `GetDrawFaded` and `SetDrawFaded`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _gizmos.LEDNumberCtrl_swigregister(LEDNumberCtrl) def PreLEDNumberCtrl(*args, **kwargs): @@ -430,6 +443,13 @@ class TreeListColumnInfo(_core.Object): """SetShown(self, bool shown)""" return _gizmos.TreeListColumnInfo_SetShown(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + Image = property(GetImage,SetImage,doc="See `GetImage` and `SetImage`") + SelectedImage = property(GetSelectedImage,SetSelectedImage,doc="See `GetSelectedImage` and `SetSelectedImage`") + Text = property(GetText,SetText,doc="See `GetText` and `SetText`") + Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") + Editable = property(IsEditable,SetEditable) + Shown = property(IsShown,SetShown) _gizmos.TreeListColumnInfo_swigregister(TreeListColumnInfo) TreeListCtrlNameStr = cvar.TreeListCtrlNameStr @@ -906,6 +926,20 @@ class TreeListCtrl(_core.Control): """GetMainWindow(self) -> ScrolledWindow""" return _gizmos.TreeListCtrl_GetMainWindow(*args, **kwargs) + ButtonsImageList = property(GetButtonsImageList,SetButtonsImageList,doc="See `GetButtonsImageList` and `SetButtonsImageList`") + ColumnCount = property(GetColumnCount,doc="See `GetColumnCount`") + Count = property(GetCount,doc="See `GetCount`") + HeaderWindow = property(GetHeaderWindow,doc="See `GetHeaderWindow`") + ImageList = property(GetImageList,SetImageList,doc="See `GetImageList` and `SetImageList`") + Indent = property(GetIndent,SetIndent,doc="See `GetIndent` and `SetIndent`") + LineSpacing = property(GetLineSpacing,SetLineSpacing,doc="See `GetLineSpacing` and `SetLineSpacing`") + MainColumn = property(GetMainColumn,SetMainColumn,doc="See `GetMainColumn` and `SetMainColumn`") + MainWindow = property(GetMainWindow,doc="See `GetMainWindow`") + Next = property(GetNext,doc="See `GetNext`") + RootItem = property(GetRootItem,doc="See `GetRootItem`") + Selection = property(GetSelection,doc="See `GetSelection`") + Selections = property(GetSelections,doc="See `GetSelections`") + StateImageList = property(GetStateImageList,SetStateImageList,doc="See `GetStateImageList` and `SetStateImageList`") _gizmos.TreeListCtrl_swigregister(TreeListCtrl) def PreTreeListCtrl(*args, **kwargs): @@ -982,6 +1016,10 @@ class StaticPicture(_core.Control): """GetCustomScale(self, float OUTPUT, float OUTPUT)""" return _gizmos.StaticPicture_GetCustomScale(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + Bitmap = property(GetBitmap,SetBitmap,doc="See `GetBitmap` and `SetBitmap`") + Icon = property(GetIcon,SetIcon,doc="See `GetIcon` and `SetIcon`") + Scale = property(GetScale,SetScale,doc="See `GetScale` and `SetScale`") _gizmos.StaticPicture_swigregister(StaticPicture) def PreStaticPicture(*args, **kwargs): diff --git a/wxPython/contrib/gizmos/msw/gizmos.py b/wxPython/contrib/gizmos/msw/gizmos.py index 592f85aeae..5ebfc2316a 100644 --- a/wxPython/contrib/gizmos/msw/gizmos.py +++ b/wxPython/contrib/gizmos/msw/gizmos.py @@ -175,6 +175,13 @@ class EditableListBox(_windows.Panel): """GetEditButton(self) -> BitmapButton""" return _gizmos.EditableListBox_GetEditButton(*args, **kwargs) + DelButton = property(GetDelButton,doc="See `GetDelButton`") + DownButton = property(GetDownButton,doc="See `GetDownButton`") + EditButton = property(GetEditButton,doc="See `GetEditButton`") + ListCtrl = property(GetListCtrl,doc="See `GetListCtrl`") + NewButton = property(GetNewButton,doc="See `GetNewButton`") + Strings = property(GetStrings,SetStrings,doc="See `GetStrings` and `SetStrings`") + UpButton = property(GetUpButton,doc="See `GetUpButton`") _gizmos.EditableListBox_swigregister(EditableListBox) class RemotelyScrolledTreeCtrl(_controls.TreeCtrl): @@ -213,6 +220,8 @@ class RemotelyScrolledTreeCtrl(_controls.TreeCtrl): """GetCompanionWindow(self) -> Window""" return _gizmos.RemotelyScrolledTreeCtrl_GetCompanionWindow(*args, **kwargs) + CompanionWindow = property(GetCompanionWindow,SetCompanionWindow,doc="See `GetCompanionWindow` and `SetCompanionWindow`") + ScrolledWindow = property(GetScrolledWindow,doc="See `GetScrolledWindow`") _gizmos.RemotelyScrolledTreeCtrl_swigregister(RemotelyScrolledTreeCtrl) class TreeCompanionWindow(_core.Window): @@ -239,6 +248,7 @@ class TreeCompanionWindow(_core.Window): """SetTreeCtrl(self, RemotelyScrolledTreeCtrl treeCtrl)""" return _gizmos.TreeCompanionWindow_SetTreeCtrl(*args, **kwargs) + TreeCtrl = property(GetTreeCtrl,SetTreeCtrl,doc="See `GetTreeCtrl` and `SetTreeCtrl`") _gizmos.TreeCompanionWindow_swigregister(TreeCompanionWindow) class ThinSplitterWindow(_windows.SplitterWindow): @@ -323,6 +333,9 @@ class LEDNumberCtrl(_core.Control): """SetValue(self, String Value, bool Redraw=True)""" return _gizmos.LEDNumberCtrl_SetValue(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + DrawFaded = property(GetDrawFaded,SetDrawFaded,doc="See `GetDrawFaded` and `SetDrawFaded`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _gizmos.LEDNumberCtrl_swigregister(LEDNumberCtrl) def PreLEDNumberCtrl(*args, **kwargs): @@ -430,6 +443,13 @@ class TreeListColumnInfo(_core.Object): """SetShown(self, bool shown)""" return _gizmos.TreeListColumnInfo_SetShown(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + Image = property(GetImage,SetImage,doc="See `GetImage` and `SetImage`") + SelectedImage = property(GetSelectedImage,SetSelectedImage,doc="See `GetSelectedImage` and `SetSelectedImage`") + Text = property(GetText,SetText,doc="See `GetText` and `SetText`") + Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") + Editable = property(IsEditable,SetEditable) + Shown = property(IsShown,SetShown) _gizmos.TreeListColumnInfo_swigregister(TreeListColumnInfo) TreeListCtrlNameStr = cvar.TreeListCtrlNameStr @@ -906,6 +926,20 @@ class TreeListCtrl(_core.Control): """GetMainWindow(self) -> ScrolledWindow""" return _gizmos.TreeListCtrl_GetMainWindow(*args, **kwargs) + ButtonsImageList = property(GetButtonsImageList,SetButtonsImageList,doc="See `GetButtonsImageList` and `SetButtonsImageList`") + ColumnCount = property(GetColumnCount,doc="See `GetColumnCount`") + Count = property(GetCount,doc="See `GetCount`") + HeaderWindow = property(GetHeaderWindow,doc="See `GetHeaderWindow`") + ImageList = property(GetImageList,SetImageList,doc="See `GetImageList` and `SetImageList`") + Indent = property(GetIndent,SetIndent,doc="See `GetIndent` and `SetIndent`") + LineSpacing = property(GetLineSpacing,SetLineSpacing,doc="See `GetLineSpacing` and `SetLineSpacing`") + MainColumn = property(GetMainColumn,SetMainColumn,doc="See `GetMainColumn` and `SetMainColumn`") + MainWindow = property(GetMainWindow,doc="See `GetMainWindow`") + Next = property(GetNext,doc="See `GetNext`") + RootItem = property(GetRootItem,doc="See `GetRootItem`") + Selection = property(GetSelection,doc="See `GetSelection`") + Selections = property(GetSelections,doc="See `GetSelections`") + StateImageList = property(GetStateImageList,SetStateImageList,doc="See `GetStateImageList` and `SetStateImageList`") _gizmos.TreeListCtrl_swigregister(TreeListCtrl) def PreTreeListCtrl(*args, **kwargs): @@ -982,6 +1016,10 @@ class StaticPicture(_core.Control): """GetCustomScale(self, float OUTPUT, float OUTPUT)""" return _gizmos.StaticPicture_GetCustomScale(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + Bitmap = property(GetBitmap,SetBitmap,doc="See `GetBitmap` and `SetBitmap`") + Icon = property(GetIcon,SetIcon,doc="See `GetIcon` and `SetIcon`") + Scale = property(GetScale,SetScale,doc="See `GetScale` and `SetScale`") _gizmos.StaticPicture_swigregister(StaticPicture) def PreStaticPicture(*args, **kwargs): diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i index 56d111e7da..1cdf228276 100644 --- a/wxPython/contrib/glcanvas/glcanvas.i +++ b/wxPython/contrib/glcanvas/glcanvas.i @@ -147,6 +147,8 @@ public: wxPalette CreateDefaultPalette(); wxPalette* GetPalette(); #endif + + %property(Context, GetContext, doc="See `GetContext`"); }; diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas.py b/wxPython/contrib/glcanvas/gtk/glcanvas.py index add8bf8b29..38f48cc8c2 100644 --- a/wxPython/contrib/glcanvas/gtk/glcanvas.py +++ b/wxPython/contrib/glcanvas/gtk/glcanvas.py @@ -120,6 +120,7 @@ class GLCanvas(_core.Window): """GetContext(self) -> GLContext""" return _glcanvas.GLCanvas_GetContext(*args, **kwargs) + Context = property(GetContext,doc="See `GetContext`") _glcanvas.GLCanvas_swigregister(GLCanvas) def GLCanvasWithContext(*args, **kwargs): diff --git a/wxPython/contrib/glcanvas/mac/glcanvas.py b/wxPython/contrib/glcanvas/mac/glcanvas.py index 95b33f2621..f72b0d71f6 100644 --- a/wxPython/contrib/glcanvas/mac/glcanvas.py +++ b/wxPython/contrib/glcanvas/mac/glcanvas.py @@ -119,6 +119,7 @@ class GLCanvas(_core.Window): """GetContext(self) -> GLContext""" return _glcanvas.GLCanvas_GetContext(*args, **kwargs) + Context = property(GetContext,doc="See `GetContext`") _glcanvas.GLCanvas_swigregister(GLCanvas) def GLCanvasWithContext(*args, **kwargs): diff --git a/wxPython/contrib/glcanvas/msw/glcanvas.py b/wxPython/contrib/glcanvas/msw/glcanvas.py index 4460eec341..755332e2f8 100644 --- a/wxPython/contrib/glcanvas/msw/glcanvas.py +++ b/wxPython/contrib/glcanvas/msw/glcanvas.py @@ -136,6 +136,7 @@ class GLCanvas(_core.Window): """GetPalette(self) -> Palette""" return _glcanvas.GLCanvas_GetPalette(*args, **kwargs) + Context = property(GetContext,doc="See `GetContext`") _glcanvas.GLCanvas_swigregister(GLCanvas) def GLCanvasWithContext(*args, **kwargs): diff --git a/wxPython/contrib/stc/gtk/stc.py b/wxPython/contrib/stc/gtk/stc.py index 347248d82e..78f7b42aa7 100644 --- a/wxPython/contrib/stc/gtk/stc.py +++ b/wxPython/contrib/stc/gtk/stc.py @@ -5276,6 +5276,90 @@ class StyledTextCtrl(_core.Control): GetCaretLineBack = GetCaretLineBackground SetCaretLineBack = SetCaretLineBackground + Anchor = property(GetAnchor,SetAnchor,doc="See `GetAnchor` and `SetAnchor`") + BackSpaceUnIndents = property(GetBackSpaceUnIndents,SetBackSpaceUnIndents,doc="See `GetBackSpaceUnIndents` and `SetBackSpaceUnIndents`") + BufferedDraw = property(GetBufferedDraw,SetBufferedDraw,doc="See `GetBufferedDraw` and `SetBufferedDraw`") + CaretForeground = property(GetCaretForeground,SetCaretForeground,doc="See `GetCaretForeground` and `SetCaretForeground`") + CaretLineBack = property(GetCaretLineBack,SetCaretLineBack,doc="See `GetCaretLineBack` and `SetCaretLineBack`") + CaretLineBackAlpha = property(GetCaretLineBackAlpha,SetCaretLineBackAlpha,doc="See `GetCaretLineBackAlpha` and `SetCaretLineBackAlpha`") + CaretLineBackground = property(GetCaretLineBackground,SetCaretLineBackground,doc="See `GetCaretLineBackground` and `SetCaretLineBackground`") + CaretLineVisible = property(GetCaretLineVisible,SetCaretLineVisible,doc="See `GetCaretLineVisible` and `SetCaretLineVisible`") + CaretPeriod = property(GetCaretPeriod,SetCaretPeriod,doc="See `GetCaretPeriod` and `SetCaretPeriod`") + CaretSticky = property(GetCaretSticky,SetCaretSticky,doc="See `GetCaretSticky` and `SetCaretSticky`") + CaretWidth = property(GetCaretWidth,SetCaretWidth,doc="See `GetCaretWidth` and `SetCaretWidth`") + CodePage = property(GetCodePage,SetCodePage,doc="See `GetCodePage` and `SetCodePage`") + ControlCharSymbol = property(GetControlCharSymbol,SetControlCharSymbol,doc="See `GetControlCharSymbol` and `SetControlCharSymbol`") + CurLine = property(GetCurLine,doc="See `GetCurLine`") + CurLineRaw = property(GetCurLineRaw,doc="See `GetCurLineRaw`") + CurLineUTF8 = property(GetCurLineUTF8,doc="See `GetCurLineUTF8`") + CurrentLine = property(GetCurrentLine,doc="See `GetCurrentLine`") + CurrentPos = property(GetCurrentPos,SetCurrentPos,doc="See `GetCurrentPos` and `SetCurrentPos`") + DocPointer = property(GetDocPointer,SetDocPointer,doc="See `GetDocPointer` and `SetDocPointer`") + EOLMode = property(GetEOLMode,SetEOLMode,doc="See `GetEOLMode` and `SetEOLMode`") + EdgeColour = property(GetEdgeColour,SetEdgeColour,doc="See `GetEdgeColour` and `SetEdgeColour`") + EdgeColumn = property(GetEdgeColumn,SetEdgeColumn,doc="See `GetEdgeColumn` and `SetEdgeColumn`") + EdgeMode = property(GetEdgeMode,SetEdgeMode,doc="See `GetEdgeMode` and `SetEdgeMode`") + EndAtLastLine = property(GetEndAtLastLine,SetEndAtLastLine,doc="See `GetEndAtLastLine` and `SetEndAtLastLine`") + EndStyled = property(GetEndStyled,doc="See `GetEndStyled`") + FirstVisibleLine = property(GetFirstVisibleLine,doc="See `GetFirstVisibleLine`") + HighlightGuide = property(GetHighlightGuide,SetHighlightGuide,doc="See `GetHighlightGuide` and `SetHighlightGuide`") + Indent = property(GetIndent,SetIndent,doc="See `GetIndent` and `SetIndent`") + IndentationGuides = property(GetIndentationGuides,SetIndentationGuides,doc="See `GetIndentationGuides` and `SetIndentationGuides`") + LastKeydownProcessed = property(GetLastKeydownProcessed,SetLastKeydownProcessed,doc="See `GetLastKeydownProcessed` and `SetLastKeydownProcessed`") + LayoutCache = property(GetLayoutCache,SetLayoutCache,doc="See `GetLayoutCache` and `SetLayoutCache`") + Length = property(GetLength,doc="See `GetLength`") + Lexer = property(GetLexer,SetLexer,doc="See `GetLexer` and `SetLexer`") + LineCount = property(GetLineCount,doc="See `GetLineCount`") + MarginLeft = property(GetMarginLeft,SetMarginLeft,doc="See `GetMarginLeft` and `SetMarginLeft`") + MarginRight = property(GetMarginRight,SetMarginRight,doc="See `GetMarginRight` and `SetMarginRight`") + MaxLineState = property(GetMaxLineState,doc="See `GetMaxLineState`") + ModEventMask = property(GetModEventMask,SetModEventMask,doc="See `GetModEventMask` and `SetModEventMask`") + Modify = property(GetModify,doc="See `GetModify`") + MouseDownCaptures = property(GetMouseDownCaptures,SetMouseDownCaptures,doc="See `GetMouseDownCaptures` and `SetMouseDownCaptures`") + MouseDwellTime = property(GetMouseDwellTime,SetMouseDwellTime,doc="See `GetMouseDwellTime` and `SetMouseDwellTime`") + Overtype = property(GetOvertype,SetOvertype,doc="See `GetOvertype` and `SetOvertype`") + PasteConvertEndings = property(GetPasteConvertEndings,SetPasteConvertEndings,doc="See `GetPasteConvertEndings` and `SetPasteConvertEndings`") + PrintColourMode = property(GetPrintColourMode,SetPrintColourMode,doc="See `GetPrintColourMode` and `SetPrintColourMode`") + PrintMagnification = property(GetPrintMagnification,SetPrintMagnification,doc="See `GetPrintMagnification` and `SetPrintMagnification`") + PrintWrapMode = property(GetPrintWrapMode,SetPrintWrapMode,doc="See `GetPrintWrapMode` and `SetPrintWrapMode`") + ReadOnly = property(GetReadOnly,SetReadOnly,doc="See `GetReadOnly` and `SetReadOnly`") + STCCursor = property(GetSTCCursor,SetSTCCursor,doc="See `GetSTCCursor` and `SetSTCCursor`") + STCFocus = property(GetSTCFocus,SetSTCFocus,doc="See `GetSTCFocus` and `SetSTCFocus`") + ScrollWidth = property(GetScrollWidth,SetScrollWidth,doc="See `GetScrollWidth` and `SetScrollWidth`") + SearchFlags = property(GetSearchFlags,SetSearchFlags,doc="See `GetSearchFlags` and `SetSearchFlags`") + SelAlpha = property(GetSelAlpha,SetSelAlpha,doc="See `GetSelAlpha` and `SetSelAlpha`") + SelectedText = property(GetSelectedText,doc="See `GetSelectedText`") + SelectedTextRaw = property(GetSelectedTextRaw,doc="See `GetSelectedTextRaw`") + SelectedTextUTF8 = property(GetSelectedTextUTF8,doc="See `GetSelectedTextUTF8`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + SelectionEnd = property(GetSelectionEnd,SetSelectionEnd,doc="See `GetSelectionEnd` and `SetSelectionEnd`") + SelectionMode = property(GetSelectionMode,SetSelectionMode,doc="See `GetSelectionMode` and `SetSelectionMode`") + SelectionStart = property(GetSelectionStart,SetSelectionStart,doc="See `GetSelectionStart` and `SetSelectionStart`") + Status = property(GetStatus,SetStatus,doc="See `GetStatus` and `SetStatus`") + StyleBits = property(GetStyleBits,SetStyleBits,doc="See `GetStyleBits` and `SetStyleBits`") + StyleBitsNeeded = property(GetStyleBitsNeeded,doc="See `GetStyleBitsNeeded`") + TabIndents = property(GetTabIndents,SetTabIndents,doc="See `GetTabIndents` and `SetTabIndents`") + TabWidth = property(GetTabWidth,SetTabWidth,doc="See `GetTabWidth` and `SetTabWidth`") + TargetEnd = property(GetTargetEnd,SetTargetEnd,doc="See `GetTargetEnd` and `SetTargetEnd`") + TargetStart = property(GetTargetStart,SetTargetStart,doc="See `GetTargetStart` and `SetTargetStart`") + Text = property(GetText,SetText,doc="See `GetText` and `SetText`") + TextLength = property(GetTextLength,doc="See `GetTextLength`") + TextRaw = property(GetTextRaw,SetTextRaw,doc="See `GetTextRaw` and `SetTextRaw`") + TextUTF8 = property(GetTextUTF8,SetTextUTF8,doc="See `GetTextUTF8` and `SetTextUTF8`") + TwoPhaseDraw = property(GetTwoPhaseDraw,SetTwoPhaseDraw,doc="See `GetTwoPhaseDraw` and `SetTwoPhaseDraw`") + UndoCollection = property(GetUndoCollection,SetUndoCollection,doc="See `GetUndoCollection` and `SetUndoCollection`") + UseAntiAliasing = property(GetUseAntiAliasing,SetUseAntiAliasing,doc="See `GetUseAntiAliasing` and `SetUseAntiAliasing`") + UseHorizontalScrollBar = property(GetUseHorizontalScrollBar,SetUseHorizontalScrollBar,doc="See `GetUseHorizontalScrollBar` and `SetUseHorizontalScrollBar`") + UseTabs = property(GetUseTabs,SetUseTabs,doc="See `GetUseTabs` and `SetUseTabs`") + UseVerticalScrollBar = property(GetUseVerticalScrollBar,SetUseVerticalScrollBar,doc="See `GetUseVerticalScrollBar` and `SetUseVerticalScrollBar`") + ViewEOL = property(GetViewEOL,SetViewEOL,doc="See `GetViewEOL` and `SetViewEOL`") + ViewWhiteSpace = property(GetViewWhiteSpace,SetViewWhiteSpace,doc="See `GetViewWhiteSpace` and `SetViewWhiteSpace`") + WrapMode = property(GetWrapMode,SetWrapMode,doc="See `GetWrapMode` and `SetWrapMode`") + WrapStartIndent = property(GetWrapStartIndent,SetWrapStartIndent,doc="See `GetWrapStartIndent` and `SetWrapStartIndent`") + WrapVisualFlags = property(GetWrapVisualFlags,SetWrapVisualFlags,doc="See `GetWrapVisualFlags` and `SetWrapVisualFlags`") + WrapVisualFlagsLocation = property(GetWrapVisualFlagsLocation,SetWrapVisualFlagsLocation,doc="See `GetWrapVisualFlagsLocation` and `SetWrapVisualFlagsLocation`") + XOffset = property(GetXOffset,SetXOffset,doc="See `GetXOffset` and `SetXOffset`") + Zoom = property(GetZoom,SetZoom,doc="See `GetZoom` and `SetZoom`") _stc.StyledTextCtrl_swigregister(StyledTextCtrl) cvar = _stc.cvar STCNameStr = cvar.STCNameStr @@ -5466,6 +5550,29 @@ class StyledTextEvent(_core.CommandEvent): """GetAlt(self) -> bool""" return _stc.StyledTextEvent_GetAlt(*args, **kwargs) + Alt = property(GetAlt,doc="See `GetAlt`") + Control = property(GetControl,doc="See `GetControl`") + DragAllowMove = property(GetDragAllowMove,SetDragAllowMove,doc="See `GetDragAllowMove` and `SetDragAllowMove`") + DragResult = property(GetDragResult,SetDragResult,doc="See `GetDragResult` and `SetDragResult`") + DragText = property(GetDragText,SetDragText,doc="See `GetDragText` and `SetDragText`") + FoldLevelNow = property(GetFoldLevelNow,SetFoldLevelNow,doc="See `GetFoldLevelNow` and `SetFoldLevelNow`") + FoldLevelPrev = property(GetFoldLevelPrev,SetFoldLevelPrev,doc="See `GetFoldLevelPrev` and `SetFoldLevelPrev`") + Key = property(GetKey,SetKey,doc="See `GetKey` and `SetKey`") + LParam = property(GetLParam,SetLParam,doc="See `GetLParam` and `SetLParam`") + Length = property(GetLength,SetLength,doc="See `GetLength` and `SetLength`") + Line = property(GetLine,SetLine,doc="See `GetLine` and `SetLine`") + LinesAdded = property(GetLinesAdded,SetLinesAdded,doc="See `GetLinesAdded` and `SetLinesAdded`") + ListType = property(GetListType,SetListType,doc="See `GetListType` and `SetListType`") + Margin = property(GetMargin,SetMargin,doc="See `GetMargin` and `SetMargin`") + Message = property(GetMessage,SetMessage,doc="See `GetMessage` and `SetMessage`") + ModificationType = property(GetModificationType,SetModificationType,doc="See `GetModificationType` and `SetModificationType`") + Modifiers = property(GetModifiers,SetModifiers,doc="See `GetModifiers` and `SetModifiers`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") + Shift = property(GetShift,doc="See `GetShift`") + Text = property(GetText,SetText,doc="See `GetText` and `SetText`") + WParam = property(GetWParam,SetWParam,doc="See `GetWParam` and `SetWParam`") + X = property(GetX,SetX,doc="See `GetX` and `SetX`") + Y = property(GetY,SetY,doc="See `GetY` and `SetY`") _stc.StyledTextEvent_swigregister(StyledTextEvent) wxEVT_STC_CHANGE = _stc.wxEVT_STC_CHANGE diff --git a/wxPython/contrib/stc/mac/stc.py b/wxPython/contrib/stc/mac/stc.py index 347248d82e..78f7b42aa7 100644 --- a/wxPython/contrib/stc/mac/stc.py +++ b/wxPython/contrib/stc/mac/stc.py @@ -5276,6 +5276,90 @@ class StyledTextCtrl(_core.Control): GetCaretLineBack = GetCaretLineBackground SetCaretLineBack = SetCaretLineBackground + Anchor = property(GetAnchor,SetAnchor,doc="See `GetAnchor` and `SetAnchor`") + BackSpaceUnIndents = property(GetBackSpaceUnIndents,SetBackSpaceUnIndents,doc="See `GetBackSpaceUnIndents` and `SetBackSpaceUnIndents`") + BufferedDraw = property(GetBufferedDraw,SetBufferedDraw,doc="See `GetBufferedDraw` and `SetBufferedDraw`") + CaretForeground = property(GetCaretForeground,SetCaretForeground,doc="See `GetCaretForeground` and `SetCaretForeground`") + CaretLineBack = property(GetCaretLineBack,SetCaretLineBack,doc="See `GetCaretLineBack` and `SetCaretLineBack`") + CaretLineBackAlpha = property(GetCaretLineBackAlpha,SetCaretLineBackAlpha,doc="See `GetCaretLineBackAlpha` and `SetCaretLineBackAlpha`") + CaretLineBackground = property(GetCaretLineBackground,SetCaretLineBackground,doc="See `GetCaretLineBackground` and `SetCaretLineBackground`") + CaretLineVisible = property(GetCaretLineVisible,SetCaretLineVisible,doc="See `GetCaretLineVisible` and `SetCaretLineVisible`") + CaretPeriod = property(GetCaretPeriod,SetCaretPeriod,doc="See `GetCaretPeriod` and `SetCaretPeriod`") + CaretSticky = property(GetCaretSticky,SetCaretSticky,doc="See `GetCaretSticky` and `SetCaretSticky`") + CaretWidth = property(GetCaretWidth,SetCaretWidth,doc="See `GetCaretWidth` and `SetCaretWidth`") + CodePage = property(GetCodePage,SetCodePage,doc="See `GetCodePage` and `SetCodePage`") + ControlCharSymbol = property(GetControlCharSymbol,SetControlCharSymbol,doc="See `GetControlCharSymbol` and `SetControlCharSymbol`") + CurLine = property(GetCurLine,doc="See `GetCurLine`") + CurLineRaw = property(GetCurLineRaw,doc="See `GetCurLineRaw`") + CurLineUTF8 = property(GetCurLineUTF8,doc="See `GetCurLineUTF8`") + CurrentLine = property(GetCurrentLine,doc="See `GetCurrentLine`") + CurrentPos = property(GetCurrentPos,SetCurrentPos,doc="See `GetCurrentPos` and `SetCurrentPos`") + DocPointer = property(GetDocPointer,SetDocPointer,doc="See `GetDocPointer` and `SetDocPointer`") + EOLMode = property(GetEOLMode,SetEOLMode,doc="See `GetEOLMode` and `SetEOLMode`") + EdgeColour = property(GetEdgeColour,SetEdgeColour,doc="See `GetEdgeColour` and `SetEdgeColour`") + EdgeColumn = property(GetEdgeColumn,SetEdgeColumn,doc="See `GetEdgeColumn` and `SetEdgeColumn`") + EdgeMode = property(GetEdgeMode,SetEdgeMode,doc="See `GetEdgeMode` and `SetEdgeMode`") + EndAtLastLine = property(GetEndAtLastLine,SetEndAtLastLine,doc="See `GetEndAtLastLine` and `SetEndAtLastLine`") + EndStyled = property(GetEndStyled,doc="See `GetEndStyled`") + FirstVisibleLine = property(GetFirstVisibleLine,doc="See `GetFirstVisibleLine`") + HighlightGuide = property(GetHighlightGuide,SetHighlightGuide,doc="See `GetHighlightGuide` and `SetHighlightGuide`") + Indent = property(GetIndent,SetIndent,doc="See `GetIndent` and `SetIndent`") + IndentationGuides = property(GetIndentationGuides,SetIndentationGuides,doc="See `GetIndentationGuides` and `SetIndentationGuides`") + LastKeydownProcessed = property(GetLastKeydownProcessed,SetLastKeydownProcessed,doc="See `GetLastKeydownProcessed` and `SetLastKeydownProcessed`") + LayoutCache = property(GetLayoutCache,SetLayoutCache,doc="See `GetLayoutCache` and `SetLayoutCache`") + Length = property(GetLength,doc="See `GetLength`") + Lexer = property(GetLexer,SetLexer,doc="See `GetLexer` and `SetLexer`") + LineCount = property(GetLineCount,doc="See `GetLineCount`") + MarginLeft = property(GetMarginLeft,SetMarginLeft,doc="See `GetMarginLeft` and `SetMarginLeft`") + MarginRight = property(GetMarginRight,SetMarginRight,doc="See `GetMarginRight` and `SetMarginRight`") + MaxLineState = property(GetMaxLineState,doc="See `GetMaxLineState`") + ModEventMask = property(GetModEventMask,SetModEventMask,doc="See `GetModEventMask` and `SetModEventMask`") + Modify = property(GetModify,doc="See `GetModify`") + MouseDownCaptures = property(GetMouseDownCaptures,SetMouseDownCaptures,doc="See `GetMouseDownCaptures` and `SetMouseDownCaptures`") + MouseDwellTime = property(GetMouseDwellTime,SetMouseDwellTime,doc="See `GetMouseDwellTime` and `SetMouseDwellTime`") + Overtype = property(GetOvertype,SetOvertype,doc="See `GetOvertype` and `SetOvertype`") + PasteConvertEndings = property(GetPasteConvertEndings,SetPasteConvertEndings,doc="See `GetPasteConvertEndings` and `SetPasteConvertEndings`") + PrintColourMode = property(GetPrintColourMode,SetPrintColourMode,doc="See `GetPrintColourMode` and `SetPrintColourMode`") + PrintMagnification = property(GetPrintMagnification,SetPrintMagnification,doc="See `GetPrintMagnification` and `SetPrintMagnification`") + PrintWrapMode = property(GetPrintWrapMode,SetPrintWrapMode,doc="See `GetPrintWrapMode` and `SetPrintWrapMode`") + ReadOnly = property(GetReadOnly,SetReadOnly,doc="See `GetReadOnly` and `SetReadOnly`") + STCCursor = property(GetSTCCursor,SetSTCCursor,doc="See `GetSTCCursor` and `SetSTCCursor`") + STCFocus = property(GetSTCFocus,SetSTCFocus,doc="See `GetSTCFocus` and `SetSTCFocus`") + ScrollWidth = property(GetScrollWidth,SetScrollWidth,doc="See `GetScrollWidth` and `SetScrollWidth`") + SearchFlags = property(GetSearchFlags,SetSearchFlags,doc="See `GetSearchFlags` and `SetSearchFlags`") + SelAlpha = property(GetSelAlpha,SetSelAlpha,doc="See `GetSelAlpha` and `SetSelAlpha`") + SelectedText = property(GetSelectedText,doc="See `GetSelectedText`") + SelectedTextRaw = property(GetSelectedTextRaw,doc="See `GetSelectedTextRaw`") + SelectedTextUTF8 = property(GetSelectedTextUTF8,doc="See `GetSelectedTextUTF8`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + SelectionEnd = property(GetSelectionEnd,SetSelectionEnd,doc="See `GetSelectionEnd` and `SetSelectionEnd`") + SelectionMode = property(GetSelectionMode,SetSelectionMode,doc="See `GetSelectionMode` and `SetSelectionMode`") + SelectionStart = property(GetSelectionStart,SetSelectionStart,doc="See `GetSelectionStart` and `SetSelectionStart`") + Status = property(GetStatus,SetStatus,doc="See `GetStatus` and `SetStatus`") + StyleBits = property(GetStyleBits,SetStyleBits,doc="See `GetStyleBits` and `SetStyleBits`") + StyleBitsNeeded = property(GetStyleBitsNeeded,doc="See `GetStyleBitsNeeded`") + TabIndents = property(GetTabIndents,SetTabIndents,doc="See `GetTabIndents` and `SetTabIndents`") + TabWidth = property(GetTabWidth,SetTabWidth,doc="See `GetTabWidth` and `SetTabWidth`") + TargetEnd = property(GetTargetEnd,SetTargetEnd,doc="See `GetTargetEnd` and `SetTargetEnd`") + TargetStart = property(GetTargetStart,SetTargetStart,doc="See `GetTargetStart` and `SetTargetStart`") + Text = property(GetText,SetText,doc="See `GetText` and `SetText`") + TextLength = property(GetTextLength,doc="See `GetTextLength`") + TextRaw = property(GetTextRaw,SetTextRaw,doc="See `GetTextRaw` and `SetTextRaw`") + TextUTF8 = property(GetTextUTF8,SetTextUTF8,doc="See `GetTextUTF8` and `SetTextUTF8`") + TwoPhaseDraw = property(GetTwoPhaseDraw,SetTwoPhaseDraw,doc="See `GetTwoPhaseDraw` and `SetTwoPhaseDraw`") + UndoCollection = property(GetUndoCollection,SetUndoCollection,doc="See `GetUndoCollection` and `SetUndoCollection`") + UseAntiAliasing = property(GetUseAntiAliasing,SetUseAntiAliasing,doc="See `GetUseAntiAliasing` and `SetUseAntiAliasing`") + UseHorizontalScrollBar = property(GetUseHorizontalScrollBar,SetUseHorizontalScrollBar,doc="See `GetUseHorizontalScrollBar` and `SetUseHorizontalScrollBar`") + UseTabs = property(GetUseTabs,SetUseTabs,doc="See `GetUseTabs` and `SetUseTabs`") + UseVerticalScrollBar = property(GetUseVerticalScrollBar,SetUseVerticalScrollBar,doc="See `GetUseVerticalScrollBar` and `SetUseVerticalScrollBar`") + ViewEOL = property(GetViewEOL,SetViewEOL,doc="See `GetViewEOL` and `SetViewEOL`") + ViewWhiteSpace = property(GetViewWhiteSpace,SetViewWhiteSpace,doc="See `GetViewWhiteSpace` and `SetViewWhiteSpace`") + WrapMode = property(GetWrapMode,SetWrapMode,doc="See `GetWrapMode` and `SetWrapMode`") + WrapStartIndent = property(GetWrapStartIndent,SetWrapStartIndent,doc="See `GetWrapStartIndent` and `SetWrapStartIndent`") + WrapVisualFlags = property(GetWrapVisualFlags,SetWrapVisualFlags,doc="See `GetWrapVisualFlags` and `SetWrapVisualFlags`") + WrapVisualFlagsLocation = property(GetWrapVisualFlagsLocation,SetWrapVisualFlagsLocation,doc="See `GetWrapVisualFlagsLocation` and `SetWrapVisualFlagsLocation`") + XOffset = property(GetXOffset,SetXOffset,doc="See `GetXOffset` and `SetXOffset`") + Zoom = property(GetZoom,SetZoom,doc="See `GetZoom` and `SetZoom`") _stc.StyledTextCtrl_swigregister(StyledTextCtrl) cvar = _stc.cvar STCNameStr = cvar.STCNameStr @@ -5466,6 +5550,29 @@ class StyledTextEvent(_core.CommandEvent): """GetAlt(self) -> bool""" return _stc.StyledTextEvent_GetAlt(*args, **kwargs) + Alt = property(GetAlt,doc="See `GetAlt`") + Control = property(GetControl,doc="See `GetControl`") + DragAllowMove = property(GetDragAllowMove,SetDragAllowMove,doc="See `GetDragAllowMove` and `SetDragAllowMove`") + DragResult = property(GetDragResult,SetDragResult,doc="See `GetDragResult` and `SetDragResult`") + DragText = property(GetDragText,SetDragText,doc="See `GetDragText` and `SetDragText`") + FoldLevelNow = property(GetFoldLevelNow,SetFoldLevelNow,doc="See `GetFoldLevelNow` and `SetFoldLevelNow`") + FoldLevelPrev = property(GetFoldLevelPrev,SetFoldLevelPrev,doc="See `GetFoldLevelPrev` and `SetFoldLevelPrev`") + Key = property(GetKey,SetKey,doc="See `GetKey` and `SetKey`") + LParam = property(GetLParam,SetLParam,doc="See `GetLParam` and `SetLParam`") + Length = property(GetLength,SetLength,doc="See `GetLength` and `SetLength`") + Line = property(GetLine,SetLine,doc="See `GetLine` and `SetLine`") + LinesAdded = property(GetLinesAdded,SetLinesAdded,doc="See `GetLinesAdded` and `SetLinesAdded`") + ListType = property(GetListType,SetListType,doc="See `GetListType` and `SetListType`") + Margin = property(GetMargin,SetMargin,doc="See `GetMargin` and `SetMargin`") + Message = property(GetMessage,SetMessage,doc="See `GetMessage` and `SetMessage`") + ModificationType = property(GetModificationType,SetModificationType,doc="See `GetModificationType` and `SetModificationType`") + Modifiers = property(GetModifiers,SetModifiers,doc="See `GetModifiers` and `SetModifiers`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") + Shift = property(GetShift,doc="See `GetShift`") + Text = property(GetText,SetText,doc="See `GetText` and `SetText`") + WParam = property(GetWParam,SetWParam,doc="See `GetWParam` and `SetWParam`") + X = property(GetX,SetX,doc="See `GetX` and `SetX`") + Y = property(GetY,SetY,doc="See `GetY` and `SetY`") _stc.StyledTextEvent_swigregister(StyledTextEvent) wxEVT_STC_CHANGE = _stc.wxEVT_STC_CHANGE diff --git a/wxPython/contrib/stc/msw/stc.py b/wxPython/contrib/stc/msw/stc.py index 347248d82e..78f7b42aa7 100644 --- a/wxPython/contrib/stc/msw/stc.py +++ b/wxPython/contrib/stc/msw/stc.py @@ -5276,6 +5276,90 @@ class StyledTextCtrl(_core.Control): GetCaretLineBack = GetCaretLineBackground SetCaretLineBack = SetCaretLineBackground + Anchor = property(GetAnchor,SetAnchor,doc="See `GetAnchor` and `SetAnchor`") + BackSpaceUnIndents = property(GetBackSpaceUnIndents,SetBackSpaceUnIndents,doc="See `GetBackSpaceUnIndents` and `SetBackSpaceUnIndents`") + BufferedDraw = property(GetBufferedDraw,SetBufferedDraw,doc="See `GetBufferedDraw` and `SetBufferedDraw`") + CaretForeground = property(GetCaretForeground,SetCaretForeground,doc="See `GetCaretForeground` and `SetCaretForeground`") + CaretLineBack = property(GetCaretLineBack,SetCaretLineBack,doc="See `GetCaretLineBack` and `SetCaretLineBack`") + CaretLineBackAlpha = property(GetCaretLineBackAlpha,SetCaretLineBackAlpha,doc="See `GetCaretLineBackAlpha` and `SetCaretLineBackAlpha`") + CaretLineBackground = property(GetCaretLineBackground,SetCaretLineBackground,doc="See `GetCaretLineBackground` and `SetCaretLineBackground`") + CaretLineVisible = property(GetCaretLineVisible,SetCaretLineVisible,doc="See `GetCaretLineVisible` and `SetCaretLineVisible`") + CaretPeriod = property(GetCaretPeriod,SetCaretPeriod,doc="See `GetCaretPeriod` and `SetCaretPeriod`") + CaretSticky = property(GetCaretSticky,SetCaretSticky,doc="See `GetCaretSticky` and `SetCaretSticky`") + CaretWidth = property(GetCaretWidth,SetCaretWidth,doc="See `GetCaretWidth` and `SetCaretWidth`") + CodePage = property(GetCodePage,SetCodePage,doc="See `GetCodePage` and `SetCodePage`") + ControlCharSymbol = property(GetControlCharSymbol,SetControlCharSymbol,doc="See `GetControlCharSymbol` and `SetControlCharSymbol`") + CurLine = property(GetCurLine,doc="See `GetCurLine`") + CurLineRaw = property(GetCurLineRaw,doc="See `GetCurLineRaw`") + CurLineUTF8 = property(GetCurLineUTF8,doc="See `GetCurLineUTF8`") + CurrentLine = property(GetCurrentLine,doc="See `GetCurrentLine`") + CurrentPos = property(GetCurrentPos,SetCurrentPos,doc="See `GetCurrentPos` and `SetCurrentPos`") + DocPointer = property(GetDocPointer,SetDocPointer,doc="See `GetDocPointer` and `SetDocPointer`") + EOLMode = property(GetEOLMode,SetEOLMode,doc="See `GetEOLMode` and `SetEOLMode`") + EdgeColour = property(GetEdgeColour,SetEdgeColour,doc="See `GetEdgeColour` and `SetEdgeColour`") + EdgeColumn = property(GetEdgeColumn,SetEdgeColumn,doc="See `GetEdgeColumn` and `SetEdgeColumn`") + EdgeMode = property(GetEdgeMode,SetEdgeMode,doc="See `GetEdgeMode` and `SetEdgeMode`") + EndAtLastLine = property(GetEndAtLastLine,SetEndAtLastLine,doc="See `GetEndAtLastLine` and `SetEndAtLastLine`") + EndStyled = property(GetEndStyled,doc="See `GetEndStyled`") + FirstVisibleLine = property(GetFirstVisibleLine,doc="See `GetFirstVisibleLine`") + HighlightGuide = property(GetHighlightGuide,SetHighlightGuide,doc="See `GetHighlightGuide` and `SetHighlightGuide`") + Indent = property(GetIndent,SetIndent,doc="See `GetIndent` and `SetIndent`") + IndentationGuides = property(GetIndentationGuides,SetIndentationGuides,doc="See `GetIndentationGuides` and `SetIndentationGuides`") + LastKeydownProcessed = property(GetLastKeydownProcessed,SetLastKeydownProcessed,doc="See `GetLastKeydownProcessed` and `SetLastKeydownProcessed`") + LayoutCache = property(GetLayoutCache,SetLayoutCache,doc="See `GetLayoutCache` and `SetLayoutCache`") + Length = property(GetLength,doc="See `GetLength`") + Lexer = property(GetLexer,SetLexer,doc="See `GetLexer` and `SetLexer`") + LineCount = property(GetLineCount,doc="See `GetLineCount`") + MarginLeft = property(GetMarginLeft,SetMarginLeft,doc="See `GetMarginLeft` and `SetMarginLeft`") + MarginRight = property(GetMarginRight,SetMarginRight,doc="See `GetMarginRight` and `SetMarginRight`") + MaxLineState = property(GetMaxLineState,doc="See `GetMaxLineState`") + ModEventMask = property(GetModEventMask,SetModEventMask,doc="See `GetModEventMask` and `SetModEventMask`") + Modify = property(GetModify,doc="See `GetModify`") + MouseDownCaptures = property(GetMouseDownCaptures,SetMouseDownCaptures,doc="See `GetMouseDownCaptures` and `SetMouseDownCaptures`") + MouseDwellTime = property(GetMouseDwellTime,SetMouseDwellTime,doc="See `GetMouseDwellTime` and `SetMouseDwellTime`") + Overtype = property(GetOvertype,SetOvertype,doc="See `GetOvertype` and `SetOvertype`") + PasteConvertEndings = property(GetPasteConvertEndings,SetPasteConvertEndings,doc="See `GetPasteConvertEndings` and `SetPasteConvertEndings`") + PrintColourMode = property(GetPrintColourMode,SetPrintColourMode,doc="See `GetPrintColourMode` and `SetPrintColourMode`") + PrintMagnification = property(GetPrintMagnification,SetPrintMagnification,doc="See `GetPrintMagnification` and `SetPrintMagnification`") + PrintWrapMode = property(GetPrintWrapMode,SetPrintWrapMode,doc="See `GetPrintWrapMode` and `SetPrintWrapMode`") + ReadOnly = property(GetReadOnly,SetReadOnly,doc="See `GetReadOnly` and `SetReadOnly`") + STCCursor = property(GetSTCCursor,SetSTCCursor,doc="See `GetSTCCursor` and `SetSTCCursor`") + STCFocus = property(GetSTCFocus,SetSTCFocus,doc="See `GetSTCFocus` and `SetSTCFocus`") + ScrollWidth = property(GetScrollWidth,SetScrollWidth,doc="See `GetScrollWidth` and `SetScrollWidth`") + SearchFlags = property(GetSearchFlags,SetSearchFlags,doc="See `GetSearchFlags` and `SetSearchFlags`") + SelAlpha = property(GetSelAlpha,SetSelAlpha,doc="See `GetSelAlpha` and `SetSelAlpha`") + SelectedText = property(GetSelectedText,doc="See `GetSelectedText`") + SelectedTextRaw = property(GetSelectedTextRaw,doc="See `GetSelectedTextRaw`") + SelectedTextUTF8 = property(GetSelectedTextUTF8,doc="See `GetSelectedTextUTF8`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + SelectionEnd = property(GetSelectionEnd,SetSelectionEnd,doc="See `GetSelectionEnd` and `SetSelectionEnd`") + SelectionMode = property(GetSelectionMode,SetSelectionMode,doc="See `GetSelectionMode` and `SetSelectionMode`") + SelectionStart = property(GetSelectionStart,SetSelectionStart,doc="See `GetSelectionStart` and `SetSelectionStart`") + Status = property(GetStatus,SetStatus,doc="See `GetStatus` and `SetStatus`") + StyleBits = property(GetStyleBits,SetStyleBits,doc="See `GetStyleBits` and `SetStyleBits`") + StyleBitsNeeded = property(GetStyleBitsNeeded,doc="See `GetStyleBitsNeeded`") + TabIndents = property(GetTabIndents,SetTabIndents,doc="See `GetTabIndents` and `SetTabIndents`") + TabWidth = property(GetTabWidth,SetTabWidth,doc="See `GetTabWidth` and `SetTabWidth`") + TargetEnd = property(GetTargetEnd,SetTargetEnd,doc="See `GetTargetEnd` and `SetTargetEnd`") + TargetStart = property(GetTargetStart,SetTargetStart,doc="See `GetTargetStart` and `SetTargetStart`") + Text = property(GetText,SetText,doc="See `GetText` and `SetText`") + TextLength = property(GetTextLength,doc="See `GetTextLength`") + TextRaw = property(GetTextRaw,SetTextRaw,doc="See `GetTextRaw` and `SetTextRaw`") + TextUTF8 = property(GetTextUTF8,SetTextUTF8,doc="See `GetTextUTF8` and `SetTextUTF8`") + TwoPhaseDraw = property(GetTwoPhaseDraw,SetTwoPhaseDraw,doc="See `GetTwoPhaseDraw` and `SetTwoPhaseDraw`") + UndoCollection = property(GetUndoCollection,SetUndoCollection,doc="See `GetUndoCollection` and `SetUndoCollection`") + UseAntiAliasing = property(GetUseAntiAliasing,SetUseAntiAliasing,doc="See `GetUseAntiAliasing` and `SetUseAntiAliasing`") + UseHorizontalScrollBar = property(GetUseHorizontalScrollBar,SetUseHorizontalScrollBar,doc="See `GetUseHorizontalScrollBar` and `SetUseHorizontalScrollBar`") + UseTabs = property(GetUseTabs,SetUseTabs,doc="See `GetUseTabs` and `SetUseTabs`") + UseVerticalScrollBar = property(GetUseVerticalScrollBar,SetUseVerticalScrollBar,doc="See `GetUseVerticalScrollBar` and `SetUseVerticalScrollBar`") + ViewEOL = property(GetViewEOL,SetViewEOL,doc="See `GetViewEOL` and `SetViewEOL`") + ViewWhiteSpace = property(GetViewWhiteSpace,SetViewWhiteSpace,doc="See `GetViewWhiteSpace` and `SetViewWhiteSpace`") + WrapMode = property(GetWrapMode,SetWrapMode,doc="See `GetWrapMode` and `SetWrapMode`") + WrapStartIndent = property(GetWrapStartIndent,SetWrapStartIndent,doc="See `GetWrapStartIndent` and `SetWrapStartIndent`") + WrapVisualFlags = property(GetWrapVisualFlags,SetWrapVisualFlags,doc="See `GetWrapVisualFlags` and `SetWrapVisualFlags`") + WrapVisualFlagsLocation = property(GetWrapVisualFlagsLocation,SetWrapVisualFlagsLocation,doc="See `GetWrapVisualFlagsLocation` and `SetWrapVisualFlagsLocation`") + XOffset = property(GetXOffset,SetXOffset,doc="See `GetXOffset` and `SetXOffset`") + Zoom = property(GetZoom,SetZoom,doc="See `GetZoom` and `SetZoom`") _stc.StyledTextCtrl_swigregister(StyledTextCtrl) cvar = _stc.cvar STCNameStr = cvar.STCNameStr @@ -5466,6 +5550,29 @@ class StyledTextEvent(_core.CommandEvent): """GetAlt(self) -> bool""" return _stc.StyledTextEvent_GetAlt(*args, **kwargs) + Alt = property(GetAlt,doc="See `GetAlt`") + Control = property(GetControl,doc="See `GetControl`") + DragAllowMove = property(GetDragAllowMove,SetDragAllowMove,doc="See `GetDragAllowMove` and `SetDragAllowMove`") + DragResult = property(GetDragResult,SetDragResult,doc="See `GetDragResult` and `SetDragResult`") + DragText = property(GetDragText,SetDragText,doc="See `GetDragText` and `SetDragText`") + FoldLevelNow = property(GetFoldLevelNow,SetFoldLevelNow,doc="See `GetFoldLevelNow` and `SetFoldLevelNow`") + FoldLevelPrev = property(GetFoldLevelPrev,SetFoldLevelPrev,doc="See `GetFoldLevelPrev` and `SetFoldLevelPrev`") + Key = property(GetKey,SetKey,doc="See `GetKey` and `SetKey`") + LParam = property(GetLParam,SetLParam,doc="See `GetLParam` and `SetLParam`") + Length = property(GetLength,SetLength,doc="See `GetLength` and `SetLength`") + Line = property(GetLine,SetLine,doc="See `GetLine` and `SetLine`") + LinesAdded = property(GetLinesAdded,SetLinesAdded,doc="See `GetLinesAdded` and `SetLinesAdded`") + ListType = property(GetListType,SetListType,doc="See `GetListType` and `SetListType`") + Margin = property(GetMargin,SetMargin,doc="See `GetMargin` and `SetMargin`") + Message = property(GetMessage,SetMessage,doc="See `GetMessage` and `SetMessage`") + ModificationType = property(GetModificationType,SetModificationType,doc="See `GetModificationType` and `SetModificationType`") + Modifiers = property(GetModifiers,SetModifiers,doc="See `GetModifiers` and `SetModifiers`") + Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") + Shift = property(GetShift,doc="See `GetShift`") + Text = property(GetText,SetText,doc="See `GetText` and `SetText`") + WParam = property(GetWParam,SetWParam,doc="See `GetWParam` and `SetWParam`") + X = property(GetX,SetX,doc="See `GetX` and `SetX`") + Y = property(GetY,SetY,doc="See `GetY` and `SetY`") _stc.StyledTextEvent_swigregister(StyledTextEvent) wxEVT_STC_CHANGE = _stc.wxEVT_STC_CHANGE diff --git a/wxPython/contrib/stc/stc.i b/wxPython/contrib/stc/stc.i index 1487f75512..ab1e072404 100644 --- a/wxPython/contrib/stc/stc.i +++ b/wxPython/contrib/stc/stc.i @@ -54,6 +54,119 @@ MustHaveApp(wxStyledTextCtrl); GetCaretLineBack = GetCaretLineBackground SetCaretLineBack = SetCaretLineBackground } + + + %property(Anchor, GetAnchor, SetAnchor, doc="See `GetAnchor` and `SetAnchor`"); + %property(BackSpaceUnIndents, GetBackSpaceUnIndents, SetBackSpaceUnIndents, doc="See `GetBackSpaceUnIndents` and `SetBackSpaceUnIndents`"); + %property(BufferedDraw, GetBufferedDraw, SetBufferedDraw, doc="See `GetBufferedDraw` and `SetBufferedDraw`"); + %property(CaretForeground, GetCaretForeground, SetCaretForeground, doc="See `GetCaretForeground` and `SetCaretForeground`"); + %property(CaretLineBack, GetCaretLineBack, SetCaretLineBack, doc="See `GetCaretLineBack` and `SetCaretLineBack`"); + %property(CaretLineBackAlpha, GetCaretLineBackAlpha, SetCaretLineBackAlpha, doc="See `GetCaretLineBackAlpha` and `SetCaretLineBackAlpha`"); + %property(CaretLineBackground, GetCaretLineBackground, SetCaretLineBackground, doc="See `GetCaretLineBackground` and `SetCaretLineBackground`"); + %property(CaretLineVisible, GetCaretLineVisible, SetCaretLineVisible, doc="See `GetCaretLineVisible` and `SetCaretLineVisible`"); + %property(CaretPeriod, GetCaretPeriod, SetCaretPeriod, doc="See `GetCaretPeriod` and `SetCaretPeriod`"); + %property(CaretSticky, GetCaretSticky, SetCaretSticky, doc="See `GetCaretSticky` and `SetCaretSticky`"); + %property(CaretWidth, GetCaretWidth, SetCaretWidth, doc="See `GetCaretWidth` and `SetCaretWidth`"); + %property(CodePage, GetCodePage, SetCodePage, doc="See `GetCodePage` and `SetCodePage`"); + %property(ControlCharSymbol, GetControlCharSymbol, SetControlCharSymbol, doc="See `GetControlCharSymbol` and `SetControlCharSymbol`"); + %property(CurLine, GetCurLine, doc="See `GetCurLine`"); + %property(CurLineRaw, GetCurLineRaw, doc="See `GetCurLineRaw`"); + %property(CurLineUTF8, GetCurLineUTF8, doc="See `GetCurLineUTF8`"); + %property(CurrentLine, GetCurrentLine, doc="See `GetCurrentLine`"); + %property(CurrentPos, GetCurrentPos, SetCurrentPos, doc="See `GetCurrentPos` and `SetCurrentPos`"); + %property(DocPointer, GetDocPointer, SetDocPointer, doc="See `GetDocPointer` and `SetDocPointer`"); + %property(EOLMode, GetEOLMode, SetEOLMode, doc="See `GetEOLMode` and `SetEOLMode`"); + %property(EdgeColour, GetEdgeColour, SetEdgeColour, doc="See `GetEdgeColour` and `SetEdgeColour`"); + %property(EdgeColumn, GetEdgeColumn, SetEdgeColumn, doc="See `GetEdgeColumn` and `SetEdgeColumn`"); + %property(EdgeMode, GetEdgeMode, SetEdgeMode, doc="See `GetEdgeMode` and `SetEdgeMode`"); + %property(EndAtLastLine, GetEndAtLastLine, SetEndAtLastLine, doc="See `GetEndAtLastLine` and `SetEndAtLastLine`"); + %property(EndStyled, GetEndStyled, doc="See `GetEndStyled`"); + %property(FirstVisibleLine, GetFirstVisibleLine, doc="See `GetFirstVisibleLine`"); + %property(HighlightGuide, GetHighlightGuide, SetHighlightGuide, doc="See `GetHighlightGuide` and `SetHighlightGuide`"); + %property(Indent, GetIndent, SetIndent, doc="See `GetIndent` and `SetIndent`"); + %property(IndentationGuides, GetIndentationGuides, SetIndentationGuides, doc="See `GetIndentationGuides` and `SetIndentationGuides`"); + %property(LastKeydownProcessed, GetLastKeydownProcessed, SetLastKeydownProcessed, doc="See `GetLastKeydownProcessed` and `SetLastKeydownProcessed`"); + %property(LayoutCache, GetLayoutCache, SetLayoutCache, doc="See `GetLayoutCache` and `SetLayoutCache`"); + %property(Length, GetLength, doc="See `GetLength`"); + %property(Lexer, GetLexer, SetLexer, doc="See `GetLexer` and `SetLexer`"); + %property(LineCount, GetLineCount, doc="See `GetLineCount`"); + %property(MarginLeft, GetMarginLeft, SetMarginLeft, doc="See `GetMarginLeft` and `SetMarginLeft`"); + %property(MarginRight, GetMarginRight, SetMarginRight, doc="See `GetMarginRight` and `SetMarginRight`"); + %property(MaxLineState, GetMaxLineState, doc="See `GetMaxLineState`"); + %property(ModEventMask, GetModEventMask, SetModEventMask, doc="See `GetModEventMask` and `SetModEventMask`"); + %property(Modify, GetModify, doc="See `GetModify`"); + %property(MouseDownCaptures, GetMouseDownCaptures, SetMouseDownCaptures, doc="See `GetMouseDownCaptures` and `SetMouseDownCaptures`"); + %property(MouseDwellTime, GetMouseDwellTime, SetMouseDwellTime, doc="See `GetMouseDwellTime` and `SetMouseDwellTime`"); + %property(Overtype, GetOvertype, SetOvertype, doc="See `GetOvertype` and `SetOvertype`"); + %property(PasteConvertEndings, GetPasteConvertEndings, SetPasteConvertEndings, doc="See `GetPasteConvertEndings` and `SetPasteConvertEndings`"); + %property(PrintColourMode, GetPrintColourMode, SetPrintColourMode, doc="See `GetPrintColourMode` and `SetPrintColourMode`"); + %property(PrintMagnification, GetPrintMagnification, SetPrintMagnification, doc="See `GetPrintMagnification` and `SetPrintMagnification`"); + %property(PrintWrapMode, GetPrintWrapMode, SetPrintWrapMode, doc="See `GetPrintWrapMode` and `SetPrintWrapMode`"); + %property(ReadOnly, GetReadOnly, SetReadOnly, doc="See `GetReadOnly` and `SetReadOnly`"); + %property(STCCursor, GetSTCCursor, SetSTCCursor, doc="See `GetSTCCursor` and `SetSTCCursor`"); + %property(STCFocus, GetSTCFocus, SetSTCFocus, doc="See `GetSTCFocus` and `SetSTCFocus`"); + %property(ScrollWidth, GetScrollWidth, SetScrollWidth, doc="See `GetScrollWidth` and `SetScrollWidth`"); + %property(SearchFlags, GetSearchFlags, SetSearchFlags, doc="See `GetSearchFlags` and `SetSearchFlags`"); + %property(SelAlpha, GetSelAlpha, SetSelAlpha, doc="See `GetSelAlpha` and `SetSelAlpha`"); + %property(SelectedText, GetSelectedText, doc="See `GetSelectedText`"); + %property(SelectedTextRaw, GetSelectedTextRaw, doc="See `GetSelectedTextRaw`"); + %property(SelectedTextUTF8, GetSelectedTextUTF8, doc="See `GetSelectedTextUTF8`"); + %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`"); + %property(SelectionEnd, GetSelectionEnd, SetSelectionEnd, doc="See `GetSelectionEnd` and `SetSelectionEnd`"); + %property(SelectionMode, GetSelectionMode, SetSelectionMode, doc="See `GetSelectionMode` and `SetSelectionMode`"); + %property(SelectionStart, GetSelectionStart, SetSelectionStart, doc="See `GetSelectionStart` and `SetSelectionStart`"); + %property(Status, GetStatus, SetStatus, doc="See `GetStatus` and `SetStatus`"); + %property(StyleBits, GetStyleBits, SetStyleBits, doc="See `GetStyleBits` and `SetStyleBits`"); + %property(StyleBitsNeeded, GetStyleBitsNeeded, doc="See `GetStyleBitsNeeded`"); + %property(TabIndents, GetTabIndents, SetTabIndents, doc="See `GetTabIndents` and `SetTabIndents`"); + %property(TabWidth, GetTabWidth, SetTabWidth, doc="See `GetTabWidth` and `SetTabWidth`"); + %property(TargetEnd, GetTargetEnd, SetTargetEnd, doc="See `GetTargetEnd` and `SetTargetEnd`"); + %property(TargetStart, GetTargetStart, SetTargetStart, doc="See `GetTargetStart` and `SetTargetStart`"); + %property(Text, GetText, SetText, doc="See `GetText` and `SetText`"); + %property(TextLength, GetTextLength, doc="See `GetTextLength`"); + %property(TextRaw, GetTextRaw, SetTextRaw, doc="See `GetTextRaw` and `SetTextRaw`"); + %property(TextUTF8, GetTextUTF8, SetTextUTF8, doc="See `GetTextUTF8` and `SetTextUTF8`"); + %property(TwoPhaseDraw, GetTwoPhaseDraw, SetTwoPhaseDraw, doc="See `GetTwoPhaseDraw` and `SetTwoPhaseDraw`"); + %property(UndoCollection, GetUndoCollection, SetUndoCollection, doc="See `GetUndoCollection` and `SetUndoCollection`"); + %property(UseAntiAliasing, GetUseAntiAliasing, SetUseAntiAliasing, doc="See `GetUseAntiAliasing` and `SetUseAntiAliasing`"); + %property(UseHorizontalScrollBar, GetUseHorizontalScrollBar, SetUseHorizontalScrollBar, doc="See `GetUseHorizontalScrollBar` and `SetUseHorizontalScrollBar`"); + %property(UseTabs, GetUseTabs, SetUseTabs, doc="See `GetUseTabs` and `SetUseTabs`"); + %property(UseVerticalScrollBar, GetUseVerticalScrollBar, SetUseVerticalScrollBar, doc="See `GetUseVerticalScrollBar` and `SetUseVerticalScrollBar`"); + %property(ViewEOL, GetViewEOL, SetViewEOL, doc="See `GetViewEOL` and `SetViewEOL`"); + %property(ViewWhiteSpace, GetViewWhiteSpace, SetViewWhiteSpace, doc="See `GetViewWhiteSpace` and `SetViewWhiteSpace`"); + %property(WrapMode, GetWrapMode, SetWrapMode, doc="See `GetWrapMode` and `SetWrapMode`"); + %property(WrapStartIndent, GetWrapStartIndent, SetWrapStartIndent, doc="See `GetWrapStartIndent` and `SetWrapStartIndent`"); + %property(WrapVisualFlags, GetWrapVisualFlags, SetWrapVisualFlags, doc="See `GetWrapVisualFlags` and `SetWrapVisualFlags`"); + %property(WrapVisualFlagsLocation, GetWrapVisualFlagsLocation, SetWrapVisualFlagsLocation, doc="See `GetWrapVisualFlagsLocation` and `SetWrapVisualFlagsLocation`"); + %property(XOffset, GetXOffset, SetXOffset, doc="See `GetXOffset` and `SetXOffset`"); + %property(Zoom, GetZoom, SetZoom, doc="See `GetZoom` and `SetZoom`"); +} + + +%extend wxStyledTextEvent { + %property(Alt, GetAlt, doc="See `GetAlt`"); + %property(Control, GetControl, doc="See `GetControl`"); + %property(DragAllowMove, GetDragAllowMove, SetDragAllowMove, doc="See `GetDragAllowMove` and `SetDragAllowMove`"); + %property(DragResult, GetDragResult, SetDragResult, doc="See `GetDragResult` and `SetDragResult`"); + %property(DragText, GetDragText, SetDragText, doc="See `GetDragText` and `SetDragText`"); + %property(FoldLevelNow, GetFoldLevelNow, SetFoldLevelNow, doc="See `GetFoldLevelNow` and `SetFoldLevelNow`"); + %property(FoldLevelPrev, GetFoldLevelPrev, SetFoldLevelPrev, doc="See `GetFoldLevelPrev` and `SetFoldLevelPrev`"); + %property(Key, GetKey, SetKey, doc="See `GetKey` and `SetKey`"); + %property(LParam, GetLParam, SetLParam, doc="See `GetLParam` and `SetLParam`"); + %property(Length, GetLength, SetLength, doc="See `GetLength` and `SetLength`"); + %property(Line, GetLine, SetLine, doc="See `GetLine` and `SetLine`"); + %property(LinesAdded, GetLinesAdded, SetLinesAdded, doc="See `GetLinesAdded` and `SetLinesAdded`"); + %property(ListType, GetListType, SetListType, doc="See `GetListType` and `SetListType`"); + %property(Margin, GetMargin, SetMargin, doc="See `GetMargin` and `SetMargin`"); + %property(Message, GetMessage, SetMessage, doc="See `GetMessage` and `SetMessage`"); + %property(ModificationType, GetModificationType, SetModificationType, doc="See `GetModificationType` and `SetModificationType`"); + %property(Modifiers, GetModifiers, SetModifiers, doc="See `GetModifiers` and `SetModifiers`"); + %property(Position, GetPosition, SetPosition, doc="See `GetPosition` and `SetPosition`"); + %property(Shift, GetShift, doc="See `GetShift`"); + %property(Text, GetText, SetText, doc="See `GetText` and `SetText`"); + %property(WParam, GetWParam, SetWParam, doc="See `GetWParam` and `SetWParam`"); + %property(X, GetX, SetX, doc="See `GetX` and `SetX`"); + %property(Y, GetY, SetY, doc="See `GetY` and `SetY`"); } //--------------------------------------------------------------------------- diff --git a/wxPython/src/_xml.i b/wxPython/src/_xml.i index 6b60b96a3a..13d3a21af5 100644 --- a/wxPython/src/_xml.i +++ b/wxPython/src/_xml.i @@ -59,6 +59,10 @@ public: void SetName(const wxString& name); void SetValue(const wxString& value); void SetNext(wxXmlProperty *next); + + %property(Name, GetName, SetName, doc="See `GetName` and `SetName`"); + %property(Next, GetNext, SetNext, doc="See `GetNext` and `SetNext`"); + %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`"); }; @@ -128,6 +132,14 @@ public: void SetChildren(wxXmlNode *child); void SetProperties(wxXmlProperty *prop); + + %property(Children, GetChildren, SetChildren, doc="See `GetChildren` and `SetChildren`"); + %property(Content, GetContent, SetContent, doc="See `GetContent` and `SetContent`"); + %property(Name, GetName, SetName, doc="See `GetName` and `SetName`"); + %property(Next, GetNext, SetNext, doc="See `GetNext` and `SetNext`"); + %property(Parent, GetParent, SetParent, doc="See `GetParent` and `SetParent`"); + %property(Properties, GetProperties, SetProperties, doc="See `GetProperties` and `SetProperties`"); + %property(Type, GetType, SetType, doc="See `GetType` and `SetType`"); }; @@ -210,6 +222,10 @@ public: // %#endif // } // } + + %property(FileEncoding, GetFileEncoding, SetFileEncoding, doc="See `GetFileEncoding` and `SetFileEncoding`"); + %property(Root, GetRoot, SetRoot, doc="See `GetRoot` and `SetRoot`"); + %property(Version, GetVersion, SetVersion, doc="See `GetVersion` and `SetVersion`"); }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_xmlhandler.i b/wxPython/src/_xmlhandler.i index 5269a40d45..9ae1038f41 100644 --- a/wxPython/src/_xmlhandler.i +++ b/wxPython/src/_xmlhandler.i @@ -258,6 +258,16 @@ public: // helper wxFileSystem& GetCurFileSystem(); + + %property(Class, GetClass, doc="See `GetClass`"); + %property(CurFileSystem, GetCurFileSystem, doc="See `GetCurFileSystem`"); + %property(ID, GetID, doc="See `GetID`"); + %property(Instance, GetInstance, doc="See `GetInstance`"); + %property(Name, GetName, doc="See `GetName`"); + %property(Node, GetNode, doc="See `GetNode`"); + %property(Parent, GetParent, doc="See `GetParent`"); + %property(ParentAsWindow, GetParentAsWindow, doc="See `GetParentAsWindow`"); + %property(Resource, GetResource, doc="See `GetResource`"); }; diff --git a/wxPython/src/_xmlres.i b/wxPython/src/_xmlres.i index 63090843c5..4d007b8786 100644 --- a/wxPython/src/_xmlres.i +++ b/wxPython/src/_xmlres.i @@ -209,6 +209,10 @@ public: // Get/Set the domain to be passed to the translation functions, defaults to NULL. wxString GetDomain() const; void SetDomain(const wxString& domain); + + %property(Domain, GetDomain, SetDomain, doc="See `GetDomain` and `SetDomain`"); + %property(Flags, GetFlags, SetFlags, doc="See `GetFlags` and `SetFlags`"); + %property(Version, GetVersion, doc="See `GetVersion`"); }; //---------------------------------------------------------------------- diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i index 5262a244e6..0c7718da11 100644 --- a/wxPython/src/grid.i +++ b/wxPython/src/grid.i @@ -678,6 +678,9 @@ public: void SetWidth(int width); int GetPrecision() const; void SetPrecision(int precision); + + %property(Precision, GetPrecision, SetPrecision, doc="See `GetPrecision` and `SetPrecision`"); + %property(Width, GetWidth, SetWidth, doc="See `GetWidth` and `SetWidth`"); }; @@ -718,7 +721,7 @@ public: // wxGridCellEditor is an ABC, and several derived classes are available. // Classes implemented in Python should be derived from wxPyGridCellEditor. -class wxGridCellEditor : public wxGridCellWorker +class wxGridCellEditor : public wxGridCellWorker { public: bool IsCreated(); @@ -747,6 +750,8 @@ public: %pythonAppend Destroy "args[0].thisown = 0" virtual void Destroy(); + %property(CellAttr, GetCellAttr, SetCellAttr, doc="See `GetCellAttr` and `SetCellAttr`"); + %property(Control, GetControl, SetControl, doc="See `GetControl` and `SetControl`"); }; @@ -910,6 +915,8 @@ public: %pythonAppend wxGridCellTextEditor "self._setOORInfo(self)" wxGridCellTextEditor(); virtual wxString GetValue(); + + %property(Value, GetValue, doc="See `GetValue`"); }; @@ -918,7 +925,6 @@ class wxGridCellNumberEditor : public wxGridCellTextEditor public: %pythonAppend wxGridCellNumberEditor "self._setOORInfo(self)" wxGridCellNumberEditor(int min = -1, int max = -1); - virtual wxString GetValue(); }; @@ -927,7 +933,6 @@ class wxGridCellFloatEditor : public wxGridCellTextEditor public: %pythonAppend wxGridCellFloatEditor "self._setOORInfo(self)" wxGridCellFloatEditor(int width = -1, int precision = -1); - virtual wxString GetValue(); }; @@ -936,7 +941,6 @@ class wxGridCellBoolEditor : public wxGridCellEditor public: %pythonAppend wxGridCellBoolEditor "self._setOORInfo(self)" wxGridCellBoolEditor(); - virtual wxString GetValue(); }; class wxGridCellChoiceEditor : public wxGridCellEditor @@ -946,7 +950,6 @@ public: wxGridCellChoiceEditor(int choices = 0, const wxString* choices_array = NULL, bool allowOthers = false); - virtual wxString GetValue(); }; @@ -955,7 +958,6 @@ class wxGridCellEnumEditor : public wxGridCellChoiceEditor public: %pythonAppend wxGridCellEnumEditor "self._setOORInfo(self)" wxGridCellEnumEditor( const wxString& choices = wxPyEmptyString ); - virtual wxString GetValue(); }; @@ -964,7 +966,6 @@ class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor public: %pythonAppend wxGridCellAutoWrapStringEditor "self._setOORInfo(self)" wxGridCellAutoWrapStringEditor(); - virtual wxString GetValue(); }; @@ -1049,6 +1050,14 @@ public: bool IsReadOnly() const; wxAttrKind GetKind(); void SetDefAttr(wxGridCellAttr* defAttr); + + %property(Alignment, GetAlignment, SetAlignment, doc="See `GetAlignment` and `SetAlignment`"); + %property(BackgroundColour, GetBackgroundColour, SetBackgroundColour, doc="See `GetBackgroundColour` and `SetBackgroundColour`"); + %property(Font, GetFont, SetFont, doc="See `GetFont` and `SetFont`"); + %property(Kind, GetKind, SetKind, doc="See `GetKind` and `SetKind`"); + %property(Overflow, GetOverflow, SetOverflow, doc="See `GetOverflow` and `SetOverflow`"); + %property(Size, GetSize, SetSize, doc="See `GetSize` and `SetSize`"); + %property(TextColour, GetTextColour, SetTextColour, doc="See `GetTextColour` and `SetTextColour`"); }; //--------------------------------------------------------------------------- @@ -1183,6 +1192,10 @@ public: virtual void SetRowAttr(wxGridCellAttr *attr, int row); virtual void SetColAttr(wxGridCellAttr *attr, int col); + %property(AttrProvider, GetAttrProvider, SetAttrProvider, doc="See `GetAttrProvider` and `SetAttrProvider`"); + %property(NumberCols, GetNumberCols, doc="See `GetNumberCols`"); + %property(NumberRows, GetNumberRows, doc="See `GetNumberRows`"); + %property(View, GetView, SetView, doc="See `GetView` and `SetView`"); }; @@ -1418,6 +1431,11 @@ public: int GetCommandInt(); void SetCommandInt2( int comInt2 ); int GetCommandInt2(); + + %property(CommandInt, GetCommandInt, SetCommandInt, doc="See `GetCommandInt` and `SetCommandInt`"); + %property(CommandInt2, GetCommandInt2, SetCommandInt2, doc="See `GetCommandInt2` and `SetCommandInt2`"); + %property(Id, GetId, SetId, doc="See `GetId` and `SetId`"); + %property(TableObject, GetTableObject, SetTableObject, doc="See `GetTableObject` and `SetTableObject`"); }; @@ -1580,6 +1598,8 @@ public: else: raise IndexError } + %property(Col, GetCol, SetCol, doc="See `GetCol` and `SetCol`"); + %property(Row, GetRow, SetRow, doc="See `GetRow` and `SetRow`"); }; @@ -1888,7 +1908,7 @@ public: DocDeclA( void, GetCellAlignment( int row, int col, int *OUTPUT, int *OUTPUT ), - "GetCellAlignment() -> (horiz, vert)"); + "GetCellAlignment(int row, int col) -> (horiz, vert)"); bool GetDefaultCellOverflow(); bool GetCellOverflow( int row, int col ); @@ -2056,6 +2076,55 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(BatchCount, GetBatchCount, doc="See `GetBatchCount`"); + %property(CellHighlightColour, GetCellHighlightColour, SetCellHighlightColour, doc="See `GetCellHighlightColour` and `SetCellHighlightColour`"); + %property(CellHighlightPenWidth, GetCellHighlightPenWidth, SetCellHighlightPenWidth, doc="See `GetCellHighlightPenWidth` and `SetCellHighlightPenWidth`"); + %property(CellHighlightROPenWidth, GetCellHighlightROPenWidth, SetCellHighlightROPenWidth, doc="See `GetCellHighlightROPenWidth` and `SetCellHighlightROPenWidth`"); + %property(CellSize, GetCellSize, SetCellSize, doc="See `GetCellSize` and `SetCellSize`"); + %property(ColLabelAlignment, GetColLabelAlignment, SetColLabelAlignment, doc="See `GetColLabelAlignment` and `SetColLabelAlignment`"); + %property(ColLabelSize, GetColLabelSize, SetColLabelSize, doc="See `GetColLabelSize` and `SetColLabelSize`"); + %property(ColLabelTextOrientation, GetColLabelTextOrientation, SetColLabelTextOrientation, doc="See `GetColLabelTextOrientation` and `SetColLabelTextOrientation`"); + %property(ColMinimalAcceptableWidth, GetColMinimalAcceptableWidth, SetColMinimalAcceptableWidth, doc="See `GetColMinimalAcceptableWidth` and `SetColMinimalAcceptableWidth`"); + %property(DefaultCellAlignment, GetDefaultCellAlignment, SetDefaultCellAlignment, doc="See `GetDefaultCellAlignment` and `SetDefaultCellAlignment`"); + %property(DefaultCellBackgroundColour, GetDefaultCellBackgroundColour, SetDefaultCellBackgroundColour, doc="See `GetDefaultCellBackgroundColour` and `SetDefaultCellBackgroundColour`"); + %property(DefaultCellFont, GetDefaultCellFont, SetDefaultCellFont, doc="See `GetDefaultCellFont` and `SetDefaultCellFont`"); + %property(DefaultCellOverflow, GetDefaultCellOverflow, SetDefaultCellOverflow, doc="See `GetDefaultCellOverflow` and `SetDefaultCellOverflow`"); + %property(DefaultCellTextColour, GetDefaultCellTextColour, SetDefaultCellTextColour, doc="See `GetDefaultCellTextColour` and `SetDefaultCellTextColour`"); + %property(DefaultColLabelSize, GetDefaultColLabelSize, doc="See `GetDefaultColLabelSize`"); + %property(DefaultColSize, GetDefaultColSize, SetDefaultColSize, doc="See `GetDefaultColSize` and `SetDefaultColSize`"); + %property(DefaultEditor, GetDefaultEditor, SetDefaultEditor, doc="See `GetDefaultEditor` and `SetDefaultEditor`"); + %property(DefaultGridLinePen, GetDefaultGridLinePen, doc="See `GetDefaultGridLinePen`"); + %property(DefaultRenderer, GetDefaultRenderer, SetDefaultRenderer, doc="See `GetDefaultRenderer` and `SetDefaultRenderer`"); + %property(DefaultRowLabelSize, GetDefaultRowLabelSize, doc="See `GetDefaultRowLabelSize`"); + %property(DefaultRowSize, GetDefaultRowSize, SetDefaultRowSize, doc="See `GetDefaultRowSize` and `SetDefaultRowSize`"); + %property(GridColLabelWindow, GetGridColLabelWindow, doc="See `GetGridColLabelWindow`"); + %property(GridCornerLabelWindow, GetGridCornerLabelWindow, doc="See `GetGridCornerLabelWindow`"); + %property(GridCursorCol, GetGridCursorCol, doc="See `GetGridCursorCol`"); + %property(GridCursorRow, GetGridCursorRow, doc="See `GetGridCursorRow`"); + %property(GridLineColour, GetGridLineColour, SetGridLineColour, doc="See `GetGridLineColour` and `SetGridLineColour`"); + %property(GridRowLabelWindow, GetGridRowLabelWindow, doc="See `GetGridRowLabelWindow`"); + %property(GridWindow, GetGridWindow, doc="See `GetGridWindow`"); + %property(LabelBackgroundColour, GetLabelBackgroundColour, SetLabelBackgroundColour, doc="See `GetLabelBackgroundColour` and `SetLabelBackgroundColour`"); + %property(LabelFont, GetLabelFont, SetLabelFont, doc="See `GetLabelFont` and `SetLabelFont`"); + %property(LabelTextColour, GetLabelTextColour, SetLabelTextColour, doc="See `GetLabelTextColour` and `SetLabelTextColour`"); + %property(NumberCols, GetNumberCols, doc="See `GetNumberCols`"); + %property(NumberRows, GetNumberRows, doc="See `GetNumberRows`"); + %property(RowLabelAlignment, GetRowLabelAlignment, SetRowLabelAlignment, doc="See `GetRowLabelAlignment` and `SetRowLabelAlignment`"); + %property(RowLabelSize, GetRowLabelSize, SetRowLabelSize, doc="See `GetRowLabelSize` and `SetRowLabelSize`"); + %property(RowMinimalAcceptableHeight, GetRowMinimalAcceptableHeight, SetRowMinimalAcceptableHeight, doc="See `GetRowMinimalAcceptableHeight` and `SetRowMinimalAcceptableHeight`"); + %property(ScrollLineX, GetScrollLineX, SetScrollLineX, doc="See `GetScrollLineX` and `SetScrollLineX`"); + %property(ScrollLineY, GetScrollLineY, SetScrollLineY, doc="See `GetScrollLineY` and `SetScrollLineY`"); + %property(SelectedCells, GetSelectedCells, doc="See `GetSelectedCells`"); + %property(SelectedCols, GetSelectedCols, doc="See `GetSelectedCols`"); + %property(SelectedRows, GetSelectedRows, doc="See `GetSelectedRows`"); + %property(SelectionBackground, GetSelectionBackground, SetSelectionBackground, doc="See `GetSelectionBackground` and `SetSelectionBackground`"); + %property(SelectionBlockBottomRight, GetSelectionBlockBottomRight, doc="See `GetSelectionBlockBottomRight`"); + %property(SelectionBlockTopLeft, GetSelectionBlockTopLeft, doc="See `GetSelectionBlockTopLeft`"); + %property(SelectionForeground, GetSelectionForeground, SetSelectionForeground, doc="See `GetSelectionForeground` and `SetSelectionForeground`"); + %property(SelectionMode, GetSelectionMode, SetSelectionMode, doc="See `GetSelectionMode` and `SetSelectionMode`"); + %property(Table, GetTable, SetTable, doc="See `GetTable` and `SetTable`"); + }; @@ -2081,6 +2150,10 @@ public: bool ShiftDown(); bool AltDown(); bool CmdDown(); + + %property(Col, GetCol, doc="See `GetCol`"); + %property(Position, GetPosition, doc="See `GetPosition`"); + %property(Row, GetRow, doc="See `GetRow`"); }; @@ -2098,6 +2171,9 @@ public: bool ShiftDown(); bool AltDown(); bool CmdDown(); + + %property(Position, GetPosition, doc="See `GetPosition`"); + %property(RowOrCol, GetRowOrCol, doc="See `GetRowOrCol`"); }; @@ -2123,6 +2199,13 @@ public: bool ShiftDown(); bool AltDown(); bool CmdDown(); + + %property(BottomRightCoords, GetBottomRightCoords, doc="See `GetBottomRightCoords`"); + %property(BottomRow, GetBottomRow, doc="See `GetBottomRow`"); + %property(LeftCol, GetLeftCol, doc="See `GetLeftCol`"); + %property(RightCol, GetRightCol, doc="See `GetRightCol`"); + %property(TopLeftCoords, GetTopLeftCoords, doc="See `GetTopLeftCoords`"); + %property(TopRow, GetTopRow, doc="See `GetTopRow`"); }; @@ -2137,6 +2220,10 @@ public: void SetRow(int row); void SetCol(int col); void SetControl(wxControl* ctrl); + + %property(Col, GetCol, SetCol, doc="See `GetCol` and `SetCol`"); + %property(Control, GetControl, SetControl, doc="See `GetControl` and `SetControl`"); + %property(Row, GetRow, SetRow, doc="See `GetRow` and `SetRow`"); }; diff --git a/wxPython/src/gtk/grid.py b/wxPython/src/gtk/grid.py index c3ce9b7097..03e3018e71 100644 --- a/wxPython/src/gtk/grid.py +++ b/wxPython/src/gtk/grid.py @@ -184,6 +184,8 @@ class GridCellFloatRenderer(GridCellStringRenderer): """SetPrecision(self, int precision)""" return _grid.GridCellFloatRenderer_SetPrecision(*args, **kwargs) + Precision = property(GetPrecision,SetPrecision,doc="See `GetPrecision` and `SetPrecision`") + Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") _grid.GridCellFloatRenderer_swigregister(GridCellFloatRenderer) class GridCellBoolRenderer(GridCellRenderer): @@ -309,6 +311,8 @@ class GridCellEditor(GridCellWorker): args[0].thisown = 0 return val + CellAttr = property(GetCellAttr,SetCellAttr,doc="See `GetCellAttr` and `SetCellAttr`") + Control = property(GetControl,SetControl,doc="See `GetControl` and `SetControl`") _grid.GridCellEditor_swigregister(GridCellEditor) class PyGridCellEditor(GridCellEditor): @@ -388,6 +392,7 @@ class GridCellTextEditor(GridCellEditor): """GetValue(self) -> String""" return _grid.GridCellTextEditor_GetValue(*args, **kwargs) + Value = property(GetValue,doc="See `GetValue`") _grid.GridCellTextEditor_swigregister(GridCellTextEditor) class GridCellNumberEditor(GridCellTextEditor): @@ -421,10 +426,6 @@ class GridCellBoolEditor(GridCellEditor): _grid.GridCellBoolEditor_swiginit(self,_grid.new_GridCellBoolEditor(*args, **kwargs)) self._setOORInfo(self) - def GetValue(*args, **kwargs): - """GetValue(self) -> String""" - return _grid.GridCellBoolEditor_GetValue(*args, **kwargs) - _grid.GridCellBoolEditor_swigregister(GridCellBoolEditor) class GridCellChoiceEditor(GridCellEditor): @@ -436,10 +437,6 @@ class GridCellChoiceEditor(GridCellEditor): _grid.GridCellChoiceEditor_swiginit(self,_grid.new_GridCellChoiceEditor(*args, **kwargs)) self._setOORInfo(self) - def GetValue(*args, **kwargs): - """GetValue(self) -> String""" - return _grid.GridCellChoiceEditor_GetValue(*args, **kwargs) - _grid.GridCellChoiceEditor_swigregister(GridCellChoiceEditor) class GridCellEnumEditor(GridCellChoiceEditor): @@ -617,6 +614,13 @@ class GridCellAttr(object): """SetDefAttr(self, GridCellAttr defAttr)""" return _grid.GridCellAttr_SetDefAttr(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") + Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") + Kind = property(GetKind,SetKind,doc="See `GetKind` and `SetKind`") + Overflow = property(GetOverflow,SetOverflow,doc="See `GetOverflow` and `SetOverflow`") + Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") + TextColour = property(GetTextColour,SetTextColour,doc="See `GetTextColour` and `SetTextColour`") _grid.GridCellAttr_swigregister(GridCellAttr) class GridCellAttrProvider(object): @@ -856,6 +860,10 @@ class GridTableBase(_core.Object): """SetColAttr(self, GridCellAttr attr, int col)""" return _grid.GridTableBase_SetColAttr(*args, **kwargs) + AttrProvider = property(GetAttrProvider,SetAttrProvider,doc="See `GetAttrProvider` and `SetAttrProvider`") + NumberCols = property(GetNumberCols,doc="See `GetNumberCols`") + NumberRows = property(GetNumberRows,doc="See `GetNumberRows`") + View = property(GetView,SetView,doc="See `GetView` and `SetView`") _grid.GridTableBase_swigregister(GridTableBase) class PyGridTableBase(GridTableBase): @@ -1038,6 +1046,10 @@ class GridTableMessage(object): """GetCommandInt2(self) -> int""" return _grid.GridTableMessage_GetCommandInt2(*args, **kwargs) + CommandInt = property(GetCommandInt,SetCommandInt,doc="See `GetCommandInt` and `SetCommandInt`") + CommandInt2 = property(GetCommandInt2,SetCommandInt2,doc="See `GetCommandInt2` and `SetCommandInt2`") + Id = property(GetId,SetId,doc="See `GetId` and `SetId`") + TableObject = property(GetTableObject,SetTableObject,doc="See `GetTableObject` and `SetTableObject`") _grid.GridTableMessage_swigregister(GridTableMessage) class GridCellCoords(object): @@ -1099,6 +1111,8 @@ class GridCellCoords(object): elif index == 1: self.SetCol(val) else: raise IndexError + Col = property(GetCol,SetCol,doc="See `GetCol` and `SetCol`") + Row = property(GetRow,SetRow,doc="See `GetRow` and `SetRow`") _grid.GridCellCoords_swigregister(GridCellCoords) class Grid(_windows.ScrolledWindow): @@ -1625,7 +1639,7 @@ class Grid(_windows.ScrolledWindow): return _grid.Grid_GetDefaultCellAlignment(*args, **kwargs) def GetCellAlignment(*args, **kwargs): - """GetCellAlignment() -> (horiz, vert)""" + """GetCellAlignment(int row, int col) -> (horiz, vert)""" return _grid.Grid_GetCellAlignment(*args, **kwargs) def GetDefaultCellOverflow(*args, **kwargs): @@ -1977,6 +1991,53 @@ class Grid(_windows.ScrolledWindow): return _grid.Grid_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + BatchCount = property(GetBatchCount,doc="See `GetBatchCount`") + CellHighlightColour = property(GetCellHighlightColour,SetCellHighlightColour,doc="See `GetCellHighlightColour` and `SetCellHighlightColour`") + CellHighlightPenWidth = property(GetCellHighlightPenWidth,SetCellHighlightPenWidth,doc="See `GetCellHighlightPenWidth` and `SetCellHighlightPenWidth`") + CellHighlightROPenWidth = property(GetCellHighlightROPenWidth,SetCellHighlightROPenWidth,doc="See `GetCellHighlightROPenWidth` and `SetCellHighlightROPenWidth`") + CellSize = property(GetCellSize,SetCellSize,doc="See `GetCellSize` and `SetCellSize`") + ColLabelAlignment = property(GetColLabelAlignment,SetColLabelAlignment,doc="See `GetColLabelAlignment` and `SetColLabelAlignment`") + ColLabelSize = property(GetColLabelSize,SetColLabelSize,doc="See `GetColLabelSize` and `SetColLabelSize`") + ColLabelTextOrientation = property(GetColLabelTextOrientation,SetColLabelTextOrientation,doc="See `GetColLabelTextOrientation` and `SetColLabelTextOrientation`") + ColMinimalAcceptableWidth = property(GetColMinimalAcceptableWidth,SetColMinimalAcceptableWidth,doc="See `GetColMinimalAcceptableWidth` and `SetColMinimalAcceptableWidth`") + DefaultCellAlignment = property(GetDefaultCellAlignment,SetDefaultCellAlignment,doc="See `GetDefaultCellAlignment` and `SetDefaultCellAlignment`") + DefaultCellBackgroundColour = property(GetDefaultCellBackgroundColour,SetDefaultCellBackgroundColour,doc="See `GetDefaultCellBackgroundColour` and `SetDefaultCellBackgroundColour`") + DefaultCellFont = property(GetDefaultCellFont,SetDefaultCellFont,doc="See `GetDefaultCellFont` and `SetDefaultCellFont`") + DefaultCellOverflow = property(GetDefaultCellOverflow,SetDefaultCellOverflow,doc="See `GetDefaultCellOverflow` and `SetDefaultCellOverflow`") + DefaultCellTextColour = property(GetDefaultCellTextColour,SetDefaultCellTextColour,doc="See `GetDefaultCellTextColour` and `SetDefaultCellTextColour`") + DefaultColLabelSize = property(GetDefaultColLabelSize,doc="See `GetDefaultColLabelSize`") + DefaultColSize = property(GetDefaultColSize,SetDefaultColSize,doc="See `GetDefaultColSize` and `SetDefaultColSize`") + DefaultEditor = property(GetDefaultEditor,SetDefaultEditor,doc="See `GetDefaultEditor` and `SetDefaultEditor`") + DefaultGridLinePen = property(GetDefaultGridLinePen,doc="See `GetDefaultGridLinePen`") + DefaultRenderer = property(GetDefaultRenderer,SetDefaultRenderer,doc="See `GetDefaultRenderer` and `SetDefaultRenderer`") + DefaultRowLabelSize = property(GetDefaultRowLabelSize,doc="See `GetDefaultRowLabelSize`") + DefaultRowSize = property(GetDefaultRowSize,SetDefaultRowSize,doc="See `GetDefaultRowSize` and `SetDefaultRowSize`") + GridColLabelWindow = property(GetGridColLabelWindow,doc="See `GetGridColLabelWindow`") + GridCornerLabelWindow = property(GetGridCornerLabelWindow,doc="See `GetGridCornerLabelWindow`") + GridCursorCol = property(GetGridCursorCol,doc="See `GetGridCursorCol`") + GridCursorRow = property(GetGridCursorRow,doc="See `GetGridCursorRow`") + GridLineColour = property(GetGridLineColour,SetGridLineColour,doc="See `GetGridLineColour` and `SetGridLineColour`") + GridRowLabelWindow = property(GetGridRowLabelWindow,doc="See `GetGridRowLabelWindow`") + GridWindow = property(GetGridWindow,doc="See `GetGridWindow`") + LabelBackgroundColour = property(GetLabelBackgroundColour,SetLabelBackgroundColour,doc="See `GetLabelBackgroundColour` and `SetLabelBackgroundColour`") + LabelFont = property(GetLabelFont,SetLabelFont,doc="See `GetLabelFont` and `SetLabelFont`") + LabelTextColour = property(GetLabelTextColour,SetLabelTextColour,doc="See `GetLabelTextColour` and `SetLabelTextColour`") + NumberCols = property(GetNumberCols,doc="See `GetNumberCols`") + NumberRows = property(GetNumberRows,doc="See `GetNumberRows`") + RowLabelAlignment = property(GetRowLabelAlignment,SetRowLabelAlignment,doc="See `GetRowLabelAlignment` and `SetRowLabelAlignment`") + RowLabelSize = property(GetRowLabelSize,SetRowLabelSize,doc="See `GetRowLabelSize` and `SetRowLabelSize`") + RowMinimalAcceptableHeight = property(GetRowMinimalAcceptableHeight,SetRowMinimalAcceptableHeight,doc="See `GetRowMinimalAcceptableHeight` and `SetRowMinimalAcceptableHeight`") + ScrollLineX = property(GetScrollLineX,SetScrollLineX,doc="See `GetScrollLineX` and `SetScrollLineX`") + ScrollLineY = property(GetScrollLineY,SetScrollLineY,doc="See `GetScrollLineY` and `SetScrollLineY`") + SelectedCells = property(GetSelectedCells,doc="See `GetSelectedCells`") + SelectedCols = property(GetSelectedCols,doc="See `GetSelectedCols`") + SelectedRows = property(GetSelectedRows,doc="See `GetSelectedRows`") + SelectionBackground = property(GetSelectionBackground,SetSelectionBackground,doc="See `GetSelectionBackground` and `SetSelectionBackground`") + SelectionBlockBottomRight = property(GetSelectionBlockBottomRight,doc="See `GetSelectionBlockBottomRight`") + SelectionBlockTopLeft = property(GetSelectionBlockTopLeft,doc="See `GetSelectionBlockTopLeft`") + SelectionForeground = property(GetSelectionForeground,SetSelectionForeground,doc="See `GetSelectionForeground` and `SetSelectionForeground`") + SelectionMode = property(GetSelectionMode,SetSelectionMode,doc="See `GetSelectionMode` and `SetSelectionMode`") + Table = property(GetTable,SetTable,doc="See `GetTable` and `SetTable`") _grid.Grid_swigregister(Grid) def PreGrid(*args, **kwargs): @@ -2049,6 +2110,9 @@ class GridEvent(_core.NotifyEvent): """CmdDown(self) -> bool""" return _grid.GridEvent_CmdDown(*args, **kwargs) + Col = property(GetCol,doc="See `GetCol`") + Position = property(GetPosition,doc="See `GetPosition`") + Row = property(GetRow,doc="See `GetRow`") _grid.GridEvent_swigregister(GridEvent) class GridSizeEvent(_core.NotifyEvent): @@ -2090,6 +2154,8 @@ class GridSizeEvent(_core.NotifyEvent): """CmdDown(self) -> bool""" return _grid.GridSizeEvent_CmdDown(*args, **kwargs) + Position = property(GetPosition,doc="See `GetPosition`") + RowOrCol = property(GetRowOrCol,doc="See `GetRowOrCol`") _grid.GridSizeEvent_swigregister(GridSizeEvent) class GridRangeSelectEvent(_core.NotifyEvent): @@ -2152,6 +2218,12 @@ class GridRangeSelectEvent(_core.NotifyEvent): """CmdDown(self) -> bool""" return _grid.GridRangeSelectEvent_CmdDown(*args, **kwargs) + BottomRightCoords = property(GetBottomRightCoords,doc="See `GetBottomRightCoords`") + BottomRow = property(GetBottomRow,doc="See `GetBottomRow`") + LeftCol = property(GetLeftCol,doc="See `GetLeftCol`") + RightCol = property(GetRightCol,doc="See `GetRightCol`") + TopLeftCoords = property(GetTopLeftCoords,doc="See `GetTopLeftCoords`") + TopRow = property(GetTopRow,doc="See `GetTopRow`") _grid.GridRangeSelectEvent_swigregister(GridRangeSelectEvent) class GridEditorCreatedEvent(_core.CommandEvent): @@ -2188,6 +2260,9 @@ class GridEditorCreatedEvent(_core.CommandEvent): """SetControl(self, Control ctrl)""" return _grid.GridEditorCreatedEvent_SetControl(*args, **kwargs) + Col = property(GetCol,SetCol,doc="See `GetCol` and `SetCol`") + Control = property(GetControl,SetControl,doc="See `GetControl` and `SetControl`") + Row = property(GetRow,SetRow,doc="See `GetRow` and `SetRow`") _grid.GridEditorCreatedEvent_swigregister(GridEditorCreatedEvent) wxEVT_GRID_CELL_LEFT_CLICK = _grid.wxEVT_GRID_CELL_LEFT_CLICK diff --git a/wxPython/src/gtk/grid_wrap.cpp b/wxPython/src/gtk/grid_wrap.cpp index a7047eecd3..100d3094a4 100644 --- a/wxPython/src/gtk/grid_wrap.cpp +++ b/wxPython/src/gtk/grid_wrap.cpp @@ -5504,40 +5504,6 @@ fail: } -SWIGINTERN PyObject *_wrap_GridCellBoolEditor_GetValue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxGridCellBoolEditor *arg1 = (wxGridCellBoolEditor *) 0 ; - wxString result; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridCellBoolEditor, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellBoolEditor_GetValue" "', expected argument " "1"" of type '" "wxGridCellBoolEditor *""'"); - } - arg1 = reinterpret_cast< wxGridCellBoolEditor * >(argp1); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetValue(); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); -#else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); -#endif - } - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *GridCellBoolEditor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -5597,40 +5563,6 @@ fail: } -SWIGINTERN PyObject *_wrap_GridCellChoiceEditor_GetValue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxGridCellChoiceEditor *arg1 = (wxGridCellChoiceEditor *) 0 ; - wxString result; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridCellChoiceEditor, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellChoiceEditor_GetValue" "', expected argument " "1"" of type '" "wxGridCellChoiceEditor *""'"); - } - arg1 = reinterpret_cast< wxGridCellChoiceEditor * >(argp1); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetValue(); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); -#else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); -#endif - } - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *GridCellChoiceEditor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -20439,11 +20371,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"GridCellFloatEditor_swigregister", GridCellFloatEditor_swigregister, METH_VARARGS, NULL}, { (char *)"GridCellFloatEditor_swiginit", GridCellFloatEditor_swiginit, METH_VARARGS, NULL}, { (char *)"new_GridCellBoolEditor", (PyCFunction)_wrap_new_GridCellBoolEditor, METH_NOARGS, NULL}, - { (char *)"GridCellBoolEditor_GetValue", (PyCFunction)_wrap_GridCellBoolEditor_GetValue, METH_O, NULL}, { (char *)"GridCellBoolEditor_swigregister", GridCellBoolEditor_swigregister, METH_VARARGS, NULL}, { (char *)"GridCellBoolEditor_swiginit", GridCellBoolEditor_swiginit, METH_VARARGS, NULL}, { (char *)"new_GridCellChoiceEditor", (PyCFunction) _wrap_new_GridCellChoiceEditor, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"GridCellChoiceEditor_GetValue", (PyCFunction)_wrap_GridCellChoiceEditor_GetValue, METH_O, NULL}, { (char *)"GridCellChoiceEditor_swigregister", GridCellChoiceEditor_swigregister, METH_VARARGS, NULL}, { (char *)"GridCellChoiceEditor_swiginit", GridCellChoiceEditor_swiginit, METH_VARARGS, NULL}, { (char *)"new_GridCellEnumEditor", (PyCFunction) _wrap_new_GridCellEnumEditor, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/gtk/html.py b/wxPython/src/gtk/html.py index 208b4f96a3..a904a6f95a 100644 --- a/wxPython/src/gtk/html.py +++ b/wxPython/src/gtk/html.py @@ -121,6 +121,10 @@ class HtmlLinkInfo(_core.Object): """SetHtmlCell(self, HtmlCell e)""" return _html.HtmlLinkInfo_SetHtmlCell(*args, **kwargs) + Event = property(GetEvent,SetEvent,doc="See `GetEvent` and `SetEvent`") + Href = property(GetHref,doc="See `GetHref`") + HtmlCell = property(GetHtmlCell,SetHtmlCell,doc="See `GetHtmlCell` and `SetHtmlCell`") + Target = property(GetTarget,doc="See `GetTarget`") _html.HtmlLinkInfo_swigregister(HtmlLinkInfo) cvar = _html.cvar HtmlWindowNameStr = cvar.HtmlWindowNameStr @@ -164,6 +168,11 @@ class HtmlTag(_core.Object): """GetEndPos2(self) -> int""" return _html.HtmlTag_GetEndPos2(*args, **kwargs) + AllParams = property(GetAllParams,doc="See `GetAllParams`") + BeginPos = property(GetBeginPos,doc="See `GetBeginPos`") + EndPos1 = property(GetEndPos1,doc="See `GetEndPos1`") + EndPos2 = property(GetEndPos2,doc="See `GetEndPos2`") + Name = property(GetName,doc="See `GetName`") _html.HtmlTag_swigregister(HtmlTag) class HtmlParser(_core.Object): @@ -219,6 +228,8 @@ class HtmlParser(_core.Object): """GetInnerSource(self, HtmlTag tag) -> String""" return _html.HtmlParser_GetInnerSource(*args, **kwargs) + FS = property(GetFS,SetFS,doc="See `GetFS` and `SetFS`") + Source = property(GetSource,doc="See `GetSource`") _html.HtmlParser_swigregister(HtmlParser) class HtmlWinParser(HtmlParser): @@ -356,6 +367,21 @@ class HtmlWinParser(HtmlParser): """GetLink(self) -> HtmlLinkInfo""" return _html.HtmlWinParser_GetLink(*args, **kwargs) + ActualColor = property(GetActualColor,SetActualColor,doc="See `GetActualColor` and `SetActualColor`") + ActualColour = property(GetActualColour,SetActualColour,doc="See `GetActualColour` and `SetActualColour`") + Align = property(GetAlign,SetAlign,doc="See `GetAlign` and `SetAlign`") + CharHeight = property(GetCharHeight,doc="See `GetCharHeight`") + CharWidth = property(GetCharWidth,doc="See `GetCharWidth`") + Container = property(GetContainer,SetContainer,doc="See `GetContainer` and `SetContainer`") + DC = property(GetDC,SetDC,doc="See `GetDC` and `SetDC`") + FontBold = property(GetFontBold,SetFontBold,doc="See `GetFontBold` and `SetFontBold`") + FontFixed = property(GetFontFixed,SetFontFixed,doc="See `GetFontFixed` and `SetFontFixed`") + FontItalic = property(GetFontItalic,SetFontItalic,doc="See `GetFontItalic` and `SetFontItalic`") + FontSize = property(GetFontSize,SetFontSize,doc="See `GetFontSize` and `SetFontSize`") + FontUnderlined = property(GetFontUnderlined,SetFontUnderlined,doc="See `GetFontUnderlined` and `SetFontUnderlined`") + Link = property(GetLink,SetLink,doc="See `GetLink` and `SetLink`") + LinkColor = property(GetLinkColor,SetLinkColor,doc="See `GetLinkColor` and `SetLinkColor`") + WindowInterface = property(GetWindowInterface,doc="See `GetWindowInterface`") _html.HtmlWinParser_swigregister(HtmlWinParser) class HtmlTagHandler(_core.Object): @@ -383,6 +409,7 @@ class HtmlTagHandler(_core.Object): """ParseInner(self, HtmlTag tag)""" return _html.HtmlTagHandler_ParseInner(*args, **kwargs) + Parser = property(GetParser,SetParser,doc="See `GetParser` and `SetParser`") _html.HtmlTagHandler_swigregister(HtmlTagHandler) class HtmlWinTagHandler(HtmlTagHandler): @@ -410,6 +437,7 @@ class HtmlWinTagHandler(HtmlTagHandler): """ParseInner(self, HtmlTag tag)""" return _html.HtmlWinTagHandler_ParseInner(*args, **kwargs) + Parser = property(GetParser,SetParser,doc="See `GetParser` and `SetParser`") _html.HtmlWinTagHandler_swigregister(HtmlWinTagHandler) @@ -475,6 +503,12 @@ class HtmlSelection(object): """IsEmpty(self) -> bool""" return _html.HtmlSelection_IsEmpty(*args, **kwargs) + FromCell = property(GetFromCell,doc="See `GetFromCell`") + FromPos = property(GetFromPos,doc="See `GetFromPos`") + FromPrivPos = property(GetFromPrivPos,SetFromPrivPos,doc="See `GetFromPrivPos` and `SetFromPrivPos`") + ToCell = property(GetToCell,doc="See `GetToCell`") + ToPos = property(GetToPos,doc="See `GetToPos`") + ToPrivPos = property(GetToPrivPos,SetToPrivPos,doc="See `GetToPrivPos` and `SetToPrivPos`") _html.HtmlSelection_swigregister(HtmlSelection) HTML_SEL_OUT = _html.HTML_SEL_OUT @@ -513,6 +547,9 @@ class HtmlRenderingState(object): """GetBgColour(self) -> Colour""" return _html.HtmlRenderingState_GetBgColour(*args, **kwargs) + BgColour = property(GetBgColour,SetBgColour,doc="See `GetBgColour` and `SetBgColour`") + FgColour = property(GetFgColour,SetFgColour,doc="See `GetFgColour` and `SetFgColour`") + SelectionState = property(GetSelectionState,SetSelectionState,doc="See `GetSelectionState` and `SetSelectionState`") _html.HtmlRenderingState_swigregister(HtmlRenderingState) class HtmlRenderingStyle(object): @@ -528,6 +565,8 @@ class HtmlRenderingStyle(object): """GetSelectedTextBgColour(self, Colour clr) -> Colour""" return _html.HtmlRenderingStyle_GetSelectedTextBgColour(*args, **kwargs) + SelectedTextBgColour = property(GetSelectedTextBgColour,doc="See `GetSelectedTextBgColour`") + SelectedTextColour = property(GetSelectedTextColour,doc="See `GetSelectedTextColour`") _html.HtmlRenderingStyle_swigregister(HtmlRenderingStyle) class DefaultHtmlRenderingStyle(HtmlRenderingStyle): @@ -566,6 +605,9 @@ class HtmlRenderingInfo(object): """GetState(self) -> HtmlRenderingState""" return _html.HtmlRenderingInfo_GetState(*args, **kwargs) + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + State = property(GetState,doc="See `GetState`") + Style = property(GetStyle,SetStyle,doc="See `GetStyle` and `SetStyle`") _html.HtmlRenderingInfo_swigregister(HtmlRenderingInfo) #--------------------------------------------------------------------------- @@ -723,6 +765,23 @@ class HtmlCell(_core.Object): """ConvertToText(self, HtmlSelection sel) -> String""" return _html.HtmlCell_ConvertToText(*args, **kwargs) + Cursor = property(GetCursor,doc="See `GetCursor`") + Depth = property(GetDepth,doc="See `GetDepth`") + Descent = property(GetDescent,doc="See `GetDescent`") + FirstChild = property(GetFirstChild,doc="See `GetFirstChild`") + FirstTerminal = property(GetFirstTerminal,doc="See `GetFirstTerminal`") + Height = property(GetHeight,doc="See `GetHeight`") + Id = property(GetId,SetId,doc="See `GetId` and `SetId`") + LastTerminal = property(GetLastTerminal,doc="See `GetLastTerminal`") + Link = property(GetLink,SetLink,doc="See `GetLink` and `SetLink`") + MaxTotalWidth = property(GetMaxTotalWidth,doc="See `GetMaxTotalWidth`") + MouseCursor = property(GetMouseCursor,doc="See `GetMouseCursor`") + Next = property(GetNext,SetNext,doc="See `GetNext` and `SetNext`") + Parent = property(GetParent,SetParent,doc="See `GetParent` and `SetParent`") + PosX = property(GetPosX,doc="See `GetPosX`") + PosY = property(GetPosY,doc="See `GetPosY`") + RootCell = property(GetRootCell,doc="See `GetRootCell`") + Width = property(GetWidth,doc="See `GetWidth`") _html.HtmlCell_swigregister(HtmlCell) class HtmlWordCell(HtmlCell): @@ -817,6 +876,12 @@ class HtmlContainerCell(HtmlCell): """GetFirstChild(self) -> HtmlCell""" return _html.HtmlContainerCell_GetFirstChild(*args, **kwargs) + AlignHor = property(GetAlignHor,SetAlignHor,doc="See `GetAlignHor` and `SetAlignHor`") + AlignVer = property(GetAlignVer,SetAlignVer,doc="See `GetAlignVer` and `SetAlignVer`") + BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") + FirstChild = property(GetFirstChild,doc="See `GetFirstChild`") + Indent = property(GetIndent,SetIndent,doc="See `GetIndent` and `SetIndent`") + IndentUnits = property(GetIndentUnits,doc="See `GetIndentUnits`") _html.HtmlContainerCell_swigregister(HtmlContainerCell) class HtmlColourCell(HtmlCell): @@ -901,6 +966,8 @@ class HtmlWindowInterface(object): HTMLCursor_Default = _html.HtmlWindowInterface_HTMLCursor_Default HTMLCursor_Link = _html.HtmlWindowInterface_HTMLCursor_Link HTMLCursor_Text = _html.HtmlWindowInterface_HTMLCursor_Text + HTMLBackgroundColour = property(GetHTMLBackgroundColour,SetHTMLBackgroundColour,doc="See `GetHTMLBackgroundColour` and `SetHTMLBackgroundColour`") + HTMLWindow = property(GetHTMLWindow,doc="See `GetHTMLWindow`") _html.HtmlWindowInterface_swigregister(HtmlWindowInterface) #--------------------------------------------------------------------------- @@ -1121,6 +1188,12 @@ class HtmlWindow(_windows.ScrolledWindow): return _html.HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs) GetDefaultHTMLCursor = staticmethod(GetDefaultHTMLCursor) + InternalRepresentation = property(GetInternalRepresentation,doc="See `GetInternalRepresentation`") + OpenedAnchor = property(GetOpenedAnchor,doc="See `GetOpenedAnchor`") + OpenedPage = property(GetOpenedPage,doc="See `GetOpenedPage`") + OpenedPageTitle = property(GetOpenedPageTitle,doc="See `GetOpenedPageTitle`") + Parser = property(GetParser,doc="See `GetParser`") + RelatedFrame = property(GetRelatedFrame,doc="See `GetRelatedFrame`") _html.HtmlWindow_swigregister(HtmlWindow) def PreHtmlWindow(*args, **kwargs): @@ -1195,6 +1268,7 @@ class HtmlDCRenderer(_core.Object): """GetTotalHeight(self) -> int""" return _html.HtmlDCRenderer_GetTotalHeight(*args, **kwargs) + TotalHeight = property(GetTotalHeight,doc="See `GetTotalHeight`") _html.HtmlDCRenderer_swigregister(HtmlDCRenderer) PAGE_ODD = _html.PAGE_ODD @@ -1311,6 +1385,8 @@ class HtmlEasyPrinting(_core.Object): """GetPageSetupData(self) -> PageSetupDialogData""" return _html.HtmlEasyPrinting_GetPageSetupData(*args, **kwargs) + PageSetupData = property(GetPageSetupData,doc="See `GetPageSetupData`") + PrintData = property(GetPrintData,doc="See `GetPrintData`") _html.HtmlEasyPrinting_swigregister(HtmlEasyPrinting) #--------------------------------------------------------------------------- @@ -1366,6 +1442,13 @@ class HtmlBookRecord(object): """GetFullPath(self, String page) -> String""" return _html.HtmlBookRecord_GetFullPath(*args, **kwargs) + BasePath = property(GetBasePath,SetBasePath,doc="See `GetBasePath` and `SetBasePath`") + BookFile = property(GetBookFile,doc="See `GetBookFile`") + ContentsEnd = property(GetContentsEnd,doc="See `GetContentsEnd`") + ContentsStart = property(GetContentsStart,doc="See `GetContentsStart`") + FullPath = property(GetFullPath,doc="See `GetFullPath`") + Start = property(GetStart,SetStart,doc="See `GetStart` and `SetStart`") + Title = property(GetTitle,SetTitle,doc="See `GetTitle` and `SetTitle`") _html.HtmlBookRecord_swigregister(HtmlBookRecord) class HtmlSearchStatus(object): @@ -1393,6 +1476,9 @@ class HtmlSearchStatus(object): """GetName(self) -> String""" return _html.HtmlSearchStatus_GetName(*args, **kwargs) + CurIndex = property(GetCurIndex,doc="See `GetCurIndex`") + MaxIndex = property(GetMaxIndex,doc="See `GetMaxIndex`") + Name = property(GetName,doc="See `GetName`") _html.HtmlSearchStatus_swigregister(HtmlSearchStatus) class HtmlHelpData(object): @@ -1424,6 +1510,7 @@ class HtmlHelpData(object): """GetBookRecArray(self) -> wxHtmlBookRecArray""" return _html.HtmlHelpData_GetBookRecArray(*args, **kwargs) + BookRecArray = property(GetBookRecArray,doc="See `GetBookRecArray`") _html.HtmlHelpData_swigregister(HtmlHelpData) HF_TOOLBAR = _html.HF_TOOLBAR @@ -1562,6 +1649,13 @@ class HtmlHelpWindow(_core.Window): """GetTreeCtrl(self) -> wxPyTreeCtrl""" return _html.HtmlHelpWindow_GetTreeCtrl(*args, **kwargs) + CfgData = property(GetCfgData,doc="See `GetCfgData`") + Controller = property(GetController,SetController,doc="See `GetController` and `SetController`") + Data = property(GetData,doc="See `GetData`") + HtmlWindow = property(GetHtmlWindow,doc="See `GetHtmlWindow`") + SplitterWindow = property(GetSplitterWindow,doc="See `GetSplitterWindow`") + ToolBar = property(GetToolBar,doc="See `GetToolBar`") + TreeCtrl = property(GetTreeCtrl,doc="See `GetTreeCtrl`") _html.HtmlHelpWindow_swigregister(HtmlHelpWindow) def PreHtmlHelpWindow(*args, **kwargs): @@ -1585,6 +1679,7 @@ class HtmlWindowEvent(_core.NotifyEvent): """GetURL(self) -> String""" return _html.HtmlWindowEvent_GetURL(*args, **kwargs) + URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") _html.HtmlWindowEvent_swigregister(HtmlWindowEvent) class HtmlHelpFrame(_windows.Frame): @@ -1647,6 +1742,9 @@ class HtmlHelpFrame(_windows.Frame): def WriteCustomization(self, config, rootpath=""): return self.GetHelpWindow().WriteCustomization(config, rootpath) + Controller = property(GetController,SetController,doc="See `GetController` and `SetController`") + Data = property(GetData,doc="See `GetData`") + HelpWindow = property(GetHelpWindow,doc="See `GetHelpWindow`") _html.HtmlHelpFrame_swigregister(HtmlHelpFrame) def PreHtmlHelpFrame(*args, **kwargs): @@ -1691,6 +1789,9 @@ class HtmlHelpDialog(_windows.Dialog): """SetTitleFormat(self, String format)""" return _html.HtmlHelpDialog_SetTitleFormat(*args, **kwargs) + Controller = property(GetController,SetController,doc="See `GetController` and `SetController`") + Data = property(GetData,doc="See `GetData`") + HelpWindow = property(GetHelpWindow,doc="See `GetHelpWindow`") _html.HtmlHelpDialog_swigregister(HtmlHelpDialog) def PreHtmlHelpDialog(*args, **kwargs): @@ -1773,6 +1874,7 @@ class HelpControllerBase(_core.Object): """GetParentWindow(self) -> Window""" return _html.HelpControllerBase_GetParentWindow(*args, **kwargs) + ParentWindow = property(GetParentWindow,SetParentWindow,doc="See `GetParentWindow` and `SetParentWindow`") _html.HelpControllerBase_swigregister(HelpControllerBase) class HtmlHelpController(HelpControllerBase): @@ -1852,6 +1954,9 @@ class HtmlHelpController(HelpControllerBase): """FindTopLevelWindow(self) -> Window""" return _html.HtmlHelpController_FindTopLevelWindow(*args, **kwargs) + Dialog = property(GetDialog,doc="See `GetDialog`") + Frame = property(GetFrame,doc="See `GetFrame`") + HelpWindow = property(GetHelpWindow,SetHelpWindow,doc="See `GetHelpWindow` and `SetHelpWindow`") _html.HtmlHelpController_swigregister(HtmlHelpController) class HtmlModalHelp(object): diff --git a/wxPython/src/gtk/media.py b/wxPython/src/gtk/media.py index 8d473ae9a5..414ca24e56 100644 --- a/wxPython/src/gtk/media.py +++ b/wxPython/src/gtk/media.py @@ -175,6 +175,11 @@ class MediaCtrl(_core.Control): """GetDownloadTotal(self) -> wxFileOffset""" return _media.MediaCtrl_GetDownloadTotal(*args, **kwargs) + DownloadProgress = property(GetDownloadProgress,doc="See `GetDownloadProgress`") + DownloadTotal = property(GetDownloadTotal,doc="See `GetDownloadTotal`") + PlaybackRate = property(GetPlaybackRate,SetPlaybackRate,doc="See `GetPlaybackRate` and `SetPlaybackRate`") + State = property(GetState,doc="See `GetState`") + Volume = property(GetVolume,SetVolume,doc="See `GetVolume` and `SetVolume`") _media.MediaCtrl_swigregister(MediaCtrl) MediaCtrlNameStr = cvar.MediaCtrlNameStr diff --git a/wxPython/src/gtk/richtext.py b/wxPython/src/gtk/richtext.py index dd3b175453..5670dacc9d 100644 --- a/wxPython/src/gtk/richtext.py +++ b/wxPython/src/gtk/richtext.py @@ -247,6 +247,9 @@ class RichTextRange(object): __safe_for_unpickling__ = True def __reduce__(self): return (RichTextRange, self.Get()) + End = property(GetEnd,SetEnd,doc="See `GetEnd` and `SetEnd`") + Length = property(GetLength,doc="See `GetLength`") + Start = property(GetStart,SetStart,doc="See `GetStart` and `SetStart`") _richtext.RichTextRange_swigregister(RichTextRange) class RichTextAttr(object): @@ -542,6 +545,29 @@ class RichTextAttr(object): """IsDefault(self) -> bool""" return _richtext.RichTextAttr_IsDefault(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") + BulletNumber = property(GetBulletNumber,SetBulletNumber,doc="See `GetBulletNumber` and `SetBulletNumber`") + BulletStyle = property(GetBulletStyle,SetBulletStyle,doc="See `GetBulletStyle` and `SetBulletStyle`") + BulletSymbol = property(GetBulletSymbol,SetBulletSymbol,doc="See `GetBulletSymbol` and `SetBulletSymbol`") + CharacterStyleName = property(GetCharacterStyleName,SetCharacterStyleName,doc="See `GetCharacterStyleName` and `SetCharacterStyleName`") + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") + FontAttributes = property(GetFontAttributes,doc="See `GetFontAttributes`") + FontFaceName = property(GetFontFaceName,SetFontFaceName,doc="See `GetFontFaceName` and `SetFontFaceName`") + FontSize = property(GetFontSize,SetFontSize,doc="See `GetFontSize` and `SetFontSize`") + FontStyle = property(GetFontStyle,SetFontStyle,doc="See `GetFontStyle` and `SetFontStyle`") + FontUnderlined = property(GetFontUnderlined,SetFontUnderlined,doc="See `GetFontUnderlined` and `SetFontUnderlined`") + FontWeight = property(GetFontWeight,SetFontWeight,doc="See `GetFontWeight` and `SetFontWeight`") + LeftIndent = property(GetLeftIndent,SetLeftIndent,doc="See `GetLeftIndent` and `SetLeftIndent`") + LeftSubIndent = property(GetLeftSubIndent,doc="See `GetLeftSubIndent`") + LineSpacing = property(GetLineSpacing,SetLineSpacing,doc="See `GetLineSpacing` and `SetLineSpacing`") + ParagraphSpacingAfter = property(GetParagraphSpacingAfter,SetParagraphSpacingAfter,doc="See `GetParagraphSpacingAfter` and `SetParagraphSpacingAfter`") + ParagraphSpacingBefore = property(GetParagraphSpacingBefore,SetParagraphSpacingBefore,doc="See `GetParagraphSpacingBefore` and `SetParagraphSpacingBefore`") + ParagraphStyleName = property(GetParagraphStyleName,SetParagraphStyleName,doc="See `GetParagraphStyleName` and `SetParagraphStyleName`") + RightIndent = property(GetRightIndent,SetRightIndent,doc="See `GetRightIndent` and `SetRightIndent`") + Tabs = property(GetTabs,SetTabs,doc="See `GetTabs` and `SetTabs`") + TextColour = property(GetTextColour,SetTextColour,doc="See `GetTextColour` and `SetTextColour`") _richtext.RichTextAttr_swigregister(RichTextAttr) cvar = _richtext.cvar RICHTEXT_ALL = cvar.RICHTEXT_ALL @@ -1291,6 +1317,19 @@ class RichTextCtrl(_windows.ScrolledWindow): """GetStyleSheet(self) -> wxRichTextStyleSheet""" return _richtext.RichTextCtrl_GetStyleSheet(*args, **kwargs) + Buffer = property(GetBuffer,doc="See `GetBuffer`") + DefaultStyle = property(GetDefaultStyle,SetDefaultStyle,doc="See `GetDefaultStyle` and `SetDefaultStyle`") + DelayedLayoutThreshold = property(GetDelayedLayoutThreshold,SetDelayedLayoutThreshold,doc="See `GetDelayedLayoutThreshold` and `SetDelayedLayoutThreshold`") + Filename = property(GetFilename,SetFilename,doc="See `GetFilename` and `SetFilename`") + InsertionPoint = property(GetInsertionPoint,SetInsertionPoint,doc="See `GetInsertionPoint` and `SetInsertionPoint`") + InternalSelectionRange = property(GetInternalSelectionRange,SetInternalSelectionRange,doc="See `GetInternalSelectionRange` and `SetInternalSelectionRange`") + LastPosition = property(GetLastPosition,doc="See `GetLastPosition`") + NumberOfLines = property(GetNumberOfLines,doc="See `GetNumberOfLines`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + SelectionRange = property(GetSelectionRange,SetSelectionRange,doc="See `GetSelectionRange` and `SetSelectionRange`") + StringSelection = property(GetStringSelection,doc="See `GetStringSelection`") + StyleSheet = property(GetStyleSheet,SetStyleSheet,doc="See `GetStyleSheet` and `SetStyleSheet`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _richtext.RichTextCtrl_swigregister(RichTextCtrl) def PreRichTextCtrl(*args, **kwargs): @@ -1336,6 +1375,8 @@ class RichTextEvent(_core.NotifyEvent): """SetFlags(self, int flags)""" return _richtext.RichTextEvent_SetFlags(*args, **kwargs) + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Index = property(GetIndex,SetIndex,doc="See `GetIndex` and `SetIndex`") _richtext.RichTextEvent_swigregister(RichTextEvent) diff --git a/wxPython/src/gtk/webkit.py b/wxPython/src/gtk/webkit.py index 853db523b9..4d57edce2c 100644 --- a/wxPython/src/gtk/webkit.py +++ b/wxPython/src/gtk/webkit.py @@ -129,6 +129,9 @@ class WebKitCtrl(_core.Control): """GetPageTitle(self) -> String""" return _webkit.WebKitCtrl_GetPageTitle(*args, **kwargs) + PageSource = property(GetPageSource,SetPageSource,doc="See `GetPageSource` and `SetPageSource`") + PageTitle = property(GetPageTitle,doc="See `GetPageTitle`") + PageURL = property(GetPageURL,doc="See `GetPageURL`") _webkit.WebKitCtrl_swigregister(WebKitCtrl) cvar = _webkit.cvar WebKitNameStr = cvar.WebKitNameStr @@ -168,6 +171,8 @@ class WebKitStateChangedEvent(_core.CommandEvent): """SetURL(self, String url)""" return _webkit.WebKitStateChangedEvent_SetURL(*args, **kwargs) + State = property(GetState,SetState,doc="See `GetState` and `SetState`") + URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") _webkit.WebKitStateChangedEvent_swigregister(WebKitStateChangedEvent) EVT_WEBKIT_STATE_CHANGED = wx.PyEventBinder(wxEVT_WEBKIT_STATE_CHANGED) diff --git a/wxPython/src/gtk/wizard.py b/wxPython/src/gtk/wizard.py index 44764ba96e..f2972ae91a 100644 --- a/wxPython/src/gtk/wizard.py +++ b/wxPython/src/gtk/wizard.py @@ -90,6 +90,8 @@ class WizardEvent(_core.NotifyEvent): """GetPage(self) -> WizardPage""" return _wizard.WizardEvent_GetPage(*args, **kwargs) + Direction = property(GetDirection,doc="See `GetDirection`") + Page = property(GetPage,doc="See `GetPage`") _wizard.WizardEvent_swigregister(WizardEvent) class WizardPage(_windows.Panel): @@ -113,6 +115,9 @@ class WizardPage(_windows.Panel): """GetBitmap(self) -> Bitmap""" return _wizard.WizardPage_GetBitmap(*args, **kwargs) + Bitmap = property(GetBitmap,doc="See `GetBitmap`") + Next = property(GetNext,doc="See `GetNext`") + Prev = property(GetPrev,doc="See `GetPrev`") _wizard.WizardPage_swigregister(WizardPage) class PyWizardPage(WizardPage): @@ -399,6 +404,9 @@ class Wizard(_windows.Dialog): """HasPrevPage(self, WizardPage page) -> bool""" return _wizard.Wizard_HasPrevPage(*args, **kwargs) + CurrentPage = property(GetCurrentPage,doc="See `GetCurrentPage`") + PageAreaSizer = property(GetPageAreaSizer,doc="See `GetPageAreaSizer`") + PageSize = property(GetPageSize,SetPageSize,doc="See `GetPageSize` and `SetPageSize`") _wizard.Wizard_swigregister(Wizard) def PreWizard(*args, **kwargs): diff --git a/wxPython/src/gtk/xrc.py b/wxPython/src/gtk/xrc.py index d1f5951492..31946bfa96 100644 --- a/wxPython/src/gtk/xrc.py +++ b/wxPython/src/gtk/xrc.py @@ -211,6 +211,9 @@ class XmlResource(_core.Object): """SetDomain(self, String domain)""" return _xrc.XmlResource_SetDomain(*args, **kwargs) + Domain = property(GetDomain,SetDomain,doc="See `GetDomain` and `SetDomain`") + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Version = property(GetVersion,doc="See `GetVersion`") _xrc.XmlResource_swigregister(XmlResource) cvar = _xrc.cvar UTF8String = cvar.UTF8String @@ -315,6 +318,9 @@ class XmlProperty(object): """SetNext(self, XmlProperty next)""" return _xrc.XmlProperty_SetNext(*args, **kwargs) + Name = property(GetName,SetName,doc="See `GetName` and `SetName`") + Next = property(GetNext,SetNext,doc="See `GetNext` and `SetNext`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _xrc.XmlProperty_swigregister(XmlProperty) class XmlNode(object): @@ -430,6 +436,13 @@ class XmlNode(object): """SetProperties(self, XmlProperty prop)""" return _xrc.XmlNode_SetProperties(*args, **kwargs) + Children = property(GetChildren,SetChildren,doc="See `GetChildren` and `SetChildren`") + Content = property(GetContent,SetContent,doc="See `GetContent` and `SetContent`") + Name = property(GetName,SetName,doc="See `GetName` and `SetName`") + Next = property(GetNext,SetNext,doc="See `GetNext` and `SetNext`") + Parent = property(GetParent,SetParent,doc="See `GetParent` and `SetParent`") + Properties = property(GetProperties,SetProperties,doc="See `GetProperties` and `SetProperties`") + Type = property(GetType,SetType,doc="See `GetType` and `SetType`") _xrc.XmlNode_swigregister(XmlNode) def XmlNodeEasy(*args, **kwargs): @@ -497,6 +510,9 @@ class XmlDocument(_core.Object): """SetFileEncoding(self, String encoding)""" return _xrc.XmlDocument_SetFileEncoding(*args, **kwargs) + FileEncoding = property(GetFileEncoding,SetFileEncoding,doc="See `GetFileEncoding` and `SetFileEncoding`") + Root = property(GetRoot,SetRoot,doc="See `GetRoot` and `SetRoot`") + Version = property(GetVersion,SetVersion,doc="See `GetVersion` and `SetVersion`") _xrc.XmlDocument_swigregister(XmlDocument) def XmlDocumentFromStream(*args, **kwargs): @@ -664,6 +680,15 @@ class XmlResourceHandler(_core.Object): """GetCurFileSystem(self) -> FileSystem""" return _xrc.XmlResourceHandler_GetCurFileSystem(*args, **kwargs) + Class = property(GetClass,doc="See `GetClass`") + CurFileSystem = property(GetCurFileSystem,doc="See `GetCurFileSystem`") + ID = property(GetID,doc="See `GetID`") + Instance = property(GetInstance,doc="See `GetInstance`") + Name = property(GetName,doc="See `GetName`") + Node = property(GetNode,doc="See `GetNode`") + Parent = property(GetParent,doc="See `GetParent`") + ParentAsWindow = property(GetParentAsWindow,doc="See `GetParentAsWindow`") + Resource = property(GetResource,doc="See `GetResource`") _xrc.XmlResourceHandler_swigregister(XmlResourceHandler) #---------------------------------------------------------------------------- diff --git a/wxPython/src/html.i b/wxPython/src/html.i index 1155b4b642..b9ee8454be 100644 --- a/wxPython/src/html.i +++ b/wxPython/src/html.i @@ -117,6 +117,11 @@ public: void SetEvent(const wxMouseEvent *e); void SetHtmlCell(const wxHtmlCell * e); + + %property(Event, GetEvent, SetEvent, doc="See `GetEvent` and `SetEvent`"); + %property(Href, GetHref, doc="See `GetHref`"); + %property(HtmlCell, GetHtmlCell, SetHtmlCell, doc="See `GetHtmlCell` and `SetHtmlCell`"); + %property(Target, GetTarget, doc="See `GetTarget`"); }; //--------------------------------------------------------------------------- @@ -138,6 +143,12 @@ public: int GetBeginPos(); int GetEndPos1(); int GetEndPos2(); + + %property(AllParams, GetAllParams, doc="See `GetAllParams`"); + %property(BeginPos, GetBeginPos, doc="See `GetBeginPos`"); + %property(EndPos1, GetEndPos1, doc="See `GetEndPos1`"); + %property(EndPos2, GetEndPos2, doc="See `GetEndPos2`"); + %property(Name, GetName, doc="See `GetName`"); }; //--------------------------------------------------------------------------- @@ -169,6 +180,9 @@ public: // Returns HTML source inside the element (i.e. between the starting // and ending tag) wxString GetInnerSource(const wxHtmlTag& tag); + + %property(FS, GetFS, SetFS, doc="See `GetFS` and `SetFS`"); + %property(Source, GetSource, doc="See `GetSource`"); }; @@ -234,6 +248,21 @@ public: wxFont* CreateCurrentFont(); wxHtmlLinkInfo GetLink(); + %property(ActualColor, GetActualColor, SetActualColor, doc="See `GetActualColor` and `SetActualColor`"); + %property(ActualColour, GetActualColour, SetActualColour, doc="See `GetActualColour` and `SetActualColour`"); + %property(Align, GetAlign, SetAlign, doc="See `GetAlign` and `SetAlign`"); + %property(CharHeight, GetCharHeight, doc="See `GetCharHeight`"); + %property(CharWidth, GetCharWidth, doc="See `GetCharWidth`"); + %property(Container, GetContainer, SetContainer, doc="See `GetContainer` and `SetContainer`"); + %property(DC, GetDC, SetDC, doc="See `GetDC` and `SetDC`"); + %property(FontBold, GetFontBold, SetFontBold, doc="See `GetFontBold` and `SetFontBold`"); + %property(FontFixed, GetFontFixed, SetFontFixed, doc="See `GetFontFixed` and `SetFontFixed`"); + %property(FontItalic, GetFontItalic, SetFontItalic, doc="See `GetFontItalic` and `SetFontItalic`"); + %property(FontSize, GetFontSize, SetFontSize, doc="See `GetFontSize` and `SetFontSize`"); + %property(FontUnderlined, GetFontUnderlined, SetFontUnderlined, doc="See `GetFontUnderlined` and `SetFontUnderlined`"); + %property(Link, GetLink, SetLink, doc="See `GetLink` and `SetLink`"); + %property(LinkColor, GetLinkColor, SetLinkColor, doc="See `GetLinkColor` and `SetLinkColor`"); + %property(WindowInterface, GetWindowInterface, doc="See `GetWindowInterface`"); }; @@ -272,6 +301,8 @@ public: void SetParser(wxHtmlParser *parser); wxHtmlParser* GetParser(); void ParseInner(const wxHtmlTag& tag); + + %property(Parser, GetParser, SetParser, doc="See `GetParser` and `SetParser`"); }; @@ -311,6 +342,8 @@ public: void SetParser(wxHtmlParser *parser); wxHtmlWinParser* GetParser(); void ParseInner(const wxHtmlTag& tag); + + %property(Parser, GetParser, SetParser, doc="See `GetParser` and `SetParser`"); }; @@ -418,6 +451,12 @@ public: const bool IsEmpty() const; + %property(FromCell, GetFromCell, doc="See `GetFromCell`"); + %property(FromPos, GetFromPos, doc="See `GetFromPos`"); + %property(FromPrivPos, GetFromPrivPos, SetFromPrivPos, doc="See `GetFromPrivPos` and `SetFromPrivPos`"); + %property(ToCell, GetToCell, doc="See `GetToCell`"); + %property(ToPos, GetToPos, doc="See `GetToPos`"); + %property(ToPrivPos, GetToPrivPos, SetToPrivPos, doc="See `GetToPrivPos` and `SetToPrivPos`"); }; @@ -445,6 +484,10 @@ public: const wxColour& GetFgColour() const; void SetBgColour(const wxColour& c); const wxColour& GetBgColour() const; + + %property(BgColour, GetBgColour, SetBgColour, doc="See `GetBgColour` and `SetBgColour`"); + %property(FgColour, GetFgColour, SetFgColour, doc="See `GetFgColour` and `SetFgColour`"); + %property(SelectionState, GetSelectionState, SetSelectionState, doc="See `GetSelectionState` and `SetSelectionState`"); }; @@ -456,14 +499,15 @@ class wxHtmlRenderingStyle public: virtual wxColour GetSelectedTextColour(const wxColour& clr) = 0; virtual wxColour GetSelectedTextBgColour(const wxColour& clr) = 0; + + %property(SelectedTextBgColour, GetSelectedTextBgColour, doc="See `GetSelectedTextBgColour`"); + %property(SelectedTextColour, GetSelectedTextColour, doc="See `GetSelectedTextColour`"); }; // Standard style: class wxDefaultHtmlRenderingStyle : public wxHtmlRenderingStyle { public: - virtual wxColour GetSelectedTextColour(const wxColour& clr); - virtual wxColour GetSelectedTextBgColour(const wxColour& clr); }; @@ -484,6 +528,10 @@ public: wxHtmlRenderingStyle& GetStyle(); wxHtmlRenderingState& GetState(); + + %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`"); + %property(State, GetState, doc="See `GetState`"); + %property(Style, GetStyle, SetStyle, doc="See `GetStyle` and `SetStyle`"); }; //--------------------------------------------------------------------------- @@ -602,6 +650,24 @@ public: // Converts the cell into text representation. If sel != NULL then // only part of the cell inside the selection is converted. wxString ConvertToText(wxHtmlSelection *sel) const; + + %property(Cursor, GetCursor, doc="See `GetCursor`"); + %property(Depth, GetDepth, doc="See `GetDepth`"); + %property(Descent, GetDescent, doc="See `GetDescent`"); + %property(FirstChild, GetFirstChild, doc="See `GetFirstChild`"); + %property(FirstTerminal, GetFirstTerminal, doc="See `GetFirstTerminal`"); + %property(Height, GetHeight, doc="See `GetHeight`"); + %property(Id, GetId, SetId, doc="See `GetId` and `SetId`"); + %property(LastTerminal, GetLastTerminal, doc="See `GetLastTerminal`"); + %property(Link, GetLink, SetLink, doc="See `GetLink` and `SetLink`"); + %property(MaxTotalWidth, GetMaxTotalWidth, doc="See `GetMaxTotalWidth`"); + %property(MouseCursor, GetMouseCursor, doc="See `GetMouseCursor`"); + %property(Next, GetNext, SetNext, doc="See `GetNext` and `SetNext`"); + %property(Parent, GetParent, SetParent, doc="See `GetParent` and `SetParent`"); + %property(PosX, GetPosX, doc="See `GetPosX`"); + %property(PosY, GetPosY, doc="See `GetPosY`"); + %property(RootCell, GetRootCell, doc="See `GetRootCell`"); + %property(Width, GetWidth, doc="See `GetWidth`"); }; @@ -639,6 +705,13 @@ public: void SetBorder(const wxColour& clr1, const wxColour& clr2); wxHtmlCell* GetFirstChild(); %pragma(python) addtoclass = "GetFirstCell = GetFirstChild" + + %property(AlignHor, GetAlignHor, SetAlignHor, doc="See `GetAlignHor` and `SetAlignHor`"); + %property(AlignVer, GetAlignVer, SetAlignVer, doc="See `GetAlignVer` and `SetAlignVer`"); + %property(BackgroundColour, GetBackgroundColour, SetBackgroundColour, doc="See `GetBackgroundColour` and `SetBackgroundColour`"); + %property(FirstChild, GetFirstChild, doc="See `GetFirstChild`"); + %property(Indent, GetIndent, SetIndent, doc="See `GetIndent` and `SetIndent`"); + %property(IndentUnits, GetIndentUnits, doc="See `GetIndentUnits`"); }; @@ -809,6 +882,9 @@ public: Returns mouse cursor of given @a type. */ // virtual wxCursor GetHTMLCursor(HTMLCursor type) const = 0; + + %property(HTMLBackgroundColour, GetHTMLBackgroundColour, SetHTMLBackgroundColour, doc="See `GetHTMLBackgroundColour` and `SetHTMLBackgroundColour`"); + %property(HTMLWindow, GetHTMLWindow, doc="See `GetHTMLWindow`"); }; @@ -1100,6 +1176,12 @@ public: // virtual void SetHTMLStatusText(const wxString& text); // virtual wxCursor GetHTMLCursor(HTMLCursor type) const; + %property(InternalRepresentation, GetInternalRepresentation, doc="See `GetInternalRepresentation`"); + %property(OpenedAnchor, GetOpenedAnchor, doc="See `GetOpenedAnchor`"); + %property(OpenedPage, GetOpenedPage, doc="See `GetOpenedPage`"); + %property(OpenedPageTitle, GetOpenedPageTitle, doc="See `GetOpenedPageTitle`"); + %property(Parser, GetParser, doc="See `GetParser`"); + %property(RelatedFrame, GetRelatedFrame, doc="See `GetRelatedFrame`"); }; @@ -1144,6 +1226,8 @@ public: int GetTotalHeight(); // returns total height of the html document // (compare Render's return value with this) + + %property(TotalHeight, GetTotalHeight, doc="See `GetTotalHeight`"); }; @@ -1234,6 +1318,8 @@ public: wxPrintData *GetPrintData() {return m_PrintData;} wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;} + %property(PageSetupData, GetPageSetupData, doc="See `GetPageSetupData`"); + %property(PrintData, GetPrintData, doc="See `GetPrintData`"); }; @@ -1261,6 +1347,14 @@ public: void SetStart(const wxString& start); wxString GetFullPath(const wxString &page) const; + + %property(BasePath, GetBasePath, SetBasePath, doc="See `GetBasePath` and `SetBasePath`"); + %property(BookFile, GetBookFile, doc="See `GetBookFile`"); + %property(ContentsEnd, GetContentsEnd, doc="See `GetContentsEnd`"); + %property(ContentsStart, GetContentsStart, doc="See `GetContentsStart`"); + %property(FullPath, GetFullPath, doc="See `GetFullPath`"); + %property(Start, GetStart, SetStart, doc="See `GetStart` and `SetStart`"); + %property(Title, GetTitle, SetTitle, doc="See `GetTitle` and `SetTitle`"); }; //--------------------------------------------------------------------------- @@ -1289,6 +1383,10 @@ public: int GetCurIndex(); int GetMaxIndex(); const wxString& GetName(); + + %property(CurIndex, GetCurIndex, doc="See `GetCurIndex`"); + %property(MaxIndex, GetMaxIndex, doc="See `GetMaxIndex`"); + %property(Name, GetName, doc="See `GetName`"); }; //--------------------------------------------------------------------------- @@ -1311,6 +1409,7 @@ public: // TODO: this one needs fixed... const wxHtmlBookRecArray& GetBookRecArray(); + %property(BookRecArray, GetBookRecArray, doc="See `GetBookRecArray`"); }; //--------------------------------------------------------------------------- @@ -1461,6 +1560,13 @@ public: // Gets the tree control wxPyTreeCtrl *GetTreeCtrl() const; + %property(CfgData, GetCfgData, doc="See `GetCfgData`"); + %property(Controller, GetController, SetController, doc="See `GetController` and `SetController`"); + %property(Data, GetData, doc="See `GetData`"); + %property(HtmlWindow, GetHtmlWindow, doc="See `GetHtmlWindow`"); + %property(SplitterWindow, GetSplitterWindow, doc="See `GetSplitterWindow`"); + %property(ToolBar, GetToolBar, doc="See `GetToolBar`"); + %property(TreeCtrl, GetTreeCtrl, doc="See `GetTreeCtrl`"); }; @@ -1472,6 +1578,8 @@ public: void SetURL(const wxString& url); const wxString& GetURL() const; + + %property(URL, GetURL, SetURL, doc="See `GetURL` and `SetURL`"); }; @@ -1533,6 +1641,10 @@ public: def WriteCustomization(self, config, rootpath=""): return self.GetHelpWindow().WriteCustomization(config, rootpath) %} + + %property(Controller, GetController, SetController, doc="See `GetController` and `SetController`"); + %property(Data, GetData, doc="See `GetData`"); + %property(HelpWindow, GetHelpWindow, doc="See `GetHelpWindow`"); }; @@ -1578,6 +1690,9 @@ public: // Override to add custom buttons to the toolbar // virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {}; + %property(Controller, GetController, SetController, doc="See `GetController` and `SetController`"); + %property(Data, GetData, doc="See `GetData`"); + %property(HelpWindow, GetHelpWindow, doc="See `GetHelpWindow`"); }; @@ -1647,6 +1762,7 @@ public: /// Get the window that can optionally be used for the help window's parent. virtual wxWindow* GetParentWindow() const; + %property(ParentWindow, GetParentWindow, SetParentWindow, doc="See `GetParentWindow` and `SetParentWindow`"); }; @@ -1682,6 +1798,10 @@ public: void MakeModalIfNeeded(); wxWindow* FindTopLevelWindow(); + + %property(Dialog, GetDialog, doc="See `GetDialog`"); + %property(Frame, GetFrame, doc="See `GetFrame`"); + %property(HelpWindow, GetHelpWindow, SetHelpWindow, doc="See `GetHelpWindow` and `SetHelpWindow`"); }; diff --git a/wxPython/src/mac/grid.py b/wxPython/src/mac/grid.py index c3ce9b7097..03e3018e71 100644 --- a/wxPython/src/mac/grid.py +++ b/wxPython/src/mac/grid.py @@ -184,6 +184,8 @@ class GridCellFloatRenderer(GridCellStringRenderer): """SetPrecision(self, int precision)""" return _grid.GridCellFloatRenderer_SetPrecision(*args, **kwargs) + Precision = property(GetPrecision,SetPrecision,doc="See `GetPrecision` and `SetPrecision`") + Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") _grid.GridCellFloatRenderer_swigregister(GridCellFloatRenderer) class GridCellBoolRenderer(GridCellRenderer): @@ -309,6 +311,8 @@ class GridCellEditor(GridCellWorker): args[0].thisown = 0 return val + CellAttr = property(GetCellAttr,SetCellAttr,doc="See `GetCellAttr` and `SetCellAttr`") + Control = property(GetControl,SetControl,doc="See `GetControl` and `SetControl`") _grid.GridCellEditor_swigregister(GridCellEditor) class PyGridCellEditor(GridCellEditor): @@ -388,6 +392,7 @@ class GridCellTextEditor(GridCellEditor): """GetValue(self) -> String""" return _grid.GridCellTextEditor_GetValue(*args, **kwargs) + Value = property(GetValue,doc="See `GetValue`") _grid.GridCellTextEditor_swigregister(GridCellTextEditor) class GridCellNumberEditor(GridCellTextEditor): @@ -421,10 +426,6 @@ class GridCellBoolEditor(GridCellEditor): _grid.GridCellBoolEditor_swiginit(self,_grid.new_GridCellBoolEditor(*args, **kwargs)) self._setOORInfo(self) - def GetValue(*args, **kwargs): - """GetValue(self) -> String""" - return _grid.GridCellBoolEditor_GetValue(*args, **kwargs) - _grid.GridCellBoolEditor_swigregister(GridCellBoolEditor) class GridCellChoiceEditor(GridCellEditor): @@ -436,10 +437,6 @@ class GridCellChoiceEditor(GridCellEditor): _grid.GridCellChoiceEditor_swiginit(self,_grid.new_GridCellChoiceEditor(*args, **kwargs)) self._setOORInfo(self) - def GetValue(*args, **kwargs): - """GetValue(self) -> String""" - return _grid.GridCellChoiceEditor_GetValue(*args, **kwargs) - _grid.GridCellChoiceEditor_swigregister(GridCellChoiceEditor) class GridCellEnumEditor(GridCellChoiceEditor): @@ -617,6 +614,13 @@ class GridCellAttr(object): """SetDefAttr(self, GridCellAttr defAttr)""" return _grid.GridCellAttr_SetDefAttr(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") + Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") + Kind = property(GetKind,SetKind,doc="See `GetKind` and `SetKind`") + Overflow = property(GetOverflow,SetOverflow,doc="See `GetOverflow` and `SetOverflow`") + Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") + TextColour = property(GetTextColour,SetTextColour,doc="See `GetTextColour` and `SetTextColour`") _grid.GridCellAttr_swigregister(GridCellAttr) class GridCellAttrProvider(object): @@ -856,6 +860,10 @@ class GridTableBase(_core.Object): """SetColAttr(self, GridCellAttr attr, int col)""" return _grid.GridTableBase_SetColAttr(*args, **kwargs) + AttrProvider = property(GetAttrProvider,SetAttrProvider,doc="See `GetAttrProvider` and `SetAttrProvider`") + NumberCols = property(GetNumberCols,doc="See `GetNumberCols`") + NumberRows = property(GetNumberRows,doc="See `GetNumberRows`") + View = property(GetView,SetView,doc="See `GetView` and `SetView`") _grid.GridTableBase_swigregister(GridTableBase) class PyGridTableBase(GridTableBase): @@ -1038,6 +1046,10 @@ class GridTableMessage(object): """GetCommandInt2(self) -> int""" return _grid.GridTableMessage_GetCommandInt2(*args, **kwargs) + CommandInt = property(GetCommandInt,SetCommandInt,doc="See `GetCommandInt` and `SetCommandInt`") + CommandInt2 = property(GetCommandInt2,SetCommandInt2,doc="See `GetCommandInt2` and `SetCommandInt2`") + Id = property(GetId,SetId,doc="See `GetId` and `SetId`") + TableObject = property(GetTableObject,SetTableObject,doc="See `GetTableObject` and `SetTableObject`") _grid.GridTableMessage_swigregister(GridTableMessage) class GridCellCoords(object): @@ -1099,6 +1111,8 @@ class GridCellCoords(object): elif index == 1: self.SetCol(val) else: raise IndexError + Col = property(GetCol,SetCol,doc="See `GetCol` and `SetCol`") + Row = property(GetRow,SetRow,doc="See `GetRow` and `SetRow`") _grid.GridCellCoords_swigregister(GridCellCoords) class Grid(_windows.ScrolledWindow): @@ -1625,7 +1639,7 @@ class Grid(_windows.ScrolledWindow): return _grid.Grid_GetDefaultCellAlignment(*args, **kwargs) def GetCellAlignment(*args, **kwargs): - """GetCellAlignment() -> (horiz, vert)""" + """GetCellAlignment(int row, int col) -> (horiz, vert)""" return _grid.Grid_GetCellAlignment(*args, **kwargs) def GetDefaultCellOverflow(*args, **kwargs): @@ -1977,6 +1991,53 @@ class Grid(_windows.ScrolledWindow): return _grid.Grid_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + BatchCount = property(GetBatchCount,doc="See `GetBatchCount`") + CellHighlightColour = property(GetCellHighlightColour,SetCellHighlightColour,doc="See `GetCellHighlightColour` and `SetCellHighlightColour`") + CellHighlightPenWidth = property(GetCellHighlightPenWidth,SetCellHighlightPenWidth,doc="See `GetCellHighlightPenWidth` and `SetCellHighlightPenWidth`") + CellHighlightROPenWidth = property(GetCellHighlightROPenWidth,SetCellHighlightROPenWidth,doc="See `GetCellHighlightROPenWidth` and `SetCellHighlightROPenWidth`") + CellSize = property(GetCellSize,SetCellSize,doc="See `GetCellSize` and `SetCellSize`") + ColLabelAlignment = property(GetColLabelAlignment,SetColLabelAlignment,doc="See `GetColLabelAlignment` and `SetColLabelAlignment`") + ColLabelSize = property(GetColLabelSize,SetColLabelSize,doc="See `GetColLabelSize` and `SetColLabelSize`") + ColLabelTextOrientation = property(GetColLabelTextOrientation,SetColLabelTextOrientation,doc="See `GetColLabelTextOrientation` and `SetColLabelTextOrientation`") + ColMinimalAcceptableWidth = property(GetColMinimalAcceptableWidth,SetColMinimalAcceptableWidth,doc="See `GetColMinimalAcceptableWidth` and `SetColMinimalAcceptableWidth`") + DefaultCellAlignment = property(GetDefaultCellAlignment,SetDefaultCellAlignment,doc="See `GetDefaultCellAlignment` and `SetDefaultCellAlignment`") + DefaultCellBackgroundColour = property(GetDefaultCellBackgroundColour,SetDefaultCellBackgroundColour,doc="See `GetDefaultCellBackgroundColour` and `SetDefaultCellBackgroundColour`") + DefaultCellFont = property(GetDefaultCellFont,SetDefaultCellFont,doc="See `GetDefaultCellFont` and `SetDefaultCellFont`") + DefaultCellOverflow = property(GetDefaultCellOverflow,SetDefaultCellOverflow,doc="See `GetDefaultCellOverflow` and `SetDefaultCellOverflow`") + DefaultCellTextColour = property(GetDefaultCellTextColour,SetDefaultCellTextColour,doc="See `GetDefaultCellTextColour` and `SetDefaultCellTextColour`") + DefaultColLabelSize = property(GetDefaultColLabelSize,doc="See `GetDefaultColLabelSize`") + DefaultColSize = property(GetDefaultColSize,SetDefaultColSize,doc="See `GetDefaultColSize` and `SetDefaultColSize`") + DefaultEditor = property(GetDefaultEditor,SetDefaultEditor,doc="See `GetDefaultEditor` and `SetDefaultEditor`") + DefaultGridLinePen = property(GetDefaultGridLinePen,doc="See `GetDefaultGridLinePen`") + DefaultRenderer = property(GetDefaultRenderer,SetDefaultRenderer,doc="See `GetDefaultRenderer` and `SetDefaultRenderer`") + DefaultRowLabelSize = property(GetDefaultRowLabelSize,doc="See `GetDefaultRowLabelSize`") + DefaultRowSize = property(GetDefaultRowSize,SetDefaultRowSize,doc="See `GetDefaultRowSize` and `SetDefaultRowSize`") + GridColLabelWindow = property(GetGridColLabelWindow,doc="See `GetGridColLabelWindow`") + GridCornerLabelWindow = property(GetGridCornerLabelWindow,doc="See `GetGridCornerLabelWindow`") + GridCursorCol = property(GetGridCursorCol,doc="See `GetGridCursorCol`") + GridCursorRow = property(GetGridCursorRow,doc="See `GetGridCursorRow`") + GridLineColour = property(GetGridLineColour,SetGridLineColour,doc="See `GetGridLineColour` and `SetGridLineColour`") + GridRowLabelWindow = property(GetGridRowLabelWindow,doc="See `GetGridRowLabelWindow`") + GridWindow = property(GetGridWindow,doc="See `GetGridWindow`") + LabelBackgroundColour = property(GetLabelBackgroundColour,SetLabelBackgroundColour,doc="See `GetLabelBackgroundColour` and `SetLabelBackgroundColour`") + LabelFont = property(GetLabelFont,SetLabelFont,doc="See `GetLabelFont` and `SetLabelFont`") + LabelTextColour = property(GetLabelTextColour,SetLabelTextColour,doc="See `GetLabelTextColour` and `SetLabelTextColour`") + NumberCols = property(GetNumberCols,doc="See `GetNumberCols`") + NumberRows = property(GetNumberRows,doc="See `GetNumberRows`") + RowLabelAlignment = property(GetRowLabelAlignment,SetRowLabelAlignment,doc="See `GetRowLabelAlignment` and `SetRowLabelAlignment`") + RowLabelSize = property(GetRowLabelSize,SetRowLabelSize,doc="See `GetRowLabelSize` and `SetRowLabelSize`") + RowMinimalAcceptableHeight = property(GetRowMinimalAcceptableHeight,SetRowMinimalAcceptableHeight,doc="See `GetRowMinimalAcceptableHeight` and `SetRowMinimalAcceptableHeight`") + ScrollLineX = property(GetScrollLineX,SetScrollLineX,doc="See `GetScrollLineX` and `SetScrollLineX`") + ScrollLineY = property(GetScrollLineY,SetScrollLineY,doc="See `GetScrollLineY` and `SetScrollLineY`") + SelectedCells = property(GetSelectedCells,doc="See `GetSelectedCells`") + SelectedCols = property(GetSelectedCols,doc="See `GetSelectedCols`") + SelectedRows = property(GetSelectedRows,doc="See `GetSelectedRows`") + SelectionBackground = property(GetSelectionBackground,SetSelectionBackground,doc="See `GetSelectionBackground` and `SetSelectionBackground`") + SelectionBlockBottomRight = property(GetSelectionBlockBottomRight,doc="See `GetSelectionBlockBottomRight`") + SelectionBlockTopLeft = property(GetSelectionBlockTopLeft,doc="See `GetSelectionBlockTopLeft`") + SelectionForeground = property(GetSelectionForeground,SetSelectionForeground,doc="See `GetSelectionForeground` and `SetSelectionForeground`") + SelectionMode = property(GetSelectionMode,SetSelectionMode,doc="See `GetSelectionMode` and `SetSelectionMode`") + Table = property(GetTable,SetTable,doc="See `GetTable` and `SetTable`") _grid.Grid_swigregister(Grid) def PreGrid(*args, **kwargs): @@ -2049,6 +2110,9 @@ class GridEvent(_core.NotifyEvent): """CmdDown(self) -> bool""" return _grid.GridEvent_CmdDown(*args, **kwargs) + Col = property(GetCol,doc="See `GetCol`") + Position = property(GetPosition,doc="See `GetPosition`") + Row = property(GetRow,doc="See `GetRow`") _grid.GridEvent_swigregister(GridEvent) class GridSizeEvent(_core.NotifyEvent): @@ -2090,6 +2154,8 @@ class GridSizeEvent(_core.NotifyEvent): """CmdDown(self) -> bool""" return _grid.GridSizeEvent_CmdDown(*args, **kwargs) + Position = property(GetPosition,doc="See `GetPosition`") + RowOrCol = property(GetRowOrCol,doc="See `GetRowOrCol`") _grid.GridSizeEvent_swigregister(GridSizeEvent) class GridRangeSelectEvent(_core.NotifyEvent): @@ -2152,6 +2218,12 @@ class GridRangeSelectEvent(_core.NotifyEvent): """CmdDown(self) -> bool""" return _grid.GridRangeSelectEvent_CmdDown(*args, **kwargs) + BottomRightCoords = property(GetBottomRightCoords,doc="See `GetBottomRightCoords`") + BottomRow = property(GetBottomRow,doc="See `GetBottomRow`") + LeftCol = property(GetLeftCol,doc="See `GetLeftCol`") + RightCol = property(GetRightCol,doc="See `GetRightCol`") + TopLeftCoords = property(GetTopLeftCoords,doc="See `GetTopLeftCoords`") + TopRow = property(GetTopRow,doc="See `GetTopRow`") _grid.GridRangeSelectEvent_swigregister(GridRangeSelectEvent) class GridEditorCreatedEvent(_core.CommandEvent): @@ -2188,6 +2260,9 @@ class GridEditorCreatedEvent(_core.CommandEvent): """SetControl(self, Control ctrl)""" return _grid.GridEditorCreatedEvent_SetControl(*args, **kwargs) + Col = property(GetCol,SetCol,doc="See `GetCol` and `SetCol`") + Control = property(GetControl,SetControl,doc="See `GetControl` and `SetControl`") + Row = property(GetRow,SetRow,doc="See `GetRow` and `SetRow`") _grid.GridEditorCreatedEvent_swigregister(GridEditorCreatedEvent) wxEVT_GRID_CELL_LEFT_CLICK = _grid.wxEVT_GRID_CELL_LEFT_CLICK diff --git a/wxPython/src/mac/grid_wrap.cpp b/wxPython/src/mac/grid_wrap.cpp index d97a49ca83..21c7c0ac49 100644 --- a/wxPython/src/mac/grid_wrap.cpp +++ b/wxPython/src/mac/grid_wrap.cpp @@ -5504,40 +5504,6 @@ fail: } -SWIGINTERN PyObject *_wrap_GridCellBoolEditor_GetValue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxGridCellBoolEditor *arg1 = (wxGridCellBoolEditor *) 0 ; - wxString result; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridCellBoolEditor, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellBoolEditor_GetValue" "', expected argument " "1"" of type '" "wxGridCellBoolEditor *""'"); - } - arg1 = reinterpret_cast< wxGridCellBoolEditor * >(argp1); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetValue(); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); -#else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); -#endif - } - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *GridCellBoolEditor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -5597,40 +5563,6 @@ fail: } -SWIGINTERN PyObject *_wrap_GridCellChoiceEditor_GetValue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxGridCellChoiceEditor *arg1 = (wxGridCellChoiceEditor *) 0 ; - wxString result; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridCellChoiceEditor, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellChoiceEditor_GetValue" "', expected argument " "1"" of type '" "wxGridCellChoiceEditor *""'"); - } - arg1 = reinterpret_cast< wxGridCellChoiceEditor * >(argp1); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetValue(); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); -#else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); -#endif - } - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *GridCellChoiceEditor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -20439,11 +20371,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"GridCellFloatEditor_swigregister", GridCellFloatEditor_swigregister, METH_VARARGS, NULL}, { (char *)"GridCellFloatEditor_swiginit", GridCellFloatEditor_swiginit, METH_VARARGS, NULL}, { (char *)"new_GridCellBoolEditor", (PyCFunction)_wrap_new_GridCellBoolEditor, METH_NOARGS, NULL}, - { (char *)"GridCellBoolEditor_GetValue", (PyCFunction)_wrap_GridCellBoolEditor_GetValue, METH_O, NULL}, { (char *)"GridCellBoolEditor_swigregister", GridCellBoolEditor_swigregister, METH_VARARGS, NULL}, { (char *)"GridCellBoolEditor_swiginit", GridCellBoolEditor_swiginit, METH_VARARGS, NULL}, { (char *)"new_GridCellChoiceEditor", (PyCFunction) _wrap_new_GridCellChoiceEditor, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"GridCellChoiceEditor_GetValue", (PyCFunction)_wrap_GridCellChoiceEditor_GetValue, METH_O, NULL}, { (char *)"GridCellChoiceEditor_swigregister", GridCellChoiceEditor_swigregister, METH_VARARGS, NULL}, { (char *)"GridCellChoiceEditor_swiginit", GridCellChoiceEditor_swiginit, METH_VARARGS, NULL}, { (char *)"new_GridCellEnumEditor", (PyCFunction) _wrap_new_GridCellEnumEditor, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/html.py b/wxPython/src/mac/html.py index 208b4f96a3..a904a6f95a 100644 --- a/wxPython/src/mac/html.py +++ b/wxPython/src/mac/html.py @@ -121,6 +121,10 @@ class HtmlLinkInfo(_core.Object): """SetHtmlCell(self, HtmlCell e)""" return _html.HtmlLinkInfo_SetHtmlCell(*args, **kwargs) + Event = property(GetEvent,SetEvent,doc="See `GetEvent` and `SetEvent`") + Href = property(GetHref,doc="See `GetHref`") + HtmlCell = property(GetHtmlCell,SetHtmlCell,doc="See `GetHtmlCell` and `SetHtmlCell`") + Target = property(GetTarget,doc="See `GetTarget`") _html.HtmlLinkInfo_swigregister(HtmlLinkInfo) cvar = _html.cvar HtmlWindowNameStr = cvar.HtmlWindowNameStr @@ -164,6 +168,11 @@ class HtmlTag(_core.Object): """GetEndPos2(self) -> int""" return _html.HtmlTag_GetEndPos2(*args, **kwargs) + AllParams = property(GetAllParams,doc="See `GetAllParams`") + BeginPos = property(GetBeginPos,doc="See `GetBeginPos`") + EndPos1 = property(GetEndPos1,doc="See `GetEndPos1`") + EndPos2 = property(GetEndPos2,doc="See `GetEndPos2`") + Name = property(GetName,doc="See `GetName`") _html.HtmlTag_swigregister(HtmlTag) class HtmlParser(_core.Object): @@ -219,6 +228,8 @@ class HtmlParser(_core.Object): """GetInnerSource(self, HtmlTag tag) -> String""" return _html.HtmlParser_GetInnerSource(*args, **kwargs) + FS = property(GetFS,SetFS,doc="See `GetFS` and `SetFS`") + Source = property(GetSource,doc="See `GetSource`") _html.HtmlParser_swigregister(HtmlParser) class HtmlWinParser(HtmlParser): @@ -356,6 +367,21 @@ class HtmlWinParser(HtmlParser): """GetLink(self) -> HtmlLinkInfo""" return _html.HtmlWinParser_GetLink(*args, **kwargs) + ActualColor = property(GetActualColor,SetActualColor,doc="See `GetActualColor` and `SetActualColor`") + ActualColour = property(GetActualColour,SetActualColour,doc="See `GetActualColour` and `SetActualColour`") + Align = property(GetAlign,SetAlign,doc="See `GetAlign` and `SetAlign`") + CharHeight = property(GetCharHeight,doc="See `GetCharHeight`") + CharWidth = property(GetCharWidth,doc="See `GetCharWidth`") + Container = property(GetContainer,SetContainer,doc="See `GetContainer` and `SetContainer`") + DC = property(GetDC,SetDC,doc="See `GetDC` and `SetDC`") + FontBold = property(GetFontBold,SetFontBold,doc="See `GetFontBold` and `SetFontBold`") + FontFixed = property(GetFontFixed,SetFontFixed,doc="See `GetFontFixed` and `SetFontFixed`") + FontItalic = property(GetFontItalic,SetFontItalic,doc="See `GetFontItalic` and `SetFontItalic`") + FontSize = property(GetFontSize,SetFontSize,doc="See `GetFontSize` and `SetFontSize`") + FontUnderlined = property(GetFontUnderlined,SetFontUnderlined,doc="See `GetFontUnderlined` and `SetFontUnderlined`") + Link = property(GetLink,SetLink,doc="See `GetLink` and `SetLink`") + LinkColor = property(GetLinkColor,SetLinkColor,doc="See `GetLinkColor` and `SetLinkColor`") + WindowInterface = property(GetWindowInterface,doc="See `GetWindowInterface`") _html.HtmlWinParser_swigregister(HtmlWinParser) class HtmlTagHandler(_core.Object): @@ -383,6 +409,7 @@ class HtmlTagHandler(_core.Object): """ParseInner(self, HtmlTag tag)""" return _html.HtmlTagHandler_ParseInner(*args, **kwargs) + Parser = property(GetParser,SetParser,doc="See `GetParser` and `SetParser`") _html.HtmlTagHandler_swigregister(HtmlTagHandler) class HtmlWinTagHandler(HtmlTagHandler): @@ -410,6 +437,7 @@ class HtmlWinTagHandler(HtmlTagHandler): """ParseInner(self, HtmlTag tag)""" return _html.HtmlWinTagHandler_ParseInner(*args, **kwargs) + Parser = property(GetParser,SetParser,doc="See `GetParser` and `SetParser`") _html.HtmlWinTagHandler_swigregister(HtmlWinTagHandler) @@ -475,6 +503,12 @@ class HtmlSelection(object): """IsEmpty(self) -> bool""" return _html.HtmlSelection_IsEmpty(*args, **kwargs) + FromCell = property(GetFromCell,doc="See `GetFromCell`") + FromPos = property(GetFromPos,doc="See `GetFromPos`") + FromPrivPos = property(GetFromPrivPos,SetFromPrivPos,doc="See `GetFromPrivPos` and `SetFromPrivPos`") + ToCell = property(GetToCell,doc="See `GetToCell`") + ToPos = property(GetToPos,doc="See `GetToPos`") + ToPrivPos = property(GetToPrivPos,SetToPrivPos,doc="See `GetToPrivPos` and `SetToPrivPos`") _html.HtmlSelection_swigregister(HtmlSelection) HTML_SEL_OUT = _html.HTML_SEL_OUT @@ -513,6 +547,9 @@ class HtmlRenderingState(object): """GetBgColour(self) -> Colour""" return _html.HtmlRenderingState_GetBgColour(*args, **kwargs) + BgColour = property(GetBgColour,SetBgColour,doc="See `GetBgColour` and `SetBgColour`") + FgColour = property(GetFgColour,SetFgColour,doc="See `GetFgColour` and `SetFgColour`") + SelectionState = property(GetSelectionState,SetSelectionState,doc="See `GetSelectionState` and `SetSelectionState`") _html.HtmlRenderingState_swigregister(HtmlRenderingState) class HtmlRenderingStyle(object): @@ -528,6 +565,8 @@ class HtmlRenderingStyle(object): """GetSelectedTextBgColour(self, Colour clr) -> Colour""" return _html.HtmlRenderingStyle_GetSelectedTextBgColour(*args, **kwargs) + SelectedTextBgColour = property(GetSelectedTextBgColour,doc="See `GetSelectedTextBgColour`") + SelectedTextColour = property(GetSelectedTextColour,doc="See `GetSelectedTextColour`") _html.HtmlRenderingStyle_swigregister(HtmlRenderingStyle) class DefaultHtmlRenderingStyle(HtmlRenderingStyle): @@ -566,6 +605,9 @@ class HtmlRenderingInfo(object): """GetState(self) -> HtmlRenderingState""" return _html.HtmlRenderingInfo_GetState(*args, **kwargs) + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + State = property(GetState,doc="See `GetState`") + Style = property(GetStyle,SetStyle,doc="See `GetStyle` and `SetStyle`") _html.HtmlRenderingInfo_swigregister(HtmlRenderingInfo) #--------------------------------------------------------------------------- @@ -723,6 +765,23 @@ class HtmlCell(_core.Object): """ConvertToText(self, HtmlSelection sel) -> String""" return _html.HtmlCell_ConvertToText(*args, **kwargs) + Cursor = property(GetCursor,doc="See `GetCursor`") + Depth = property(GetDepth,doc="See `GetDepth`") + Descent = property(GetDescent,doc="See `GetDescent`") + FirstChild = property(GetFirstChild,doc="See `GetFirstChild`") + FirstTerminal = property(GetFirstTerminal,doc="See `GetFirstTerminal`") + Height = property(GetHeight,doc="See `GetHeight`") + Id = property(GetId,SetId,doc="See `GetId` and `SetId`") + LastTerminal = property(GetLastTerminal,doc="See `GetLastTerminal`") + Link = property(GetLink,SetLink,doc="See `GetLink` and `SetLink`") + MaxTotalWidth = property(GetMaxTotalWidth,doc="See `GetMaxTotalWidth`") + MouseCursor = property(GetMouseCursor,doc="See `GetMouseCursor`") + Next = property(GetNext,SetNext,doc="See `GetNext` and `SetNext`") + Parent = property(GetParent,SetParent,doc="See `GetParent` and `SetParent`") + PosX = property(GetPosX,doc="See `GetPosX`") + PosY = property(GetPosY,doc="See `GetPosY`") + RootCell = property(GetRootCell,doc="See `GetRootCell`") + Width = property(GetWidth,doc="See `GetWidth`") _html.HtmlCell_swigregister(HtmlCell) class HtmlWordCell(HtmlCell): @@ -817,6 +876,12 @@ class HtmlContainerCell(HtmlCell): """GetFirstChild(self) -> HtmlCell""" return _html.HtmlContainerCell_GetFirstChild(*args, **kwargs) + AlignHor = property(GetAlignHor,SetAlignHor,doc="See `GetAlignHor` and `SetAlignHor`") + AlignVer = property(GetAlignVer,SetAlignVer,doc="See `GetAlignVer` and `SetAlignVer`") + BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") + FirstChild = property(GetFirstChild,doc="See `GetFirstChild`") + Indent = property(GetIndent,SetIndent,doc="See `GetIndent` and `SetIndent`") + IndentUnits = property(GetIndentUnits,doc="See `GetIndentUnits`") _html.HtmlContainerCell_swigregister(HtmlContainerCell) class HtmlColourCell(HtmlCell): @@ -901,6 +966,8 @@ class HtmlWindowInterface(object): HTMLCursor_Default = _html.HtmlWindowInterface_HTMLCursor_Default HTMLCursor_Link = _html.HtmlWindowInterface_HTMLCursor_Link HTMLCursor_Text = _html.HtmlWindowInterface_HTMLCursor_Text + HTMLBackgroundColour = property(GetHTMLBackgroundColour,SetHTMLBackgroundColour,doc="See `GetHTMLBackgroundColour` and `SetHTMLBackgroundColour`") + HTMLWindow = property(GetHTMLWindow,doc="See `GetHTMLWindow`") _html.HtmlWindowInterface_swigregister(HtmlWindowInterface) #--------------------------------------------------------------------------- @@ -1121,6 +1188,12 @@ class HtmlWindow(_windows.ScrolledWindow): return _html.HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs) GetDefaultHTMLCursor = staticmethod(GetDefaultHTMLCursor) + InternalRepresentation = property(GetInternalRepresentation,doc="See `GetInternalRepresentation`") + OpenedAnchor = property(GetOpenedAnchor,doc="See `GetOpenedAnchor`") + OpenedPage = property(GetOpenedPage,doc="See `GetOpenedPage`") + OpenedPageTitle = property(GetOpenedPageTitle,doc="See `GetOpenedPageTitle`") + Parser = property(GetParser,doc="See `GetParser`") + RelatedFrame = property(GetRelatedFrame,doc="See `GetRelatedFrame`") _html.HtmlWindow_swigregister(HtmlWindow) def PreHtmlWindow(*args, **kwargs): @@ -1195,6 +1268,7 @@ class HtmlDCRenderer(_core.Object): """GetTotalHeight(self) -> int""" return _html.HtmlDCRenderer_GetTotalHeight(*args, **kwargs) + TotalHeight = property(GetTotalHeight,doc="See `GetTotalHeight`") _html.HtmlDCRenderer_swigregister(HtmlDCRenderer) PAGE_ODD = _html.PAGE_ODD @@ -1311,6 +1385,8 @@ class HtmlEasyPrinting(_core.Object): """GetPageSetupData(self) -> PageSetupDialogData""" return _html.HtmlEasyPrinting_GetPageSetupData(*args, **kwargs) + PageSetupData = property(GetPageSetupData,doc="See `GetPageSetupData`") + PrintData = property(GetPrintData,doc="See `GetPrintData`") _html.HtmlEasyPrinting_swigregister(HtmlEasyPrinting) #--------------------------------------------------------------------------- @@ -1366,6 +1442,13 @@ class HtmlBookRecord(object): """GetFullPath(self, String page) -> String""" return _html.HtmlBookRecord_GetFullPath(*args, **kwargs) + BasePath = property(GetBasePath,SetBasePath,doc="See `GetBasePath` and `SetBasePath`") + BookFile = property(GetBookFile,doc="See `GetBookFile`") + ContentsEnd = property(GetContentsEnd,doc="See `GetContentsEnd`") + ContentsStart = property(GetContentsStart,doc="See `GetContentsStart`") + FullPath = property(GetFullPath,doc="See `GetFullPath`") + Start = property(GetStart,SetStart,doc="See `GetStart` and `SetStart`") + Title = property(GetTitle,SetTitle,doc="See `GetTitle` and `SetTitle`") _html.HtmlBookRecord_swigregister(HtmlBookRecord) class HtmlSearchStatus(object): @@ -1393,6 +1476,9 @@ class HtmlSearchStatus(object): """GetName(self) -> String""" return _html.HtmlSearchStatus_GetName(*args, **kwargs) + CurIndex = property(GetCurIndex,doc="See `GetCurIndex`") + MaxIndex = property(GetMaxIndex,doc="See `GetMaxIndex`") + Name = property(GetName,doc="See `GetName`") _html.HtmlSearchStatus_swigregister(HtmlSearchStatus) class HtmlHelpData(object): @@ -1424,6 +1510,7 @@ class HtmlHelpData(object): """GetBookRecArray(self) -> wxHtmlBookRecArray""" return _html.HtmlHelpData_GetBookRecArray(*args, **kwargs) + BookRecArray = property(GetBookRecArray,doc="See `GetBookRecArray`") _html.HtmlHelpData_swigregister(HtmlHelpData) HF_TOOLBAR = _html.HF_TOOLBAR @@ -1562,6 +1649,13 @@ class HtmlHelpWindow(_core.Window): """GetTreeCtrl(self) -> wxPyTreeCtrl""" return _html.HtmlHelpWindow_GetTreeCtrl(*args, **kwargs) + CfgData = property(GetCfgData,doc="See `GetCfgData`") + Controller = property(GetController,SetController,doc="See `GetController` and `SetController`") + Data = property(GetData,doc="See `GetData`") + HtmlWindow = property(GetHtmlWindow,doc="See `GetHtmlWindow`") + SplitterWindow = property(GetSplitterWindow,doc="See `GetSplitterWindow`") + ToolBar = property(GetToolBar,doc="See `GetToolBar`") + TreeCtrl = property(GetTreeCtrl,doc="See `GetTreeCtrl`") _html.HtmlHelpWindow_swigregister(HtmlHelpWindow) def PreHtmlHelpWindow(*args, **kwargs): @@ -1585,6 +1679,7 @@ class HtmlWindowEvent(_core.NotifyEvent): """GetURL(self) -> String""" return _html.HtmlWindowEvent_GetURL(*args, **kwargs) + URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") _html.HtmlWindowEvent_swigregister(HtmlWindowEvent) class HtmlHelpFrame(_windows.Frame): @@ -1647,6 +1742,9 @@ class HtmlHelpFrame(_windows.Frame): def WriteCustomization(self, config, rootpath=""): return self.GetHelpWindow().WriteCustomization(config, rootpath) + Controller = property(GetController,SetController,doc="See `GetController` and `SetController`") + Data = property(GetData,doc="See `GetData`") + HelpWindow = property(GetHelpWindow,doc="See `GetHelpWindow`") _html.HtmlHelpFrame_swigregister(HtmlHelpFrame) def PreHtmlHelpFrame(*args, **kwargs): @@ -1691,6 +1789,9 @@ class HtmlHelpDialog(_windows.Dialog): """SetTitleFormat(self, String format)""" return _html.HtmlHelpDialog_SetTitleFormat(*args, **kwargs) + Controller = property(GetController,SetController,doc="See `GetController` and `SetController`") + Data = property(GetData,doc="See `GetData`") + HelpWindow = property(GetHelpWindow,doc="See `GetHelpWindow`") _html.HtmlHelpDialog_swigregister(HtmlHelpDialog) def PreHtmlHelpDialog(*args, **kwargs): @@ -1773,6 +1874,7 @@ class HelpControllerBase(_core.Object): """GetParentWindow(self) -> Window""" return _html.HelpControllerBase_GetParentWindow(*args, **kwargs) + ParentWindow = property(GetParentWindow,SetParentWindow,doc="See `GetParentWindow` and `SetParentWindow`") _html.HelpControllerBase_swigregister(HelpControllerBase) class HtmlHelpController(HelpControllerBase): @@ -1852,6 +1954,9 @@ class HtmlHelpController(HelpControllerBase): """FindTopLevelWindow(self) -> Window""" return _html.HtmlHelpController_FindTopLevelWindow(*args, **kwargs) + Dialog = property(GetDialog,doc="See `GetDialog`") + Frame = property(GetFrame,doc="See `GetFrame`") + HelpWindow = property(GetHelpWindow,SetHelpWindow,doc="See `GetHelpWindow` and `SetHelpWindow`") _html.HtmlHelpController_swigregister(HtmlHelpController) class HtmlModalHelp(object): diff --git a/wxPython/src/mac/media.py b/wxPython/src/mac/media.py index 8d473ae9a5..414ca24e56 100644 --- a/wxPython/src/mac/media.py +++ b/wxPython/src/mac/media.py @@ -175,6 +175,11 @@ class MediaCtrl(_core.Control): """GetDownloadTotal(self) -> wxFileOffset""" return _media.MediaCtrl_GetDownloadTotal(*args, **kwargs) + DownloadProgress = property(GetDownloadProgress,doc="See `GetDownloadProgress`") + DownloadTotal = property(GetDownloadTotal,doc="See `GetDownloadTotal`") + PlaybackRate = property(GetPlaybackRate,SetPlaybackRate,doc="See `GetPlaybackRate` and `SetPlaybackRate`") + State = property(GetState,doc="See `GetState`") + Volume = property(GetVolume,SetVolume,doc="See `GetVolume` and `SetVolume`") _media.MediaCtrl_swigregister(MediaCtrl) MediaCtrlNameStr = cvar.MediaCtrlNameStr diff --git a/wxPython/src/mac/richtext.py b/wxPython/src/mac/richtext.py index dd3b175453..5670dacc9d 100644 --- a/wxPython/src/mac/richtext.py +++ b/wxPython/src/mac/richtext.py @@ -247,6 +247,9 @@ class RichTextRange(object): __safe_for_unpickling__ = True def __reduce__(self): return (RichTextRange, self.Get()) + End = property(GetEnd,SetEnd,doc="See `GetEnd` and `SetEnd`") + Length = property(GetLength,doc="See `GetLength`") + Start = property(GetStart,SetStart,doc="See `GetStart` and `SetStart`") _richtext.RichTextRange_swigregister(RichTextRange) class RichTextAttr(object): @@ -542,6 +545,29 @@ class RichTextAttr(object): """IsDefault(self) -> bool""" return _richtext.RichTextAttr_IsDefault(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") + BulletNumber = property(GetBulletNumber,SetBulletNumber,doc="See `GetBulletNumber` and `SetBulletNumber`") + BulletStyle = property(GetBulletStyle,SetBulletStyle,doc="See `GetBulletStyle` and `SetBulletStyle`") + BulletSymbol = property(GetBulletSymbol,SetBulletSymbol,doc="See `GetBulletSymbol` and `SetBulletSymbol`") + CharacterStyleName = property(GetCharacterStyleName,SetCharacterStyleName,doc="See `GetCharacterStyleName` and `SetCharacterStyleName`") + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") + FontAttributes = property(GetFontAttributes,doc="See `GetFontAttributes`") + FontFaceName = property(GetFontFaceName,SetFontFaceName,doc="See `GetFontFaceName` and `SetFontFaceName`") + FontSize = property(GetFontSize,SetFontSize,doc="See `GetFontSize` and `SetFontSize`") + FontStyle = property(GetFontStyle,SetFontStyle,doc="See `GetFontStyle` and `SetFontStyle`") + FontUnderlined = property(GetFontUnderlined,SetFontUnderlined,doc="See `GetFontUnderlined` and `SetFontUnderlined`") + FontWeight = property(GetFontWeight,SetFontWeight,doc="See `GetFontWeight` and `SetFontWeight`") + LeftIndent = property(GetLeftIndent,SetLeftIndent,doc="See `GetLeftIndent` and `SetLeftIndent`") + LeftSubIndent = property(GetLeftSubIndent,doc="See `GetLeftSubIndent`") + LineSpacing = property(GetLineSpacing,SetLineSpacing,doc="See `GetLineSpacing` and `SetLineSpacing`") + ParagraphSpacingAfter = property(GetParagraphSpacingAfter,SetParagraphSpacingAfter,doc="See `GetParagraphSpacingAfter` and `SetParagraphSpacingAfter`") + ParagraphSpacingBefore = property(GetParagraphSpacingBefore,SetParagraphSpacingBefore,doc="See `GetParagraphSpacingBefore` and `SetParagraphSpacingBefore`") + ParagraphStyleName = property(GetParagraphStyleName,SetParagraphStyleName,doc="See `GetParagraphStyleName` and `SetParagraphStyleName`") + RightIndent = property(GetRightIndent,SetRightIndent,doc="See `GetRightIndent` and `SetRightIndent`") + Tabs = property(GetTabs,SetTabs,doc="See `GetTabs` and `SetTabs`") + TextColour = property(GetTextColour,SetTextColour,doc="See `GetTextColour` and `SetTextColour`") _richtext.RichTextAttr_swigregister(RichTextAttr) cvar = _richtext.cvar RICHTEXT_ALL = cvar.RICHTEXT_ALL @@ -1291,6 +1317,19 @@ class RichTextCtrl(_windows.ScrolledWindow): """GetStyleSheet(self) -> wxRichTextStyleSheet""" return _richtext.RichTextCtrl_GetStyleSheet(*args, **kwargs) + Buffer = property(GetBuffer,doc="See `GetBuffer`") + DefaultStyle = property(GetDefaultStyle,SetDefaultStyle,doc="See `GetDefaultStyle` and `SetDefaultStyle`") + DelayedLayoutThreshold = property(GetDelayedLayoutThreshold,SetDelayedLayoutThreshold,doc="See `GetDelayedLayoutThreshold` and `SetDelayedLayoutThreshold`") + Filename = property(GetFilename,SetFilename,doc="See `GetFilename` and `SetFilename`") + InsertionPoint = property(GetInsertionPoint,SetInsertionPoint,doc="See `GetInsertionPoint` and `SetInsertionPoint`") + InternalSelectionRange = property(GetInternalSelectionRange,SetInternalSelectionRange,doc="See `GetInternalSelectionRange` and `SetInternalSelectionRange`") + LastPosition = property(GetLastPosition,doc="See `GetLastPosition`") + NumberOfLines = property(GetNumberOfLines,doc="See `GetNumberOfLines`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + SelectionRange = property(GetSelectionRange,SetSelectionRange,doc="See `GetSelectionRange` and `SetSelectionRange`") + StringSelection = property(GetStringSelection,doc="See `GetStringSelection`") + StyleSheet = property(GetStyleSheet,SetStyleSheet,doc="See `GetStyleSheet` and `SetStyleSheet`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _richtext.RichTextCtrl_swigregister(RichTextCtrl) def PreRichTextCtrl(*args, **kwargs): @@ -1336,6 +1375,8 @@ class RichTextEvent(_core.NotifyEvent): """SetFlags(self, int flags)""" return _richtext.RichTextEvent_SetFlags(*args, **kwargs) + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Index = property(GetIndex,SetIndex,doc="See `GetIndex` and `SetIndex`") _richtext.RichTextEvent_swigregister(RichTextEvent) diff --git a/wxPython/src/mac/webkit.py b/wxPython/src/mac/webkit.py index 853db523b9..4d57edce2c 100644 --- a/wxPython/src/mac/webkit.py +++ b/wxPython/src/mac/webkit.py @@ -129,6 +129,9 @@ class WebKitCtrl(_core.Control): """GetPageTitle(self) -> String""" return _webkit.WebKitCtrl_GetPageTitle(*args, **kwargs) + PageSource = property(GetPageSource,SetPageSource,doc="See `GetPageSource` and `SetPageSource`") + PageTitle = property(GetPageTitle,doc="See `GetPageTitle`") + PageURL = property(GetPageURL,doc="See `GetPageURL`") _webkit.WebKitCtrl_swigregister(WebKitCtrl) cvar = _webkit.cvar WebKitNameStr = cvar.WebKitNameStr @@ -168,6 +171,8 @@ class WebKitStateChangedEvent(_core.CommandEvent): """SetURL(self, String url)""" return _webkit.WebKitStateChangedEvent_SetURL(*args, **kwargs) + State = property(GetState,SetState,doc="See `GetState` and `SetState`") + URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") _webkit.WebKitStateChangedEvent_swigregister(WebKitStateChangedEvent) EVT_WEBKIT_STATE_CHANGED = wx.PyEventBinder(wxEVT_WEBKIT_STATE_CHANGED) diff --git a/wxPython/src/mac/wizard.py b/wxPython/src/mac/wizard.py index 44764ba96e..f2972ae91a 100644 --- a/wxPython/src/mac/wizard.py +++ b/wxPython/src/mac/wizard.py @@ -90,6 +90,8 @@ class WizardEvent(_core.NotifyEvent): """GetPage(self) -> WizardPage""" return _wizard.WizardEvent_GetPage(*args, **kwargs) + Direction = property(GetDirection,doc="See `GetDirection`") + Page = property(GetPage,doc="See `GetPage`") _wizard.WizardEvent_swigregister(WizardEvent) class WizardPage(_windows.Panel): @@ -113,6 +115,9 @@ class WizardPage(_windows.Panel): """GetBitmap(self) -> Bitmap""" return _wizard.WizardPage_GetBitmap(*args, **kwargs) + Bitmap = property(GetBitmap,doc="See `GetBitmap`") + Next = property(GetNext,doc="See `GetNext`") + Prev = property(GetPrev,doc="See `GetPrev`") _wizard.WizardPage_swigregister(WizardPage) class PyWizardPage(WizardPage): @@ -399,6 +404,9 @@ class Wizard(_windows.Dialog): """HasPrevPage(self, WizardPage page) -> bool""" return _wizard.Wizard_HasPrevPage(*args, **kwargs) + CurrentPage = property(GetCurrentPage,doc="See `GetCurrentPage`") + PageAreaSizer = property(GetPageAreaSizer,doc="See `GetPageAreaSizer`") + PageSize = property(GetPageSize,SetPageSize,doc="See `GetPageSize` and `SetPageSize`") _wizard.Wizard_swigregister(Wizard) def PreWizard(*args, **kwargs): diff --git a/wxPython/src/mac/xrc.py b/wxPython/src/mac/xrc.py index d1f5951492..31946bfa96 100644 --- a/wxPython/src/mac/xrc.py +++ b/wxPython/src/mac/xrc.py @@ -211,6 +211,9 @@ class XmlResource(_core.Object): """SetDomain(self, String domain)""" return _xrc.XmlResource_SetDomain(*args, **kwargs) + Domain = property(GetDomain,SetDomain,doc="See `GetDomain` and `SetDomain`") + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Version = property(GetVersion,doc="See `GetVersion`") _xrc.XmlResource_swigregister(XmlResource) cvar = _xrc.cvar UTF8String = cvar.UTF8String @@ -315,6 +318,9 @@ class XmlProperty(object): """SetNext(self, XmlProperty next)""" return _xrc.XmlProperty_SetNext(*args, **kwargs) + Name = property(GetName,SetName,doc="See `GetName` and `SetName`") + Next = property(GetNext,SetNext,doc="See `GetNext` and `SetNext`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _xrc.XmlProperty_swigregister(XmlProperty) class XmlNode(object): @@ -430,6 +436,13 @@ class XmlNode(object): """SetProperties(self, XmlProperty prop)""" return _xrc.XmlNode_SetProperties(*args, **kwargs) + Children = property(GetChildren,SetChildren,doc="See `GetChildren` and `SetChildren`") + Content = property(GetContent,SetContent,doc="See `GetContent` and `SetContent`") + Name = property(GetName,SetName,doc="See `GetName` and `SetName`") + Next = property(GetNext,SetNext,doc="See `GetNext` and `SetNext`") + Parent = property(GetParent,SetParent,doc="See `GetParent` and `SetParent`") + Properties = property(GetProperties,SetProperties,doc="See `GetProperties` and `SetProperties`") + Type = property(GetType,SetType,doc="See `GetType` and `SetType`") _xrc.XmlNode_swigregister(XmlNode) def XmlNodeEasy(*args, **kwargs): @@ -497,6 +510,9 @@ class XmlDocument(_core.Object): """SetFileEncoding(self, String encoding)""" return _xrc.XmlDocument_SetFileEncoding(*args, **kwargs) + FileEncoding = property(GetFileEncoding,SetFileEncoding,doc="See `GetFileEncoding` and `SetFileEncoding`") + Root = property(GetRoot,SetRoot,doc="See `GetRoot` and `SetRoot`") + Version = property(GetVersion,SetVersion,doc="See `GetVersion` and `SetVersion`") _xrc.XmlDocument_swigregister(XmlDocument) def XmlDocumentFromStream(*args, **kwargs): @@ -664,6 +680,15 @@ class XmlResourceHandler(_core.Object): """GetCurFileSystem(self) -> FileSystem""" return _xrc.XmlResourceHandler_GetCurFileSystem(*args, **kwargs) + Class = property(GetClass,doc="See `GetClass`") + CurFileSystem = property(GetCurFileSystem,doc="See `GetCurFileSystem`") + ID = property(GetID,doc="See `GetID`") + Instance = property(GetInstance,doc="See `GetInstance`") + Name = property(GetName,doc="See `GetName`") + Node = property(GetNode,doc="See `GetNode`") + Parent = property(GetParent,doc="See `GetParent`") + ParentAsWindow = property(GetParentAsWindow,doc="See `GetParentAsWindow`") + Resource = property(GetResource,doc="See `GetResource`") _xrc.XmlResourceHandler_swigregister(XmlResourceHandler) #---------------------------------------------------------------------------- diff --git a/wxPython/src/media.i b/wxPython/src/media.i index 7cf4b6481f..129284aeb0 100644 --- a/wxPython/src/media.i +++ b/wxPython/src/media.i @@ -240,6 +240,11 @@ public: wxFileOffset GetDownloadProgress(); // DirectShow only wxFileOffset GetDownloadTotal(); // DirectShow only + %property(DownloadProgress, GetDownloadProgress, doc="See `GetDownloadProgress`"); + %property(DownloadTotal, GetDownloadTotal, doc="See `GetDownloadTotal`"); + %property(PlaybackRate, GetPlaybackRate, SetPlaybackRate, doc="See `GetPlaybackRate` and `SetPlaybackRate`"); + %property(State, GetState, doc="See `GetState`"); + %property(Volume, GetVolume, SetVolume, doc="See `GetVolume` and `SetVolume`"); }; diff --git a/wxPython/src/msw/grid.py b/wxPython/src/msw/grid.py index c3ce9b7097..03e3018e71 100644 --- a/wxPython/src/msw/grid.py +++ b/wxPython/src/msw/grid.py @@ -184,6 +184,8 @@ class GridCellFloatRenderer(GridCellStringRenderer): """SetPrecision(self, int precision)""" return _grid.GridCellFloatRenderer_SetPrecision(*args, **kwargs) + Precision = property(GetPrecision,SetPrecision,doc="See `GetPrecision` and `SetPrecision`") + Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") _grid.GridCellFloatRenderer_swigregister(GridCellFloatRenderer) class GridCellBoolRenderer(GridCellRenderer): @@ -309,6 +311,8 @@ class GridCellEditor(GridCellWorker): args[0].thisown = 0 return val + CellAttr = property(GetCellAttr,SetCellAttr,doc="See `GetCellAttr` and `SetCellAttr`") + Control = property(GetControl,SetControl,doc="See `GetControl` and `SetControl`") _grid.GridCellEditor_swigregister(GridCellEditor) class PyGridCellEditor(GridCellEditor): @@ -388,6 +392,7 @@ class GridCellTextEditor(GridCellEditor): """GetValue(self) -> String""" return _grid.GridCellTextEditor_GetValue(*args, **kwargs) + Value = property(GetValue,doc="See `GetValue`") _grid.GridCellTextEditor_swigregister(GridCellTextEditor) class GridCellNumberEditor(GridCellTextEditor): @@ -421,10 +426,6 @@ class GridCellBoolEditor(GridCellEditor): _grid.GridCellBoolEditor_swiginit(self,_grid.new_GridCellBoolEditor(*args, **kwargs)) self._setOORInfo(self) - def GetValue(*args, **kwargs): - """GetValue(self) -> String""" - return _grid.GridCellBoolEditor_GetValue(*args, **kwargs) - _grid.GridCellBoolEditor_swigregister(GridCellBoolEditor) class GridCellChoiceEditor(GridCellEditor): @@ -436,10 +437,6 @@ class GridCellChoiceEditor(GridCellEditor): _grid.GridCellChoiceEditor_swiginit(self,_grid.new_GridCellChoiceEditor(*args, **kwargs)) self._setOORInfo(self) - def GetValue(*args, **kwargs): - """GetValue(self) -> String""" - return _grid.GridCellChoiceEditor_GetValue(*args, **kwargs) - _grid.GridCellChoiceEditor_swigregister(GridCellChoiceEditor) class GridCellEnumEditor(GridCellChoiceEditor): @@ -617,6 +614,13 @@ class GridCellAttr(object): """SetDefAttr(self, GridCellAttr defAttr)""" return _grid.GridCellAttr_SetDefAttr(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") + Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") + Kind = property(GetKind,SetKind,doc="See `GetKind` and `SetKind`") + Overflow = property(GetOverflow,SetOverflow,doc="See `GetOverflow` and `SetOverflow`") + Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") + TextColour = property(GetTextColour,SetTextColour,doc="See `GetTextColour` and `SetTextColour`") _grid.GridCellAttr_swigregister(GridCellAttr) class GridCellAttrProvider(object): @@ -856,6 +860,10 @@ class GridTableBase(_core.Object): """SetColAttr(self, GridCellAttr attr, int col)""" return _grid.GridTableBase_SetColAttr(*args, **kwargs) + AttrProvider = property(GetAttrProvider,SetAttrProvider,doc="See `GetAttrProvider` and `SetAttrProvider`") + NumberCols = property(GetNumberCols,doc="See `GetNumberCols`") + NumberRows = property(GetNumberRows,doc="See `GetNumberRows`") + View = property(GetView,SetView,doc="See `GetView` and `SetView`") _grid.GridTableBase_swigregister(GridTableBase) class PyGridTableBase(GridTableBase): @@ -1038,6 +1046,10 @@ class GridTableMessage(object): """GetCommandInt2(self) -> int""" return _grid.GridTableMessage_GetCommandInt2(*args, **kwargs) + CommandInt = property(GetCommandInt,SetCommandInt,doc="See `GetCommandInt` and `SetCommandInt`") + CommandInt2 = property(GetCommandInt2,SetCommandInt2,doc="See `GetCommandInt2` and `SetCommandInt2`") + Id = property(GetId,SetId,doc="See `GetId` and `SetId`") + TableObject = property(GetTableObject,SetTableObject,doc="See `GetTableObject` and `SetTableObject`") _grid.GridTableMessage_swigregister(GridTableMessage) class GridCellCoords(object): @@ -1099,6 +1111,8 @@ class GridCellCoords(object): elif index == 1: self.SetCol(val) else: raise IndexError + Col = property(GetCol,SetCol,doc="See `GetCol` and `SetCol`") + Row = property(GetRow,SetRow,doc="See `GetRow` and `SetRow`") _grid.GridCellCoords_swigregister(GridCellCoords) class Grid(_windows.ScrolledWindow): @@ -1625,7 +1639,7 @@ class Grid(_windows.ScrolledWindow): return _grid.Grid_GetDefaultCellAlignment(*args, **kwargs) def GetCellAlignment(*args, **kwargs): - """GetCellAlignment() -> (horiz, vert)""" + """GetCellAlignment(int row, int col) -> (horiz, vert)""" return _grid.Grid_GetCellAlignment(*args, **kwargs) def GetDefaultCellOverflow(*args, **kwargs): @@ -1977,6 +1991,53 @@ class Grid(_windows.ScrolledWindow): return _grid.Grid_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + BatchCount = property(GetBatchCount,doc="See `GetBatchCount`") + CellHighlightColour = property(GetCellHighlightColour,SetCellHighlightColour,doc="See `GetCellHighlightColour` and `SetCellHighlightColour`") + CellHighlightPenWidth = property(GetCellHighlightPenWidth,SetCellHighlightPenWidth,doc="See `GetCellHighlightPenWidth` and `SetCellHighlightPenWidth`") + CellHighlightROPenWidth = property(GetCellHighlightROPenWidth,SetCellHighlightROPenWidth,doc="See `GetCellHighlightROPenWidth` and `SetCellHighlightROPenWidth`") + CellSize = property(GetCellSize,SetCellSize,doc="See `GetCellSize` and `SetCellSize`") + ColLabelAlignment = property(GetColLabelAlignment,SetColLabelAlignment,doc="See `GetColLabelAlignment` and `SetColLabelAlignment`") + ColLabelSize = property(GetColLabelSize,SetColLabelSize,doc="See `GetColLabelSize` and `SetColLabelSize`") + ColLabelTextOrientation = property(GetColLabelTextOrientation,SetColLabelTextOrientation,doc="See `GetColLabelTextOrientation` and `SetColLabelTextOrientation`") + ColMinimalAcceptableWidth = property(GetColMinimalAcceptableWidth,SetColMinimalAcceptableWidth,doc="See `GetColMinimalAcceptableWidth` and `SetColMinimalAcceptableWidth`") + DefaultCellAlignment = property(GetDefaultCellAlignment,SetDefaultCellAlignment,doc="See `GetDefaultCellAlignment` and `SetDefaultCellAlignment`") + DefaultCellBackgroundColour = property(GetDefaultCellBackgroundColour,SetDefaultCellBackgroundColour,doc="See `GetDefaultCellBackgroundColour` and `SetDefaultCellBackgroundColour`") + DefaultCellFont = property(GetDefaultCellFont,SetDefaultCellFont,doc="See `GetDefaultCellFont` and `SetDefaultCellFont`") + DefaultCellOverflow = property(GetDefaultCellOverflow,SetDefaultCellOverflow,doc="See `GetDefaultCellOverflow` and `SetDefaultCellOverflow`") + DefaultCellTextColour = property(GetDefaultCellTextColour,SetDefaultCellTextColour,doc="See `GetDefaultCellTextColour` and `SetDefaultCellTextColour`") + DefaultColLabelSize = property(GetDefaultColLabelSize,doc="See `GetDefaultColLabelSize`") + DefaultColSize = property(GetDefaultColSize,SetDefaultColSize,doc="See `GetDefaultColSize` and `SetDefaultColSize`") + DefaultEditor = property(GetDefaultEditor,SetDefaultEditor,doc="See `GetDefaultEditor` and `SetDefaultEditor`") + DefaultGridLinePen = property(GetDefaultGridLinePen,doc="See `GetDefaultGridLinePen`") + DefaultRenderer = property(GetDefaultRenderer,SetDefaultRenderer,doc="See `GetDefaultRenderer` and `SetDefaultRenderer`") + DefaultRowLabelSize = property(GetDefaultRowLabelSize,doc="See `GetDefaultRowLabelSize`") + DefaultRowSize = property(GetDefaultRowSize,SetDefaultRowSize,doc="See `GetDefaultRowSize` and `SetDefaultRowSize`") + GridColLabelWindow = property(GetGridColLabelWindow,doc="See `GetGridColLabelWindow`") + GridCornerLabelWindow = property(GetGridCornerLabelWindow,doc="See `GetGridCornerLabelWindow`") + GridCursorCol = property(GetGridCursorCol,doc="See `GetGridCursorCol`") + GridCursorRow = property(GetGridCursorRow,doc="See `GetGridCursorRow`") + GridLineColour = property(GetGridLineColour,SetGridLineColour,doc="See `GetGridLineColour` and `SetGridLineColour`") + GridRowLabelWindow = property(GetGridRowLabelWindow,doc="See `GetGridRowLabelWindow`") + GridWindow = property(GetGridWindow,doc="See `GetGridWindow`") + LabelBackgroundColour = property(GetLabelBackgroundColour,SetLabelBackgroundColour,doc="See `GetLabelBackgroundColour` and `SetLabelBackgroundColour`") + LabelFont = property(GetLabelFont,SetLabelFont,doc="See `GetLabelFont` and `SetLabelFont`") + LabelTextColour = property(GetLabelTextColour,SetLabelTextColour,doc="See `GetLabelTextColour` and `SetLabelTextColour`") + NumberCols = property(GetNumberCols,doc="See `GetNumberCols`") + NumberRows = property(GetNumberRows,doc="See `GetNumberRows`") + RowLabelAlignment = property(GetRowLabelAlignment,SetRowLabelAlignment,doc="See `GetRowLabelAlignment` and `SetRowLabelAlignment`") + RowLabelSize = property(GetRowLabelSize,SetRowLabelSize,doc="See `GetRowLabelSize` and `SetRowLabelSize`") + RowMinimalAcceptableHeight = property(GetRowMinimalAcceptableHeight,SetRowMinimalAcceptableHeight,doc="See `GetRowMinimalAcceptableHeight` and `SetRowMinimalAcceptableHeight`") + ScrollLineX = property(GetScrollLineX,SetScrollLineX,doc="See `GetScrollLineX` and `SetScrollLineX`") + ScrollLineY = property(GetScrollLineY,SetScrollLineY,doc="See `GetScrollLineY` and `SetScrollLineY`") + SelectedCells = property(GetSelectedCells,doc="See `GetSelectedCells`") + SelectedCols = property(GetSelectedCols,doc="See `GetSelectedCols`") + SelectedRows = property(GetSelectedRows,doc="See `GetSelectedRows`") + SelectionBackground = property(GetSelectionBackground,SetSelectionBackground,doc="See `GetSelectionBackground` and `SetSelectionBackground`") + SelectionBlockBottomRight = property(GetSelectionBlockBottomRight,doc="See `GetSelectionBlockBottomRight`") + SelectionBlockTopLeft = property(GetSelectionBlockTopLeft,doc="See `GetSelectionBlockTopLeft`") + SelectionForeground = property(GetSelectionForeground,SetSelectionForeground,doc="See `GetSelectionForeground` and `SetSelectionForeground`") + SelectionMode = property(GetSelectionMode,SetSelectionMode,doc="See `GetSelectionMode` and `SetSelectionMode`") + Table = property(GetTable,SetTable,doc="See `GetTable` and `SetTable`") _grid.Grid_swigregister(Grid) def PreGrid(*args, **kwargs): @@ -2049,6 +2110,9 @@ class GridEvent(_core.NotifyEvent): """CmdDown(self) -> bool""" return _grid.GridEvent_CmdDown(*args, **kwargs) + Col = property(GetCol,doc="See `GetCol`") + Position = property(GetPosition,doc="See `GetPosition`") + Row = property(GetRow,doc="See `GetRow`") _grid.GridEvent_swigregister(GridEvent) class GridSizeEvent(_core.NotifyEvent): @@ -2090,6 +2154,8 @@ class GridSizeEvent(_core.NotifyEvent): """CmdDown(self) -> bool""" return _grid.GridSizeEvent_CmdDown(*args, **kwargs) + Position = property(GetPosition,doc="See `GetPosition`") + RowOrCol = property(GetRowOrCol,doc="See `GetRowOrCol`") _grid.GridSizeEvent_swigregister(GridSizeEvent) class GridRangeSelectEvent(_core.NotifyEvent): @@ -2152,6 +2218,12 @@ class GridRangeSelectEvent(_core.NotifyEvent): """CmdDown(self) -> bool""" return _grid.GridRangeSelectEvent_CmdDown(*args, **kwargs) + BottomRightCoords = property(GetBottomRightCoords,doc="See `GetBottomRightCoords`") + BottomRow = property(GetBottomRow,doc="See `GetBottomRow`") + LeftCol = property(GetLeftCol,doc="See `GetLeftCol`") + RightCol = property(GetRightCol,doc="See `GetRightCol`") + TopLeftCoords = property(GetTopLeftCoords,doc="See `GetTopLeftCoords`") + TopRow = property(GetTopRow,doc="See `GetTopRow`") _grid.GridRangeSelectEvent_swigregister(GridRangeSelectEvent) class GridEditorCreatedEvent(_core.CommandEvent): @@ -2188,6 +2260,9 @@ class GridEditorCreatedEvent(_core.CommandEvent): """SetControl(self, Control ctrl)""" return _grid.GridEditorCreatedEvent_SetControl(*args, **kwargs) + Col = property(GetCol,SetCol,doc="See `GetCol` and `SetCol`") + Control = property(GetControl,SetControl,doc="See `GetControl` and `SetControl`") + Row = property(GetRow,SetRow,doc="See `GetRow` and `SetRow`") _grid.GridEditorCreatedEvent_swigregister(GridEditorCreatedEvent) wxEVT_GRID_CELL_LEFT_CLICK = _grid.wxEVT_GRID_CELL_LEFT_CLICK diff --git a/wxPython/src/msw/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp index a7047eecd3..100d3094a4 100644 --- a/wxPython/src/msw/grid_wrap.cpp +++ b/wxPython/src/msw/grid_wrap.cpp @@ -5504,40 +5504,6 @@ fail: } -SWIGINTERN PyObject *_wrap_GridCellBoolEditor_GetValue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxGridCellBoolEditor *arg1 = (wxGridCellBoolEditor *) 0 ; - wxString result; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridCellBoolEditor, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellBoolEditor_GetValue" "', expected argument " "1"" of type '" "wxGridCellBoolEditor *""'"); - } - arg1 = reinterpret_cast< wxGridCellBoolEditor * >(argp1); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetValue(); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); -#else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); -#endif - } - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *GridCellBoolEditor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -5597,40 +5563,6 @@ fail: } -SWIGINTERN PyObject *_wrap_GridCellChoiceEditor_GetValue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxGridCellChoiceEditor *arg1 = (wxGridCellChoiceEditor *) 0 ; - wxString result; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridCellChoiceEditor, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellChoiceEditor_GetValue" "', expected argument " "1"" of type '" "wxGridCellChoiceEditor *""'"); - } - arg1 = reinterpret_cast< wxGridCellChoiceEditor * >(argp1); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetValue(); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); -#else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); -#endif - } - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *GridCellChoiceEditor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -20439,11 +20371,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"GridCellFloatEditor_swigregister", GridCellFloatEditor_swigregister, METH_VARARGS, NULL}, { (char *)"GridCellFloatEditor_swiginit", GridCellFloatEditor_swiginit, METH_VARARGS, NULL}, { (char *)"new_GridCellBoolEditor", (PyCFunction)_wrap_new_GridCellBoolEditor, METH_NOARGS, NULL}, - { (char *)"GridCellBoolEditor_GetValue", (PyCFunction)_wrap_GridCellBoolEditor_GetValue, METH_O, NULL}, { (char *)"GridCellBoolEditor_swigregister", GridCellBoolEditor_swigregister, METH_VARARGS, NULL}, { (char *)"GridCellBoolEditor_swiginit", GridCellBoolEditor_swiginit, METH_VARARGS, NULL}, { (char *)"new_GridCellChoiceEditor", (PyCFunction) _wrap_new_GridCellChoiceEditor, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"GridCellChoiceEditor_GetValue", (PyCFunction)_wrap_GridCellChoiceEditor_GetValue, METH_O, NULL}, { (char *)"GridCellChoiceEditor_swigregister", GridCellChoiceEditor_swigregister, METH_VARARGS, NULL}, { (char *)"GridCellChoiceEditor_swiginit", GridCellChoiceEditor_swiginit, METH_VARARGS, NULL}, { (char *)"new_GridCellEnumEditor", (PyCFunction) _wrap_new_GridCellEnumEditor, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py index 208b4f96a3..a904a6f95a 100644 --- a/wxPython/src/msw/html.py +++ b/wxPython/src/msw/html.py @@ -121,6 +121,10 @@ class HtmlLinkInfo(_core.Object): """SetHtmlCell(self, HtmlCell e)""" return _html.HtmlLinkInfo_SetHtmlCell(*args, **kwargs) + Event = property(GetEvent,SetEvent,doc="See `GetEvent` and `SetEvent`") + Href = property(GetHref,doc="See `GetHref`") + HtmlCell = property(GetHtmlCell,SetHtmlCell,doc="See `GetHtmlCell` and `SetHtmlCell`") + Target = property(GetTarget,doc="See `GetTarget`") _html.HtmlLinkInfo_swigregister(HtmlLinkInfo) cvar = _html.cvar HtmlWindowNameStr = cvar.HtmlWindowNameStr @@ -164,6 +168,11 @@ class HtmlTag(_core.Object): """GetEndPos2(self) -> int""" return _html.HtmlTag_GetEndPos2(*args, **kwargs) + AllParams = property(GetAllParams,doc="See `GetAllParams`") + BeginPos = property(GetBeginPos,doc="See `GetBeginPos`") + EndPos1 = property(GetEndPos1,doc="See `GetEndPos1`") + EndPos2 = property(GetEndPos2,doc="See `GetEndPos2`") + Name = property(GetName,doc="See `GetName`") _html.HtmlTag_swigregister(HtmlTag) class HtmlParser(_core.Object): @@ -219,6 +228,8 @@ class HtmlParser(_core.Object): """GetInnerSource(self, HtmlTag tag) -> String""" return _html.HtmlParser_GetInnerSource(*args, **kwargs) + FS = property(GetFS,SetFS,doc="See `GetFS` and `SetFS`") + Source = property(GetSource,doc="See `GetSource`") _html.HtmlParser_swigregister(HtmlParser) class HtmlWinParser(HtmlParser): @@ -356,6 +367,21 @@ class HtmlWinParser(HtmlParser): """GetLink(self) -> HtmlLinkInfo""" return _html.HtmlWinParser_GetLink(*args, **kwargs) + ActualColor = property(GetActualColor,SetActualColor,doc="See `GetActualColor` and `SetActualColor`") + ActualColour = property(GetActualColour,SetActualColour,doc="See `GetActualColour` and `SetActualColour`") + Align = property(GetAlign,SetAlign,doc="See `GetAlign` and `SetAlign`") + CharHeight = property(GetCharHeight,doc="See `GetCharHeight`") + CharWidth = property(GetCharWidth,doc="See `GetCharWidth`") + Container = property(GetContainer,SetContainer,doc="See `GetContainer` and `SetContainer`") + DC = property(GetDC,SetDC,doc="See `GetDC` and `SetDC`") + FontBold = property(GetFontBold,SetFontBold,doc="See `GetFontBold` and `SetFontBold`") + FontFixed = property(GetFontFixed,SetFontFixed,doc="See `GetFontFixed` and `SetFontFixed`") + FontItalic = property(GetFontItalic,SetFontItalic,doc="See `GetFontItalic` and `SetFontItalic`") + FontSize = property(GetFontSize,SetFontSize,doc="See `GetFontSize` and `SetFontSize`") + FontUnderlined = property(GetFontUnderlined,SetFontUnderlined,doc="See `GetFontUnderlined` and `SetFontUnderlined`") + Link = property(GetLink,SetLink,doc="See `GetLink` and `SetLink`") + LinkColor = property(GetLinkColor,SetLinkColor,doc="See `GetLinkColor` and `SetLinkColor`") + WindowInterface = property(GetWindowInterface,doc="See `GetWindowInterface`") _html.HtmlWinParser_swigregister(HtmlWinParser) class HtmlTagHandler(_core.Object): @@ -383,6 +409,7 @@ class HtmlTagHandler(_core.Object): """ParseInner(self, HtmlTag tag)""" return _html.HtmlTagHandler_ParseInner(*args, **kwargs) + Parser = property(GetParser,SetParser,doc="See `GetParser` and `SetParser`") _html.HtmlTagHandler_swigregister(HtmlTagHandler) class HtmlWinTagHandler(HtmlTagHandler): @@ -410,6 +437,7 @@ class HtmlWinTagHandler(HtmlTagHandler): """ParseInner(self, HtmlTag tag)""" return _html.HtmlWinTagHandler_ParseInner(*args, **kwargs) + Parser = property(GetParser,SetParser,doc="See `GetParser` and `SetParser`") _html.HtmlWinTagHandler_swigregister(HtmlWinTagHandler) @@ -475,6 +503,12 @@ class HtmlSelection(object): """IsEmpty(self) -> bool""" return _html.HtmlSelection_IsEmpty(*args, **kwargs) + FromCell = property(GetFromCell,doc="See `GetFromCell`") + FromPos = property(GetFromPos,doc="See `GetFromPos`") + FromPrivPos = property(GetFromPrivPos,SetFromPrivPos,doc="See `GetFromPrivPos` and `SetFromPrivPos`") + ToCell = property(GetToCell,doc="See `GetToCell`") + ToPos = property(GetToPos,doc="See `GetToPos`") + ToPrivPos = property(GetToPrivPos,SetToPrivPos,doc="See `GetToPrivPos` and `SetToPrivPos`") _html.HtmlSelection_swigregister(HtmlSelection) HTML_SEL_OUT = _html.HTML_SEL_OUT @@ -513,6 +547,9 @@ class HtmlRenderingState(object): """GetBgColour(self) -> Colour""" return _html.HtmlRenderingState_GetBgColour(*args, **kwargs) + BgColour = property(GetBgColour,SetBgColour,doc="See `GetBgColour` and `SetBgColour`") + FgColour = property(GetFgColour,SetFgColour,doc="See `GetFgColour` and `SetFgColour`") + SelectionState = property(GetSelectionState,SetSelectionState,doc="See `GetSelectionState` and `SetSelectionState`") _html.HtmlRenderingState_swigregister(HtmlRenderingState) class HtmlRenderingStyle(object): @@ -528,6 +565,8 @@ class HtmlRenderingStyle(object): """GetSelectedTextBgColour(self, Colour clr) -> Colour""" return _html.HtmlRenderingStyle_GetSelectedTextBgColour(*args, **kwargs) + SelectedTextBgColour = property(GetSelectedTextBgColour,doc="See `GetSelectedTextBgColour`") + SelectedTextColour = property(GetSelectedTextColour,doc="See `GetSelectedTextColour`") _html.HtmlRenderingStyle_swigregister(HtmlRenderingStyle) class DefaultHtmlRenderingStyle(HtmlRenderingStyle): @@ -566,6 +605,9 @@ class HtmlRenderingInfo(object): """GetState(self) -> HtmlRenderingState""" return _html.HtmlRenderingInfo_GetState(*args, **kwargs) + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + State = property(GetState,doc="See `GetState`") + Style = property(GetStyle,SetStyle,doc="See `GetStyle` and `SetStyle`") _html.HtmlRenderingInfo_swigregister(HtmlRenderingInfo) #--------------------------------------------------------------------------- @@ -723,6 +765,23 @@ class HtmlCell(_core.Object): """ConvertToText(self, HtmlSelection sel) -> String""" return _html.HtmlCell_ConvertToText(*args, **kwargs) + Cursor = property(GetCursor,doc="See `GetCursor`") + Depth = property(GetDepth,doc="See `GetDepth`") + Descent = property(GetDescent,doc="See `GetDescent`") + FirstChild = property(GetFirstChild,doc="See `GetFirstChild`") + FirstTerminal = property(GetFirstTerminal,doc="See `GetFirstTerminal`") + Height = property(GetHeight,doc="See `GetHeight`") + Id = property(GetId,SetId,doc="See `GetId` and `SetId`") + LastTerminal = property(GetLastTerminal,doc="See `GetLastTerminal`") + Link = property(GetLink,SetLink,doc="See `GetLink` and `SetLink`") + MaxTotalWidth = property(GetMaxTotalWidth,doc="See `GetMaxTotalWidth`") + MouseCursor = property(GetMouseCursor,doc="See `GetMouseCursor`") + Next = property(GetNext,SetNext,doc="See `GetNext` and `SetNext`") + Parent = property(GetParent,SetParent,doc="See `GetParent` and `SetParent`") + PosX = property(GetPosX,doc="See `GetPosX`") + PosY = property(GetPosY,doc="See `GetPosY`") + RootCell = property(GetRootCell,doc="See `GetRootCell`") + Width = property(GetWidth,doc="See `GetWidth`") _html.HtmlCell_swigregister(HtmlCell) class HtmlWordCell(HtmlCell): @@ -817,6 +876,12 @@ class HtmlContainerCell(HtmlCell): """GetFirstChild(self) -> HtmlCell""" return _html.HtmlContainerCell_GetFirstChild(*args, **kwargs) + AlignHor = property(GetAlignHor,SetAlignHor,doc="See `GetAlignHor` and `SetAlignHor`") + AlignVer = property(GetAlignVer,SetAlignVer,doc="See `GetAlignVer` and `SetAlignVer`") + BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") + FirstChild = property(GetFirstChild,doc="See `GetFirstChild`") + Indent = property(GetIndent,SetIndent,doc="See `GetIndent` and `SetIndent`") + IndentUnits = property(GetIndentUnits,doc="See `GetIndentUnits`") _html.HtmlContainerCell_swigregister(HtmlContainerCell) class HtmlColourCell(HtmlCell): @@ -901,6 +966,8 @@ class HtmlWindowInterface(object): HTMLCursor_Default = _html.HtmlWindowInterface_HTMLCursor_Default HTMLCursor_Link = _html.HtmlWindowInterface_HTMLCursor_Link HTMLCursor_Text = _html.HtmlWindowInterface_HTMLCursor_Text + HTMLBackgroundColour = property(GetHTMLBackgroundColour,SetHTMLBackgroundColour,doc="See `GetHTMLBackgroundColour` and `SetHTMLBackgroundColour`") + HTMLWindow = property(GetHTMLWindow,doc="See `GetHTMLWindow`") _html.HtmlWindowInterface_swigregister(HtmlWindowInterface) #--------------------------------------------------------------------------- @@ -1121,6 +1188,12 @@ class HtmlWindow(_windows.ScrolledWindow): return _html.HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs) GetDefaultHTMLCursor = staticmethod(GetDefaultHTMLCursor) + InternalRepresentation = property(GetInternalRepresentation,doc="See `GetInternalRepresentation`") + OpenedAnchor = property(GetOpenedAnchor,doc="See `GetOpenedAnchor`") + OpenedPage = property(GetOpenedPage,doc="See `GetOpenedPage`") + OpenedPageTitle = property(GetOpenedPageTitle,doc="See `GetOpenedPageTitle`") + Parser = property(GetParser,doc="See `GetParser`") + RelatedFrame = property(GetRelatedFrame,doc="See `GetRelatedFrame`") _html.HtmlWindow_swigregister(HtmlWindow) def PreHtmlWindow(*args, **kwargs): @@ -1195,6 +1268,7 @@ class HtmlDCRenderer(_core.Object): """GetTotalHeight(self) -> int""" return _html.HtmlDCRenderer_GetTotalHeight(*args, **kwargs) + TotalHeight = property(GetTotalHeight,doc="See `GetTotalHeight`") _html.HtmlDCRenderer_swigregister(HtmlDCRenderer) PAGE_ODD = _html.PAGE_ODD @@ -1311,6 +1385,8 @@ class HtmlEasyPrinting(_core.Object): """GetPageSetupData(self) -> PageSetupDialogData""" return _html.HtmlEasyPrinting_GetPageSetupData(*args, **kwargs) + PageSetupData = property(GetPageSetupData,doc="See `GetPageSetupData`") + PrintData = property(GetPrintData,doc="See `GetPrintData`") _html.HtmlEasyPrinting_swigregister(HtmlEasyPrinting) #--------------------------------------------------------------------------- @@ -1366,6 +1442,13 @@ class HtmlBookRecord(object): """GetFullPath(self, String page) -> String""" return _html.HtmlBookRecord_GetFullPath(*args, **kwargs) + BasePath = property(GetBasePath,SetBasePath,doc="See `GetBasePath` and `SetBasePath`") + BookFile = property(GetBookFile,doc="See `GetBookFile`") + ContentsEnd = property(GetContentsEnd,doc="See `GetContentsEnd`") + ContentsStart = property(GetContentsStart,doc="See `GetContentsStart`") + FullPath = property(GetFullPath,doc="See `GetFullPath`") + Start = property(GetStart,SetStart,doc="See `GetStart` and `SetStart`") + Title = property(GetTitle,SetTitle,doc="See `GetTitle` and `SetTitle`") _html.HtmlBookRecord_swigregister(HtmlBookRecord) class HtmlSearchStatus(object): @@ -1393,6 +1476,9 @@ class HtmlSearchStatus(object): """GetName(self) -> String""" return _html.HtmlSearchStatus_GetName(*args, **kwargs) + CurIndex = property(GetCurIndex,doc="See `GetCurIndex`") + MaxIndex = property(GetMaxIndex,doc="See `GetMaxIndex`") + Name = property(GetName,doc="See `GetName`") _html.HtmlSearchStatus_swigregister(HtmlSearchStatus) class HtmlHelpData(object): @@ -1424,6 +1510,7 @@ class HtmlHelpData(object): """GetBookRecArray(self) -> wxHtmlBookRecArray""" return _html.HtmlHelpData_GetBookRecArray(*args, **kwargs) + BookRecArray = property(GetBookRecArray,doc="See `GetBookRecArray`") _html.HtmlHelpData_swigregister(HtmlHelpData) HF_TOOLBAR = _html.HF_TOOLBAR @@ -1562,6 +1649,13 @@ class HtmlHelpWindow(_core.Window): """GetTreeCtrl(self) -> wxPyTreeCtrl""" return _html.HtmlHelpWindow_GetTreeCtrl(*args, **kwargs) + CfgData = property(GetCfgData,doc="See `GetCfgData`") + Controller = property(GetController,SetController,doc="See `GetController` and `SetController`") + Data = property(GetData,doc="See `GetData`") + HtmlWindow = property(GetHtmlWindow,doc="See `GetHtmlWindow`") + SplitterWindow = property(GetSplitterWindow,doc="See `GetSplitterWindow`") + ToolBar = property(GetToolBar,doc="See `GetToolBar`") + TreeCtrl = property(GetTreeCtrl,doc="See `GetTreeCtrl`") _html.HtmlHelpWindow_swigregister(HtmlHelpWindow) def PreHtmlHelpWindow(*args, **kwargs): @@ -1585,6 +1679,7 @@ class HtmlWindowEvent(_core.NotifyEvent): """GetURL(self) -> String""" return _html.HtmlWindowEvent_GetURL(*args, **kwargs) + URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") _html.HtmlWindowEvent_swigregister(HtmlWindowEvent) class HtmlHelpFrame(_windows.Frame): @@ -1647,6 +1742,9 @@ class HtmlHelpFrame(_windows.Frame): def WriteCustomization(self, config, rootpath=""): return self.GetHelpWindow().WriteCustomization(config, rootpath) + Controller = property(GetController,SetController,doc="See `GetController` and `SetController`") + Data = property(GetData,doc="See `GetData`") + HelpWindow = property(GetHelpWindow,doc="See `GetHelpWindow`") _html.HtmlHelpFrame_swigregister(HtmlHelpFrame) def PreHtmlHelpFrame(*args, **kwargs): @@ -1691,6 +1789,9 @@ class HtmlHelpDialog(_windows.Dialog): """SetTitleFormat(self, String format)""" return _html.HtmlHelpDialog_SetTitleFormat(*args, **kwargs) + Controller = property(GetController,SetController,doc="See `GetController` and `SetController`") + Data = property(GetData,doc="See `GetData`") + HelpWindow = property(GetHelpWindow,doc="See `GetHelpWindow`") _html.HtmlHelpDialog_swigregister(HtmlHelpDialog) def PreHtmlHelpDialog(*args, **kwargs): @@ -1773,6 +1874,7 @@ class HelpControllerBase(_core.Object): """GetParentWindow(self) -> Window""" return _html.HelpControllerBase_GetParentWindow(*args, **kwargs) + ParentWindow = property(GetParentWindow,SetParentWindow,doc="See `GetParentWindow` and `SetParentWindow`") _html.HelpControllerBase_swigregister(HelpControllerBase) class HtmlHelpController(HelpControllerBase): @@ -1852,6 +1954,9 @@ class HtmlHelpController(HelpControllerBase): """FindTopLevelWindow(self) -> Window""" return _html.HtmlHelpController_FindTopLevelWindow(*args, **kwargs) + Dialog = property(GetDialog,doc="See `GetDialog`") + Frame = property(GetFrame,doc="See `GetFrame`") + HelpWindow = property(GetHelpWindow,SetHelpWindow,doc="See `GetHelpWindow` and `SetHelpWindow`") _html.HtmlHelpController_swigregister(HtmlHelpController) class HtmlModalHelp(object): diff --git a/wxPython/src/msw/media.py b/wxPython/src/msw/media.py index 8d473ae9a5..414ca24e56 100644 --- a/wxPython/src/msw/media.py +++ b/wxPython/src/msw/media.py @@ -175,6 +175,11 @@ class MediaCtrl(_core.Control): """GetDownloadTotal(self) -> wxFileOffset""" return _media.MediaCtrl_GetDownloadTotal(*args, **kwargs) + DownloadProgress = property(GetDownloadProgress,doc="See `GetDownloadProgress`") + DownloadTotal = property(GetDownloadTotal,doc="See `GetDownloadTotal`") + PlaybackRate = property(GetPlaybackRate,SetPlaybackRate,doc="See `GetPlaybackRate` and `SetPlaybackRate`") + State = property(GetState,doc="See `GetState`") + Volume = property(GetVolume,SetVolume,doc="See `GetVolume` and `SetVolume`") _media.MediaCtrl_swigregister(MediaCtrl) MediaCtrlNameStr = cvar.MediaCtrlNameStr diff --git a/wxPython/src/msw/richtext.py b/wxPython/src/msw/richtext.py index dd3b175453..5670dacc9d 100644 --- a/wxPython/src/msw/richtext.py +++ b/wxPython/src/msw/richtext.py @@ -247,6 +247,9 @@ class RichTextRange(object): __safe_for_unpickling__ = True def __reduce__(self): return (RichTextRange, self.Get()) + End = property(GetEnd,SetEnd,doc="See `GetEnd` and `SetEnd`") + Length = property(GetLength,doc="See `GetLength`") + Start = property(GetStart,SetStart,doc="See `GetStart` and `SetStart`") _richtext.RichTextRange_swigregister(RichTextRange) class RichTextAttr(object): @@ -542,6 +545,29 @@ class RichTextAttr(object): """IsDefault(self) -> bool""" return _richtext.RichTextAttr_IsDefault(*args, **kwargs) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") + BulletNumber = property(GetBulletNumber,SetBulletNumber,doc="See `GetBulletNumber` and `SetBulletNumber`") + BulletStyle = property(GetBulletStyle,SetBulletStyle,doc="See `GetBulletStyle` and `SetBulletStyle`") + BulletSymbol = property(GetBulletSymbol,SetBulletSymbol,doc="See `GetBulletSymbol` and `SetBulletSymbol`") + CharacterStyleName = property(GetCharacterStyleName,SetCharacterStyleName,doc="See `GetCharacterStyleName` and `SetCharacterStyleName`") + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") + FontAttributes = property(GetFontAttributes,doc="See `GetFontAttributes`") + FontFaceName = property(GetFontFaceName,SetFontFaceName,doc="See `GetFontFaceName` and `SetFontFaceName`") + FontSize = property(GetFontSize,SetFontSize,doc="See `GetFontSize` and `SetFontSize`") + FontStyle = property(GetFontStyle,SetFontStyle,doc="See `GetFontStyle` and `SetFontStyle`") + FontUnderlined = property(GetFontUnderlined,SetFontUnderlined,doc="See `GetFontUnderlined` and `SetFontUnderlined`") + FontWeight = property(GetFontWeight,SetFontWeight,doc="See `GetFontWeight` and `SetFontWeight`") + LeftIndent = property(GetLeftIndent,SetLeftIndent,doc="See `GetLeftIndent` and `SetLeftIndent`") + LeftSubIndent = property(GetLeftSubIndent,doc="See `GetLeftSubIndent`") + LineSpacing = property(GetLineSpacing,SetLineSpacing,doc="See `GetLineSpacing` and `SetLineSpacing`") + ParagraphSpacingAfter = property(GetParagraphSpacingAfter,SetParagraphSpacingAfter,doc="See `GetParagraphSpacingAfter` and `SetParagraphSpacingAfter`") + ParagraphSpacingBefore = property(GetParagraphSpacingBefore,SetParagraphSpacingBefore,doc="See `GetParagraphSpacingBefore` and `SetParagraphSpacingBefore`") + ParagraphStyleName = property(GetParagraphStyleName,SetParagraphStyleName,doc="See `GetParagraphStyleName` and `SetParagraphStyleName`") + RightIndent = property(GetRightIndent,SetRightIndent,doc="See `GetRightIndent` and `SetRightIndent`") + Tabs = property(GetTabs,SetTabs,doc="See `GetTabs` and `SetTabs`") + TextColour = property(GetTextColour,SetTextColour,doc="See `GetTextColour` and `SetTextColour`") _richtext.RichTextAttr_swigregister(RichTextAttr) cvar = _richtext.cvar RICHTEXT_ALL = cvar.RICHTEXT_ALL @@ -1291,6 +1317,19 @@ class RichTextCtrl(_windows.ScrolledWindow): """GetStyleSheet(self) -> wxRichTextStyleSheet""" return _richtext.RichTextCtrl_GetStyleSheet(*args, **kwargs) + Buffer = property(GetBuffer,doc="See `GetBuffer`") + DefaultStyle = property(GetDefaultStyle,SetDefaultStyle,doc="See `GetDefaultStyle` and `SetDefaultStyle`") + DelayedLayoutThreshold = property(GetDelayedLayoutThreshold,SetDelayedLayoutThreshold,doc="See `GetDelayedLayoutThreshold` and `SetDelayedLayoutThreshold`") + Filename = property(GetFilename,SetFilename,doc="See `GetFilename` and `SetFilename`") + InsertionPoint = property(GetInsertionPoint,SetInsertionPoint,doc="See `GetInsertionPoint` and `SetInsertionPoint`") + InternalSelectionRange = property(GetInternalSelectionRange,SetInternalSelectionRange,doc="See `GetInternalSelectionRange` and `SetInternalSelectionRange`") + LastPosition = property(GetLastPosition,doc="See `GetLastPosition`") + NumberOfLines = property(GetNumberOfLines,doc="See `GetNumberOfLines`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + SelectionRange = property(GetSelectionRange,SetSelectionRange,doc="See `GetSelectionRange` and `SetSelectionRange`") + StringSelection = property(GetStringSelection,doc="See `GetStringSelection`") + StyleSheet = property(GetStyleSheet,SetStyleSheet,doc="See `GetStyleSheet` and `SetStyleSheet`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _richtext.RichTextCtrl_swigregister(RichTextCtrl) def PreRichTextCtrl(*args, **kwargs): @@ -1336,6 +1375,8 @@ class RichTextEvent(_core.NotifyEvent): """SetFlags(self, int flags)""" return _richtext.RichTextEvent_SetFlags(*args, **kwargs) + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Index = property(GetIndex,SetIndex,doc="See `GetIndex` and `SetIndex`") _richtext.RichTextEvent_swigregister(RichTextEvent) diff --git a/wxPython/src/msw/webkit.py b/wxPython/src/msw/webkit.py index 853db523b9..4d57edce2c 100644 --- a/wxPython/src/msw/webkit.py +++ b/wxPython/src/msw/webkit.py @@ -129,6 +129,9 @@ class WebKitCtrl(_core.Control): """GetPageTitle(self) -> String""" return _webkit.WebKitCtrl_GetPageTitle(*args, **kwargs) + PageSource = property(GetPageSource,SetPageSource,doc="See `GetPageSource` and `SetPageSource`") + PageTitle = property(GetPageTitle,doc="See `GetPageTitle`") + PageURL = property(GetPageURL,doc="See `GetPageURL`") _webkit.WebKitCtrl_swigregister(WebKitCtrl) cvar = _webkit.cvar WebKitNameStr = cvar.WebKitNameStr @@ -168,6 +171,8 @@ class WebKitStateChangedEvent(_core.CommandEvent): """SetURL(self, String url)""" return _webkit.WebKitStateChangedEvent_SetURL(*args, **kwargs) + State = property(GetState,SetState,doc="See `GetState` and `SetState`") + URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") _webkit.WebKitStateChangedEvent_swigregister(WebKitStateChangedEvent) EVT_WEBKIT_STATE_CHANGED = wx.PyEventBinder(wxEVT_WEBKIT_STATE_CHANGED) diff --git a/wxPython/src/msw/wizard.py b/wxPython/src/msw/wizard.py index 44764ba96e..f2972ae91a 100644 --- a/wxPython/src/msw/wizard.py +++ b/wxPython/src/msw/wizard.py @@ -90,6 +90,8 @@ class WizardEvent(_core.NotifyEvent): """GetPage(self) -> WizardPage""" return _wizard.WizardEvent_GetPage(*args, **kwargs) + Direction = property(GetDirection,doc="See `GetDirection`") + Page = property(GetPage,doc="See `GetPage`") _wizard.WizardEvent_swigregister(WizardEvent) class WizardPage(_windows.Panel): @@ -113,6 +115,9 @@ class WizardPage(_windows.Panel): """GetBitmap(self) -> Bitmap""" return _wizard.WizardPage_GetBitmap(*args, **kwargs) + Bitmap = property(GetBitmap,doc="See `GetBitmap`") + Next = property(GetNext,doc="See `GetNext`") + Prev = property(GetPrev,doc="See `GetPrev`") _wizard.WizardPage_swigregister(WizardPage) class PyWizardPage(WizardPage): @@ -399,6 +404,9 @@ class Wizard(_windows.Dialog): """HasPrevPage(self, WizardPage page) -> bool""" return _wizard.Wizard_HasPrevPage(*args, **kwargs) + CurrentPage = property(GetCurrentPage,doc="See `GetCurrentPage`") + PageAreaSizer = property(GetPageAreaSizer,doc="See `GetPageAreaSizer`") + PageSize = property(GetPageSize,SetPageSize,doc="See `GetPageSize` and `SetPageSize`") _wizard.Wizard_swigregister(Wizard) def PreWizard(*args, **kwargs): diff --git a/wxPython/src/msw/xrc.py b/wxPython/src/msw/xrc.py index d1f5951492..31946bfa96 100644 --- a/wxPython/src/msw/xrc.py +++ b/wxPython/src/msw/xrc.py @@ -211,6 +211,9 @@ class XmlResource(_core.Object): """SetDomain(self, String domain)""" return _xrc.XmlResource_SetDomain(*args, **kwargs) + Domain = property(GetDomain,SetDomain,doc="See `GetDomain` and `SetDomain`") + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Version = property(GetVersion,doc="See `GetVersion`") _xrc.XmlResource_swigregister(XmlResource) cvar = _xrc.cvar UTF8String = cvar.UTF8String @@ -315,6 +318,9 @@ class XmlProperty(object): """SetNext(self, XmlProperty next)""" return _xrc.XmlProperty_SetNext(*args, **kwargs) + Name = property(GetName,SetName,doc="See `GetName` and `SetName`") + Next = property(GetNext,SetNext,doc="See `GetNext` and `SetNext`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _xrc.XmlProperty_swigregister(XmlProperty) class XmlNode(object): @@ -430,6 +436,13 @@ class XmlNode(object): """SetProperties(self, XmlProperty prop)""" return _xrc.XmlNode_SetProperties(*args, **kwargs) + Children = property(GetChildren,SetChildren,doc="See `GetChildren` and `SetChildren`") + Content = property(GetContent,SetContent,doc="See `GetContent` and `SetContent`") + Name = property(GetName,SetName,doc="See `GetName` and `SetName`") + Next = property(GetNext,SetNext,doc="See `GetNext` and `SetNext`") + Parent = property(GetParent,SetParent,doc="See `GetParent` and `SetParent`") + Properties = property(GetProperties,SetProperties,doc="See `GetProperties` and `SetProperties`") + Type = property(GetType,SetType,doc="See `GetType` and `SetType`") _xrc.XmlNode_swigregister(XmlNode) def XmlNodeEasy(*args, **kwargs): @@ -497,6 +510,9 @@ class XmlDocument(_core.Object): """SetFileEncoding(self, String encoding)""" return _xrc.XmlDocument_SetFileEncoding(*args, **kwargs) + FileEncoding = property(GetFileEncoding,SetFileEncoding,doc="See `GetFileEncoding` and `SetFileEncoding`") + Root = property(GetRoot,SetRoot,doc="See `GetRoot` and `SetRoot`") + Version = property(GetVersion,SetVersion,doc="See `GetVersion` and `SetVersion`") _xrc.XmlDocument_swigregister(XmlDocument) def XmlDocumentFromStream(*args, **kwargs): @@ -664,6 +680,15 @@ class XmlResourceHandler(_core.Object): """GetCurFileSystem(self) -> FileSystem""" return _xrc.XmlResourceHandler_GetCurFileSystem(*args, **kwargs) + Class = property(GetClass,doc="See `GetClass`") + CurFileSystem = property(GetCurFileSystem,doc="See `GetCurFileSystem`") + ID = property(GetID,doc="See `GetID`") + Instance = property(GetInstance,doc="See `GetInstance`") + Name = property(GetName,doc="See `GetName`") + Node = property(GetNode,doc="See `GetNode`") + Parent = property(GetParent,doc="See `GetParent`") + ParentAsWindow = property(GetParentAsWindow,doc="See `GetParentAsWindow`") + Resource = property(GetResource,doc="See `GetResource`") _xrc.XmlResourceHandler_swigregister(XmlResourceHandler) #---------------------------------------------------------------------------- diff --git a/wxPython/src/richtext.i b/wxPython/src/richtext.i index 0574089c62..ce3106b734 100644 --- a/wxPython/src/richtext.i +++ b/wxPython/src/richtext.i @@ -283,6 +283,10 @@ empty range.", ""); __safe_for_unpickling__ = True def __reduce__(self): return (RichTextRange, self.Get()) } + + %property(End, GetEnd, SetEnd, doc="See `GetEnd` and `SetEnd`"); + %property(Length, GetLength, doc="See `GetLength`"); + %property(Start, GetStart, SetStart, doc="See `GetStart` and `SetStart`"); }; @@ -429,6 +433,31 @@ public: // static wxRichTextAttr Combine(const wxRichTextAttr& attr, // const wxRichTextAttr& attrDef, // const wxTextCtrlBase *text); + + + %property(Alignment, GetAlignment, SetAlignment, doc="See `GetAlignment` and `SetAlignment`"); + %property(BackgroundColour, GetBackgroundColour, SetBackgroundColour, doc="See `GetBackgroundColour` and `SetBackgroundColour`"); + %property(BulletNumber, GetBulletNumber, SetBulletNumber, doc="See `GetBulletNumber` and `SetBulletNumber`"); + %property(BulletStyle, GetBulletStyle, SetBulletStyle, doc="See `GetBulletStyle` and `SetBulletStyle`"); + %property(BulletSymbol, GetBulletSymbol, SetBulletSymbol, doc="See `GetBulletSymbol` and `SetBulletSymbol`"); + %property(CharacterStyleName, GetCharacterStyleName, SetCharacterStyleName, doc="See `GetCharacterStyleName` and `SetCharacterStyleName`"); + %property(Flags, GetFlags, SetFlags, doc="See `GetFlags` and `SetFlags`"); + %property(Font, GetFont, SetFont, doc="See `GetFont` and `SetFont`"); + %property(FontAttributes, GetFontAttributes, doc="See `GetFontAttributes`"); + %property(FontFaceName, GetFontFaceName, SetFontFaceName, doc="See `GetFontFaceName` and `SetFontFaceName`"); + %property(FontSize, GetFontSize, SetFontSize, doc="See `GetFontSize` and `SetFontSize`"); + %property(FontStyle, GetFontStyle, SetFontStyle, doc="See `GetFontStyle` and `SetFontStyle`"); + %property(FontUnderlined, GetFontUnderlined, SetFontUnderlined, doc="See `GetFontUnderlined` and `SetFontUnderlined`"); + %property(FontWeight, GetFontWeight, SetFontWeight, doc="See `GetFontWeight` and `SetFontWeight`"); + %property(LeftIndent, GetLeftIndent, SetLeftIndent, doc="See `GetLeftIndent` and `SetLeftIndent`"); + %property(LeftSubIndent, GetLeftSubIndent, doc="See `GetLeftSubIndent`"); + %property(LineSpacing, GetLineSpacing, SetLineSpacing, doc="See `GetLineSpacing` and `SetLineSpacing`"); + %property(ParagraphSpacingAfter, GetParagraphSpacingAfter, SetParagraphSpacingAfter, doc="See `GetParagraphSpacingAfter` and `SetParagraphSpacingAfter`"); + %property(ParagraphSpacingBefore, GetParagraphSpacingBefore, SetParagraphSpacingBefore, doc="See `GetParagraphSpacingBefore` and `SetParagraphSpacingBefore`"); + %property(ParagraphStyleName, GetParagraphStyleName, SetParagraphStyleName, doc="See `GetParagraphStyleName` and `SetParagraphStyleName`"); + %property(RightIndent, GetRightIndent, SetRightIndent, doc="See `GetRightIndent` and `SetRightIndent`"); + %property(Tabs, GetTabs, SetTabs, doc="See `GetTabs` and `SetTabs`"); + %property(TextColour, GetTextColour, SetTextColour, doc="See `GetTextColour` and `SetTextColour`"); }; @@ -1320,6 +1349,19 @@ flag.", ""); "", ""); + %property(Buffer, GetBuffer, doc="See `GetBuffer`"); + %property(DefaultStyle, GetDefaultStyle, SetDefaultStyle, doc="See `GetDefaultStyle` and `SetDefaultStyle`"); + %property(DelayedLayoutThreshold, GetDelayedLayoutThreshold, SetDelayedLayoutThreshold, doc="See `GetDelayedLayoutThreshold` and `SetDelayedLayoutThreshold`"); + %property(Filename, GetFilename, SetFilename, doc="See `GetFilename` and `SetFilename`"); + %property(InsertionPoint, GetInsertionPoint, SetInsertionPoint, doc="See `GetInsertionPoint` and `SetInsertionPoint`"); + %property(InternalSelectionRange, GetInternalSelectionRange, SetInternalSelectionRange, doc="See `GetInternalSelectionRange` and `SetInternalSelectionRange`"); + %property(LastPosition, GetLastPosition, doc="See `GetLastPosition`"); + %property(NumberOfLines, GetNumberOfLines, doc="See `GetNumberOfLines`"); + %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`"); + %property(SelectionRange, GetSelectionRange, SetSelectionRange, doc="See `GetSelectionRange` and `SetSelectionRange`"); + %property(StringSelection, GetStringSelection, doc="See `GetStringSelection`"); + %property(StyleSheet, GetStyleSheet, SetStyleSheet, doc="See `GetStyleSheet` and `SetStyleSheet`"); + %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`"); // Implementation // TODO: Which of these should be exposed to Python? @@ -1453,6 +1495,9 @@ public: int GetFlags() const; void SetFlags(int flags); + + %property(Flags, GetFlags, SetFlags, doc="See `GetFlags` and `SetFlags`"); + %property(Index, GetIndex, SetIndex, doc="See `GetIndex` and `SetIndex`"); }; //---------------------------------------------------------------------- diff --git a/wxPython/src/webkit.i b/wxPython/src/webkit.i index 8a2187fce5..4e0f84f9ef 100644 --- a/wxPython/src/webkit.i +++ b/wxPython/src/webkit.i @@ -158,6 +158,10 @@ public: void SetPageSource(wxString& source, const wxString& baseUrl = wxPyEmptyString); wxString GetPageURL(); wxString GetPageTitle(); + + %property(PageSource, GetPageSource, SetPageSource, doc="See `GetPageSource` and `SetPageSource`"); + %property(PageTitle, GetPageTitle, doc="See `GetPageTitle`"); + %property(PageURL, GetPageURL, doc="See `GetPageURL`"); }; @@ -186,6 +190,9 @@ public: void SetState(const int state); wxString GetURL(); void SetURL(const wxString& url); + + %property(State, GetState, SetState, doc="See `GetState` and `SetState`"); + %property(URL, GetURL, SetURL, doc="See `GetURL` and `SetURL`"); }; diff --git a/wxPython/src/wizard.i b/wxPython/src/wizard.i index 992b4af0bf..18677ef176 100644 --- a/wxPython/src/wizard.i +++ b/wxPython/src/wizard.i @@ -70,9 +70,12 @@ public: // False otherwise and for EVT_WIZARD_PAGE_CHANGED return True if we came // from the previous page and False if we returned from the next one // (this function doesn't make sense for CANCEL events) - bool GetDirection() const { return m_direction; } + bool GetDirection() const; - wxWizardPage* GetPage() const { return m_page; } + wxWizardPage* GetPage() const; + + %property(Direction, GetDirection, doc="See `GetDirection`"); + %property(Page, GetPage, doc="See `GetPage`"); }; @@ -118,6 +121,10 @@ public: // dynamically or to do something even more fancy. It's ok to return // wxNullBitmap from here - the default one will be used then. virtual wxBitmap GetBitmap() const; + + %property(Bitmap, GetBitmap, doc="See `GetBitmap`"); + %property(Next, GetNext, doc="See `GetNext`"); + %property(Prev, GetPrev, doc="See `GetPrev`"); }; @@ -410,6 +417,10 @@ public: bool HasNextPage(wxWizardPage* page); bool HasPrevPage(wxWizardPage* page); + + %property(CurrentPage, GetCurrentPage, doc="See `GetCurrentPage`"); + %property(PageAreaSizer, GetPageAreaSizer, doc="See `GetPageAreaSizer`"); + %property(PageSize, GetPageSize, SetPageSize, doc="See `GetPageSize` and `SetPageSize`"); }; -- 2.45.2