X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..52f52ebc4e0be6a9899d328b08db9eb14629d219:/wxPython/src/msw/windows_wrap.cpp?ds=sidebyside diff --git a/wxPython/src/msw/windows_wrap.cpp b/wxPython/src/msw/windows_wrap.cpp index 7f11314ff4..8e94d5d71c 100644 --- a/wxPython/src/msw/windows_wrap.cpp +++ b/wxPython/src/msw/windows_wrap.cpp @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 1.3.20 + * Version 1.3.22 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -45,6 +45,8 @@ private: #define SWIG_TypeName SWIG_Python_TypeName #define SWIG_TypeQuery SWIG_Python_TypeQuery #define SWIG_TypeClientData SWIG_Python_TypeClientData +#define SWIG_PackData SWIG_Python_PackData +#define SWIG_UnpackData SWIG_Python_UnpackData /*********************************************************************** @@ -59,36 +61,35 @@ private: #include -#if defined(_WIN32) || defined(__WIN32__) -# if defined(_MSC_VER) -# if defined(STATIC_LINKED) -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) extern a -# else -# define SWIGEXPORT(a) __declspec(dllexport) a -# define SWIGIMPORT(a) extern a -# endif -# else -# if defined(__BORLANDC__) -# define SWIGEXPORT(a) a _export -# define SWIGIMPORT(a) a _export -# else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a -# endif -# endif +#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(_MSC_VER) || defined(__GNUC__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) extern a +# else +# define SWIGEXPORT(a) __declspec(dllexport) a +# define SWIGIMPORT(a) extern a +# endif +# else +# if defined(__BORLANDC__) +# define SWIGEXPORT(a) a _export +# define SWIGIMPORT(a) a _export +# else +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) a +# endif +# endif #else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a +# define SWIGEXPORT(a) a +# define SWIGIMPORT(a) a #endif #ifdef SWIG_GLOBAL -#define SWIGRUNTIME(a) SWIGEXPORT(a) +# define SWIGRUNTIME(a) SWIGEXPORT(a) #else -#define SWIGRUNTIME(a) static a +# define SWIGRUNTIME(a) static a #endif - #ifdef __cplusplus extern "C" { #endif @@ -114,12 +115,15 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *); SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *); SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); +SWIGIMPORT(char *) SWIG_PackData(char *, void *, int); +SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); #ifdef __cplusplus } #endif + /*********************************************************************** * pyrun.swg for wxPython * @@ -130,7 +134,6 @@ SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); * ************************************************************************/ - #include "Python.h" #ifdef __cplusplus @@ -161,8 +164,6 @@ typedef struct swig_const_info { swig_type_info **ptype; } swig_const_info; - - /* Common SWIG API */ #define SWIG_ConvertPtr(obj, pp, type, flags) \ SWIG_Python_ConvertPtr(obj, pp, type, flags) @@ -170,7 +171,7 @@ typedef struct swig_const_info { SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) \ SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_newvarlink() \ SWIG_Python_newvarlink() @@ -178,40 +179,48 @@ typedef struct swig_const_info { SWIG_Python_addvarlink(p, name, get_attr, set_attr) #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \ SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) -#define SWIG_PackData(c, ptr, sz) \ - SWIG_Python_PackData(c, ptr, sz) -#define SWIG_UnpackData(c, ptr, sz) \ - SWIG_Python_UnpackData(c, ptr, sz) #define SWIG_NewPackedObj(ptr, sz, type) \ SWIG_Python_NewPackedObj(ptr, sz, type) #define SWIG_InstallConstants(d, constants) \ SWIG_Python_InstallConstants(d, constants) +typedef double (*py_objasdbl_conv)(PyObject *obj); -SWIGEXPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); -SWIGEXPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); -SWIGEXPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); +SWIGIMPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); +SWIGIMPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); +SWIGIMPORT(PyObject *) SWIG_Python_newvarlink(void); +SWIGIMPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); +SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); +SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); +SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); -SWIGEXPORT(PyObject *) SWIG_Python_newvarlink(void); -SWIGEXPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); -SWIGEXPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); -SWIGEXPORT(char *) SWIG_Python_PackData(char *c, void *, int); -SWIGEXPORT(char *) SWIG_Python_UnpackData(char *c, void *, int); -SWIGEXPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); -SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); +/* ----------------------------------------------------------------------------- + * the needed conversions between C++ and python + * ----------------------------------------------------------------------------- */ +/* basic types */ +/* + utilities +*/ +SWIGIMPORT(char* ) SWIG_PyObj_AsCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharPtr(const char* cptr); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLong(PyObject * obj); +SWIGIMPORT(long) SWIG_PyObj_AsLongInRange(PyObject * obj, const char* type, + long min_value, long max_value); +SWIGIMPORT(unsigned long) SWIG_PyObj_AsUnsignedLongInRange(PyObject *obj, const char* type, + unsigned long max_value); +SWIGIMPORT(char *) SWIG_PyObj_AsNewCharPtr(PyObject *obj, swig_type_info* pchar_info); +SWIGIMPORT(void) SWIG_PyObj_AsCharPtrAndSize(PyObject *obj, swig_type_info* pchar_info, + char** cptr, size_t* size); +SWIGIMPORT(void) SWIG_PyObj_AsCharArray(PyObject *obj, swig_type_info* pchar_info, + char* carray, size_t size); +SWIGIMPORT(PyObject *) SWIG_PyObj_FromCharArray(const char* carray, size_t size); +SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_conv pyconv); /* Contract support */ -#define SWIG_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_inherit_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_inherit_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_invariant(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_begin(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_end(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else +#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else #ifdef __cplusplus } @@ -224,90 +233,88 @@ SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[0] #define SWIGTYPE_p_wxPreviewFrame swig_types[1] #define SWIGTYPE_p_wxPyPreviewFrame swig_types[2] -#define SWIGTYPE_p_wxAcceleratorEntry swig_types[3] -#define SWIGTYPE_p_wxPyPanel swig_types[4] -#define SWIGTYPE_p_wxMenu swig_types[5] -#define SWIGTYPE_p_wxPrintData swig_types[6] -#define SWIGTYPE_p_wxFontData swig_types[7] -#define SWIGTYPE_p_wxEvent swig_types[8] -#define SWIGTYPE_p_wxTaskBarIcon swig_types[9] -#define SWIGTYPE_p_wxIconBundle swig_types[10] -#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[11] -#define SWIGTYPE_p_wxFindDialogEvent swig_types[12] -#define SWIGTYPE_p_wxPreviewCanvas swig_types[13] -#define SWIGTYPE_p_wxFont swig_types[14] -#define SWIGTYPE_p_wxSplitterEvent swig_types[15] -#define SWIGTYPE_p_wxRegion swig_types[16] -#define SWIGTYPE_p_wxFindReplaceData swig_types[17] -#define SWIGTYPE_p_int swig_types[18] -#define SWIGTYPE_p_wxSize swig_types[19] -#define SWIGTYPE_p_wxDC swig_types[20] -#define SWIGTYPE_p_wxIcon swig_types[21] -#define SWIGTYPE_p_wxMDIChildFrame swig_types[22] -#define SWIGTYPE_p_wxColourData swig_types[23] -#define SWIGTYPE_p_wxNotifyEvent swig_types[24] -#define SWIGTYPE_p_wxPyWindow swig_types[25] -#define SWIGTYPE_p_wxSplashScreen swig_types[26] -#define SWIGTYPE_p_wxFindReplaceDialog swig_types[27] -#define SWIGTYPE_p_wxProgressDialog swig_types[28] -#define SWIGTYPE_p_wxMessageDialog swig_types[29] -#define SWIGTYPE_p_wxTextEntryDialog swig_types[30] -#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[31] -#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[32] -#define SWIGTYPE_p_wxFileDialog swig_types[33] -#define SWIGTYPE_p_wxPrinter swig_types[34] -#define SWIGTYPE_p_wxMenuItem swig_types[35] -#define SWIGTYPE_p_wxArrayInt swig_types[36] -#define SWIGTYPE_p_wxEvtHandler swig_types[37] -#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[38] -#define SWIGTYPE_p_wxPyHtmlListBox swig_types[39] -#define SWIGTYPE_p_wxPyVListBox swig_types[40] -#define SWIGTYPE_p_wxRect swig_types[41] -#define SWIGTYPE_p_wxAcceleratorTable swig_types[42] -#define SWIGTYPE_p_wxMiniFrame swig_types[43] -#define SWIGTYPE_p_wxFrame swig_types[44] -#define SWIGTYPE_p_wxPyPrintout swig_types[45] -#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[46] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[47] -#define SWIGTYPE_p_wxStatusBar swig_types[48] -#define SWIGTYPE_p_wxMDIParentFrame swig_types[49] -#define SWIGTYPE_p_wxPoint swig_types[50] -#define SWIGTYPE_p_wxObject swig_types[51] -#define SWIGTYPE_p_unsigned_long swig_types[52] -#define SWIGTYPE_p_wxMDIClientWindow swig_types[53] -#define SWIGTYPE_p_wxTipWindow swig_types[54] -#define SWIGTYPE_p_wxSashLayoutWindow swig_types[55] -#define SWIGTYPE_p_wxSplitterWindow swig_types[56] -#define SWIGTYPE_p_wxSplashScreenWindow swig_types[57] -#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[58] -#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[59] -#define SWIGTYPE_p_wxPopupWindow swig_types[60] -#define SWIGTYPE_p_wxSashWindow swig_types[61] -#define SWIGTYPE_p_wxTopLevelWindow swig_types[62] -#define SWIGTYPE_p_wxWindow swig_types[63] -#define SWIGTYPE_p_wxScrolledWindow swig_types[64] -#define SWIGTYPE_p_wxMenuBar swig_types[65] -#define SWIGTYPE_p_wxPrintPreview swig_types[66] -#define SWIGTYPE_p_wxSashEvent swig_types[67] -#define SWIGTYPE_p_wxString swig_types[68] -#define SWIGTYPE_p_wxPyPrintPreview swig_types[69] -#define SWIGTYPE_p_wxFontDialog swig_types[70] -#define SWIGTYPE_p_wxDirDialog swig_types[71] -#define SWIGTYPE_p_wxColourDialog swig_types[72] -#define SWIGTYPE_p_wxDialog swig_types[73] -#define SWIGTYPE_p_wxPanel swig_types[74] -#define SWIGTYPE_p_wxPageSetupDialog swig_types[75] -#define SWIGTYPE_p_wxPrintDialog swig_types[76] -#define SWIGTYPE_p_wxBitmap swig_types[77] -#define SWIGTYPE_p_wxCommandEvent swig_types[78] -#define SWIGTYPE_p_wxPrintQuality swig_types[79] -#define SWIGTYPE_p_wxPreviewControlBar swig_types[80] -#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[81] -#define SWIGTYPE_p_wxColour swig_types[82] -#define SWIGTYPE_p_wxToolBar swig_types[83] -#define SWIGTYPE_p_wxPageSetupDialogData swig_types[84] -#define SWIGTYPE_p_wxPrintDialogData swig_types[85] -static swig_type_info *swig_types[87]; +#define SWIGTYPE_p_wxPyPanel swig_types[3] +#define SWIGTYPE_p_wxMenu swig_types[4] +#define SWIGTYPE_p_wxPrintData swig_types[5] +#define SWIGTYPE_p_wxFontData swig_types[6] +#define SWIGTYPE_p_wxEvent swig_types[7] +#define SWIGTYPE_p_wxTaskBarIcon swig_types[8] +#define SWIGTYPE_p_wxIconBundle swig_types[9] +#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[10] +#define SWIGTYPE_p_wxFindDialogEvent swig_types[11] +#define SWIGTYPE_p_wxPreviewCanvas swig_types[12] +#define SWIGTYPE_p_wxFont swig_types[13] +#define SWIGTYPE_p_wxSplitterEvent swig_types[14] +#define SWIGTYPE_p_wxRegion swig_types[15] +#define SWIGTYPE_p_wxFindReplaceData swig_types[16] +#define SWIGTYPE_p_int swig_types[17] +#define SWIGTYPE_p_wxSize swig_types[18] +#define SWIGTYPE_p_wxDC swig_types[19] +#define SWIGTYPE_p_wxIcon swig_types[20] +#define SWIGTYPE_p_wxMDIChildFrame swig_types[21] +#define SWIGTYPE_p_wxColourData swig_types[22] +#define SWIGTYPE_p_wxNotifyEvent swig_types[23] +#define SWIGTYPE_p_wxPyWindow swig_types[24] +#define SWIGTYPE_p_wxSplashScreen swig_types[25] +#define SWIGTYPE_p_wxFindReplaceDialog swig_types[26] +#define SWIGTYPE_p_wxProgressDialog swig_types[27] +#define SWIGTYPE_p_wxMessageDialog swig_types[28] +#define SWIGTYPE_p_wxTextEntryDialog swig_types[29] +#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[30] +#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[31] +#define SWIGTYPE_p_wxFileDialog swig_types[32] +#define SWIGTYPE_p_wxPrinter swig_types[33] +#define SWIGTYPE_p_wxArrayInt swig_types[34] +#define SWIGTYPE_p_wxEvtHandler swig_types[35] +#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[36] +#define SWIGTYPE_p_wxPyHtmlListBox swig_types[37] +#define SWIGTYPE_p_wxPyVListBox swig_types[38] +#define SWIGTYPE_p_wxRect swig_types[39] +#define SWIGTYPE_p_char swig_types[40] +#define SWIGTYPE_p_wxMiniFrame swig_types[41] +#define SWIGTYPE_p_wxFrame swig_types[42] +#define SWIGTYPE_p_wxPyPrintout swig_types[43] +#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[44] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[45] +#define SWIGTYPE_p_wxStatusBar swig_types[46] +#define SWIGTYPE_p_wxMDIParentFrame swig_types[47] +#define SWIGTYPE_p_wxPoint swig_types[48] +#define SWIGTYPE_p_wxObject swig_types[49] +#define SWIGTYPE_p_wxOutputStream swig_types[50] +#define SWIGTYPE_p_unsigned_long swig_types[51] +#define SWIGTYPE_p_wxMDIClientWindow swig_types[52] +#define SWIGTYPE_p_wxTipWindow swig_types[53] +#define SWIGTYPE_p_wxSashLayoutWindow swig_types[54] +#define SWIGTYPE_p_wxSplitterWindow swig_types[55] +#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[56] +#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[57] +#define SWIGTYPE_p_wxPopupWindow swig_types[58] +#define SWIGTYPE_p_wxSashWindow swig_types[59] +#define SWIGTYPE_p_wxTopLevelWindow swig_types[60] +#define SWIGTYPE_p_wxWindow swig_types[61] +#define SWIGTYPE_p_wxScrolledWindow swig_types[62] +#define SWIGTYPE_p_wxSplashScreenWindow swig_types[63] +#define SWIGTYPE_p_wxMenuBar swig_types[64] +#define SWIGTYPE_p_wxPrintPreview swig_types[65] +#define SWIGTYPE_p_wxSashEvent swig_types[66] +#define SWIGTYPE_p_wxString swig_types[67] +#define SWIGTYPE_p_wxPyPrintPreview swig_types[68] +#define SWIGTYPE_p_wxFontDialog swig_types[69] +#define SWIGTYPE_p_wxDirDialog swig_types[70] +#define SWIGTYPE_p_wxColourDialog swig_types[71] +#define SWIGTYPE_p_wxDialog swig_types[72] +#define SWIGTYPE_p_wxPanel swig_types[73] +#define SWIGTYPE_p_wxPageSetupDialog swig_types[74] +#define SWIGTYPE_p_wxPrintDialog swig_types[75] +#define SWIGTYPE_p_wxBitmap swig_types[76] +#define SWIGTYPE_p_wxCommandEvent swig_types[77] +#define SWIGTYPE_p_wxPreviewControlBar swig_types[78] +#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[79] +#define SWIGTYPE_p_wxColour swig_types[80] +#define SWIGTYPE_p_wxToolBar swig_types[81] +#define SWIGTYPE_p_wxPageSetupDialogData swig_types[82] +#define SWIGTYPE_p_wxPrintDialogData swig_types[83] +static swig_type_info *swig_types[85]; /* -------- TYPES TABLE (END) -------- */ @@ -319,14 +326,73 @@ static swig_type_info *swig_types[87]; #define SWIG_name "_windows" +#include +#include +#include + +#ifndef SWIGSTATIC +#ifdef __cplusplus +#define SWIGSTATIC(a) static inline a +#else +#define SWIGSTATIC(a) static a +#endif +#endif + +#ifndef numeric_cast +#ifdef __cplusplus +#ifdef HAVE_NUMERIC_CAST +#define numeric_cast(type,a) numeric_cast(a) +#else +#define numeric_cast(type,a) static_cast(a) +#endif +#else +#define numeric_cast(type,a) (type)(a) +#endif +#endif + + + +#define SWIG_PyObj_FromSignedChar PyInt_FromLong +#define SWIG_PyObj_FromUnsignedChar PyInt_FromLong +#define SWIG_PyObj_FromShort PyInt_FromLong +#define SWIG_PyObj_FromUnsignedShort PyInt_FromLong +#define SWIG_PyObj_FromInt PyInt_FromLong +#define SWIG_PyObj_FromLong PyInt_FromLong +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble +#define SWIG_PyObj_FromFloat PyFloat_FromDouble +#define SWIG_PyObj_FromDouble PyFloat_FromDouble + + #include "wx/wxPython/wxPython.h" #include "wx/wxPython/pyclasses.h" - DECLARE_DEF_STRING(PanelNameStr); - DECLARE_DEF_STRING(EmptyString); - + + static const wxString wxPyEmptyString(wxEmptyString); + static const wxString wxPyPanelNameStr(wxPanelNameStr); + + + +SWIGSTATIC(int) +SWIG_PyObj_AsInt(PyObject *obj) +{ + return numeric_cast(int, + SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); +} + + +SWIGSTATIC(long) +SWIG_PyObj_AsLong(PyObject * obj) +{ + return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); +} +SWIGSTATIC(bool) +SWIG_PyObj_AsBool(PyObject *obj) +{ + return PyObject_IsTrue(obj) ? true : false; +} static PyObject* t_output_helper(PyObject* target, PyObject* o) { @@ -356,12 +422,25 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } - // Put some wx default wxChar* values into wxStrings. - DECLARE_DEF_STRING(FrameNameStr); - DECLARE_DEF_STRING(DialogNameStr); - DECLARE_DEF_STRING(StatusLineNameStr); - DECLARE_DEF_STRING(ToolBarNameStr); +SWIGSTATIC(double) +SWIG_PyObj_AsDouble(PyObject *obj) +{ + return (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : +#if HAVE_LONG_LONG + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); +#else + (double)((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); +#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "a double is expected"); + } +} + static const wxString wxPyFrameNameStr(wxFrameNameStr); + static const wxString wxPyDialogNameStr(wxDialogNameStr); + static const wxString wxPyStatusLineNameStr(wxStatusLineNameStr); + static const wxString wxPyToolBarNameStr(wxToolBarNameStr); bool wxDialog_IsModalShowing(wxDialog *self){ @@ -371,16 +450,14 @@ bool wxDialog_IsModalShowing(wxDialog *self){ } - - static const wxChar* wxSplitterNameStr = wxT("splitter"); - DECLARE_DEF_STRING(SplitterNameStr); - - - static const wxChar* wxSashNameStr = wxT("sashWindow"); - DECLARE_DEF_STRING(SashNameStr); - static const wxChar* wxSashLayoutNameStr = wxT("layoutWindow"); - DECLARE_DEF_STRING(SashLayoutNameStr); - +wxRect wxStatusBar_GetFieldRect(wxStatusBar *self,int i){ + wxRect r; + self->GetFieldRect(i, r); + return r; + } + static const wxString wxPySplitterNameStr(wxT("splitter")); + static const wxString wxPySashNameStr(wxT("sashWindow")); + static const wxString wxPySashLayoutNameStr(wxT("layoutWindow")); #include @@ -406,9 +483,8 @@ IMP_PYCALLBACK_BOOL_(wxPyPopupTransientWindow, wxPopupTransientWindow, CanDismis #include -wxTipWindow *new_wxTipWindow(wxWindow *parent,wxString const *text,wxCoord maxLength,wxRect *rectBound){ - wxString tmp = *text; - return new wxTipWindow(parent, tmp, maxLength, NULL, rectBound); +wxTipWindow *new_wxTipWindow(wxWindow *parent,wxString const &text,int maxLength,wxRect *rectBound){ + return new wxTipWindow(parent, text, maxLength, NULL, rectBound); } #include @@ -471,7 +547,7 @@ public: // find the index of the line we need to show at the top of the window such // that the last (fully or partially) visible line is the given one - size_t FindFirstFromBottom(size_t lineLast, bool fullyVisible = false) + size_t FindFirstFromBottom(size_t lineLast, bool fullyVisible = False) { return wxVScrolledWindow::FindFirstFromBottom(lineLast, fullyVisible); } // get the total height of the lines between lineMin (inclusive) and @@ -490,9 +566,17 @@ IMP_PYCALLBACK_VOID_SIZETSIZET_const(wxPyVScrolledWindow, wxVScrolledWindow, OnG IMP_PYCALLBACK_COORD_const (wxPyVScrolledWindow, wxVScrolledWindow, EstimateTotalHeight); +SWIGSTATIC(PyObject* ) +SWIG_PyObj_FromUnsignedLong(unsigned long value) +{ + return (value > (unsigned long)(LONG_MAX)) ? + PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)value); +} + + #include -DECLARE_DEF_STRING(VListBoxNameStr); + static const wxString wxPyVListBoxNameStr(wxVListBoxNameStr); class wxPyVListBox : public wxVListBox { @@ -616,7 +700,7 @@ IMP_PYCALLBACK_STRING_SIZET (wxPyHtmlListBox, wxHtmlListBox, OnGetItemMarkup class wxTaskBarIcon : public wxEvtHandler { public: - wxTaskBarIcon() { PyErr_SetNone(PyExc_NotImplementedError); } + wxTaskBarIcon() { wxPyRaiseNotImplemented(); } }; @@ -624,7 +708,7 @@ class wxTaskBarIconEvent : public wxEvent { public: wxTaskBarIconEvent(wxEventType, wxTaskBarIcon *) - { PyErr_SetNone(PyExc_NotImplementedError); } + { wxPyRaiseNotImplemented(); } virtual wxEvent* Clone() const { return NULL; } }; @@ -639,16 +723,12 @@ enum { }; #endif - - - DECLARE_DEF_STRING(FileSelectorPromptStr); - DECLARE_DEF_STRING(DirSelectorPromptStr); - DECLARE_DEF_STRING(DirDialogNameStr); - DECLARE_DEF_STRING(FileSelectorDefaultWildcardStr); - DECLARE_DEF_STRING(GetTextFromUserPromptStr); - DECLARE_DEF_STRING(MessageBoxCaptionStr); - - + static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); + static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); + static const wxString wxPyDirDialogNameStr(wxDirDialogNameStr); + static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); + static const wxString wxPyGetTextFromUserPromptStr(wxGetTextFromUserPromptStr); + static const wxString wxPyMessageBoxCaptionStr(wxMessageBoxCaptionStr); PyObject *wxFileDialog_GetFilenames(wxFileDialog *self){ wxArrayString arr; self->GetFilenames(arr); @@ -808,18 +888,15 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, RemoveChild); #include "wx/wxPython/printfw.h" - static const wxChar* wxPrintoutTitleStr = wxT("Printout"); - DECLARE_DEF_STRING(PrintoutTitleStr); - static const wxChar* wxPreviewCanvasNameStr = wxT("previewcanvas"); - DECLARE_DEF_STRING(PreviewCanvasNameStr); - + static const wxString wxPyPrintoutTitleStr(wxT("Printout")); + static const wxString wxPyPreviewCanvasNameStr(wxT("previewcanvas")); // Since this one would be tough and ugly to do with the Macros... void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) { - bool hadErr = FALSE; + bool hadErr = False; bool found; wxPyBeginBlockThreads(); @@ -830,22 +907,22 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p val = PyTuple_GetItem(result, 0); if (PyInt_Check(val)) *minPage = PyInt_AsLong(val); - else hadErr = TRUE; + else hadErr = True; val = PyTuple_GetItem(result, 1); if (PyInt_Check(val)) *maxPage = PyInt_AsLong(val); - else hadErr = TRUE; + else hadErr = True; val = PyTuple_GetItem(result, 2); if (PyInt_Check(val)) *pageFrom = PyInt_AsLong(val); - else hadErr = TRUE; + else hadErr = True; val = PyTuple_GetItem(result, 3); if (PyInt_Check(val)) *pageTo = PyInt_AsLong(val); - else hadErr = TRUE; + else hadErr = True; } else - hadErr = TRUE; + hadErr = True; if (hadErr) { PyErr_SetString(PyExc_TypeError, "GetPageInfo should return a tuple of 4 integers."); @@ -882,7 +959,7 @@ IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage); #define IMP_PYCALLBACK_BOOL_PREWINDC(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(wxPreviewCanvas* a, wxDC& b) { \ - bool rval=FALSE; \ + bool rval=False; \ bool found; \ wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ @@ -1005,7 +1082,7 @@ extern "C" { static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 = (int) (int)-1 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -1016,17 +1093,25 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg wxPanel *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlO:new_Panel",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_Panel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -1039,11 +1124,17 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -1094,7 +1185,7 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw PyObject *resultobj; wxPanel *arg1 = (wxPanel *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 ; + int arg3 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -1105,19 +1196,25 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:Panel_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Panel_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -1130,11 +1227,17 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -1144,7 +1247,7 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -1193,7 +1296,7 @@ static PyObject * Panel_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 = (wxWindowID) (wxWindowID)-1 ; + int arg2 = (int) (int)-1 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -1204,17 +1307,25 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje wxScrolledWindow *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlO:new_ScrolledWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_ScrolledWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -1227,11 +1338,17 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -1282,7 +1399,7 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 = (wxWindowID) (wxWindowID)-1 ; + int arg3 = (int) (int)-1 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -1293,19 +1410,27 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlO:ScrolledWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:ScrolledWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -1318,11 +1443,17 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -1332,7 +1463,7 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -1356,19 +1487,55 @@ static PyObject *_wrap_ScrolledWindow_SetScrollbars(PyObject *self, PyObject *ar int arg5 ; int arg6 = (int) 0 ; int arg7 = (int) 0 ; - bool arg8 = (bool) FALSE ; + bool arg8 = (bool) False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pixelsPerUnitX",(char *) "pixelsPerUnitY",(char *) "noUnitsX",(char *) "noUnitsY",(char *) "xPos",(char *) "yPos",(char *) "noRefresh", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|iiO:ScrolledWindow_SetScrollbars",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:ScrolledWindow_SetScrollbars",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (obj7) { - arg8 = PyInt_AsLong(obj7) ? true : false; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); if (PyErr_Occurred()) SWIG_fail; } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj6) { + { + arg7 = (int) SWIG_PyObj_AsInt(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj7) { + { + arg8 = (bool) SWIG_PyObj_AsBool(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetScrollbars(arg2,arg3,arg4,arg5,arg6,arg7,arg8); @@ -1389,12 +1556,22 @@ static PyObject *_wrap_ScrolledWindow_Scroll(PyObject *self, PyObject *args, PyO int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ScrolledWindow_Scroll",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_Scroll",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Scroll(arg2,arg3); @@ -1415,12 +1592,17 @@ static PyObject *_wrap_ScrolledWindow_GetScrollPageSize(PyObject *self, PyObject int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ScrolledWindow_GetScrollPageSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrolledWindow_GetScrollPageSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxScrolledWindow const *)arg1)->GetScrollPageSize(arg2); @@ -1428,7 +1610,7 @@ static PyObject *_wrap_ScrolledWindow_GetScrollPageSize(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -1441,12 +1623,22 @@ static PyObject *_wrap_ScrolledWindow_SetScrollPageSize(PyObject *self, PyObject int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient",(char *) "pageSize", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ScrolledWindow_SetScrollPageSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_SetScrollPageSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetScrollPageSize(arg2,arg3); @@ -1467,12 +1659,22 @@ static PyObject *_wrap_ScrolledWindow_SetScrollRate(PyObject *self, PyObject *ar int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "xstep",(char *) "ystep", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:ScrolledWindow_SetScrollRate",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_SetScrollRate",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetScrollRate(arg2,arg3); @@ -1539,10 +1741,14 @@ static PyObject *_wrap_ScrolledWindow_EnableScrolling(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_EnableScrolling",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EnableScrolling(arg2,arg3); @@ -1601,12 +1807,22 @@ static PyObject *_wrap_ScrolledWindow_SetScale(PyObject *self, PyObject *args, P double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "xs",(char *) "ys", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:ScrolledWindow_SetScale",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_SetScale",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetScale(arg2,arg3); @@ -1639,7 +1855,7 @@ static PyObject *_wrap_ScrolledWindow_GetScaleX(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1664,7 +1880,7 @@ static PyObject *_wrap_ScrolledWindow_GetScaleY(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -1674,33 +1890,29 @@ static PyObject *_wrap_ScrolledWindow_GetScaleY(PyObject *self, PyObject *args, static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ; - int arg2 ; - int arg3 ; - int *arg4 = (int *) 0 ; - int *arg5 = (int *) 0 ; - int temp4 ; - int temp5 ; + wxPoint *arg2 = 0 ; + wxPoint result; + wxPoint temp2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - arg4 = &temp4; - arg5 = &temp5; - if(!PyArg_ParseTuple(args,(char *)"Oii:ScrolledWindow_CalcScrolledPosition",&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:ScrolledWindow_CalcScrolledPosition",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxScrolledWindow const *)arg1)->CalcScrolledPosition(arg2,arg3,arg4,arg5); + result = ((wxScrolledWindow const *)arg1)->CalcScrolledPosition((wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; - { - PyObject *o = PyInt_FromLong((long) (*arg4)); - resultobj = t_output_helper(resultobj,o); - } { - PyObject *o = PyInt_FromLong((long) (*arg5)); - resultobj = t_output_helper(resultobj,o); + wxPoint * resultptr; + resultptr = new wxPoint((wxPoint &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -1711,29 +1923,43 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition__SWIG_0(PyObject *sel static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ; - wxPoint *arg2 = 0 ; - wxPoint result; - wxPoint temp2 ; + int arg2 ; + int arg3 ; + int *arg4 = (int *) 0 ; + int *arg5 = (int *) 0 ; + int temp4 ; + int temp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:ScrolledWindow_CalcScrolledPosition",&obj0,&obj1)) goto fail; + arg4 = &temp4; + arg5 = &temp5; + if(!PyArg_ParseTuple(args,(char *)"OOO:ScrolledWindow_CalcScrolledPosition",&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = &temp2; - if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxScrolledWindow const *)arg1)->CalcScrolledPosition((wxPoint const &)*arg2); + ((wxScrolledWindow const *)arg1)->CalcScrolledPosition(arg2,arg3,arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } + Py_INCREF(Py_None); resultobj = Py_None; { - wxPoint * resultptr; - resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + PyObject *o = PyInt_FromLong((long) (*arg4)); + resultobj = t_output_helper(resultobj,o); + } + { + PyObject *o = PyInt_FromLong((long) (*arg5)); + resultobj = t_output_helper(resultobj,o); } return resultobj; fail: @@ -1766,7 +1992,7 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition(PyObject *self, PyObj _v = wxPySimple_typecheck(argv[1], wxT("wxPoint"), 2); } if (_v) { - return _wrap_ScrolledWindow_CalcScrolledPosition__SWIG_1(self,args); + return _wrap_ScrolledWindow_CalcScrolledPosition__SWIG_0(self,args); } } } @@ -1783,14 +2009,26 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition(PyObject *self, PyObj } if (_v) { { - _v = (PyInt_Check(argv[1]) || PyLong_Check(argv[1])) ? 1 : 0; + SWIG_PyObj_AsInt(argv[1]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } } if (_v) { { - _v = (PyInt_Check(argv[2]) || PyLong_Check(argv[2])) ? 1 : 0; + SWIG_PyObj_AsInt(argv[2]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } } if (_v) { - return _wrap_ScrolledWindow_CalcScrolledPosition__SWIG_0(self,args); + return _wrap_ScrolledWindow_CalcScrolledPosition__SWIG_1(self,args); } } } @@ -1804,33 +2042,29 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition(PyObject *self, PyObj static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ; - int arg2 ; - int arg3 ; - int *arg4 = (int *) 0 ; - int *arg5 = (int *) 0 ; - int temp4 ; - int temp5 ; + wxPoint *arg2 = 0 ; + wxPoint result; + wxPoint temp2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - arg4 = &temp4; - arg5 = &temp5; - if(!PyArg_ParseTuple(args,(char *)"Oii:ScrolledWindow_CalcUnscrolledPosition",&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:ScrolledWindow_CalcUnscrolledPosition",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxScrolledWindow const *)arg1)->CalcUnscrolledPosition(arg2,arg3,arg4,arg5); + result = ((wxScrolledWindow const *)arg1)->CalcUnscrolledPosition((wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; { - PyObject *o = PyInt_FromLong((long) (*arg4)); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o = PyInt_FromLong((long) (*arg5)); - resultobj = t_output_helper(resultobj,o); + wxPoint * resultptr; + resultptr = new wxPoint((wxPoint &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); } return resultobj; fail: @@ -1841,29 +2075,43 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_0(PyObject *s static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ; - wxPoint *arg2 = 0 ; - wxPoint result; - wxPoint temp2 ; + int arg2 ; + int arg3 ; + int *arg4 = (int *) 0 ; + int *arg5 = (int *) 0 ; + int temp4 ; + int temp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO:ScrolledWindow_CalcUnscrolledPosition",&obj0,&obj1)) goto fail; + arg4 = &temp4; + arg5 = &temp5; + if(!PyArg_ParseTuple(args,(char *)"OOO:ScrolledWindow_CalcUnscrolledPosition",&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg2 = &temp2; - if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxScrolledWindow const *)arg1)->CalcUnscrolledPosition((wxPoint const &)*arg2); + ((wxScrolledWindow const *)arg1)->CalcUnscrolledPosition(arg2,arg3,arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } + Py_INCREF(Py_None); resultobj = Py_None; { - wxPoint * resultptr; - resultptr = new wxPoint((wxPoint &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPoint, 1); + PyObject *o = PyInt_FromLong((long) (*arg4)); + resultobj = t_output_helper(resultobj,o); + } + { + PyObject *o = PyInt_FromLong((long) (*arg5)); + resultobj = t_output_helper(resultobj,o); } return resultobj; fail: @@ -1896,7 +2144,7 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition(PyObject *self, PyO _v = wxPySimple_typecheck(argv[1], wxT("wxPoint"), 2); } if (_v) { - return _wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_1(self,args); + return _wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_0(self,args); } } } @@ -1913,14 +2161,26 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition(PyObject *self, PyO } if (_v) { { - _v = (PyInt_Check(argv[1]) || PyLong_Check(argv[1])) ? 1 : 0; + SWIG_PyObj_AsInt(argv[1]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } } if (_v) { { - _v = (PyInt_Check(argv[2]) || PyLong_Check(argv[2])) ? 1 : 0; + SWIG_PyObj_AsInt(argv[2]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } } if (_v) { - return _wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_0(self,args); + return _wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_1(self,args); } } } @@ -1979,7 +2239,7 @@ static PyObject *_wrap_ScrolledWindow_CalcScrollInc(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -2107,376 +2367,90 @@ static PyObject * ScrolledWindow_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_AcceleratorEntry(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - int arg1 = (int) 0 ; - int arg2 = (int) 0 ; - int arg3 = (int) 0 ; - wxMenuItem *arg4 = (wxMenuItem *) NULL ; - wxAcceleratorEntry *result; - PyObject * obj3 = 0 ; - char *kwnames[] = { - (char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iiiO:new_AcceleratorEntry",kwnames,&arg1,&arg2,&arg3,&obj3)) goto fail; - if (obj3) { - if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxAcceleratorEntry *)new wxAcceleratorEntry(arg1,arg2,arg3,arg4); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAcceleratorEntry, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_delete_AcceleratorEntry(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_AcceleratorEntry",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - delete arg1; - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_AcceleratorEntry_Set(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; - int arg2 ; - int arg3 ; - int arg4 ; - wxMenuItem *arg5 = (wxMenuItem *) NULL ; - PyObject * obj0 = 0 ; - PyObject * obj4 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "flags",(char *) "keyCode",(char *) "cmd",(char *) "item", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiii|O:AcceleratorEntry_Set",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (obj4) { - if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Set(arg2,arg3,arg4,arg5); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_AcceleratorEntry_SetMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; - wxMenuItem *arg2 = (wxMenuItem *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "item", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AcceleratorEntry_SetMenuItem",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMenuItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetMenuItem(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_AcceleratorEntry_GetMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; - wxMenuItem *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetMenuItem",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMenuItem *)((wxAcceleratorEntry const *)arg1)->GetMenuItem(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = wxPyMake_wxObject(result); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_AcceleratorEntry_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetFlags",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetFlags(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; +static int _wrap_FrameNameStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable FrameNameStr is read-only."); + return 1; } -static PyObject *_wrap_AcceleratorEntry_GetKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; +static PyObject *_wrap_FrameNameStr_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetKeyCode",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetKeyCode(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyFrameNameStr)->c_str(), (&wxPyFrameNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyFrameNameStr)->c_str(), (&wxPyFrameNameStr)->Len()); +#endif } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; + return pyobj; } -static PyObject *_wrap_AcceleratorEntry_GetCommand(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_GetCommand",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorEntry,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetCommand(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; +static int _wrap_DialogNameStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable DialogNameStr is read-only."); + return 1; } -static PyObject * AcceleratorEntry_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxAcceleratorEntry, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); -} -static PyObject *_wrap_new_AcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - int arg1 ; - wxAcceleratorEntry *arg2 = (wxAcceleratorEntry *) 0 ; - wxAcceleratorTable *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "n", NULL - }; +static PyObject *_wrap_DialogNameStr_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_AcceleratorTable",kwnames,&obj0)) goto fail; - { - arg2 = wxAcceleratorEntry_LIST_helper(obj0); - if (arg2) arg1 = PyList_Size(obj0); - else arg1 = 0; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxAcceleratorTable *)new wxAcceleratorTable(arg1,(wxAcceleratorEntry const *)arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAcceleratorTable, 1); { - delete [] arg2; - } - return resultobj; - fail: - { - delete [] arg2; +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyDialogNameStr)->c_str(), (&wxPyDialogNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyDialogNameStr)->c_str(), (&wxPyDialogNameStr)->Len()); +#endif } - return NULL; + return pyobj; } -static PyObject *_wrap_delete_AcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxAcceleratorTable *arg1 = (wxAcceleratorTable *) 0 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_AcceleratorTable",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorTable,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - delete arg1; - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; +static int _wrap_StatusLineNameStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable StatusLineNameStr is read-only."); + return 1; } -static PyObject *_wrap_AcceleratorTable_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxAcceleratorTable *arg1 = (wxAcceleratorTable *) 0 ; - bool result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; +static PyObject *_wrap_StatusLineNameStr_get() { + PyObject *pyobj; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorTable_Ok",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxAcceleratorTable,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxAcceleratorTable const *)arg1)->Ok(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyStatusLineNameStr)->c_str(), (&wxPyStatusLineNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyStatusLineNameStr)->c_str(), (&wxPyStatusLineNameStr)->Len()); +#endif } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; + return pyobj; } -static PyObject * AcceleratorTable_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxAcceleratorTable, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); -} -static int _wrap_NullAcceleratorTable_set(PyObject *_val) { - PyErr_SetString(PyExc_TypeError,"Variable NullAcceleratorTable is read-only."); +static int _wrap_ToolBarNameStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ToolBarNameStr is read-only."); return 1; } -static PyObject *_wrap_NullAcceleratorTable_get() { +static PyObject *_wrap_ToolBarNameStr_get() { PyObject *pyobj; - pyobj = SWIG_NewPointerObj((void *) &wxNullAcceleratorTable, SWIGTYPE_p_wxAcceleratorTable, 0); - return pyobj; -} - - -static PyObject *_wrap_GetAccelFromString(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxString *arg1 = 0 ; - wxAcceleratorEntry *result; - bool temp1 = false ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "label", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetAccelFromString",kwnames,&obj0)) goto fail; - { - arg1 = wxString_in_helper(obj0); - if (arg1 == NULL) SWIG_fail; - temp1 = true; - } { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxAcceleratorEntry *)wxGetAccelFromString((wxString const &)*arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxAcceleratorEntry, 0); - { - if (temp1) - delete arg1; - } - return resultobj; - fail: - { - if (temp1) - delete arg1; +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyToolBarNameStr)->c_str(), (&wxPyToolBarNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyToolBarNameStr)->c_str(), (&wxPyToolBarNameStr)->Len()); +#endif } - return NULL; + return pyobj; } static PyObject *_wrap_TopLevelWindow_Maximize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -2486,8 +2460,10 @@ static PyObject *_wrap_TopLevelWindow_Maximize(PyObject *self, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TopLevelWindow_Maximize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTopLevelWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2530,7 +2506,7 @@ static PyObject *_wrap_TopLevelWindow_Restore(PyObject *self, PyObject *args, Py static PyObject *_wrap_TopLevelWindow_Iconize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ; - bool arg2 = (bool) TRUE ; + bool arg2 = (bool) True ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -2540,8 +2516,10 @@ static PyObject *_wrap_TopLevelWindow_Iconize(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TopLevelWindow_Iconize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTopLevelWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2575,7 +2553,7 @@ static PyObject *_wrap_TopLevelWindow_IsMaximized(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2600,7 +2578,7 @@ static PyObject *_wrap_TopLevelWindow_IsIconized(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2704,14 +2682,23 @@ static PyObject *_wrap_TopLevelWindow_ShowFullScreen(PyObject *self, PyObject *a bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "show",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|l:TopLevelWindow_ShowFullScreen",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TopLevelWindow_ShowFullScreen",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTopLevelWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ShowFullScreen(arg2,arg3); @@ -2719,7 +2706,7 @@ static PyObject *_wrap_TopLevelWindow_ShowFullScreen(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2744,7 +2731,7 @@ static PyObject *_wrap_TopLevelWindow_IsFullScreen(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2755,7 +2742,7 @@ static PyObject *_wrap_TopLevelWindow_SetTitle(PyObject *self, PyObject *args, P PyObject *resultobj; wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -2767,7 +2754,7 @@ static PyObject *_wrap_TopLevelWindow_SetTitle(PyObject *self, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -2846,7 +2833,7 @@ static PyObject *_wrap_TopLevelWindow_SetShape(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2863,7 +2850,7 @@ static PyObject * TopLevelWindow_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; wxString *arg3 = 0 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; @@ -2873,25 +2860,31 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg wxString const &arg7_defvalue = wxPyFrameNameStr ; wxString *arg7 = (wxString *) &arg7_defvalue ; wxFrame *result; - bool temp3 = false ; + bool temp3 = False ; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_Frame",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_Frame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { @@ -2905,11 +2898,17 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -2972,7 +2971,7 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw PyObject *resultobj; wxFrame *arg1 = (wxFrame *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 ; + int arg3 ; wxString *arg4 = 0 ; wxPoint const &arg5_defvalue = wxDefaultPosition ; wxPoint *arg5 = (wxPoint *) &arg5_defvalue ; @@ -2982,27 +2981,33 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw wxString const &arg8_defvalue = wxPyFrameNameStr ; wxString *arg8 = (wxString *) &arg8_defvalue ; bool result; - bool temp4 = false ; + bool temp4 = False ; wxPoint temp5 ; wxSize temp6 ; - bool temp8 = false ; + bool temp8 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:Frame_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:Frame_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { @@ -3016,11 +3021,17 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); if (arg8 == NULL) SWIG_fail; - temp8 = true; + temp8 = True; } } { @@ -3030,7 +3041,7 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -3166,12 +3177,17 @@ static PyObject *_wrap_Frame_ProcessCommand(PyObject *self, PyObject *args, PyOb int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "winid", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Frame_ProcessCommand",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Frame_ProcessCommand",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ProcessCommand(arg2); @@ -3179,7 +3195,7 @@ static PyObject *_wrap_Frame_ProcessCommand(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3191,24 +3207,45 @@ static PyObject *_wrap_Frame_CreateStatusBar(PyObject *self, PyObject *args, PyO wxFrame *arg1 = (wxFrame *) 0 ; int arg2 = (int) 1 ; long arg3 = (long) wxST_SIZEGRIP ; - wxWindowID arg4 = (wxWindowID) 0 ; + int arg4 = (int) 0 ; wxString const &arg5_defvalue = wxPyStatusLineNameStr ; wxString *arg5 = (wxString *) &arg5_defvalue ; wxStatusBar *result; - bool temp5 = false ; + bool temp5 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number",(char *) "style",(char *) "winid",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iliO:Frame_CreateStatusBar",kwnames,&obj0,&arg2,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOO:Frame_CreateStatusBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } { @@ -3294,19 +3331,26 @@ static PyObject *_wrap_Frame_SetStatusText(PyObject *self, PyObject *args, PyObj wxFrame *arg1 = (wxFrame *) 0 ; wxString *arg2 = 0 ; int arg3 = (int) 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Frame_SetStatusText",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Frame_SetStatusText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3373,19 +3417,26 @@ static PyObject *_wrap_Frame_PushStatusText(PyObject *self, PyObject *args, PyOb wxFrame *arg1 = (wxFrame *) 0 ; wxString *arg2 = 0 ; int arg3 = (int) 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:Frame_PushStatusText",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Frame_PushStatusText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3414,12 +3465,19 @@ static PyObject *_wrap_Frame_PopStatusText(PyObject *self, PyObject *args, PyObj wxFrame *arg1 = (wxFrame *) 0 ; int arg2 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:Frame_PopStatusText",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Frame_PopStatusText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PopStatusText(arg2); @@ -3439,12 +3497,17 @@ static PyObject *_wrap_Frame_SetStatusBarPane(PyObject *self, PyObject *args, Py wxFrame *arg1 = (wxFrame *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "n", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Frame_SetStatusBarPane",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Frame_SetStatusBarPane",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStatusBarPane(arg2); @@ -3477,7 +3540,7 @@ static PyObject *_wrap_Frame_GetStatusBarPane(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3488,24 +3551,38 @@ static PyObject *_wrap_Frame_CreateToolBar(PyObject *self, PyObject *args, PyObj PyObject *resultobj; wxFrame *arg1 = (wxFrame *) 0 ; long arg2 = (long) -1 ; - wxWindowID arg3 = (wxWindowID) -1 ; + int arg3 = (int) -1 ; wxString const &arg4_defvalue = wxPyToolBarNameStr ; wxString *arg4 = (wxString *) &arg4_defvalue ; wxToolBar *result; - bool temp4 = false ; + bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style",(char *) "winid",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|liO:Frame_CreateToolBar",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:Frame_CreateToolBar",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { @@ -3591,7 +3668,7 @@ static PyObject *_wrap_Frame_DoGiveHelp(PyObject *self, PyObject *args, PyObject wxFrame *arg1 = (wxFrame *) 0 ; wxString *arg2 = 0 ; bool arg3 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -3604,10 +3681,12 @@ static PyObject *_wrap_Frame_DoGiveHelp(PyObject *self, PyObject *args, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; } - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->DoGiveHelp((wxString const &)*arg2,arg3); @@ -3669,7 +3748,7 @@ static PyObject * Frame_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; wxString *arg3 = 0 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; @@ -3679,25 +3758,31 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar wxString const &arg7_defvalue = wxPyDialogNameStr ; wxString *arg7 = (wxString *) &arg7_defvalue ; wxDialog *result; - bool temp3 = false ; + bool temp3 = False ; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_Dialog",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_Dialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { @@ -3711,11 +3796,17 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -3774,7 +3865,7 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxDialog *arg1 = (wxDialog *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 ; + int arg3 ; wxString *arg4 = 0 ; wxPoint const &arg5_defvalue = wxDefaultPosition ; wxPoint *arg5 = (wxPoint *) &arg5_defvalue ; @@ -3784,27 +3875,33 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k wxString const &arg8_defvalue = wxPyDialogNameStr ; wxString *arg8 = (wxString *) &arg8_defvalue ; bool result; - bool temp4 = false ; + bool temp4 = False ; wxPoint temp5 ; wxSize temp6 ; - bool temp8 = false ; + bool temp8 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:Dialog_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:Dialog_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { @@ -3818,11 +3915,17 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); if (arg8 == NULL) SWIG_fail; - temp8 = true; + temp8 = True; } } { @@ -3832,7 +3935,7 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -3860,12 +3963,17 @@ static PyObject *_wrap_Dialog_SetReturnCode(PyObject *self, PyObject *args, PyOb wxDialog *arg1 = (wxDialog *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "returnCode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Dialog_SetReturnCode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_SetReturnCode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetReturnCode(arg2); @@ -3898,7 +4006,7 @@ static PyObject *_wrap_Dialog_GetReturnCode(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -3910,7 +4018,7 @@ static PyObject *_wrap_Dialog_CreateTextSizer(PyObject *self, PyObject *args, Py wxDialog *arg1 = (wxDialog *) 0 ; wxString *arg2 = 0 ; wxSizer *result; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -3922,7 +4030,7 @@ static PyObject *_wrap_Dialog_CreateTextSizer(PyObject *self, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3954,12 +4062,17 @@ static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *self, PyObject *args, long arg2 ; wxSizer *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:Dialog_CreateButtonSizer",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_CreateButtonSizer",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSizer *)(arg1)->CreateButtonSizer(arg2); @@ -3976,34 +4089,6 @@ static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *self, PyObject *args, } -static PyObject *_wrap_Dialog_SetModal(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxDialog *arg1 = (wxDialog *) 0 ; - bool arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "flag", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_SetModal",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetModal(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Dialog_IsModal(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDialog *arg1 = (wxDialog *) 0 ; @@ -4022,7 +4107,7 @@ static PyObject *_wrap_Dialog_IsModal(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4047,7 +4132,7 @@ static PyObject *_wrap_Dialog_ShowModal(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4059,12 +4144,17 @@ static PyObject *_wrap_Dialog_EndModal(PyObject *self, PyObject *args, PyObject wxDialog *arg1 = (wxDialog *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "retCode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Dialog_EndModal",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_EndModal",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EndModal(arg2); @@ -4097,7 +4187,7 @@ static PyObject *_wrap_Dialog_IsModalShowing(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4114,7 +4204,7 @@ static PyObject * Dialog_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; wxString *arg3 = 0 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; @@ -4124,25 +4214,31 @@ static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *k wxString const &arg7_defvalue = wxPyFrameNameStr ; wxString *arg7 = (wxString *) &arg7_defvalue ; wxMiniFrame *result; - bool temp3 = false ; + bool temp3 = False ; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_MiniFrame",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_MiniFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { @@ -4156,11 +4252,17 @@ static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *k if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -4219,7 +4321,7 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxMiniFrame *arg1 = (wxMiniFrame *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 ; + int arg3 ; wxString *arg4 = 0 ; wxPoint const &arg5_defvalue = wxDefaultPosition ; wxPoint *arg5 = (wxPoint *) &arg5_defvalue ; @@ -4229,27 +4331,33 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject wxString const &arg8_defvalue = wxPyFrameNameStr ; wxString *arg8 = (wxString *) &arg8_defvalue ; bool result; - bool temp4 = false ; + bool temp4 = False ; wxPoint temp5 ; wxSize temp6 ; - bool temp8 = false ; + bool temp8 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:MiniFrame_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:MiniFrame_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMiniFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { @@ -4263,11 +4371,17 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); if (arg8 == NULL) SWIG_fail; - temp8 = true; + temp8 = True; } } { @@ -4277,7 +4391,7 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -4311,7 +4425,7 @@ static PyObject *_wrap_new_SplashScreenWindow(PyObject *self, PyObject *args, Py PyObject *resultobj; wxBitmap *arg1 = 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 ; + int arg3 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -4322,18 +4436,24 @@ static PyObject *_wrap_new_SplashScreenWindow(PyObject *self, PyObject *args, Py wxSize temp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "bitmap",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOl:new_SplashScreenWindow",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:new_SplashScreenWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -4346,6 +4466,12 @@ static PyObject *_wrap_new_SplashScreenWindow(PyObject *self, PyObject *args, Py if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSplashScreenWindow *)new wxSplashScreenWindow((wxBitmap const &)*arg1,arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6); @@ -4431,7 +4557,7 @@ static PyObject *_wrap_new_SplashScreen(PyObject *self, PyObject *args, PyObject long arg2 ; int arg3 ; wxWindow *arg4 = (wxWindow *) 0 ; - wxWindowID arg5 ; + int arg5 ; wxPoint const &arg6_defvalue = wxDefaultPosition ; wxPoint *arg6 = (wxPoint *) &arg6_defvalue ; wxSize const &arg7_defvalue = wxDefaultSize ; @@ -4441,19 +4567,35 @@ static PyObject *_wrap_new_SplashScreen(PyObject *self, PyObject *args, PyObject wxPoint temp6 ; wxSize temp7 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "bitmap",(char *) "splashStyle",(char *) "milliseconds",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OliOi|OOl:new_SplashScreen",kwnames,&obj0,&arg2,&arg3,&obj3,&arg5,&obj5,&obj6,&arg8)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:new_SplashScreen",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg1 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } if (obj5) { { arg6 = &temp6; @@ -4466,6 +4608,12 @@ static PyObject *_wrap_new_SplashScreen(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj6, &arg7)) SWIG_fail; } } + if (obj7) { + { + arg8 = (long) SWIG_PyObj_AsLong(obj7); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSplashScreen *)new wxSplashScreen((wxBitmap const &)*arg1,arg2,arg3,arg4,arg5,(wxPoint const &)*arg6,(wxSize const &)*arg7,arg8); @@ -4498,7 +4646,7 @@ static PyObject *_wrap_SplashScreen_GetSplashStyle(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -4548,7 +4696,7 @@ static PyObject *_wrap_SplashScreen_GetTimeout(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4565,25 +4713,39 @@ static PyObject * SplashScreen_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 = (wxWindowID) -1 ; + int arg2 = (int) -1 ; long arg3 = (long) wxST_SIZEGRIP ; wxString const &arg4_defvalue = wxPyStatusLineNameStr ; wxString *arg4 = (wxString *) &arg4_defvalue ; wxStatusBar *result; - bool temp4 = false ; + bool temp4 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ilO:new_StatusBar",kwnames,&obj0,&arg2,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:new_StatusBar",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { @@ -4638,27 +4800,39 @@ static PyObject *_wrap_StatusBar_Create(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxStatusBar *arg1 = (wxStatusBar *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 ; + int arg3 ; long arg4 = (long) wxST_SIZEGRIP ; wxString const &arg5_defvalue = wxPyStatusLineNameStr ; wxString *arg5 = (wxString *) &arg5_defvalue ; bool result; - bool temp5 = false ; + bool temp5 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|lO:StatusBar_Create",kwnames,&obj0,&obj1,&arg3,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:StatusBar_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj4) { { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } { @@ -4668,7 +4842,7 @@ static PyObject *_wrap_StatusBar_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp5) delete arg5; @@ -4688,12 +4862,19 @@ static PyObject *_wrap_StatusBar_SetFieldsCount(PyObject *self, PyObject *args, wxStatusBar *arg1 = (wxStatusBar *) 0 ; int arg2 = (int) 1 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:StatusBar_SetFieldsCount",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:StatusBar_SetFieldsCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFieldsCount(arg2); @@ -4726,7 +4907,7 @@ static PyObject *_wrap_StatusBar_GetFieldsCount(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -4738,19 +4919,26 @@ static PyObject *_wrap_StatusBar_SetStatusText(PyObject *self, PyObject *args, P wxStatusBar *arg1 = (wxStatusBar *) 0 ; wxString *arg2 = 0 ; int arg3 = (int) 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:StatusBar_SetStatusText",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:StatusBar_SetStatusText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4780,12 +4968,19 @@ static PyObject *_wrap_StatusBar_GetStatusText(PyObject *self, PyObject *args, P int arg2 = (int) 0 ; wxString result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:StatusBar_GetStatusText",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:StatusBar_GetStatusText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = ((wxStatusBar const *)arg1)->GetStatusText(arg2); @@ -4811,19 +5006,26 @@ static PyObject *_wrap_StatusBar_PushStatusText(PyObject *self, PyObject *args, wxStatusBar *arg1 = (wxStatusBar *) 0 ; wxString *arg2 = 0 ; int arg3 = (int) 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "text",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:StatusBar_PushStatusText",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:StatusBar_PushStatusText",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4852,12 +5054,19 @@ static PyObject *_wrap_StatusBar_PopStatusText(PyObject *self, PyObject *args, P wxStatusBar *arg1 = (wxStatusBar *) 0 ; int arg2 = (int) 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "number", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:StatusBar_PopStatusText",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:StatusBar_PopStatusText",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->PopStatusText(arg2); @@ -4914,29 +5123,31 @@ static PyObject *_wrap_StatusBar_GetFieldRect(PyObject *self, PyObject *args, Py PyObject *resultobj; wxStatusBar *arg1 = (wxStatusBar *) 0 ; int arg2 ; - wxRect *arg3 = 0 ; - bool result; - wxRect temp3 ; + wxRect result; PyObject * obj0 = 0 ; - PyObject * obj2 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "i",(char *) "rect", NULL + (char *) "self",(char *) "i", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:StatusBar_GetFieldRect",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StatusBar_GetFieldRect",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - arg3 = &temp3; - if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxStatusBar const *)arg1)->GetFieldRect(arg2,*arg3); + result = wxStatusBar_GetFieldRect(arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + { + wxRect * resultptr; + resultptr = new wxRect((wxRect &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1); + } return resultobj; fail: return NULL; @@ -4948,12 +5159,17 @@ static PyObject *_wrap_StatusBar_SetMinHeight(PyObject *self, PyObject *args, Py wxStatusBar *arg1 = (wxStatusBar *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:StatusBar_SetMinHeight",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StatusBar_SetMinHeight",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStatusBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinHeight(arg2); @@ -4986,7 +5202,7 @@ static PyObject *_wrap_StatusBar_GetBorderX(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5011,7 +5227,7 @@ static PyObject *_wrap_StatusBar_GetBorderY(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5025,10 +5241,30 @@ static PyObject * StatusBar_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static int _wrap_SplitterNameStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable SplitterNameStr is read-only."); + return 1; +} + + +static PyObject *_wrap_SplitterNameStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPySplitterNameStr)->c_str(), (&wxPySplitterNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPySplitterNameStr)->c_str(), (&wxPySplitterNameStr)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -5039,17 +5275,23 @@ static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObje wxSplitterWindow *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { - (char *) "parent",(char *) "id",(char *) "point",(char *) "size",(char *) "style",(char *) "name", NULL + (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlO:new_SplitterWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_SplitterWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -5062,11 +5304,17 @@ static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -5117,7 +5365,7 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 ; + int arg3 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -5128,19 +5376,25 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "parent",(char *) "id",(char *) "point",(char *) "size",(char *) "style",(char *) "name", NULL + (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:SplitterWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:SplitterWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -5153,11 +5407,17 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -5167,7 +5427,7 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -5241,12 +5501,17 @@ static PyObject *_wrap_SplitterWindow_SetSplitMode(PyObject *self, PyObject *arg wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "mode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterWindow_SetSplitMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetSplitMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSplitMode(arg2); @@ -5279,7 +5544,7 @@ static PyObject *_wrap_SplitterWindow_GetSplitMode(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5323,14 +5588,21 @@ static PyObject *_wrap_SplitterWindow_SplitVertically(PyObject *self, PyObject * PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "window1",(char *) "window2",(char *) "sashPosition", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:SplitterWindow_SplitVertically",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:SplitterWindow_SplitVertically",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SplitVertically(arg2,arg3,arg4); @@ -5338,7 +5610,7 @@ static PyObject *_wrap_SplitterWindow_SplitVertically(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5355,14 +5627,21 @@ static PyObject *_wrap_SplitterWindow_SplitHorizontally(PyObject *self, PyObject PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "window1",(char *) "window2",(char *) "sashPosition", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:SplitterWindow_SplitHorizontally",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:SplitterWindow_SplitHorizontally",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SplitHorizontally(arg2,arg3,arg4); @@ -5370,7 +5649,7 @@ static PyObject *_wrap_SplitterWindow_SplitHorizontally(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5400,7 +5679,7 @@ static PyObject *_wrap_SplitterWindow_Unsplit(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5431,7 +5710,7 @@ static PyObject *_wrap_SplitterWindow_ReplaceWindow(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5456,7 +5735,7 @@ static PyObject *_wrap_SplitterWindow_IsSplit(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5468,12 +5747,17 @@ static PyObject *_wrap_SplitterWindow_SetSashSize(PyObject *self, PyObject *args wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterWindow_SetSashSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetSashSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSashSize(arg2); @@ -5493,12 +5777,17 @@ static PyObject *_wrap_SplitterWindow_SetBorderSize(PyObject *self, PyObject *ar wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterWindow_SetBorderSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetBorderSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetBorderSize(arg2); @@ -5531,7 +5820,7 @@ static PyObject *_wrap_SplitterWindow_GetSashSize(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5556,7 +5845,7 @@ static PyObject *_wrap_SplitterWindow_GetBorderSize(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5567,19 +5856,26 @@ static PyObject *_wrap_SplitterWindow_SetSashPosition(PyObject *self, PyObject * PyObject *resultobj; wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; int arg2 ; - bool arg3 = (bool) TRUE ; + bool arg3 = (bool) True ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "position",(char *) "redraw", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:SplitterWindow_SetSashPosition",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:SplitterWindow_SetSashPosition",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSashPosition(arg2,arg3); @@ -5612,7 +5908,7 @@ static PyObject *_wrap_SplitterWindow_GetSashPosition(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5624,12 +5920,17 @@ static PyObject *_wrap_SplitterWindow_SetMinimumPaneSize(PyObject *self, PyObjec wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "min", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterWindow_SetMinimumPaneSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetMinimumPaneSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinimumPaneSize(arg2); @@ -5662,7 +5963,7 @@ static PyObject *_wrap_SplitterWindow_GetMinimumPaneSize(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5677,12 +5978,29 @@ static PyObject *_wrap_SplitterWindow_SashHitTest(PyObject *self, PyObject *args int arg4 = (int) 5 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "tolerance", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:SplitterWindow_SashHitTest",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:SplitterWindow_SashHitTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SashHitTest(arg2,arg3,arg4); @@ -5690,7 +6008,7 @@ static PyObject *_wrap_SplitterWindow_SashHitTest(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5733,8 +6051,10 @@ static PyObject *_wrap_SplitterWindow_SetNeedUpdating(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetNeedUpdating",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetNeedUpdating(arg2); @@ -5767,7 +6087,7 @@ static PyObject *_wrap_SplitterWindow_GetNeedUpdating(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5786,12 +6106,19 @@ static PyObject *_wrap_new_SplitterEvent(PyObject *self, PyObject *args, PyObjec wxEventType arg1 = (wxEventType) wxEVT_NULL ; wxSplitterWindow *arg2 = (wxSplitterWindow *) (wxSplitterWindow *) NULL ; wxSplitterEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "type",(char *) "splitter", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|iO:new_SplitterEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SplitterEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxSplitterWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } @@ -5814,12 +6141,17 @@ static PyObject *_wrap_SplitterEvent_SetSashPosition(PyObject *self, PyObject *a wxSplitterEvent *arg1 = (wxSplitterEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SplitterEvent_SetSashPosition",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterEvent_SetSashPosition",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSplitterEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSashPosition(arg2); @@ -5852,7 +6184,7 @@ static PyObject *_wrap_SplitterEvent_GetSashPosition(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5904,7 +6236,7 @@ static PyObject *_wrap_SplitterEvent_GetX(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5929,7 +6261,7 @@ static PyObject *_wrap_SplitterEvent_GetY(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -5943,10 +6275,50 @@ static PyObject * SplitterEvent_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static int _wrap_SashNameStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable SashNameStr is read-only."); + return 1; +} + + +static PyObject *_wrap_SashNameStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPySashNameStr)->c_str(), (&wxPySashNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPySashNameStr)->c_str(), (&wxPySashNameStr)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_SashLayoutNameStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable SashLayoutNameStr is read-only."); + return 1; +} + + +static PyObject *_wrap_SashLayoutNameStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPySashLayoutNameStr)->c_str(), (&wxPySashLayoutNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPySashLayoutNameStr)->c_str(), (&wxPySashLayoutNameStr)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -5957,17 +6329,23 @@ static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject * wxSashWindow *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlO:new_SashWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_SashWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -5980,11 +6358,17 @@ static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject * if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -6035,7 +6419,7 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec PyObject *resultobj; wxSashWindow *arg1 = (wxSashWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 ; + int arg3 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -6046,19 +6430,25 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:SashWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:SashWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -6071,11 +6461,17 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -6085,7 +6481,7 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -6106,15 +6502,22 @@ static PyObject *_wrap_SashWindow_SetSashVisible(PyObject *self, PyObject *args, int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge",(char *) "sash", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:SashWindow_SetSashVisible",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SashWindow_SetSashVisible",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSashVisible((wxSashEdgePosition )arg2,arg3); @@ -6135,12 +6538,17 @@ static PyObject *_wrap_SashWindow_GetSashVisible(PyObject *self, PyObject *args, int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_GetSashVisible",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_GetSashVisible",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxSashWindow const *)arg1)->GetSashVisible((wxSashEdgePosition )arg2); @@ -6148,7 +6556,7 @@ static PyObject *_wrap_SashWindow_GetSashVisible(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6161,15 +6569,22 @@ static PyObject *_wrap_SashWindow_SetSashBorder(PyObject *self, PyObject *args, int arg2 ; bool arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge",(char *) "border", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:SashWindow_SetSashBorder",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SashWindow_SetSashBorder",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg3 = PyInt_AsLong(obj2) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSashBorder((wxSashEdgePosition )arg2,arg3); @@ -6190,12 +6605,17 @@ static PyObject *_wrap_SashWindow_HasBorder(PyObject *self, PyObject *args, PyOb int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_HasBorder",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_HasBorder",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxSashWindow const *)arg1)->HasBorder((wxSashEdgePosition )arg2); @@ -6203,7 +6623,7 @@ static PyObject *_wrap_SashWindow_HasBorder(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6216,12 +6636,17 @@ static PyObject *_wrap_SashWindow_GetEdgeMargin(PyObject *self, PyObject *args, int arg2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_GetEdgeMargin",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_GetEdgeMargin",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxSashWindow const *)arg1)->GetEdgeMargin((wxSashEdgePosition )arg2); @@ -6229,7 +6654,7 @@ static PyObject *_wrap_SashWindow_GetEdgeMargin(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6241,12 +6666,17 @@ static PyObject *_wrap_SashWindow_SetDefaultBorderSize(PyObject *self, PyObject wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetDefaultBorderSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetDefaultBorderSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDefaultBorderSize(arg2); @@ -6279,7 +6709,7 @@ static PyObject *_wrap_SashWindow_GetDefaultBorderSize(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6291,12 +6721,17 @@ static PyObject *_wrap_SashWindow_SetExtraBorderSize(PyObject *self, PyObject *a wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetExtraBorderSize",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetExtraBorderSize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetExtraBorderSize(arg2); @@ -6329,7 +6764,7 @@ static PyObject *_wrap_SashWindow_GetExtraBorderSize(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6341,12 +6776,17 @@ static PyObject *_wrap_SashWindow_SetMinimumSizeX(PyObject *self, PyObject *args wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "min", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetMinimumSizeX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMinimumSizeX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinimumSizeX(arg2); @@ -6366,12 +6806,17 @@ static PyObject *_wrap_SashWindow_SetMinimumSizeY(PyObject *self, PyObject *args wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "min", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetMinimumSizeY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMinimumSizeY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinimumSizeY(arg2); @@ -6404,7 +6849,7 @@ static PyObject *_wrap_SashWindow_GetMinimumSizeX(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6429,7 +6874,7 @@ static PyObject *_wrap_SashWindow_GetMinimumSizeY(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6441,12 +6886,17 @@ static PyObject *_wrap_SashWindow_SetMaximumSizeX(PyObject *self, PyObject *args wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "max", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetMaximumSizeX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMaximumSizeX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMaximumSizeX(arg2); @@ -6466,12 +6916,17 @@ static PyObject *_wrap_SashWindow_SetMaximumSizeY(PyObject *self, PyObject *args wxSashWindow *arg1 = (wxSashWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "max", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashWindow_SetMaximumSizeY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMaximumSizeY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMaximumSizeY(arg2); @@ -6504,7 +6959,7 @@ static PyObject *_wrap_SashWindow_GetMaximumSizeX(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6529,7 +6984,7 @@ static PyObject *_wrap_SashWindow_GetMaximumSizeY(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6544,12 +6999,29 @@ static PyObject *_wrap_SashWindow_SashHitTest(PyObject *self, PyObject *args, Py int arg4 = (int) 2 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "tolerance", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii|i:SashWindow_SashHitTest",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:SashWindow_SashHitTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)(arg1)->SashHitTest(arg2,arg3,arg4); @@ -6557,7 +7029,7 @@ static PyObject *_wrap_SashWindow_SashHitTest(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6600,11 +7072,25 @@ static PyObject *_wrap_new_SashEvent(PyObject *self, PyObject *args, PyObject *k int arg1 = (int) 0 ; int arg2 = (int) wxSASH_NONE ; wxSashEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "id",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_SashEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SashEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxSashEvent *)new wxSashEvent(arg1,(wxSashEdgePosition )arg2); @@ -6624,12 +7110,17 @@ static PyObject *_wrap_SashEvent_SetEdge(PyObject *self, PyObject *args, PyObjec wxSashEvent *arg1 = (wxSashEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "edge", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashEvent_SetEdge",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashEvent_SetEdge",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashEdgePosition) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetEdge((wxSashEdgePosition )arg2); @@ -6662,7 +7153,7 @@ static PyObject *_wrap_SashEvent_GetEdge(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6734,12 +7225,17 @@ static PyObject *_wrap_SashEvent_SetDragStatus(PyObject *self, PyObject *args, P wxSashEvent *arg1 = (wxSashEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "status", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashEvent_SetDragStatus",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashEvent_SetDragStatus",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxSashDragStatus) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDragStatus((wxSashDragStatus )arg2); @@ -6772,7 +7268,7 @@ static PyObject *_wrap_SashEvent_GetDragStatus(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6788,13 +7284,20 @@ static PyObject * SashEvent_swigregister(PyObject *self, PyObject *args) { } static PyObject *_wrap_new_QueryLayoutInfoEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWindowID arg1 = (wxWindowID) 0 ; + int arg1 = (int) 0 ; wxQueryLayoutInfoEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_QueryLayoutInfoEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_QueryLayoutInfoEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxQueryLayoutInfoEvent *)new wxQueryLayoutInfoEvent(arg1); @@ -6814,12 +7317,17 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetRequestedLength(PyObject *self, P wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "length", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:QueryLayoutInfoEvent_SetRequestedLength",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetRequestedLength",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryLayoutInfoEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRequestedLength(arg2); @@ -6852,7 +7360,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetRequestedLength(PyObject *self, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6864,12 +7372,17 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetFlags(PyObject *self, PyObject *a wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:QueryLayoutInfoEvent_SetFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryLayoutInfoEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlags(arg2); @@ -6902,7 +7415,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetFlags(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -6974,12 +7487,17 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetOrientation(PyObject *self, PyObj wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:QueryLayoutInfoEvent_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryLayoutInfoEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxLayoutOrientation) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation((wxLayoutOrientation )arg2); @@ -7012,7 +7530,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetOrientation(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7024,12 +7542,17 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetAlignment(PyObject *self, PyObjec wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "align", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:QueryLayoutInfoEvent_SetAlignment",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetAlignment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxQueryLayoutInfoEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxLayoutAlignment) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment((wxLayoutAlignment )arg2); @@ -7062,7 +7585,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetAlignment(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7078,13 +7601,20 @@ static PyObject * QueryLayoutInfoEvent_swigregister(PyObject *self, PyObject *ar } static PyObject *_wrap_new_CalculateLayoutEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWindowID arg1 = (wxWindowID) 0 ; + int arg1 = (int) 0 ; wxCalculateLayoutEvent *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_CalculateLayoutEvent",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_CalculateLayoutEvent",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxCalculateLayoutEvent *)new wxCalculateLayoutEvent(arg1); @@ -7104,12 +7634,17 @@ static PyObject *_wrap_CalculateLayoutEvent_SetFlags(PyObject *self, PyObject *a wxCalculateLayoutEvent *arg1 = (wxCalculateLayoutEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:CalculateLayoutEvent_SetFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalculateLayoutEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxCalculateLayoutEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlags(arg2); @@ -7142,7 +7677,7 @@ static PyObject *_wrap_CalculateLayoutEvent_GetFlags(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7219,7 +7754,7 @@ static PyObject * CalculateLayoutEvent_swigregister(PyObject *self, PyObject *ar static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -7230,17 +7765,23 @@ static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyOb wxSashLayoutWindow *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlO:new_SashLayoutWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_SashLayoutWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -7253,11 +7794,17 @@ static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyOb if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -7308,7 +7855,7 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P PyObject *resultobj; wxSashLayoutWindow *arg1 = (wxSashLayoutWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 ; + int arg3 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -7319,19 +7866,25 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi|OOlO:SashLayoutWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:SashLayoutWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashLayoutWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } if (obj3) { { arg4 = &temp4; @@ -7344,11 +7897,17 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -7358,7 +7917,7 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -7391,7 +7950,7 @@ static PyObject *_wrap_SashLayoutWindow_GetAlignment(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7416,7 +7975,7 @@ static PyObject *_wrap_SashLayoutWindow_GetOrientation(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -7428,12 +7987,17 @@ static PyObject *_wrap_SashLayoutWindow_SetAlignment(PyObject *self, PyObject *a wxSashLayoutWindow *arg1 = (wxSashLayoutWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "alignment", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashLayoutWindow_SetAlignment",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashLayoutWindow_SetAlignment",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashLayoutWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxLayoutAlignment) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAlignment((wxLayoutAlignment )arg2); @@ -7484,12 +8048,17 @@ static PyObject *_wrap_SashLayoutWindow_SetOrientation(PyObject *self, PyObject wxSashLayoutWindow *arg1 = (wxSashLayoutWindow *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orientation", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SashLayoutWindow_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashLayoutWindow_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSashLayoutWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxLayoutOrientation) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation((wxLayoutOrientation )arg2); @@ -7583,7 +8152,7 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7616,7 +8185,7 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutFrame(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7649,7 +8218,7 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutWindow(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7669,12 +8238,19 @@ static PyObject *_wrap_new_PopupWindow(PyObject *self, PyObject *args, PyObject int arg2 = (int) wxBORDER_NONE ; wxPopupWindow *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_PopupWindow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_PopupWindow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPopupWindow *)new wxPopupWindow(arg1,arg2); @@ -7719,13 +8295,20 @@ static PyObject *_wrap_PopupWindow_Create(PyObject *self, PyObject *args, PyObje bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|i:PopupWindow_Create",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PopupWindow_Create",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPopupWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Create(arg2,arg3); @@ -7733,7 +8316,7 @@ static PyObject *_wrap_PopupWindow_Create(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7791,12 +8374,19 @@ static PyObject *_wrap_new_PopupTransientWindow(PyObject *self, PyObject *args, int arg2 = (int) wxBORDER_NONE ; wxPyPopupTransientWindow *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|i:new_PopupTransientWindow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_PopupTransientWindow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxPyPopupTransientWindow *)new wxPyPopupTransientWindow(arg1,arg2); @@ -7926,33 +8516,53 @@ static PyObject * PopupTransientWindow_swigregister(PyObject *self, PyObject *ar static PyObject *_wrap_new_TipWindow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxString *arg2 = (wxString *) 0 ; - wxCoord arg3 = (wxCoord) 100 ; + wxString *arg2 = 0 ; + int arg3 = (int) 100 ; wxRect *arg4 = (wxRect *) NULL ; wxTipWindow *result; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "text",(char *) "maxLength",(char *) "rectBound", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iO:new_TipWindow",kwnames,&obj0,&obj1,&arg3,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_TipWindow",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTipWindow *)new_wxTipWindow(arg1,(wxString const *)arg2,arg3,arg4); + result = (wxTipWindow *)new_wxTipWindow(arg1,(wxString const &)*arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxTipWindow, 1); + { + if (temp2) + delete arg2; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } return NULL; } @@ -8022,7 +8632,7 @@ static PyObject * TipWindow_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 = (wxWindowID) wxID_ANY ; + int arg2 = (int) wxID_ANY ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -8033,17 +8643,25 @@ static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObj wxPyVScrolledWindow *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlO:new_VScrolledWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_VScrolledWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -8056,11 +8674,17 @@ static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObj if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -8141,7 +8765,7 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py PyObject *resultobj; wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 = (wxWindowID) wxID_ANY ; + int arg3 = (int) wxID_ANY ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -8152,19 +8776,27 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlO:VScrolledWindow_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:VScrolledWindow_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -8177,11 +8809,17 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -8191,7 +8829,7 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -8218,8 +8856,10 @@ static PyObject *_wrap_VScrolledWindow_SetLineCount(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_SetLineCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetLineCount(arg2); @@ -8247,8 +8887,10 @@ static PyObject *_wrap_VScrolledWindow_ScrollToLine(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_ScrollToLine",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollToLine(arg2); @@ -8256,7 +8898,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollToLine(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8269,12 +8911,17 @@ static PyObject *_wrap_VScrolledWindow_ScrollLines(PyObject *self, PyObject *arg int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "lines", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:VScrolledWindow_ScrollLines",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_ScrollLines",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollLines(arg2); @@ -8282,7 +8929,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollLines(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8295,12 +8942,17 @@ static PyObject *_wrap_VScrolledWindow_ScrollPages(PyObject *self, PyObject *arg int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pages", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:VScrolledWindow_ScrollPages",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_ScrollPages",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->ScrollPages(arg2); @@ -8308,7 +8960,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollPages(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8327,8 +8979,10 @@ static PyObject *_wrap_VScrolledWindow_RefreshLine(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_RefreshLine",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RefreshLine(arg2); @@ -8357,10 +9011,14 @@ static PyObject *_wrap_VScrolledWindow_RefreshLines(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VScrolledWindow_RefreshLines",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; - arg3 = (size_t) PyInt_AsLong(obj2); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->RefreshLines(arg2,arg3); @@ -8378,16 +9036,26 @@ static PyObject *_wrap_VScrolledWindow_RefreshLines(PyObject *self, PyObject *ar static PyObject *_wrap_VScrolledWindow_HitTestXT(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; int result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:VScrolledWindow_HitTestXT",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VScrolledWindow_HitTestXT",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (int)((wxPyVScrolledWindow const *)arg1)->HitTest(arg2,arg3); @@ -8395,7 +9063,7 @@ static PyObject *_wrap_VScrolledWindow_HitTestXT(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8427,7 +9095,7 @@ static PyObject *_wrap_VScrolledWindow_HitTest(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8476,7 +9144,7 @@ static PyObject *_wrap_VScrolledWindow_GetLineCount(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8501,7 +9169,7 @@ static PyObject *_wrap_VScrolledWindow_GetFirstVisibleLine(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8526,7 +9194,7 @@ static PyObject *_wrap_VScrolledWindow_GetLastVisibleLine(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8546,8 +9214,10 @@ static PyObject *_wrap_VScrolledWindow_IsVisible(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_IsVisible",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVScrolledWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxPyVScrolledWindow const *)arg1)->IsVisible(arg2); @@ -8555,7 +9225,7 @@ static PyObject *_wrap_VScrolledWindow_IsVisible(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8569,10 +9239,30 @@ static PyObject * VScrolledWindow_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static int _wrap_VListBoxNameStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable VListBoxNameStr is read-only."); + return 1; +} + + +static PyObject *_wrap_VListBoxNameStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyVListBoxNameStr)->c_str(), (&wxPyVListBoxNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyVListBoxNameStr)->c_str(), (&wxPyVListBoxNameStr)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 = (wxWindowID) wxID_ANY ; + int arg2 = (int) wxID_ANY ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -8583,17 +9273,25 @@ static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kw wxPyVListBox *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlO:new_VListBox",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_VListBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -8606,11 +9304,17 @@ static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -8691,7 +9395,7 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxPyVListBox *arg1 = (wxPyVListBox *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 = (wxWindowID) wxID_ANY ; + int arg3 = (int) wxID_ANY ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -8702,19 +9406,27 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlO:VListBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:VListBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -8727,11 +9439,17 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -8741,7 +9459,7 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -8774,7 +9492,7 @@ static PyObject *_wrap_VListBox_GetItemCount(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8799,7 +9517,7 @@ static PyObject *_wrap_VListBox_HasMultipleSelection(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8824,7 +9542,7 @@ static PyObject *_wrap_VListBox_GetSelection(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8844,8 +9562,10 @@ static PyObject *_wrap_VListBox_IsCurrent(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_IsCurrent",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxPyVListBox const *)arg1)->IsCurrent(arg2); @@ -8853,7 +9573,7 @@ static PyObject *_wrap_VListBox_IsCurrent(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8873,8 +9593,10 @@ static PyObject *_wrap_VListBox_IsSelected(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_IsSelected",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)((wxPyVListBox const *)arg1)->IsSelected(arg2); @@ -8882,7 +9604,7 @@ static PyObject *_wrap_VListBox_IsSelected(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8907,7 +9629,7 @@ static PyObject *_wrap_VListBox_GetSelectedCount(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromUnsignedLong((unsigned long)result); return resultobj; fail: return NULL; @@ -8938,7 +9660,7 @@ static PyObject *_wrap_VListBox_GetFirstSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -8969,7 +9691,7 @@ static PyObject *_wrap_VListBox_GetNextSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -9045,8 +9767,10 @@ static PyObject *_wrap_VListBox_SetItemCount(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_SetItemCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetItemCount(arg2); @@ -9090,12 +9814,17 @@ static PyObject *_wrap_VListBox_SetSelection(PyObject *self, PyObject *args, PyO wxPyVListBox *arg1 = (wxPyVListBox *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "selection", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:VListBox_SetSelection",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2); @@ -9114,7 +9843,7 @@ static PyObject *_wrap_VListBox_Select(PyObject *self, PyObject *args, PyObject PyObject *resultobj; wxPyVListBox *arg1 = (wxPyVListBox *) 0 ; size_t arg2 ; - bool arg3 = (bool) true ; + bool arg3 = (bool) True ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -9125,12 +9854,16 @@ static PyObject *_wrap_VListBox_Select(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:VListBox_Select",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; - if (obj2) { - arg3 = PyInt_AsLong(obj2) ? true : false; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); if (PyErr_Occurred()) SWIG_fail; } + if (obj2) { + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Select(arg2,arg3); @@ -9138,7 +9871,7 @@ static PyObject *_wrap_VListBox_Select(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9160,10 +9893,14 @@ static PyObject *_wrap_VListBox_SelectRange(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VListBox_SelectRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; - arg3 = (size_t) PyInt_AsLong(obj2); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (size_t) SWIG_PyObj_AsUnsignedLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SelectRange(arg2,arg3); @@ -9171,7 +9908,7 @@ static PyObject *_wrap_VListBox_SelectRange(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9190,8 +9927,10 @@ static PyObject *_wrap_VListBox_Toggle(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_Toggle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Toggle(arg2); @@ -9224,7 +9963,7 @@ static PyObject *_wrap_VListBox_SelectAll(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9249,7 +9988,7 @@ static PyObject *_wrap_VListBox_DeselectAll(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9290,15 +10029,25 @@ static PyObject *_wrap_VListBox_SetMargins(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_VListBox_SetMarginsXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyVListBox *arg1 = (wxPyVListBox *) 0 ; - wxCoord arg2 ; - wxCoord arg3 ; + int arg2 ; + int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:VListBox_SetMarginsXY",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VListBox_SetMarginsXY",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyVListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMargins(arg2,arg3); @@ -9354,7 +10103,7 @@ static PyObject * VListBox_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 = (wxWindowID) wxID_ANY ; + int arg2 = (int) wxID_ANY ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -9365,17 +10114,25 @@ static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject wxPyHtmlListBox *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlO:new_HtmlListBox",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_HtmlListBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj2) { { arg3 = &temp3; @@ -9388,11 +10145,17 @@ static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -9473,7 +10236,7 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje PyObject *resultobj; wxPyHtmlListBox *arg1 = (wxPyHtmlListBox *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 = (wxWindowID) wxID_ANY ; + int arg3 = (int) wxID_ANY ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; @@ -9484,19 +10247,27 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje bool result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOOlO:HtmlListBox_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:HtmlListBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj3) { { arg4 = &temp4; @@ -9509,11 +10280,17 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -9523,7 +10300,7 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -9574,8 +10351,10 @@ static PyObject *_wrap_HtmlListBox_SetItemCount(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlListBox_SetItemCount",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlListBox,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = (size_t) PyInt_AsLong(obj1); - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (size_t) SWIG_PyObj_AsUnsignedLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetItemCount(arg2); @@ -9661,7 +10440,7 @@ static PyObject *_wrap_TaskBarIcon_IsOk(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9686,7 +10465,7 @@ static PyObject *_wrap_TaskBarIcon_IsIconInstalled(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9700,7 +10479,7 @@ static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *self, PyObject *args, PyObj wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; bool result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -9718,7 +10497,7 @@ static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *self, PyObject *args, PyObj { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } { @@ -9728,7 +10507,7 @@ static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp3) delete arg3; @@ -9761,7 +10540,7 @@ static PyObject *_wrap_TaskBarIcon_RemoveIcon(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9789,7 +10568,7 @@ static PyObject *_wrap_TaskBarIcon_PopupMenu(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9808,12 +10587,17 @@ static PyObject *_wrap_new_TaskBarIconEvent(PyObject *self, PyObject *args, PyOb wxEventType arg1 ; wxTaskBarIcon *arg2 = (wxTaskBarIcon *) 0 ; wxTaskBarIconEvent *result; + PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "evtType",(char *) "tbIcon", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iO:new_TaskBarIconEvent",kwnames,&arg1,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_TaskBarIconEvent",kwnames,&obj0,&obj1)) goto fail; + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTaskBarIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9829,13 +10613,133 @@ static PyObject *_wrap_new_TaskBarIconEvent(PyObject *self, PyObject *args, PyOb } -static PyObject * TaskBarIconEvent_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxTaskBarIconEvent, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); +static PyObject * TaskBarIconEvent_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxTaskBarIconEvent, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static int _wrap_FileSelectorPromptStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable FileSelectorPromptStr is read-only."); + return 1; +} + + +static PyObject *_wrap_FileSelectorPromptStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyFileSelectorPromptStr)->c_str(), (&wxPyFileSelectorPromptStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyFileSelectorPromptStr)->c_str(), (&wxPyFileSelectorPromptStr)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_DirSelectorPromptStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable DirSelectorPromptStr is read-only."); + return 1; +} + + +static PyObject *_wrap_DirSelectorPromptStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyDirSelectorPromptStr)->c_str(), (&wxPyDirSelectorPromptStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyDirSelectorPromptStr)->c_str(), (&wxPyDirSelectorPromptStr)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_DirDialogNameStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable DirDialogNameStr is read-only."); + return 1; +} + + +static PyObject *_wrap_DirDialogNameStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyDirDialogNameStr)->c_str(), (&wxPyDirDialogNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyDirDialogNameStr)->c_str(), (&wxPyDirDialogNameStr)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable FileSelectorDefaultWildcardStr is read-only."); + return 1; +} + + +static PyObject *_wrap_FileSelectorDefaultWildcardStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyFileSelectorDefaultWildcardStr)->c_str(), (&wxPyFileSelectorDefaultWildcardStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyFileSelectorDefaultWildcardStr)->c_str(), (&wxPyFileSelectorDefaultWildcardStr)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_GetTextFromUserPromptStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable GetTextFromUserPromptStr is read-only."); + return 1; +} + + +static PyObject *_wrap_GetTextFromUserPromptStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyGetTextFromUserPromptStr)->c_str(), (&wxPyGetTextFromUserPromptStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyGetTextFromUserPromptStr)->c_str(), (&wxPyGetTextFromUserPromptStr)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_MessageBoxCaptionStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable MessageBoxCaptionStr is read-only."); + return 1; +} + + +static PyObject *_wrap_MessageBoxCaptionStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyMessageBoxCaptionStr)->c_str(), (&wxPyMessageBoxCaptionStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyMessageBoxCaptionStr)->c_str(), (&wxPyMessageBoxCaptionStr)->Len()); +#endif + } + return pyobj; } + + static PyObject *_wrap_new_ColourData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxColourData *result; @@ -9900,7 +10804,7 @@ static PyObject *_wrap_ColourData_GetChooseFull(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9942,12 +10846,17 @@ static PyObject *_wrap_ColourData_GetCustomColour(PyObject *self, PyObject *args int arg2 ; wxColour result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ColourData_GetCustomColour",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourData_GetCustomColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (arg1)->GetCustomColour(arg2); @@ -9971,12 +10880,17 @@ static PyObject *_wrap_ColourData_SetChooseFull(PyObject *self, PyObject *args, wxColourData *arg1 = (wxColourData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:ColourData_SetChooseFull",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourData_SetChooseFull",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetChooseFull(arg2); @@ -10029,13 +10943,18 @@ static PyObject *_wrap_ColourData_SetCustomColour(PyObject *self, PyObject *args wxColour *arg3 = 0 ; wxColour temp3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "i",(char *) "colour", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:ColourData_SetCustomColour",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ColourData_SetCustomColour",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = &temp3; if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; @@ -10119,31 +11038,6 @@ static PyObject *_wrap_ColourDialog_GetColourData(PyObject *self, PyObject *args } -static PyObject *_wrap_ColourDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxColourDialog *arg1 = (wxColourDialog *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ColourDialog_ShowModal",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxColourDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->ShowModal(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - static PyObject * ColourDialog_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -10166,14 +11060,15 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k wxString const &arg7_defvalue = wxPyDirDialogNameStr ; wxString *arg7 = (wxString *) &arg7_defvalue ; wxDirDialog *result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; wxPoint temp5 ; wxSize temp6 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; @@ -10181,20 +11076,26 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k (char *) "parent",(char *) "message",(char *) "defaultPath",(char *) "style",(char *) "pos",(char *) "size",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOlOOO:new_DirDialog",kwnames,&obj0,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_DirDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; + } + } + if (obj3) { + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; } } if (obj4) { @@ -10213,7 +11114,7 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -10334,7 +11235,7 @@ static PyObject *_wrap_DirDialog_GetStyle(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -10345,7 +11246,7 @@ static PyObject *_wrap_DirDialog_SetMessage(PyObject *self, PyObject *args, PyOb PyObject *resultobj; wxDirDialog *arg1 = (wxDirDialog *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10357,7 +11258,7 @@ static PyObject *_wrap_DirDialog_SetMessage(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10385,7 +11286,7 @@ static PyObject *_wrap_DirDialog_SetPath(PyObject *self, PyObject *args, PyObjec PyObject *resultobj; wxDirDialog *arg1 = (wxDirDialog *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10397,7 +11298,7 @@ static PyObject *_wrap_DirDialog_SetPath(PyObject *self, PyObject *args, PyObjec { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10421,31 +11322,6 @@ static PyObject *_wrap_DirDialog_SetPath(PyObject *self, PyObject *args, PyObjec } -static PyObject *_wrap_DirDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxDirDialog *arg1 = (wxDirDialog *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DirDialog_ShowModal",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDirDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->ShowModal(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - static PyObject * DirDialog_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -10468,49 +11344,56 @@ static PyObject *_wrap_new_FileDialog(PyObject *self, PyObject *args, PyObject * wxPoint const &arg7_defvalue = wxDefaultPosition ; wxPoint *arg7 = (wxPoint *) &arg7_defvalue ; wxFileDialog *result; - bool temp2 = false ; - bool temp3 = false ; - bool temp4 = false ; - bool temp5 = false ; + bool temp2 = False ; + bool temp3 = False ; + bool temp4 = False ; + bool temp5 = False ; wxPoint temp7 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "message",(char *) "defaultDir",(char *) "defaultFile",(char *) "wildcard",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOlO:new_FileDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_FileDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } if (obj4) { { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; + } + } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; } } if (obj6) { @@ -10569,7 +11452,7 @@ static PyObject *_wrap_FileDialog_SetMessage(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxFileDialog *arg1 = (wxFileDialog *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10581,7 +11464,7 @@ static PyObject *_wrap_FileDialog_SetMessage(PyObject *self, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10609,7 +11492,7 @@ static PyObject *_wrap_FileDialog_SetPath(PyObject *self, PyObject *args, PyObje PyObject *resultobj; wxFileDialog *arg1 = (wxFileDialog *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10621,7 +11504,7 @@ static PyObject *_wrap_FileDialog_SetPath(PyObject *self, PyObject *args, PyObje { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10649,7 +11532,7 @@ static PyObject *_wrap_FileDialog_SetDirectory(PyObject *self, PyObject *args, P PyObject *resultobj; wxFileDialog *arg1 = (wxFileDialog *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10661,7 +11544,7 @@ static PyObject *_wrap_FileDialog_SetDirectory(PyObject *self, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10689,7 +11572,7 @@ static PyObject *_wrap_FileDialog_SetFilename(PyObject *self, PyObject *args, Py PyObject *resultobj; wxFileDialog *arg1 = (wxFileDialog *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10701,7 +11584,7 @@ static PyObject *_wrap_FileDialog_SetFilename(PyObject *self, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10729,7 +11612,7 @@ static PyObject *_wrap_FileDialog_SetWildcard(PyObject *self, PyObject *args, Py PyObject *resultobj; wxFileDialog *arg1 = (wxFileDialog *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -10741,7 +11624,7 @@ static PyObject *_wrap_FileDialog_SetWildcard(PyObject *self, PyObject *args, Py { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10770,12 +11653,17 @@ static PyObject *_wrap_FileDialog_SetStyle(PyObject *self, PyObject *args, PyObj wxFileDialog *arg1 = (wxFileDialog *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:FileDialog_SetStyle",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileDialog_SetStyle",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetStyle(arg2); @@ -10795,12 +11683,17 @@ static PyObject *_wrap_FileDialog_SetFilterIndex(PyObject *self, PyObject *args, wxFileDialog *arg1 = (wxFileDialog *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "filterIndex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FileDialog_SetFilterIndex",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileDialog_SetFilterIndex",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFileDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFilterIndex(arg2); @@ -10988,7 +11881,7 @@ static PyObject *_wrap_FileDialog_GetStyle(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -11013,7 +11906,7 @@ static PyObject *_wrap_FileDialog_GetFilterIndex(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -11082,41 +11975,54 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; wxString *arg3 = 0 ; - int arg4 ; + int arg4 = (int) 0 ; wxString *arg5 = (wxString *) 0 ; long arg6 = (long) wxCHOICEDLG_STYLE ; wxPoint const &arg7_defvalue = wxDefaultPosition ; wxPoint *arg7 = (wxPoint *) &arg7_defvalue ; wxMultiChoiceDialog *result; - bool temp2 = false ; - bool temp3 = false ; - wxPoint temp7 ; + bool temp2 = False ; + bool temp3 = False ; + wxPoint temp6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; - PyObject * obj6 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { - (char *) "parent",(char *) "message",(char *) "caption",(char *) "LCOUNT",(char *) "choices",(char *) "style",(char *) "pos", NULL + (char *) "parent",(char *) "message",(char *) "caption",(char *) "choices",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOiO|lO:new_MultiChoiceDialog",kwnames,&obj0,&obj1,&obj2,&arg4,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:new_MultiChoiceDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } - if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (obj6) { + if (obj3) { { - arg7 = &temp7; - if ( ! wxPoint_helper(obj6, &arg7)) SWIG_fail; + arg4 = PyList_Size(obj3); + arg5 = wxString_LIST_helper(obj3); + if (arg5 == NULL) SWIG_fail; + } + } + if (obj4) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj5) { + { + arg7 = &temp6; + if ( ! wxPoint_helper(obj5, &arg7)) SWIG_fail; } } { @@ -11135,6 +12041,9 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO if (temp3) delete arg3; } + { + if (arg5) delete [] arg5; + } return resultobj; fail: { @@ -11145,6 +12054,9 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO if (temp3) delete arg3; } + { + if (arg5) delete [] arg5; + } return NULL; } @@ -11153,6 +12065,7 @@ static PyObject *_wrap_MultiChoiceDialog_SetSelections(PyObject *self, PyObject PyObject *resultobj; wxMultiChoiceDialog *arg1 = (wxMultiChoiceDialog *) 0 ; wxArrayInt *arg2 = 0 ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -11167,6 +12080,7 @@ static PyObject *_wrap_MultiChoiceDialog_SetSelections(PyObject *self, PyObject SWIG_fail; } arg2 = new wxArrayInt; + temp2 = True; int i, len=PySequence_Length(obj1); for (i=0; iSetSelection(arg2); - - wxPyEndAllowThreads(__tstate); + arg2 = (int) SWIG_PyObj_AsInt(obj1); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_SingleChoiceDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxSingleChoiceDialog *arg1 = (wxSingleChoiceDialog *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SingleChoiceDialog_ShowModal",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSingleChoiceDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->ShowModal(); + (arg1)->SetSelection(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; @@ -11435,38 +12336,45 @@ static PyObject *_wrap_new_TextEntryDialog(PyObject *self, PyObject *args, PyObj wxPoint const &arg6_defvalue = wxDefaultPosition ; wxPoint *arg6 = (wxPoint *) &arg6_defvalue ; wxTextEntryDialog *result; - bool temp2 = false ; - bool temp3 = false ; - bool temp4 = false ; + bool temp2 = False ; + bool temp3 = False ; + bool temp4 = False ; wxPoint temp6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "message",(char *) "caption",(char *) "defaultValue",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOlO:new_TextEntryDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_TextEntryDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } if (obj3) { { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; + } + } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; } } if (obj5) { @@ -11548,7 +12456,7 @@ static PyObject *_wrap_TextEntryDialog_SetValue(PyObject *self, PyObject *args, PyObject *resultobj; wxTextEntryDialog *arg1 = (wxTextEntryDialog *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -11560,7 +12468,7 @@ static PyObject *_wrap_TextEntryDialog_SetValue(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -11584,31 +12492,6 @@ static PyObject *_wrap_TextEntryDialog_SetValue(PyObject *self, PyObject *args, } -static PyObject *_wrap_TextEntryDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxTextEntryDialog *arg1 = (wxTextEntryDialog *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TextEntryDialog_ShowModal",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextEntryDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->ShowModal(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - static PyObject * TextEntryDialog_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -11674,8 +12557,10 @@ static PyObject *_wrap_FontData_EnableEffects(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontData_EnableEffects",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EnableEffects(arg2); @@ -11708,7 +12593,7 @@ static PyObject *_wrap_FontData_GetAllowSymbols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11791,7 +12676,7 @@ static PyObject *_wrap_FontData_GetEnableEffects(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11845,7 +12730,7 @@ static PyObject *_wrap_FontData_GetShowHelp(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11864,8 +12749,10 @@ static PyObject *_wrap_FontData_SetAllowSymbols(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontData_SetAllowSymbols",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAllowSymbols(arg2); @@ -11977,12 +12864,22 @@ static PyObject *_wrap_FontData_SetRange(PyObject *self, PyObject *args, PyObjec int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "min",(char *) "max", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:FontData_SetRange",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:FontData_SetRange",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetRange(arg2,arg3); @@ -12009,8 +12906,10 @@ static PyObject *_wrap_FontData_SetShowHelp(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontData_SetShowHelp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetShowHelp(arg2); @@ -12032,18 +12931,37 @@ static PyObject * FontData_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_FontDialog(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_FontDialog__SWIG_0(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxFontDialog *result; + PyObject * obj0 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O:new_FontDialog",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxFontDialog *)new wxFontDialog(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFontDialog, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_new_FontDialog__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; wxFontData *arg2 = 0 ; wxFontDialog *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "parent",(char *) "data", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_FontDialog",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:new_FontDialog",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -12063,6 +12981,62 @@ static PyObject *_wrap_new_FontDialog(PyObject *self, PyObject *args, PyObject * } +static PyObject *_wrap_new_FontDialog(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[3]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 2); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if (argc == 1) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_FontDialog__SWIG_0(self,args); + } + } + if (argc == 2) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + void *ptr; + if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxFontData, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_FontDialog__SWIG_1(self,args); + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_FontDialog'"); + return NULL; +} + + static PyObject *_wrap_FontDialog_GetFontData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFontDialog *arg1 = (wxFontDialog *) 0 ; @@ -12091,31 +13065,6 @@ static PyObject *_wrap_FontDialog_GetFontData(PyObject *self, PyObject *args, Py } -static PyObject *_wrap_FontDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxFontDialog *arg1 = (wxFontDialog *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontDialog_ShowModal",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->ShowModal(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - static PyObject * FontDialog_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -12133,29 +13082,36 @@ static PyObject *_wrap_new_MessageDialog(PyObject *self, PyObject *args, PyObjec wxPoint const &arg5_defvalue = wxDefaultPosition ; wxPoint *arg5 = (wxPoint *) &arg5_defvalue ; wxMessageDialog *result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; wxPoint temp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "message",(char *) "caption",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OlO:new_MessageDialog",kwnames,&obj0,&obj1,&obj2,&arg4,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_MessageDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; + } + } + if (obj3) { + { + arg4 = (long) SWIG_PyObj_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; } } if (obj4) { @@ -12194,31 +13150,6 @@ static PyObject *_wrap_new_MessageDialog(PyObject *self, PyObject *args, PyObjec } -static PyObject *_wrap_MessageDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxMessageDialog *arg1 = (wxMessageDialog *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MessageDialog_ShowModal",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMessageDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->ShowModal(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - static PyObject * MessageDialog_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -12234,29 +13165,43 @@ static PyObject *_wrap_new_ProgressDialog(PyObject *self, PyObject *args, PyObje wxWindow *arg4 = (wxWindow *) NULL ; int arg5 = (int) wxPD_AUTO_HIDE|wxPD_APP_MODAL ; wxProgressDialog *result; - bool temp1 = false ; - bool temp2 = false ; + bool temp1 = False ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "title",(char *) "message",(char *) "maximum",(char *) "parent",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iOi:new_ProgressDialog",kwnames,&obj0,&obj1,&arg3,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_ProgressDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; + } + if (obj2) { + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } } if (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxProgressDialog *)new wxProgressDialog((wxString const &)*arg1,(wxString const &)*arg2,arg3,arg4,arg5); @@ -12294,20 +13239,25 @@ static PyObject *_wrap_ProgressDialog_Update(PyObject *self, PyObject *args, PyO wxString const &arg3_defvalue = wxPyEmptyString ; wxString *arg3 = (wxString *) &arg3_defvalue ; bool result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "value",(char *) "newmsg", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|O:ProgressDialog_Update",kwnames,&obj0,&arg2,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ProgressDialog_Update",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxProgressDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } { @@ -12317,7 +13267,7 @@ static PyObject *_wrap_ProgressDialog_Update(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp3) delete arg3; @@ -12368,11 +13318,25 @@ static PyObject *_wrap_new_FindDialogEvent(PyObject *self, PyObject *args, PyObj wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; wxFindDialogEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "commandType",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_FindDialogEvent",kwnames,&arg1,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_FindDialogEvent",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + { + arg1 = (wxEventType) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFindDialogEvent *)new wxFindDialogEvent(arg1,arg2); @@ -12405,7 +13369,7 @@ static PyObject *_wrap_FindDialogEvent_GetFlags(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12415,7 +13379,7 @@ static PyObject *_wrap_FindDialogEvent_GetFlags(PyObject *self, PyObject *args, static PyObject *_wrap_FindDialogEvent_GetFindString(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ; - wxString result; + wxString *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -12425,16 +13389,19 @@ static PyObject *_wrap_FindDialogEvent_GetFindString(PyObject *self, PyObject *a if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFindDialogEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetFindString(); + { + wxString const &_result_ref = (arg1)->GetFindString(); + result = (wxString *) &_result_ref; + } wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } { #if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); #else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); #endif } return resultobj; @@ -12464,7 +13431,13 @@ static PyObject *_wrap_FindDialogEvent_GetReplaceString(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -12501,12 +13474,17 @@ static PyObject *_wrap_FindDialogEvent_SetFlags(PyObject *self, PyObject *args, wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FindDialogEvent_SetFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FindDialogEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFindDialogEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlags(arg2); @@ -12525,7 +13503,7 @@ static PyObject *_wrap_FindDialogEvent_SetFindString(PyObject *self, PyObject *a PyObject *resultobj; wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -12537,7 +13515,7 @@ static PyObject *_wrap_FindDialogEvent_SetFindString(PyObject *self, PyObject *a { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12565,7 +13543,7 @@ static PyObject *_wrap_FindDialogEvent_SetReplaceString(PyObject *self, PyObject PyObject *resultobj; wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -12577,7 +13555,7 @@ static PyObject *_wrap_FindDialogEvent_SetReplaceString(PyObject *self, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12612,11 +13590,18 @@ static PyObject *_wrap_new_FindReplaceData(PyObject *self, PyObject *args, PyObj PyObject *resultobj; int arg1 = (int) 0 ; wxFindReplaceData *result; + PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|i:new_FindReplaceData",kwnames,&arg1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_FindReplaceData",kwnames,&obj0)) goto fail; + if (obj0) { + { + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxFindReplaceData *)new wxFindReplaceData(arg1); @@ -12676,7 +13661,13 @@ static PyObject *_wrap_FindReplaceData_GetFindString(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -12704,7 +13695,13 @@ static PyObject *_wrap_FindReplaceData_GetReplaceString(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -12729,7 +13726,7 @@ static PyObject *_wrap_FindReplaceData_GetFlags(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -12741,12 +13738,17 @@ static PyObject *_wrap_FindReplaceData_SetFlags(PyObject *self, PyObject *args, wxFindReplaceData *arg1 = (wxFindReplaceData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "flags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:FindReplaceData_SetFlags",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FindReplaceData_SetFlags",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFindReplaceData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFlags(arg2); @@ -12765,7 +13767,7 @@ static PyObject *_wrap_FindReplaceData_SetFindString(PyObject *self, PyObject *a PyObject *resultobj; wxFindReplaceData *arg1 = (wxFindReplaceData *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -12777,7 +13779,7 @@ static PyObject *_wrap_FindReplaceData_SetFindString(PyObject *self, PyObject *a { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12805,7 +13807,7 @@ static PyObject *_wrap_FindReplaceData_SetReplaceString(PyObject *self, PyObject PyObject *resultobj; wxFindReplaceData *arg1 = (wxFindReplaceData *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -12817,7 +13819,7 @@ static PyObject *_wrap_FindReplaceData_SetReplaceString(PyObject *self, PyObject { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12855,21 +13857,28 @@ static PyObject *_wrap_new_FindReplaceDialog(PyObject *self, PyObject *args, PyO wxString *arg3 = 0 ; int arg4 = (int) 0 ; wxFindReplaceDialog *result; - bool temp3 = false ; + bool temp3 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "data",(char *) "title",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:new_FindReplaceDialog",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:new_FindReplaceDialog",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFindReplaceData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; + } + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12923,23 +13932,30 @@ static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args, wxString *arg4 = 0 ; int arg5 = (int) 0 ; bool result; - bool temp4 = false ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "data",(char *) "title",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|i:FindReplaceDialog_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:FindReplaceDialog_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFindReplaceDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxFindReplaceData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; + } + if (obj4) { + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12948,7 +13964,7 @@ static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -13025,7 +14041,7 @@ static PyObject * FindReplaceDialog_swigregister(PyObject *self, PyObject *args) static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; wxString *arg3 = 0 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; @@ -13035,25 +14051,31 @@ static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObje wxString const &arg7_defvalue = wxPyFrameNameStr ; wxString *arg7 = (wxString *) &arg7_defvalue ; wxMDIParentFrame *result; - bool temp3 = false ; + bool temp3 = False ; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_MDIParentFrame",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_MDIParentFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { @@ -13067,11 +14089,17 @@ static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -13130,7 +14158,7 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; - wxWindowID arg3 ; + int arg3 ; wxString *arg4 = 0 ; wxPoint const &arg5_defvalue = wxDefaultPosition ; wxPoint *arg5 = (wxPoint *) &arg5_defvalue ; @@ -13140,27 +14168,33 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO wxString const &arg8_defvalue = wxPyFrameNameStr ; wxString *arg8 = (wxString *) &arg8_defvalue ; bool result; - bool temp4 = false ; + bool temp4 = False ; wxPoint temp5 ; wxSize temp6 ; - bool temp8 = false ; + bool temp8 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:MDIParentFrame_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:MDIParentFrame_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { @@ -13174,11 +14208,17 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); if (arg8 == NULL) SWIG_fail; - temp8 = true; + temp8 = True; } } { @@ -13188,7 +14228,7 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -13503,7 +14543,7 @@ static PyObject * MDIParentFrame_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ; - wxWindowID arg2 ; + int arg2 ; wxString *arg3 = 0 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; @@ -13513,25 +14553,31 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec wxString const &arg7_defvalue = wxPyFrameNameStr ; wxString *arg7 = (wxString *) &arg7_defvalue ; wxMDIChildFrame *result; - bool temp3 = false ; + bool temp3 = False ; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|OOlO:new_MDIChildFrame",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_MDIChildFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { @@ -13545,11 +14591,17 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -13612,7 +14664,7 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb PyObject *resultobj; wxMDIChildFrame *arg1 = (wxMDIChildFrame *) 0 ; wxMDIParentFrame *arg2 = (wxMDIParentFrame *) 0 ; - wxWindowID arg3 ; + int arg3 ; wxString *arg4 = 0 ; wxPoint const &arg5_defvalue = wxDefaultPosition ; wxPoint *arg5 = (wxPoint *) &arg5_defvalue ; @@ -13622,27 +14674,33 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb wxString const &arg8_defvalue = wxPyFrameNameStr ; wxString *arg8 = (wxString *) &arg8_defvalue ; bool result; - bool temp4 = false ; + bool temp4 = False ; wxPoint temp5 ; wxSize temp6 ; - bool temp8 = false ; + bool temp8 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "id",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|OOlO:MDIChildFrame_Create",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:MDIChildFrame_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIChildFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg3 = (int const) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { @@ -13656,11 +14714,17 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; } } + if (obj6) { + { + arg7 = (long) SWIG_PyObj_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj7) { { arg8 = wxString_in_helper(obj7); if (arg8 == NULL) SWIG_fail; - temp8 = true; + temp8 = True; } } { @@ -13670,7 +14734,7 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -13729,8 +14793,10 @@ static PyObject *_wrap_MDIChildFrame_Maximize(PyObject *self, PyObject *args, Py if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MDIChildFrame_Maximize",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIChildFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->Maximize(arg2); @@ -13782,12 +14848,19 @@ static PyObject *_wrap_new_MDIClientWindow(PyObject *self, PyObject *args, PyObj long arg2 = (long) 0 ; wxMDIClientWindow *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|l:new_MDIClientWindow",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_MDIClientWindow",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj1) { + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxMDIClientWindow *)new wxMDIClientWindow(arg1,arg2); @@ -13836,13 +14909,20 @@ static PyObject *_wrap_MDIClientWindow_Create(PyObject *self, PyObject *args, Py bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "style", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|l:MDIClientWindow_Create",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:MDIClientWindow_Create",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMDIClientWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMDIParentFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj2) { + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Create(arg2,arg3); @@ -13850,7 +14930,7 @@ static PyObject *_wrap_MDIClientWindow_Create(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13867,7 +14947,7 @@ static PyObject * MDIClientWindow_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -13878,17 +14958,23 @@ static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kw wxPyWindow *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlO:new_PyWindow",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_PyWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -13901,11 +14987,17 @@ static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kw if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -13968,12 +15060,32 @@ static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *self, PyObject *args int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:PyWindow_base_DoMoveWindow",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWindow_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); @@ -13997,12 +15109,39 @@ static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *self, PyObject *args, P int arg5 ; int arg6 = (int) wxSIZE_AUTO ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|i:PyWindow_base_DoSetSize",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWindow_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); @@ -14023,12 +15162,22 @@ static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *self, PyObject *a int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyWindow_base_DoSetClientSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetClientSize(arg2,arg3); @@ -14049,12 +15198,22 @@ static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *self, PyObject * int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyWindow_base_DoSetVirtualSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetVirtualSize(arg2,arg3); @@ -14283,7 +15442,7 @@ static PyObject *_wrap_PyWindow_base_TransferDataToWindow(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14308,7 +15467,7 @@ static PyObject *_wrap_PyWindow_base_TransferDataFromWindow(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14333,7 +15492,7 @@ static PyObject *_wrap_PyWindow_base_Validate(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14358,7 +15517,7 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocus(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14383,7 +15542,7 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocusFromKeyboard(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14483,7 +15642,7 @@ static PyObject * PyWindow_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxWindowID arg2 ; + int arg2 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -14494,17 +15653,23 @@ static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwa wxPyPanel *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlO:new_PyPanel",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_PyPanel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int const) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -14517,11 +15682,17 @@ static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwa if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -14584,12 +15755,32 @@ static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *self, PyObject *args, int arg4 ; int arg5 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:PyPanel_base_DoMoveWindow",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyPanel_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); @@ -14613,12 +15804,39 @@ static PyObject *_wrap_PyPanel_base_DoSetSize(PyObject *self, PyObject *args, Py int arg5 ; int arg6 = (int) wxSIZE_AUTO ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii|i:PyPanel_base_DoSetSize",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5,&arg6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyPanel_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg5 = (int) SWIG_PyObj_AsInt(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj5) { + { + arg6 = (int) SWIG_PyObj_AsInt(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); @@ -14639,12 +15857,22 @@ static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *self, PyObject *ar int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyPanel_base_DoSetClientSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetClientSize(arg2,arg3); @@ -14665,12 +15893,22 @@ static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *self, PyObject *a int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:PyPanel_base_DoSetVirtualSize",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPanel,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_DoSetVirtualSize(arg2,arg3); @@ -14899,7 +16137,7 @@ static PyObject *_wrap_PyPanel_base_TransferDataToWindow(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14924,7 +16162,7 @@ static PyObject *_wrap_PyPanel_base_TransferDataFromWindow(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14949,7 +16187,7 @@ static PyObject *_wrap_PyPanel_base_Validate(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14974,7 +16212,7 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocus(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14999,7 +16237,7 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocusFromKeyboard(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15096,6 +16334,46 @@ static PyObject * PyPanel_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static int _wrap_PrintoutTitleStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable PrintoutTitleStr is read-only."); + return 1; +} + + +static PyObject *_wrap_PrintoutTitleStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyPrintoutTitleStr)->c_str(), (&wxPyPrintoutTitleStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyPrintoutTitleStr)->c_str(), (&wxPyPrintoutTitleStr)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_PreviewCanvasNameStr_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable PreviewCanvasNameStr is read-only."); + return 1; +} + + +static PyObject *_wrap_PreviewCanvasNameStr_get() { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyPreviewCanvasNameStr)->c_str(), (&wxPyPreviewCanvasNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyPreviewCanvasNameStr)->c_str(), (&wxPyPreviewCanvasNameStr)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_new_PrintData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPrintData *result; @@ -15160,7 +16438,7 @@ static PyObject *_wrap_PrintData_GetNoCopies(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15185,7 +16463,7 @@ static PyObject *_wrap_PrintData_GetCollate(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15210,7 +16488,7 @@ static PyObject *_wrap_PrintData_GetOrientation(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15235,7 +16513,7 @@ static PyObject *_wrap_PrintData_Ok(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15263,7 +16541,13 @@ static PyObject *_wrap_PrintData_GetPrinterName(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -15288,7 +16572,7 @@ static PyObject *_wrap_PrintData_GetColour(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15313,7 +16597,7 @@ static PyObject *_wrap_PrintData_GetDuplex(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15338,7 +16622,7 @@ static PyObject *_wrap_PrintData_GetPaperId(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15376,7 +16660,7 @@ static PyObject *_wrap_PrintData_GetPaperSize(PyObject *self, PyObject *args, Py static PyObject *_wrap_PrintData_GetQuality(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPrintData *arg1 = (wxPrintData *) 0 ; - wxPrintQuality result; + int result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -15386,16 +16670,12 @@ static PyObject *_wrap_PrintData_GetQuality(PyObject *self, PyObject *args, PyOb if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetQuality(); + result = (int)(arg1)->GetQuality(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - wxPrintQuality * resultptr; - resultptr = new wxPrintQuality((wxPrintQuality &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxPrintQuality, 1); - } + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15407,12 +16687,17 @@ static PyObject *_wrap_PrintData_SetNoCopies(PyObject *self, PyObject *args, PyO wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetNoCopies",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetNoCopies",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetNoCopies(arg2); @@ -15439,8 +16724,10 @@ static PyObject *_wrap_PrintData_SetCollate(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetCollate",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCollate(arg2); @@ -15460,12 +16747,17 @@ static PyObject *_wrap_PrintData_SetOrientation(PyObject *self, PyObject *args, wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "orient", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetOrientation",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOrientation(arg2); @@ -15484,7 +16776,7 @@ static PyObject *_wrap_PrintData_SetPrinterName(PyObject *self, PyObject *args, PyObject *resultobj; wxPrintData *arg1 = (wxPrintData *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -15496,7 +16788,7 @@ static PyObject *_wrap_PrintData_SetPrinterName(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15532,8 +16824,10 @@ static PyObject *_wrap_PrintData_SetColour(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetColour",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetColour(arg2); @@ -15553,12 +16847,17 @@ static PyObject *_wrap_PrintData_SetDuplex(PyObject *self, PyObject *args, PyObj wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "duplex", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetDuplex",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetDuplex",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxDuplexMode) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDuplex((wxDuplexMode )arg2); @@ -15578,12 +16877,17 @@ static PyObject *_wrap_PrintData_SetPaperId(PyObject *self, PyObject *args, PyOb wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "sizeId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetPaperId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPaperId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxPaperSize) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPaperId((wxPaperSize )arg2); @@ -15632,8 +16936,7 @@ static PyObject *_wrap_PrintData_SetPaperSize(PyObject *self, PyObject *args, Py static PyObject *_wrap_PrintData_SetQuality(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPrintData *arg1 = (wxPrintData *) 0 ; - wxPrintQuality arg2 ; - wxPrintQuality *argp2 ; + int arg2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -15642,8 +16945,10 @@ static PyObject *_wrap_PrintData_SetQuality(PyObject *self, PyObject *args, PyOb if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetQuality",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxPrintQuality,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg2 = *argp2; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetQuality(arg2); @@ -15679,7 +16984,13 @@ static PyObject *_wrap_PrintData_GetPrinterCommand(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -15707,7 +17018,13 @@ static PyObject *_wrap_PrintData_GetPrinterOptions(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -15735,7 +17052,13 @@ static PyObject *_wrap_PrintData_GetPreviewCommand(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -15763,7 +17086,13 @@ static PyObject *_wrap_PrintData_GetFilename(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -15791,7 +17120,13 @@ static PyObject *_wrap_PrintData_GetFontMetricPath(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxString, 0); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } return resultobj; fail: return NULL; @@ -15816,7 +17151,7 @@ static PyObject *_wrap_PrintData_GetPrinterScaleX(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -15841,7 +17176,7 @@ static PyObject *_wrap_PrintData_GetPrinterScaleY(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyFloat_FromDouble(result); + resultobj = SWIG_PyObj_FromDouble((double)result); return resultobj; fail: return NULL; @@ -15866,7 +17201,7 @@ static PyObject *_wrap_PrintData_GetPrinterTranslateX(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -15891,7 +17226,7 @@ static PyObject *_wrap_PrintData_GetPrinterTranslateY(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromLong((long)result); return resultobj; fail: return NULL; @@ -15916,7 +17251,7 @@ static PyObject *_wrap_PrintData_GetPrintMode(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -15927,7 +17262,7 @@ static PyObject *_wrap_PrintData_SetPrinterCommand(PyObject *self, PyObject *arg PyObject *resultobj; wxPrintData *arg1 = (wxPrintData *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -15939,7 +17274,7 @@ static PyObject *_wrap_PrintData_SetPrinterCommand(PyObject *self, PyObject *arg { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -15967,7 +17302,7 @@ static PyObject *_wrap_PrintData_SetPrinterOptions(PyObject *self, PyObject *arg PyObject *resultobj; wxPrintData *arg1 = (wxPrintData *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -15979,7 +17314,7 @@ static PyObject *_wrap_PrintData_SetPrinterOptions(PyObject *self, PyObject *arg { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16007,7 +17342,7 @@ static PyObject *_wrap_PrintData_SetPreviewCommand(PyObject *self, PyObject *arg PyObject *resultobj; wxPrintData *arg1 = (wxPrintData *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -16019,7 +17354,7 @@ static PyObject *_wrap_PrintData_SetPreviewCommand(PyObject *self, PyObject *arg { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16047,7 +17382,7 @@ static PyObject *_wrap_PrintData_SetFilename(PyObject *self, PyObject *args, PyO PyObject *resultobj; wxPrintData *arg1 = (wxPrintData *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -16059,7 +17394,7 @@ static PyObject *_wrap_PrintData_SetFilename(PyObject *self, PyObject *args, PyO { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16087,7 +17422,7 @@ static PyObject *_wrap_PrintData_SetFontMetricPath(PyObject *self, PyObject *arg PyObject *resultobj; wxPrintData *arg1 = (wxPrintData *) 0 ; wxString *arg2 = 0 ; - bool temp2 = false ; + bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -16099,7 +17434,7 @@ static PyObject *_wrap_PrintData_SetFontMetricPath(PyObject *self, PyObject *arg { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -16128,12 +17463,17 @@ static PyObject *_wrap_PrintData_SetPrinterScaleX(PyObject *self, PyObject *args wxPrintData *arg1 = (wxPrintData *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PrintData_SetPrinterScaleX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterScaleX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterScaleX(arg2); @@ -16153,12 +17493,17 @@ static PyObject *_wrap_PrintData_SetPrinterScaleY(PyObject *self, PyObject *args wxPrintData *arg1 = (wxPrintData *) 0 ; double arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:PrintData_SetPrinterScaleY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterScaleY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterScaleY(arg2); @@ -16179,12 +17524,22 @@ static PyObject *_wrap_PrintData_SetPrinterScaling(PyObject *self, PyObject *arg double arg2 ; double arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Odd:PrintData_SetPrinterScaling",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PrintData_SetPrinterScaling",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (double) SWIG_PyObj_AsDouble(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (double) SWIG_PyObj_AsDouble(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterScaling(arg2,arg3); @@ -16204,12 +17559,17 @@ static PyObject *_wrap_PrintData_SetPrinterTranslateX(PyObject *self, PyObject * wxPrintData *arg1 = (wxPrintData *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:PrintData_SetPrinterTranslateX",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterTranslateX",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterTranslateX(arg2); @@ -16229,12 +17589,17 @@ static PyObject *_wrap_PrintData_SetPrinterTranslateY(PyObject *self, PyObject * wxPrintData *arg1 = (wxPrintData *) 0 ; long arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:PrintData_SetPrinterTranslateY",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterTranslateY",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterTranslateY(arg2); @@ -16255,12 +17620,22 @@ static PyObject *_wrap_PrintData_SetPrinterTranslation(PyObject *self, PyObject long arg2 ; long arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oll:PrintData_SetPrinterTranslation",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PrintData_SetPrinterTranslation",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (long) SWIG_PyObj_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrinterTranslation(arg2,arg3); @@ -16280,12 +17655,17 @@ static PyObject *_wrap_PrintData_SetPrintMode(PyObject *self, PyObject *args, Py wxPrintData *arg1 = (wxPrintData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "printMode", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetPrintMode",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrintMode",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxPrintMode) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrintMode((wxPrintMode )arg2); @@ -16300,6 +17680,58 @@ static PyObject *_wrap_PrintData_SetPrintMode(PyObject *self, PyObject *args, Py } +static PyObject *_wrap_PrintData_GetOutputStream(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPrintData *arg1 = (wxPrintData *) 0 ; + wxOutputStream *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PrintData_GetOutputStream",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxOutputStream *)(arg1)->GetOutputStream(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxOutputStream, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_PrintData_SetOutputStream(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPrintData *arg1 = (wxPrintData *) 0 ; + wxOutputStream *arg2 = (wxOutputStream *) 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "outputstream", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetOutputStream",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxOutputStream,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetOutputStream(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject * PrintData_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -16365,8 +17797,10 @@ static PyObject *_wrap_PageSetupDialogData_EnableHelp(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableHelp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EnableHelp(arg2); @@ -16393,8 +17827,10 @@ static PyObject *_wrap_PageSetupDialogData_EnableMargins(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableMargins",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EnableMargins(arg2); @@ -16421,8 +17857,10 @@ static PyObject *_wrap_PageSetupDialogData_EnableOrientation(PyObject *self, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableOrientation",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EnableOrientation(arg2); @@ -16449,8 +17887,10 @@ static PyObject *_wrap_PageSetupDialogData_EnablePaper(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnablePaper",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EnablePaper(arg2); @@ -16477,8 +17917,10 @@ static PyObject *_wrap_PageSetupDialogData_EnablePrinter(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnablePrinter",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EnablePrinter(arg2); @@ -16511,7 +17953,7 @@ static PyObject *_wrap_PageSetupDialogData_GetDefaultMinMargins(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16536,7 +17978,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableMargins(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16561,7 +18003,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableOrientation(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16586,7 +18028,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnablePaper(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16611,7 +18053,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnablePrinter(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16636,7 +18078,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableHelp(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16661,7 +18103,7 @@ static PyObject *_wrap_PageSetupDialogData_GetDefaultInfo(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16802,7 +18244,7 @@ static PyObject *_wrap_PageSetupDialogData_GetPaperId(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -16884,7 +18326,7 @@ static PyObject *_wrap_PageSetupDialogData_Ok(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16903,8 +18345,10 @@ static PyObject *_wrap_PageSetupDialogData_SetDefaultInfo(PyObject *self, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetDefaultInfo",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDefaultInfo(arg2); @@ -16931,8 +18375,10 @@ static PyObject *_wrap_PageSetupDialogData_SetDefaultMinMargins(PyObject *self, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetDefaultMinMargins",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetDefaultMinMargins(arg2); @@ -17076,12 +18522,17 @@ static PyObject *_wrap_PageSetupDialogData_SetPaperId(PyObject *self, PyObject * wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "id", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PageSetupDialogData_SetPaperId",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetPaperId",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPageSetupDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (wxPaperSize) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPaperId((wxPaperSize )arg2); @@ -17240,7 +18691,7 @@ static PyObject *_wrap_PageSetupDialog_ShowModal(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17318,7 +18769,7 @@ static PyObject *_wrap_PrintDialogData_GetFromPage(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17343,7 +18794,7 @@ static PyObject *_wrap_PrintDialogData_GetToPage(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17368,7 +18819,7 @@ static PyObject *_wrap_PrintDialogData_GetMinPage(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17393,7 +18844,7 @@ static PyObject *_wrap_PrintDialogData_GetMaxPage(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17418,7 +18869,7 @@ static PyObject *_wrap_PrintDialogData_GetNoCopies(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -17443,7 +18894,7 @@ static PyObject *_wrap_PrintDialogData_GetAllPages(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17468,7 +18919,7 @@ static PyObject *_wrap_PrintDialogData_GetSelection(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17493,7 +18944,7 @@ static PyObject *_wrap_PrintDialogData_GetCollate(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17518,7 +18969,7 @@ static PyObject *_wrap_PrintDialogData_GetPrintToFile(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17543,7 +18994,7 @@ static PyObject *_wrap_PrintDialogData_GetSetupDialog(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17555,12 +19006,17 @@ static PyObject *_wrap_PrintDialogData_SetFromPage(PyObject *self, PyObject *arg wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetFromPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetFromPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetFromPage(arg2); @@ -17580,12 +19036,17 @@ static PyObject *_wrap_PrintDialogData_SetToPage(PyObject *self, PyObject *args, wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetToPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetToPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetToPage(arg2); @@ -17605,12 +19066,17 @@ static PyObject *_wrap_PrintDialogData_SetMinPage(PyObject *self, PyObject *args wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetMinPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetMinPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMinPage(arg2); @@ -17630,12 +19096,17 @@ static PyObject *_wrap_PrintDialogData_SetMaxPage(PyObject *self, PyObject *args wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetMaxPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetMaxPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetMaxPage(arg2); @@ -17655,12 +19126,17 @@ static PyObject *_wrap_PrintDialogData_SetNoCopies(PyObject *self, PyObject *arg wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "v", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintDialogData_SetNoCopies",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetNoCopies",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetNoCopies(arg2); @@ -17687,8 +19163,10 @@ static PyObject *_wrap_PrintDialogData_SetAllPages(PyObject *self, PyObject *arg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetAllPages",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetAllPages(arg2); @@ -17715,8 +19193,10 @@ static PyObject *_wrap_PrintDialogData_SetSelection(PyObject *self, PyObject *ar if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSelection(arg2); @@ -17743,8 +19223,10 @@ static PyObject *_wrap_PrintDialogData_SetCollate(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetCollate",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetCollate(arg2); @@ -17771,8 +19253,10 @@ static PyObject *_wrap_PrintDialogData_SetPrintToFile(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetPrintToFile",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPrintToFile(arg2); @@ -17799,8 +19283,10 @@ static PyObject *_wrap_PrintDialogData_SetSetupDialog(PyObject *self, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetSetupDialog",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetSetupDialog(arg2); @@ -17827,8 +19313,10 @@ static PyObject *_wrap_PrintDialogData_EnablePrintToFile(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnablePrintToFile",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EnablePrintToFile(arg2); @@ -17855,8 +19343,10 @@ static PyObject *_wrap_PrintDialogData_EnableSelection(PyObject *self, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnableSelection",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EnableSelection(arg2); @@ -17883,8 +19373,10 @@ static PyObject *_wrap_PrintDialogData_EnablePageNumbers(PyObject *self, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnablePageNumbers",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EnablePageNumbers(arg2); @@ -17911,8 +19403,10 @@ static PyObject *_wrap_PrintDialogData_EnableHelp(PyObject *self, PyObject *args if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnableHelp",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintDialogData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->EnableHelp(arg2); @@ -17945,7 +19439,7 @@ static PyObject *_wrap_PrintDialogData_GetEnablePrintToFile(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17970,7 +19464,7 @@ static PyObject *_wrap_PrintDialogData_GetEnableSelection(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17995,7 +19489,7 @@ static PyObject *_wrap_PrintDialogData_GetEnablePageNumbers(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18020,7 +19514,7 @@ static PyObject *_wrap_PrintDialogData_GetEnableHelp(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18045,7 +19539,7 @@ static PyObject *_wrap_PrintDialogData_Ok(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18220,7 +19714,7 @@ static PyObject *_wrap_PrintDialog_ShowModal(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18348,19 +19842,26 @@ static PyObject *_wrap_Printer_Print(PyObject *self, PyObject *args, PyObject *k wxPrinter *arg1 = (wxPrinter *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; wxPyPrintout *arg3 = (wxPyPrintout *) 0 ; - int arg4 = (int) TRUE ; + int arg4 = (int) True ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { (char *) "self",(char *) "parent",(char *) "printout",(char *) "prompt", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|i:Printer_Print",kwnames,&obj0,&obj1,&obj2,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Printer_Print",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrinter,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (obj3) { + { + arg4 = (int) SWIG_PyObj_AsInt(obj3); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Print(arg2,arg3,arg4); @@ -18368,7 +19869,7 @@ static PyObject *_wrap_Printer_Print(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18411,7 +19912,7 @@ static PyObject *_wrap_Printer_ReportError(PyObject *self, PyObject *args, PyObj wxWindow *arg2 = (wxWindow *) 0 ; wxPyPrintout *arg3 = (wxPyPrintout *) 0 ; wxString *arg4 = 0 ; - bool temp4 = false ; + bool temp4 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -18427,7 +19928,7 @@ static PyObject *_wrap_Printer_ReportError(PyObject *self, PyObject *args, PyObj { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -18472,7 +19973,7 @@ static PyObject *_wrap_Printer_Setup(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18497,7 +19998,7 @@ static PyObject *_wrap_Printer_GetAbort(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18519,7 +20020,7 @@ static PyObject *_wrap_Printer_GetLastError(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -18538,7 +20039,7 @@ static PyObject *_wrap_new_Printout(PyObject *self, PyObject *args, PyObject *kw wxString const &arg1_defvalue = wxPyPrintoutTitleStr ; wxString *arg1 = (wxString *) &arg1_defvalue ; wxPyPrintout *result; - bool temp1 = false ; + bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "title", NULL @@ -18549,7 +20050,7 @@ static PyObject *_wrap_new_Printout(PyObject *self, PyObject *args, PyObject *kw { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; - temp1 = true; + temp1 = True; } } { @@ -18691,64 +20192,74 @@ static PyObject *_wrap_Printout_SetDC(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_Printout_GetPageSizePixels(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Printout_SetPageSizePixels(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; - int *arg2 = (int *) 0 ; - int *arg3 = (int *) 0 ; - int temp2 ; - int temp3 ; + int arg2 ; + int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "w",(char *) "h", NULL }; - arg2 = &temp2; - arg3 = &temp3; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_GetPageSizePixels",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPageSizePixels",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->GetPageSizePixels(arg2,arg3); - - wxPyEndAllowThreads(__tstate); + arg2 = (int) SWIG_PyObj_AsInt(obj1); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; { - PyObject *o = PyInt_FromLong((long) (*arg2)); - resultobj = t_output_helper(resultobj,o); + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; } { - PyObject *o = PyInt_FromLong((long) (*arg3)); - resultobj = t_output_helper(resultobj,o); + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetPageSizePixels(arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_Printout_SetPageSizePixels(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Printout_GetPageSizePixels(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; - int arg2 ; - int arg3 ; + int *arg2 = (int *) 0 ; + int *arg3 = (int *) 0 ; + int temp2 ; + int temp3 ; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "w",(char *) "h", NULL + (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Printout_SetPageSizePixels",kwnames,&obj0,&arg2,&arg3)) goto fail; + arg2 = &temp2; + arg3 = &temp3; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_GetPageSizePixels",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetPageSizePixels(arg2,arg3); + (arg1)->GetPageSizePixels(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } Py_INCREF(Py_None); resultobj = Py_None; + { + PyObject *o = PyInt_FromLong((long) (*arg2)); + resultobj = t_output_helper(resultobj,o); + } + { + PyObject *o = PyInt_FromLong((long) (*arg3)); + resultobj = t_output_helper(resultobj,o); + } return resultobj; fail: return NULL; @@ -18761,12 +20272,22 @@ static PyObject *_wrap_Printout_SetPageSizeMM(PyObject *self, PyObject *args, Py int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "w",(char *) "h", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Printout_SetPageSizeMM",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPageSizeMM",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPageSizeMM(arg2,arg3); @@ -18825,12 +20346,22 @@ static PyObject *_wrap_Printout_SetPPIScreen(PyObject *self, PyObject *args, PyO int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Printout_SetPPIScreen",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPPIScreen",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPPIScreen(arg2,arg3); @@ -18889,12 +20420,22 @@ static PyObject *_wrap_Printout_SetPPIPrinter(PyObject *self, PyObject *args, Py int arg2 ; int arg3 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Printout_SetPPIPrinter",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPPIPrinter",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetPPIPrinter(arg2,arg3); @@ -18965,7 +20506,7 @@ static PyObject *_wrap_Printout_IsPreview(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18984,8 +20525,10 @@ static PyObject *_wrap_Printout_SetIsPreview(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_SetIsPreview",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetIsPreview(arg2); @@ -19007,12 +20550,22 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *self, PyObject *a int arg3 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char *kwnames[] = { (char *) "self",(char *) "startPage",(char *) "endPage", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Printout_base_OnBeginDocument",kwnames,&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_base_OnBeginDocument",kwnames,&obj0,&obj1,&obj2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + arg3 = (int) SWIG_PyObj_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_OnBeginDocument(arg2,arg3); @@ -19020,7 +20573,7 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19123,6 +20676,37 @@ static PyObject *_wrap_Printout_base_OnPreparePrinting(PyObject *self, PyObject } +static PyObject *_wrap_Printout_base_HasPage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; + int arg2 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "page", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_base_HasPage",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->base_HasPage(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Printout_base_GetPageInfo(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; @@ -19175,32 +20759,6 @@ static PyObject *_wrap_Printout_base_GetPageInfo(PyObject *self, PyObject *args, } -static PyObject *_wrap_Printout_base_HasPage(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; - int arg2 ; - bool result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "page", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Printout_base_HasPage",kwnames,&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_HasPage(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - static PyObject * Printout_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -19222,17 +20780,18 @@ static PyObject *_wrap_new_PreviewCanvas(PyObject *self, PyObject *args, PyObjec wxPreviewCanvas *result; wxPoint temp3 ; wxSize temp4 ; - bool temp6 = false ; + bool temp6 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { (char *) "preview",(char *) "parent",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOlO:new_PreviewCanvas",kwnames,&obj0,&obj1,&obj2,&obj3,&arg5,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_PreviewCanvas",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { @@ -19247,11 +20806,17 @@ static PyObject *_wrap_new_PreviewCanvas(PyObject *self, PyObject *args, PyObjec if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; } } + if (obj4) { + { + arg5 = (long) SWIG_PyObj_AsLong(obj4); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj5) { { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -19296,27 +20861,28 @@ static PyObject *_wrap_new_PreviewFrame(PyObject *self, PyObject *args, PyObject wxString const &arg7_defvalue = wxPyFrameNameStr ; wxString *arg7 = (wxString *) &arg7_defvalue ; wxPreviewFrame *result; - bool temp3 = false ; + bool temp3 = False ; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "preview",(char *) "parent",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOlO:new_PreviewFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PreviewFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { @@ -19330,11 +20896,17 @@ static PyObject *_wrap_new_PreviewFrame(PyObject *self, PyObject *args, PyObject if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -19486,18 +21058,24 @@ static PyObject *_wrap_new_PreviewControlBar(PyObject *self, PyObject *args, PyO wxPreviewControlBar *result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "preview",(char *) "buttons",(char *) "parent",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO|OOlO:new_PreviewControlBar",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PreviewControlBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj3) { { @@ -19511,11 +21089,17 @@ static PyObject *_wrap_new_PreviewControlBar(PyObject *self, PyObject *args, PyO if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -19558,7 +21142,7 @@ static PyObject *_wrap_PreviewControlBar_GetZoomControl(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -19570,12 +21154,17 @@ static PyObject *_wrap_PreviewControlBar_SetZoomControl(PyObject *self, PyObject wxPreviewControlBar *arg1 = (wxPreviewControlBar *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "zoom", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PreviewControlBar_SetZoomControl",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PreviewControlBar_SetZoomControl",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPreviewControlBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetZoomControl(arg2); @@ -19781,12 +21370,17 @@ static PyObject *_wrap_PrintPreview_SetCurrentPage(PyObject *self, PyObject *arg int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pageNum", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintPreview_SetCurrentPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_SetCurrentPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->SetCurrentPage(arg2); @@ -19794,7 +21388,7 @@ static PyObject *_wrap_PrintPreview_SetCurrentPage(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19819,7 +21413,7 @@ static PyObject *_wrap_PrintPreview_GetCurrentPage(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20040,7 +21634,7 @@ static PyObject *_wrap_PrintPreview_PaintPage(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20074,7 +21668,7 @@ static PyObject *_wrap_PrintPreview_DrawBlankPage(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20087,12 +21681,17 @@ static PyObject *_wrap_PrintPreview_RenderPage(PyObject *self, PyObject *args, P int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pageNum", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintPreview_RenderPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_RenderPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->RenderPage(arg2); @@ -20100,7 +21699,7 @@ static PyObject *_wrap_PrintPreview_RenderPage(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20167,12 +21766,17 @@ static PyObject *_wrap_PrintPreview_SetZoom(PyObject *self, PyObject *args, PyOb wxPrintPreview *arg1 = (wxPrintPreview *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "percent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintPreview_SetZoom",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_SetZoom",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetZoom(arg2); @@ -20205,7 +21809,7 @@ static PyObject *_wrap_PrintPreview_GetZoom(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20230,7 +21834,7 @@ static PyObject *_wrap_PrintPreview_GetMaxPage(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20255,7 +21859,7 @@ static PyObject *_wrap_PrintPreview_GetMinPage(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = SWIG_PyObj_FromInt((int)result); return resultobj; fail: return NULL; @@ -20280,7 +21884,7 @@ static PyObject *_wrap_PrintPreview_Ok(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20299,8 +21903,10 @@ static PyObject *_wrap_PrintPreview_SetOk(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_SetOk",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetOk(arg2); @@ -20328,8 +21934,10 @@ static PyObject *_wrap_PrintPreview_Print(PyObject *self, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_Print",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->Print(arg2); @@ -20337,7 +21945,7 @@ static PyObject *_wrap_PrintPreview_Print(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20444,12 +22052,17 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *self, PyObje int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pageNum", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyPrintPreview_base_SetCurrentPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_SetCurrentPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_SetCurrentPage(arg2); @@ -20457,7 +22070,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20491,7 +22104,7 @@ static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20525,7 +22138,7 @@ static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20538,12 +22151,17 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *self, PyObject * int arg2 ; bool result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "pageNum", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyPrintPreview_base_RenderPage",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_RenderPage",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_RenderPage(arg2); @@ -20551,7 +22169,7 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20563,12 +22181,17 @@ static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *self, PyObject *arg wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "percent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyPrintPreview_base_SetZoom",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_SetZoom",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetZoom(arg2); @@ -20596,8 +22219,10 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *self, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_Print",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; + { + arg2 = (bool) SWIG_PyObj_AsBool(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (bool)(arg1)->base_Print(arg2); @@ -20605,7 +22230,7 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = PyInt_FromLong((long)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20656,27 +22281,28 @@ static PyObject *_wrap_new_PyPreviewFrame(PyObject *self, PyObject *args, PyObje wxString const &arg7_defvalue = wxPyFrameNameStr ; wxString *arg7 = (wxString *) &arg7_defvalue ; wxPyPreviewFrame *result; - bool temp3 = false ; + bool temp3 = False ; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "preview",(char *) "parent",(char *) "title",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOlO:new_PyPreviewFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PyPreviewFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { @@ -20690,11 +22316,17 @@ static PyObject *_wrap_new_PyPreviewFrame(PyObject *self, PyObject *args, PyObje if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -20905,18 +22537,24 @@ static PyObject *_wrap_new_PyPreviewControlBar(PyObject *self, PyObject *args, P wxPyPreviewControlBar *result; wxPoint temp4 ; wxSize temp5 ; - bool temp7 = false ; + bool temp7 = False ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; char *kwnames[] = { (char *) "preview",(char *) "buttons",(char *) "parent",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OlO|OOlO:new_PyPreviewControlBar",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PyPreviewControlBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPrintPreview,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (long) SWIG_PyObj_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj3) { { @@ -20930,11 +22568,17 @@ static PyObject *_wrap_new_PyPreviewControlBar(PyObject *self, PyObject *args, P if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; } } + if (obj5) { + { + arg6 = (long) SWIG_PyObj_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + } if (obj6) { { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -21045,12 +22689,17 @@ static PyObject *_wrap_PyPreviewControlBar_base_SetZoomControl(PyObject *self, P wxPyPreviewControlBar *arg1 = (wxPyPreviewControlBar *) 0 ; int arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { (char *) "self",(char *) "zoom", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PyPreviewControlBar_base_SetZoomControl",kwnames,&obj0,&arg2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPreviewControlBar_base_SetZoomControl",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyPreviewControlBar,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->base_SetZoomControl(arg2); @@ -21101,20 +22750,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"ScrolledWindow_SetTargetRect", (PyCFunction) _wrap_ScrolledWindow_SetTargetRect, METH_VARARGS | METH_KEYWORDS }, { (char *)"ScrolledWindow_GetTargetRect", (PyCFunction) _wrap_ScrolledWindow_GetTargetRect, METH_VARARGS | METH_KEYWORDS }, { (char *)"ScrolledWindow_swigregister", ScrolledWindow_swigregister, METH_VARARGS }, - { (char *)"new_AcceleratorEntry", (PyCFunction) _wrap_new_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS }, - { (char *)"delete_AcceleratorEntry", (PyCFunction) _wrap_delete_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS }, - { (char *)"AcceleratorEntry_Set", (PyCFunction) _wrap_AcceleratorEntry_Set, METH_VARARGS | METH_KEYWORDS }, - { (char *)"AcceleratorEntry_SetMenuItem", (PyCFunction) _wrap_AcceleratorEntry_SetMenuItem, METH_VARARGS | METH_KEYWORDS }, - { (char *)"AcceleratorEntry_GetMenuItem", (PyCFunction) _wrap_AcceleratorEntry_GetMenuItem, METH_VARARGS | METH_KEYWORDS }, - { (char *)"AcceleratorEntry_GetFlags", (PyCFunction) _wrap_AcceleratorEntry_GetFlags, METH_VARARGS | METH_KEYWORDS }, - { (char *)"AcceleratorEntry_GetKeyCode", (PyCFunction) _wrap_AcceleratorEntry_GetKeyCode, METH_VARARGS | METH_KEYWORDS }, - { (char *)"AcceleratorEntry_GetCommand", (PyCFunction) _wrap_AcceleratorEntry_GetCommand, METH_VARARGS | METH_KEYWORDS }, - { (char *)"AcceleratorEntry_swigregister", AcceleratorEntry_swigregister, METH_VARARGS }, - { (char *)"new_AcceleratorTable", (PyCFunction) _wrap_new_AcceleratorTable, METH_VARARGS | METH_KEYWORDS }, - { (char *)"delete_AcceleratorTable", (PyCFunction) _wrap_delete_AcceleratorTable, METH_VARARGS | METH_KEYWORDS }, - { (char *)"AcceleratorTable_Ok", (PyCFunction) _wrap_AcceleratorTable_Ok, METH_VARARGS | METH_KEYWORDS }, - { (char *)"AcceleratorTable_swigregister", AcceleratorTable_swigregister, METH_VARARGS }, - { (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS }, { (char *)"TopLevelWindow_Maximize", (PyCFunction) _wrap_TopLevelWindow_Maximize, METH_VARARGS | METH_KEYWORDS }, { (char *)"TopLevelWindow_Restore", (PyCFunction) _wrap_TopLevelWindow_Restore, METH_VARARGS | METH_KEYWORDS }, { (char *)"TopLevelWindow_Iconize", (PyCFunction) _wrap_TopLevelWindow_Iconize, METH_VARARGS | METH_KEYWORDS }, @@ -21159,7 +22794,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"Dialog_GetReturnCode", (PyCFunction) _wrap_Dialog_GetReturnCode, METH_VARARGS | METH_KEYWORDS }, { (char *)"Dialog_CreateTextSizer", (PyCFunction) _wrap_Dialog_CreateTextSizer, METH_VARARGS | METH_KEYWORDS }, { (char *)"Dialog_CreateButtonSizer", (PyCFunction) _wrap_Dialog_CreateButtonSizer, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Dialog_SetModal", (PyCFunction) _wrap_Dialog_SetModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"Dialog_IsModal", (PyCFunction) _wrap_Dialog_IsModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"Dialog_ShowModal", (PyCFunction) _wrap_Dialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"Dialog_EndModal", (PyCFunction) _wrap_Dialog_EndModal, METH_VARARGS | METH_KEYWORDS }, @@ -21377,7 +23011,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"ColourData_swigregister", ColourData_swigregister, METH_VARARGS }, { (char *)"new_ColourDialog", (PyCFunction) _wrap_new_ColourDialog, METH_VARARGS | METH_KEYWORDS }, { (char *)"ColourDialog_GetColourData", (PyCFunction) _wrap_ColourDialog_GetColourData, METH_VARARGS | METH_KEYWORDS }, - { (char *)"ColourDialog_ShowModal", (PyCFunction) _wrap_ColourDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"ColourDialog_swigregister", ColourDialog_swigregister, METH_VARARGS }, { (char *)"new_DirDialog", (PyCFunction) _wrap_new_DirDialog, METH_VARARGS | METH_KEYWORDS }, { (char *)"DirDialog_GetPath", (PyCFunction) _wrap_DirDialog_GetPath, METH_VARARGS | METH_KEYWORDS }, @@ -21385,7 +23018,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"DirDialog_GetStyle", (PyCFunction) _wrap_DirDialog_GetStyle, METH_VARARGS | METH_KEYWORDS }, { (char *)"DirDialog_SetMessage", (PyCFunction) _wrap_DirDialog_SetMessage, METH_VARARGS | METH_KEYWORDS }, { (char *)"DirDialog_SetPath", (PyCFunction) _wrap_DirDialog_SetPath, METH_VARARGS | METH_KEYWORDS }, - { (char *)"DirDialog_ShowModal", (PyCFunction) _wrap_DirDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"DirDialog_swigregister", DirDialog_swigregister, METH_VARARGS }, { (char *)"new_FileDialog", (PyCFunction) _wrap_new_FileDialog, METH_VARARGS | METH_KEYWORDS }, { (char *)"FileDialog_SetMessage", (PyCFunction) _wrap_FileDialog_SetMessage, METH_VARARGS | METH_KEYWORDS }, @@ -21413,12 +23045,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"SingleChoiceDialog_GetSelection", (PyCFunction) _wrap_SingleChoiceDialog_GetSelection, METH_VARARGS | METH_KEYWORDS }, { (char *)"SingleChoiceDialog_GetStringSelection", (PyCFunction) _wrap_SingleChoiceDialog_GetStringSelection, METH_VARARGS | METH_KEYWORDS }, { (char *)"SingleChoiceDialog_SetSelection", (PyCFunction) _wrap_SingleChoiceDialog_SetSelection, METH_VARARGS | METH_KEYWORDS }, - { (char *)"SingleChoiceDialog_ShowModal", (PyCFunction) _wrap_SingleChoiceDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"SingleChoiceDialog_swigregister", SingleChoiceDialog_swigregister, METH_VARARGS }, { (char *)"new_TextEntryDialog", (PyCFunction) _wrap_new_TextEntryDialog, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextEntryDialog_GetValue", (PyCFunction) _wrap_TextEntryDialog_GetValue, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextEntryDialog_SetValue", (PyCFunction) _wrap_TextEntryDialog_SetValue, METH_VARARGS | METH_KEYWORDS }, - { (char *)"TextEntryDialog_ShowModal", (PyCFunction) _wrap_TextEntryDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextEntryDialog_swigregister", TextEntryDialog_swigregister, METH_VARARGS }, { (char *)"new_FontData", (PyCFunction) _wrap_new_FontData, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_FontData", (PyCFunction) _wrap_delete_FontData, METH_VARARGS | METH_KEYWORDS }, @@ -21436,12 +23066,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"FontData_SetRange", (PyCFunction) _wrap_FontData_SetRange, METH_VARARGS | METH_KEYWORDS }, { (char *)"FontData_SetShowHelp", (PyCFunction) _wrap_FontData_SetShowHelp, METH_VARARGS | METH_KEYWORDS }, { (char *)"FontData_swigregister", FontData_swigregister, METH_VARARGS }, - { (char *)"new_FontDialog", (PyCFunction) _wrap_new_FontDialog, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_FontDialog", _wrap_new_FontDialog, METH_VARARGS }, { (char *)"FontDialog_GetFontData", (PyCFunction) _wrap_FontDialog_GetFontData, METH_VARARGS | METH_KEYWORDS }, - { (char *)"FontDialog_ShowModal", (PyCFunction) _wrap_FontDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"FontDialog_swigregister", FontDialog_swigregister, METH_VARARGS }, { (char *)"new_MessageDialog", (PyCFunction) _wrap_new_MessageDialog, METH_VARARGS | METH_KEYWORDS }, - { (char *)"MessageDialog_ShowModal", (PyCFunction) _wrap_MessageDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"MessageDialog_swigregister", MessageDialog_swigregister, METH_VARARGS }, { (char *)"new_ProgressDialog", (PyCFunction) _wrap_new_ProgressDialog, METH_VARARGS | METH_KEYWORDS }, { (char *)"ProgressDialog_Update", (PyCFunction) _wrap_ProgressDialog_Update, METH_VARARGS | METH_KEYWORDS }, @@ -21582,6 +23210,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"PrintData_SetPrinterTranslateY", (PyCFunction) _wrap_PrintData_SetPrinterTranslateY, METH_VARARGS | METH_KEYWORDS }, { (char *)"PrintData_SetPrinterTranslation", (PyCFunction) _wrap_PrintData_SetPrinterTranslation, METH_VARARGS | METH_KEYWORDS }, { (char *)"PrintData_SetPrintMode", (PyCFunction) _wrap_PrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS }, + { (char *)"PrintData_GetOutputStream", (PyCFunction) _wrap_PrintData_GetOutputStream, METH_VARARGS | METH_KEYWORDS }, + { (char *)"PrintData_SetOutputStream", (PyCFunction) _wrap_PrintData_SetOutputStream, METH_VARARGS | METH_KEYWORDS }, { (char *)"PrintData_swigregister", PrintData_swigregister, METH_VARARGS }, { (char *)"new_PageSetupDialogData", (PyCFunction) _wrap_new_PageSetupDialogData, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_PageSetupDialogData", (PyCFunction) _wrap_delete_PageSetupDialogData, METH_VARARGS | METH_KEYWORDS }, @@ -21674,8 +23304,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"Printout_GetTitle", (PyCFunction) _wrap_Printout_GetTitle, METH_VARARGS | METH_KEYWORDS }, { (char *)"Printout_GetDC", (PyCFunction) _wrap_Printout_GetDC, METH_VARARGS | METH_KEYWORDS }, { (char *)"Printout_SetDC", (PyCFunction) _wrap_Printout_SetDC, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Printout_GetPageSizePixels", (PyCFunction) _wrap_Printout_GetPageSizePixels, METH_VARARGS | METH_KEYWORDS }, { (char *)"Printout_SetPageSizePixels", (PyCFunction) _wrap_Printout_SetPageSizePixels, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Printout_GetPageSizePixels", (PyCFunction) _wrap_Printout_GetPageSizePixels, METH_VARARGS | METH_KEYWORDS }, { (char *)"Printout_SetPageSizeMM", (PyCFunction) _wrap_Printout_SetPageSizeMM, METH_VARARGS | METH_KEYWORDS }, { (char *)"Printout_GetPageSizeMM", (PyCFunction) _wrap_Printout_GetPageSizeMM, METH_VARARGS | METH_KEYWORDS }, { (char *)"Printout_SetPPIScreen", (PyCFunction) _wrap_Printout_SetPPIScreen, METH_VARARGS | METH_KEYWORDS }, @@ -21689,8 +23319,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"Printout_base_OnBeginPrinting", (PyCFunction) _wrap_Printout_base_OnBeginPrinting, METH_VARARGS | METH_KEYWORDS }, { (char *)"Printout_base_OnEndPrinting", (PyCFunction) _wrap_Printout_base_OnEndPrinting, METH_VARARGS | METH_KEYWORDS }, { (char *)"Printout_base_OnPreparePrinting", (PyCFunction) _wrap_Printout_base_OnPreparePrinting, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Printout_base_GetPageInfo", (PyCFunction) _wrap_Printout_base_GetPageInfo, METH_VARARGS | METH_KEYWORDS }, { (char *)"Printout_base_HasPage", (PyCFunction) _wrap_Printout_base_HasPage, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Printout_base_GetPageInfo", (PyCFunction) _wrap_Printout_base_GetPageInfo, METH_VARARGS | METH_KEYWORDS }, { (char *)"Printout_swigregister", Printout_swigregister, METH_VARARGS }, { (char *)"new_PreviewCanvas", (PyCFunction) _wrap_new_PreviewCanvas, METH_VARARGS | METH_KEYWORDS }, { (char *)"PreviewCanvas_swigregister", PreviewCanvas_swigregister, METH_VARARGS }, @@ -22328,9 +23958,6 @@ static void *_p_wxNavigationKeyEventTo_p_wxObject(void *x) { static void *_p_wxKeyEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *) ((wxKeyEvent *) x)); } -static void *_p_wxScrolledWindowTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *) ((wxScrolledWindow *) x)); -} static void *_p_wxWindowTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *) ((wxWindow *) x)); } @@ -22340,6 +23967,9 @@ static void *_p_wxMenuTo_p_wxObject(void *x) { static void *_p_wxMenuBarTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMenuBar *) x)); } +static void *_p_wxScrolledWindowTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *) ((wxScrolledWindow *) x)); +} static void *_p_wxTopLevelWindowTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxTopLevelWindow *) x)); } @@ -22766,7 +24396,6 @@ static void *_p_wxPyPreviewControlBarTo_p_wxPreviewControlBar(void *x) { static swig_type_info _swigt__p_wxQueryLayoutInfoEvent[] = {{"_p_wxQueryLayoutInfoEvent", 0, "wxQueryLayoutInfoEvent *", 0},{"_p_wxQueryLayoutInfoEvent"},{0}}; static swig_type_info _swigt__p_wxPreviewFrame[] = {{"_p_wxPreviewFrame", 0, "wxPreviewFrame *", 0},{"_p_wxPreviewFrame"},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxPreviewFrame},{0}}; static swig_type_info _swigt__p_wxPyPreviewFrame[] = {{"_p_wxPyPreviewFrame", 0, "wxPyPreviewFrame *", 0},{"_p_wxPyPreviewFrame"},{0}}; -static swig_type_info _swigt__p_wxAcceleratorEntry[] = {{"_p_wxAcceleratorEntry", 0, "wxAcceleratorEntry *", 0},{"_p_wxAcceleratorEntry"},{0}}; static swig_type_info _swigt__p_wxPyPanel[] = {{"_p_wxPyPanel", 0, "wxPyPanel *", 0},{"_p_wxPyPanel"},{0}}; static swig_type_info _swigt__p_wxMenu[] = {{"_p_wxMenu", 0, "wxMenu *", 0},{"_p_wxMenu"},{0}}; static swig_type_info _swigt__p_wxPrintData[] = {{"_p_wxPrintData", 0, "wxPrintData *", 0},{"_p_wxPrintData"},{0}}; @@ -22798,14 +24427,13 @@ static swig_type_info _swigt__p_wxSingleChoiceDialog[] = {{"_p_wxSingleChoiceDia static swig_type_info _swigt__p_wxMultiChoiceDialog[] = {{"_p_wxMultiChoiceDialog", 0, "wxMultiChoiceDialog *", 0},{"_p_wxMultiChoiceDialog"},{0}}; static swig_type_info _swigt__p_wxFileDialog[] = {{"_p_wxFileDialog", 0, "wxFileDialog *", 0},{"_p_wxFileDialog"},{0}}; static swig_type_info _swigt__p_wxPrinter[] = {{"_p_wxPrinter", 0, "wxPrinter *", 0},{"_p_wxPrinter"},{0}}; -static swig_type_info _swigt__p_wxMenuItem[] = {{"_p_wxMenuItem", 0, "wxMenuItem *", 0},{"_p_wxMenuItem"},{0}}; static swig_type_info _swigt__p_wxArrayInt[] = {{"_p_wxArrayInt", 0, "wxArrayInt *", 0},{"_p_wxArrayInt"},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler},{0}}; static swig_type_info _swigt__p_wxCalculateLayoutEvent[] = {{"_p_wxCalculateLayoutEvent", 0, "wxCalculateLayoutEvent *", 0},{"_p_wxCalculateLayoutEvent"},{0}}; static swig_type_info _swigt__p_wxPyHtmlListBox[] = {{"_p_wxPyHtmlListBox", 0, "wxPyHtmlListBox *", 0},{"_p_wxPyHtmlListBox"},{0}}; static swig_type_info _swigt__p_wxPyVListBox[] = {{"_p_wxPyVListBox", 0, "wxPyVListBox *", 0},{"_p_wxPyVListBox"},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPyVListBox},{0}}; static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p_wxRect"},{0}}; -static swig_type_info _swigt__p_wxAcceleratorTable[] = {{"_p_wxAcceleratorTable", 0, "wxAcceleratorTable *", 0},{"_p_wxAcceleratorTable"},{0}}; +static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxMiniFrame[] = {{"_p_wxMiniFrame", 0, "wxMiniFrame *", 0},{"_p_wxMiniFrame"},{0}}; static swig_type_info _swigt__p_wxFrame[] = {{"_p_wxFrame", 0, "wxFrame *", 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxFrame},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxFrame},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxFrame},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxFrame},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxFrame},{"_p_wxFrame"},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxFrame},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxFrame},{0}}; static swig_type_info _swigt__p_wxPyPrintout[] = {{"_p_wxPyPrintout", 0, "wxPyPrintout *", 0},{"_p_wxPyPrintout"},{0}}; @@ -22815,12 +24443,12 @@ static swig_type_info _swigt__p_wxStatusBar[] = {{"_p_wxStatusBar", 0, "wxStatus static swig_type_info _swigt__p_wxMDIParentFrame[] = {{"_p_wxMDIParentFrame", 0, "wxMDIParentFrame *", 0},{"_p_wxMDIParentFrame"},{0}}; static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{"_p_wxPoint"},{0}}; static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxFrame", _p_wxFrameTo_p_wxObject},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject},{"_p_wxObject"},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject},{"_p_wxPanel", _p_wxPanelTo_p_wxObject},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject},{"_p_wxDialog", _p_wxDialogTo_p_wxObject},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{0}}; +static swig_type_info _swigt__p_wxOutputStream[] = {{"_p_wxOutputStream", 0, "wxOutputStream *", 0},{"_p_wxOutputStream"},{0}}; static swig_type_info _swigt__p_unsigned_long[] = {{"_p_unsigned_long", 0, "unsigned long *", 0},{"_p_unsigned_long"},{0}}; static swig_type_info _swigt__p_wxMDIClientWindow[] = {{"_p_wxMDIClientWindow", 0, "wxMDIClientWindow *", 0},{"_p_wxMDIClientWindow"},{0}}; static swig_type_info _swigt__p_wxTipWindow[] = {{"_p_wxTipWindow", 0, "wxTipWindow *", 0},{"_p_wxTipWindow"},{0}}; static swig_type_info _swigt__p_wxSashLayoutWindow[] = {{"_p_wxSashLayoutWindow", 0, "wxSashLayoutWindow *", 0},{"_p_wxSashLayoutWindow"},{0}}; static swig_type_info _swigt__p_wxSplitterWindow[] = {{"_p_wxSplitterWindow", 0, "wxSplitterWindow *", 0},{"_p_wxSplitterWindow"},{0}}; -static swig_type_info _swigt__p_wxSplashScreenWindow[] = {{"_p_wxSplashScreenWindow", 0, "wxSplashScreenWindow *", 0},{"_p_wxSplashScreenWindow"},{0}}; static swig_type_info _swigt__p_wxPyVScrolledWindow[] = {{"_p_wxPyVScrolledWindow", 0, "wxPyVScrolledWindow *", 0},{"_p_wxPyVScrolledWindow"},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPyVScrolledWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPyVScrolledWindow},{0}}; static swig_type_info _swigt__p_wxPyPopupTransientWindow[] = {{"_p_wxPyPopupTransientWindow", 0, "wxPyPopupTransientWindow *", 0},{"_p_wxPyPopupTransientWindow"},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxPyPopupTransientWindow},{0}}; static swig_type_info _swigt__p_wxPopupWindow[] = {{"_p_wxPopupWindow", 0, "wxPopupWindow *", 0},{"_p_wxPopupWindow"},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxPopupWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxPopupWindow},{0}}; @@ -22828,6 +24456,7 @@ static swig_type_info _swigt__p_wxSashWindow[] = {{"_p_wxSashWindow", 0, "wxSash static swig_type_info _swigt__p_wxTopLevelWindow[] = {{"_p_wxTopLevelWindow", 0, "wxTopLevelWindow *", 0},{"_p_wxFrame", _p_wxFrameTo_p_wxTopLevelWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxTopLevelWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxTopLevelWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxTopLevelWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxTopLevelWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxTopLevelWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxTopLevelWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxTopLevelWindow},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxTopLevelWindow},{"_p_wxTopLevelWindow"},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxTopLevelWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxTopLevelWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxTopLevelWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxTopLevelWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxTopLevelWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxTopLevelWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxTopLevelWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxTopLevelWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxTopLevelWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxTopLevelWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxTopLevelWindow},{0}}; static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{0}}; static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow},{0}}; +static swig_type_info _swigt__p_wxSplashScreenWindow[] = {{"_p_wxSplashScreenWindow", 0, "wxSplashScreenWindow *", 0},{"_p_wxSplashScreenWindow"},{0}}; static swig_type_info _swigt__p_wxMenuBar[] = {{"_p_wxMenuBar", 0, "wxMenuBar *", 0},{"_p_wxMenuBar"},{0}}; static swig_type_info _swigt__p_wxPrintPreview[] = {{"_p_wxPrintPreview", 0, "wxPrintPreview *", 0},{"_p_wxPrintPreview"},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxPrintPreview},{0}}; static swig_type_info _swigt__p_wxSashEvent[] = {{"_p_wxSashEvent", 0, "wxSashEvent *", 0},{"_p_wxSashEvent"},{0}}; @@ -22842,7 +24471,6 @@ static swig_type_info _swigt__p_wxPageSetupDialog[] = {{"_p_wxPageSetupDialog", static swig_type_info _swigt__p_wxPrintDialog[] = {{"_p_wxPrintDialog", 0, "wxPrintDialog *", 0},{"_p_wxPrintDialog"},{0}}; static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}}; static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxCommandEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxCommandEvent},{"_p_wxCommandEvent"},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxCommandEvent},{0}}; -static swig_type_info _swigt__p_wxPrintQuality[] = {{"_p_wxPrintQuality", 0, "wxPrintQuality *", 0},{"_p_wxPrintQuality"},{0}}; static swig_type_info _swigt__p_wxPreviewControlBar[] = {{"_p_wxPreviewControlBar", 0, "wxPreviewControlBar *", 0},{"_p_wxPreviewControlBar"},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPreviewControlBar},{0}}; static swig_type_info _swigt__p_wxPyPreviewControlBar[] = {{"_p_wxPyPreviewControlBar", 0, "wxPyPreviewControlBar *", 0},{"_p_wxPyPreviewControlBar"},{0}}; static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0},{"_p_wxColour"},{0}}; @@ -22854,7 +24482,6 @@ static swig_type_info *swig_types_initial[] = { _swigt__p_wxQueryLayoutInfoEvent, _swigt__p_wxPreviewFrame, _swigt__p_wxPyPreviewFrame, -_swigt__p_wxAcceleratorEntry, _swigt__p_wxPyPanel, _swigt__p_wxMenu, _swigt__p_wxPrintData, @@ -22886,14 +24513,13 @@ _swigt__p_wxSingleChoiceDialog, _swigt__p_wxMultiChoiceDialog, _swigt__p_wxFileDialog, _swigt__p_wxPrinter, -_swigt__p_wxMenuItem, _swigt__p_wxArrayInt, _swigt__p_wxEvtHandler, _swigt__p_wxCalculateLayoutEvent, _swigt__p_wxPyHtmlListBox, _swigt__p_wxPyVListBox, _swigt__p_wxRect, -_swigt__p_wxAcceleratorTable, +_swigt__p_char, _swigt__p_wxMiniFrame, _swigt__p_wxFrame, _swigt__p_wxPyPrintout, @@ -22903,12 +24529,12 @@ _swigt__p_wxStatusBar, _swigt__p_wxMDIParentFrame, _swigt__p_wxPoint, _swigt__p_wxObject, +_swigt__p_wxOutputStream, _swigt__p_unsigned_long, _swigt__p_wxMDIClientWindow, _swigt__p_wxTipWindow, _swigt__p_wxSashLayoutWindow, _swigt__p_wxSplitterWindow, -_swigt__p_wxSplashScreenWindow, _swigt__p_wxPyVScrolledWindow, _swigt__p_wxPyPopupTransientWindow, _swigt__p_wxPopupWindow, @@ -22916,6 +24542,7 @@ _swigt__p_wxSashWindow, _swigt__p_wxTopLevelWindow, _swigt__p_wxWindow, _swigt__p_wxScrolledWindow, +_swigt__p_wxSplashScreenWindow, _swigt__p_wxMenuBar, _swigt__p_wxPrintPreview, _swigt__p_wxSashEvent, @@ -22930,7 +24557,6 @@ _swigt__p_wxPageSetupDialog, _swigt__p_wxPrintDialog, _swigt__p_wxBitmap, _swigt__p_wxCommandEvent, -_swigt__p_wxPrintQuality, _swigt__p_wxPreviewControlBar, _swigt__p_wxPyPreviewControlBar, _swigt__p_wxColour, @@ -22944,115 +24570,6 @@ _swigt__p_wxPrintDialogData, /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOMENUBAR", (long) wxFULLSCREEN_NOMENUBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOTOOLBAR", (long) wxFULLSCREEN_NOTOOLBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOSTATUSBAR", (long) wxFULLSCREEN_NOSTATUSBAR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOBORDER", (long) wxFULLSCREEN_NOBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_NOCAPTION", (long) wxFULLSCREEN_NOCAPTION, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FULLSCREEN_ALL", (long) wxFULLSCREEN_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"TOPLEVEL_EX_DIALOG", (long) wxTOPLEVEL_EX_DIALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_CENTRE_ON_PARENT", (long) wxSPLASH_CENTRE_ON_PARENT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_CENTRE_ON_SCREEN", (long) wxSPLASH_CENTRE_ON_SCREEN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_NO_CENTRE", (long) wxSPLASH_NO_CENTRE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_TIMEOUT", (long) wxSPLASH_TIMEOUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLASH_NO_TIMEOUT", (long) wxSPLASH_NO_TIMEOUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_NOBORDER", (long) wxSP_NOBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_NOSASH", (long) wxSP_NOSASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_PERMIT_UNSPLIT", (long) wxSP_PERMIT_UNSPLIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_LIVE_UPDATE", (long) wxSP_LIVE_UPDATE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_3DSASH", (long) wxSP_3DSASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_3DBORDER", (long) wxSP_3DBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_BORDER", (long) wxSP_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SP_3D", (long) wxSP_3D, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_HORIZONTAL", (long) wxSPLIT_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_VERTICAL", (long) wxSPLIT_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_DRAG_NONE", (long) wxSPLIT_DRAG_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_DRAG_DRAGGING", (long) wxSPLIT_DRAG_DRAGGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SPLIT_DRAG_LEFT_DOWN", (long) wxSPLIT_DRAG_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", (long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING", (long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SPLITTER_DOUBLECLICKED", (long) wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_SPLITTER_UNSPLIT", (long) wxEVT_COMMAND_SPLITTER_UNSPLIT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_DRAG_NONE", (long) wxSASH_DRAG_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_DRAG_DRAGGING", (long) wxSASH_DRAG_DRAGGING, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_DRAG_LEFT_DOWN", (long) wxSASH_DRAG_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_NOBORDER", (long) wxSW_NOBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_BORDER", (long) wxSW_BORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_3DSASH", (long) wxSW_3DSASH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_3DBORDER", (long) wxSW_3DBORDER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SW_3D", (long) wxSW_3D, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_TOP", (long) wxSASH_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_RIGHT", (long) wxSASH_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_BOTTOM", (long) wxSASH_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_LEFT", (long) wxSASH_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_NONE", (long) wxSASH_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_STATUS_OK", (long) wxSASH_STATUS_OK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"SASH_STATUS_OUT_OF_RANGE", (long) wxSASH_STATUS_OUT_OF_RANGE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_SASH_DRAGGED", (long) wxEVT_SASH_DRAGGED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_HORIZONTAL", (long) wxLAYOUT_HORIZONTAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_VERTICAL", (long) wxLAYOUT_VERTICAL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_NONE", (long) wxLAYOUT_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_TOP", (long) wxLAYOUT_TOP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_LEFT", (long) wxLAYOUT_LEFT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_RIGHT", (long) wxLAYOUT_RIGHT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_BOTTOM", (long) wxLAYOUT_BOTTOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_LENGTH_Y", (long) wxLAYOUT_LENGTH_Y, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_LENGTH_X", (long) wxLAYOUT_LENGTH_X, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_MRU_LENGTH", (long) wxLAYOUT_MRU_LENGTH, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAYOUT_QUERY", (long) wxLAYOUT_QUERY, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_QUERY_LAYOUT_INFO", (long) wxEVT_QUERY_LAYOUT_INFO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_CALCULATE_LAYOUT", (long) wxEVT_CALCULATE_LAYOUT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_MOVE", (long) wxEVT_TASKBAR_MOVE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_LEFT_DOWN", (long) wxEVT_TASKBAR_LEFT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_LEFT_UP", (long) wxEVT_TASKBAR_LEFT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_RIGHT_DOWN", (long) wxEVT_TASKBAR_RIGHT_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_RIGHT_UP", (long) wxEVT_TASKBAR_RIGHT_UP, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_LEFT_DCLICK", (long) wxEVT_TASKBAR_LEFT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_TASKBAR_RIGHT_DCLICK", (long) wxEVT_TASKBAR_RIGHT_DCLICK, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"CHOICEDLG_STYLE", (long) wxCHOICEDLG_STYLE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_DOWN", (long) wxFR_DOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_WHOLEWORD", (long) wxFR_WHOLEWORD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_MATCHCASE", (long) wxFR_MATCHCASE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_REPLACEDIALOG", (long) wxFR_REPLACEDIALOG, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_NOUPDOWN", (long) wxFR_NOUPDOWN, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_NOMATCHCASE", (long) wxFR_NOMATCHCASE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FR_NOWHOLEWORD", (long) wxFR_NOWHOLEWORD, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND", (long) wxEVT_COMMAND_FIND, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND_NEXT", (long) wxEVT_COMMAND_FIND_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND_REPLACE", (long) wxEVT_COMMAND_FIND_REPLACE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND_REPLACE_ALL", (long) wxEVT_COMMAND_FIND_REPLACE_ALL, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"wxEVT_COMMAND_FIND_CLOSE", (long) wxEVT_COMMAND_FIND_CLOSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWTILE", (long) 4001, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWTILEHOR", (long) 4001, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWCASCADE", (long) 4002, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWICONS", (long) 4003, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWNEXT", (long) 4004, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"IDM_WINDOWTILEVERT", (long) 4005, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"FIRST_MDI_CHILD", (long) 4100, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"LAST_MDI_CHILD", (long) 4600, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_MODE_NONE", (long) wxPRINT_MODE_NONE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_MODE_PREVIEW", (long) wxPRINT_MODE_PREVIEW, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_MODE_FILE", (long) wxPRINT_MODE_FILE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINT_MODE_PRINTER", (long) wxPRINT_MODE_PRINTER, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINTER_NO_ERROR", (long) wxPRINTER_NO_ERROR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINTER_CANCELLED", (long) wxPRINTER_CANCELLED, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PRINTER_ERROR", (long) wxPRINTER_ERROR, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_PRINT", (long) wxPREVIEW_PRINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_PREVIOUS", (long) wxPREVIEW_PREVIOUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_NEXT", (long) wxPREVIEW_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_ZOOM", (long) wxPREVIEW_ZOOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_FIRST", (long) wxPREVIEW_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_LAST", (long) wxPREVIEW_LAST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_GOTO", (long) wxPREVIEW_GOTO, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"PREVIEW_DEFAULT", (long) wxPREVIEW_DEFAULT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_CLOSE", (long) wxID_PREVIEW_CLOSE, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_NEXT", (long) wxID_PREVIEW_NEXT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_PREVIOUS", (long) wxID_PREVIEW_PREVIOUS, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_PRINT", (long) wxID_PREVIEW_PRINT, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_ZOOM", (long) wxID_PREVIEW_ZOOM, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_FIRST", (long) wxID_PREVIEW_FIRST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_LAST", (long) wxID_PREVIEW_LAST, 0, 0, 0}, -{ SWIG_PY_INT, (char *)"ID_PREVIEW_GOTO", (long) wxID_PREVIEW_GOTO, 0, 0, 0}, {0}}; #ifdef __cplusplus @@ -23080,14 +24597,72 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_InstallConstants(d,swig_const_table); PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); - SWIG_addvarlink(SWIG_globals,(char*)"NullAcceleratorTable",_wrap_NullAcceleratorTable_get, _wrap_NullAcceleratorTable_set); + SWIG_addvarlink(SWIG_globals,(char*)"FrameNameStr",_wrap_FrameNameStr_get, _wrap_FrameNameStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"DialogNameStr",_wrap_DialogNameStr_get, _wrap_DialogNameStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"StatusLineNameStr",_wrap_StatusLineNameStr_get, _wrap_StatusLineNameStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"ToolBarNameStr",_wrap_ToolBarNameStr_get, _wrap_ToolBarNameStr_set); + PyDict_SetItemString(d,"FULLSCREEN_NOMENUBAR", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOMENUBAR)); + PyDict_SetItemString(d,"FULLSCREEN_NOTOOLBAR", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOTOOLBAR)); + PyDict_SetItemString(d,"FULLSCREEN_NOSTATUSBAR", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOSTATUSBAR)); + PyDict_SetItemString(d,"FULLSCREEN_NOBORDER", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOBORDER)); + PyDict_SetItemString(d,"FULLSCREEN_NOCAPTION", SWIG_PyObj_FromInt((int)wxFULLSCREEN_NOCAPTION)); + PyDict_SetItemString(d,"FULLSCREEN_ALL", SWIG_PyObj_FromInt((int)wxFULLSCREEN_ALL)); + PyDict_SetItemString(d,"TOPLEVEL_EX_DIALOG", SWIG_PyObj_FromInt((int)wxTOPLEVEL_EX_DIALOG)); + PyDict_SetItemString(d,"SPLASH_CENTRE_ON_PARENT", SWIG_PyObj_FromInt((int)wxSPLASH_CENTRE_ON_PARENT)); + PyDict_SetItemString(d,"SPLASH_CENTRE_ON_SCREEN", SWIG_PyObj_FromInt((int)wxSPLASH_CENTRE_ON_SCREEN)); + PyDict_SetItemString(d,"SPLASH_NO_CENTRE", SWIG_PyObj_FromInt((int)wxSPLASH_NO_CENTRE)); + PyDict_SetItemString(d,"SPLASH_TIMEOUT", SWIG_PyObj_FromInt((int)wxSPLASH_TIMEOUT)); + PyDict_SetItemString(d,"SPLASH_NO_TIMEOUT", SWIG_PyObj_FromInt((int)wxSPLASH_NO_TIMEOUT)); + SWIG_addvarlink(SWIG_globals,(char*)"SplitterNameStr",_wrap_SplitterNameStr_get, _wrap_SplitterNameStr_set); + PyDict_SetItemString(d,"SP_NOBORDER", SWIG_PyObj_FromInt((int)wxSP_NOBORDER)); + PyDict_SetItemString(d,"SP_NOSASH", SWIG_PyObj_FromInt((int)wxSP_NOSASH)); + PyDict_SetItemString(d,"SP_PERMIT_UNSPLIT", SWIG_PyObj_FromInt((int)wxSP_PERMIT_UNSPLIT)); + PyDict_SetItemString(d,"SP_LIVE_UPDATE", SWIG_PyObj_FromInt((int)wxSP_LIVE_UPDATE)); + PyDict_SetItemString(d,"SP_3DSASH", SWIG_PyObj_FromInt((int)wxSP_3DSASH)); + PyDict_SetItemString(d,"SP_3DBORDER", SWIG_PyObj_FromInt((int)wxSP_3DBORDER)); + PyDict_SetItemString(d,"SP_BORDER", SWIG_PyObj_FromInt((int)wxSP_BORDER)); + PyDict_SetItemString(d,"SP_3D", SWIG_PyObj_FromInt((int)wxSP_3D)); + PyDict_SetItemString(d,"SPLIT_HORIZONTAL", SWIG_PyObj_FromInt((int)wxSPLIT_HORIZONTAL)); + PyDict_SetItemString(d,"SPLIT_VERTICAL", SWIG_PyObj_FromInt((int)wxSPLIT_VERTICAL)); + PyDict_SetItemString(d,"SPLIT_DRAG_NONE", SWIG_PyObj_FromInt((int)wxSPLIT_DRAG_NONE)); + PyDict_SetItemString(d,"SPLIT_DRAG_DRAGGING", SWIG_PyObj_FromInt((int)wxSPLIT_DRAG_DRAGGING)); + PyDict_SetItemString(d,"SPLIT_DRAG_LEFT_DOWN", SWIG_PyObj_FromInt((int)wxSPLIT_DRAG_LEFT_DOWN)); PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING)); PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_DOUBLECLICKED", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED)); PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_UNSPLIT", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_UNSPLIT)); + SWIG_addvarlink(SWIG_globals,(char*)"SashNameStr",_wrap_SashNameStr_get, _wrap_SashNameStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"SashLayoutNameStr",_wrap_SashLayoutNameStr_get, _wrap_SashLayoutNameStr_set); + PyDict_SetItemString(d,"SASH_DRAG_NONE", SWIG_PyObj_FromInt((int)wxSASH_DRAG_NONE)); + PyDict_SetItemString(d,"SASH_DRAG_DRAGGING", SWIG_PyObj_FromInt((int)wxSASH_DRAG_DRAGGING)); + PyDict_SetItemString(d,"SASH_DRAG_LEFT_DOWN", SWIG_PyObj_FromInt((int)wxSASH_DRAG_LEFT_DOWN)); + PyDict_SetItemString(d,"SW_NOBORDER", SWIG_PyObj_FromInt((int)wxSW_NOBORDER)); + PyDict_SetItemString(d,"SW_BORDER", SWIG_PyObj_FromInt((int)wxSW_BORDER)); + PyDict_SetItemString(d,"SW_3DSASH", SWIG_PyObj_FromInt((int)wxSW_3DSASH)); + PyDict_SetItemString(d,"SW_3DBORDER", SWIG_PyObj_FromInt((int)wxSW_3DBORDER)); + PyDict_SetItemString(d,"SW_3D", SWIG_PyObj_FromInt((int)wxSW_3D)); + PyDict_SetItemString(d,"SASH_TOP", SWIG_PyObj_FromInt((int)wxSASH_TOP)); + PyDict_SetItemString(d,"SASH_RIGHT", SWIG_PyObj_FromInt((int)wxSASH_RIGHT)); + PyDict_SetItemString(d,"SASH_BOTTOM", SWIG_PyObj_FromInt((int)wxSASH_BOTTOM)); + PyDict_SetItemString(d,"SASH_LEFT", SWIG_PyObj_FromInt((int)wxSASH_LEFT)); + PyDict_SetItemString(d,"SASH_NONE", SWIG_PyObj_FromInt((int)wxSASH_NONE)); + PyDict_SetItemString(d,"SASH_STATUS_OK", SWIG_PyObj_FromInt((int)wxSASH_STATUS_OK)); + PyDict_SetItemString(d,"SASH_STATUS_OUT_OF_RANGE", SWIG_PyObj_FromInt((int)wxSASH_STATUS_OUT_OF_RANGE)); PyDict_SetItemString(d, "wxEVT_SASH_DRAGGED", PyInt_FromLong(wxEVT_SASH_DRAGGED)); + PyDict_SetItemString(d,"LAYOUT_HORIZONTAL", SWIG_PyObj_FromInt((int)wxLAYOUT_HORIZONTAL)); + PyDict_SetItemString(d,"LAYOUT_VERTICAL", SWIG_PyObj_FromInt((int)wxLAYOUT_VERTICAL)); + PyDict_SetItemString(d,"LAYOUT_NONE", SWIG_PyObj_FromInt((int)wxLAYOUT_NONE)); + PyDict_SetItemString(d,"LAYOUT_TOP", SWIG_PyObj_FromInt((int)wxLAYOUT_TOP)); + PyDict_SetItemString(d,"LAYOUT_LEFT", SWIG_PyObj_FromInt((int)wxLAYOUT_LEFT)); + PyDict_SetItemString(d,"LAYOUT_RIGHT", SWIG_PyObj_FromInt((int)wxLAYOUT_RIGHT)); + PyDict_SetItemString(d,"LAYOUT_BOTTOM", SWIG_PyObj_FromInt((int)wxLAYOUT_BOTTOM)); + PyDict_SetItemString(d,"LAYOUT_LENGTH_Y", SWIG_PyObj_FromInt((int)wxLAYOUT_LENGTH_Y)); + PyDict_SetItemString(d,"LAYOUT_LENGTH_X", SWIG_PyObj_FromInt((int)wxLAYOUT_LENGTH_X)); + PyDict_SetItemString(d,"LAYOUT_MRU_LENGTH", SWIG_PyObj_FromInt((int)wxLAYOUT_MRU_LENGTH)); + PyDict_SetItemString(d,"LAYOUT_QUERY", SWIG_PyObj_FromInt((int)wxLAYOUT_QUERY)); PyDict_SetItemString(d, "wxEVT_QUERY_LAYOUT_INFO", PyInt_FromLong(wxEVT_QUERY_LAYOUT_INFO)); PyDict_SetItemString(d, "wxEVT_CALCULATE_LAYOUT", PyInt_FromLong(wxEVT_CALCULATE_LAYOUT)); + SWIG_addvarlink(SWIG_globals,(char*)"VListBoxNameStr",_wrap_VListBoxNameStr_get, _wrap_VListBoxNameStr_set); // Map renamed classes back to their common name for OOR wxPyPtrTypeMap_Add("wxHtmlListBox", "wxPyHtmlListBox"); @@ -23101,11 +24676,59 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_TASKBAR_RIGHT_UP", PyInt_FromLong(wxEVT_TASKBAR_RIGHT_UP)); PyDict_SetItemString(d, "wxEVT_TASKBAR_LEFT_DCLICK", PyInt_FromLong(wxEVT_TASKBAR_LEFT_DCLICK)); PyDict_SetItemString(d, "wxEVT_TASKBAR_RIGHT_DCLICK", PyInt_FromLong(wxEVT_TASKBAR_RIGHT_DCLICK)); + SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorPromptStr",_wrap_FileSelectorPromptStr_get, _wrap_FileSelectorPromptStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"DirSelectorPromptStr",_wrap_DirSelectorPromptStr_get, _wrap_DirSelectorPromptStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"DirDialogNameStr",_wrap_DirDialogNameStr_get, _wrap_DirDialogNameStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorDefaultWildcardStr",_wrap_FileSelectorDefaultWildcardStr_get, _wrap_FileSelectorDefaultWildcardStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"GetTextFromUserPromptStr",_wrap_GetTextFromUserPromptStr_get, _wrap_GetTextFromUserPromptStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"MessageBoxCaptionStr",_wrap_MessageBoxCaptionStr_get, _wrap_MessageBoxCaptionStr_set); + PyDict_SetItemString(d,"CHOICEDLG_STYLE", SWIG_PyObj_FromInt((int)wxCHOICEDLG_STYLE)); + PyDict_SetItemString(d,"FR_DOWN", SWIG_PyObj_FromInt((int)wxFR_DOWN)); + PyDict_SetItemString(d,"FR_WHOLEWORD", SWIG_PyObj_FromInt((int)wxFR_WHOLEWORD)); + PyDict_SetItemString(d,"FR_MATCHCASE", SWIG_PyObj_FromInt((int)wxFR_MATCHCASE)); + PyDict_SetItemString(d,"FR_REPLACEDIALOG", SWIG_PyObj_FromInt((int)wxFR_REPLACEDIALOG)); + PyDict_SetItemString(d,"FR_NOUPDOWN", SWIG_PyObj_FromInt((int)wxFR_NOUPDOWN)); + PyDict_SetItemString(d,"FR_NOMATCHCASE", SWIG_PyObj_FromInt((int)wxFR_NOMATCHCASE)); + PyDict_SetItemString(d,"FR_NOWHOLEWORD", SWIG_PyObj_FromInt((int)wxFR_NOWHOLEWORD)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND", PyInt_FromLong(wxEVT_COMMAND_FIND)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_NEXT", PyInt_FromLong(wxEVT_COMMAND_FIND_NEXT)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_REPLACE", PyInt_FromLong(wxEVT_COMMAND_FIND_REPLACE)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_REPLACE_ALL", PyInt_FromLong(wxEVT_COMMAND_FIND_REPLACE_ALL)); PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_CLOSE", PyInt_FromLong(wxEVT_COMMAND_FIND_CLOSE)); + PyDict_SetItemString(d,"IDM_WINDOWTILE", SWIG_PyObj_FromInt((int)4001)); + PyDict_SetItemString(d,"IDM_WINDOWTILEHOR", SWIG_PyObj_FromInt((int)4001)); + PyDict_SetItemString(d,"IDM_WINDOWCASCADE", SWIG_PyObj_FromInt((int)4002)); + PyDict_SetItemString(d,"IDM_WINDOWICONS", SWIG_PyObj_FromInt((int)4003)); + PyDict_SetItemString(d,"IDM_WINDOWNEXT", SWIG_PyObj_FromInt((int)4004)); + PyDict_SetItemString(d,"IDM_WINDOWTILEVERT", SWIG_PyObj_FromInt((int)4005)); + PyDict_SetItemString(d,"FIRST_MDI_CHILD", SWIG_PyObj_FromInt((int)4100)); + PyDict_SetItemString(d,"LAST_MDI_CHILD", SWIG_PyObj_FromInt((int)4600)); + SWIG_addvarlink(SWIG_globals,(char*)"PrintoutTitleStr",_wrap_PrintoutTitleStr_get, _wrap_PrintoutTitleStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"PreviewCanvasNameStr",_wrap_PreviewCanvasNameStr_get, _wrap_PreviewCanvasNameStr_set); + PyDict_SetItemString(d,"PRINT_MODE_NONE", SWIG_PyObj_FromInt((int)wxPRINT_MODE_NONE)); + PyDict_SetItemString(d,"PRINT_MODE_PREVIEW", SWIG_PyObj_FromInt((int)wxPRINT_MODE_PREVIEW)); + PyDict_SetItemString(d,"PRINT_MODE_FILE", SWIG_PyObj_FromInt((int)wxPRINT_MODE_FILE)); + PyDict_SetItemString(d,"PRINT_MODE_PRINTER", SWIG_PyObj_FromInt((int)wxPRINT_MODE_PRINTER)); + PyDict_SetItemString(d,"PRINT_MODE_STREAM", SWIG_PyObj_FromInt((int)wxPRINT_MODE_STREAM)); + PyDict_SetItemString(d,"PRINTER_NO_ERROR", SWIG_PyObj_FromInt((int)wxPRINTER_NO_ERROR)); + PyDict_SetItemString(d,"PRINTER_CANCELLED", SWIG_PyObj_FromInt((int)wxPRINTER_CANCELLED)); + PyDict_SetItemString(d,"PRINTER_ERROR", SWIG_PyObj_FromInt((int)wxPRINTER_ERROR)); + PyDict_SetItemString(d,"PREVIEW_PRINT", SWIG_PyObj_FromInt((int)wxPREVIEW_PRINT)); + PyDict_SetItemString(d,"PREVIEW_PREVIOUS", SWIG_PyObj_FromInt((int)wxPREVIEW_PREVIOUS)); + PyDict_SetItemString(d,"PREVIEW_NEXT", SWIG_PyObj_FromInt((int)wxPREVIEW_NEXT)); + PyDict_SetItemString(d,"PREVIEW_ZOOM", SWIG_PyObj_FromInt((int)wxPREVIEW_ZOOM)); + PyDict_SetItemString(d,"PREVIEW_FIRST", SWIG_PyObj_FromInt((int)wxPREVIEW_FIRST)); + PyDict_SetItemString(d,"PREVIEW_LAST", SWIG_PyObj_FromInt((int)wxPREVIEW_LAST)); + PyDict_SetItemString(d,"PREVIEW_GOTO", SWIG_PyObj_FromInt((int)wxPREVIEW_GOTO)); + PyDict_SetItemString(d,"PREVIEW_DEFAULT", SWIG_PyObj_FromInt((int)wxPREVIEW_DEFAULT)); + PyDict_SetItemString(d,"ID_PREVIEW_CLOSE", SWIG_PyObj_FromInt((int)wxID_PREVIEW_CLOSE)); + PyDict_SetItemString(d,"ID_PREVIEW_NEXT", SWIG_PyObj_FromInt((int)wxID_PREVIEW_NEXT)); + PyDict_SetItemString(d,"ID_PREVIEW_PREVIOUS", SWIG_PyObj_FromInt((int)wxID_PREVIEW_PREVIOUS)); + PyDict_SetItemString(d,"ID_PREVIEW_PRINT", SWIG_PyObj_FromInt((int)wxID_PREVIEW_PRINT)); + PyDict_SetItemString(d,"ID_PREVIEW_ZOOM", SWIG_PyObj_FromInt((int)wxID_PREVIEW_ZOOM)); + PyDict_SetItemString(d,"ID_PREVIEW_FIRST", SWIG_PyObj_FromInt((int)wxID_PREVIEW_FIRST)); + PyDict_SetItemString(d,"ID_PREVIEW_LAST", SWIG_PyObj_FromInt((int)wxID_PREVIEW_LAST)); + PyDict_SetItemString(d,"ID_PREVIEW_GOTO", SWIG_PyObj_FromInt((int)wxID_PREVIEW_GOTO)); wxPyPtrTypeMap_Add("wxPrintout", "wxPyPrintout");