X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..35095c028d472a2d0b9607a9430a468765a16e3f:/wxPython/src/gtk/windows_wrap.cpp?ds=sidebyside diff --git a/wxPython/src/gtk/windows_wrap.cpp b/wxPython/src/gtk/windows_wrap.cpp index 5551a6d5e4..3c5aa870ca 100644 --- a/wxPython/src/gtk/windows_wrap.cpp +++ b/wxPython/src/gtk/windows_wrap.cpp @@ -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,16 @@ 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 +135,6 @@ SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); * ************************************************************************/ - #include "Python.h" #ifdef __cplusplus @@ -161,8 +165,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) @@ -178,40 +180,26 @@ 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) -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[]); /* 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 +212,86 @@ 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_wxMiniFrame swig_types[40] +#define SWIGTYPE_p_wxFrame swig_types[41] +#define SWIGTYPE_p_wxPyPrintout swig_types[42] +#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[43] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[44] +#define SWIGTYPE_p_wxStatusBar swig_types[45] +#define SWIGTYPE_p_wxMDIParentFrame swig_types[46] +#define SWIGTYPE_p_wxPoint swig_types[47] +#define SWIGTYPE_p_wxObject swig_types[48] +#define SWIGTYPE_p_unsigned_long swig_types[49] +#define SWIGTYPE_p_wxMDIClientWindow swig_types[50] +#define SWIGTYPE_p_wxTipWindow swig_types[51] +#define SWIGTYPE_p_wxSashLayoutWindow swig_types[52] +#define SWIGTYPE_p_wxSplitterWindow swig_types[53] +#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[54] +#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[55] +#define SWIGTYPE_p_wxPopupWindow swig_types[56] +#define SWIGTYPE_p_wxSashWindow swig_types[57] +#define SWIGTYPE_p_wxTopLevelWindow swig_types[58] +#define SWIGTYPE_p_wxWindow swig_types[59] +#define SWIGTYPE_p_wxScrolledWindow swig_types[60] +#define SWIGTYPE_p_wxSplashScreenWindow swig_types[61] +#define SWIGTYPE_p_wxMenuBar swig_types[62] +#define SWIGTYPE_p_wxPrintPreview swig_types[63] +#define SWIGTYPE_p_wxSashEvent swig_types[64] +#define SWIGTYPE_p_wxString swig_types[65] +#define SWIGTYPE_p_wxPyPrintPreview swig_types[66] +#define SWIGTYPE_p_wxPageSetupDialog swig_types[67] +#define SWIGTYPE_p_wxFontDialog swig_types[68] +#define SWIGTYPE_p_wxDirDialog swig_types[69] +#define SWIGTYPE_p_wxColourDialog swig_types[70] +#define SWIGTYPE_p_wxDialog swig_types[71] +#define SWIGTYPE_p_wxPanel swig_types[72] +#define SWIGTYPE_p_wxPrintDialog swig_types[73] +#define SWIGTYPE_p_wxBitmap swig_types[74] +#define SWIGTYPE_p_wxCommandEvent swig_types[75] +#define SWIGTYPE_p_wxPreviewControlBar swig_types[76] +#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[77] +#define SWIGTYPE_p_wxColour swig_types[78] +#define SWIGTYPE_p_wxToolBar swig_types[79] +#define SWIGTYPE_p_wxPrintDialogData swig_types[80] +#define SWIGTYPE_p_wxPageSetupDialogData swig_types[81] +static swig_type_info *swig_types[83]; /* -------- TYPES TABLE (END) -------- */ @@ -322,10 +306,9 @@ static swig_type_info *swig_types[87]; #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); @@ -355,13 +338,10 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - - // Put some wx default wxChar* values into wxStrings. - DECLARE_DEF_STRING(FrameNameStr); - DECLARE_DEF_STRING(DialogNameStr); - DECLARE_DEF_STRING(StatusLineNameStr); - DECLARE_DEF_STRING(ToolBarNameStr); - + 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){ return self->m_modalShowing; @@ -371,16 +351,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 +384,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 +448,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 @@ -491,8 +468,8 @@ IMP_PYCALLBACK_COORD_const (wxPyVScrolledWindow, wxVScrolledWindow, Est #include -DECLARE_DEF_STRING(VListBoxNameStr); + static const wxString wxPyVListBoxNameStr(wxVListBoxNameStr); class wxPyVListBox : public wxVListBox { @@ -616,7 +593,7 @@ IMP_PYCALLBACK_STRING_SIZET (wxPyHtmlListBox, wxHtmlListBox, OnGetItemMarkup class wxTaskBarIcon : public wxEvtHandler { public: - wxTaskBarIcon() { PyErr_SetNone(PyExc_NotImplementedError); } + wxTaskBarIcon() { wxPyRaiseNotImplemented(); } }; @@ -624,7 +601,7 @@ class wxTaskBarIconEvent : public wxEvent { public: wxTaskBarIconEvent(wxEventType, wxTaskBarIcon *) - { PyErr_SetNone(PyExc_NotImplementedError); } + { wxPyRaiseNotImplemented(); } virtual wxEvent* Clone() const { return NULL; } }; @@ -639,16 +616,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 +781,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 +800,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 +852,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 +975,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,7 +986,7 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -1025,7 +995,7 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg (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|iOOlO:new_Panel",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj2) { { @@ -1043,7 +1013,7 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -1094,7 +1064,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,7 +1075,7 @@ 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 * obj3 = 0 ; @@ -1134,7 +1104,7 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -1193,7 +1163,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,7 +1174,7 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -1231,7 +1201,7 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -1282,7 +1252,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,7 +1263,7 @@ 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 * obj3 = 0 ; @@ -1322,7 +1292,7 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -1356,7 +1326,7 @@ 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 * obj7 = 0 ; char *kwnames[] = { @@ -1674,33 +1644,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 +1677,33 @@ 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 ; - if(!PyArg_ParseTuple(args,(char *)"OO:ScrolledWindow_CalcScrolledPosition",&obj0,&obj1)) goto fail; + arg4 = &temp4; + arg5 = &temp5; + if(!PyArg_ParseTuple(args,(char *)"Oii:ScrolledWindow_CalcScrolledPosition",&obj0,&arg2,&arg3)) 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(); - 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 +1736,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); } } } @@ -1790,7 +1760,7 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition(PyObject *self, PyObj _v = (PyInt_Check(argv[2]) || PyLong_Check(argv[2])) ? 1 : 0; } if (_v) { - return _wrap_ScrolledWindow_CalcScrolledPosition__SWIG_0(self,args); + return _wrap_ScrolledWindow_CalcScrolledPosition__SWIG_1(self,args); } } } @@ -1804,33 +1774,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 +1807,33 @@ 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 ; - if(!PyArg_ParseTuple(args,(char *)"OO:ScrolledWindow_CalcUnscrolledPosition",&obj0,&obj1)) goto fail; + arg4 = &temp4; + arg5 = &temp5; + if(!PyArg_ParseTuple(args,(char *)"Oii:ScrolledWindow_CalcUnscrolledPosition",&obj0,&arg2,&arg3)) 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(); - 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 +1866,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); } } } @@ -1920,7 +1890,7 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition(PyObject *self, PyO _v = (PyInt_Check(argv[2]) || PyLong_Check(argv[2])) ? 1 : 0; } if (_v) { - return _wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_0(self,args); + return _wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_1(self,args); } } } @@ -2047,376 +2017,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 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 - }; - - 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; - } - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; -} - - -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_FrameNameStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable FrameNameStr 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_FrameNameStr_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((&wxPyFrameNameStr)->c_str(), (&wxPyFrameNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyFrameNameStr)->c_str(), (&wxPyFrameNameStr)->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_DialogNameStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable DialogNameStr 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_DialogNameStr_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((&wxPyDialogNameStr)->c_str(), (&wxPyDialogNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyDialogNameStr)->c_str(), (&wxPyDialogNameStr)->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_StatusLineNameStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable StatusLineNameStr is read-only."); return 1; } -static PyObject *_wrap_NullAcceleratorTable_get() { +static PyObject *_wrap_StatusLineNameStr_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; +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyStatusLineNameStr)->c_str(), (&wxPyStatusLineNameStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyStatusLineNameStr)->c_str(), (&wxPyStatusLineNameStr)->Len()); +#endif } - return resultobj; - fail: + return pyobj; +} + + +static int _wrap_ToolBarNameStr_set(PyObject *_val) { + PyErr_SetString(PyExc_TypeError,"Variable ToolBarNameStr is read-only."); + return 1; +} + + +static PyObject *_wrap_ToolBarNameStr_get() { + PyObject *pyobj; + { - 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[] = { @@ -2470,7 +2154,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[] = { @@ -2695,7 +2379,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[] = { @@ -2707,7 +2391,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(); @@ -2803,7 +2487,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 ; @@ -2813,10 +2497,10 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -2831,7 +2515,7 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { @@ -2849,7 +2533,7 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -2912,7 +2596,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 ; @@ -2922,10 +2606,10 @@ 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 * obj3 = 0 ; @@ -2942,7 +2626,7 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { @@ -2960,7 +2644,7 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw { arg8 = wxString_in_helper(obj7); if (arg8 == NULL) SWIG_fail; - temp8 = true; + temp8 = True; } } { @@ -3131,11 +2815,11 @@ 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 * obj4 = 0 ; char *kwnames[] = { @@ -3148,7 +2832,7 @@ static PyObject *_wrap_Frame_CreateStatusBar(PyObject *self, PyObject *args, PyO { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } { @@ -3234,7 +2918,7 @@ 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 ; char *kwnames[] = { @@ -3246,7 +2930,7 @@ static PyObject *_wrap_Frame_SetStatusText(PyObject *self, PyObject *args, PyObj { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3313,7 +2997,7 @@ 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 ; char *kwnames[] = { @@ -3325,7 +3009,7 @@ static PyObject *_wrap_Frame_PushStatusText(PyObject *self, PyObject *args, PyOb { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -3428,11 +3112,11 @@ 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 * obj3 = 0 ; char *kwnames[] = { @@ -3445,7 +3129,7 @@ static PyObject *_wrap_Frame_CreateToolBar(PyObject *self, PyObject *args, PyObj { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { @@ -3531,7 +3215,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 ; @@ -3544,7 +3228,7 @@ 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 = PyInt_AsLong(obj2) ? true : false; if (PyErr_Occurred()) SWIG_fail; @@ -3609,7 +3293,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 ; @@ -3619,10 +3303,10 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -3637,7 +3321,7 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { @@ -3655,7 +3339,7 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -3714,7 +3398,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 ; @@ -3724,10 +3408,10 @@ 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 * obj3 = 0 ; @@ -3744,7 +3428,7 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { @@ -3762,7 +3446,7 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k { arg8 = wxString_in_helper(obj7); if (arg8 == NULL) SWIG_fail; - temp8 = true; + temp8 = True; } } { @@ -3850,7 +3534,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[] = { @@ -3862,7 +3546,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(); @@ -3916,34 +3600,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 ; @@ -4054,7 +3710,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 ; @@ -4064,10 +3720,10 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -4082,7 +3738,7 @@ static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *k { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { @@ -4100,7 +3756,7 @@ static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *k { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -4159,7 +3815,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 ; @@ -4169,10 +3825,10 @@ 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 * obj3 = 0 ; @@ -4189,7 +3845,7 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { @@ -4207,7 +3863,7 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject { arg8 = wxString_in_helper(obj7); if (arg8 == NULL) SWIG_fail; - temp8 = true; + temp8 = True; } } { @@ -4251,7 +3907,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 ; @@ -4371,7 +4027,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 ; @@ -4505,12 +4161,12 @@ 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 * obj3 = 0 ; char *kwnames[] = { @@ -4523,7 +4179,7 @@ static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *k { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } } { @@ -4578,12 +4234,12 @@ 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 * obj4 = 0 ; @@ -4598,7 +4254,7 @@ static PyObject *_wrap_StatusBar_Create(PyObject *self, PyObject *args, PyObject { arg5 = wxString_in_helper(obj4); if (arg5 == NULL) SWIG_fail; - temp5 = true; + temp5 = True; } } { @@ -4678,7 +4334,7 @@ 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 ; char *kwnames[] = { @@ -4690,7 +4346,7 @@ static PyObject *_wrap_StatusBar_SetStatusText(PyObject *self, PyObject *args, P { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4751,7 +4407,7 @@ 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 ; char *kwnames[] = { @@ -4763,7 +4419,7 @@ static PyObject *_wrap_StatusBar_PushStatusText(PyObject *self, PyObject *args, { arg2 = wxString_in_helper(obj1); if (arg2 == NULL) SWIG_fail; - temp2 = true; + temp2 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -4854,29 +4510,26 @@ 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 ; 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 *)"Oi:StatusBar_GetFieldRect",kwnames,&obj0,&arg2)) 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; - } { 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; @@ -4965,10 +4618,30 @@ static PyObject * StatusBar_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static int _wrap_SplitterNameStr_set(PyObject *_val) { + 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 ; @@ -4979,7 +4652,7 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -5006,7 +4679,7 @@ static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObje { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -5057,7 +4730,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 ; @@ -5068,7 +4741,7 @@ 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 * obj3 = 0 ; @@ -5097,7 +4770,7 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -5507,7 +5180,7 @@ 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 * obj2 = 0 ; char *kwnames[] = { @@ -5883,10 +5556,50 @@ static PyObject * SplitterEvent_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static int _wrap_SashNameStr_set(PyObject *_val) { + 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 *_val) { + 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 ; @@ -5897,7 +5610,7 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -5924,7 +5637,7 @@ static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject * { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -5975,7 +5688,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 ; @@ -5986,7 +5699,7 @@ 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 * obj3 = 0 ; @@ -6015,7 +5728,7 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -6728,7 +6441,7 @@ 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; char *kwnames[] = { (char *) "id", NULL @@ -7018,7 +6731,7 @@ 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; char *kwnames[] = { (char *) "id", NULL @@ -7159,7 +6872,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 ; @@ -7170,7 +6883,7 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -7197,7 +6910,7 @@ static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyOb { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -7248,7 +6961,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 ; @@ -7259,7 +6972,7 @@ 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 * obj3 = 0 ; @@ -7288,7 +7001,7 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -7866,10 +7579,11 @@ 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 * obj3 = 0 ; @@ -7879,20 +7593,32 @@ static PyObject *_wrap_new_TipWindow(PyObject *self, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|iO:new_TipWindow",kwnames,&obj0,&obj1,&arg3,&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 (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; } @@ -7962,7 +7688,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 ; @@ -7973,7 +7699,7 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -8000,7 +7726,7 @@ static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObj { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -8081,7 +7807,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 ; @@ -8092,7 +7818,7 @@ 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 * obj3 = 0 ; @@ -8121,7 +7847,7 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -8318,8 +8044,8 @@ 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 ; char *kwnames[] = { @@ -8509,10 +8235,30 @@ static PyObject * VScrolledWindow_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static int _wrap_VListBoxNameStr_set(PyObject *_val) { + 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 ; @@ -8523,7 +8269,7 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -8550,7 +8296,7 @@ static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kw { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -8631,7 +8377,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 ; @@ -8642,7 +8388,7 @@ 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 * obj3 = 0 ; @@ -8671,7 +8417,7 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -9054,7 +8800,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 ; @@ -9230,8 +8976,8 @@ 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 ; char *kwnames[] = { (char *) "self",(char *) "x",(char *) "y", NULL @@ -9294,7 +9040,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 ; @@ -9305,7 +9051,7 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -9332,7 +9078,7 @@ static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -9413,7 +9159,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 ; @@ -9424,7 +9170,7 @@ 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 * obj3 = 0 ; @@ -9453,7 +9199,7 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -9640,7 +9386,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 ; @@ -9658,7 +9404,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; } } { @@ -9753,29 +9499,149 @@ static PyObject *_wrap_new_TaskBarIconEvent(PyObject *self, PyObject *args, PyOb (char *) "evtType",(char *) "tbIcon", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iO:new_TaskBarIconEvent",kwnames,&arg1,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTaskBarIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"iO:new_TaskBarIconEvent",kwnames,&arg1,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTaskBarIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxTaskBarIconEvent *)new wxTaskBarIconEvent(arg1,arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxTaskBarIconEvent, 1); + return resultobj; + fail: + return NULL; +} + + +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 *_val) { + 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 *_val) { + 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 *_val) { + 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 *_val) { + 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 *_val) { + 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 *_val) { + PyErr_SetString(PyExc_TypeError,"Variable MessageBoxCaptionStr is read-only."); + return 1; +} + + +static PyObject *_wrap_MessageBoxCaptionStr_get() { + PyObject *pyobj; + { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTaskBarIconEvent *)new wxTaskBarIconEvent(arg1,arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyMessageBoxCaptionStr)->c_str(), (&wxPyMessageBoxCaptionStr)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyMessageBoxCaptionStr)->c_str(), (&wxPyMessageBoxCaptionStr)->Len()); +#endif } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxTaskBarIconEvent, 1); - return resultobj; - fail: - return NULL; + return pyobj; } -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 *_wrap_new_ColourData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxColourData *result; @@ -10106,11 +9972,11 @@ 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 ; @@ -10127,14 +9993,14 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k { 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 (obj4) { @@ -10153,7 +10019,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; } } { @@ -10285,7 +10151,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[] = { @@ -10297,7 +10163,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(); @@ -10325,7 +10191,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[] = { @@ -10337,7 +10203,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(); @@ -10408,10 +10274,10 @@ 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 ; @@ -10429,28 +10295,28 @@ static PyObject *_wrap_new_FileDialog(PyObject *self, PyObject *args, PyObject * { 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 (obj6) { @@ -10509,7 +10375,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[] = { @@ -10521,7 +10387,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(); @@ -10549,7 +10415,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[] = { @@ -10561,7 +10427,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(); @@ -10589,7 +10455,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[] = { @@ -10601,7 +10467,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(); @@ -10629,7 +10495,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[] = { @@ -10641,7 +10507,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(); @@ -10669,7 +10535,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[] = { @@ -10681,7 +10547,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(); @@ -11028,8 +10894,9 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO wxPoint const &arg7_defvalue = wxDefaultPosition ; wxPoint *arg7 = (wxPoint *) &arg7_defvalue ; wxMultiChoiceDialog *result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; + bool temp5 = False ; wxPoint temp7 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -11045,14 +10912,18 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO { 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; + } + { + arg5 = wxString_in_helper(obj4); + if (arg5 == NULL) SWIG_fail; + temp5 = True; } - if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj6) { { arg7 = &temp7; @@ -11075,6 +10946,10 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO if (temp3) delete arg3; } + { + if (temp5) + delete arg5; + } return resultobj; fail: { @@ -11085,6 +10960,10 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO if (temp3) delete arg3; } + { + if (temp5) + delete arg5; + } return NULL; } @@ -11179,8 +11058,8 @@ static PyObject *_wrap_new_SingleChoiceDialog(PyObject *self, PyObject *args, Py wxPoint const &arg7_defvalue = wxDefaultPosition ; wxPoint *arg7 = (wxPoint *) &arg7_defvalue ; wxSingleChoiceDialog *result; - bool temp2 = false ; - bool temp3 = false ; + bool temp2 = False ; + bool temp3 = False ; wxPoint temp6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -11196,12 +11075,12 @@ static PyObject *_wrap_new_SingleChoiceDialog(PyObject *self, PyObject *args, Py { 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; } { arg4 = PyList_Size(obj3); @@ -11375,9 +11254,9 @@ 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 ; @@ -11393,20 +11272,20 @@ static PyObject *_wrap_new_TextEntryDialog(PyObject *self, PyObject *args, PyObj { 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 (obj5) { @@ -11488,7 +11367,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[] = { @@ -11500,7 +11379,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(); @@ -12073,8 +11952,8 @@ 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 ; @@ -12089,13 +11968,13 @@ static PyObject *_wrap_new_MessageDialog(PyObject *self, PyObject *args, PyObjec { 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 (obj4) { @@ -12174,8 +12053,8 @@ 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 * obj3 = 0 ; @@ -12187,12 +12066,12 @@ static PyObject *_wrap_new_ProgressDialog(PyObject *self, PyObject *args, PyObje { 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 (obj3) { if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; @@ -12234,7 +12113,7 @@ 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 * obj2 = 0 ; char *kwnames[] = { @@ -12247,7 +12126,7 @@ static PyObject *_wrap_ProgressDialog_Update(PyObject *self, PyObject *args, PyO { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } } { @@ -12355,7 +12234,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 @@ -12365,16 +12244,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; @@ -12404,7 +12286,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; @@ -12465,7 +12353,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[] = { @@ -12477,7 +12365,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(); @@ -12505,7 +12393,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[] = { @@ -12517,7 +12405,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(); @@ -12616,7 +12504,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; @@ -12644,7 +12538,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; @@ -12705,7 +12605,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[] = { @@ -12717,7 +12617,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(); @@ -12745,7 +12645,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[] = { @@ -12757,7 +12657,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(); @@ -12795,7 +12695,7 @@ 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 ; @@ -12809,7 +12709,7 @@ static PyObject *_wrap_new_FindReplaceDialog(PyObject *self, PyObject *args, PyO { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12863,7 +12763,7 @@ 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 ; @@ -12879,7 +12779,7 @@ static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args, { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12965,7 +12865,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 ; @@ -12975,10 +12875,10 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -12993,7 +12893,7 @@ static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObje { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { @@ -13011,7 +12911,7 @@ static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObje { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -13070,7 +12970,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 ; @@ -13080,10 +12980,10 @@ 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 * obj3 = 0 ; @@ -13100,7 +13000,7 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { @@ -13118,7 +13018,7 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO { arg8 = wxString_in_helper(obj7); if (arg8 == NULL) SWIG_fail; - temp8 = true; + temp8 = True; } } { @@ -13362,7 +13262,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 ; @@ -13372,10 +13272,10 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -13390,7 +13290,7 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { @@ -13408,7 +13308,7 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -13471,7 +13371,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 ; @@ -13481,10 +13381,10 @@ 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 * obj3 = 0 ; @@ -13501,7 +13401,7 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb { arg4 = wxString_in_helper(obj3); if (arg4 == NULL) SWIG_fail; - temp4 = true; + temp4 = True; } if (obj4) { { @@ -13519,7 +13419,7 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb { arg8 = wxString_in_helper(obj7); if (arg8 == NULL) SWIG_fail; - temp8 = true; + temp8 = True; } } { @@ -13726,7 +13626,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 ; @@ -13737,7 +13637,7 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -13764,7 +13664,7 @@ static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kw { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -14342,7 +14242,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 ; @@ -14353,7 +14253,7 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -14380,7 +14280,7 @@ static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwa { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -14955,6 +14855,46 @@ static PyObject * PyPanel_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static int _wrap_PrintoutTitleStr_set(PyObject *_val) { + 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 *_val) { + 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; @@ -15122,7 +15062,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; @@ -15235,7 +15181,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 @@ -15245,16 +15191,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 = PyInt_FromLong((long)result); return resultobj; fail: return NULL; @@ -15343,7 +15285,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[] = { @@ -15355,7 +15297,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(); @@ -15491,18 +15433,14 @@ 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[] = { (char *) "self",(char *) "quality", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetQuality",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:PrintData_SetQuality",kwnames,&obj0,&arg2)) 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; { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->SetQuality(arg2); @@ -15538,7 +15476,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; @@ -15566,7 +15510,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; @@ -15594,7 +15544,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; @@ -15622,7 +15578,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; @@ -15650,7 +15612,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; @@ -15786,7 +15754,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[] = { @@ -15798,7 +15766,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(); @@ -15826,7 +15794,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[] = { @@ -15838,7 +15806,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(); @@ -15866,7 +15834,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[] = { @@ -15878,7 +15846,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(); @@ -15906,7 +15874,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[] = { @@ -15918,7 +15886,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(); @@ -15946,7 +15914,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[] = { @@ -15958,7 +15926,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(); @@ -18207,7 +18175,7 @@ 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 ; @@ -18270,7 +18238,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 ; @@ -18286,7 +18254,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(); @@ -18397,7 +18365,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 @@ -18408,7 +18376,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; } } { @@ -18550,64 +18518,64 @@ 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 ; 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 *)"Oii:Printout_SetPageSizePixels",kwnames,&obj0,&arg2,&arg3)) 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); + (arg1)->SetPageSizePixels(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; } -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; @@ -18982,6 +18950,32 @@ 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 ; + 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 *_wrap_Printout_base_GetPageInfo(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; @@ -19034,32 +19028,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; @@ -19081,7 +19049,7 @@ 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 ; @@ -19110,7 +19078,7 @@ static PyObject *_wrap_new_PreviewCanvas(PyObject *self, PyObject *args, PyObjec { arg6 = wxString_in_helper(obj5); if (arg6 == NULL) SWIG_fail; - temp6 = true; + temp6 = True; } } { @@ -19155,10 +19123,10 @@ 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 ; @@ -19175,7 +19143,7 @@ static PyObject *_wrap_new_PreviewFrame(PyObject *self, PyObject *args, PyObject { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { @@ -19193,7 +19161,7 @@ static PyObject *_wrap_new_PreviewFrame(PyObject *self, PyObject *args, PyObject { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -19345,7 +19313,7 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -19374,7 +19342,7 @@ static PyObject *_wrap_new_PreviewControlBar(PyObject *self, PyObject *args, PyO { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -20515,10 +20483,10 @@ 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 ; @@ -20535,7 +20503,7 @@ static PyObject *_wrap_new_PyPreviewFrame(PyObject *self, PyObject *args, PyObje { arg3 = wxString_in_helper(obj2); if (arg3 == NULL) SWIG_fail; - temp3 = true; + temp3 = True; } if (obj3) { { @@ -20553,7 +20521,7 @@ static PyObject *_wrap_new_PyPreviewFrame(PyObject *self, PyObject *args, PyObje { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -20764,7 +20732,7 @@ 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 * obj2 = 0 ; PyObject * obj3 = 0 ; @@ -20793,7 +20761,7 @@ static PyObject *_wrap_new_PyPreviewControlBar(PyObject *self, PyObject *args, P { arg7 = wxString_in_helper(obj6); if (arg7 == NULL) SWIG_fail; - temp7 = true; + temp7 = True; } } { @@ -20958,20 +20926,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"ScrolledWindow_SetTargetWindow", (PyCFunction) _wrap_ScrolledWindow_SetTargetWindow, METH_VARARGS | METH_KEYWORDS }, { (char *)"ScrolledWindow_GetTargetWindow", (PyCFunction) _wrap_ScrolledWindow_GetTargetWindow, 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 }, @@ -21016,7 +20970,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 }, @@ -21528,8 +21481,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 }, @@ -21543,8 +21496,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 }, @@ -22182,9 +22135,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)); } @@ -22194,6 +22144,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)); } @@ -22620,7 +22573,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}}; @@ -22652,14 +22604,12 @@ 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_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}}; @@ -22674,7 +22624,6 @@ static swig_type_info _swigt__p_wxMDIClientWindow[] = {{"_p_wxMDIClientWindow", 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}}; @@ -22682,33 +22631,32 @@ 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}}; static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; static swig_type_info _swigt__p_wxPyPrintPreview[] = {{"_p_wxPyPrintPreview", 0, "wxPyPrintPreview *", 0},{"_p_wxPyPrintPreview"},{0}}; +static swig_type_info _swigt__p_wxPageSetupDialog[] = {{"_p_wxPageSetupDialog", 0, "wxPageSetupDialog *", 0},{"_p_wxPageSetupDialog"},{0}}; static swig_type_info _swigt__p_wxFontDialog[] = {{"_p_wxFontDialog", 0, "wxFontDialog *", 0},{"_p_wxFontDialog"},{0}}; static swig_type_info _swigt__p_wxDirDialog[] = {{"_p_wxDirDialog", 0, "wxDirDialog *", 0},{"_p_wxDirDialog"},{0}}; static swig_type_info _swigt__p_wxColourDialog[] = {{"_p_wxColourDialog", 0, "wxColourDialog *", 0},{"_p_wxColourDialog"},{0}}; static swig_type_info _swigt__p_wxDialog[] = {{"_p_wxDialog", 0, "wxDialog *", 0},{"_p_wxDialog"},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxDialog},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxDialog},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxDialog},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxDialog},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxDialog},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxDialog},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxDialog},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxDialog},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxDialog},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxDialog},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxDialog},{0}}; static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0},{"_p_wxPanel"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel},{0}}; -static swig_type_info _swigt__p_wxPageSetupDialog[] = {{"_p_wxPageSetupDialog", 0, "wxPageSetupDialog *", 0},{"_p_wxPageSetupDialog"},{0}}; 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}}; static swig_type_info _swigt__p_wxToolBar[] = {{"_p_wxToolBar", 0, "wxToolBar *", 0},{"_p_wxToolBar"},{0}}; -static swig_type_info _swigt__p_wxPageSetupDialogData[] = {{"_p_wxPageSetupDialogData", 0, "wxPageSetupDialogData *", 0},{"_p_wxPageSetupDialogData"},{0}}; static swig_type_info _swigt__p_wxPrintDialogData[] = {{"_p_wxPrintDialogData", 0, "wxPrintDialogData *", 0},{"_p_wxPrintDialogData"},{0}}; +static swig_type_info _swigt__p_wxPageSetupDialogData[] = {{"_p_wxPageSetupDialogData", 0, "wxPageSetupDialogData *", 0},{"_p_wxPageSetupDialogData"},{0}}; 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, @@ -22740,14 +22688,12 @@ _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_wxMiniFrame, _swigt__p_wxFrame, _swigt__p_wxPyPrintout, @@ -22762,7 +22708,6 @@ _swigt__p_wxMDIClientWindow, _swigt__p_wxTipWindow, _swigt__p_wxSashLayoutWindow, _swigt__p_wxSplitterWindow, -_swigt__p_wxSplashScreenWindow, _swigt__p_wxPyVScrolledWindow, _swigt__p_wxPyPopupTransientWindow, _swigt__p_wxPopupWindow, @@ -22770,27 +22715,27 @@ _swigt__p_wxSashWindow, _swigt__p_wxTopLevelWindow, _swigt__p_wxWindow, _swigt__p_wxScrolledWindow, +_swigt__p_wxSplashScreenWindow, _swigt__p_wxMenuBar, _swigt__p_wxPrintPreview, _swigt__p_wxSashEvent, _swigt__p_wxString, _swigt__p_wxPyPrintPreview, +_swigt__p_wxPageSetupDialog, _swigt__p_wxFontDialog, _swigt__p_wxDirDialog, _swigt__p_wxColourDialog, _swigt__p_wxDialog, _swigt__p_wxPanel, -_swigt__p_wxPageSetupDialog, _swigt__p_wxPrintDialog, _swigt__p_wxBitmap, _swigt__p_wxCommandEvent, -_swigt__p_wxPrintQuality, _swigt__p_wxPreviewControlBar, _swigt__p_wxPyPreviewControlBar, _swigt__p_wxColour, _swigt__p_wxToolBar, -_swigt__p_wxPageSetupDialogData, _swigt__p_wxPrintDialogData, +_swigt__p_wxPageSetupDialogData, 0 }; @@ -22934,14 +22879,21 @@ 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); + SWIG_addvarlink(SWIG_globals,(char*)"SplitterNameStr",_wrap_SplitterNameStr_get, _wrap_SplitterNameStr_set); 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, "wxEVT_SASH_DRAGGED", PyInt_FromLong(wxEVT_SASH_DRAGGED)); 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"); @@ -22955,11 +22907,19 @@ 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, "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)); + SWIG_addvarlink(SWIG_globals,(char*)"PrintoutTitleStr",_wrap_PrintoutTitleStr_get, _wrap_PrintoutTitleStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"PreviewCanvasNameStr",_wrap_PreviewCanvasNameStr_get, _wrap_PreviewCanvasNameStr_set); wxPyPtrTypeMap_Add("wxPrintout", "wxPyPrintout");