From 994453b843b007de6367fedbf4a49ac9d920c63c Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 15 Sep 2006 21:31:02 +0000 Subject: [PATCH] added more properties git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/_cmndlgs.i | 2 + wxPython/src/_dataobj.i | 2 + wxPython/src/_datetime.i | 7 ++ wxPython/src/_defs.i | 8 ++ wxPython/src/_intl.i | 8 -- wxPython/src/_misc.i | 3 + wxPython/src/_notebook.i | 3 + wxPython/src/_textctrl.i | 22 +++++ wxPython/src/_tglbtn.i | 2 + wxPython/src/_timer.i | 6 ++ wxPython/src/_tipdlg.i | 3 + wxPython/src/_toolbar.i | 23 +++++ wxPython/src/_toplvl.i | 4 + wxPython/src/_treectrl.i | 23 +++++ wxPython/src/_window.i | 1 + wxPython/src/gtk/_controls.py | 64 ++++++++++++ wxPython/src/gtk/_core.py | 10 +- wxPython/src/gtk/_core_wrap.cpp | 166 +++++++++++++++----------------- wxPython/src/gtk/_gdi.py | 3 - wxPython/src/gtk/_gdi_wrap.cpp | 3 - wxPython/src/gtk/_misc.py | 16 +++ wxPython/src/gtk/_windows.py | 5 + wxPython/src/mac/_controls.py | 64 ++++++++++++ wxPython/src/mac/_core.py | 10 +- wxPython/src/mac/_core_wrap.cpp | 166 +++++++++++++++----------------- wxPython/src/mac/_gdi.py | 3 - wxPython/src/mac/_gdi_wrap.cpp | 3 - wxPython/src/mac/_misc.py | 16 +++ wxPython/src/mac/_windows.py | 5 + wxPython/src/msw/_controls.py | 64 ++++++++++++ wxPython/src/msw/_core.py | 10 +- wxPython/src/msw/_core_wrap.cpp | 166 +++++++++++++++----------------- wxPython/src/msw/_gdi.py | 3 - wxPython/src/msw/_gdi_wrap.cpp | 3 - wxPython/src/msw/_misc.py | 16 +++ wxPython/src/msw/_windows.py | 5 + 36 files changed, 619 insertions(+), 299 deletions(-) diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i index d2cb1632ff..ac40159bad 100644 --- a/wxPython/src/_cmndlgs.i +++ b/wxPython/src/_cmndlgs.i @@ -524,6 +524,8 @@ or the original value if the user has pressed Cancel.", ""); DocDeclStr( void , SetValue(const wxString& value), "Sets the default text value.", ""); + + %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`"); }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_dataobj.i b/wxPython/src/_dataobj.i index b7980bcdb9..aa34db08a5 100644 --- a/wxPython/src/_dataobj.i +++ b/wxPython/src/_dataobj.i @@ -585,6 +585,8 @@ text into the member variable. If you want to process the text on the fly you may wish to override this function (via `wx.PyTextDataObject`.)", ""); + %property(Text, GetText, SetText, doc="See `GetText` and `SetText`"); + %property(TextLength, GetTextLength, doc="See `GetTextLength`"); }; diff --git a/wxPython/src/_datetime.i b/wxPython/src/_datetime.i index 78b03d2e45..41786ff186 100644 --- a/wxPython/src/_datetime.i +++ b/wxPython/src/_datetime.i @@ -1063,6 +1063,13 @@ public: def __str__(self): return self.Format().encode(wx.GetDefaultPyEncoding()) } + + %property(Days, GetDays, doc="See `GetDays`"); + %property(Hours, GetHours, doc="See `GetHours`"); + %property(Milliseconds, GetMilliseconds, doc="See `GetMilliseconds`"); + %property(Minutes, GetMinutes, doc="See `GetMinutes`"); + %property(Seconds, GetSeconds, doc="See `GetSeconds`"); + %property(Weeks, GetWeeks, doc="See `GetWeeks`"); }; diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index c0534eff69..1aa7ff32b0 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -1210,6 +1210,14 @@ enum wxUpdateUI }; +enum wxLayoutDirection +{ + wxLayout_Default, + wxLayout_LeftToRight, + wxLayout_RightToLeft +}; + + //--------------------------------------------------------------------------- diff --git a/wxPython/src/_intl.i b/wxPython/src/_intl.i index 913e4c684c..18e7f9db0b 100644 --- a/wxPython/src/_intl.i +++ b/wxPython/src/_intl.i @@ -22,14 +22,6 @@ //--------------------------------------------------------------------------- %newgroup -enum wxLayoutDirection -{ - wxLayout_Default, - wxLayout_LeftToRight, - wxLayout_RightToLeft -}; - - enum wxLanguage { // user's default/preffered language as got from OS: diff --git a/wxPython/src/_misc.i b/wxPython/src/_misc.i index fa233350d3..11ca06c834 100644 --- a/wxPython/src/_misc.i +++ b/wxPython/src/_misc.i @@ -38,6 +38,9 @@ public: static void Enable(bool flag); static void SetDelay(long milliseconds); + + %property(Tip, GetTip, SetTip, doc="See `GetTip` and `SetTip`"); + %property(Window, GetWindow, doc="See `GetWindow`"); }; #endif diff --git a/wxPython/src/_notebook.i b/wxPython/src/_notebook.i index 32325974a3..baff81bb3e 100644 --- a/wxPython/src/_notebook.i +++ b/wxPython/src/_notebook.i @@ -555,6 +555,7 @@ public: // the tree control we use for showing the pages index tree wxPyTreeCtrl* GetTreeCtrl() const; + %property(TreeCtrl, GetTreeCtrl, doc="See `GetTreeCtrl`"); }; @@ -614,6 +615,8 @@ public: // Not part of the wxBookctrl API, but must be called in OnIdle or // by application to realize the toolbar and select the initial page. void Realize(); + + %property(ToolBar, GetToolBar, doc="See `GetToolBar`"); }; diff --git a/wxPython/src/_textctrl.i b/wxPython/src/_textctrl.i index 71d8ef2b65..d5ccdbab89 100644 --- a/wxPython/src/_textctrl.i +++ b/wxPython/src/_textctrl.i @@ -177,6 +177,16 @@ public: static wxTextAttr Combine(const wxTextAttr& attr, const wxTextAttr& attrDef, const wxTextCtrl *text); + + %property(Alignment, GetAlignment, SetAlignment, doc="See `GetAlignment` and `SetAlignment`"); + %property(BackgroundColour, GetBackgroundColour, SetBackgroundColour, doc="See `GetBackgroundColour` and `SetBackgroundColour`"); + %property(Flags, GetFlags, SetFlags, doc="See `GetFlags` and `SetFlags`"); + %property(Font, GetFont, SetFont, doc="See `GetFont` and `SetFont`"); + %property(LeftIndent, GetLeftIndent, SetLeftIndent, doc="See `GetLeftIndent` and `SetLeftIndent`"); + %property(LeftSubIndent, GetLeftSubIndent, doc="See `GetLeftSubIndent`"); + %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`"); }; //--------------------------------------------------------------------------- @@ -350,6 +360,14 @@ the client area origin nor scrolling. ", "", static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(DefaultStyle, GetDefaultStyle, SetDefaultStyle, doc="See `GetDefaultStyle` and `SetDefaultStyle`"); + %property(InsertionPoint, GetInsertionPoint, SetInsertionPoint, doc="See `GetInsertionPoint` and `SetInsertionPoint`"); + %property(LastPosition, GetLastPosition, doc="See `GetLastPosition`"); + %property(NumberOfLines, GetNumberOfLines, doc="See `GetNumberOfLines`"); + %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`"); + %property(StringSelection, GetStringSelection, doc="See `GetStringSelection`"); + %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`"); }; //--------------------------------------------------------------------------- @@ -375,6 +393,10 @@ public: // get the end of the URL long GetURLEnd() const; + + %property(MouseEvent, GetMouseEvent, doc="See `GetMouseEvent`"); + %property(URLEnd, GetURLEnd, doc="See `GetURLEnd`"); + %property(URLStart, GetURLStart, doc="See `GetURLStart`"); }; diff --git a/wxPython/src/_tglbtn.i b/wxPython/src/_tglbtn.i index 4b6e6eef24..05fa6455f3 100644 --- a/wxPython/src/_tglbtn.i +++ b/wxPython/src/_tglbtn.i @@ -83,6 +83,8 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`"); }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/_timer.i b/wxPython/src/_timer.i index 10aeddc278..a883c73b66 100644 --- a/wxPython/src/_timer.i +++ b/wxPython/src/_timer.i @@ -104,6 +104,10 @@ public: """NO-OP: Timers must be destroyed by normal reference counting""" pass } + + %property(Id, GetId, doc="See `GetId`"); + %property(Interval, GetInterval, doc="See `GetInterval`"); + %property(Owner, GetOwner, SetOwner, doc="See `GetOwner` and `SetOwner`"); }; @@ -130,6 +134,8 @@ class wxTimerEvent : public wxEvent public: wxTimerEvent(int timerid = 0, int interval = 0); int GetInterval() const; + + %property(Interval, GetInterval, doc="See `GetInterval`"); }; diff --git a/wxPython/src/_tipdlg.i b/wxPython/src/_tipdlg.i index 2713eaf6e5..37ac6959b2 100644 --- a/wxPython/src/_tipdlg.i +++ b/wxPython/src/_tipdlg.i @@ -43,6 +43,9 @@ public: // modify the tip as soon as it is read. If return wxEmptyString, then // the tip is skipped, and the next one is read. virtual wxString PreprocessTip(const wxString& tip); + + %property(CurrentTip, GetCurrentTip, doc="See `GetCurrentTip`"); + %property(Tip, GetTip, doc="See `GetTip`"); }; diff --git a/wxPython/src/_toolbar.i b/wxPython/src/_toolbar.i index 70191aaa59..65a1b76af6 100644 --- a/wxPython/src/_toolbar.i +++ b/wxPython/src/_toolbar.i @@ -122,6 +122,19 @@ public: SetBitmap1 = SetNormalBitmap SetBitmap2 = SetDisabledBitmap } + + %property(Bitmap, GetBitmap, doc="See `GetBitmap`"); + %property(ClientData, GetClientData, SetClientData, doc="See `GetClientData` and `SetClientData`"); + %property(Control, GetControl, doc="See `GetControl`"); + %property(DisabledBitmap, GetDisabledBitmap, SetDisabledBitmap, doc="See `GetDisabledBitmap` and `SetDisabledBitmap`"); + %property(Id, GetId, doc="See `GetId`"); + %property(Kind, GetKind, doc="See `GetKind`"); + %property(Label, GetLabel, SetLabel, doc="See `GetLabel` and `SetLabel`"); + %property(LongHelp, GetLongHelp, SetLongHelp, doc="See `GetLongHelp` and `SetLongHelp`"); + %property(NormalBitmap, GetNormalBitmap, SetNormalBitmap, doc="See `GetNormalBitmap` and `SetNormalBitmap`"); + %property(ShortHelp, GetShortHelp, SetShortHelp, doc="See `GetShortHelp` and `SetShortHelp`"); + %property(Style, GetStyle, doc="See `GetStyle`"); + %property(ToolBar, GetToolBar, doc="See `GetToolBar`"); }; @@ -383,6 +396,16 @@ public: bool IsVertical(); size_t GetToolsCount() const; + + %property(Margins, GetMargins, SetMargins, doc="See `GetMargins` and `SetMargins`"); + %property(MaxCols, GetMaxCols, doc="See `GetMaxCols`"); + %property(MaxRows, GetMaxRows, doc="See `GetMaxRows`"); + %property(ToolBitmapSize, GetToolBitmapSize, SetToolBitmapSize, doc="See `GetToolBitmapSize` and `SetToolBitmapSize`"); + %property(ToolMargins, GetToolMargins, doc="See `GetToolMargins`"); + %property(ToolPacking, GetToolPacking, SetToolPacking, doc="See `GetToolPacking` and `SetToolPacking`"); + %property(ToolSeparation, GetToolSeparation, SetToolSeparation, doc="See `GetToolSeparation` and `SetToolSeparation`"); + %property(ToolSize, GetToolSize, doc="See `GetToolSize`"); + %property(ToolsCount, GetToolsCount, doc="See `GetToolsCount`"); }; diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i index bc5bd903df..bb383c2b01 100644 --- a/wxPython/src/_toplvl.i +++ b/wxPython/src/_toplvl.i @@ -195,6 +195,10 @@ by pressing such as the OK button on a wx.Dialog.", ""); virtual wxWindow *, GetTmpDefaultItem() const, "Return the temporary default item, which can be None.", ""); + %property(DefaultItem, GetDefaultItem, SetDefaultItem, doc="See `GetDefaultItem` and `SetDefaultItem`"); + %property(Icon, GetIcon, SetIcon, doc="See `GetIcon` and `SetIcon`"); + %property(Title, GetTitle, SetTitle, doc="See `GetTitle` and `SetTitle`"); + %property(TmpDefaultItem, GetTmpDefaultItem, SetTmpDefaultItem, doc="See `GetTmpDefaultItem` and `SetTmpDefaultItem`"); }; diff --git a/wxPython/src/_treectrl.i b/wxPython/src/_treectrl.i index 4248e589e7..e87e7ba7b3 100644 --- a/wxPython/src/_treectrl.i +++ b/wxPython/src/_treectrl.i @@ -134,6 +134,9 @@ public: %pythonAppend Destroy "args[0].thisown = 0" %extend { void Destroy() { delete self; } } + + %property(Data, GetData, SetData, doc="See `GetData` and `SetData`"); + %property(Id, GetId, SetId, doc="See `GetId` and `SetId`"); }; @@ -272,6 +275,15 @@ public: // Set the tooltip for the item (for EVT_TREE_ITEM_GETTOOLTIP events) void SetToolTip(const wxString& toolTip); wxString GetToolTip(); + + %property(Item, GetItem, SetItem, doc="See `GetItem` and `SetItem`"); + %property(KeyCode, GetKeyCode, doc="See `GetKeyCode`"); + %property(KeyEvent, GetKeyEvent, SetKeyEvent, doc="See `GetKeyEvent` and `SetKeyEvent`"); + %property(Label, GetLabel, SetLabel, doc="See `GetLabel` and `SetLabel`"); + %property(OldItem, GetOldItem, SetOldItem, doc="See `GetOldItem` and `SetOldItem`"); + %property(Point, GetPoint, SetPoint, doc="See `GetPoint` and `SetPoint`"); + %property(ToolTip, GetToolTip, SetToolTip, doc="See `GetToolTip` and `SetToolTip`"); + %property(EditCancelled, IsEditCancelled, SetEditCanceled, doc="See `IsEditCancelled` and `SetEditCanceled`"); }; //--------------------------------------------------------------------------- @@ -755,6 +767,17 @@ value is set to a bitmask of wxTREE_HITTEST_xxx constants. void SetQuickBestSize(bool q); bool GetQuickBestSize() const; + %property(Count, GetCount, doc="See `GetCount`"); + %property(EditControl, GetEditControl, doc="See `GetEditControl`"); + %property(FirstVisibleItem, GetFirstVisibleItem, doc="See `GetFirstVisibleItem`"); + %property(ImageList, GetImageList, SetImageList, doc="See `GetImageList` and `SetImageList`"); + %property(Indent, GetIndent, SetIndent, doc="See `GetIndent` and `SetIndent`"); + %property(QuickBestSize, GetQuickBestSize, SetQuickBestSize, doc="See `GetQuickBestSize` and `SetQuickBestSize`"); + %property(RootItem, GetRootItem, doc="See `GetRootItem`"); + %property(Selection, GetSelection, doc="See `GetSelection`"); + %property(Selections, GetSelections, doc="See `GetSelections`"); + %property(Spacing, GetSpacing, SetSpacing, doc="See `GetSpacing` and `SetSpacing`"); + %property(StateImageList, GetStateImageList, SetStateImageList, doc="See `GetStateImageList` and `SetStateImageList`"); }; diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i index 6109238c7a..1fdba3305f 100644 --- a/wxPython/src/_window.i +++ b/wxPython/src/_window.i @@ -2091,6 +2091,7 @@ opaque.", ""); %property(HelpText, GetHelpText, SetHelpText, doc="See `GetHelpText` and `SetHelpText`"); %property(Id, GetId, SetId, doc="See `GetId` and `SetId`"); %property(Label, GetLabel, SetLabel, doc="See `GetLabel` and `SetLabel`"); + %property(LayoutDirection, GetLayoutDirection, SetLayoutDirection, doc="See `GetLayoutDirection` and `SetLayoutDirection`"); %property(MaxHeight, GetMaxHeight, doc="See `GetMaxHeight`"); %property(MaxSize, GetMaxSize, SetMaxSize, doc="See `GetMaxSize` and `SetMaxSize`"); %property(MaxWidth, GetMaxWidth, doc="See `GetMaxWidth`"); diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py index 1e0a06ec07..5e87c3c56e 100644 --- a/wxPython/src/gtk/_controls.py +++ b/wxPython/src/gtk/_controls.py @@ -1662,6 +1662,15 @@ class TextAttr(object): return _controls_.TextAttr_Combine(*args, **kwargs) Combine = staticmethod(Combine) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") + LeftIndent = property(GetLeftIndent,SetLeftIndent,doc="See `GetLeftIndent` and `SetLeftIndent`") + LeftSubIndent = property(GetLeftSubIndent,doc="See `GetLeftSubIndent`") + 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`") _controls_.TextAttr_swigregister(TextAttr) TextCtrlNameStr = cvar.TextCtrlNameStr @@ -1938,6 +1947,13 @@ class TextCtrl(_core.Control): return _controls_.TextCtrl_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + DefaultStyle = property(GetDefaultStyle,SetDefaultStyle,doc="See `GetDefaultStyle` and `SetDefaultStyle`") + InsertionPoint = property(GetInsertionPoint,SetInsertionPoint,doc="See `GetInsertionPoint` and `SetInsertionPoint`") + LastPosition = property(GetLastPosition,doc="See `GetLastPosition`") + NumberOfLines = property(GetNumberOfLines,doc="See `GetNumberOfLines`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + StringSelection = property(GetStringSelection,doc="See `GetStringSelection`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.TextCtrl_swigregister(TextCtrl) def PreTextCtrl(*args, **kwargs): @@ -1985,6 +2001,9 @@ class TextUrlEvent(_core.CommandEvent): """GetURLEnd(self) -> long""" return _controls_.TextUrlEvent_GetURLEnd(*args, **kwargs) + MouseEvent = property(GetMouseEvent,doc="See `GetMouseEvent`") + URLEnd = property(GetURLEnd,doc="See `GetURLEnd`") + URLStart = property(GetURLStart,doc="See `GetURLStart`") _controls_.TextUrlEvent_swigregister(TextUrlEvent) EVT_TEXT = wx.PyEventBinder( wxEVT_COMMAND_TEXT_UPDATED, 1) @@ -2778,6 +2797,7 @@ class ToggleButton(_core.Control): return _controls_.ToggleButton_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.ToggleButton_swigregister(ToggleButton) ToggleButtonNameStr = cvar.ToggleButtonNameStr @@ -3335,6 +3355,7 @@ class Treebook(BookCtrlBase): """GetTreeCtrl(self) -> TreeCtrl""" return _controls_.Treebook_GetTreeCtrl(*args, **kwargs) + TreeCtrl = property(GetTreeCtrl,doc="See `GetTreeCtrl`") _controls_.Treebook_swigregister(Treebook) def PreTreebook(*args, **kwargs): @@ -3393,6 +3414,7 @@ class Toolbook(BookCtrlBase): """Realize(self)""" return _controls_.Toolbook_Realize(*args, **kwargs) + ToolBar = property(GetToolBar,doc="See `GetToolBar`") _controls_.Toolbook_swigregister(Toolbook) def PreToolbook(*args, **kwargs): @@ -3560,6 +3582,18 @@ class ToolBarToolBase(_core.Object): SetBitmap1 = SetNormalBitmap SetBitmap2 = SetDisabledBitmap + Bitmap = property(GetBitmap,doc="See `GetBitmap`") + ClientData = property(GetClientData,SetClientData,doc="See `GetClientData` and `SetClientData`") + Control = property(GetControl,doc="See `GetControl`") + DisabledBitmap = property(GetDisabledBitmap,SetDisabledBitmap,doc="See `GetDisabledBitmap` and `SetDisabledBitmap`") + Id = property(GetId,doc="See `GetId`") + Kind = property(GetKind,doc="See `GetKind`") + Label = property(GetLabel,SetLabel,doc="See `GetLabel` and `SetLabel`") + LongHelp = property(GetLongHelp,SetLongHelp,doc="See `GetLongHelp` and `SetLongHelp`") + NormalBitmap = property(GetNormalBitmap,SetNormalBitmap,doc="See `GetNormalBitmap` and `SetNormalBitmap`") + ShortHelp = property(GetShortHelp,SetShortHelp,doc="See `GetShortHelp` and `SetShortHelp`") + Style = property(GetStyle,doc="See `GetStyle`") + ToolBar = property(GetToolBar,doc="See `GetToolBar`") _controls_.ToolBarToolBase_swigregister(ToolBarToolBase) class ToolBarBase(_core.Control): @@ -3881,6 +3915,15 @@ class ToolBarBase(_core.Control): """GetToolsCount(self) -> size_t""" return _controls_.ToolBarBase_GetToolsCount(*args, **kwargs) + Margins = property(GetMargins,SetMargins,doc="See `GetMargins` and `SetMargins`") + MaxCols = property(GetMaxCols,doc="See `GetMaxCols`") + MaxRows = property(GetMaxRows,doc="See `GetMaxRows`") + ToolBitmapSize = property(GetToolBitmapSize,SetToolBitmapSize,doc="See `GetToolBitmapSize` and `SetToolBitmapSize`") + ToolMargins = property(GetToolMargins,doc="See `GetToolMargins`") + ToolPacking = property(GetToolPacking,SetToolPacking,doc="See `GetToolPacking` and `SetToolPacking`") + ToolSeparation = property(GetToolSeparation,SetToolSeparation,doc="See `GetToolSeparation` and `SetToolSeparation`") + ToolSize = property(GetToolSize,doc="See `GetToolSize`") + ToolsCount = property(GetToolsCount,doc="See `GetToolsCount`") _controls_.ToolBarBase_swigregister(ToolBarBase) class ToolBar(ToolBarBase): @@ -4965,6 +5008,8 @@ class TreeItemData(object): args[0].thisown = 0 return val + Data = property(GetData,SetData,doc="See `GetData` and `SetData`") + Id = property(GetId,SetId,doc="See `GetId` and `SetId`") _controls_.TreeItemData_swigregister(TreeItemData) #--------------------------------------------------------------------------- @@ -5082,6 +5127,14 @@ class TreeEvent(_core.NotifyEvent): """GetToolTip(self) -> String""" return _controls_.TreeEvent_GetToolTip(*args, **kwargs) + Item = property(GetItem,SetItem,doc="See `GetItem` and `SetItem`") + KeyCode = property(GetKeyCode,doc="See `GetKeyCode`") + KeyEvent = property(GetKeyEvent,SetKeyEvent,doc="See `GetKeyEvent` and `SetKeyEvent`") + Label = property(GetLabel,SetLabel,doc="See `GetLabel` and `SetLabel`") + OldItem = property(GetOldItem,SetOldItem,doc="See `GetOldItem` and `SetOldItem`") + Point = property(GetPoint,SetPoint,doc="See `GetPoint` and `SetPoint`") + ToolTip = property(GetToolTip,SetToolTip,doc="See `GetToolTip` and `SetToolTip`") + EditCancelled = property(IsEditCancelled,SetEditCanceled,doc="See `IsEditCancelled` and `SetEditCanceled`") _controls_.TreeEvent_swigregister(TreeEvent) #--------------------------------------------------------------------------- @@ -5450,6 +5503,17 @@ class TreeCtrl(_core.Control): """GetQuickBestSize(self) -> bool""" return _controls_.TreeCtrl_GetQuickBestSize(*args, **kwargs) + Count = property(GetCount,doc="See `GetCount`") + EditControl = property(GetEditControl,doc="See `GetEditControl`") + FirstVisibleItem = property(GetFirstVisibleItem,doc="See `GetFirstVisibleItem`") + ImageList = property(GetImageList,SetImageList,doc="See `GetImageList` and `SetImageList`") + Indent = property(GetIndent,SetIndent,doc="See `GetIndent` and `SetIndent`") + QuickBestSize = property(GetQuickBestSize,SetQuickBestSize,doc="See `GetQuickBestSize` and `SetQuickBestSize`") + RootItem = property(GetRootItem,doc="See `GetRootItem`") + Selection = property(GetSelection,doc="See `GetSelection`") + Selections = property(GetSelections,doc="See `GetSelections`") + Spacing = property(GetSpacing,SetSpacing,doc="See `GetSpacing` and `SetSpacing`") + StateImageList = property(GetStateImageList,SetStateImageList,doc="See `GetStateImageList` and `SetStateImageList`") _controls_.TreeCtrl_swigregister(TreeCtrl) def PreTreeCtrl(*args, **kwargs): diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index d28b51d65f..09905808e4 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -678,6 +678,9 @@ MOD_ALL = _core_.MOD_ALL UPDATE_UI_NONE = _core_.UPDATE_UI_NONE UPDATE_UI_RECURSE = _core_.UPDATE_UI_RECURSE UPDATE_UI_FROMIDLE = _core_.UPDATE_UI_FROMIDLE +Layout_Default = _core_.Layout_Default +Layout_LeftToRight = _core_.Layout_LeftToRight +Layout_RightToLeft = _core_.Layout_RightToLeft #--------------------------------------------------------------------------- class Object(object): @@ -6788,7 +6791,7 @@ class PyApp(EvtHandler): def GetLayoutDirection(*args, **kwargs): """ - GetLayoutDirection(self) -> wxLayoutDirection + GetLayoutDirection(self) -> int Return the layout direction for the current locale. """ @@ -7932,7 +7935,7 @@ class Window(EvtHandler): PrevControlId = staticmethod(PrevControlId) def GetLayoutDirection(*args, **kwargs): """ - GetLayoutDirection(self) -> wxLayoutDirection + GetLayoutDirection(self) -> int Get the layout direction (LTR or RTL) for this window. Returns ``wx.Layout_Default`` if layout direction is not supported. @@ -7941,7 +7944,7 @@ class Window(EvtHandler): def SetLayoutDirection(*args, **kwargs): """ - SetLayoutDirection(self, wxLayoutDirection dir) + SetLayoutDirection(self, int dir) Set the layout direction (LTR or RTL) for this window. """ @@ -9991,6 +9994,7 @@ class Window(EvtHandler): HelpText = property(GetHelpText,SetHelpText,doc="See `GetHelpText` and `SetHelpText`") Id = property(GetId,SetId,doc="See `GetId` and `SetId`") Label = property(GetLabel,SetLabel,doc="See `GetLabel` and `SetLabel`") + LayoutDirection = property(GetLayoutDirection,SetLayoutDirection,doc="See `GetLayoutDirection` and `SetLayoutDirection`") MaxHeight = property(GetMaxHeight,doc="See `GetMaxHeight`") MaxSize = property(GetMaxSize,SetMaxSize,doc="See `GetMaxSize` and `SetMaxSize`") MaxWidth = property(GetMaxWidth,doc="See `GetMaxWidth`") diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index ceb5d5e6b0..f6f5f78abd 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -2533,71 +2533,70 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxJPEGHandler swig_types[67] #define SWIGTYPE_p_wxKeyEvent swig_types[68] #define SWIGTYPE_p_wxLayoutConstraints swig_types[69] -#define SWIGTYPE_p_wxLayoutDirection swig_types[70] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[71] -#define SWIGTYPE_p_wxMemoryFSHandler swig_types[72] -#define SWIGTYPE_p_wxMenu swig_types[73] -#define SWIGTYPE_p_wxMenuBar swig_types[74] -#define SWIGTYPE_p_wxMenuBarBase swig_types[75] -#define SWIGTYPE_p_wxMenuEvent swig_types[76] -#define SWIGTYPE_p_wxMenuItem swig_types[77] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[78] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[79] -#define SWIGTYPE_p_wxMouseEvent swig_types[80] -#define SWIGTYPE_p_wxMoveEvent swig_types[81] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[82] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[83] -#define SWIGTYPE_p_wxNotifyEvent swig_types[84] -#define SWIGTYPE_p_wxObject swig_types[85] -#define SWIGTYPE_p_wxOutputStream swig_types[86] -#define SWIGTYPE_p_wxPCXHandler swig_types[87] -#define SWIGTYPE_p_wxPNGHandler swig_types[88] -#define SWIGTYPE_p_wxPNMHandler swig_types[89] -#define SWIGTYPE_p_wxPaintEvent swig_types[90] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[91] -#define SWIGTYPE_p_wxPaperSize swig_types[92] -#define SWIGTYPE_p_wxPoint swig_types[93] -#define SWIGTYPE_p_wxPoint2D swig_types[94] -#define SWIGTYPE_p_wxPropagateOnce swig_types[95] -#define SWIGTYPE_p_wxPropagationDisabler swig_types[96] -#define SWIGTYPE_p_wxPyApp swig_types[97] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[98] -#define SWIGTYPE_p_wxPyDropTarget swig_types[99] -#define SWIGTYPE_p_wxPyEvent swig_types[100] -#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[101] -#define SWIGTYPE_p_wxPyImageHandler swig_types[102] -#define SWIGTYPE_p_wxPyInputStream swig_types[103] -#define SWIGTYPE_p_wxPySizer swig_types[104] -#define SWIGTYPE_p_wxPyValidator swig_types[105] -#define SWIGTYPE_p_wxQuantize swig_types[106] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[107] -#define SWIGTYPE_p_wxRealPoint swig_types[108] -#define SWIGTYPE_p_wxRect swig_types[109] -#define SWIGTYPE_p_wxRegion swig_types[110] -#define SWIGTYPE_p_wxScrollEvent swig_types[111] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[112] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[113] -#define SWIGTYPE_p_wxShowEvent swig_types[114] -#define SWIGTYPE_p_wxSize swig_types[115] -#define SWIGTYPE_p_wxSizeEvent swig_types[116] -#define SWIGTYPE_p_wxSizer swig_types[117] -#define SWIGTYPE_p_wxSizerItem swig_types[118] -#define SWIGTYPE_p_wxStaticBox swig_types[119] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[120] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[121] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[122] -#define SWIGTYPE_p_wxTIFFHandler swig_types[123] -#define SWIGTYPE_p_wxToolTip swig_types[124] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[125] -#define SWIGTYPE_p_wxValidator swig_types[126] -#define SWIGTYPE_p_wxVisualAttributes swig_types[127] -#define SWIGTYPE_p_wxWindow swig_types[128] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[129] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[130] -#define SWIGTYPE_p_wxXPMHandler swig_types[131] -#define SWIGTYPE_p_wxZipFSHandler swig_types[132] -static swig_type_info *swig_types[134]; -static swig_module_info swig_module = {swig_types, 133, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxMaximizeEvent swig_types[70] +#define SWIGTYPE_p_wxMemoryFSHandler swig_types[71] +#define SWIGTYPE_p_wxMenu swig_types[72] +#define SWIGTYPE_p_wxMenuBar swig_types[73] +#define SWIGTYPE_p_wxMenuBarBase swig_types[74] +#define SWIGTYPE_p_wxMenuEvent swig_types[75] +#define SWIGTYPE_p_wxMenuItem swig_types[76] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[77] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[78] +#define SWIGTYPE_p_wxMouseEvent swig_types[79] +#define SWIGTYPE_p_wxMoveEvent swig_types[80] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[81] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[82] +#define SWIGTYPE_p_wxNotifyEvent swig_types[83] +#define SWIGTYPE_p_wxObject swig_types[84] +#define SWIGTYPE_p_wxOutputStream swig_types[85] +#define SWIGTYPE_p_wxPCXHandler swig_types[86] +#define SWIGTYPE_p_wxPNGHandler swig_types[87] +#define SWIGTYPE_p_wxPNMHandler swig_types[88] +#define SWIGTYPE_p_wxPaintEvent swig_types[89] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[90] +#define SWIGTYPE_p_wxPaperSize swig_types[91] +#define SWIGTYPE_p_wxPoint swig_types[92] +#define SWIGTYPE_p_wxPoint2D swig_types[93] +#define SWIGTYPE_p_wxPropagateOnce swig_types[94] +#define SWIGTYPE_p_wxPropagationDisabler swig_types[95] +#define SWIGTYPE_p_wxPyApp swig_types[96] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[97] +#define SWIGTYPE_p_wxPyDropTarget swig_types[98] +#define SWIGTYPE_p_wxPyEvent swig_types[99] +#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[100] +#define SWIGTYPE_p_wxPyImageHandler swig_types[101] +#define SWIGTYPE_p_wxPyInputStream swig_types[102] +#define SWIGTYPE_p_wxPySizer swig_types[103] +#define SWIGTYPE_p_wxPyValidator swig_types[104] +#define SWIGTYPE_p_wxQuantize swig_types[105] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[106] +#define SWIGTYPE_p_wxRealPoint swig_types[107] +#define SWIGTYPE_p_wxRect swig_types[108] +#define SWIGTYPE_p_wxRegion swig_types[109] +#define SWIGTYPE_p_wxScrollEvent swig_types[110] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[111] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[112] +#define SWIGTYPE_p_wxShowEvent swig_types[113] +#define SWIGTYPE_p_wxSize swig_types[114] +#define SWIGTYPE_p_wxSizeEvent swig_types[115] +#define SWIGTYPE_p_wxSizer swig_types[116] +#define SWIGTYPE_p_wxSizerItem swig_types[117] +#define SWIGTYPE_p_wxStaticBox swig_types[118] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[119] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[120] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[121] +#define SWIGTYPE_p_wxTIFFHandler swig_types[122] +#define SWIGTYPE_p_wxToolTip swig_types[123] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[124] +#define SWIGTYPE_p_wxValidator swig_types[125] +#define SWIGTYPE_p_wxVisualAttributes swig_types[126] +#define SWIGTYPE_p_wxWindow swig_types[127] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[128] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[129] +#define SWIGTYPE_p_wxXPMHandler swig_types[130] +#define SWIGTYPE_p_wxZipFSHandler swig_types[131] +static swig_type_info *swig_types[133]; +static swig_module_info swig_module = {swig_types, 132, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -27787,11 +27786,11 @@ SWIGINTERN PyObject *_wrap_PyApp_GetLayoutDirection(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< wxPyApp * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyApp const *)arg1)->GetLayoutDirection(); + result = (wxLayoutDirection)((wxPyApp const *)arg1)->GetLayoutDirection(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxLayoutDirection(static_cast< const wxLayoutDirection& >(result))), SWIGTYPE_p_wxLayoutDirection, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: return NULL; @@ -30736,11 +30735,11 @@ SWIGINTERN PyObject *_wrap_Window_GetLayoutDirection(PyObject *SWIGUNUSEDPARM(se arg1 = reinterpret_cast< wxWindow * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxWindow const *)arg1)->GetLayoutDirection(); + result = (wxLayoutDirection)((wxWindow const *)arg1)->GetLayoutDirection(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxLayoutDirection(static_cast< const wxLayoutDirection& >(result))), SWIGTYPE_p_wxLayoutDirection, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: return NULL; @@ -30753,8 +30752,8 @@ SWIGINTERN PyObject *_wrap_Window_SetLayoutDirection(PyObject *SWIGUNUSEDPARM(se wxLayoutDirection arg2 ; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 ; - int res2 = 0 ; + int val2 ; + int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char * kwnames[] = { @@ -30767,19 +30766,11 @@ SWIGINTERN PyObject *_wrap_Window_SetLayoutDirection(PyObject *SWIGUNUSEDPARM(se SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_SetLayoutDirection" "', expected argument " "1"" of type '" "wxWindow *""'"); } arg1 = reinterpret_cast< wxWindow * >(argp1); - { - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxLayoutDirection, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Window_SetLayoutDirection" "', expected argument " "2"" of type '" "wxLayoutDirection""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Window_SetLayoutDirection" "', expected argument " "2"" of type '" "wxLayoutDirection""'"); - } else { - wxLayoutDirection * temp = reinterpret_cast< wxLayoutDirection * >(argp2); - arg2 = *temp; - if (SWIG_IsNewObj(res2)) delete temp; - } - } + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Window_SetLayoutDirection" "', expected argument " "2"" of type '" "wxLayoutDirection""'"); + } + arg2 = static_cast< wxLayoutDirection >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLayoutDirection(arg2); @@ -55813,7 +55804,6 @@ static swig_type_info _swigt__p_wxItemContainer = {"_p_wxItemContainer", "wxItem static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", "wxJPEGHandler *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxKeyEvent = {"_p_wxKeyEvent", "wxKeyEvent *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxLayoutConstraints = {"_p_wxLayoutConstraints", "wxLayoutConstraints *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_wxLayoutDirection = {"_p_wxLayoutDirection", "wxLayoutDirection *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxMaximizeEvent = {"_p_wxMaximizeEvent", "wxMaximizeEvent *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxMemoryFSHandler = {"_p_wxMemoryFSHandler", "wxMemoryFSHandler *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxMenu = {"_p_wxMenu", "wxMenu *", 0, 0, (void*)0, 0}; @@ -55948,7 +55938,6 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxJPEGHandler, &_swigt__p_wxKeyEvent, &_swigt__p_wxLayoutConstraints, - &_swigt__p_wxLayoutDirection, &_swigt__p_wxMaximizeEvent, &_swigt__p_wxMemoryFSHandler, &_swigt__p_wxMenu, @@ -56083,7 +56072,6 @@ static swig_cast_info _swigc__p_wxItemContainer[] = { {&_swigt__p_wxControlWith static swig_cast_info _swigc__p_wxJPEGHandler[] = { {&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxKeyEvent[] = { {&_swigt__p_wxKeyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxLayoutConstraints[] = { {&_swigt__p_wxLayoutConstraints, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxLayoutDirection[] = { {&_swigt__p_wxLayoutDirection, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMaximizeEvent[] = { {&_swigt__p_wxMaximizeEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMemoryFSHandler[] = { {&_swigt__p_wxMemoryFSHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMenu[] = { {&_swigt__p_wxMenu, 0, 0, 0},{0, 0, 0, 0}}; @@ -56218,7 +56206,6 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxJPEGHandler, _swigc__p_wxKeyEvent, _swigc__p_wxLayoutConstraints, - _swigc__p_wxLayoutDirection, _swigc__p_wxMaximizeEvent, _swigc__p_wxMemoryFSHandler, _swigc__p_wxMenu, @@ -57391,6 +57378,9 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "UPDATE_UI_NONE",SWIG_From_int(static_cast< int >(wxUPDATE_UI_NONE))); SWIG_Python_SetConstant(d, "UPDATE_UI_RECURSE",SWIG_From_int(static_cast< int >(wxUPDATE_UI_RECURSE))); SWIG_Python_SetConstant(d, "UPDATE_UI_FROMIDLE",SWIG_From_int(static_cast< int >(wxUPDATE_UI_FROMIDLE))); + SWIG_Python_SetConstant(d, "Layout_Default",SWIG_From_int(static_cast< int >(wxLayout_Default))); + SWIG_Python_SetConstant(d, "Layout_LeftToRight",SWIG_From_int(static_cast< int >(wxLayout_LeftToRight))); + SWIG_Python_SetConstant(d, "Layout_RightToLeft",SWIG_From_int(static_cast< int >(wxLayout_RightToLeft))); PyDict_SetItemString(d,(char*)"cvar", SWIG_globals()); SWIG_addvarlink(SWIG_globals(),(char*)"EmptyString",EmptyString_get, EmptyString_set); SWIG_Python_SetConstant(d, "BITMAP_TYPE_INVALID",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_INVALID))); diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py index 26fe829251..b6e94f1f93 100644 --- a/wxPython/src/gtk/_gdi.py +++ b/wxPython/src/gtk/_gdi.py @@ -2342,9 +2342,6 @@ def FontEnumerator_IsValidFacename(*args, **kwargs): #--------------------------------------------------------------------------- -Layout_Default = _gdi_.Layout_Default -Layout_LeftToRight = _gdi_.Layout_LeftToRight -Layout_RightToLeft = _gdi_.Layout_RightToLeft LANGUAGE_DEFAULT = _gdi_.LANGUAGE_DEFAULT LANGUAGE_UNKNOWN = _gdi_.LANGUAGE_UNKNOWN LANGUAGE_ABKHAZIAN = _gdi_.LANGUAGE_ABKHAZIAN diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp index 3d48f3a0db..8886560038 100644 --- a/wxPython/src/gtk/_gdi_wrap.cpp +++ b/wxPython/src/gtk/_gdi_wrap.cpp @@ -33551,9 +33551,6 @@ SWIGEXPORT void SWIG_init(void) { wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator"); - SWIG_Python_SetConstant(d, "Layout_Default",SWIG_From_int(static_cast< int >(wxLayout_Default))); - SWIG_Python_SetConstant(d, "Layout_LeftToRight",SWIG_From_int(static_cast< int >(wxLayout_LeftToRight))); - SWIG_Python_SetConstant(d, "Layout_RightToLeft",SWIG_From_int(static_cast< int >(wxLayout_RightToLeft))); SWIG_Python_SetConstant(d, "LANGUAGE_DEFAULT",SWIG_From_int(static_cast< int >(wxLANGUAGE_DEFAULT))); SWIG_Python_SetConstant(d, "LANGUAGE_UNKNOWN",SWIG_From_int(static_cast< int >(wxLANGUAGE_UNKNOWN))); SWIG_Python_SetConstant(d, "LANGUAGE_ABKHAZIAN",SWIG_From_int(static_cast< int >(wxLANGUAGE_ABKHAZIAN))); diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index ccee8ff4eb..14adc5847f 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -791,6 +791,8 @@ class ToolTip(_core.Object): return _misc_.ToolTip_SetDelay(*args, **kwargs) SetDelay = staticmethod(SetDelay) + Tip = property(GetTip,SetTip,doc="See `GetTip` and `SetTip`") + Window = property(GetWindow,doc="See `GetWindow`") _misc_.ToolTip_swigregister(ToolTip) def ToolTip_Enable(*args, **kwargs): @@ -1227,6 +1229,8 @@ class TipProvider(object): """PreprocessTip(self, String tip) -> String""" return _misc_.TipProvider_PreprocessTip(*args, **kwargs) + CurrentTip = property(GetCurrentTip,doc="See `GetCurrentTip`") + Tip = property(GetTip,doc="See `GetTip`") _misc_.TipProvider_swigregister(TipProvider) class PyTipProvider(TipProvider): @@ -1312,6 +1316,9 @@ class Timer(_core.EvtHandler): """NO-OP: Timers must be destroyed by normal reference counting""" pass + Id = property(GetId,doc="See `GetId`") + Interval = property(GetInterval,doc="See `GetInterval`") + Owner = property(GetOwner,SetOwner,doc="See `GetOwner` and `SetOwner`") _misc_.Timer_swigregister(Timer) # For backwards compatibility with 2.4 @@ -1339,6 +1346,7 @@ class TimerEvent(_core.Event): """GetInterval(self) -> int""" return _misc_.TimerEvent_GetInterval(*args, **kwargs) + Interval = property(GetInterval,doc="See `GetInterval`") _misc_.TimerEvent_swigregister(TimerEvent) class TimerRunner(object): @@ -4325,6 +4333,12 @@ class TimeSpan(object): def __str__(self): return self.Format().encode(wx.GetDefaultPyEncoding()) + Days = property(GetDays,doc="See `GetDays`") + Hours = property(GetHours,doc="See `GetHours`") + Milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") + Minutes = property(GetMinutes,doc="See `GetMinutes`") + Seconds = property(GetSeconds,doc="See `GetSeconds`") + Weeks = property(GetWeeks,doc="See `GetWeeks`") _misc_.TimeSpan_swigregister(TimeSpan) def TimeSpan_Milliseconds(*args, **kwargs): @@ -4982,6 +4996,8 @@ class TextDataObject(DataObjectSimple): """ return _misc_.TextDataObject_SetText(*args, **kwargs) + Text = property(GetText,SetText,doc="See `GetText` and `SetText`") + TextLength = property(GetTextLength,doc="See `GetTextLength`") _misc_.TextDataObject_swigregister(TextDataObject) class PyTextDataObject(TextDataObject): diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py index eba3873d8b..fea11d0686 100644 --- a/wxPython/src/gtk/_windows.py +++ b/wxPython/src/gtk/_windows.py @@ -463,6 +463,10 @@ class TopLevelWindow(_core.Window): """ return _windows_.TopLevelWindow_GetTmpDefaultItem(*args, **kwargs) + DefaultItem = property(GetDefaultItem,SetDefaultItem,doc="See `GetDefaultItem` and `SetDefaultItem`") + Icon = property(GetIcon,SetIcon,doc="See `GetIcon` and `SetIcon`") + Title = property(GetTitle,SetTitle,doc="See `GetTitle` and `SetTitle`") + TmpDefaultItem = property(GetTmpDefaultItem,SetTmpDefaultItem,doc="See `GetTmpDefaultItem` and `SetTmpDefaultItem`") _windows_.TopLevelWindow_swigregister(TopLevelWindow) cvar = _windows_.cvar FrameNameStr = cvar.FrameNameStr @@ -2598,6 +2602,7 @@ class TextEntryDialog(Dialog): """ return _windows_.TextEntryDialog_SetValue(*args, **kwargs) + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _windows_.TextEntryDialog_swigregister(TextEntryDialog) class PasswordEntryDialog(TextEntryDialog): diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index 616cc0206d..e0b9124bbc 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -1655,6 +1655,15 @@ class TextAttr(object): return _controls_.TextAttr_Combine(*args, **kwargs) Combine = staticmethod(Combine) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") + LeftIndent = property(GetLeftIndent,SetLeftIndent,doc="See `GetLeftIndent` and `SetLeftIndent`") + LeftSubIndent = property(GetLeftSubIndent,doc="See `GetLeftSubIndent`") + 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`") _controls_.TextAttr_swigregister(TextAttr) TextCtrlNameStr = cvar.TextCtrlNameStr @@ -1931,6 +1940,13 @@ class TextCtrl(_core.Control): return _controls_.TextCtrl_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + DefaultStyle = property(GetDefaultStyle,SetDefaultStyle,doc="See `GetDefaultStyle` and `SetDefaultStyle`") + InsertionPoint = property(GetInsertionPoint,SetInsertionPoint,doc="See `GetInsertionPoint` and `SetInsertionPoint`") + LastPosition = property(GetLastPosition,doc="See `GetLastPosition`") + NumberOfLines = property(GetNumberOfLines,doc="See `GetNumberOfLines`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + StringSelection = property(GetStringSelection,doc="See `GetStringSelection`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.TextCtrl_swigregister(TextCtrl) def PreTextCtrl(*args, **kwargs): @@ -1978,6 +1994,9 @@ class TextUrlEvent(_core.CommandEvent): """GetURLEnd(self) -> long""" return _controls_.TextUrlEvent_GetURLEnd(*args, **kwargs) + MouseEvent = property(GetMouseEvent,doc="See `GetMouseEvent`") + URLEnd = property(GetURLEnd,doc="See `GetURLEnd`") + URLStart = property(GetURLStart,doc="See `GetURLStart`") _controls_.TextUrlEvent_swigregister(TextUrlEvent) EVT_TEXT = wx.PyEventBinder( wxEVT_COMMAND_TEXT_UPDATED, 1) @@ -2771,6 +2790,7 @@ class ToggleButton(_core.Control): return _controls_.ToggleButton_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.ToggleButton_swigregister(ToggleButton) ToggleButtonNameStr = cvar.ToggleButtonNameStr @@ -3328,6 +3348,7 @@ class Treebook(BookCtrlBase): """GetTreeCtrl(self) -> TreeCtrl""" return _controls_.Treebook_GetTreeCtrl(*args, **kwargs) + TreeCtrl = property(GetTreeCtrl,doc="See `GetTreeCtrl`") _controls_.Treebook_swigregister(Treebook) def PreTreebook(*args, **kwargs): @@ -3386,6 +3407,7 @@ class Toolbook(BookCtrlBase): """Realize(self)""" return _controls_.Toolbook_Realize(*args, **kwargs) + ToolBar = property(GetToolBar,doc="See `GetToolBar`") _controls_.Toolbook_swigregister(Toolbook) def PreToolbook(*args, **kwargs): @@ -3553,6 +3575,18 @@ class ToolBarToolBase(_core.Object): SetBitmap1 = SetNormalBitmap SetBitmap2 = SetDisabledBitmap + Bitmap = property(GetBitmap,doc="See `GetBitmap`") + ClientData = property(GetClientData,SetClientData,doc="See `GetClientData` and `SetClientData`") + Control = property(GetControl,doc="See `GetControl`") + DisabledBitmap = property(GetDisabledBitmap,SetDisabledBitmap,doc="See `GetDisabledBitmap` and `SetDisabledBitmap`") + Id = property(GetId,doc="See `GetId`") + Kind = property(GetKind,doc="See `GetKind`") + Label = property(GetLabel,SetLabel,doc="See `GetLabel` and `SetLabel`") + LongHelp = property(GetLongHelp,SetLongHelp,doc="See `GetLongHelp` and `SetLongHelp`") + NormalBitmap = property(GetNormalBitmap,SetNormalBitmap,doc="See `GetNormalBitmap` and `SetNormalBitmap`") + ShortHelp = property(GetShortHelp,SetShortHelp,doc="See `GetShortHelp` and `SetShortHelp`") + Style = property(GetStyle,doc="See `GetStyle`") + ToolBar = property(GetToolBar,doc="See `GetToolBar`") _controls_.ToolBarToolBase_swigregister(ToolBarToolBase) class ToolBarBase(_core.Control): @@ -3874,6 +3908,15 @@ class ToolBarBase(_core.Control): """GetToolsCount(self) -> size_t""" return _controls_.ToolBarBase_GetToolsCount(*args, **kwargs) + Margins = property(GetMargins,SetMargins,doc="See `GetMargins` and `SetMargins`") + MaxCols = property(GetMaxCols,doc="See `GetMaxCols`") + MaxRows = property(GetMaxRows,doc="See `GetMaxRows`") + ToolBitmapSize = property(GetToolBitmapSize,SetToolBitmapSize,doc="See `GetToolBitmapSize` and `SetToolBitmapSize`") + ToolMargins = property(GetToolMargins,doc="See `GetToolMargins`") + ToolPacking = property(GetToolPacking,SetToolPacking,doc="See `GetToolPacking` and `SetToolPacking`") + ToolSeparation = property(GetToolSeparation,SetToolSeparation,doc="See `GetToolSeparation` and `SetToolSeparation`") + ToolSize = property(GetToolSize,doc="See `GetToolSize`") + ToolsCount = property(GetToolsCount,doc="See `GetToolsCount`") _controls_.ToolBarBase_swigregister(ToolBarBase) class ToolBar(ToolBarBase): @@ -4958,6 +5001,8 @@ class TreeItemData(object): args[0].thisown = 0 return val + Data = property(GetData,SetData,doc="See `GetData` and `SetData`") + Id = property(GetId,SetId,doc="See `GetId` and `SetId`") _controls_.TreeItemData_swigregister(TreeItemData) #--------------------------------------------------------------------------- @@ -5075,6 +5120,14 @@ class TreeEvent(_core.NotifyEvent): """GetToolTip(self) -> String""" return _controls_.TreeEvent_GetToolTip(*args, **kwargs) + Item = property(GetItem,SetItem,doc="See `GetItem` and `SetItem`") + KeyCode = property(GetKeyCode,doc="See `GetKeyCode`") + KeyEvent = property(GetKeyEvent,SetKeyEvent,doc="See `GetKeyEvent` and `SetKeyEvent`") + Label = property(GetLabel,SetLabel,doc="See `GetLabel` and `SetLabel`") + OldItem = property(GetOldItem,SetOldItem,doc="See `GetOldItem` and `SetOldItem`") + Point = property(GetPoint,SetPoint,doc="See `GetPoint` and `SetPoint`") + ToolTip = property(GetToolTip,SetToolTip,doc="See `GetToolTip` and `SetToolTip`") + EditCancelled = property(IsEditCancelled,SetEditCanceled,doc="See `IsEditCancelled` and `SetEditCanceled`") _controls_.TreeEvent_swigregister(TreeEvent) #--------------------------------------------------------------------------- @@ -5443,6 +5496,17 @@ class TreeCtrl(_core.Control): """GetQuickBestSize(self) -> bool""" return _controls_.TreeCtrl_GetQuickBestSize(*args, **kwargs) + Count = property(GetCount,doc="See `GetCount`") + EditControl = property(GetEditControl,doc="See `GetEditControl`") + FirstVisibleItem = property(GetFirstVisibleItem,doc="See `GetFirstVisibleItem`") + ImageList = property(GetImageList,SetImageList,doc="See `GetImageList` and `SetImageList`") + Indent = property(GetIndent,SetIndent,doc="See `GetIndent` and `SetIndent`") + QuickBestSize = property(GetQuickBestSize,SetQuickBestSize,doc="See `GetQuickBestSize` and `SetQuickBestSize`") + RootItem = property(GetRootItem,doc="See `GetRootItem`") + Selection = property(GetSelection,doc="See `GetSelection`") + Selections = property(GetSelections,doc="See `GetSelections`") + Spacing = property(GetSpacing,SetSpacing,doc="See `GetSpacing` and `SetSpacing`") + StateImageList = property(GetStateImageList,SetStateImageList,doc="See `GetStateImageList` and `SetStateImageList`") _controls_.TreeCtrl_swigregister(TreeCtrl) def PreTreeCtrl(*args, **kwargs): diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index d28b51d65f..09905808e4 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -678,6 +678,9 @@ MOD_ALL = _core_.MOD_ALL UPDATE_UI_NONE = _core_.UPDATE_UI_NONE UPDATE_UI_RECURSE = _core_.UPDATE_UI_RECURSE UPDATE_UI_FROMIDLE = _core_.UPDATE_UI_FROMIDLE +Layout_Default = _core_.Layout_Default +Layout_LeftToRight = _core_.Layout_LeftToRight +Layout_RightToLeft = _core_.Layout_RightToLeft #--------------------------------------------------------------------------- class Object(object): @@ -6788,7 +6791,7 @@ class PyApp(EvtHandler): def GetLayoutDirection(*args, **kwargs): """ - GetLayoutDirection(self) -> wxLayoutDirection + GetLayoutDirection(self) -> int Return the layout direction for the current locale. """ @@ -7932,7 +7935,7 @@ class Window(EvtHandler): PrevControlId = staticmethod(PrevControlId) def GetLayoutDirection(*args, **kwargs): """ - GetLayoutDirection(self) -> wxLayoutDirection + GetLayoutDirection(self) -> int Get the layout direction (LTR or RTL) for this window. Returns ``wx.Layout_Default`` if layout direction is not supported. @@ -7941,7 +7944,7 @@ class Window(EvtHandler): def SetLayoutDirection(*args, **kwargs): """ - SetLayoutDirection(self, wxLayoutDirection dir) + SetLayoutDirection(self, int dir) Set the layout direction (LTR or RTL) for this window. """ @@ -9991,6 +9994,7 @@ class Window(EvtHandler): HelpText = property(GetHelpText,SetHelpText,doc="See `GetHelpText` and `SetHelpText`") Id = property(GetId,SetId,doc="See `GetId` and `SetId`") Label = property(GetLabel,SetLabel,doc="See `GetLabel` and `SetLabel`") + LayoutDirection = property(GetLayoutDirection,SetLayoutDirection,doc="See `GetLayoutDirection` and `SetLayoutDirection`") MaxHeight = property(GetMaxHeight,doc="See `GetMaxHeight`") MaxSize = property(GetMaxSize,SetMaxSize,doc="See `GetMaxSize` and `SetMaxSize`") MaxWidth = property(GetMaxWidth,doc="See `GetMaxWidth`") diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index f084e45042..1930db7d82 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -2533,71 +2533,70 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxJPEGHandler swig_types[67] #define SWIGTYPE_p_wxKeyEvent swig_types[68] #define SWIGTYPE_p_wxLayoutConstraints swig_types[69] -#define SWIGTYPE_p_wxLayoutDirection swig_types[70] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[71] -#define SWIGTYPE_p_wxMemoryFSHandler swig_types[72] -#define SWIGTYPE_p_wxMenu swig_types[73] -#define SWIGTYPE_p_wxMenuBar swig_types[74] -#define SWIGTYPE_p_wxMenuBarBase swig_types[75] -#define SWIGTYPE_p_wxMenuEvent swig_types[76] -#define SWIGTYPE_p_wxMenuItem swig_types[77] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[78] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[79] -#define SWIGTYPE_p_wxMouseEvent swig_types[80] -#define SWIGTYPE_p_wxMoveEvent swig_types[81] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[82] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[83] -#define SWIGTYPE_p_wxNotifyEvent swig_types[84] -#define SWIGTYPE_p_wxObject swig_types[85] -#define SWIGTYPE_p_wxOutputStream swig_types[86] -#define SWIGTYPE_p_wxPCXHandler swig_types[87] -#define SWIGTYPE_p_wxPNGHandler swig_types[88] -#define SWIGTYPE_p_wxPNMHandler swig_types[89] -#define SWIGTYPE_p_wxPaintEvent swig_types[90] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[91] -#define SWIGTYPE_p_wxPaperSize swig_types[92] -#define SWIGTYPE_p_wxPoint swig_types[93] -#define SWIGTYPE_p_wxPoint2D swig_types[94] -#define SWIGTYPE_p_wxPropagateOnce swig_types[95] -#define SWIGTYPE_p_wxPropagationDisabler swig_types[96] -#define SWIGTYPE_p_wxPyApp swig_types[97] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[98] -#define SWIGTYPE_p_wxPyDropTarget swig_types[99] -#define SWIGTYPE_p_wxPyEvent swig_types[100] -#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[101] -#define SWIGTYPE_p_wxPyImageHandler swig_types[102] -#define SWIGTYPE_p_wxPyInputStream swig_types[103] -#define SWIGTYPE_p_wxPySizer swig_types[104] -#define SWIGTYPE_p_wxPyValidator swig_types[105] -#define SWIGTYPE_p_wxQuantize swig_types[106] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[107] -#define SWIGTYPE_p_wxRealPoint swig_types[108] -#define SWIGTYPE_p_wxRect swig_types[109] -#define SWIGTYPE_p_wxRegion swig_types[110] -#define SWIGTYPE_p_wxScrollEvent swig_types[111] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[112] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[113] -#define SWIGTYPE_p_wxShowEvent swig_types[114] -#define SWIGTYPE_p_wxSize swig_types[115] -#define SWIGTYPE_p_wxSizeEvent swig_types[116] -#define SWIGTYPE_p_wxSizer swig_types[117] -#define SWIGTYPE_p_wxSizerItem swig_types[118] -#define SWIGTYPE_p_wxStaticBox swig_types[119] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[120] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[121] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[122] -#define SWIGTYPE_p_wxTIFFHandler swig_types[123] -#define SWIGTYPE_p_wxToolTip swig_types[124] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[125] -#define SWIGTYPE_p_wxValidator swig_types[126] -#define SWIGTYPE_p_wxVisualAttributes swig_types[127] -#define SWIGTYPE_p_wxWindow swig_types[128] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[129] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[130] -#define SWIGTYPE_p_wxXPMHandler swig_types[131] -#define SWIGTYPE_p_wxZipFSHandler swig_types[132] -static swig_type_info *swig_types[134]; -static swig_module_info swig_module = {swig_types, 133, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxMaximizeEvent swig_types[70] +#define SWIGTYPE_p_wxMemoryFSHandler swig_types[71] +#define SWIGTYPE_p_wxMenu swig_types[72] +#define SWIGTYPE_p_wxMenuBar swig_types[73] +#define SWIGTYPE_p_wxMenuBarBase swig_types[74] +#define SWIGTYPE_p_wxMenuEvent swig_types[75] +#define SWIGTYPE_p_wxMenuItem swig_types[76] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[77] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[78] +#define SWIGTYPE_p_wxMouseEvent swig_types[79] +#define SWIGTYPE_p_wxMoveEvent swig_types[80] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[81] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[82] +#define SWIGTYPE_p_wxNotifyEvent swig_types[83] +#define SWIGTYPE_p_wxObject swig_types[84] +#define SWIGTYPE_p_wxOutputStream swig_types[85] +#define SWIGTYPE_p_wxPCXHandler swig_types[86] +#define SWIGTYPE_p_wxPNGHandler swig_types[87] +#define SWIGTYPE_p_wxPNMHandler swig_types[88] +#define SWIGTYPE_p_wxPaintEvent swig_types[89] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[90] +#define SWIGTYPE_p_wxPaperSize swig_types[91] +#define SWIGTYPE_p_wxPoint swig_types[92] +#define SWIGTYPE_p_wxPoint2D swig_types[93] +#define SWIGTYPE_p_wxPropagateOnce swig_types[94] +#define SWIGTYPE_p_wxPropagationDisabler swig_types[95] +#define SWIGTYPE_p_wxPyApp swig_types[96] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[97] +#define SWIGTYPE_p_wxPyDropTarget swig_types[98] +#define SWIGTYPE_p_wxPyEvent swig_types[99] +#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[100] +#define SWIGTYPE_p_wxPyImageHandler swig_types[101] +#define SWIGTYPE_p_wxPyInputStream swig_types[102] +#define SWIGTYPE_p_wxPySizer swig_types[103] +#define SWIGTYPE_p_wxPyValidator swig_types[104] +#define SWIGTYPE_p_wxQuantize swig_types[105] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[106] +#define SWIGTYPE_p_wxRealPoint swig_types[107] +#define SWIGTYPE_p_wxRect swig_types[108] +#define SWIGTYPE_p_wxRegion swig_types[109] +#define SWIGTYPE_p_wxScrollEvent swig_types[110] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[111] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[112] +#define SWIGTYPE_p_wxShowEvent swig_types[113] +#define SWIGTYPE_p_wxSize swig_types[114] +#define SWIGTYPE_p_wxSizeEvent swig_types[115] +#define SWIGTYPE_p_wxSizer swig_types[116] +#define SWIGTYPE_p_wxSizerItem swig_types[117] +#define SWIGTYPE_p_wxStaticBox swig_types[118] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[119] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[120] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[121] +#define SWIGTYPE_p_wxTIFFHandler swig_types[122] +#define SWIGTYPE_p_wxToolTip swig_types[123] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[124] +#define SWIGTYPE_p_wxValidator swig_types[125] +#define SWIGTYPE_p_wxVisualAttributes swig_types[126] +#define SWIGTYPE_p_wxWindow swig_types[127] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[128] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[129] +#define SWIGTYPE_p_wxXPMHandler swig_types[130] +#define SWIGTYPE_p_wxZipFSHandler swig_types[131] +static swig_type_info *swig_types[133]; +static swig_module_info swig_module = {swig_types, 132, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -27786,11 +27785,11 @@ SWIGINTERN PyObject *_wrap_PyApp_GetLayoutDirection(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< wxPyApp * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyApp const *)arg1)->GetLayoutDirection(); + result = (wxLayoutDirection)((wxPyApp const *)arg1)->GetLayoutDirection(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxLayoutDirection(static_cast< const wxLayoutDirection& >(result))), SWIGTYPE_p_wxLayoutDirection, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: return NULL; @@ -30735,11 +30734,11 @@ SWIGINTERN PyObject *_wrap_Window_GetLayoutDirection(PyObject *SWIGUNUSEDPARM(se arg1 = reinterpret_cast< wxWindow * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxWindow const *)arg1)->GetLayoutDirection(); + result = (wxLayoutDirection)((wxWindow const *)arg1)->GetLayoutDirection(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxLayoutDirection(static_cast< const wxLayoutDirection& >(result))), SWIGTYPE_p_wxLayoutDirection, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: return NULL; @@ -30752,8 +30751,8 @@ SWIGINTERN PyObject *_wrap_Window_SetLayoutDirection(PyObject *SWIGUNUSEDPARM(se wxLayoutDirection arg2 ; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 ; - int res2 = 0 ; + int val2 ; + int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char * kwnames[] = { @@ -30766,19 +30765,11 @@ SWIGINTERN PyObject *_wrap_Window_SetLayoutDirection(PyObject *SWIGUNUSEDPARM(se SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_SetLayoutDirection" "', expected argument " "1"" of type '" "wxWindow *""'"); } arg1 = reinterpret_cast< wxWindow * >(argp1); - { - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxLayoutDirection, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Window_SetLayoutDirection" "', expected argument " "2"" of type '" "wxLayoutDirection""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Window_SetLayoutDirection" "', expected argument " "2"" of type '" "wxLayoutDirection""'"); - } else { - wxLayoutDirection * temp = reinterpret_cast< wxLayoutDirection * >(argp2); - arg2 = *temp; - if (SWIG_IsNewObj(res2)) delete temp; - } - } + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Window_SetLayoutDirection" "', expected argument " "2"" of type '" "wxLayoutDirection""'"); + } + arg2 = static_cast< wxLayoutDirection >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLayoutDirection(arg2); @@ -55812,7 +55803,6 @@ static swig_type_info _swigt__p_wxItemContainer = {"_p_wxItemContainer", "wxItem static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", "wxJPEGHandler *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxKeyEvent = {"_p_wxKeyEvent", "wxKeyEvent *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxLayoutConstraints = {"_p_wxLayoutConstraints", "wxLayoutConstraints *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_wxLayoutDirection = {"_p_wxLayoutDirection", "wxLayoutDirection *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxMaximizeEvent = {"_p_wxMaximizeEvent", "wxMaximizeEvent *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxMemoryFSHandler = {"_p_wxMemoryFSHandler", "wxMemoryFSHandler *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxMenu = {"_p_wxMenu", "wxMenu *", 0, 0, (void*)0, 0}; @@ -55947,7 +55937,6 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxJPEGHandler, &_swigt__p_wxKeyEvent, &_swigt__p_wxLayoutConstraints, - &_swigt__p_wxLayoutDirection, &_swigt__p_wxMaximizeEvent, &_swigt__p_wxMemoryFSHandler, &_swigt__p_wxMenu, @@ -56082,7 +56071,6 @@ static swig_cast_info _swigc__p_wxItemContainer[] = { {&_swigt__p_wxControlWith static swig_cast_info _swigc__p_wxJPEGHandler[] = { {&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxKeyEvent[] = { {&_swigt__p_wxKeyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxLayoutConstraints[] = { {&_swigt__p_wxLayoutConstraints, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxLayoutDirection[] = { {&_swigt__p_wxLayoutDirection, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMaximizeEvent[] = { {&_swigt__p_wxMaximizeEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMemoryFSHandler[] = { {&_swigt__p_wxMemoryFSHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMenu[] = { {&_swigt__p_wxMenu, 0, 0, 0},{0, 0, 0, 0}}; @@ -56217,7 +56205,6 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxJPEGHandler, _swigc__p_wxKeyEvent, _swigc__p_wxLayoutConstraints, - _swigc__p_wxLayoutDirection, _swigc__p_wxMaximizeEvent, _swigc__p_wxMemoryFSHandler, _swigc__p_wxMenu, @@ -57390,6 +57377,9 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "UPDATE_UI_NONE",SWIG_From_int(static_cast< int >(wxUPDATE_UI_NONE))); SWIG_Python_SetConstant(d, "UPDATE_UI_RECURSE",SWIG_From_int(static_cast< int >(wxUPDATE_UI_RECURSE))); SWIG_Python_SetConstant(d, "UPDATE_UI_FROMIDLE",SWIG_From_int(static_cast< int >(wxUPDATE_UI_FROMIDLE))); + SWIG_Python_SetConstant(d, "Layout_Default",SWIG_From_int(static_cast< int >(wxLayout_Default))); + SWIG_Python_SetConstant(d, "Layout_LeftToRight",SWIG_From_int(static_cast< int >(wxLayout_LeftToRight))); + SWIG_Python_SetConstant(d, "Layout_RightToLeft",SWIG_From_int(static_cast< int >(wxLayout_RightToLeft))); PyDict_SetItemString(d,(char*)"cvar", SWIG_globals()); SWIG_addvarlink(SWIG_globals(),(char*)"EmptyString",EmptyString_get, EmptyString_set); SWIG_Python_SetConstant(d, "BITMAP_TYPE_INVALID",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_INVALID))); diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py index 459db06ec3..3621a7fbad 100644 --- a/wxPython/src/mac/_gdi.py +++ b/wxPython/src/mac/_gdi.py @@ -2341,9 +2341,6 @@ def FontEnumerator_IsValidFacename(*args, **kwargs): #--------------------------------------------------------------------------- -Layout_Default = _gdi_.Layout_Default -Layout_LeftToRight = _gdi_.Layout_LeftToRight -Layout_RightToLeft = _gdi_.Layout_RightToLeft LANGUAGE_DEFAULT = _gdi_.LANGUAGE_DEFAULT LANGUAGE_UNKNOWN = _gdi_.LANGUAGE_UNKNOWN LANGUAGE_ABKHAZIAN = _gdi_.LANGUAGE_ABKHAZIAN diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp index 681676d7ad..0682252abd 100644 --- a/wxPython/src/mac/_gdi_wrap.cpp +++ b/wxPython/src/mac/_gdi_wrap.cpp @@ -33767,9 +33767,6 @@ SWIGEXPORT void SWIG_init(void) { wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator"); - SWIG_Python_SetConstant(d, "Layout_Default",SWIG_From_int(static_cast< int >(wxLayout_Default))); - SWIG_Python_SetConstant(d, "Layout_LeftToRight",SWIG_From_int(static_cast< int >(wxLayout_LeftToRight))); - SWIG_Python_SetConstant(d, "Layout_RightToLeft",SWIG_From_int(static_cast< int >(wxLayout_RightToLeft))); SWIG_Python_SetConstant(d, "LANGUAGE_DEFAULT",SWIG_From_int(static_cast< int >(wxLANGUAGE_DEFAULT))); SWIG_Python_SetConstant(d, "LANGUAGE_UNKNOWN",SWIG_From_int(static_cast< int >(wxLANGUAGE_UNKNOWN))); SWIG_Python_SetConstant(d, "LANGUAGE_ABKHAZIAN",SWIG_From_int(static_cast< int >(wxLANGUAGE_ABKHAZIAN))); diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py index a978b3cd4c..c2e981778b 100644 --- a/wxPython/src/mac/_misc.py +++ b/wxPython/src/mac/_misc.py @@ -791,6 +791,8 @@ class ToolTip(_core.Object): return _misc_.ToolTip_SetDelay(*args, **kwargs) SetDelay = staticmethod(SetDelay) + Tip = property(GetTip,SetTip,doc="See `GetTip` and `SetTip`") + Window = property(GetWindow,doc="See `GetWindow`") _misc_.ToolTip_swigregister(ToolTip) def ToolTip_Enable(*args, **kwargs): @@ -1227,6 +1229,8 @@ class TipProvider(object): """PreprocessTip(self, String tip) -> String""" return _misc_.TipProvider_PreprocessTip(*args, **kwargs) + CurrentTip = property(GetCurrentTip,doc="See `GetCurrentTip`") + Tip = property(GetTip,doc="See `GetTip`") _misc_.TipProvider_swigregister(TipProvider) class PyTipProvider(TipProvider): @@ -1312,6 +1316,9 @@ class Timer(_core.EvtHandler): """NO-OP: Timers must be destroyed by normal reference counting""" pass + Id = property(GetId,doc="See `GetId`") + Interval = property(GetInterval,doc="See `GetInterval`") + Owner = property(GetOwner,SetOwner,doc="See `GetOwner` and `SetOwner`") _misc_.Timer_swigregister(Timer) # For backwards compatibility with 2.4 @@ -1339,6 +1346,7 @@ class TimerEvent(_core.Event): """GetInterval(self) -> int""" return _misc_.TimerEvent_GetInterval(*args, **kwargs) + Interval = property(GetInterval,doc="See `GetInterval`") _misc_.TimerEvent_swigregister(TimerEvent) class TimerRunner(object): @@ -4325,6 +4333,12 @@ class TimeSpan(object): def __str__(self): return self.Format().encode(wx.GetDefaultPyEncoding()) + Days = property(GetDays,doc="See `GetDays`") + Hours = property(GetHours,doc="See `GetHours`") + Milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") + Minutes = property(GetMinutes,doc="See `GetMinutes`") + Seconds = property(GetSeconds,doc="See `GetSeconds`") + Weeks = property(GetWeeks,doc="See `GetWeeks`") _misc_.TimeSpan_swigregister(TimeSpan) def TimeSpan_Milliseconds(*args, **kwargs): @@ -4982,6 +4996,8 @@ class TextDataObject(DataObjectSimple): """ return _misc_.TextDataObject_SetText(*args, **kwargs) + Text = property(GetText,SetText,doc="See `GetText` and `SetText`") + TextLength = property(GetTextLength,doc="See `GetTextLength`") _misc_.TextDataObject_swigregister(TextDataObject) class PyTextDataObject(TextDataObject): diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py index 57fc2b6ea1..cc0b036c7c 100644 --- a/wxPython/src/mac/_windows.py +++ b/wxPython/src/mac/_windows.py @@ -471,6 +471,10 @@ class TopLevelWindow(_core.Window): """ return _windows_.TopLevelWindow_GetTmpDefaultItem(*args, **kwargs) + DefaultItem = property(GetDefaultItem,SetDefaultItem,doc="See `GetDefaultItem` and `SetDefaultItem`") + Icon = property(GetIcon,SetIcon,doc="See `GetIcon` and `SetIcon`") + Title = property(GetTitle,SetTitle,doc="See `GetTitle` and `SetTitle`") + TmpDefaultItem = property(GetTmpDefaultItem,SetTmpDefaultItem,doc="See `GetTmpDefaultItem` and `SetTmpDefaultItem`") _windows_.TopLevelWindow_swigregister(TopLevelWindow) cvar = _windows_.cvar FrameNameStr = cvar.FrameNameStr @@ -2578,6 +2582,7 @@ class TextEntryDialog(Dialog): """ return _windows_.TextEntryDialog_SetValue(*args, **kwargs) + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _windows_.TextEntryDialog_swigregister(TextEntryDialog) class PasswordEntryDialog(TextEntryDialog): diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py index afa7ea4797..6a1cf94744 100644 --- a/wxPython/src/msw/_controls.py +++ b/wxPython/src/msw/_controls.py @@ -1662,6 +1662,15 @@ class TextAttr(object): return _controls_.TextAttr_Combine(*args, **kwargs) Combine = staticmethod(Combine) + Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") + BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") + Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") + Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") + LeftIndent = property(GetLeftIndent,SetLeftIndent,doc="See `GetLeftIndent` and `SetLeftIndent`") + LeftSubIndent = property(GetLeftSubIndent,doc="See `GetLeftSubIndent`") + 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`") _controls_.TextAttr_swigregister(TextAttr) TextCtrlNameStr = cvar.TextCtrlNameStr @@ -1946,6 +1955,13 @@ class TextCtrl(_core.Control): return _controls_.TextCtrl_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + DefaultStyle = property(GetDefaultStyle,SetDefaultStyle,doc="See `GetDefaultStyle` and `SetDefaultStyle`") + InsertionPoint = property(GetInsertionPoint,SetInsertionPoint,doc="See `GetInsertionPoint` and `SetInsertionPoint`") + LastPosition = property(GetLastPosition,doc="See `GetLastPosition`") + NumberOfLines = property(GetNumberOfLines,doc="See `GetNumberOfLines`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + StringSelection = property(GetStringSelection,doc="See `GetStringSelection`") + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.TextCtrl_swigregister(TextCtrl) def PreTextCtrl(*args, **kwargs): @@ -1993,6 +2009,9 @@ class TextUrlEvent(_core.CommandEvent): """GetURLEnd(self) -> long""" return _controls_.TextUrlEvent_GetURLEnd(*args, **kwargs) + MouseEvent = property(GetMouseEvent,doc="See `GetMouseEvent`") + URLEnd = property(GetURLEnd,doc="See `GetURLEnd`") + URLStart = property(GetURLStart,doc="See `GetURLStart`") _controls_.TextUrlEvent_swigregister(TextUrlEvent) EVT_TEXT = wx.PyEventBinder( wxEVT_COMMAND_TEXT_UPDATED, 1) @@ -2786,6 +2805,7 @@ class ToggleButton(_core.Control): return _controls_.ToggleButton_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _controls_.ToggleButton_swigregister(ToggleButton) ToggleButtonNameStr = cvar.ToggleButtonNameStr @@ -3343,6 +3363,7 @@ class Treebook(BookCtrlBase): """GetTreeCtrl(self) -> TreeCtrl""" return _controls_.Treebook_GetTreeCtrl(*args, **kwargs) + TreeCtrl = property(GetTreeCtrl,doc="See `GetTreeCtrl`") _controls_.Treebook_swigregister(Treebook) def PreTreebook(*args, **kwargs): @@ -3401,6 +3422,7 @@ class Toolbook(BookCtrlBase): """Realize(self)""" return _controls_.Toolbook_Realize(*args, **kwargs) + ToolBar = property(GetToolBar,doc="See `GetToolBar`") _controls_.Toolbook_swigregister(Toolbook) def PreToolbook(*args, **kwargs): @@ -3568,6 +3590,18 @@ class ToolBarToolBase(_core.Object): SetBitmap1 = SetNormalBitmap SetBitmap2 = SetDisabledBitmap + Bitmap = property(GetBitmap,doc="See `GetBitmap`") + ClientData = property(GetClientData,SetClientData,doc="See `GetClientData` and `SetClientData`") + Control = property(GetControl,doc="See `GetControl`") + DisabledBitmap = property(GetDisabledBitmap,SetDisabledBitmap,doc="See `GetDisabledBitmap` and `SetDisabledBitmap`") + Id = property(GetId,doc="See `GetId`") + Kind = property(GetKind,doc="See `GetKind`") + Label = property(GetLabel,SetLabel,doc="See `GetLabel` and `SetLabel`") + LongHelp = property(GetLongHelp,SetLongHelp,doc="See `GetLongHelp` and `SetLongHelp`") + NormalBitmap = property(GetNormalBitmap,SetNormalBitmap,doc="See `GetNormalBitmap` and `SetNormalBitmap`") + ShortHelp = property(GetShortHelp,SetShortHelp,doc="See `GetShortHelp` and `SetShortHelp`") + Style = property(GetStyle,doc="See `GetStyle`") + ToolBar = property(GetToolBar,doc="See `GetToolBar`") _controls_.ToolBarToolBase_swigregister(ToolBarToolBase) class ToolBarBase(_core.Control): @@ -3889,6 +3923,15 @@ class ToolBarBase(_core.Control): """GetToolsCount(self) -> size_t""" return _controls_.ToolBarBase_GetToolsCount(*args, **kwargs) + Margins = property(GetMargins,SetMargins,doc="See `GetMargins` and `SetMargins`") + MaxCols = property(GetMaxCols,doc="See `GetMaxCols`") + MaxRows = property(GetMaxRows,doc="See `GetMaxRows`") + ToolBitmapSize = property(GetToolBitmapSize,SetToolBitmapSize,doc="See `GetToolBitmapSize` and `SetToolBitmapSize`") + ToolMargins = property(GetToolMargins,doc="See `GetToolMargins`") + ToolPacking = property(GetToolPacking,SetToolPacking,doc="See `GetToolPacking` and `SetToolPacking`") + ToolSeparation = property(GetToolSeparation,SetToolSeparation,doc="See `GetToolSeparation` and `SetToolSeparation`") + ToolSize = property(GetToolSize,doc="See `GetToolSize`") + ToolsCount = property(GetToolsCount,doc="See `GetToolsCount`") _controls_.ToolBarBase_swigregister(ToolBarBase) class ToolBar(ToolBarBase): @@ -4972,6 +5015,8 @@ class TreeItemData(object): args[0].thisown = 0 return val + Data = property(GetData,SetData,doc="See `GetData` and `SetData`") + Id = property(GetId,SetId,doc="See `GetId` and `SetId`") _controls_.TreeItemData_swigregister(TreeItemData) #--------------------------------------------------------------------------- @@ -5089,6 +5134,14 @@ class TreeEvent(_core.NotifyEvent): """GetToolTip(self) -> String""" return _controls_.TreeEvent_GetToolTip(*args, **kwargs) + Item = property(GetItem,SetItem,doc="See `GetItem` and `SetItem`") + KeyCode = property(GetKeyCode,doc="See `GetKeyCode`") + KeyEvent = property(GetKeyEvent,SetKeyEvent,doc="See `GetKeyEvent` and `SetKeyEvent`") + Label = property(GetLabel,SetLabel,doc="See `GetLabel` and `SetLabel`") + OldItem = property(GetOldItem,SetOldItem,doc="See `GetOldItem` and `SetOldItem`") + Point = property(GetPoint,SetPoint,doc="See `GetPoint` and `SetPoint`") + ToolTip = property(GetToolTip,SetToolTip,doc="See `GetToolTip` and `SetToolTip`") + EditCancelled = property(IsEditCancelled,SetEditCanceled,doc="See `IsEditCancelled` and `SetEditCanceled`") _controls_.TreeEvent_swigregister(TreeEvent) #--------------------------------------------------------------------------- @@ -5469,6 +5522,17 @@ class TreeCtrl(_core.Control): """GetQuickBestSize(self) -> bool""" return _controls_.TreeCtrl_GetQuickBestSize(*args, **kwargs) + Count = property(GetCount,doc="See `GetCount`") + EditControl = property(GetEditControl,doc="See `GetEditControl`") + FirstVisibleItem = property(GetFirstVisibleItem,doc="See `GetFirstVisibleItem`") + ImageList = property(GetImageList,SetImageList,doc="See `GetImageList` and `SetImageList`") + Indent = property(GetIndent,SetIndent,doc="See `GetIndent` and `SetIndent`") + QuickBestSize = property(GetQuickBestSize,SetQuickBestSize,doc="See `GetQuickBestSize` and `SetQuickBestSize`") + RootItem = property(GetRootItem,doc="See `GetRootItem`") + Selection = property(GetSelection,doc="See `GetSelection`") + Selections = property(GetSelections,doc="See `GetSelections`") + Spacing = property(GetSpacing,SetSpacing,doc="See `GetSpacing` and `SetSpacing`") + StateImageList = property(GetStateImageList,SetStateImageList,doc="See `GetStateImageList` and `SetStateImageList`") _controls_.TreeCtrl_swigregister(TreeCtrl) def PreTreeCtrl(*args, **kwargs): diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 27a932ec39..b8ff92b615 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -678,6 +678,9 @@ MOD_ALL = _core_.MOD_ALL UPDATE_UI_NONE = _core_.UPDATE_UI_NONE UPDATE_UI_RECURSE = _core_.UPDATE_UI_RECURSE UPDATE_UI_FROMIDLE = _core_.UPDATE_UI_FROMIDLE +Layout_Default = _core_.Layout_Default +Layout_LeftToRight = _core_.Layout_LeftToRight +Layout_RightToLeft = _core_.Layout_RightToLeft #--------------------------------------------------------------------------- class Object(object): @@ -6788,7 +6791,7 @@ class PyApp(EvtHandler): def GetLayoutDirection(*args, **kwargs): """ - GetLayoutDirection(self) -> wxLayoutDirection + GetLayoutDirection(self) -> int Return the layout direction for the current locale. """ @@ -7932,7 +7935,7 @@ class Window(EvtHandler): PrevControlId = staticmethod(PrevControlId) def GetLayoutDirection(*args, **kwargs): """ - GetLayoutDirection(self) -> wxLayoutDirection + GetLayoutDirection(self) -> int Get the layout direction (LTR or RTL) for this window. Returns ``wx.Layout_Default`` if layout direction is not supported. @@ -7941,7 +7944,7 @@ class Window(EvtHandler): def SetLayoutDirection(*args, **kwargs): """ - SetLayoutDirection(self, wxLayoutDirection dir) + SetLayoutDirection(self, int dir) Set the layout direction (LTR or RTL) for this window. """ @@ -9995,6 +9998,7 @@ class Window(EvtHandler): HelpText = property(GetHelpText,SetHelpText,doc="See `GetHelpText` and `SetHelpText`") Id = property(GetId,SetId,doc="See `GetId` and `SetId`") Label = property(GetLabel,SetLabel,doc="See `GetLabel` and `SetLabel`") + LayoutDirection = property(GetLayoutDirection,SetLayoutDirection,doc="See `GetLayoutDirection` and `SetLayoutDirection`") MaxHeight = property(GetMaxHeight,doc="See `GetMaxHeight`") MaxSize = property(GetMaxSize,SetMaxSize,doc="See `GetMaxSize` and `SetMaxSize`") MaxWidth = property(GetMaxWidth,doc="See `GetMaxWidth`") diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index fe6cd15ba5..c11de14c4a 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -2533,71 +2533,70 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxJPEGHandler swig_types[67] #define SWIGTYPE_p_wxKeyEvent swig_types[68] #define SWIGTYPE_p_wxLayoutConstraints swig_types[69] -#define SWIGTYPE_p_wxLayoutDirection swig_types[70] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[71] -#define SWIGTYPE_p_wxMemoryFSHandler swig_types[72] -#define SWIGTYPE_p_wxMenu swig_types[73] -#define SWIGTYPE_p_wxMenuBar swig_types[74] -#define SWIGTYPE_p_wxMenuBarBase swig_types[75] -#define SWIGTYPE_p_wxMenuEvent swig_types[76] -#define SWIGTYPE_p_wxMenuItem swig_types[77] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[78] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[79] -#define SWIGTYPE_p_wxMouseEvent swig_types[80] -#define SWIGTYPE_p_wxMoveEvent swig_types[81] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[82] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[83] -#define SWIGTYPE_p_wxNotifyEvent swig_types[84] -#define SWIGTYPE_p_wxObject swig_types[85] -#define SWIGTYPE_p_wxOutputStream swig_types[86] -#define SWIGTYPE_p_wxPCXHandler swig_types[87] -#define SWIGTYPE_p_wxPNGHandler swig_types[88] -#define SWIGTYPE_p_wxPNMHandler swig_types[89] -#define SWIGTYPE_p_wxPaintEvent swig_types[90] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[91] -#define SWIGTYPE_p_wxPaperSize swig_types[92] -#define SWIGTYPE_p_wxPoint swig_types[93] -#define SWIGTYPE_p_wxPoint2D swig_types[94] -#define SWIGTYPE_p_wxPropagateOnce swig_types[95] -#define SWIGTYPE_p_wxPropagationDisabler swig_types[96] -#define SWIGTYPE_p_wxPyApp swig_types[97] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[98] -#define SWIGTYPE_p_wxPyDropTarget swig_types[99] -#define SWIGTYPE_p_wxPyEvent swig_types[100] -#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[101] -#define SWIGTYPE_p_wxPyImageHandler swig_types[102] -#define SWIGTYPE_p_wxPyInputStream swig_types[103] -#define SWIGTYPE_p_wxPySizer swig_types[104] -#define SWIGTYPE_p_wxPyValidator swig_types[105] -#define SWIGTYPE_p_wxQuantize swig_types[106] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[107] -#define SWIGTYPE_p_wxRealPoint swig_types[108] -#define SWIGTYPE_p_wxRect swig_types[109] -#define SWIGTYPE_p_wxRegion swig_types[110] -#define SWIGTYPE_p_wxScrollEvent swig_types[111] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[112] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[113] -#define SWIGTYPE_p_wxShowEvent swig_types[114] -#define SWIGTYPE_p_wxSize swig_types[115] -#define SWIGTYPE_p_wxSizeEvent swig_types[116] -#define SWIGTYPE_p_wxSizer swig_types[117] -#define SWIGTYPE_p_wxSizerItem swig_types[118] -#define SWIGTYPE_p_wxStaticBox swig_types[119] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[120] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[121] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[122] -#define SWIGTYPE_p_wxTIFFHandler swig_types[123] -#define SWIGTYPE_p_wxToolTip swig_types[124] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[125] -#define SWIGTYPE_p_wxValidator swig_types[126] -#define SWIGTYPE_p_wxVisualAttributes swig_types[127] -#define SWIGTYPE_p_wxWindow swig_types[128] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[129] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[130] -#define SWIGTYPE_p_wxXPMHandler swig_types[131] -#define SWIGTYPE_p_wxZipFSHandler swig_types[132] -static swig_type_info *swig_types[134]; -static swig_module_info swig_module = {swig_types, 133, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxMaximizeEvent swig_types[70] +#define SWIGTYPE_p_wxMemoryFSHandler swig_types[71] +#define SWIGTYPE_p_wxMenu swig_types[72] +#define SWIGTYPE_p_wxMenuBar swig_types[73] +#define SWIGTYPE_p_wxMenuBarBase swig_types[74] +#define SWIGTYPE_p_wxMenuEvent swig_types[75] +#define SWIGTYPE_p_wxMenuItem swig_types[76] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[77] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[78] +#define SWIGTYPE_p_wxMouseEvent swig_types[79] +#define SWIGTYPE_p_wxMoveEvent swig_types[80] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[81] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[82] +#define SWIGTYPE_p_wxNotifyEvent swig_types[83] +#define SWIGTYPE_p_wxObject swig_types[84] +#define SWIGTYPE_p_wxOutputStream swig_types[85] +#define SWIGTYPE_p_wxPCXHandler swig_types[86] +#define SWIGTYPE_p_wxPNGHandler swig_types[87] +#define SWIGTYPE_p_wxPNMHandler swig_types[88] +#define SWIGTYPE_p_wxPaintEvent swig_types[89] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[90] +#define SWIGTYPE_p_wxPaperSize swig_types[91] +#define SWIGTYPE_p_wxPoint swig_types[92] +#define SWIGTYPE_p_wxPoint2D swig_types[93] +#define SWIGTYPE_p_wxPropagateOnce swig_types[94] +#define SWIGTYPE_p_wxPropagationDisabler swig_types[95] +#define SWIGTYPE_p_wxPyApp swig_types[96] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[97] +#define SWIGTYPE_p_wxPyDropTarget swig_types[98] +#define SWIGTYPE_p_wxPyEvent swig_types[99] +#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[100] +#define SWIGTYPE_p_wxPyImageHandler swig_types[101] +#define SWIGTYPE_p_wxPyInputStream swig_types[102] +#define SWIGTYPE_p_wxPySizer swig_types[103] +#define SWIGTYPE_p_wxPyValidator swig_types[104] +#define SWIGTYPE_p_wxQuantize swig_types[105] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[106] +#define SWIGTYPE_p_wxRealPoint swig_types[107] +#define SWIGTYPE_p_wxRect swig_types[108] +#define SWIGTYPE_p_wxRegion swig_types[109] +#define SWIGTYPE_p_wxScrollEvent swig_types[110] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[111] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[112] +#define SWIGTYPE_p_wxShowEvent swig_types[113] +#define SWIGTYPE_p_wxSize swig_types[114] +#define SWIGTYPE_p_wxSizeEvent swig_types[115] +#define SWIGTYPE_p_wxSizer swig_types[116] +#define SWIGTYPE_p_wxSizerItem swig_types[117] +#define SWIGTYPE_p_wxStaticBox swig_types[118] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[119] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[120] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[121] +#define SWIGTYPE_p_wxTIFFHandler swig_types[122] +#define SWIGTYPE_p_wxToolTip swig_types[123] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[124] +#define SWIGTYPE_p_wxValidator swig_types[125] +#define SWIGTYPE_p_wxVisualAttributes swig_types[126] +#define SWIGTYPE_p_wxWindow swig_types[127] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[128] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[129] +#define SWIGTYPE_p_wxXPMHandler swig_types[130] +#define SWIGTYPE_p_wxZipFSHandler swig_types[131] +static swig_type_info *swig_types[133]; +static swig_module_info swig_module = {swig_types, 132, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -27771,11 +27770,11 @@ SWIGINTERN PyObject *_wrap_PyApp_GetLayoutDirection(PyObject *SWIGUNUSEDPARM(sel arg1 = reinterpret_cast< wxPyApp * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyApp const *)arg1)->GetLayoutDirection(); + result = (wxLayoutDirection)((wxPyApp const *)arg1)->GetLayoutDirection(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxLayoutDirection(static_cast< const wxLayoutDirection& >(result))), SWIGTYPE_p_wxLayoutDirection, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: return NULL; @@ -30720,11 +30719,11 @@ SWIGINTERN PyObject *_wrap_Window_GetLayoutDirection(PyObject *SWIGUNUSEDPARM(se arg1 = reinterpret_cast< wxWindow * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxWindow const *)arg1)->GetLayoutDirection(); + result = (wxLayoutDirection)((wxWindow const *)arg1)->GetLayoutDirection(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((new wxLayoutDirection(static_cast< const wxLayoutDirection& >(result))), SWIGTYPE_p_wxLayoutDirection, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: return NULL; @@ -30737,8 +30736,8 @@ SWIGINTERN PyObject *_wrap_Window_SetLayoutDirection(PyObject *SWIGUNUSEDPARM(se wxLayoutDirection arg2 ; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 ; - int res2 = 0 ; + int val2 ; + int ecode2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char * kwnames[] = { @@ -30751,19 +30750,11 @@ SWIGINTERN PyObject *_wrap_Window_SetLayoutDirection(PyObject *SWIGUNUSEDPARM(se SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_SetLayoutDirection" "', expected argument " "1"" of type '" "wxWindow *""'"); } arg1 = reinterpret_cast< wxWindow * >(argp1); - { - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxLayoutDirection, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Window_SetLayoutDirection" "', expected argument " "2"" of type '" "wxLayoutDirection""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Window_SetLayoutDirection" "', expected argument " "2"" of type '" "wxLayoutDirection""'"); - } else { - wxLayoutDirection * temp = reinterpret_cast< wxLayoutDirection * >(argp2); - arg2 = *temp; - if (SWIG_IsNewObj(res2)) delete temp; - } - } + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Window_SetLayoutDirection" "', expected argument " "2"" of type '" "wxLayoutDirection""'"); + } + arg2 = static_cast< wxLayoutDirection >(val2); { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLayoutDirection(arg2); @@ -55839,7 +55830,6 @@ static swig_type_info _swigt__p_wxItemContainer = {"_p_wxItemContainer", "wxItem static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", "wxJPEGHandler *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxKeyEvent = {"_p_wxKeyEvent", "wxKeyEvent *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxLayoutConstraints = {"_p_wxLayoutConstraints", "wxLayoutConstraints *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_wxLayoutDirection = {"_p_wxLayoutDirection", "wxLayoutDirection *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxMaximizeEvent = {"_p_wxMaximizeEvent", "wxMaximizeEvent *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxMemoryFSHandler = {"_p_wxMemoryFSHandler", "wxMemoryFSHandler *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxMenu = {"_p_wxMenu", "wxMenu *", 0, 0, (void*)0, 0}; @@ -55974,7 +55964,6 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxJPEGHandler, &_swigt__p_wxKeyEvent, &_swigt__p_wxLayoutConstraints, - &_swigt__p_wxLayoutDirection, &_swigt__p_wxMaximizeEvent, &_swigt__p_wxMemoryFSHandler, &_swigt__p_wxMenu, @@ -56109,7 +56098,6 @@ static swig_cast_info _swigc__p_wxItemContainer[] = { {&_swigt__p_wxControlWith static swig_cast_info _swigc__p_wxJPEGHandler[] = { {&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxKeyEvent[] = { {&_swigt__p_wxKeyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxLayoutConstraints[] = { {&_swigt__p_wxLayoutConstraints, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxLayoutDirection[] = { {&_swigt__p_wxLayoutDirection, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMaximizeEvent[] = { {&_swigt__p_wxMaximizeEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMemoryFSHandler[] = { {&_swigt__p_wxMemoryFSHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMenu[] = { {&_swigt__p_wxMenu, 0, 0, 0},{0, 0, 0, 0}}; @@ -56244,7 +56232,6 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxJPEGHandler, _swigc__p_wxKeyEvent, _swigc__p_wxLayoutConstraints, - _swigc__p_wxLayoutDirection, _swigc__p_wxMaximizeEvent, _swigc__p_wxMemoryFSHandler, _swigc__p_wxMenu, @@ -57417,6 +57404,9 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "UPDATE_UI_NONE",SWIG_From_int(static_cast< int >(wxUPDATE_UI_NONE))); SWIG_Python_SetConstant(d, "UPDATE_UI_RECURSE",SWIG_From_int(static_cast< int >(wxUPDATE_UI_RECURSE))); SWIG_Python_SetConstant(d, "UPDATE_UI_FROMIDLE",SWIG_From_int(static_cast< int >(wxUPDATE_UI_FROMIDLE))); + SWIG_Python_SetConstant(d, "Layout_Default",SWIG_From_int(static_cast< int >(wxLayout_Default))); + SWIG_Python_SetConstant(d, "Layout_LeftToRight",SWIG_From_int(static_cast< int >(wxLayout_LeftToRight))); + SWIG_Python_SetConstant(d, "Layout_RightToLeft",SWIG_From_int(static_cast< int >(wxLayout_RightToLeft))); PyDict_SetItemString(d,(char*)"cvar", SWIG_globals()); SWIG_addvarlink(SWIG_globals(),(char*)"EmptyString",EmptyString_get, EmptyString_set); SWIG_Python_SetConstant(d, "BITMAP_TYPE_INVALID",SWIG_From_int(static_cast< int >(wxBITMAP_TYPE_INVALID))); diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py index 7334761ce7..944c292c95 100644 --- a/wxPython/src/msw/_gdi.py +++ b/wxPython/src/msw/_gdi.py @@ -2431,9 +2431,6 @@ def FontEnumerator_IsValidFacename(*args, **kwargs): #--------------------------------------------------------------------------- -Layout_Default = _gdi_.Layout_Default -Layout_LeftToRight = _gdi_.Layout_LeftToRight -Layout_RightToLeft = _gdi_.Layout_RightToLeft LANGUAGE_DEFAULT = _gdi_.LANGUAGE_DEFAULT LANGUAGE_UNKNOWN = _gdi_.LANGUAGE_UNKNOWN LANGUAGE_ABKHAZIAN = _gdi_.LANGUAGE_ABKHAZIAN diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp index dee1295c07..cf404d0e7f 100644 --- a/wxPython/src/msw/_gdi_wrap.cpp +++ b/wxPython/src/msw/_gdi_wrap.cpp @@ -34529,9 +34529,6 @@ SWIGEXPORT void SWIG_init(void) { wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator"); - SWIG_Python_SetConstant(d, "Layout_Default",SWIG_From_int(static_cast< int >(wxLayout_Default))); - SWIG_Python_SetConstant(d, "Layout_LeftToRight",SWIG_From_int(static_cast< int >(wxLayout_LeftToRight))); - SWIG_Python_SetConstant(d, "Layout_RightToLeft",SWIG_From_int(static_cast< int >(wxLayout_RightToLeft))); SWIG_Python_SetConstant(d, "LANGUAGE_DEFAULT",SWIG_From_int(static_cast< int >(wxLANGUAGE_DEFAULT))); SWIG_Python_SetConstant(d, "LANGUAGE_UNKNOWN",SWIG_From_int(static_cast< int >(wxLANGUAGE_UNKNOWN))); SWIG_Python_SetConstant(d, "LANGUAGE_ABKHAZIAN",SWIG_From_int(static_cast< int >(wxLANGUAGE_ABKHAZIAN))); diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py index a978b3cd4c..c2e981778b 100644 --- a/wxPython/src/msw/_misc.py +++ b/wxPython/src/msw/_misc.py @@ -791,6 +791,8 @@ class ToolTip(_core.Object): return _misc_.ToolTip_SetDelay(*args, **kwargs) SetDelay = staticmethod(SetDelay) + Tip = property(GetTip,SetTip,doc="See `GetTip` and `SetTip`") + Window = property(GetWindow,doc="See `GetWindow`") _misc_.ToolTip_swigregister(ToolTip) def ToolTip_Enable(*args, **kwargs): @@ -1227,6 +1229,8 @@ class TipProvider(object): """PreprocessTip(self, String tip) -> String""" return _misc_.TipProvider_PreprocessTip(*args, **kwargs) + CurrentTip = property(GetCurrentTip,doc="See `GetCurrentTip`") + Tip = property(GetTip,doc="See `GetTip`") _misc_.TipProvider_swigregister(TipProvider) class PyTipProvider(TipProvider): @@ -1312,6 +1316,9 @@ class Timer(_core.EvtHandler): """NO-OP: Timers must be destroyed by normal reference counting""" pass + Id = property(GetId,doc="See `GetId`") + Interval = property(GetInterval,doc="See `GetInterval`") + Owner = property(GetOwner,SetOwner,doc="See `GetOwner` and `SetOwner`") _misc_.Timer_swigregister(Timer) # For backwards compatibility with 2.4 @@ -1339,6 +1346,7 @@ class TimerEvent(_core.Event): """GetInterval(self) -> int""" return _misc_.TimerEvent_GetInterval(*args, **kwargs) + Interval = property(GetInterval,doc="See `GetInterval`") _misc_.TimerEvent_swigregister(TimerEvent) class TimerRunner(object): @@ -4325,6 +4333,12 @@ class TimeSpan(object): def __str__(self): return self.Format().encode(wx.GetDefaultPyEncoding()) + Days = property(GetDays,doc="See `GetDays`") + Hours = property(GetHours,doc="See `GetHours`") + Milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") + Minutes = property(GetMinutes,doc="See `GetMinutes`") + Seconds = property(GetSeconds,doc="See `GetSeconds`") + Weeks = property(GetWeeks,doc="See `GetWeeks`") _misc_.TimeSpan_swigregister(TimeSpan) def TimeSpan_Milliseconds(*args, **kwargs): @@ -4982,6 +4996,8 @@ class TextDataObject(DataObjectSimple): """ return _misc_.TextDataObject_SetText(*args, **kwargs) + Text = property(GetText,SetText,doc="See `GetText` and `SetText`") + TextLength = property(GetTextLength,doc="See `GetTextLength`") _misc_.TextDataObject_swigregister(TextDataObject) class PyTextDataObject(TextDataObject): diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index 34b7fadab0..016d08db16 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -471,6 +471,10 @@ class TopLevelWindow(_core.Window): """ return _windows_.TopLevelWindow_GetTmpDefaultItem(*args, **kwargs) + DefaultItem = property(GetDefaultItem,SetDefaultItem,doc="See `GetDefaultItem` and `SetDefaultItem`") + Icon = property(GetIcon,SetIcon,doc="See `GetIcon` and `SetIcon`") + Title = property(GetTitle,SetTitle,doc="See `GetTitle` and `SetTitle`") + TmpDefaultItem = property(GetTmpDefaultItem,SetTmpDefaultItem,doc="See `GetTmpDefaultItem` and `SetTmpDefaultItem`") _windows_.TopLevelWindow_swigregister(TopLevelWindow) cvar = _windows_.cvar FrameNameStr = cvar.FrameNameStr @@ -2606,6 +2610,7 @@ class TextEntryDialog(Dialog): """ return _windows_.TextEntryDialog_SetValue(*args, **kwargs) + Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") _windows_.TextEntryDialog_swigregister(TextEntryDialog) class PasswordEntryDialog(TextEntryDialog): -- 2.45.2