diff --git a/wxPython/demo/AnimateCtrl.py b/wxPython/demo/AnimateCtrl.py index e993e4ee77..276771ec59 100644 --- a/wxPython/demo/AnimateCtrl.py +++ b/wxPython/demo/AnimateCtrl.py @@ -25,10 +25,10 @@ class TestPanel(wx.Panel): ctrl = wx.animate.AnimationCtrl(self, -1, ani) ctrl.SetUseWindowBackgroundColour() ctrl.Play() - sizer.Add(ctrl, 0, wx.ALL, 10) + sizer.AddF(ctrl, wx.SizerFlags().Border(wx.ALL, 10)) border = wx.BoxSizer() - border.Add(sizer, 1, wx.EXPAND|wx.ALL, 20) + border.AddF(sizer, wx.SizerFlags(1).Expand().Border(wx.ALL, 20)) self.SetSizer(border) diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt index 02a53d0298..c623ef74ca 100644 --- a/wxPython/docs/CHANGES.txt +++ b/wxPython/docs/CHANGES.txt @@ -16,6 +16,18 @@ module) and also as a non mix-in tool (using wx.lib.inspect.InspectionTool). Add wx.lib.mixins.treemixin from Frank Niessink. +Added the wx.SizerFlags class, and also added AddF, InsertF and +PrependF methods to wx.Sizer. The wxSizerFlags class provides a +convienient and easier to read way to add items to a sizer. For +example, instead of writing:: + + sizer.Add(ctrl, 0, wx.EXPAND | wx.ALL, 10) + +you can now write:: + + sizer.AddF(ctrl, wx.SizerFlags().Expand().Border(10)) + + diff --git a/wxPython/src/_sizers.i b/wxPython/src/_sizers.i index ab10c04355..9b76f8db87 100644 --- a/wxPython/src/_sizers.i +++ b/wxPython/src/_sizers.i @@ -21,6 +21,155 @@ //--------------------------------------------------------------------------- %newgroup; +DocStr(wxSizerFlags, +"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(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(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.", ""); + +class wxSizerFlags +{ +public: + // construct the flags object initialized with the given proportion (0 by + // default) + DocCtorStr( + wxSizerFlags(int proportion = 0), + "Constructs the flags object with the specified proportion.", ""); + + ~wxSizerFlags(); + + // This typemap ensures that the returned object is the same + // Python instance as what was passed in as `self`, instead of + // creating a new proxy as SWIG would normally do. + %typemap(out) wxSizerFlags& { $result = $self; Py_INCREF($result); } + + DocDeclStr( + wxSizerFlags& , Proportion(int proportion), + "Sets the item's proportion value.", ""); + + DocDeclStr( + wxSizerFlags& , Align(int alignment), + "Sets the item's alignment", ""); + + DocDeclStr( + wxSizerFlags& , Expand(), + "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.", ""); + + DocDeclStr( + wxSizerFlags& , Centre(), + "Same as `Center` for those with an alternate dialect of English.", ""); + + DocDeclStr( + wxSizerFlags& , Center(), + "Sets the centering alignment flags.", ""); + + DocDeclStr( + wxSizerFlags& , Left(), + "Aligns the object to the left, a shortcut for calling +Align(wx.ALIGN_LEFT)", ""); + + DocDeclStr( + wxSizerFlags& , Right(), + "Aligns the object to the right, a shortcut for calling +Align(wx.ALIGN_RIGHT)", ""); + + DocDeclStr( + wxSizerFlags& , Top(), + "Aligns the object to the top of the available space, a shortcut for +calling Align(wx.ALIGN_TOP)", ""); + + DocDeclStr( + wxSizerFlags& , Bottom(), + "Aligns the object to the bottom of the available space, a shortcut for +calling Align(wx.ALIGN_BOTTOM)", ""); + + DocDeclStr( + wxSizerFlags& , Shaped(), + "Sets the wx.SHAPED flag.", ""); + + DocDeclStr( + wxSizerFlags& , FixedMinSize(), + "Sets the wx.FIXED_MINSIZE flag.", ""); + + + + %extend { + DocDeclStr( + wxSizerFlags& , Border(int direction=wxALL, int borderInPixels=-1), + "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.", "") + { + if (borderInPixels == -1) + return self->Border(direction); + else + return self->Border(direction, borderInPixels); + } + } + + DocDeclStr( + wxSizerFlags& , DoubleBorder(int direction = wxALL), + "Sets the border in the given direction to twice the default border +size.", ""); + + DocDeclStr( + wxSizerFlags& , TripleBorder(int direction = wxALL), + "Sets the border in the given direction to three times the default +border size.", ""); + + DocDeclStr( + wxSizerFlags& , HorzBorder(), + "Sets the left and right borders to the default border size.", ""); + + DocDeclStr( + wxSizerFlags& , DoubleHorzBorder(), + "Sets the left and right borders to twice the default border size.", ""); + + + // Clear the typemap + %typemap(out) wxSizerFlags& ; + + + + DocDeclStr( + static int , GetDefaultBorder(), + "Returns the default border size used by the other border methods", ""); + + + DocDeclStr( + int , GetProportion() const, + "Returns the proportion value to be used in the sizer item.", ""); + + DocDeclStr( + int , GetFlags() const, + "Returns the flags value to be used in the sizer item.", ""); + + DocDeclStr( + int , GetBorderInPixels() const, + "Returns the border value in pixels to be used in the sizer item.", ""); +}; + +//--------------------------------------------------------------------------- + DocStr(wxSizerItem, "The wx.SizerItem class is used to track the position, size and other attributes of each item managed by a `wx.Sizer`. It is not usually @@ -444,7 +593,7 @@ public: - **sizer**: The (child-)sizer to be added to the sizer. This allows placing a child sizer in a sizer and thus to create - hierarchies of sizers (typically a vertical box as the top + hierarchies of sizers (for example a vertical box as the top sizer and several horizontal boxes on the level beneath). - **size**: A `wx.Size` or a 2-element sequence of integers @@ -552,8 +701,34 @@ public: return NULL; } -// virtual wxSizerItem* AddSpacer(int size); -// virtual wxSizerItem* AddStretchSpacer(int prop = 1); + + DocAStr(AddF, + "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.", ""); + wxSizerItem* AddF(PyObject* item, wxSizerFlags& flags) { + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); + wxPyEndBlockThreads(blocked); + + // Now call the real Add method if a valid item type was found + if ( info.window ) + return self->Add(info.window, flags); + else if ( info.sizer ) + return self->Add(info.sizer, flags); + else if (info.gotSize) + return self->Add(info.size.GetWidth(), info.size.GetHeight(), + flags.GetProportion(), + flags.GetFlags(), + flags.GetBorderInPixels()); + else + return NULL; + } + + DocAStr(Insert, "Insert(self, int before, item, int proportion=0, int flag=0, int border=0, @@ -586,8 +761,35 @@ the item at index *before*. See `Add` for a description of the parameters.", "" } -// virtual wxSizerItem* InsertSpacer(size_t index, int size); -// virtual wxSizerItem* InsertStretchSpacer(size_t index, int prop = 1); + + DocAStr(InsertF, + "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.", ""); + wxSizerItem* InsertF(int before, PyObject* item, wxSizerFlags& flags) { + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); + wxPyEndBlockThreads(blocked); + + // Now call the real Insert method if a valid item type was found + if ( info.window ) + return self->Insert(before, info.window, flags); + else if ( info.sizer ) + return self->Insert(before, info.sizer, flags); + else if (info.gotSize) + return self->Insert(before, info.size.GetWidth(), info.size.GetHeight(), + flags.GetProportion(), + flags.GetFlags(), + flags.GetBorderInPixels()); + else + return NULL; + } + + + DocAStr(Prepend, "Prepend(self, item, int proportion=0, int flag=0, int border=0, @@ -619,10 +821,36 @@ this sizer. See `Add` for a description of the parameters.", ""); return NULL; } -// virtual wxSizerItem* PrependSpacer(int size); -// virtual wxSizerItem* PrependStretchSpacer(int prop = 1); + DocAStr(PrependF, + "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.", ""); + wxSizerItem* PrependF(PyObject* item, wxSizerFlags& flags) { + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); + wxPyEndBlockThreads(blocked); + + // Now call the real Add method if a valid item type was found + if ( info.window ) + return self->Prepend(info.window, flags); + else if ( info.sizer ) + return self->Prepend(info.sizer, flags); + else if (info.gotSize) + return self->Prepend(info.size.GetWidth(), info.size.GetHeight(), + flags.GetProportion(), + flags.GetFlags(), + flags.GetBorderInPixels()); + else + return NULL; + } + + + DocAStr(Remove, "Remove(self, item) -> bool", "Removes an item from the sizer and destroys it. This method does not diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index ed48f60738..bc08380262 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -11570,6 +11570,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(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(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 @@ -11965,6 +12181,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, @@ -11975,6 +12200,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, @@ -11985,6 +12219,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 diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index 96514e9445..3c18d3c95a 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -2582,24 +2582,25 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxSize swig_types[116] #define SWIGTYPE_p_wxSizeEvent swig_types[117] #define SWIGTYPE_p_wxSizer swig_types[118] -#define SWIGTYPE_p_wxSizerItem swig_types[119] -#define SWIGTYPE_p_wxStaticBox swig_types[120] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[121] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[122] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[123] -#define SWIGTYPE_p_wxTGAHandler swig_types[124] -#define SWIGTYPE_p_wxTIFFHandler swig_types[125] -#define SWIGTYPE_p_wxToolTip swig_types[126] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[127] -#define SWIGTYPE_p_wxValidator swig_types[128] -#define SWIGTYPE_p_wxVisualAttributes swig_types[129] -#define SWIGTYPE_p_wxWindow swig_types[130] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[131] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[132] -#define SWIGTYPE_p_wxXPMHandler swig_types[133] -#define SWIGTYPE_p_wxZipFSHandler swig_types[134] -static swig_type_info *swig_types[136]; -static swig_module_info swig_module = {swig_types, 135, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxSizerFlags swig_types[119] +#define SWIGTYPE_p_wxSizerItem swig_types[120] +#define SWIGTYPE_p_wxStaticBox swig_types[121] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[122] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[123] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[124] +#define SWIGTYPE_p_wxTGAHandler swig_types[125] +#define SWIGTYPE_p_wxTIFFHandler swig_types[126] +#define SWIGTYPE_p_wxToolTip swig_types[127] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[128] +#define SWIGTYPE_p_wxValidator swig_types[129] +#define SWIGTYPE_p_wxVisualAttributes swig_types[130] +#define SWIGTYPE_p_wxWindow swig_types[131] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[132] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[133] +#define SWIGTYPE_p_wxXPMHandler swig_types[134] +#define SWIGTYPE_p_wxZipFSHandler swig_types[135] +static swig_type_info *swig_types[137]; +static swig_module_info swig_module = {swig_types, 136, 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) @@ -4021,6 +4022,12 @@ SWIGINTERN void wxItemContainer_SetClientData(wxItemContainer *self,int n,PyObje } +SWIGINTERN wxSizerFlags &wxSizerFlags_Border(wxSizerFlags *self,int direction=wxALL,int borderInPixels=-1){ + if (borderInPixels == -1) + return self->Border(direction); + else + return self->Border(direction, borderInPixels); + } SWIGINTERN wxSizerItem *new_wxSizerItem(wxWindow *window,int proportion,int flag,int border,PyObject *userData=NULL){ wxPyUserData* data = NULL; if ( userData ) { @@ -4164,6 +4171,27 @@ SWIGINTERN wxSizerItem *wxSizer_Add(wxSizer *self,PyObject *item,int proportion= else return NULL; } +SWIGINTERN wxSizerItem *wxSizer_AddF(wxSizer *self,PyObject *item,wxSizerFlags &flags){ + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); + wxPyEndBlockThreads(blocked); + + // Now call the real Add method if a valid item type was found + if ( info.window ) + return self->Add(info.window, flags); + else if ( info.sizer ) + return self->Add(info.sizer, flags); + else if (info.gotSize) + return self->Add(info.size.GetWidth(), info.size.GetHeight(), + flags.GetProportion(), + flags.GetFlags(), + flags.GetBorderInPixels()); + else + return NULL; + } SWIGINTERN wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){ wxPyUserData* data = NULL; @@ -4186,6 +4214,27 @@ SWIGINTERN wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,i else return NULL; } +SWIGINTERN wxSizerItem *wxSizer_InsertF(wxSizer *self,int before,PyObject *item,wxSizerFlags &flags){ + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); + wxPyEndBlockThreads(blocked); + + // Now call the real Insert method if a valid item type was found + if ( info.window ) + return self->Insert(before, info.window, flags); + else if ( info.sizer ) + return self->Insert(before, info.sizer, flags); + else if (info.gotSize) + return self->Insert(before, info.size.GetWidth(), info.size.GetHeight(), + flags.GetProportion(), + flags.GetFlags(), + flags.GetBorderInPixels()); + else + return NULL; + } SWIGINTERN wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){ wxPyUserData* data = NULL; @@ -4208,6 +4257,27 @@ SWIGINTERN wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proport else return NULL; } +SWIGINTERN wxSizerItem *wxSizer_PrependF(wxSizer *self,PyObject *item,wxSizerFlags &flags){ + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); + wxPyEndBlockThreads(blocked); + + // Now call the real Add method if a valid item type was found + if ( info.window ) + return self->Prepend(info.window, flags); + else if ( info.sizer ) + return self->Prepend(info.sizer, flags); + else if (info.gotSize) + return self->Prepend(info.size.GetWidth(), info.size.GetHeight(), + flags.GetProportion(), + flags.GetFlags(), + flags.GetBorderInPixels()); + else + return NULL; + } SWIGINTERN bool wxSizer_Remove(wxSizer *self,PyObject *item){ wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); @@ -48391,6 +48461,779 @@ SWIGINTERN PyObject *ControlWithItems_swigregister(PyObject *SWIGUNUSEDPARM(self return SWIG_Py_Void(); } +SWIGINTERN PyObject *_wrap_new_SizerFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + int arg1 = (int) 0 ; + wxSizerFlags *result = 0 ; + int val1 ; + int ecode1 = 0 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "proportion", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_SizerFlags",kwnames,&obj0)) SWIG_fail; + if (obj0) { + ecode1 = SWIG_AsVal_int(obj0, &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SizerFlags" "', expected argument " "1"" of type '" "int""'"); + } + arg1 = static_cast< int >(val1); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizerFlags *)new wxSizerFlags(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerFlags, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_delete_SizerFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SizerFlags" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Proportion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "proportion", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerFlags_Proportion",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Proportion" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Proportion" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Proportion(arg2); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Align(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "alignment", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerFlags_Align",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Align" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Align" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Align(arg2); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Expand(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Expand" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Expand(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Centre(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Centre" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Centre(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Center" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Center(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Left(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Left" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Left(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Right(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Right" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Right(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Top(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Top" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Top(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Bottom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Bottom" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Bottom(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Shaped(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Shaped" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Shaped(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_FixedMinSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_FixedMinSize" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->FixedMinSize(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Border(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 = (int) wxALL ; + int arg3 = (int) -1 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + int val3 ; + int ecode3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "direction",(char *) "borderInPixels", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:SizerFlags_Border",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Border" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Border" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + } + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SizerFlags_Border" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = wxSizerFlags_Border(arg1,arg2,arg3); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_DoubleBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 = (int) wxALL ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "direction", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:SizerFlags_DoubleBorder",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_DoubleBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_DoubleBorder" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->DoubleBorder(arg2); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_TripleBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 = (int) wxALL ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "direction", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:SizerFlags_TripleBorder",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_TripleBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_TripleBorder" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->TripleBorder(arg2); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_HorzBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_HorzBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->HorzBorder(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_DoubleHorzBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_DoubleHorzBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->DoubleHorzBorder(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_GetDefaultBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + int result; + + if (!SWIG_Python_UnpackTuple(args,"SizerFlags_GetDefaultBorder",0,0,0)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)wxSizerFlags::GetDefaultBorder(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_GetProportion(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetProportion" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxSizerFlags const *)arg1)->GetProportion(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_GetFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetFlags" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxSizerFlags const *)arg1)->GetFlags(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_GetBorderInPixels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetBorderInPixels" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxSizerFlags const *)arg1)->GetBorderInPixels(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *SizerFlags_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_wxSizerFlags, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *SizerFlags_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + SWIGINTERN PyObject *_wrap_new_SizerItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxSizerItem *result = 0 ; @@ -49847,6 +50690,51 @@ fail: } +SWIGINTERN PyObject *_wrap_Sizer_AddF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizer *arg1 = (wxSizer *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + wxSizerFlags *arg3 = 0 ; + wxSizerItem *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item",(char *) "flags", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_AddF",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_AddF" "', expected argument " "1"" of type '" "wxSizer *""'"); + } + arg1 = reinterpret_cast< wxSizer * >(argp1); + arg2 = obj1; + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxSizerFlags, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer_AddF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_AddF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); + } + arg3 = reinterpret_cast< wxSizerFlags * >(argp3); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizerItem *)wxSizer_AddF(arg1,arg2,*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Sizer_Insert(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizer *arg1 = (wxSizer *) 0 ; @@ -49927,6 +50815,60 @@ fail: } +SWIGINTERN PyObject *_wrap_Sizer_InsertF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizer *arg1 = (wxSizer *) 0 ; + int arg2 ; + PyObject *arg3 = (PyObject *) 0 ; + wxSizerFlags *arg4 = 0 ; + wxSizerItem *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + void *argp4 = 0 ; + int res4 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "before",(char *) "item",(char *) "flags", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Sizer_InsertF",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_InsertF" "', expected argument " "1"" of type '" "wxSizer *""'"); + } + arg1 = reinterpret_cast< wxSizer * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Sizer_InsertF" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + arg3 = obj2; + res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxSizerFlags, 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "Sizer_InsertF" "', expected argument " "4"" of type '" "wxSizerFlags &""'"); + } + if (!argp4) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_InsertF" "', expected argument " "4"" of type '" "wxSizerFlags &""'"); + } + arg4 = reinterpret_cast< wxSizerFlags * >(argp4); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizerItem *)wxSizer_InsertF(arg1,arg2,arg3,*arg4); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Sizer_Prepend(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizer *arg1 = (wxSizer *) 0 ; @@ -49998,6 +50940,51 @@ fail: } +SWIGINTERN PyObject *_wrap_Sizer_PrependF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizer *arg1 = (wxSizer *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + wxSizerFlags *arg3 = 0 ; + wxSizerItem *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item",(char *) "flags", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_PrependF",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_PrependF" "', expected argument " "1"" of type '" "wxSizer *""'"); + } + arg1 = reinterpret_cast< wxSizer * >(argp1); + arg2 = obj1; + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxSizerFlags, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer_PrependF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_PrependF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); + } + arg3 = reinterpret_cast< wxSizerFlags * >(argp3); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizerItem *)wxSizer_PrependF(arg1,arg2,*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Sizer_Remove(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizer *arg1 = (wxSizer *) 0 ; @@ -57753,6 +58740,30 @@ static PyMethodDef SwigMethods[] = { { (char *)"ItemContainer_Select", (PyCFunction) _wrap_ItemContainer_Select, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ItemContainer_swigregister", ItemContainer_swigregister, METH_VARARGS, NULL}, { (char *)"ControlWithItems_swigregister", ControlWithItems_swigregister, METH_VARARGS, NULL}, + { (char *)"new_SizerFlags", (PyCFunction) _wrap_new_SizerFlags, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_SizerFlags", (PyCFunction)_wrap_delete_SizerFlags, METH_O, NULL}, + { (char *)"SizerFlags_Proportion", (PyCFunction) _wrap_SizerFlags_Proportion, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_Align", (PyCFunction) _wrap_SizerFlags_Align, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_Expand", (PyCFunction)_wrap_SizerFlags_Expand, METH_O, NULL}, + { (char *)"SizerFlags_Centre", (PyCFunction)_wrap_SizerFlags_Centre, METH_O, NULL}, + { (char *)"SizerFlags_Center", (PyCFunction)_wrap_SizerFlags_Center, METH_O, NULL}, + { (char *)"SizerFlags_Left", (PyCFunction)_wrap_SizerFlags_Left, METH_O, NULL}, + { (char *)"SizerFlags_Right", (PyCFunction)_wrap_SizerFlags_Right, METH_O, NULL}, + { (char *)"SizerFlags_Top", (PyCFunction)_wrap_SizerFlags_Top, METH_O, NULL}, + { (char *)"SizerFlags_Bottom", (PyCFunction)_wrap_SizerFlags_Bottom, METH_O, NULL}, + { (char *)"SizerFlags_Shaped", (PyCFunction)_wrap_SizerFlags_Shaped, METH_O, NULL}, + { (char *)"SizerFlags_FixedMinSize", (PyCFunction)_wrap_SizerFlags_FixedMinSize, METH_O, NULL}, + { (char *)"SizerFlags_Border", (PyCFunction) _wrap_SizerFlags_Border, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_DoubleBorder", (PyCFunction) _wrap_SizerFlags_DoubleBorder, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_TripleBorder", (PyCFunction) _wrap_SizerFlags_TripleBorder, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_HorzBorder", (PyCFunction)_wrap_SizerFlags_HorzBorder, METH_O, NULL}, + { (char *)"SizerFlags_DoubleHorzBorder", (PyCFunction)_wrap_SizerFlags_DoubleHorzBorder, METH_O, NULL}, + { (char *)"SizerFlags_GetDefaultBorder", (PyCFunction)_wrap_SizerFlags_GetDefaultBorder, METH_NOARGS, NULL}, + { (char *)"SizerFlags_GetProportion", (PyCFunction)_wrap_SizerFlags_GetProportion, METH_O, NULL}, + { (char *)"SizerFlags_GetFlags", (PyCFunction)_wrap_SizerFlags_GetFlags, METH_O, NULL}, + { (char *)"SizerFlags_GetBorderInPixels", (PyCFunction)_wrap_SizerFlags_GetBorderInPixels, METH_O, NULL}, + { (char *)"SizerFlags_swigregister", SizerFlags_swigregister, METH_VARARGS, NULL}, + { (char *)"SizerFlags_swiginit", SizerFlags_swiginit, METH_VARARGS, NULL}, { (char *)"new_SizerItem", (PyCFunction)_wrap_new_SizerItem, METH_NOARGS, NULL}, { (char *)"delete_SizerItem", (PyCFunction)_wrap_delete_SizerItem, METH_O, NULL}, { (char *)"new_SizerItemWindow", (PyCFunction) _wrap_new_SizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -57796,8 +58807,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_Sizer", (PyCFunction)_wrap_delete_Sizer, METH_O, NULL}, { (char *)"Sizer__setOORInfo", (PyCFunction) _wrap_Sizer__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Add", (PyCFunction) _wrap_Sizer_Add, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Sizer_AddF", (PyCFunction) _wrap_Sizer_AddF, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Insert", (PyCFunction) _wrap_Sizer_Insert, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Sizer_InsertF", (PyCFunction) _wrap_Sizer_InsertF, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Prepend", (PyCFunction) _wrap_Sizer_Prepend, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Sizer_PrependF", (PyCFunction) _wrap_Sizer_PrependF, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Remove", (PyCFunction) _wrap_Sizer_Remove, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Detach", (PyCFunction) _wrap_Sizer_Detach, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_GetItem", (PyCFunction) _wrap_Sizer_GetItem, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -57983,36 +58997,6 @@ static PyMethodDef SwigMethods[] = { /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ -static void *_p_wxGBSizerItemTo_p_wxSizerItem(void *x) { - return (void *)((wxSizerItem *) ((wxGBSizerItem *) x)); -} -static void *_p_wxBoxSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) ((wxBoxSizer *) x)); -} -static void *_p_wxStaticBoxSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxBoxSizer *) ((wxStaticBoxSizer *) x)); -} -static void *_p_wxStdDialogButtonSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); -} -static void *_p_wxGridBagSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxGridSizer *)(wxFlexGridSizer *) ((wxGridBagSizer *) x)); -} -static void *_p_wxGridSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) ((wxGridSizer *) x)); -} -static void *_p_wxFlexGridSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxGridSizer *) ((wxFlexGridSizer *) x)); -} -static void *_p_wxPySizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) ((wxPySizer *) x)); -} -static void *_p_wxStaticBoxSizerTo_p_wxBoxSizer(void *x) { - return (void *)((wxBoxSizer *) ((wxStaticBoxSizer *) x)); -} -static void *_p_wxStdDialogButtonSizerTo_p_wxBoxSizer(void *x) { - return (void *)((wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); -} static void *_p_wxContextMenuEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *) ((wxContextMenuEvent *) x)); } @@ -58127,113 +59111,8 @@ static void *_p_wxKeyEventTo_p_wxEvent(void *x) { static void *_p_wxScrollWinEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) ((wxScrollWinEvent *) x)); } -static void *_p_wxGridBagSizerTo_p_wxGridSizer(void *x) { - return (void *)((wxGridSizer *) (wxFlexGridSizer *) ((wxGridBagSizer *) x)); -} -static void *_p_wxFlexGridSizerTo_p_wxGridSizer(void *x) { - return (void *)((wxGridSizer *) ((wxFlexGridSizer *) x)); -} -static void *_p_wxGridBagSizerTo_p_wxFlexGridSizer(void *x) { - return (void *)((wxFlexGridSizer *) ((wxGridBagSizer *) x)); -} -static void *_p_wxControlWithItemsTo_p_wxItemContainer(void *x) { - return (void *)((wxItemContainer *) ((wxControlWithItems *) x)); -} -static void *_p_wxControlWithItemsTo_p_wxControl(void *x) { - return (void *)((wxControl *) ((wxControlWithItems *) x)); -} -static void *_p_wxControlTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x)); -} -static void *_p_wxWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxWindow *) x)); -} -static void *_p_wxControlWithItemsTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxControlWithItems *) x)); -} -static void *_p_wxPyAppTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxPyApp *) x)); -} -static void *_p_wxValidatorTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxValidator *) x)); -} -static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxValidator *) ((wxPyValidator *) x)); -} -static void *_p_wxMenuBarTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxMenuBar *) x)); -} -static void *_p_wxMenuTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxMenu *) x)); -} -static void *_p_wxANIHandlerTo_p_wxCURHandler(void *x) { - return (void *)((wxCURHandler *) ((wxANIHandler *) x)); -} -static void *_p_wxCURHandlerTo_p_wxICOHandler(void *x) { - return (void *)((wxICOHandler *) ((wxCURHandler *) x)); -} -static void *_p_wxANIHandlerTo_p_wxICOHandler(void *x) { - return (void *)((wxICOHandler *) (wxCURHandler *) ((wxANIHandler *) x)); -} -static void *_p_wxICOHandlerTo_p_wxBMPHandler(void *x) { - return (void *)((wxBMPHandler *) ((wxICOHandler *) x)); -} -static void *_p_wxCURHandlerTo_p_wxBMPHandler(void *x) { - return (void *)((wxBMPHandler *) (wxICOHandler *) ((wxCURHandler *) x)); -} -static void *_p_wxANIHandlerTo_p_wxBMPHandler(void *x) { - return (void *)((wxBMPHandler *) (wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x)); -} -static void *_p_wxPyImageHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxPyImageHandler *) x)); -} -static void *_p_wxBMPHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxBMPHandler *) x)); -} -static void *_p_wxICOHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) (wxBMPHandler *) ((wxICOHandler *) x)); -} -static void *_p_wxCURHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *) ((wxCURHandler *) x)); -} -static void *_p_wxANIHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x)); -} -static void *_p_wxPNGHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxPNGHandler *) x)); -} -static void *_p_wxGIFHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxGIFHandler *) x)); -} -static void *_p_wxPCXHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxPCXHandler *) x)); -} -static void *_p_wxJPEGHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxJPEGHandler *) x)); -} -static void *_p_wxPNMHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxPNMHandler *) x)); -} -static void *_p_wxXPMHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxXPMHandler *) x)); -} -static void *_p_wxTIFFHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxTIFFHandler *) x)); -} -static void *_p_wxTGAHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxTGAHandler *) x)); -} -static void *_p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler(void *x) { - return (void *)((wxFileSystemHandler *) ((wxPyFileSystemHandler *) x)); -} -static void *_p_wxInternetFSHandlerTo_p_wxFileSystemHandler(void *x) { - return (void *)((wxFileSystemHandler *) ((wxInternetFSHandler *) x)); -} -static void *_p_wxZipFSHandlerTo_p_wxFileSystemHandler(void *x) { - return (void *)((wxFileSystemHandler *) ((wxZipFSHandler *) x)); -} -static void *_p_wxMemoryFSHandlerTo_p_wxFileSystemHandler(void *x) { - return (void *)((wxFileSystemHandler *) ((wxMemoryFSHandler *) x)); +static void *_p_wxPyValidatorTo_p_wxValidator(void *x) { + return (void *)((wxValidator *) ((wxPyValidator *) x)); } static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxLayoutConstraints *) x)); @@ -58472,6 +59351,144 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) { static void *_p_wxValidatorTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x)); } +static void *_p_wxGridBagSizerTo_p_wxFlexGridSizer(void *x) { + return (void *)((wxFlexGridSizer *) ((wxGridBagSizer *) x)); +} +static void *_p_wxGridBagSizerTo_p_wxGridSizer(void *x) { + return (void *)((wxGridSizer *) (wxFlexGridSizer *) ((wxGridBagSizer *) x)); +} +static void *_p_wxFlexGridSizerTo_p_wxGridSizer(void *x) { + return (void *)((wxGridSizer *) ((wxFlexGridSizer *) x)); +} +static void *_p_wxControlWithItemsTo_p_wxControl(void *x) { + return (void *)((wxControl *) ((wxControlWithItems *) x)); +} +static void *_p_wxControlWithItemsTo_p_wxItemContainer(void *x) { + return (void *)((wxItemContainer *) ((wxControlWithItems *) x)); +} +static void *_p_wxStaticBoxSizerTo_p_wxBoxSizer(void *x) { + return (void *)((wxBoxSizer *) ((wxStaticBoxSizer *) x)); +} +static void *_p_wxStdDialogButtonSizerTo_p_wxBoxSizer(void *x) { + return (void *)((wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); +} +static void *_p_wxBoxSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) ((wxBoxSizer *) x)); +} +static void *_p_wxStaticBoxSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) (wxBoxSizer *) ((wxStaticBoxSizer *) x)); +} +static void *_p_wxStdDialogButtonSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) (wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); +} +static void *_p_wxGridBagSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) (wxGridSizer *)(wxFlexGridSizer *) ((wxGridBagSizer *) x)); +} +static void *_p_wxGridSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) ((wxGridSizer *) x)); +} +static void *_p_wxFlexGridSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) (wxGridSizer *) ((wxFlexGridSizer *) x)); +} +static void *_p_wxPySizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) ((wxPySizer *) x)); +} +static void *_p_wxGBSizerItemTo_p_wxSizerItem(void *x) { + return (void *)((wxSizerItem *) ((wxGBSizerItem *) x)); +} +static void *_p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler(void *x) { + return (void *)((wxFileSystemHandler *) ((wxPyFileSystemHandler *) x)); +} +static void *_p_wxInternetFSHandlerTo_p_wxFileSystemHandler(void *x) { + return (void *)((wxFileSystemHandler *) ((wxInternetFSHandler *) x)); +} +static void *_p_wxZipFSHandlerTo_p_wxFileSystemHandler(void *x) { + return (void *)((wxFileSystemHandler *) ((wxZipFSHandler *) x)); +} +static void *_p_wxMemoryFSHandlerTo_p_wxFileSystemHandler(void *x) { + return (void *)((wxFileSystemHandler *) ((wxMemoryFSHandler *) x)); +} +static void *_p_wxPyImageHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxPyImageHandler *) x)); +} +static void *_p_wxBMPHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxBMPHandler *) x)); +} +static void *_p_wxICOHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) (wxBMPHandler *) ((wxICOHandler *) x)); +} +static void *_p_wxCURHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *) ((wxCURHandler *) x)); +} +static void *_p_wxANIHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x)); +} +static void *_p_wxPNGHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxPNGHandler *) x)); +} +static void *_p_wxGIFHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxGIFHandler *) x)); +} +static void *_p_wxPCXHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxPCXHandler *) x)); +} +static void *_p_wxJPEGHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxJPEGHandler *) x)); +} +static void *_p_wxPNMHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxPNMHandler *) x)); +} +static void *_p_wxXPMHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxXPMHandler *) x)); +} +static void *_p_wxTIFFHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxTIFFHandler *) x)); +} +static void *_p_wxTGAHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxTGAHandler *) x)); +} +static void *_p_wxICOHandlerTo_p_wxBMPHandler(void *x) { + return (void *)((wxBMPHandler *) ((wxICOHandler *) x)); +} +static void *_p_wxCURHandlerTo_p_wxBMPHandler(void *x) { + return (void *)((wxBMPHandler *) (wxICOHandler *) ((wxCURHandler *) x)); +} +static void *_p_wxANIHandlerTo_p_wxBMPHandler(void *x) { + return (void *)((wxBMPHandler *) (wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x)); +} +static void *_p_wxCURHandlerTo_p_wxICOHandler(void *x) { + return (void *)((wxICOHandler *) ((wxCURHandler *) x)); +} +static void *_p_wxANIHandlerTo_p_wxICOHandler(void *x) { + return (void *)((wxICOHandler *) (wxCURHandler *) ((wxANIHandler *) x)); +} +static void *_p_wxANIHandlerTo_p_wxCURHandler(void *x) { + return (void *)((wxCURHandler *) ((wxANIHandler *) x)); +} +static void *_p_wxControlTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x)); +} +static void *_p_wxWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxWindow *) x)); +} +static void *_p_wxControlWithItemsTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxControlWithItems *) x)); +} +static void *_p_wxPyAppTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxPyApp *) x)); +} +static void *_p_wxValidatorTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxValidator *) x)); +} +static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxValidator *) ((wxPyValidator *) x)); +} +static void *_p_wxMenuBarTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxMenuBar *) x)); +} +static void *_p_wxMenuTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxMenu *) x)); +} static void *_p_wxControlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) ((wxControl *) x)); } @@ -58511,9 +59528,6 @@ static void *_p_wxNotifyEventTo_p_wxCommandEvent(void *x) { static void *_p_wxPyCommandEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) ((wxPyCommandEvent *) x)); } -static void *_p_wxPyValidatorTo_p_wxValidator(void *x) { - return (void *)((wxValidator *) ((wxPyValidator *) x)); -} static swig_type_info _swigt__p_buffer = {"_p_buffer", "buffer *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0}; @@ -58633,6 +59647,7 @@ static swig_type_info _swigt__p_wxShowEvent = {"_p_wxShowEvent", "wxShowEvent *" static swig_type_info _swigt__p_wxSize = {"_p_wxSize", "wxSize *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxSizeEvent = {"_p_wxSizeEvent", "wxSizeEvent *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxSizer = {"_p_wxSizer", "wxSizer *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_wxSizerFlags = {"_p_wxSizerFlags", "wxSizerFlags *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxSizerItem = {"_p_wxSizerItem", "wxSizerItem *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxStaticBox = {"_p_wxStaticBox", "wxStaticBox *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxStaticBoxSizer = {"_p_wxStaticBoxSizer", "wxStaticBoxSizer *", 0, 0, (void*)0, 0}; @@ -58770,6 +59785,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxSize, &_swigt__p_wxSizeEvent, &_swigt__p_wxSizer, + &_swigt__p_wxSizerFlags, &_swigt__p_wxSizerItem, &_swigt__p_wxStaticBox, &_swigt__p_wxStaticBoxSizer, @@ -58907,6 +59923,7 @@ static swig_cast_info _swigc__p_wxShowEvent[] = { {&_swigt__p_wxShowEvent, 0, 0 static swig_cast_info _swigc__p_wxSize[] = { {&_swigt__p_wxSize, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSizeEvent[] = { {&_swigt__p_wxSizeEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSizer[] = { {&_swigt__p_wxSizer, 0, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxSizer, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxSizerFlags[] = { {&_swigt__p_wxSizerFlags, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSizerItem[] = { {&_swigt__p_wxSizerItem, 0, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxSizerItem, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStaticBox[] = { {&_swigt__p_wxStaticBox, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStaticBoxSizer[] = { {&_swigt__p_wxStaticBoxSizer, 0, 0, 0},{0, 0, 0, 0}}; @@ -59044,6 +60061,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxSize, _swigc__p_wxSizeEvent, _swigc__p_wxSizer, + _swigc__p_wxSizerFlags, _swigc__p_wxSizerItem, _swigc__p_wxStaticBox, _swigc__p_wxStaticBoxSizer, diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index ed48f60738..bc08380262 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -11570,6 +11570,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(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(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 @@ -11965,6 +12181,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, @@ -11975,6 +12200,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, @@ -11985,6 +12219,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 diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index ff74bf8eae..9a882f04e9 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -2582,24 +2582,25 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxSize swig_types[116] #define SWIGTYPE_p_wxSizeEvent swig_types[117] #define SWIGTYPE_p_wxSizer swig_types[118] -#define SWIGTYPE_p_wxSizerItem swig_types[119] -#define SWIGTYPE_p_wxStaticBox swig_types[120] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[121] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[122] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[123] -#define SWIGTYPE_p_wxTGAHandler swig_types[124] -#define SWIGTYPE_p_wxTIFFHandler swig_types[125] -#define SWIGTYPE_p_wxToolTip swig_types[126] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[127] -#define SWIGTYPE_p_wxValidator swig_types[128] -#define SWIGTYPE_p_wxVisualAttributes swig_types[129] -#define SWIGTYPE_p_wxWindow swig_types[130] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[131] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[132] -#define SWIGTYPE_p_wxXPMHandler swig_types[133] -#define SWIGTYPE_p_wxZipFSHandler swig_types[134] -static swig_type_info *swig_types[136]; -static swig_module_info swig_module = {swig_types, 135, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxSizerFlags swig_types[119] +#define SWIGTYPE_p_wxSizerItem swig_types[120] +#define SWIGTYPE_p_wxStaticBox swig_types[121] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[122] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[123] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[124] +#define SWIGTYPE_p_wxTGAHandler swig_types[125] +#define SWIGTYPE_p_wxTIFFHandler swig_types[126] +#define SWIGTYPE_p_wxToolTip swig_types[127] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[128] +#define SWIGTYPE_p_wxValidator swig_types[129] +#define SWIGTYPE_p_wxVisualAttributes swig_types[130] +#define SWIGTYPE_p_wxWindow swig_types[131] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[132] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[133] +#define SWIGTYPE_p_wxXPMHandler swig_types[134] +#define SWIGTYPE_p_wxZipFSHandler swig_types[135] +static swig_type_info *swig_types[137]; +static swig_module_info swig_module = {swig_types, 136, 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) @@ -4020,6 +4021,12 @@ SWIGINTERN void wxItemContainer_SetClientData(wxItemContainer *self,int n,PyObje } +SWIGINTERN wxSizerFlags &wxSizerFlags_Border(wxSizerFlags *self,int direction=wxALL,int borderInPixels=-1){ + if (borderInPixels == -1) + return self->Border(direction); + else + return self->Border(direction, borderInPixels); + } SWIGINTERN wxSizerItem *new_wxSizerItem(wxWindow *window,int proportion,int flag,int border,PyObject *userData=NULL){ wxPyUserData* data = NULL; if ( userData ) { @@ -4163,6 +4170,27 @@ SWIGINTERN wxSizerItem *wxSizer_Add(wxSizer *self,PyObject *item,int proportion= else return NULL; } +SWIGINTERN wxSizerItem *wxSizer_AddF(wxSizer *self,PyObject *item,wxSizerFlags &flags){ + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); + wxPyEndBlockThreads(blocked); + + // Now call the real Add method if a valid item type was found + if ( info.window ) + return self->Add(info.window, flags); + else if ( info.sizer ) + return self->Add(info.sizer, flags); + else if (info.gotSize) + return self->Add(info.size.GetWidth(), info.size.GetHeight(), + flags.GetProportion(), + flags.GetFlags(), + flags.GetBorderInPixels()); + else + return NULL; + } SWIGINTERN wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){ wxPyUserData* data = NULL; @@ -4185,6 +4213,27 @@ SWIGINTERN wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,i else return NULL; } +SWIGINTERN wxSizerItem *wxSizer_InsertF(wxSizer *self,int before,PyObject *item,wxSizerFlags &flags){ + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); + wxPyEndBlockThreads(blocked); + + // Now call the real Insert method if a valid item type was found + if ( info.window ) + return self->Insert(before, info.window, flags); + else if ( info.sizer ) + return self->Insert(before, info.sizer, flags); + else if (info.gotSize) + return self->Insert(before, info.size.GetWidth(), info.size.GetHeight(), + flags.GetProportion(), + flags.GetFlags(), + flags.GetBorderInPixels()); + else + return NULL; + } SWIGINTERN wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){ wxPyUserData* data = NULL; @@ -4207,6 +4256,27 @@ SWIGINTERN wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proport else return NULL; } +SWIGINTERN wxSizerItem *wxSizer_PrependF(wxSizer *self,PyObject *item,wxSizerFlags &flags){ + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); + wxPyEndBlockThreads(blocked); + + // Now call the real Add method if a valid item type was found + if ( info.window ) + return self->Prepend(info.window, flags); + else if ( info.sizer ) + return self->Prepend(info.sizer, flags); + else if (info.gotSize) + return self->Prepend(info.size.GetWidth(), info.size.GetHeight(), + flags.GetProportion(), + flags.GetFlags(), + flags.GetBorderInPixels()); + else + return NULL; + } SWIGINTERN bool wxSizer_Remove(wxSizer *self,PyObject *item){ wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); @@ -48390,6 +48460,779 @@ SWIGINTERN PyObject *ControlWithItems_swigregister(PyObject *SWIGUNUSEDPARM(self return SWIG_Py_Void(); } +SWIGINTERN PyObject *_wrap_new_SizerFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + int arg1 = (int) 0 ; + wxSizerFlags *result = 0 ; + int val1 ; + int ecode1 = 0 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "proportion", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_SizerFlags",kwnames,&obj0)) SWIG_fail; + if (obj0) { + ecode1 = SWIG_AsVal_int(obj0, &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SizerFlags" "', expected argument " "1"" of type '" "int""'"); + } + arg1 = static_cast< int >(val1); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizerFlags *)new wxSizerFlags(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerFlags, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_delete_SizerFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SizerFlags" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Proportion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "proportion", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerFlags_Proportion",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Proportion" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Proportion" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Proportion(arg2); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Align(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "alignment", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerFlags_Align",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Align" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Align" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Align(arg2); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Expand(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Expand" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Expand(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Centre(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Centre" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Centre(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Center" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Center(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Left(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Left" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Left(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Right(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Right" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Right(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Top(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Top" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Top(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Bottom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Bottom" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Bottom(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Shaped(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Shaped" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Shaped(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_FixedMinSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_FixedMinSize" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->FixedMinSize(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Border(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 = (int) wxALL ; + int arg3 = (int) -1 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + int val3 ; + int ecode3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "direction",(char *) "borderInPixels", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:SizerFlags_Border",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Border" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Border" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + } + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SizerFlags_Border" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = wxSizerFlags_Border(arg1,arg2,arg3); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_DoubleBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 = (int) wxALL ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "direction", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:SizerFlags_DoubleBorder",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_DoubleBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_DoubleBorder" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->DoubleBorder(arg2); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_TripleBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 = (int) wxALL ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "direction", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:SizerFlags_TripleBorder",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_TripleBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_TripleBorder" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->TripleBorder(arg2); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_HorzBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_HorzBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->HorzBorder(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_DoubleHorzBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_DoubleHorzBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->DoubleHorzBorder(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_GetDefaultBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + int result; + + if (!SWIG_Python_UnpackTuple(args,"SizerFlags_GetDefaultBorder",0,0,0)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)wxSizerFlags::GetDefaultBorder(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_GetProportion(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetProportion" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxSizerFlags const *)arg1)->GetProportion(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_GetFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetFlags" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxSizerFlags const *)arg1)->GetFlags(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_GetBorderInPixels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetBorderInPixels" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxSizerFlags const *)arg1)->GetBorderInPixels(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *SizerFlags_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_wxSizerFlags, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *SizerFlags_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + SWIGINTERN PyObject *_wrap_new_SizerItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxSizerItem *result = 0 ; @@ -49846,6 +50689,51 @@ fail: } +SWIGINTERN PyObject *_wrap_Sizer_AddF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizer *arg1 = (wxSizer *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + wxSizerFlags *arg3 = 0 ; + wxSizerItem *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item",(char *) "flags", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_AddF",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_AddF" "', expected argument " "1"" of type '" "wxSizer *""'"); + } + arg1 = reinterpret_cast< wxSizer * >(argp1); + arg2 = obj1; + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxSizerFlags, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer_AddF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_AddF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); + } + arg3 = reinterpret_cast< wxSizerFlags * >(argp3); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizerItem *)wxSizer_AddF(arg1,arg2,*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Sizer_Insert(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizer *arg1 = (wxSizer *) 0 ; @@ -49926,6 +50814,60 @@ fail: } +SWIGINTERN PyObject *_wrap_Sizer_InsertF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizer *arg1 = (wxSizer *) 0 ; + int arg2 ; + PyObject *arg3 = (PyObject *) 0 ; + wxSizerFlags *arg4 = 0 ; + wxSizerItem *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + void *argp4 = 0 ; + int res4 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "before",(char *) "item",(char *) "flags", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Sizer_InsertF",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_InsertF" "', expected argument " "1"" of type '" "wxSizer *""'"); + } + arg1 = reinterpret_cast< wxSizer * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Sizer_InsertF" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + arg3 = obj2; + res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxSizerFlags, 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "Sizer_InsertF" "', expected argument " "4"" of type '" "wxSizerFlags &""'"); + } + if (!argp4) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_InsertF" "', expected argument " "4"" of type '" "wxSizerFlags &""'"); + } + arg4 = reinterpret_cast< wxSizerFlags * >(argp4); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizerItem *)wxSizer_InsertF(arg1,arg2,arg3,*arg4); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Sizer_Prepend(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizer *arg1 = (wxSizer *) 0 ; @@ -49997,6 +50939,51 @@ fail: } +SWIGINTERN PyObject *_wrap_Sizer_PrependF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizer *arg1 = (wxSizer *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + wxSizerFlags *arg3 = 0 ; + wxSizerItem *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item",(char *) "flags", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_PrependF",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_PrependF" "', expected argument " "1"" of type '" "wxSizer *""'"); + } + arg1 = reinterpret_cast< wxSizer * >(argp1); + arg2 = obj1; + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxSizerFlags, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer_PrependF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_PrependF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); + } + arg3 = reinterpret_cast< wxSizerFlags * >(argp3); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizerItem *)wxSizer_PrependF(arg1,arg2,*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Sizer_Remove(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizer *arg1 = (wxSizer *) 0 ; @@ -57752,6 +58739,30 @@ static PyMethodDef SwigMethods[] = { { (char *)"ItemContainer_Select", (PyCFunction) _wrap_ItemContainer_Select, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ItemContainer_swigregister", ItemContainer_swigregister, METH_VARARGS, NULL}, { (char *)"ControlWithItems_swigregister", ControlWithItems_swigregister, METH_VARARGS, NULL}, + { (char *)"new_SizerFlags", (PyCFunction) _wrap_new_SizerFlags, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_SizerFlags", (PyCFunction)_wrap_delete_SizerFlags, METH_O, NULL}, + { (char *)"SizerFlags_Proportion", (PyCFunction) _wrap_SizerFlags_Proportion, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_Align", (PyCFunction) _wrap_SizerFlags_Align, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_Expand", (PyCFunction)_wrap_SizerFlags_Expand, METH_O, NULL}, + { (char *)"SizerFlags_Centre", (PyCFunction)_wrap_SizerFlags_Centre, METH_O, NULL}, + { (char *)"SizerFlags_Center", (PyCFunction)_wrap_SizerFlags_Center, METH_O, NULL}, + { (char *)"SizerFlags_Left", (PyCFunction)_wrap_SizerFlags_Left, METH_O, NULL}, + { (char *)"SizerFlags_Right", (PyCFunction)_wrap_SizerFlags_Right, METH_O, NULL}, + { (char *)"SizerFlags_Top", (PyCFunction)_wrap_SizerFlags_Top, METH_O, NULL}, + { (char *)"SizerFlags_Bottom", (PyCFunction)_wrap_SizerFlags_Bottom, METH_O, NULL}, + { (char *)"SizerFlags_Shaped", (PyCFunction)_wrap_SizerFlags_Shaped, METH_O, NULL}, + { (char *)"SizerFlags_FixedMinSize", (PyCFunction)_wrap_SizerFlags_FixedMinSize, METH_O, NULL}, + { (char *)"SizerFlags_Border", (PyCFunction) _wrap_SizerFlags_Border, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_DoubleBorder", (PyCFunction) _wrap_SizerFlags_DoubleBorder, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_TripleBorder", (PyCFunction) _wrap_SizerFlags_TripleBorder, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_HorzBorder", (PyCFunction)_wrap_SizerFlags_HorzBorder, METH_O, NULL}, + { (char *)"SizerFlags_DoubleHorzBorder", (PyCFunction)_wrap_SizerFlags_DoubleHorzBorder, METH_O, NULL}, + { (char *)"SizerFlags_GetDefaultBorder", (PyCFunction)_wrap_SizerFlags_GetDefaultBorder, METH_NOARGS, NULL}, + { (char *)"SizerFlags_GetProportion", (PyCFunction)_wrap_SizerFlags_GetProportion, METH_O, NULL}, + { (char *)"SizerFlags_GetFlags", (PyCFunction)_wrap_SizerFlags_GetFlags, METH_O, NULL}, + { (char *)"SizerFlags_GetBorderInPixels", (PyCFunction)_wrap_SizerFlags_GetBorderInPixels, METH_O, NULL}, + { (char *)"SizerFlags_swigregister", SizerFlags_swigregister, METH_VARARGS, NULL}, + { (char *)"SizerFlags_swiginit", SizerFlags_swiginit, METH_VARARGS, NULL}, { (char *)"new_SizerItem", (PyCFunction)_wrap_new_SizerItem, METH_NOARGS, NULL}, { (char *)"delete_SizerItem", (PyCFunction)_wrap_delete_SizerItem, METH_O, NULL}, { (char *)"new_SizerItemWindow", (PyCFunction) _wrap_new_SizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -57795,8 +58806,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_Sizer", (PyCFunction)_wrap_delete_Sizer, METH_O, NULL}, { (char *)"Sizer__setOORInfo", (PyCFunction) _wrap_Sizer__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Add", (PyCFunction) _wrap_Sizer_Add, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Sizer_AddF", (PyCFunction) _wrap_Sizer_AddF, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Insert", (PyCFunction) _wrap_Sizer_Insert, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Sizer_InsertF", (PyCFunction) _wrap_Sizer_InsertF, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Prepend", (PyCFunction) _wrap_Sizer_Prepend, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Sizer_PrependF", (PyCFunction) _wrap_Sizer_PrependF, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Remove", (PyCFunction) _wrap_Sizer_Remove, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Detach", (PyCFunction) _wrap_Sizer_Detach, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_GetItem", (PyCFunction) _wrap_Sizer_GetItem, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -57982,36 +58996,6 @@ static PyMethodDef SwigMethods[] = { /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ -static void *_p_wxGBSizerItemTo_p_wxSizerItem(void *x) { - return (void *)((wxSizerItem *) ((wxGBSizerItem *) x)); -} -static void *_p_wxBoxSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) ((wxBoxSizer *) x)); -} -static void *_p_wxStaticBoxSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxBoxSizer *) ((wxStaticBoxSizer *) x)); -} -static void *_p_wxStdDialogButtonSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); -} -static void *_p_wxGridBagSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxGridSizer *)(wxFlexGridSizer *) ((wxGridBagSizer *) x)); -} -static void *_p_wxGridSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) ((wxGridSizer *) x)); -} -static void *_p_wxFlexGridSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxGridSizer *) ((wxFlexGridSizer *) x)); -} -static void *_p_wxPySizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) ((wxPySizer *) x)); -} -static void *_p_wxStaticBoxSizerTo_p_wxBoxSizer(void *x) { - return (void *)((wxBoxSizer *) ((wxStaticBoxSizer *) x)); -} -static void *_p_wxStdDialogButtonSizerTo_p_wxBoxSizer(void *x) { - return (void *)((wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); -} static void *_p_wxContextMenuEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *) ((wxContextMenuEvent *) x)); } @@ -58126,113 +59110,8 @@ static void *_p_wxKeyEventTo_p_wxEvent(void *x) { static void *_p_wxScrollWinEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) ((wxScrollWinEvent *) x)); } -static void *_p_wxGridBagSizerTo_p_wxGridSizer(void *x) { - return (void *)((wxGridSizer *) (wxFlexGridSizer *) ((wxGridBagSizer *) x)); -} -static void *_p_wxFlexGridSizerTo_p_wxGridSizer(void *x) { - return (void *)((wxGridSizer *) ((wxFlexGridSizer *) x)); -} -static void *_p_wxGridBagSizerTo_p_wxFlexGridSizer(void *x) { - return (void *)((wxFlexGridSizer *) ((wxGridBagSizer *) x)); -} -static void *_p_wxControlWithItemsTo_p_wxItemContainer(void *x) { - return (void *)((wxItemContainer *) ((wxControlWithItems *) x)); -} -static void *_p_wxControlWithItemsTo_p_wxControl(void *x) { - return (void *)((wxControl *) ((wxControlWithItems *) x)); -} -static void *_p_wxControlTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x)); -} -static void *_p_wxWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxWindow *) x)); -} -static void *_p_wxControlWithItemsTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxControlWithItems *) x)); -} -static void *_p_wxPyAppTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxPyApp *) x)); -} -static void *_p_wxValidatorTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxValidator *) x)); -} -static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxValidator *) ((wxPyValidator *) x)); -} -static void *_p_wxMenuBarTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxMenuBar *) x)); -} -static void *_p_wxMenuTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxMenu *) x)); -} -static void *_p_wxANIHandlerTo_p_wxCURHandler(void *x) { - return (void *)((wxCURHandler *) ((wxANIHandler *) x)); -} -static void *_p_wxCURHandlerTo_p_wxICOHandler(void *x) { - return (void *)((wxICOHandler *) ((wxCURHandler *) x)); -} -static void *_p_wxANIHandlerTo_p_wxICOHandler(void *x) { - return (void *)((wxICOHandler *) (wxCURHandler *) ((wxANIHandler *) x)); -} -static void *_p_wxICOHandlerTo_p_wxBMPHandler(void *x) { - return (void *)((wxBMPHandler *) ((wxICOHandler *) x)); -} -static void *_p_wxCURHandlerTo_p_wxBMPHandler(void *x) { - return (void *)((wxBMPHandler *) (wxICOHandler *) ((wxCURHandler *) x)); -} -static void *_p_wxANIHandlerTo_p_wxBMPHandler(void *x) { - return (void *)((wxBMPHandler *) (wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x)); -} -static void *_p_wxPyImageHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxPyImageHandler *) x)); -} -static void *_p_wxBMPHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxBMPHandler *) x)); -} -static void *_p_wxICOHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) (wxBMPHandler *) ((wxICOHandler *) x)); -} -static void *_p_wxCURHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *) ((wxCURHandler *) x)); -} -static void *_p_wxANIHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x)); -} -static void *_p_wxPNGHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxPNGHandler *) x)); -} -static void *_p_wxGIFHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxGIFHandler *) x)); -} -static void *_p_wxPCXHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxPCXHandler *) x)); -} -static void *_p_wxJPEGHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxJPEGHandler *) x)); -} -static void *_p_wxPNMHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxPNMHandler *) x)); -} -static void *_p_wxXPMHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxXPMHandler *) x)); -} -static void *_p_wxTIFFHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxTIFFHandler *) x)); -} -static void *_p_wxTGAHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxTGAHandler *) x)); -} -static void *_p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler(void *x) { - return (void *)((wxFileSystemHandler *) ((wxPyFileSystemHandler *) x)); -} -static void *_p_wxInternetFSHandlerTo_p_wxFileSystemHandler(void *x) { - return (void *)((wxFileSystemHandler *) ((wxInternetFSHandler *) x)); -} -static void *_p_wxZipFSHandlerTo_p_wxFileSystemHandler(void *x) { - return (void *)((wxFileSystemHandler *) ((wxZipFSHandler *) x)); -} -static void *_p_wxMemoryFSHandlerTo_p_wxFileSystemHandler(void *x) { - return (void *)((wxFileSystemHandler *) ((wxMemoryFSHandler *) x)); +static void *_p_wxPyValidatorTo_p_wxValidator(void *x) { + return (void *)((wxValidator *) ((wxPyValidator *) x)); } static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxLayoutConstraints *) x)); @@ -58471,6 +59350,144 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) { static void *_p_wxValidatorTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x)); } +static void *_p_wxGridBagSizerTo_p_wxFlexGridSizer(void *x) { + return (void *)((wxFlexGridSizer *) ((wxGridBagSizer *) x)); +} +static void *_p_wxGridBagSizerTo_p_wxGridSizer(void *x) { + return (void *)((wxGridSizer *) (wxFlexGridSizer *) ((wxGridBagSizer *) x)); +} +static void *_p_wxFlexGridSizerTo_p_wxGridSizer(void *x) { + return (void *)((wxGridSizer *) ((wxFlexGridSizer *) x)); +} +static void *_p_wxControlWithItemsTo_p_wxControl(void *x) { + return (void *)((wxControl *) ((wxControlWithItems *) x)); +} +static void *_p_wxControlWithItemsTo_p_wxItemContainer(void *x) { + return (void *)((wxItemContainer *) ((wxControlWithItems *) x)); +} +static void *_p_wxStaticBoxSizerTo_p_wxBoxSizer(void *x) { + return (void *)((wxBoxSizer *) ((wxStaticBoxSizer *) x)); +} +static void *_p_wxStdDialogButtonSizerTo_p_wxBoxSizer(void *x) { + return (void *)((wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); +} +static void *_p_wxBoxSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) ((wxBoxSizer *) x)); +} +static void *_p_wxStaticBoxSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) (wxBoxSizer *) ((wxStaticBoxSizer *) x)); +} +static void *_p_wxStdDialogButtonSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) (wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); +} +static void *_p_wxGridBagSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) (wxGridSizer *)(wxFlexGridSizer *) ((wxGridBagSizer *) x)); +} +static void *_p_wxGridSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) ((wxGridSizer *) x)); +} +static void *_p_wxFlexGridSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) (wxGridSizer *) ((wxFlexGridSizer *) x)); +} +static void *_p_wxPySizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) ((wxPySizer *) x)); +} +static void *_p_wxGBSizerItemTo_p_wxSizerItem(void *x) { + return (void *)((wxSizerItem *) ((wxGBSizerItem *) x)); +} +static void *_p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler(void *x) { + return (void *)((wxFileSystemHandler *) ((wxPyFileSystemHandler *) x)); +} +static void *_p_wxInternetFSHandlerTo_p_wxFileSystemHandler(void *x) { + return (void *)((wxFileSystemHandler *) ((wxInternetFSHandler *) x)); +} +static void *_p_wxZipFSHandlerTo_p_wxFileSystemHandler(void *x) { + return (void *)((wxFileSystemHandler *) ((wxZipFSHandler *) x)); +} +static void *_p_wxMemoryFSHandlerTo_p_wxFileSystemHandler(void *x) { + return (void *)((wxFileSystemHandler *) ((wxMemoryFSHandler *) x)); +} +static void *_p_wxPyImageHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxPyImageHandler *) x)); +} +static void *_p_wxBMPHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxBMPHandler *) x)); +} +static void *_p_wxICOHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) (wxBMPHandler *) ((wxICOHandler *) x)); +} +static void *_p_wxCURHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *) ((wxCURHandler *) x)); +} +static void *_p_wxANIHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x)); +} +static void *_p_wxPNGHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxPNGHandler *) x)); +} +static void *_p_wxGIFHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxGIFHandler *) x)); +} +static void *_p_wxPCXHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxPCXHandler *) x)); +} +static void *_p_wxJPEGHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxJPEGHandler *) x)); +} +static void *_p_wxPNMHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxPNMHandler *) x)); +} +static void *_p_wxXPMHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxXPMHandler *) x)); +} +static void *_p_wxTIFFHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxTIFFHandler *) x)); +} +static void *_p_wxTGAHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxTGAHandler *) x)); +} +static void *_p_wxICOHandlerTo_p_wxBMPHandler(void *x) { + return (void *)((wxBMPHandler *) ((wxICOHandler *) x)); +} +static void *_p_wxCURHandlerTo_p_wxBMPHandler(void *x) { + return (void *)((wxBMPHandler *) (wxICOHandler *) ((wxCURHandler *) x)); +} +static void *_p_wxANIHandlerTo_p_wxBMPHandler(void *x) { + return (void *)((wxBMPHandler *) (wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x)); +} +static void *_p_wxCURHandlerTo_p_wxICOHandler(void *x) { + return (void *)((wxICOHandler *) ((wxCURHandler *) x)); +} +static void *_p_wxANIHandlerTo_p_wxICOHandler(void *x) { + return (void *)((wxICOHandler *) (wxCURHandler *) ((wxANIHandler *) x)); +} +static void *_p_wxANIHandlerTo_p_wxCURHandler(void *x) { + return (void *)((wxCURHandler *) ((wxANIHandler *) x)); +} +static void *_p_wxControlTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x)); +} +static void *_p_wxWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxWindow *) x)); +} +static void *_p_wxControlWithItemsTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxControlWithItems *) x)); +} +static void *_p_wxPyAppTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxPyApp *) x)); +} +static void *_p_wxValidatorTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxValidator *) x)); +} +static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxValidator *) ((wxPyValidator *) x)); +} +static void *_p_wxMenuBarTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxMenuBar *) x)); +} +static void *_p_wxMenuTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxMenu *) x)); +} static void *_p_wxControlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) ((wxControl *) x)); } @@ -58510,9 +59527,6 @@ static void *_p_wxNotifyEventTo_p_wxCommandEvent(void *x) { static void *_p_wxPyCommandEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) ((wxPyCommandEvent *) x)); } -static void *_p_wxPyValidatorTo_p_wxValidator(void *x) { - return (void *)((wxValidator *) ((wxPyValidator *) x)); -} static swig_type_info _swigt__p_buffer = {"_p_buffer", "buffer *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0}; @@ -58632,6 +59646,7 @@ static swig_type_info _swigt__p_wxShowEvent = {"_p_wxShowEvent", "wxShowEvent *" static swig_type_info _swigt__p_wxSize = {"_p_wxSize", "wxSize *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxSizeEvent = {"_p_wxSizeEvent", "wxSizeEvent *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxSizer = {"_p_wxSizer", "wxSizer *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_wxSizerFlags = {"_p_wxSizerFlags", "wxSizerFlags *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxSizerItem = {"_p_wxSizerItem", "wxSizerItem *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxStaticBox = {"_p_wxStaticBox", "wxStaticBox *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxStaticBoxSizer = {"_p_wxStaticBoxSizer", "wxStaticBoxSizer *", 0, 0, (void*)0, 0}; @@ -58769,6 +59784,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxSize, &_swigt__p_wxSizeEvent, &_swigt__p_wxSizer, + &_swigt__p_wxSizerFlags, &_swigt__p_wxSizerItem, &_swigt__p_wxStaticBox, &_swigt__p_wxStaticBoxSizer, @@ -58906,6 +59922,7 @@ static swig_cast_info _swigc__p_wxShowEvent[] = { {&_swigt__p_wxShowEvent, 0, 0 static swig_cast_info _swigc__p_wxSize[] = { {&_swigt__p_wxSize, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSizeEvent[] = { {&_swigt__p_wxSizeEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSizer[] = { {&_swigt__p_wxSizer, 0, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxSizer, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxSizerFlags[] = { {&_swigt__p_wxSizerFlags, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSizerItem[] = { {&_swigt__p_wxSizerItem, 0, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxSizerItem, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStaticBox[] = { {&_swigt__p_wxStaticBox, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStaticBoxSizer[] = { {&_swigt__p_wxStaticBoxSizer, 0, 0, 0},{0, 0, 0, 0}}; @@ -59043,6 +60060,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxSize, _swigc__p_wxSizeEvent, _swigc__p_wxSizer, + _swigc__p_wxSizerFlags, _swigc__p_wxSizerItem, _swigc__p_wxStaticBox, _swigc__p_wxStaticBoxSizer, diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 1457f8c2cf..bc34ed6120 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -11574,6 +11574,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(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(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 @@ -11969,6 +12185,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, @@ -11979,6 +12204,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, @@ -11989,6 +12223,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 diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index ea8a19c731..89ebea237a 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -2582,24 +2582,25 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxSize swig_types[116] #define SWIGTYPE_p_wxSizeEvent swig_types[117] #define SWIGTYPE_p_wxSizer swig_types[118] -#define SWIGTYPE_p_wxSizerItem swig_types[119] -#define SWIGTYPE_p_wxStaticBox swig_types[120] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[121] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[122] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[123] -#define SWIGTYPE_p_wxTGAHandler swig_types[124] -#define SWIGTYPE_p_wxTIFFHandler swig_types[125] -#define SWIGTYPE_p_wxToolTip swig_types[126] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[127] -#define SWIGTYPE_p_wxValidator swig_types[128] -#define SWIGTYPE_p_wxVisualAttributes swig_types[129] -#define SWIGTYPE_p_wxWindow swig_types[130] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[131] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[132] -#define SWIGTYPE_p_wxXPMHandler swig_types[133] -#define SWIGTYPE_p_wxZipFSHandler swig_types[134] -static swig_type_info *swig_types[136]; -static swig_module_info swig_module = {swig_types, 135, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxSizerFlags swig_types[119] +#define SWIGTYPE_p_wxSizerItem swig_types[120] +#define SWIGTYPE_p_wxStaticBox swig_types[121] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[122] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[123] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[124] +#define SWIGTYPE_p_wxTGAHandler swig_types[125] +#define SWIGTYPE_p_wxTIFFHandler swig_types[126] +#define SWIGTYPE_p_wxToolTip swig_types[127] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[128] +#define SWIGTYPE_p_wxValidator swig_types[129] +#define SWIGTYPE_p_wxVisualAttributes swig_types[130] +#define SWIGTYPE_p_wxWindow swig_types[131] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[132] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[133] +#define SWIGTYPE_p_wxXPMHandler swig_types[134] +#define SWIGTYPE_p_wxZipFSHandler swig_types[135] +static swig_type_info *swig_types[137]; +static swig_module_info swig_module = {swig_types, 136, 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) @@ -4005,6 +4006,12 @@ SWIGINTERN void wxItemContainer_SetClientData(wxItemContainer *self,int n,PyObje } +SWIGINTERN wxSizerFlags &wxSizerFlags_Border(wxSizerFlags *self,int direction=wxALL,int borderInPixels=-1){ + if (borderInPixels == -1) + return self->Border(direction); + else + return self->Border(direction, borderInPixels); + } SWIGINTERN wxSizerItem *new_wxSizerItem(wxWindow *window,int proportion,int flag,int border,PyObject *userData=NULL){ wxPyUserData* data = NULL; if ( userData ) { @@ -4148,6 +4155,27 @@ SWIGINTERN wxSizerItem *wxSizer_Add(wxSizer *self,PyObject *item,int proportion= else return NULL; } +SWIGINTERN wxSizerItem *wxSizer_AddF(wxSizer *self,PyObject *item,wxSizerFlags &flags){ + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); + wxPyEndBlockThreads(blocked); + + // Now call the real Add method if a valid item type was found + if ( info.window ) + return self->Add(info.window, flags); + else if ( info.sizer ) + return self->Add(info.sizer, flags); + else if (info.gotSize) + return self->Add(info.size.GetWidth(), info.size.GetHeight(), + flags.GetProportion(), + flags.GetFlags(), + flags.GetBorderInPixels()); + else + return NULL; + } SWIGINTERN wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){ wxPyUserData* data = NULL; @@ -4170,6 +4198,27 @@ SWIGINTERN wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,i else return NULL; } +SWIGINTERN wxSizerItem *wxSizer_InsertF(wxSizer *self,int before,PyObject *item,wxSizerFlags &flags){ + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); + wxPyEndBlockThreads(blocked); + + // Now call the real Insert method if a valid item type was found + if ( info.window ) + return self->Insert(before, info.window, flags); + else if ( info.sizer ) + return self->Insert(before, info.sizer, flags); + else if (info.gotSize) + return self->Insert(before, info.size.GetWidth(), info.size.GetHeight(), + flags.GetProportion(), + flags.GetFlags(), + flags.GetBorderInPixels()); + else + return NULL; + } SWIGINTERN wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){ wxPyUserData* data = NULL; @@ -4192,6 +4241,27 @@ SWIGINTERN wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proport else return NULL; } +SWIGINTERN wxSizerItem *wxSizer_PrependF(wxSizer *self,PyObject *item,wxSizerFlags &flags){ + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); + wxPyEndBlockThreads(blocked); + + // Now call the real Add method if a valid item type was found + if ( info.window ) + return self->Prepend(info.window, flags); + else if ( info.sizer ) + return self->Prepend(info.sizer, flags); + else if (info.gotSize) + return self->Prepend(info.size.GetWidth(), info.size.GetHeight(), + flags.GetProportion(), + flags.GetFlags(), + flags.GetBorderInPixels()); + else + return NULL; + } SWIGINTERN bool wxSizer_Remove(wxSizer *self,PyObject *item){ wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); @@ -48416,6 +48486,779 @@ SWIGINTERN PyObject *ControlWithItems_swigregister(PyObject *SWIGUNUSEDPARM(self return SWIG_Py_Void(); } +SWIGINTERN PyObject *_wrap_new_SizerFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + int arg1 = (int) 0 ; + wxSizerFlags *result = 0 ; + int val1 ; + int ecode1 = 0 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "proportion", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_SizerFlags",kwnames,&obj0)) SWIG_fail; + if (obj0) { + ecode1 = SWIG_AsVal_int(obj0, &val1); + if (!SWIG_IsOK(ecode1)) { + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SizerFlags" "', expected argument " "1"" of type '" "int""'"); + } + arg1 = static_cast< int >(val1); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizerFlags *)new wxSizerFlags(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerFlags, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_delete_SizerFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SizerFlags" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Proportion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "proportion", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerFlags_Proportion",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Proportion" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Proportion" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Proportion(arg2); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Align(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "alignment", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerFlags_Align",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Align" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Align" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Align(arg2); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Expand(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Expand" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Expand(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Centre(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Centre" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Centre(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Center" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Center(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Left(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Left" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Left(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Right(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Right" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Right(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Top(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Top" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Top(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Bottom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Bottom" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Bottom(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Shaped(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Shaped" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->Shaped(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_FixedMinSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_FixedMinSize" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->FixedMinSize(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_Border(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 = (int) wxALL ; + int arg3 = (int) -1 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + int val3 ; + int ecode3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "direction",(char *) "borderInPixels", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:SizerFlags_Border",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Border" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Border" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + } + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SizerFlags_Border" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = wxSizerFlags_Border(arg1,arg2,arg3); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_DoubleBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 = (int) wxALL ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "direction", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:SizerFlags_DoubleBorder",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_DoubleBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_DoubleBorder" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->DoubleBorder(arg2); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_TripleBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int arg2 = (int) wxALL ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "direction", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:SizerFlags_TripleBorder",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_TripleBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + if (obj1) { + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_TripleBorder" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->TripleBorder(arg2); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = obj0; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_HorzBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_HorzBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->HorzBorder(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_DoubleHorzBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + wxSizerFlags *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_DoubleHorzBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + { + wxSizerFlags &_result_ref = (arg1)->DoubleHorzBorder(); + result = (wxSizerFlags *) &_result_ref; + } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = swig_obj[0]; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_GetDefaultBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + int result; + + if (!SWIG_Python_UnpackTuple(args,"SizerFlags_GetDefaultBorder",0,0,0)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)wxSizerFlags::GetDefaultBorder(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_GetProportion(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetProportion" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxSizerFlags const *)arg1)->GetProportion(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_GetFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetFlags" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxSizerFlags const *)arg1)->GetFlags(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_SizerFlags_GetBorderInPixels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxSizerFlags *arg1 = (wxSizerFlags *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetBorderInPixels" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); + } + arg1 = reinterpret_cast< wxSizerFlags * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxSizerFlags const *)arg1)->GetBorderInPixels(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *SizerFlags_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_wxSizerFlags, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *SizerFlags_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + SWIGINTERN PyObject *_wrap_new_SizerItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxSizerItem *result = 0 ; @@ -49872,6 +50715,51 @@ fail: } +SWIGINTERN PyObject *_wrap_Sizer_AddF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizer *arg1 = (wxSizer *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + wxSizerFlags *arg3 = 0 ; + wxSizerItem *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item",(char *) "flags", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_AddF",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_AddF" "', expected argument " "1"" of type '" "wxSizer *""'"); + } + arg1 = reinterpret_cast< wxSizer * >(argp1); + arg2 = obj1; + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxSizerFlags, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer_AddF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_AddF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); + } + arg3 = reinterpret_cast< wxSizerFlags * >(argp3); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizerItem *)wxSizer_AddF(arg1,arg2,*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Sizer_Insert(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizer *arg1 = (wxSizer *) 0 ; @@ -49952,6 +50840,60 @@ fail: } +SWIGINTERN PyObject *_wrap_Sizer_InsertF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizer *arg1 = (wxSizer *) 0 ; + int arg2 ; + PyObject *arg3 = (PyObject *) 0 ; + wxSizerFlags *arg4 = 0 ; + wxSizerItem *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + void *argp4 = 0 ; + int res4 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "before",(char *) "item",(char *) "flags", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Sizer_InsertF",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_InsertF" "', expected argument " "1"" of type '" "wxSizer *""'"); + } + arg1 = reinterpret_cast< wxSizer * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Sizer_InsertF" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + arg3 = obj2; + res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxSizerFlags, 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "Sizer_InsertF" "', expected argument " "4"" of type '" "wxSizerFlags &""'"); + } + if (!argp4) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_InsertF" "', expected argument " "4"" of type '" "wxSizerFlags &""'"); + } + arg4 = reinterpret_cast< wxSizerFlags * >(argp4); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizerItem *)wxSizer_InsertF(arg1,arg2,arg3,*arg4); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Sizer_Prepend(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizer *arg1 = (wxSizer *) 0 ; @@ -50023,6 +50965,51 @@ fail: } +SWIGINTERN PyObject *_wrap_Sizer_PrependF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxSizer *arg1 = (wxSizer *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + wxSizerFlags *arg3 = 0 ; + wxSizerItem *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "item",(char *) "flags", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_PrependF",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_PrependF" "', expected argument " "1"" of type '" "wxSizer *""'"); + } + arg1 = reinterpret_cast< wxSizer * >(argp1); + arg2 = obj1; + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxSizerFlags, 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer_PrependF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_PrependF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); + } + arg3 = reinterpret_cast< wxSizerFlags * >(argp3); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSizerItem *)wxSizer_PrependF(arg1,arg2,*arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Sizer_Remove(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxSizer *arg1 = (wxSizer *) 0 ; @@ -57779,6 +58766,30 @@ static PyMethodDef SwigMethods[] = { { (char *)"ItemContainer_Select", (PyCFunction) _wrap_ItemContainer_Select, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ItemContainer_swigregister", ItemContainer_swigregister, METH_VARARGS, NULL}, { (char *)"ControlWithItems_swigregister", ControlWithItems_swigregister, METH_VARARGS, NULL}, + { (char *)"new_SizerFlags", (PyCFunction) _wrap_new_SizerFlags, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_SizerFlags", (PyCFunction)_wrap_delete_SizerFlags, METH_O, NULL}, + { (char *)"SizerFlags_Proportion", (PyCFunction) _wrap_SizerFlags_Proportion, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_Align", (PyCFunction) _wrap_SizerFlags_Align, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_Expand", (PyCFunction)_wrap_SizerFlags_Expand, METH_O, NULL}, + { (char *)"SizerFlags_Centre", (PyCFunction)_wrap_SizerFlags_Centre, METH_O, NULL}, + { (char *)"SizerFlags_Center", (PyCFunction)_wrap_SizerFlags_Center, METH_O, NULL}, + { (char *)"SizerFlags_Left", (PyCFunction)_wrap_SizerFlags_Left, METH_O, NULL}, + { (char *)"SizerFlags_Right", (PyCFunction)_wrap_SizerFlags_Right, METH_O, NULL}, + { (char *)"SizerFlags_Top", (PyCFunction)_wrap_SizerFlags_Top, METH_O, NULL}, + { (char *)"SizerFlags_Bottom", (PyCFunction)_wrap_SizerFlags_Bottom, METH_O, NULL}, + { (char *)"SizerFlags_Shaped", (PyCFunction)_wrap_SizerFlags_Shaped, METH_O, NULL}, + { (char *)"SizerFlags_FixedMinSize", (PyCFunction)_wrap_SizerFlags_FixedMinSize, METH_O, NULL}, + { (char *)"SizerFlags_Border", (PyCFunction) _wrap_SizerFlags_Border, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_DoubleBorder", (PyCFunction) _wrap_SizerFlags_DoubleBorder, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_TripleBorder", (PyCFunction) _wrap_SizerFlags_TripleBorder, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"SizerFlags_HorzBorder", (PyCFunction)_wrap_SizerFlags_HorzBorder, METH_O, NULL}, + { (char *)"SizerFlags_DoubleHorzBorder", (PyCFunction)_wrap_SizerFlags_DoubleHorzBorder, METH_O, NULL}, + { (char *)"SizerFlags_GetDefaultBorder", (PyCFunction)_wrap_SizerFlags_GetDefaultBorder, METH_NOARGS, NULL}, + { (char *)"SizerFlags_GetProportion", (PyCFunction)_wrap_SizerFlags_GetProportion, METH_O, NULL}, + { (char *)"SizerFlags_GetFlags", (PyCFunction)_wrap_SizerFlags_GetFlags, METH_O, NULL}, + { (char *)"SizerFlags_GetBorderInPixels", (PyCFunction)_wrap_SizerFlags_GetBorderInPixels, METH_O, NULL}, + { (char *)"SizerFlags_swigregister", SizerFlags_swigregister, METH_VARARGS, NULL}, + { (char *)"SizerFlags_swiginit", SizerFlags_swiginit, METH_VARARGS, NULL}, { (char *)"new_SizerItem", (PyCFunction)_wrap_new_SizerItem, METH_NOARGS, NULL}, { (char *)"delete_SizerItem", (PyCFunction)_wrap_delete_SizerItem, METH_O, NULL}, { (char *)"new_SizerItemWindow", (PyCFunction) _wrap_new_SizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -57822,8 +58833,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_Sizer", (PyCFunction)_wrap_delete_Sizer, METH_O, NULL}, { (char *)"Sizer__setOORInfo", (PyCFunction) _wrap_Sizer__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Add", (PyCFunction) _wrap_Sizer_Add, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Sizer_AddF", (PyCFunction) _wrap_Sizer_AddF, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Insert", (PyCFunction) _wrap_Sizer_Insert, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Sizer_InsertF", (PyCFunction) _wrap_Sizer_InsertF, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Prepend", (PyCFunction) _wrap_Sizer_Prepend, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Sizer_PrependF", (PyCFunction) _wrap_Sizer_PrependF, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Remove", (PyCFunction) _wrap_Sizer_Remove, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Detach", (PyCFunction) _wrap_Sizer_Detach, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_GetItem", (PyCFunction) _wrap_Sizer_GetItem, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -58009,36 +59023,6 @@ static PyMethodDef SwigMethods[] = { /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ -static void *_p_wxGBSizerItemTo_p_wxSizerItem(void *x) { - return (void *)((wxSizerItem *) ((wxGBSizerItem *) x)); -} -static void *_p_wxBoxSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) ((wxBoxSizer *) x)); -} -static void *_p_wxStaticBoxSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxBoxSizer *) ((wxStaticBoxSizer *) x)); -} -static void *_p_wxStdDialogButtonSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); -} -static void *_p_wxGridBagSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxGridSizer *)(wxFlexGridSizer *) ((wxGridBagSizer *) x)); -} -static void *_p_wxGridSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) ((wxGridSizer *) x)); -} -static void *_p_wxFlexGridSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxGridSizer *) ((wxFlexGridSizer *) x)); -} -static void *_p_wxPySizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) ((wxPySizer *) x)); -} -static void *_p_wxStaticBoxSizerTo_p_wxBoxSizer(void *x) { - return (void *)((wxBoxSizer *) ((wxStaticBoxSizer *) x)); -} -static void *_p_wxStdDialogButtonSizerTo_p_wxBoxSizer(void *x) { - return (void *)((wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); -} static void *_p_wxContextMenuEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *) ((wxContextMenuEvent *) x)); } @@ -58153,113 +59137,8 @@ static void *_p_wxKeyEventTo_p_wxEvent(void *x) { static void *_p_wxScrollWinEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) ((wxScrollWinEvent *) x)); } -static void *_p_wxGridBagSizerTo_p_wxGridSizer(void *x) { - return (void *)((wxGridSizer *) (wxFlexGridSizer *) ((wxGridBagSizer *) x)); -} -static void *_p_wxFlexGridSizerTo_p_wxGridSizer(void *x) { - return (void *)((wxGridSizer *) ((wxFlexGridSizer *) x)); -} -static void *_p_wxGridBagSizerTo_p_wxFlexGridSizer(void *x) { - return (void *)((wxFlexGridSizer *) ((wxGridBagSizer *) x)); -} -static void *_p_wxControlWithItemsTo_p_wxItemContainer(void *x) { - return (void *)((wxItemContainer *) ((wxControlWithItems *) x)); -} -static void *_p_wxControlWithItemsTo_p_wxControl(void *x) { - return (void *)((wxControl *) ((wxControlWithItems *) x)); -} -static void *_p_wxControlTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x)); -} -static void *_p_wxWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxWindow *) x)); -} -static void *_p_wxControlWithItemsTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxControlWithItems *) x)); -} -static void *_p_wxPyAppTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxPyApp *) x)); -} -static void *_p_wxValidatorTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxValidator *) x)); -} -static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxValidator *) ((wxPyValidator *) x)); -} -static void *_p_wxMenuBarTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxMenuBar *) x)); -} -static void *_p_wxMenuTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxMenu *) x)); -} -static void *_p_wxANIHandlerTo_p_wxCURHandler(void *x) { - return (void *)((wxCURHandler *) ((wxANIHandler *) x)); -} -static void *_p_wxCURHandlerTo_p_wxICOHandler(void *x) { - return (void *)((wxICOHandler *) ((wxCURHandler *) x)); -} -static void *_p_wxANIHandlerTo_p_wxICOHandler(void *x) { - return (void *)((wxICOHandler *) (wxCURHandler *) ((wxANIHandler *) x)); -} -static void *_p_wxICOHandlerTo_p_wxBMPHandler(void *x) { - return (void *)((wxBMPHandler *) ((wxICOHandler *) x)); -} -static void *_p_wxCURHandlerTo_p_wxBMPHandler(void *x) { - return (void *)((wxBMPHandler *) (wxICOHandler *) ((wxCURHandler *) x)); -} -static void *_p_wxANIHandlerTo_p_wxBMPHandler(void *x) { - return (void *)((wxBMPHandler *) (wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x)); -} -static void *_p_wxPyImageHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxPyImageHandler *) x)); -} -static void *_p_wxBMPHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxBMPHandler *) x)); -} -static void *_p_wxICOHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) (wxBMPHandler *) ((wxICOHandler *) x)); -} -static void *_p_wxCURHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *) ((wxCURHandler *) x)); -} -static void *_p_wxANIHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x)); -} -static void *_p_wxPNGHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxPNGHandler *) x)); -} -static void *_p_wxGIFHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxGIFHandler *) x)); -} -static void *_p_wxPCXHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxPCXHandler *) x)); -} -static void *_p_wxJPEGHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxJPEGHandler *) x)); -} -static void *_p_wxPNMHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxPNMHandler *) x)); -} -static void *_p_wxXPMHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxXPMHandler *) x)); -} -static void *_p_wxTIFFHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxTIFFHandler *) x)); -} -static void *_p_wxTGAHandlerTo_p_wxImageHandler(void *x) { - return (void *)((wxImageHandler *) ((wxTGAHandler *) x)); -} -static void *_p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler(void *x) { - return (void *)((wxFileSystemHandler *) ((wxPyFileSystemHandler *) x)); -} -static void *_p_wxInternetFSHandlerTo_p_wxFileSystemHandler(void *x) { - return (void *)((wxFileSystemHandler *) ((wxInternetFSHandler *) x)); -} -static void *_p_wxZipFSHandlerTo_p_wxFileSystemHandler(void *x) { - return (void *)((wxFileSystemHandler *) ((wxZipFSHandler *) x)); -} -static void *_p_wxMemoryFSHandlerTo_p_wxFileSystemHandler(void *x) { - return (void *)((wxFileSystemHandler *) ((wxMemoryFSHandler *) x)); +static void *_p_wxPyValidatorTo_p_wxValidator(void *x) { + return (void *)((wxValidator *) ((wxPyValidator *) x)); } static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxLayoutConstraints *) x)); @@ -58498,6 +59377,144 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) { static void *_p_wxValidatorTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x)); } +static void *_p_wxGridBagSizerTo_p_wxFlexGridSizer(void *x) { + return (void *)((wxFlexGridSizer *) ((wxGridBagSizer *) x)); +} +static void *_p_wxGridBagSizerTo_p_wxGridSizer(void *x) { + return (void *)((wxGridSizer *) (wxFlexGridSizer *) ((wxGridBagSizer *) x)); +} +static void *_p_wxFlexGridSizerTo_p_wxGridSizer(void *x) { + return (void *)((wxGridSizer *) ((wxFlexGridSizer *) x)); +} +static void *_p_wxControlWithItemsTo_p_wxControl(void *x) { + return (void *)((wxControl *) ((wxControlWithItems *) x)); +} +static void *_p_wxControlWithItemsTo_p_wxItemContainer(void *x) { + return (void *)((wxItemContainer *) ((wxControlWithItems *) x)); +} +static void *_p_wxStaticBoxSizerTo_p_wxBoxSizer(void *x) { + return (void *)((wxBoxSizer *) ((wxStaticBoxSizer *) x)); +} +static void *_p_wxStdDialogButtonSizerTo_p_wxBoxSizer(void *x) { + return (void *)((wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); +} +static void *_p_wxBoxSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) ((wxBoxSizer *) x)); +} +static void *_p_wxStaticBoxSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) (wxBoxSizer *) ((wxStaticBoxSizer *) x)); +} +static void *_p_wxStdDialogButtonSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) (wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); +} +static void *_p_wxGridBagSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) (wxGridSizer *)(wxFlexGridSizer *) ((wxGridBagSizer *) x)); +} +static void *_p_wxGridSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) ((wxGridSizer *) x)); +} +static void *_p_wxFlexGridSizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) (wxGridSizer *) ((wxFlexGridSizer *) x)); +} +static void *_p_wxPySizerTo_p_wxSizer(void *x) { + return (void *)((wxSizer *) ((wxPySizer *) x)); +} +static void *_p_wxGBSizerItemTo_p_wxSizerItem(void *x) { + return (void *)((wxSizerItem *) ((wxGBSizerItem *) x)); +} +static void *_p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler(void *x) { + return (void *)((wxFileSystemHandler *) ((wxPyFileSystemHandler *) x)); +} +static void *_p_wxInternetFSHandlerTo_p_wxFileSystemHandler(void *x) { + return (void *)((wxFileSystemHandler *) ((wxInternetFSHandler *) x)); +} +static void *_p_wxZipFSHandlerTo_p_wxFileSystemHandler(void *x) { + return (void *)((wxFileSystemHandler *) ((wxZipFSHandler *) x)); +} +static void *_p_wxMemoryFSHandlerTo_p_wxFileSystemHandler(void *x) { + return (void *)((wxFileSystemHandler *) ((wxMemoryFSHandler *) x)); +} +static void *_p_wxPyImageHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxPyImageHandler *) x)); +} +static void *_p_wxBMPHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxBMPHandler *) x)); +} +static void *_p_wxICOHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) (wxBMPHandler *) ((wxICOHandler *) x)); +} +static void *_p_wxCURHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *) ((wxCURHandler *) x)); +} +static void *_p_wxANIHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x)); +} +static void *_p_wxPNGHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxPNGHandler *) x)); +} +static void *_p_wxGIFHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxGIFHandler *) x)); +} +static void *_p_wxPCXHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxPCXHandler *) x)); +} +static void *_p_wxJPEGHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxJPEGHandler *) x)); +} +static void *_p_wxPNMHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxPNMHandler *) x)); +} +static void *_p_wxXPMHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxXPMHandler *) x)); +} +static void *_p_wxTIFFHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxTIFFHandler *) x)); +} +static void *_p_wxTGAHandlerTo_p_wxImageHandler(void *x) { + return (void *)((wxImageHandler *) ((wxTGAHandler *) x)); +} +static void *_p_wxICOHandlerTo_p_wxBMPHandler(void *x) { + return (void *)((wxBMPHandler *) ((wxICOHandler *) x)); +} +static void *_p_wxCURHandlerTo_p_wxBMPHandler(void *x) { + return (void *)((wxBMPHandler *) (wxICOHandler *) ((wxCURHandler *) x)); +} +static void *_p_wxANIHandlerTo_p_wxBMPHandler(void *x) { + return (void *)((wxBMPHandler *) (wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x)); +} +static void *_p_wxCURHandlerTo_p_wxICOHandler(void *x) { + return (void *)((wxICOHandler *) ((wxCURHandler *) x)); +} +static void *_p_wxANIHandlerTo_p_wxICOHandler(void *x) { + return (void *)((wxICOHandler *) (wxCURHandler *) ((wxANIHandler *) x)); +} +static void *_p_wxANIHandlerTo_p_wxCURHandler(void *x) { + return (void *)((wxCURHandler *) ((wxANIHandler *) x)); +} +static void *_p_wxControlTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x)); +} +static void *_p_wxWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxWindow *) x)); +} +static void *_p_wxControlWithItemsTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxControlWithItems *) x)); +} +static void *_p_wxPyAppTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxPyApp *) x)); +} +static void *_p_wxValidatorTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxValidator *) x)); +} +static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxValidator *) ((wxPyValidator *) x)); +} +static void *_p_wxMenuBarTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxMenuBar *) x)); +} +static void *_p_wxMenuTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxMenu *) x)); +} static void *_p_wxControlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) ((wxControl *) x)); } @@ -58537,9 +59554,6 @@ static void *_p_wxNotifyEventTo_p_wxCommandEvent(void *x) { static void *_p_wxPyCommandEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) ((wxPyCommandEvent *) x)); } -static void *_p_wxPyValidatorTo_p_wxValidator(void *x) { - return (void *)((wxValidator *) ((wxPyValidator *) x)); -} static swig_type_info _swigt__p_buffer = {"_p_buffer", "buffer *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0}; @@ -58659,6 +59673,7 @@ static swig_type_info _swigt__p_wxShowEvent = {"_p_wxShowEvent", "wxShowEvent *" static swig_type_info _swigt__p_wxSize = {"_p_wxSize", "wxSize *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxSizeEvent = {"_p_wxSizeEvent", "wxSizeEvent *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxSizer = {"_p_wxSizer", "wxSizer *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_wxSizerFlags = {"_p_wxSizerFlags", "wxSizerFlags *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxSizerItem = {"_p_wxSizerItem", "wxSizerItem *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxStaticBox = {"_p_wxStaticBox", "wxStaticBox *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxStaticBoxSizer = {"_p_wxStaticBoxSizer", "wxStaticBoxSizer *", 0, 0, (void*)0, 0}; @@ -58796,6 +59811,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxSize, &_swigt__p_wxSizeEvent, &_swigt__p_wxSizer, + &_swigt__p_wxSizerFlags, &_swigt__p_wxSizerItem, &_swigt__p_wxStaticBox, &_swigt__p_wxStaticBoxSizer, @@ -58933,6 +59949,7 @@ static swig_cast_info _swigc__p_wxShowEvent[] = { {&_swigt__p_wxShowEvent, 0, 0 static swig_cast_info _swigc__p_wxSize[] = { {&_swigt__p_wxSize, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSizeEvent[] = { {&_swigt__p_wxSizeEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSizer[] = { {&_swigt__p_wxSizer, 0, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxSizer, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxSizer, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxSizerFlags[] = { {&_swigt__p_wxSizerFlags, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSizerItem[] = { {&_swigt__p_wxSizerItem, 0, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxSizerItem, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStaticBox[] = { {&_swigt__p_wxStaticBox, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStaticBoxSizer[] = { {&_swigt__p_wxStaticBoxSizer, 0, 0, 0},{0, 0, 0, 0}}; @@ -59070,6 +60087,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxSize, _swigc__p_wxSizeEvent, _swigc__p_wxSizer, + _swigc__p_wxSizerFlags, _swigc__p_wxSizerItem, _swigc__p_wxStaticBox, _swigc__p_wxStaticBoxSizer,