X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d82d64ea6cd726f35454b87312a1982757fe3cd..3eddc6bc00bcbdea23d52a8724f46ad56768f8b6:/wxPython/src/msw/_core.py diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 48633bb5be..888d6af8da 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -116,8 +116,6 @@ LB_MULTIPLE = _core_.LB_MULTIPLE LB_EXTENDED = _core_.LB_EXTENDED LB_OWNERDRAW = _core_.LB_OWNERDRAW LB_HSCROLL = _core_.LB_HSCROLL -PROCESS_ENTER = _core_.PROCESS_ENTER -PASSWORD = _core_.PASSWORD CB_SIMPLE = _core_.CB_SIMPLE CB_DROPDOWN = _core_.CB_DROPDOWN CB_SORT = _core_.CB_SORT @@ -133,9 +131,6 @@ SB_HORIZONTAL = _core_.SB_HORIZONTAL SB_VERTICAL = _core_.SB_VERTICAL RB_USE_CHECKBOX = _core_.RB_USE_CHECKBOX ST_SIZEGRIP = _core_.ST_SIZEGRIP -ST_NO_AUTORESIZE = _core_.ST_NO_AUTORESIZE -ST_DOTS_MIDDLE = _core_.ST_DOTS_MIDDLE -ST_DOTS_END = _core_.ST_DOTS_END FLOOD_SURFACE = _core_.FLOOD_SURFACE FLOOD_BORDER = _core_.FLOOD_BORDER ODDEVEN_RULE = _core_.ODDEVEN_RULE @@ -334,7 +329,7 @@ EXPAND = _core_.EXPAND SHAPED = _core_.SHAPED FIXED_MINSIZE = _core_.FIXED_MINSIZE TILE = _core_.TILE -ADJUST_MINSIZE = _core_.ADJUST_MINSIZE +ADJUST_MINSIZE = 0 BORDER_DEFAULT = _core_.BORDER_DEFAULT BORDER_NONE = _core_.BORDER_NONE BORDER_STATIC = _core_.BORDER_STATIC @@ -416,8 +411,6 @@ WXK_CONTROL = _core_.WXK_CONTROL WXK_MENU = _core_.WXK_MENU WXK_PAUSE = _core_.WXK_PAUSE WXK_CAPITAL = _core_.WXK_CAPITAL -WXK_PRIOR = _core_.WXK_PRIOR -WXK_NEXT = _core_.WXK_NEXT WXK_END = _core_.WXK_END WXK_HOME = _core_.WXK_HOME WXK_LEFT = _core_.WXK_LEFT @@ -486,9 +479,7 @@ WXK_NUMPAD_LEFT = _core_.WXK_NUMPAD_LEFT WXK_NUMPAD_UP = _core_.WXK_NUMPAD_UP WXK_NUMPAD_RIGHT = _core_.WXK_NUMPAD_RIGHT WXK_NUMPAD_DOWN = _core_.WXK_NUMPAD_DOWN -WXK_NUMPAD_PRIOR = _core_.WXK_NUMPAD_PRIOR WXK_NUMPAD_PAGEUP = _core_.WXK_NUMPAD_PAGEUP -WXK_NUMPAD_NEXT = _core_.WXK_NUMPAD_NEXT WXK_NUMPAD_PAGEDOWN = _core_.WXK_NUMPAD_PAGEDOWN WXK_NUMPAD_END = _core_.WXK_NUMPAD_END WXK_NUMPAD_BEGIN = _core_.WXK_NUMPAD_BEGIN @@ -525,6 +516,11 @@ WXK_SPECIAL17 = _core_.WXK_SPECIAL17 WXK_SPECIAL18 = _core_.WXK_SPECIAL18 WXK_SPECIAL19 = _core_.WXK_SPECIAL19 WXK_SPECIAL20 = _core_.WXK_SPECIAL20 +WXK_PRIOR = WXK_PAGEUP +WXK_NEXT = WXK_PAGEDOWN +WXK_NUMPAD_PRIOR = WXK_NUMPAD_PAGEUP +WXK_NUMPAD_NEXT = WXK_NUMPAD_PAGEDOWN + PAPER_NONE = _core_.PAPER_NONE PAPER_LETTER = _core_.PAPER_LETTER PAPER_LEGAL = _core_.PAPER_LEGAL @@ -1912,6 +1908,73 @@ class Rect2D(object): _core_.Rect2D_swigregister(Rect2D) +class Position(object): + """Proxy of C++ Position class""" + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """__init__(self, int row=0, int col=0) -> Position""" + _core_.Position_swiginit(self,_core_.new_Position(*args, **kwargs)) + __swig_destroy__ = _core_.delete_Position + __del__ = lambda self : None; + def GetRow(*args, **kwargs): + """GetRow(self) -> int""" + return _core_.Position_GetRow(*args, **kwargs) + + def GetColumn(*args, **kwargs): + """GetColumn(self) -> int""" + return _core_.Position_GetColumn(*args, **kwargs) + + def GetCol(*args, **kwargs): + """GetCol(self) -> int""" + return _core_.Position_GetCol(*args, **kwargs) + + def SetRow(*args, **kwargs): + """SetRow(self, int row)""" + return _core_.Position_SetRow(*args, **kwargs) + + def SetColumn(*args, **kwargs): + """SetColumn(self, int column)""" + return _core_.Position_SetColumn(*args, **kwargs) + + def SetCol(*args, **kwargs): + """SetCol(self, int column)""" + return _core_.Position_SetCol(*args, **kwargs) + + def __eq__(*args, **kwargs): + """ + __eq__(self, PyObject other) -> bool + + Test for equality of wx.Position objects. + """ + return _core_.Position___eq__(*args, **kwargs) + + def __ne__(*args, **kwargs): + """ + __ne__(self, PyObject other) -> bool + + Test for inequality of wx.Position objects. + """ + return _core_.Position___ne__(*args, **kwargs) + + def __add__(*args): + """ + __add__(self, Position p) -> Position + __add__(self, Size s) -> Position + """ + return _core_.Position___add__(*args) + + def __sub__(*args): + """ + __sub__(self, Position p) -> Position + __sub__(self, Size s) -> Position + """ + return _core_.Position___sub__(*args) + + row = property(GetRow,SetRow) + col = property(GetCol,SetCol) +_core_.Position_swigregister(Position) + #--------------------------------------------------------------------------- FromStart = _core_.FromStart @@ -2070,7 +2133,7 @@ class FileSystemHandler(CPPFileSystemHandler): def __init__(self, *args, **kwargs): """__init__(self) -> FileSystemHandler""" _core_.FileSystemHandler_swiginit(self,_core_.new_FileSystemHandler(*args, **kwargs)) - self._setCallbackInfo(self, FileSystemHandler) + FileSystemHandler._setCallbackInfo(self, self, FileSystemHandler) def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)""" @@ -3758,18 +3821,6 @@ class EvtHandler(Object): """ProcessPendingEvents(self)""" return _core_.EvtHandler_ProcessPendingEvents(*args, **kwargs) - def AllowReentrance(*args, **kwargs): - """AllowReentrance(self, bool allow=True)""" - return _core_.EvtHandler_AllowReentrance(*args, **kwargs) - - def IsReentranceAllowed(*args, **kwargs): - """IsReentranceAllowed(self) -> bool""" - return _core_.EvtHandler_IsReentranceAllowed(*args, **kwargs) - - def IsEventHandlingInProgress(*args, **kwargs): - """IsEventHandlingInProgress(self) -> bool""" - return _core_.EvtHandler_IsEventHandlingInProgress(*args, **kwargs) - def Connect(*args, **kwargs): """Connect(self, int id, int lastId, int eventType, PyObject func)""" return _core_.EvtHandler_Connect(*args, **kwargs) @@ -3781,7 +3832,7 @@ class EvtHandler(Object): def _setOORInfo(*args, **kwargs): """_setOORInfo(self, PyObject _self, bool incref=True)""" val = _core_.EvtHandler__setOORInfo(*args, **kwargs) - args[0].thisown = 0 + args[0].this.own(False) return val def Bind(self, event, handler, source=None, id=wx.ID_ANY, id2=wx.ID_ANY): @@ -3859,6 +3910,15 @@ class PyEventBinder(object): success += target.Disconnect(id1, id2, et) return success != 0 + def _getEvtType(self): + """ + Make it easy to get to the default wxEventType typeID for this + event binder. + """ + return self.evtType[0] + + typeId = property(_getEvtType) + def __call__(self, *args): """ @@ -3903,6 +3963,7 @@ EVENT_PROPAGATE_MAX = _core_.EVENT_PROPAGATE_MAX def NewEventType(*args): """NewEventType() -> EventType""" return _core_.NewEventType(*args) +wxEVT_ANY = _core_.wxEVT_ANY wxEVT_NULL = _core_.wxEVT_NULL wxEVT_FIRST = _core_.wxEVT_FIRST wxEVT_USER_FIRST = _core_.wxEVT_USER_FIRST @@ -4583,7 +4644,7 @@ class ScrollEvent(CommandEvent): """ A scroll event holds information about events sent from stand-alone scrollbars and sliders. Note that scrolled windows do not send - instnaces of this event class, but send the `wx.ScrollWinEvent` + instances of this event class, but send the `wx.ScrollWinEvent` instead. """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -5054,6 +5115,16 @@ class MouseEvent(Event): """ return _core_.MouseEvent_GetWheelDelta(*args, **kwargs) + def GetWheelAxis(*args, **kwargs): + """ + GetWheelAxis(self) -> int + + Gets the axis the wheel operation concerns, 0 being the y axis as on + most mouse wheels, 1 is the x axis for things like MightyMouse scrolls + or horizontal trackpad scrolling. + """ + return _core_.MouseEvent_GetWheelAxis(*args, **kwargs) + def GetLinesPerAction(*args, **kwargs): """ GetLinesPerAction(self) -> int @@ -6997,6 +7068,25 @@ _core_.DateEvent_swigregister(DateEvent) wxEVT_DATE_CHANGED = _core_.wxEVT_DATE_CHANGED EVT_DATE_CHANGED = wx.PyEventBinder( wxEVT_DATE_CHANGED, 1 ) +class EventBlocker(EvtHandler): + """Helper class to temporarily disable event handling for a window.""" + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self, Window win, EventType type=wxEVT_ANY) -> EventBlocker + + Helper class to temporarily disable event handling for a window. + """ + _core_.EventBlocker_swiginit(self,_core_.new_EventBlocker(*args, **kwargs)) + __swig_destroy__ = _core_.delete_EventBlocker + __del__ = lambda self : None; + def Block(*args, **kwargs): + """Block(self, EventType type)""" + return _core_.EventBlocker_Block(*args, **kwargs) + +_core_.EventBlocker_swigregister(EventBlocker) + #--------------------------------------------------------------------------- PYAPP_ASSERT_SUPPRESS = _core_.PYAPP_ASSERT_SUPPRESS @@ -7019,13 +7109,12 @@ class PyApp(EvtHandler): Create a new application object, starting the bootstrap process. """ _core_.PyApp_swiginit(self,_core_.new_PyApp(*args, **kwargs)) - self._setCallbackInfo(self, PyApp, False) - self._setOORInfo(self, False) + self._setOORInfo(self, False);PyApp._setCallbackInfo(self, self, PyApp) __swig_destroy__ = _core_.delete_PyApp __del__ = lambda self : None; def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(self, PyObject self, PyObject _class, bool incref)""" + """_setCallbackInfo(self, PyObject self, PyObject _class, bool incref=False)""" return _core_.PyApp__setCallbackInfo(*args, **kwargs) def GetAppName(*args, **kwargs): @@ -7260,7 +7349,7 @@ class PyApp(EvtHandler): def SetUseBestVisual(*args, **kwargs): """ - SetUseBestVisual(self, bool flag) + SetUseBestVisual(self, bool flag, bool forceTrueColour=False) Set whether the app should try to use the best available visual on systems where more than one is available, (Sun, SGI, XFree86 4, etc.) @@ -7753,6 +7842,9 @@ in on the main display of your Mac.""" # Use Python's install prefix as the default wx.StandardPaths.Get().SetInstallPrefix(_sys.prefix) + # Until the new native control for wxMac is up to par, still use the generic one. + wx.SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1) + # This finishes the initialization of wxWindows and then calls # the OnInit that should be present in the derived class self._BootstrapApp() @@ -8095,10 +8187,11 @@ class AcceleratorTable(Object): Ok = IsOk _core_.AcceleratorTable_swigregister(AcceleratorTable) +def GetAccelFromString(label): + entry = AcceleratorEntry() + entry.FromString(label) + return entry -def GetAccelFromString(*args, **kwargs): - """GetAccelFromString(String label) -> AcceleratorEntry""" - return _core_.GetAccelFromString(*args, **kwargs) #--------------------------------------------------------------------------- class VisualAttributes(object): @@ -8114,9 +8207,21 @@ class VisualAttributes(object): _core_.VisualAttributes_swiginit(self,_core_.new_VisualAttributes(*args, **kwargs)) __swig_destroy__ = _core_.delete_VisualAttributes __del__ = lambda self : None; - font = property(_core_.VisualAttributes_font_get, _core_.VisualAttributes_font_set) - colFg = property(_core_.VisualAttributes_colFg_get, _core_.VisualAttributes_colFg_set) - colBg = property(_core_.VisualAttributes_colBg_get, _core_.VisualAttributes_colBg_set) + def _get_font(*args, **kwargs): + """_get_font(self) -> Font""" + return _core_.VisualAttributes__get_font(*args, **kwargs) + + def _get_colFg(*args, **kwargs): + """_get_colFg(self) -> Colour""" + return _core_.VisualAttributes__get_colFg(*args, **kwargs) + + def _get_colBg(*args, **kwargs): + """_get_colBg(self) -> Colour""" + return _core_.VisualAttributes__get_colBg(*args, **kwargs) + + font = property(_get_font) + colFg = property(_get_colFg) + colBg = property(_get_colBg) _core_.VisualAttributes_swigregister(VisualAttributes) NullAcceleratorTable = cvar.NullAcceleratorTable PanelNameStr = cvar.PanelNameStr @@ -8406,7 +8511,7 @@ class Window(EvtHandler): Raise(self) Raises the window to the top of the window hierarchy. In current - version of wxWidgets this works both for manage and child windows. + version of wxWidgets this works both for managed and child windows. """ return _core_.Window_Raise(*args, **kwargs) @@ -8415,7 +8520,7 @@ class Window(EvtHandler): Lower(self) Lowers the window to the bottom of the window hierarchy. In current - version of wxWidgets this works both for manage and child windows. + version of wxWidgets this works both for managed and child windows. """ return _core_.Window_Lower(*args, **kwargs) @@ -8810,6 +8915,14 @@ class Window(EvtHandler): """ return _core_.Window_GetVirtualSizeTuple(*args, **kwargs) + def GetWindowBorderSize(*args, **kwargs): + """ + GetWindowBorderSize(self) -> Size + + Return the size of the left/right and top/bottom borders. + """ + return _core_.Window_GetWindowBorderSize(*args, **kwargs) + def GetBestVirtualSize(*args, **kwargs): """ GetBestVirtualSize(self) -> Size @@ -8872,9 +8985,21 @@ class Window(EvtHandler): IsEnabled(self) -> bool Returns true if the window is enabled for input, false otherwise. + This method takes into account the enabled state of parent windows up + to the top-level window. """ return _core_.Window_IsEnabled(*args, **kwargs) + def IsThisEnabled(*args, **kwargs): + """ + IsThisEnabled(self) -> bool + + Returns the internal enabled state independent of the parent(s) state, + i.e. the state in which the window would be if all of its parents are + enabled. Use `IsEnabled` to get the effective window state. + """ + return _core_.Window_IsThisEnabled(*args, **kwargs) + def IsShownOnScreen(*args, **kwargs): """ IsShownOnScreen(self) -> bool @@ -8923,6 +9048,15 @@ class Window(EvtHandler): """ return _core_.Window_IsRetained(*args, **kwargs) + def ToggleWindowStyle(*args, **kwargs): + """ + ToggleWindowStyle(self, int flag) -> bool + + Turn the flag on if it had been turned off before and vice versa, + returns True if the flag is turned on by this function call. + """ + return _core_.Window_ToggleWindowStyle(*args, **kwargs) + def SetExtraStyle(*args, **kwargs): """ SetExtraStyle(self, long exStyle) @@ -9010,6 +9144,14 @@ class Window(EvtHandler): """ return _core_.Window_AcceptsFocus(*args, **kwargs) + def CanAcceptFocus(*args, **kwargs): + """ + CanAcceptFocus(self) -> bool + + Can this window have focus right now? + """ + return _core_.Window_CanAcceptFocus(*args, **kwargs) + def AcceptsFocusFromKeyboard(*args, **kwargs): """ AcceptsFocusFromKeyboard(self) -> bool @@ -9020,12 +9162,32 @@ class Window(EvtHandler): """ return _core_.Window_AcceptsFocusFromKeyboard(*args, **kwargs) + def CanAcceptFocusFromKeyboard(*args, **kwargs): + """ + CanAcceptFocusFromKeyboard(self) -> bool + + Can this window be assigned focus from keyboard right now? + """ + return _core_.Window_CanAcceptFocusFromKeyboard(*args, **kwargs) + + def SetCanFocus(*args, **kwargs): + """SetCanFocus(self, bool canFocus)""" + return _core_.Window_SetCanFocus(*args, **kwargs) + + def NavigateIn(*args, **kwargs): + """ + NavigateIn(self, int flags=NavigationKeyEvent.IsForward) -> bool + + Navigates inside this window. + """ + return _core_.Window_NavigateIn(*args, **kwargs) + def Navigate(*args, **kwargs): """ Navigate(self, int flags=NavigationKeyEvent.IsForward) -> bool - Does keyboard navigation from this window to another, by sending a - `wx.NavigationKeyEvent`. + Does keyboard navigation starting from this window to another. This is + equivalient to self.GetParent().NavigateIn(). """ return _core_.Window_Navigate(*args, **kwargs) @@ -9081,6 +9243,14 @@ class Window(EvtHandler): """ return _core_.Window_GetGrandParent(*args, **kwargs) + def GetTopLevelParent(*args, **kwargs): + """ + GetTopLevelParent(self) -> Window + + Returns the first frame or dialog in this window's parental hierarchy. + """ + return _core_.Window_GetTopLevelParent(*args, **kwargs) + def IsTopLevel(*args, **kwargs): """ IsTopLevel(self) -> bool @@ -10343,15 +10513,20 @@ class Window(EvtHandler): self.thisown = pre.thisown pre.thisown = 0 if hasattr(self, '_setOORInfo'): - self._setOORInfo(self) + try: + self._setOORInfo(self) + except TypeError: + pass if hasattr(self, '_setCallbackInfo'): - self._setCallbackInfo(self, self.__class__) + try: + self._setCallbackInfo(self, pre.__class__) + except TypeError: + pass def SendSizeEvent(self): self.GetEventHandler().ProcessEvent(wx.SizeEvent((-1,-1))) AcceleratorTable = property(GetAcceleratorTable,SetAcceleratorTable,doc="See `GetAcceleratorTable` and `SetAcceleratorTable`") - AdjustedBestSize = property(GetAdjustedBestSize,doc="See `GetAdjustedBestSize`") AutoLayout = property(GetAutoLayout,SetAutoLayout,doc="See `GetAutoLayout` and `SetAutoLayout`") BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") BackgroundStyle = property(GetBackgroundStyle,SetBackgroundStyle,doc="See `GetBackgroundStyle` and `SetBackgroundStyle`") @@ -10376,6 +10551,7 @@ class Window(EvtHandler): Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") ForegroundColour = property(GetForegroundColour,SetForegroundColour,doc="See `GetForegroundColour` and `SetForegroundColour`") GrandParent = property(GetGrandParent,doc="See `GetGrandParent`") + TopLevelParent = property(GetTopLevelParent,doc="See `GetTopLevelParent`") Handle = property(GetHandle,doc="See `GetHandle`") HelpText = property(GetHelpText,SetHelpText,doc="See `GetHelpText` and `SetHelpText`") Id = property(GetId,SetId,doc="See `GetId` and `SetId`") @@ -10614,12 +10790,10 @@ class PyValidator(Validator): def __init__(self, *args, **kwargs): """__init__(self) -> PyValidator""" _core_.PyValidator_swiginit(self,_core_.new_PyValidator(*args, **kwargs)) - - self._setCallbackInfo(self, PyValidator, 1) - self._setOORInfo(self) + self._setOORInfo(self);PyValidator._setCallbackInfo(self, self, PyValidator) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=True)""" + """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=1)""" return _core_.PyValidator__setCallbackInfo(*args, **kwargs) _core_.PyValidator_swigregister(PyValidator) @@ -10728,9 +10902,15 @@ class Menu(EvtHandler): """Remove(self, int id) -> MenuItem""" return _core_.Menu_Remove(*args, **kwargs) - def RemoveItem(*args, **kwargs): + def RemoveItem(self, item): """RemoveItem(self, MenuItem item) -> MenuItem""" - return _core_.Menu_RemoveItem(*args, **kwargs) + #// The return object is always the parameter, so return that + #// proxy instead of the new one + val = _core_.Menu_RemoveItem(self, item) + item.this.own(val.this.own()) + val.this.disown() + return item + def Delete(*args, **kwargs): """Delete(self, int id) -> bool""" @@ -11015,7 +11195,6 @@ class MenuBar(Window): self.Append(m, l) Frame = property(GetFrame,doc="See `GetFrame`") - Menu = property(GetMenu,doc="See `GetMenu`") MenuCount = property(GetMenuCount,doc="See `GetMenuCount`") Menus = property(GetMenus,SetMenus,doc="See `GetMenus` and `SetMenus`") _core_.MenuBar_swigregister(MenuBar) @@ -11036,13 +11215,14 @@ class MenuItem(Object): __repr__ = _swig_repr def __init__(self, *args, **kwargs): """ - __init__(self, Menu parentMenu=None, int id=ID_ANY, String text=EmptyString, + __init__(self, Menu parentMenu=None, int id=ID_SEPARATOR, String text=EmptyString, String help=EmptyString, int kind=ITEM_NORMAL, Menu subMenu=None) -> MenuItem """ _core_.MenuItem_swiginit(self,_core_.new_MenuItem(*args, **kwargs)) __swig_destroy__ = _core_.delete_MenuItem __del__ = lambda self : None; + def Destroy(self): pass def GetMenu(*args, **kwargs): """GetMenu(self) -> Menu""" return _core_.MenuItem_GetMenu(*args, **kwargs) @@ -11297,6 +11477,15 @@ class Control(Window): """ return _core_.Control_Command(*args, **kwargs) + def RemoveMnemonics(*args, **kwargs): + """ + RemoveMnemonics(String str) -> String + + removes the mnemonics characters + """ + return _core_.Control_RemoveMnemonics(*args, **kwargs) + + RemoveMnemonics = staticmethod(RemoveMnemonics) def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -11329,6 +11518,14 @@ def PreControl(*args, **kwargs): val = _core_.new_PreControl(*args, **kwargs) return val +def Control_RemoveMnemonics(*args, **kwargs): + """ + Control_RemoveMnemonics(String str) -> String + + removes the mnemonics characters + """ + return _core_.Control_RemoveMnemonics(*args, **kwargs) + def Control_GetClassDefaultAttributes(*args, **kwargs): """ Control_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -11390,7 +11587,7 @@ class ItemContainer(object): def Insert(*args, **kwargs): """ - Insert(self, String item, unsigned int pos, PyObject clientData=None) -> int + Insert(self, String item, int pos, PyObject clientData=None) -> int Insert an item into the control before the item at the ``pos`` index, optionally associating some data object with the item. @@ -11407,7 +11604,7 @@ class ItemContainer(object): def Delete(*args, **kwargs): """ - Delete(self, unsigned int n) + Delete(self, int n) Deletes the item at the zero-based index 'n' from the control. Note that it is an error (signalled by a `wx.PyAssertionError` exception if @@ -11418,7 +11615,7 @@ class ItemContainer(object): def GetClientData(*args, **kwargs): """ - GetClientData(self, unsigned int n) -> PyObject + GetClientData(self, int n) -> PyObject Returns the client data associated with the given item, (if any.) """ @@ -11426,7 +11623,7 @@ class ItemContainer(object): def SetClientData(*args, **kwargs): """ - SetClientData(self, unsigned int n, PyObject clientData) + SetClientData(self, int n, PyObject clientData) Associate the given client data with the item at position n. """ @@ -11434,7 +11631,7 @@ class ItemContainer(object): def GetCount(*args, **kwargs): """ - GetCount(self) -> unsigned int + GetCount(self) -> int Returns the number of items in the control. """ @@ -11450,7 +11647,7 @@ class ItemContainer(object): def GetString(*args, **kwargs): """ - GetString(self, unsigned int n) -> String + GetString(self, int n) -> String Returns the label of the item with the given index. """ @@ -11462,7 +11659,7 @@ class ItemContainer(object): def SetString(*args, **kwargs): """ - SetString(self, unsigned int n, String s) + SetString(self, int n, String s) Sets the label for the given item. """ @@ -11549,6 +11746,222 @@ _core_.ControlWithItems_swigregister(ControlWithItems) #--------------------------------------------------------------------------- +class SizerFlags(object): + """ + Normally, when you add an item to a sizer via `wx.Sizer.Add`, you have + to specify a lot of flags and parameters which can be unwieldy. This + is where wx.SizerFlags comes in: it allows you to specify all + parameters using the named methods instead. For example, instead of:: + + sizer.Add(ctrl, 0, wx.EXPAND | wx.ALL, 10) + + you can now write:: + + sizer.AddF(ctrl, wx.SizerFlags().Expand().Border(wx.ALL, 10)) + + This is more readable and also allows you to create wx.SizerFlags + objects which can be reused for several sizer items.:: + + flagsExpand = wx.SizerFlags(1) + flagsExpand.Expand().Border(wx.ALL, 10) + sizer.AddF(ctrl1, flagsExpand) + sizer.AddF(ctrl2, flagsExpand) + + Note that by specification, all methods of wx.SizerFlags return the + wx.SizerFlags object itself allowing chaining multiple method calls + like in the examples above. + """ + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self, int proportion=0) -> SizerFlags + + Constructs the flags object with the specified proportion. + """ + _core_.SizerFlags_swiginit(self,_core_.new_SizerFlags(*args, **kwargs)) + __swig_destroy__ = _core_.delete_SizerFlags + __del__ = lambda self : None; + def Proportion(*args, **kwargs): + """ + Proportion(self, int proportion) -> SizerFlags + + Sets the item's proportion value. + """ + return _core_.SizerFlags_Proportion(*args, **kwargs) + + def Align(*args, **kwargs): + """ + Align(self, int alignment) -> SizerFlags + + Sets the item's alignment + """ + return _core_.SizerFlags_Align(*args, **kwargs) + + def Expand(*args, **kwargs): + """ + Expand(self) -> SizerFlags + + Sets the wx.EXPAND flag, which will cause the item to be expanded to + fill as much space as it is given by the sizer. + """ + return _core_.SizerFlags_Expand(*args, **kwargs) + + def Centre(*args, **kwargs): + """ + Centre(self) -> SizerFlags + + Same as `Center` for those with an alternate dialect of English. + """ + return _core_.SizerFlags_Centre(*args, **kwargs) + + def Center(*args, **kwargs): + """ + Center(self) -> SizerFlags + + Sets the centering alignment flags. + """ + return _core_.SizerFlags_Center(*args, **kwargs) + + def Left(*args, **kwargs): + """ + Left(self) -> SizerFlags + + Aligns the object to the left, a shortcut for calling + Align(wx.ALIGN_LEFT) + """ + return _core_.SizerFlags_Left(*args, **kwargs) + + def Right(*args, **kwargs): + """ + Right(self) -> SizerFlags + + Aligns the object to the right, a shortcut for calling + Align(wx.ALIGN_RIGHT) + """ + return _core_.SizerFlags_Right(*args, **kwargs) + + def Top(*args, **kwargs): + """ + Top(self) -> SizerFlags + + Aligns the object to the top of the available space, a shortcut for + calling Align(wx.ALIGN_TOP) + """ + return _core_.SizerFlags_Top(*args, **kwargs) + + def Bottom(*args, **kwargs): + """ + Bottom(self) -> SizerFlags + + Aligns the object to the bottom of the available space, a shortcut for + calling Align(wx.ALIGN_BOTTOM) + """ + return _core_.SizerFlags_Bottom(*args, **kwargs) + + def Shaped(*args, **kwargs): + """ + Shaped(self) -> SizerFlags + + Sets the wx.SHAPED flag. + """ + return _core_.SizerFlags_Shaped(*args, **kwargs) + + def FixedMinSize(*args, **kwargs): + """ + FixedMinSize(self) -> SizerFlags + + Sets the wx.FIXED_MINSIZE flag. + """ + return _core_.SizerFlags_FixedMinSize(*args, **kwargs) + + def Border(*args, **kwargs): + """ + Border(self, int direction=ALL, int borderInPixels=-1) -> SizerFlags + + Sets the border of the item in the direction(s) or sides given by the + direction parameter. If the borderInPixels value is not given then + the default border size (see `GetDefaultBorder`) will be used. + """ + return _core_.SizerFlags_Border(*args, **kwargs) + + def DoubleBorder(*args, **kwargs): + """ + DoubleBorder(self, int direction=ALL) -> SizerFlags + + Sets the border in the given direction to twice the default border + size. + """ + return _core_.SizerFlags_DoubleBorder(*args, **kwargs) + + def TripleBorder(*args, **kwargs): + """ + TripleBorder(self, int direction=ALL) -> SizerFlags + + Sets the border in the given direction to three times the default + border size. + """ + return _core_.SizerFlags_TripleBorder(*args, **kwargs) + + def HorzBorder(*args, **kwargs): + """ + HorzBorder(self) -> SizerFlags + + Sets the left and right borders to the default border size. + """ + return _core_.SizerFlags_HorzBorder(*args, **kwargs) + + def DoubleHorzBorder(*args, **kwargs): + """ + DoubleHorzBorder(self) -> SizerFlags + + Sets the left and right borders to twice the default border size. + """ + return _core_.SizerFlags_DoubleHorzBorder(*args, **kwargs) + + def GetDefaultBorder(*args, **kwargs): + """ + GetDefaultBorder() -> int + + Returns the default border size used by the other border methods + """ + return _core_.SizerFlags_GetDefaultBorder(*args, **kwargs) + + GetDefaultBorder = staticmethod(GetDefaultBorder) + def GetProportion(*args, **kwargs): + """ + GetProportion(self) -> int + + Returns the proportion value to be used in the sizer item. + """ + return _core_.SizerFlags_GetProportion(*args, **kwargs) + + def GetFlags(*args, **kwargs): + """ + GetFlags(self) -> int + + Returns the flags value to be used in the sizer item. + """ + return _core_.SizerFlags_GetFlags(*args, **kwargs) + + def GetBorderInPixels(*args, **kwargs): + """ + GetBorderInPixels(self) -> int + + Returns the border value in pixels to be used in the sizer item. + """ + return _core_.SizerFlags_GetBorderInPixels(*args, **kwargs) + +_core_.SizerFlags_swigregister(SizerFlags) + +def SizerFlags_GetDefaultBorder(*args): + """ + SizerFlags_GetDefaultBorder() -> int + + Returns the default border size used by the other border methods + """ + return _core_.SizerFlags_GetDefaultBorder(*args) + class SizerItem(Object): """ The wx.SizerItem class is used to track the position, size and other @@ -11768,14 +12181,6 @@ class SizerItem(Object): """ return _core_.SizerItem_GetWindow(*args, **kwargs) - def SetWindow(*args, **kwargs): - """ - SetWindow(self, Window window) - - Set the window to be managed by this sizer item. - """ - return _core_.SizerItem_SetWindow(*args, **kwargs) - def GetSizer(*args, **kwargs): """ GetSizer(self) -> Sizer @@ -11784,6 +12189,22 @@ class SizerItem(Object): """ return _core_.SizerItem_GetSizer(*args, **kwargs) + def GetSpacer(*args, **kwargs): + """ + GetSpacer(self) -> Size + + Get the size of the spacer managed by this sizer item. + """ + return _core_.SizerItem_GetSpacer(*args, **kwargs) + + def SetWindow(*args, **kwargs): + """ + SetWindow(self, Window window) + + Set the window to be managed by this sizer item. + """ + return _core_.SizerItem_SetWindow(*args, **kwargs) + def SetSizer(*args, **kwargs): """ SetSizer(self, Sizer sizer) @@ -11792,21 +12213,41 @@ class SizerItem(Object): """ return _core_.SizerItem_SetSizer(*args, **kwargs) - def GetSpacer(*args, **kwargs): + def SetSpacer(*args, **kwargs): """ - GetSpacer(self) -> Size + SetSpacer(self, Size size) - Get the size of the spacer managed by this sizer item. + Set the size of the spacer to be managed by this sizer item. """ - return _core_.SizerItem_GetSpacer(*args, **kwargs) + return _core_.SizerItem_SetSpacer(*args, **kwargs) - def SetSpacer(*args, **kwargs): + SetWindow = wx._deprecated(SetWindow, "Use `AssignWindow` instead.") + SetSizer = wx._deprecated(SetSizer, "Use `AssignSizer` instead.") + SetSpacer = wx._deprecated(SetSpacer, "Use `AssignSpacer` instead.") + + def AssignWindow(*args, **kwargs): """ - SetSpacer(self, Size size) + AssignWindow(self, Window window) + + Set the window to be managed by this sizer item. + """ + return _core_.SizerItem_AssignWindow(*args, **kwargs) + + def AssignSizer(*args, **kwargs): + """ + AssignSizer(self, Sizer sizer) + + Set the subsizer to be managed by this sizer item. + """ + return _core_.SizerItem_AssignSizer(*args, **kwargs) + + def AssignSpacer(*args, **kwargs): + """ + AssignSpacer(self, Size size) Set the size of the spacer to be managed by this sizer item. """ - return _core_.SizerItem_SetSpacer(*args, **kwargs) + return _core_.SizerItem_AssignSpacer(*args, **kwargs) def Show(*args, **kwargs): """ @@ -11860,10 +12301,10 @@ class SizerItem(Object): Ratio = property(GetRatio,SetRatio,doc="See `GetRatio` and `SetRatio`") Rect = property(GetRect,doc="See `GetRect`") Size = property(GetSize,doc="See `GetSize`") - Sizer = property(GetSizer,SetSizer,doc="See `GetSizer` and `SetSizer`") - Spacer = property(GetSpacer,SetSpacer,doc="See `GetSpacer` and `SetSpacer`") + Sizer = property(GetSizer,AssignSizer,doc="See `GetSizer` and `AssignSizer`") + Spacer = property(GetSpacer,AssignSpacer,doc="See `GetSpacer` and `AssignSpacer`") UserData = property(GetUserData,SetUserData,doc="See `GetUserData` and `SetUserData`") - Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") + Window = property(GetWindow,AssignWindow,doc="See `GetWindow` and `AssignWindow`") _core_.SizerItem_swigregister(SizerItem) def SizerItemWindow(*args, **kwargs): @@ -11944,6 +12385,15 @@ class Sizer(Object): """ return _core_.Sizer_Add(*args, **kwargs) + def AddF(*args, **kwargs): + """ + AddF(self, item, wx.SizerFlags flags) -> wx.SizerItem + + Similar to `Add` but uses the `wx.SizerFlags` convenience class for + setting the various flags, options and borders. + """ + return _core_.Sizer_AddF(*args, **kwargs) + def Insert(*args, **kwargs): """ Insert(self, int before, item, int proportion=0, int flag=0, int border=0, @@ -11954,6 +12404,15 @@ class Sizer(Object): """ return _core_.Sizer_Insert(*args, **kwargs) + def InsertF(*args, **kwargs): + """ + InsertF(self, int before, item, wx.SizerFlags flags) -> wx.SizerItem + + Similar to `Insert`, but uses the `wx.SizerFlags` convenience class + for setting the various flags, options and borders. + """ + return _core_.Sizer_InsertF(*args, **kwargs) + def Prepend(*args, **kwargs): """ Prepend(self, item, int proportion=0, int flag=0, int border=0, @@ -11964,6 +12423,15 @@ class Sizer(Object): """ return _core_.Sizer_Prepend(*args, **kwargs) + def PrependF(*args, **kwargs): + """ + PrependF(self, item, wx.SizerFlags flags) -> wx.SizerItem + + Similar to `Prepend` but uses the `wx.SizerFlags` convenience class + for setting the various flags, options and borders. + """ + return _core_.Sizer_PrependF(*args, **kwargs) + def Remove(*args, **kwargs): """ Remove(self, item) -> bool @@ -11991,7 +12459,7 @@ class Sizer(Object): def GetItem(*args, **kwargs): """ - GetItem(self, item) -> wx.SizerItem + GetItem(self, item, recursive=False) -> wx.SizerItem Returns the `wx.SizerItem` which holds the *item* given. The *item* parameter can be either a window, a sizer, or the zero-based index of @@ -12031,9 +12499,9 @@ class Sizer(Object): """ if isinstance(olditem, wx.Window): return self._ReplaceWin(olditem, item, recursive) - elif isinstnace(olditem, wx.Sizer): + elif isinstance(olditem, wx.Sizer): return self._ReplaceSizer(olditem, item, recursive) - elif isinstnace(olditem, int): + elif isinstance(olditem, int): return self._ReplaceItem(olditem, item) else: raise TypeError("Expected Window, Sizer, or integer for first parameter.") @@ -12445,7 +12913,7 @@ class PySizer(Sizer): class. """ _core_.PySizer_swiginit(self,_core_.new_PySizer(*args, **kwargs)) - self._setCallbackInfo(self, PySizer);self._setOORInfo(self) + self._setOORInfo(self);PySizer._setCallbackInfo(self, self, PySizer) def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)""" @@ -13318,6 +13786,16 @@ class GridBagSizer(FlexGridSizer): """ return _core_.GridBagSizer_FindItem(*args) + def GetItem(self, item): + gbsi = None + si = wx.FlexGridSizer.GetItem(self, item) + if not si: + return None + if type(item) is not int: + gbsi = self.FindItem(item) + if gbsi: return gbsi + return si + def FindItemAtPosition(*args, **kwargs): """ FindItemAtPosition(self, GBPosition pos) -> GBSizerItem @@ -13671,6 +14149,24 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION: import warnings warnings.warn("wxPython/wxWidgets release number mismatch") + +def version(): + """Returns a string containing version and port info""" + ctype = wx.USE_UNICODE and 'unicode' or 'ansi' + if wx.Platform == '__WXMSW__': + port = 'msw' + elif wx.Platform == '__WXMAC__': + port = 'mac' + elif wx.Platform == '__WXGTK__': + port = 'gtk' + if 'gtk2' in wx.PlatformInfo: + port = 'gtk2' + else: + port = '?' + + return "%s (%s-%s)" % (wx.VERSION_STRING, port, ctype) + + #---------------------------------------------------------------------------- # Set wxPython's default string<-->unicode conversion encoding from @@ -13690,7 +14186,10 @@ if default == 'ascii': import locale import codecs try: - default = locale.getdefaultlocale()[1] + if hasattr(locale, 'getpreferredencoding'): + default = locale.getpreferredencoding() + else: + default = locale.getdefaultlocale()[1] codecs.lookup(default) except (ValueError, LookupError, TypeError): default = _sys.getdefaultencoding()