diff --git a/utils/wxPython/demo/data/grid.i b/utils/wxPython/demo/data/grid.i index c6d4bb27e2..0d874ba22b 100644 --- a/utils/wxPython/demo/data/grid.i +++ b/utils/wxPython/demo/data/grid.i @@ -4,7 +4,7 @@ // // Author: Robin Dunn // -// Created: 6/2/98 +// Created: 17-March-2000 // RCS-ID: $Id$ // Copyright: (c) 1998 by Total Control Software // Licence: wxWindows license @@ -783,15 +783,30 @@ public: wxGridCellBoolEditor(); }; - class wxGridCellChoiceEditor : public wxGridCellEditor { public: wxGridCellChoiceEditor(int LCOUNT = 0, const wxString* choices = NULL, bool allowOthers = FALSE); -}; +#ifdef PRE2115 + %addmethods { + wxGridCellChoiceEditor(PyObject* choices, + bool allowOthers = FALSE) { + const char** temp = string_LIST_helper(choices); + if (temp) { + int count = PyList_Size(choices); + wxGridCellChoiceEditor* ret; + ret = new wxGridCellChoiceEditor(count, temp, allowOthers); + delete [] temp; + return ret; + } + return NULL; + } + } +#endif +}; //--------------------------------------------------------------------------- @@ -1345,6 +1360,7 @@ public: void DisableCellEditControl(); bool CanEnableCellControl() const; bool IsCellEditControlEnabled() const; + bool IsCellEditControlShown() const; bool IsCurrentCellReadOnly() const; @@ -1419,6 +1435,7 @@ public: wxString GetRowLabelValue( int row ); wxString GetColLabelValue( int col ); wxColour GetGridLineColour(); + wxColour GetCellHighlightColour(); void SetRowLabelSize( int width ); void SetColLabelSize( int height ); @@ -1430,6 +1447,7 @@ public: void SetRowLabelValue( int row, const wxString& ); void SetColLabelValue( int col, const wxString& ); void SetGridLineColour( const wxColour& ); + void SetCellHighlightColour( const wxColour& ); void EnableDragRowSize( bool enable = TRUE ); void DisableDragRowSize(); diff --git a/utils/wxPython/demo/data/stc.h b/utils/wxPython/demo/data/stc.h index 7c70f14121..f2a514524e 100644 --- a/utils/wxPython/demo/data/stc.h +++ b/utils/wxPython/demo/data/stc.h @@ -492,6 +492,7 @@ private: void OnSysColourChanged(wxSysColourChangedEvent& evt); void OnEraseBackground(wxEraseEvent& evt); void OnMenu(wxCommandEvent& evt); + void OnListBox(wxCommandEvent& evt); // Turn notifications from Scintilla into events @@ -612,7 +613,7 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&); #define EVT_STC_ROMODIFYATTEMPT(id, fn) { wxEVT_STC_ROMODIFYATTEMPT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL }, #define EVT_STC_DOUBLECLICK(id, fn) { wxEVT_STC_DOUBLECLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL }, #define EVT_STC_MODIFIED(id, fn) { wxEVT_STC_MODIFIED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL }, -#define EVT_STC_CMDKEY(id, fn) { wxEVT_STC_CMDKEY, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL }, +#define EVT_STC_KEY(id, fn) { wxEVT_STC_KEY, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL }, #define EVT_STC_MACRORECORD(id, fn) { wxEVT_STC_MACRORECORD, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL }, #define EVT_STC_MARGINCLICK(id, fn) { wxEVT_STC_MARGINCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL }, #define EVT_STC_NEEDSHOWN(id, fn) { wxEVT_STC_NEEDSHOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL }, diff --git a/utils/wxPython/demo/wxOGL.py b/utils/wxPython/demo/wxOGL.py index 8012b4873b..c963fdd847 100644 --- a/utils/wxPython/demo/wxOGL.py +++ b/utils/wxPython/demo/wxOGL.py @@ -115,6 +115,10 @@ class TestWindow(wxShapeCanvas): def __init__(self, parent, log, frame): wxShapeCanvas.__init__(self, parent) + maxWidth = 1000 + maxHeight = 1000 + self.SetScrollbars(20, 20, maxWidth/20, maxHeight/20) + self.log = log self.frame = frame self.SetBackgroundColour(wxWHITE) diff --git a/utils/wxPython/distrib/autobuild.py b/utils/wxPython/distrib/autobuild.py index bdfa3fc05b..ccbdf02707 100644 --- a/utils/wxPython/distrib/autobuild.py +++ b/utils/wxPython/distrib/autobuild.py @@ -72,7 +72,7 @@ def main(): os.chdir(WXDIR + '/src/msw') do('make dll pch FINAL=1') validateFile(WXDIR + '/lib/wx'+dllVer+'.dll') - do("upx -9 " + WXDIR + '/lib/wx'+dllVer+'.dll') + ## do("upx -9 " + WXDIR + '/lib/wx'+dllVer+'.dll') do('makeaddons FINAL=1') validateFile(WXDIR + '/contrib/lib/ogl.lib') @@ -117,8 +117,8 @@ FINAL=1 validateFile(WXDIR+'\\utils\\wxPython\\oglc.pyd') validateFile(WXDIR+'\\utils\\wxPython\\stc_c.pyd') - os.chdir(WXDIR+'\\utils\\wxPython') - do("upx -9 *.pyd") + ## os.chdir(WXDIR+'\\utils\\wxPython') + ## do("upx -9 *.pyd") logSeparator("Building installer executable...") os.chdir(WXDIR+'\\utils\\wxPython\\distrib') @@ -162,7 +162,7 @@ FINAL=1 # #*#*#*#*#* Comment this out to allow upload... - ##return + return logSeparator("Uploading to website...") do('python c:\\utils\\sendwxp.py %s' % destName) diff --git a/utils/wxPython/distrib/build.py b/utils/wxPython/distrib/build.py index 68f83c0722..936401c3bd 100755 --- a/utils/wxPython/distrib/build.py +++ b/utils/wxPython/distrib/build.py @@ -92,6 +92,7 @@ Configuration Options OTHERTARGETS Other targets to be placed on the default rule line OTHERINSTALLTARGETS Other targets to be placed on the install rule line + OTHERDEFS Text to place near the begining of the Makefile OTHERRULES This text is placed at the end of the makefile and will typically be used for adding rules and such DEFAULTRULE Text to be used for the default rule in the makefile @@ -245,6 +246,7 @@ class BuildConfig: self.WXPSRCDIR = '$(WXDIR)/utils/wxPython/src' self.SWIGDEPS = '' self.OTHERDEPS = '' + self.OTHERDEFS = '' if sys.platform == 'win32': @@ -504,6 +506,7 @@ WXUSINGDLL = %(WXUSINGDLL)s GENCODEDIR = %(GENCODEDIR)s RESFILE = %(RESFILE)s WXPSRCDIR = %(WXPSRCDIR)s +%(OTHERDEFS)s TARGETDIR = %(TARGETDIR)s @@ -682,6 +685,7 @@ HELPERLIB = %(HELPERLIB)s HELPERLIBDIR = %(HELPERLIBDIR)s WXCONFIG=%(WXCONFIG)s TARGETDIR = %(TARGETDIR)s +%(OTHERDEFS)s CCC = %(CCC)s diff --git a/utils/wxPython/distrib/wxPython.wse b/utils/wxPython/distrib/wxPython.wse index d8d92772b4..c9c753c1c2 100644 --- a/utils/wxPython/distrib/wxPython.wse +++ b/utils/wxPython/distrib/wxPython.wse @@ -927,6 +927,12 @@ item: Install File Description=Demos Flags=0000000010000010 end +item: Install File + Source=C:\PROJECTS\wx\utils\wxPython\demo\data\tips.txt + Destination=%MAINDIR%\wxPython\demo\data\tips.txt + Description=Demos + Flags=0000000010000010 +end item: Remark end item: Install File diff --git a/utils/wxPython/modules/ogl/build.cfg b/utils/wxPython/modules/ogl/build.cfg index cd3a50e750..0f41bcfbab 100644 --- a/utils/wxPython/modules/ogl/build.cfg +++ b/utils/wxPython/modules/ogl/build.cfg @@ -6,30 +6,33 @@ SWIGFILES = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i', 'oglcanvas.i' SOURCES = ['oglhelpers.cpp'] -OTHERCFLAGS = '-I$(WXWIN)/contrib/include' +OTHERCFLAGS = '-I$(STCLOC)/contrib/include' +SOURCES = SOURCES + [ + '$(STCLOC)/contrib/src/ogl/basic.cpp', + '$(STCLOC)/contrib/src/ogl/bmpshape.cpp', + '$(STCLOC)/contrib/src/ogl/composit.cpp', + '$(STCLOC)/contrib/src/ogl/divided.cpp', + '$(STCLOC)/contrib/src/ogl/lines.cpp', + '$(STCLOC)/contrib/src/ogl/misc.cpp', + '$(STCLOC)/contrib/src/ogl/basic2.cpp', + '$(STCLOC)/contrib/src/ogl/canvas.cpp', + '$(STCLOC)/contrib/src/ogl/constrnt.cpp', + '$(STCLOC)/contrib/src/ogl/drawn.cpp', + '$(STCLOC)/contrib/src/ogl/mfutils.cpp', + '$(STCLOC)/contrib/src/ogl/ogldiag.cpp', + ] if sys.platform == 'win32': - OTHERCFLAGS = '-I$(WXWIN)/contrib/include' - OTHERLIBS = '$(WXWIN)/contrib/lib/ogl$(LIBEXT).lib' + OTHERDEFS = 'STCLOC = $(WXWIN)' + OTHERRULES = ''' +{$(WXWIN)/contrib/src/ogl}.cpp{}.obj: + $(cc) @<< +$(CPPFLAGS) /c /Tp $< +<< +''' else: OTHERCFLAGS = '-Icontrib/include' - SOURCES = SOURCES + [ - 'contrib/src/ogl/basic.cpp', - 'contrib/src/ogl/bmpshape.cpp', - 'contrib/src/ogl/composit.cpp', - 'contrib/src/ogl/divided.cpp', - 'contrib/src/ogl/lines.cpp', - 'contrib/src/ogl/misc.cpp', - 'contrib/src/ogl/basic2.cpp', - 'contrib/src/ogl/canvas.cpp', - 'contrib/src/ogl/constrnt.cpp', - 'contrib/src/ogl/drawn.cpp', - 'contrib/src/ogl/mfutils.cpp', - 'contrib/src/ogl/ogldiag.cpp', - ] DEFAULTRULE = 'default: contrib $(GENCODEDIR) $(TARGET)' - - OTHERRULES = """ %.o : contrib/src/ogl/%.cpp $(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $< diff --git a/utils/wxPython/modules/stc/build.cfg b/utils/wxPython/modules/stc/build.cfg index cd645dd9c0..4250d2dc69 100644 --- a/utils/wxPython/modules/stc/build.cfg +++ b/utils/wxPython/modules/stc/build.cfg @@ -7,49 +7,63 @@ SOURCES = [] PYFILES = ['stc.py'] -OTHERSWIGFLAGS = '-I$(WXWIN)/contrib/include/wx/stc' +OTHERSWIGFLAGS = '-I$(STCLOC)/contrib/include/wx/stc' +SWIGDEPS = '$(STCLOC)/contrib/include/wx/stc/stc.h' + +SOURCES = SOURCES + [ + '$(STCLOC)/contrib/src/stc/scintilla/src/AutoComplete.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/CallTip.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/CellBuffer.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/ContractionState.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/Document.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/Editor.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/Indicator.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/KeyMap.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/KeyWords.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/LineMarker.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/PropSet.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/ScintillaBase.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/Style.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/ViewStyle.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/LexCPP.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/LexHTML.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/LexOthers.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/LexPerl.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/LexPython.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/LexSQL.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/LexVB.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/DocumentAccessor.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/UniConversion.cxx', + '$(STCLOC)/contrib/src/stc/scintilla/src/WindowAccessor.cxx', + + '$(STCLOC)/contrib/src/stc/PlatWX.cpp', + '$(STCLOC)/contrib/src/stc/ScintillaWX.cpp', + '$(STCLOC)/contrib/src/stc/stc.cpp', + ] + +OTHERCFLAGS = '-D__WX__ -DSCI_LEXER ' + \ + '-I$(STCLOC)/contrib/src/stc/scintilla/include ' + \ + '-I$(STCLOC)/contrib/include ' + \ + '-I$(STCLOC)/contrib/src/stc/scintilla/src' -SWIGDEPS = '$(WXWIN)/contrib/include/wx/stc/stc.h' if sys.platform == 'win32': - OTHERCFLAGS = '-I$(WXWIN)/contrib/include' - OTHERLIBS = '$(WXWIN)/contrib/lib/stc$(LIBEXT).lib' + OTHERDEFS = 'STCLOC = $(WXWIN)' + OTHERRULES = ''' +{$(WXWIN)/contrib/src/stc}.cpp{}.obj: + $(cc) @<< +$(CPPFLAGS) /c /Tp $< +<< + +{$(WXWIN)/contrib/src/stc/scintilla/src}.cxx{}.obj: + $(cc) @<< +$(CPPFLAGS) /c /Tp $< +<< +''' + else: - OTHERCFLAGS = '-D__WX__ -DSCI_LEXER ' + \ - '-Icontrib/src/stc/scintilla/include -Icontrib/include ' + \ - '-Icontrib/src/stc/scintilla/src' - SOURCES = SOURCES + [ - 'contrib/src/stc/scintilla/src/AutoComplete.cxx', - 'contrib/src/stc/scintilla/src/CallTip.cxx', - 'contrib/src/stc/scintilla/src/CellBuffer.cxx', - 'contrib/src/stc/scintilla/src/ContractionState.cxx', - 'contrib/src/stc/scintilla/src/Document.cxx', - 'contrib/src/stc/scintilla/src/Editor.cxx', - 'contrib/src/stc/scintilla/src/Indicator.cxx', - 'contrib/src/stc/scintilla/src/KeyMap.cxx', - 'contrib/src/stc/scintilla/src/KeyWords.cxx', - 'contrib/src/stc/scintilla/src/LineMarker.cxx', - 'contrib/src/stc/scintilla/src/PropSet.cxx', - 'contrib/src/stc/scintilla/src/ScintillaBase.cxx', - 'contrib/src/stc/scintilla/src/Style.cxx', - 'contrib/src/stc/scintilla/src/ViewStyle.cxx', - 'contrib/src/stc/scintilla/src/LexCPP.cxx', - 'contrib/src/stc/scintilla/src/LexHTML.cxx', - 'contrib/src/stc/scintilla/src/LexOthers.cxx', - 'contrib/src/stc/scintilla/src/LexPerl.cxx', - 'contrib/src/stc/scintilla/src/LexPython.cxx', - 'contrib/src/stc/scintilla/src/LexSQL.cxx', - 'contrib/src/stc/scintilla/src/LexVB.cxx', - 'contrib/src/stc/scintilla/src/DocumentAccessor.cxx', - 'contrib/src/stc/scintilla/src/UniConversion.cxx', - 'contrib/src/stc/scintilla/src/WindowAccessor.cxx', - - 'contrib/src/stc/PlatWX.cpp', - 'contrib/src/stc/ScintillaWX.cpp', - 'contrib/src/stc/stc.cpp', - ] DEFAULTRULE = 'default: contrib $(GENCODEDIR) $(TARGET)' - + OTHERDEFS = 'STCLOC = .' OTHERRULES = """ %.o : contrib/src/stc/%.cpp $(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $< diff --git a/utils/wxPython/src/msw/sizers.cpp b/utils/wxPython/src/msw/sizers.cpp index 214c0a57a7..cf885aa2f7 100644 --- a/utils/wxPython/src/msw/sizers.cpp +++ b/utils/wxPython/src/msw/sizers.cpp @@ -457,6 +457,42 @@ static PyObject *_wrap_wxSizerItem_GetWindow(PyObject *self, PyObject *args, PyO return _resultobj; } +#define wxSizerItem_SetWindow(_swigobj,_swigarg0) (_swigobj->SetWindow(_swigarg0)) +static PyObject *_wrap_wxSizerItem_SetWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizerItem * _arg0; + wxWindow * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","window", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizerItem_SetWindow",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizerItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizerItem_SetWindow. Expected _wxSizerItem_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizerItem_SetWindow. Expected _wxWindow_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizerItem_SetWindow(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxSizerItem_GetSizer(_swigobj) (_swigobj->GetSizer()) static PyObject *_wrap_wxSizerItem_GetSizer(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -491,6 +527,42 @@ static PyObject *_wrap_wxSizerItem_GetSizer(PyObject *self, PyObject *args, PyOb return _resultobj; } +#define wxSizerItem_SetSizer(_swigobj,_swigarg0) (_swigobj->SetSizer(_swigarg0)) +static PyObject *_wrap_wxSizerItem_SetSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizerItem * _arg0; + wxSizer * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","sizer", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizerItem_SetSizer",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizerItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizerItem_SetSizer. Expected _wxSizerItem_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizerItem_SetSizer. Expected _wxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizerItem_SetSizer(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxSizerItem_GetOption(_swigobj) (_swigobj->GetOption()) static PyObject *_wrap_wxSizerItem_GetOption(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -890,6 +962,149 @@ static PyObject *_wrap_wxSizer_AddSpacer(PyObject *self, PyObject *args, PyObjec return _resultobj; } +static void wxSizer_InsertWindow(wxSizer *self,int before,wxWindow * window,int option,int flag,int border,PyObject * userData) { + wxPyUserData* data = NULL; + if (userData) data = new wxPyUserData(userData); + self->Insert(before, window, option, flag, border, data); + } +static PyObject *_wrap_wxSizer_InsertWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + int _arg1; + wxWindow * _arg2; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + int _arg5 = (int ) 0; + PyObject * _arg6 = (PyObject *) NULL; + PyObject * _argo0 = 0; + PyObject * _argo2 = 0; + PyObject * _obj6 = 0; + char *_kwnames[] = { "self","before","window","option","flag","border","userData", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|iiiO:wxSizer_InsertWindow",_kwnames,&_argo0,&_arg1,&_argo2,&_arg3,&_arg4,&_arg5,&_obj6)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_InsertWindow. Expected _wxSizer_p."); + return NULL; + } + } + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxSizer_InsertWindow. Expected _wxWindow_p."); + return NULL; + } + } + if (_obj6) +{ + _arg6 = _obj6; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_InsertWindow(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void wxSizer_InsertSizer(wxSizer *self,int before,wxSizer * sizer,int option,int flag,int border,PyObject * userData) { + wxPyUserData* data = NULL; + if (userData) data = new wxPyUserData(userData); + self->Insert(before, sizer, option, flag, border, data); + } +static PyObject *_wrap_wxSizer_InsertSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + int _arg1; + wxSizer * _arg2; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + int _arg5 = (int ) 0; + PyObject * _arg6 = (PyObject *) NULL; + PyObject * _argo0 = 0; + PyObject * _argo2 = 0; + PyObject * _obj6 = 0; + char *_kwnames[] = { "self","before","sizer","option","flag","border","userData", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|iiiO:wxSizer_InsertSizer",_kwnames,&_argo0,&_arg1,&_argo2,&_arg3,&_arg4,&_arg5,&_obj6)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_InsertSizer. Expected _wxSizer_p."); + return NULL; + } + } + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxSizer_InsertSizer. Expected _wxSizer_p."); + return NULL; + } + } + if (_obj6) +{ + _arg6 = _obj6; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_InsertSizer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void wxSizer_InsertSpacer(wxSizer *self,int before,int width,int height,int option,int flag,int border,PyObject * userData) { + wxPyUserData* data = NULL; + if (userData) data = new wxPyUserData(userData); + self->Insert(before, width, height, option, flag, border, data); + } +static PyObject *_wrap_wxSizer_InsertSpacer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + int _arg1; + int _arg2; + int _arg3; + int _arg4 = (int ) 0; + int _arg5 = (int ) 0; + int _arg6 = (int ) 0; + PyObject * _arg7 = (PyObject *) NULL; + PyObject * _argo0 = 0; + PyObject * _obj7 = 0; + char *_kwnames[] = { "self","before","width","height","option","flag","border","userData", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii|iiiO:wxSizer_InsertSpacer",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_obj7)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_InsertSpacer. Expected _wxSizer_p."); + return NULL; + } + } + if (_obj7) +{ + _arg7 = _obj7; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_InsertSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void wxSizer_PrependWindow(wxSizer *self,wxWindow * window,int option,int flag,int border,PyObject * userData) { wxPyUserData* data = NULL; if (userData) data = new wxPyUserData(userData); @@ -1161,6 +1376,147 @@ static PyObject *_wrap_wxSizer_SetDimension(PyObject *self, PyObject *args, PyOb return _resultobj; } +#define wxSizer_SetMinSize(_swigobj,_swigarg0) (_swigobj->SetMinSize(_swigarg0)) +static PyObject *_wrap_wxSizer_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + wxSize * _arg1; + PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","size", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_SetMinSize",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_SetMinSize. Expected _wxSizer_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) + return NULL; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_SetMinSize(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizer_SetItemMinSizeWindow(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->SetItemMinSize(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxSizer_SetItemMinSizeWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + wxWindow * _arg1; + int _arg2; + int _arg3; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","window","width","height", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOii:wxSizer_SetItemMinSizeWindow",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_SetItemMinSizeWindow. Expected _wxSizer_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_SetItemMinSizeWindow. Expected _wxWindow_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_SetItemMinSizeWindow(_arg0,_arg1,_arg2,_arg3); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizer_SetItemMinSizeSizer(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->SetItemMinSize(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxSizer_SetItemMinSizeSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + wxSizer * _arg1; + int _arg2; + int _arg3; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","sizer","width","height", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOii:wxSizer_SetItemMinSizeSizer",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_SetItemMinSizeSizer. Expected _wxSizer_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_SetItemMinSizeSizer. Expected _wxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_SetItemMinSizeSizer(_arg0,_arg1,_arg2,_arg3); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizer_SetItemMinSizePos(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->SetItemMinSize(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxSizer_SetItemMinSizePos(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + int _arg1; + int _arg2; + int _arg3; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","pos","width","height", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii:wxSizer_SetItemMinSizePos",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_SetItemMinSizePos. Expected _wxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_SetItemMinSizePos(_arg0,_arg1,_arg2,_arg3); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxSizer_GetSize(_swigobj) (_swigobj->GetSize()) static PyObject *_wrap_wxSizer_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1839,7 +2195,551 @@ static PyObject *_wrap_wxNotebookSizer_GetNotebook(PyObject *self, PyObject *arg return _resultobj; } +static void *SwigwxGridSizerTowxSizer(void *ptr) { + wxGridSizer *src; + wxSizer *dest; + src = (wxGridSizer *) ptr; + dest = (wxSizer *) src; + return (void *) dest; +} + +#define new_wxGridSizer(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxGridSizer(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_new_wxGridSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGridSizer * _result; + int _arg0 = (int ) 1; + int _arg1 = (int ) 0; + int _arg2 = (int ) 0; + int _arg3 = (int ) 0; + char *_kwnames[] = { "rows","cols","vgap","hgap", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iiii:new_wxGridSizer",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxGridSizer *)new_wxGridSizer(_arg0,_arg1,_arg2,_arg3); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridSizer_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxGridSizer_RecalcSizes(_swigobj) (_swigobj->RecalcSizes()) +static PyObject *_wrap_wxGridSizer_RecalcSizes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGridSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridSizer_RecalcSizes",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridSizer_RecalcSizes. Expected _wxGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxGridSizer_RecalcSizes(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxGridSizer_CalcMin(_swigobj) (_swigobj->CalcMin()) +static PyObject *_wrap_wxGridSizer_CalcMin(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSize * _result; + wxGridSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridSizer_CalcMin",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridSizer_CalcMin. Expected _wxGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = new wxSize (wxGridSizer_CalcMin(_arg0)); + + wxPy_END_ALLOW_THREADS; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxGridSizer_SetCols(_swigobj,_swigarg0) (_swigobj->SetCols(_swigarg0)) +static PyObject *_wrap_wxGridSizer_SetCols(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGridSizer * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","cols", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridSizer_SetCols",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridSizer_SetCols. Expected _wxGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxGridSizer_SetCols(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxGridSizer_SetRows(_swigobj,_swigarg0) (_swigobj->SetRows(_swigarg0)) +static PyObject *_wrap_wxGridSizer_SetRows(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGridSizer * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","rows", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridSizer_SetRows",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridSizer_SetRows. Expected _wxGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxGridSizer_SetRows(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxGridSizer_SetVGap(_swigobj,_swigarg0) (_swigobj->SetVGap(_swigarg0)) +static PyObject *_wrap_wxGridSizer_SetVGap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGridSizer * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","gap", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridSizer_SetVGap",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridSizer_SetVGap. Expected _wxGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxGridSizer_SetVGap(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxGridSizer_SetHGap(_swigobj,_swigarg0) (_swigobj->SetHGap(_swigarg0)) +static PyObject *_wrap_wxGridSizer_SetHGap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGridSizer * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","gap", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridSizer_SetHGap",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridSizer_SetHGap. Expected _wxGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxGridSizer_SetHGap(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxGridSizer_GetCols(_swigobj) (_swigobj->GetCols()) +static PyObject *_wrap_wxGridSizer_GetCols(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxGridSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridSizer_GetCols",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridSizer_GetCols. Expected _wxGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxGridSizer_GetCols(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxGridSizer_GetRows(_swigobj) (_swigobj->GetRows()) +static PyObject *_wrap_wxGridSizer_GetRows(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxGridSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridSizer_GetRows",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridSizer_GetRows. Expected _wxGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxGridSizer_GetRows(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxGridSizer_GetVGap(_swigobj) (_swigobj->GetVGap()) +static PyObject *_wrap_wxGridSizer_GetVGap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxGridSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridSizer_GetVGap",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridSizer_GetVGap. Expected _wxGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxGridSizer_GetVGap(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxGridSizer_GetHGap(_swigobj) (_swigobj->GetHGap()) +static PyObject *_wrap_wxGridSizer_GetHGap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxGridSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridSizer_GetHGap",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridSizer_GetHGap. Expected _wxGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxGridSizer_GetHGap(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static void *SwigwxFlexGridSizerTowxGridSizer(void *ptr) { + wxFlexGridSizer *src; + wxGridSizer *dest; + src = (wxFlexGridSizer *) ptr; + dest = (wxGridSizer *) src; + return (void *) dest; +} + +static void *SwigwxFlexGridSizerTowxSizer(void *ptr) { + wxFlexGridSizer *src; + wxSizer *dest; + src = (wxFlexGridSizer *) ptr; + dest = (wxSizer *) src; + return (void *) dest; +} + +#define new_wxFlexGridSizer(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxFlexGridSizer(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_new_wxFlexGridSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFlexGridSizer * _result; + int _arg0 = (int ) 1; + int _arg1 = (int ) 0; + int _arg2 = (int ) 0; + int _arg3 = (int ) 0; + char *_kwnames[] = { "rows","cols","vgap","hgap", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iiii:new_wxFlexGridSizer",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxFlexGridSizer *)new_wxFlexGridSizer(_arg0,_arg1,_arg2,_arg3); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxFlexGridSizer_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxFlexGridSizer_RecalcSizes(_swigobj) (_swigobj->RecalcSizes()) +static PyObject *_wrap_wxFlexGridSizer_RecalcSizes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFlexGridSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFlexGridSizer_RecalcSizes",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFlexGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFlexGridSizer_RecalcSizes. Expected _wxFlexGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxFlexGridSizer_RecalcSizes(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxFlexGridSizer_CalcMin(_swigobj) (_swigobj->CalcMin()) +static PyObject *_wrap_wxFlexGridSizer_CalcMin(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSize * _result; + wxFlexGridSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFlexGridSizer_CalcMin",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFlexGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFlexGridSizer_CalcMin. Expected _wxFlexGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = new wxSize (wxFlexGridSizer_CalcMin(_arg0)); + + wxPy_END_ALLOW_THREADS; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxFlexGridSizer_AddGrowableRow(_swigobj,_swigarg0) (_swigobj->AddGrowableRow(_swigarg0)) +static PyObject *_wrap_wxFlexGridSizer_AddGrowableRow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFlexGridSizer * _arg0; + size_t _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","idx", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFlexGridSizer_AddGrowableRow",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFlexGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFlexGridSizer_AddGrowableRow. Expected _wxFlexGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxFlexGridSizer_AddGrowableRow(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxFlexGridSizer_RemoveGrowableRow(_swigobj,_swigarg0) (_swigobj->RemoveGrowableRow(_swigarg0)) +static PyObject *_wrap_wxFlexGridSizer_RemoveGrowableRow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFlexGridSizer * _arg0; + size_t _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","idx", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFlexGridSizer_RemoveGrowableRow",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFlexGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFlexGridSizer_RemoveGrowableRow. Expected _wxFlexGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxFlexGridSizer_RemoveGrowableRow(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxFlexGridSizer_AddGrowableCol(_swigobj,_swigarg0) (_swigobj->AddGrowableCol(_swigarg0)) +static PyObject *_wrap_wxFlexGridSizer_AddGrowableCol(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFlexGridSizer * _arg0; + size_t _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","idx", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFlexGridSizer_AddGrowableCol",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFlexGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFlexGridSizer_AddGrowableCol. Expected _wxFlexGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxFlexGridSizer_AddGrowableCol(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxFlexGridSizer_RemoveGrowableCol(_swigobj,_swigarg0) (_swigobj->RemoveGrowableCol(_swigarg0)) +static PyObject *_wrap_wxFlexGridSizer_RemoveGrowableCol(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFlexGridSizer * _arg0; + size_t _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","idx", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFlexGridSizer_RemoveGrowableCol",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFlexGridSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFlexGridSizer_RemoveGrowableCol. Expected _wxFlexGridSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxFlexGridSizer_RemoveGrowableCol(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static PyMethodDef sizerscMethods[] = { + { "wxFlexGridSizer_RemoveGrowableCol", (PyCFunction) _wrap_wxFlexGridSizer_RemoveGrowableCol, METH_VARARGS | METH_KEYWORDS }, + { "wxFlexGridSizer_AddGrowableCol", (PyCFunction) _wrap_wxFlexGridSizer_AddGrowableCol, METH_VARARGS | METH_KEYWORDS }, + { "wxFlexGridSizer_RemoveGrowableRow", (PyCFunction) _wrap_wxFlexGridSizer_RemoveGrowableRow, METH_VARARGS | METH_KEYWORDS }, + { "wxFlexGridSizer_AddGrowableRow", (PyCFunction) _wrap_wxFlexGridSizer_AddGrowableRow, METH_VARARGS | METH_KEYWORDS }, + { "wxFlexGridSizer_CalcMin", (PyCFunction) _wrap_wxFlexGridSizer_CalcMin, METH_VARARGS | METH_KEYWORDS }, + { "wxFlexGridSizer_RecalcSizes", (PyCFunction) _wrap_wxFlexGridSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS }, + { "new_wxFlexGridSizer", (PyCFunction) _wrap_new_wxFlexGridSizer, METH_VARARGS | METH_KEYWORDS }, + { "wxGridSizer_GetHGap", (PyCFunction) _wrap_wxGridSizer_GetHGap, METH_VARARGS | METH_KEYWORDS }, + { "wxGridSizer_GetVGap", (PyCFunction) _wrap_wxGridSizer_GetVGap, METH_VARARGS | METH_KEYWORDS }, + { "wxGridSizer_GetRows", (PyCFunction) _wrap_wxGridSizer_GetRows, METH_VARARGS | METH_KEYWORDS }, + { "wxGridSizer_GetCols", (PyCFunction) _wrap_wxGridSizer_GetCols, METH_VARARGS | METH_KEYWORDS }, + { "wxGridSizer_SetHGap", (PyCFunction) _wrap_wxGridSizer_SetHGap, METH_VARARGS | METH_KEYWORDS }, + { "wxGridSizer_SetVGap", (PyCFunction) _wrap_wxGridSizer_SetVGap, METH_VARARGS | METH_KEYWORDS }, + { "wxGridSizer_SetRows", (PyCFunction) _wrap_wxGridSizer_SetRows, METH_VARARGS | METH_KEYWORDS }, + { "wxGridSizer_SetCols", (PyCFunction) _wrap_wxGridSizer_SetCols, METH_VARARGS | METH_KEYWORDS }, + { "wxGridSizer_CalcMin", (PyCFunction) _wrap_wxGridSizer_CalcMin, METH_VARARGS | METH_KEYWORDS }, + { "wxGridSizer_RecalcSizes", (PyCFunction) _wrap_wxGridSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS }, + { "new_wxGridSizer", (PyCFunction) _wrap_new_wxGridSizer, METH_VARARGS | METH_KEYWORDS }, { "wxNotebookSizer_GetNotebook", (PyCFunction) _wrap_wxNotebookSizer_GetNotebook, METH_VARARGS | METH_KEYWORDS }, { "wxNotebookSizer_CalcMin", (PyCFunction) _wrap_wxNotebookSizer_CalcMin, METH_VARARGS | METH_KEYWORDS }, { "wxNotebookSizer_RecalcSizes", (PyCFunction) _wrap_wxNotebookSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS }, @@ -1861,6 +2761,10 @@ static PyMethodDef sizerscMethods[] = { { "wxSizer_GetMinSize", (PyCFunction) _wrap_wxSizer_GetMinSize, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_GetPosition", (PyCFunction) _wrap_wxSizer_GetPosition, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_GetSize", (PyCFunction) _wrap_wxSizer_GetSize, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_SetItemMinSizePos", (PyCFunction) _wrap_wxSizer_SetItemMinSizePos, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_SetItemMinSizeSizer", (PyCFunction) _wrap_wxSizer_SetItemMinSizeSizer, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_SetItemMinSizeWindow", (PyCFunction) _wrap_wxSizer_SetItemMinSizeWindow, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_SetMinSize", (PyCFunction) _wrap_wxSizer_SetMinSize, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_SetDimension", (PyCFunction) _wrap_wxSizer_SetDimension, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_RemovePos", (PyCFunction) _wrap_wxSizer_RemovePos, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_RemoveSizer", (PyCFunction) _wrap_wxSizer_RemoveSizer, METH_VARARGS | METH_KEYWORDS }, @@ -1868,6 +2772,9 @@ static PyMethodDef sizerscMethods[] = { { "wxSizer_PrependSpacer", (PyCFunction) _wrap_wxSizer_PrependSpacer, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_PrependSizer", (PyCFunction) _wrap_wxSizer_PrependSizer, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_PrependWindow", (PyCFunction) _wrap_wxSizer_PrependWindow, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_InsertSpacer", (PyCFunction) _wrap_wxSizer_InsertSpacer, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_InsertSizer", (PyCFunction) _wrap_wxSizer_InsertSizer, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_InsertWindow", (PyCFunction) _wrap_wxSizer_InsertWindow, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_AddSpacer", (PyCFunction) _wrap_wxSizer_AddSpacer, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_AddSizer", (PyCFunction) _wrap_wxSizer_AddSizer, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_AddWindow", (PyCFunction) _wrap_wxSizer_AddWindow, METH_VARARGS | METH_KEYWORDS }, @@ -1880,7 +2787,9 @@ static PyMethodDef sizerscMethods[] = { { "wxSizerItem_GetBorder", (PyCFunction) _wrap_wxSizerItem_GetBorder, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_GetFlag", (PyCFunction) _wrap_wxSizerItem_GetFlag, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_GetOption", (PyCFunction) _wrap_wxSizerItem_GetOption, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_SetSizer", (PyCFunction) _wrap_wxSizerItem_SetSizer, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_GetSizer", (PyCFunction) _wrap_wxSizerItem_GetSizer, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_SetWindow", (PyCFunction) _wrap_wxSizerItem_SetWindow, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_GetWindow", (PyCFunction) _wrap_wxSizerItem_GetWindow, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_IsSpacer", (PyCFunction) _wrap_wxSizerItem_IsSpacer, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_IsSizer", (PyCFunction) _wrap_wxSizerItem_IsSizer, METH_VARARGS | METH_KEYWORDS }, @@ -1909,6 +2818,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0}, { "_wxBitmapDataObject","_class_wxBitmapDataObject",0}, { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, + { "_wxFlexGridSizer","_class_wxFlexGridSizer",0}, { "_wxPrintQuality","_wxCoord",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, @@ -1945,6 +2855,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxDataObjectSimple","_class_wxDataObjectSimple",0}, { "_wxDropFilesEvent","_class_wxDropFilesEvent",0}, { "_wxBitmapButton","_class_wxBitmapButton",0}, + { "_class_wxSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer}, + { "_class_wxSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer}, + { "_class_wxSizer","_class_wxGridSizer",SwigwxGridSizerTowxSizer}, + { "_class_wxSizer","_wxGridSizer",SwigwxGridSizerTowxSizer}, { "_class_wxSizer","_class_wxNotebookSizer",SwigwxNotebookSizerTowxSizer}, { "_class_wxSizer","_wxNotebookSizer",SwigwxNotebookSizerTowxSizer}, { "_class_wxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer}, @@ -1954,12 +2868,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxSizer","_class_wxPySizer",SwigwxPySizerTowxSizer}, { "_class_wxSizer","_wxPySizer",SwigwxPySizerTowxSizer}, { "_class_wxSizer","_wxSizer",0}, + { "_wxGridSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer}, + { "_wxGridSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer}, + { "_wxGridSizer","_class_wxGridSizer",0}, { "_class_wxAcceleratorTable","_wxAcceleratorTable",0}, { "_class_wxClipboard","_wxClipboard",0}, { "_class_wxGauge","_wxGauge",0}, { "_wxDC","_class_wxDC",0}, { "_wxSizerItem","_class_wxSizerItem",0}, { "_class_wxBitmapDataObject","_wxBitmapDataObject",0}, + { "_class_wxFlexGridSizer","_wxFlexGridSizer",0}, { "_wxSpinEvent","_class_wxSpinEvent",0}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, @@ -2130,6 +3048,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxSlider","_wxSlider",0}, { "_class_wxImageList","_wxImageList",0}, { "_class_wxBitmapButton","_wxBitmapButton",0}, + { "_class_wxGridSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer}, + { "_class_wxGridSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer}, + { "_class_wxGridSizer","_wxGridSizer",0}, { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, @@ -2188,6 +3109,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxDataObjectComposite","_class_wxDataObjectComposite",0}, { "_class_wxJoystickEvent","_wxJoystickEvent",0}, { "_wxRegion","_class_wxRegion",0}, + { "_wxSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer}, + { "_wxSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer}, + { "_wxSizer","_class_wxGridSizer",SwigwxGridSizerTowxSizer}, + { "_wxSizer","_wxGridSizer",SwigwxGridSizerTowxSizer}, { "_wxSizer","_class_wxNotebookSizer",SwigwxNotebookSizerTowxSizer}, { "_wxSizer","_wxNotebookSizer",SwigwxNotebookSizerTowxSizer}, { "_wxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer}, diff --git a/utils/wxPython/src/msw/sizers.py b/utils/wxPython/src/msw/sizers.py index 213ef77740..3305dda245 100644 --- a/utils/wxPython/src/msw/sizers.py +++ b/utils/wxPython/src/msw/sizers.py @@ -54,10 +54,16 @@ class wxSizerItemPtr : val = apply(sizersc.wxSizerItem_GetWindow,(self,) + _args, _kwargs) if val: val = wxWindowPtr(val) return val + def SetWindow(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_SetWindow,(self,) + _args, _kwargs) + return val def GetSizer(self, *_args, **_kwargs): val = apply(sizersc.wxSizerItem_GetSizer,(self,) + _args, _kwargs) if val: val = wxSizerPtr(val) return val + def SetSizer(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_SetSizer,(self,) + _args, _kwargs) + return val def GetOption(self, *_args, **_kwargs): val = apply(sizersc.wxSizerItem_GetOption,(self,) + _args, _kwargs) return val @@ -107,6 +113,15 @@ class wxSizerPtr : def AddSpacer(self, *_args, **_kwargs): val = apply(sizersc.wxSizer_AddSpacer,(self,) + _args, _kwargs) return val + def InsertWindow(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_InsertWindow,(self,) + _args, _kwargs) + return val + def InsertSizer(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_InsertSizer,(self,) + _args, _kwargs) + return val + def InsertSpacer(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_InsertSpacer,(self,) + _args, _kwargs) + return val def PrependWindow(self, *_args, **_kwargs): val = apply(sizersc.wxSizer_PrependWindow,(self,) + _args, _kwargs) return val @@ -128,6 +143,18 @@ class wxSizerPtr : def SetDimension(self, *_args, **_kwargs): val = apply(sizersc.wxSizer_SetDimension,(self,) + _args, _kwargs) return val + def SetMinSize(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_SetMinSize,(self,) + _args, _kwargs) + return val + def SetItemMinSizeWindow(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_SetItemMinSizeWindow,(self,) + _args, _kwargs) + return val + def SetItemMinSizeSizer(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_SetItemMinSizeSizer,(self,) + _args, _kwargs) + return val + def SetItemMinSizePos(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_SetItemMinSizePos,(self,) + _args, _kwargs) + return val def GetSize(self, *_args, **_kwargs): val = apply(sizersc.wxSizer_GetSize,(self,) + _args, _kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 @@ -163,6 +190,14 @@ class wxSizerPtr : else: apply(self.AddWindow, args) + def Insert(self, *args): + if type(args[0]) == type(1): + apply(self.InsertSpacer, args) + elif string.find(args[0].this, 'Sizer') != -1: + apply(self.InsertSizer, args) + else: + apply(self.InsertWindow, args) + def Prepend(self, *args): if type(args[0]) == type(1): apply(self.PrependSpacer, args) @@ -185,6 +220,15 @@ class wxSizerPtr : childinfo = (childinfo, ) apply(self.Add, childinfo) + + def SetItemMinSize(self, *args): + if type(args[0]) == type(1): + apply(self.SetItemMinSizePos, args) + elif string.find(args[0].this, 'Sizer') != -1: + apply(self.SetItemMinSizeSizer, args) + else: + apply(self.SetItemMinSizeWindow, args) + class wxSizer(wxSizerPtr): def __init__(self,this): self.this = this @@ -284,6 +328,84 @@ class wxNotebookSizer(wxNotebookSizerPtr): +class wxGridSizerPtr(wxSizerPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def RecalcSizes(self, *_args, **_kwargs): + val = apply(sizersc.wxGridSizer_RecalcSizes,(self,) + _args, _kwargs) + return val + def CalcMin(self, *_args, **_kwargs): + val = apply(sizersc.wxGridSizer_CalcMin,(self,) + _args, _kwargs) + if val: val = wxSizePtr(val) ; val.thisown = 1 + return val + def SetCols(self, *_args, **_kwargs): + val = apply(sizersc.wxGridSizer_SetCols,(self,) + _args, _kwargs) + return val + def SetRows(self, *_args, **_kwargs): + val = apply(sizersc.wxGridSizer_SetRows,(self,) + _args, _kwargs) + return val + def SetVGap(self, *_args, **_kwargs): + val = apply(sizersc.wxGridSizer_SetVGap,(self,) + _args, _kwargs) + return val + def SetHGap(self, *_args, **_kwargs): + val = apply(sizersc.wxGridSizer_SetHGap,(self,) + _args, _kwargs) + return val + def GetCols(self, *_args, **_kwargs): + val = apply(sizersc.wxGridSizer_GetCols,(self,) + _args, _kwargs) + return val + def GetRows(self, *_args, **_kwargs): + val = apply(sizersc.wxGridSizer_GetRows,(self,) + _args, _kwargs) + return val + def GetVGap(self, *_args, **_kwargs): + val = apply(sizersc.wxGridSizer_GetVGap,(self,) + _args, _kwargs) + return val + def GetHGap(self, *_args, **_kwargs): + val = apply(sizersc.wxGridSizer_GetHGap,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxGridSizer(wxGridSizerPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(sizersc.new_wxGridSizer,_args,_kwargs) + self.thisown = 1 + + + + +class wxFlexGridSizerPtr(wxGridSizerPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def RecalcSizes(self, *_args, **_kwargs): + val = apply(sizersc.wxFlexGridSizer_RecalcSizes,(self,) + _args, _kwargs) + return val + def CalcMin(self, *_args, **_kwargs): + val = apply(sizersc.wxFlexGridSizer_CalcMin,(self,) + _args, _kwargs) + if val: val = wxSizePtr(val) ; val.thisown = 1 + return val + def AddGrowableRow(self, *_args, **_kwargs): + val = apply(sizersc.wxFlexGridSizer_AddGrowableRow,(self,) + _args, _kwargs) + return val + def RemoveGrowableRow(self, *_args, **_kwargs): + val = apply(sizersc.wxFlexGridSizer_RemoveGrowableRow,(self,) + _args, _kwargs) + return val + def AddGrowableCol(self, *_args, **_kwargs): + val = apply(sizersc.wxFlexGridSizer_AddGrowableCol,(self,) + _args, _kwargs) + return val + def RemoveGrowableCol(self, *_args, **_kwargs): + val = apply(sizersc.wxFlexGridSizer_RemoveGrowableCol,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxFlexGridSizer(wxFlexGridSizerPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(sizersc.new_wxFlexGridSizer,_args,_kwargs) + self.thisown = 1 + + + + #-------------- FUNCTION WRAPPERS ------------------ diff --git a/utils/wxPython/src/sizers.i b/utils/wxPython/src/sizers.i index a92fbd8038..446de4c3ad 100644 --- a/utils/wxPython/src/sizers.i +++ b/utils/wxPython/src/sizers.i @@ -54,7 +54,9 @@ public: bool IsSpacer(); wxWindow *GetWindow(); + void SetWindow( wxWindow *window ); wxSizer *GetSizer(); + void SetSizer( wxSizer *sizer ); int GetOption(); int GetFlag(); int GetBorder(); @@ -97,14 +99,12 @@ public: if (userData) data = new wxPyUserData(userData); self->Add(window, option, flag, border, data); } - void AddSizer(wxSizer *sizer, int option=0, int flag=0, int border=0, PyObject* userData=NULL) { wxPyUserData* data = NULL; if (userData) data = new wxPyUserData(userData); self->Add(sizer, option, flag, border, data); } - void AddSpacer(int width, int height, int option=0, int flag=0, int border=0, PyObject* userData=NULL) { wxPyUserData* data = NULL; @@ -113,20 +113,38 @@ public: } + void InsertWindow(int before, wxWindow *window, int option=0, int flag=0, + int border=0, PyObject* userData=NULL) { + wxPyUserData* data = NULL; + if (userData) data = new wxPyUserData(userData); + self->Insert(before, window, option, flag, border, data); + } + void InsertSizer(int before, wxSizer *sizer, int option=0, int flag=0, + int border=0, PyObject* userData=NULL) { + wxPyUserData* data = NULL; + if (userData) data = new wxPyUserData(userData); + self->Insert(before, sizer, option, flag, border, data); + } + void InsertSpacer(int before, int width, int height, int option=0, int flag=0, + int border=0, PyObject* userData=NULL) { + wxPyUserData* data = NULL; + if (userData) data = new wxPyUserData(userData); + self->Insert(before, width, height, option, flag, border, data); + } + + void PrependWindow(wxWindow *window, int option=0, int flag=0, int border=0, PyObject* userData=NULL) { wxPyUserData* data = NULL; if (userData) data = new wxPyUserData(userData); self->Prepend(window, option, flag, border, data); } - void PrependSizer(wxSizer *sizer, int option=0, int flag=0, int border=0, PyObject* userData=NULL) { wxPyUserData* data = NULL; if (userData) data = new wxPyUserData(userData); self->Prepend(sizer, option, flag, border, data); } - void PrependSpacer(int width, int height, int option=0, int flag=0, int border=0, PyObject* userData=NULL) { wxPyUserData* data = NULL; @@ -149,6 +167,14 @@ public: else: apply(self.AddWindow, args) + def Insert(self, *args): + if type(args[0]) == type(1): + apply(self.InsertSpacer, args) + elif string.find(args[0].this, 'Sizer') != -1: + apply(self.InsertSizer, args) + else: + apply(self.InsertWindow, args) + def Prepend(self, *args): if type(args[0]) == type(1): apply(self.PrependSpacer, args) @@ -174,6 +200,21 @@ public: void SetDimension( int x, int y, int width, int height ); + void SetMinSize(wxSize size); + + %name(SetItemMinSizeWindow) void SetItemMinSize(wxWindow* window, int width, int height); + %name(SetItemMinSizeSizer) void SetItemMinSize(wxSizer* sizer, int width, int height); + %name(SetItemMinSizePos) void SetItemMinSize(int pos, int width, int height); + + %pragma(python) addtoclass = " + def SetItemMinSize(self, *args): + if type(args[0]) == type(1): + apply(self.SetItemMinSizePos, args) + elif string.find(args[0].this, 'Sizer') != -1: + apply(self.SetItemMinSizeSizer, args) + else: + apply(self.SetItemMinSizeWindow, args) + " wxSize GetSize(); wxPoint GetPosition(); @@ -259,7 +300,41 @@ public: wxNotebook *GetNotebook(); }; +//--------------------------------------------------------------------------- +class wxGridSizer: public wxSizer +{ +public: + wxGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 ); + + void RecalcSizes(); + wxSize CalcMin(); + + void SetCols( int cols ); + void SetRows( int rows ); + void SetVGap( int gap ); + void SetHGap( int gap ); + int GetCols(); + int GetRows(); + int GetVGap(); + int GetHGap(); +}; //--------------------------------------------------------------------------- +class wxFlexGridSizer: public wxGridSizer +{ +public: + wxFlexGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 ); + + void RecalcSizes(); + wxSize CalcMin(); + + void AddGrowableRow( size_t idx ); + void RemoveGrowableRow( size_t idx ); + void AddGrowableCol( size_t idx ); + void RemoveGrowableCol( size_t idx ); + +}; + +//---------------------------------------------------------------------------