X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/059a841c9651ba15b1ecc7a8c35189a813a122eb..68f36a2ca14a0005874f3343391f85f4aa084f99:/wxPython/src/gtk/printfw.cpp diff --git a/wxPython/src/gtk/printfw.cpp b/wxPython/src/gtk/printfw.cpp index 8d1240b77c..b328b4a73d 100644 --- a/wxPython/src/gtk/printfw.cpp +++ b/wxPython/src/gtk/printfw.cpp @@ -91,7 +91,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { #if PYTHON_API_VERSION >= 1009 static char* wxStringErrorMsg = "String or Unicode type required"; #else - static char* wxStringErrorMsg = "string type is required for parameter"; + static char* wxStringErrorMsg = "String type required"; #endif @@ -2488,11 +2488,11 @@ static void *SwigwxPageSetupDialogTowxDialog(void *ptr) { return (void *) dest; } -static void *SwigwxPageSetupDialogTowxPanel(void *ptr) { +static void *SwigwxPageSetupDialogTowxTopLevelWindow(void *ptr) { wxPageSetupDialog *src; - wxPanel *dest; + wxTopLevelWindow *dest; src = (wxPageSetupDialog *) ptr; - dest = (wxPanel *) src; + dest = (wxTopLevelWindow *) src; return (void *) dest; } @@ -3358,11 +3358,11 @@ static void *SwigwxPrintDialogTowxDialog(void *ptr) { return (void *) dest; } -static void *SwigwxPrintDialogTowxPanel(void *ptr) { +static void *SwigwxPrintDialogTowxTopLevelWindow(void *ptr) { wxPrintDialog *src; - wxPanel *dest; + wxTopLevelWindow *dest; src = (wxPrintDialog *) ptr; - dest = (wxPanel *) src; + dest = (wxTopLevelWindow *) src; return (void *) dest; } @@ -3561,8 +3561,8 @@ static PyObject *_wrap_new_wxPrintout(PyObject *self, PyObject *args, PyObject * return _resultobj; } -#define wxPrintout__setSelf(_swigobj,_swigarg0,_swigarg1) (_swigobj->_setSelf(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxPrintout__setSelf(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPrintout__setCallbackInfo(_swigobj,_swigarg0,_swigarg1) (_swigobj->_setCallbackInfo(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPrintout__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyPrintout * _arg0; PyObject * _arg1; @@ -3573,12 +3573,12 @@ static PyObject *_wrap_wxPrintout__setSelf(PyObject *self, PyObject *args, PyObj char *_kwnames[] = { "self","self","_class", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPrintout__setSelf",_kwnames,&_argo0,&_obj1,&_obj2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPrintout__setCallbackInfo",_kwnames,&_argo0,&_obj1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyPrintout_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout__setSelf. Expected _wxPyPrintout_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintout__setCallbackInfo. Expected _wxPyPrintout_p."); return NULL; } } @@ -3590,7 +3590,7 @@ static PyObject *_wrap_wxPrintout__setSelf(PyObject *self, PyObject *args, PyObj } { wxPy_BEGIN_ALLOW_THREADS; - wxPrintout__setSelf(_arg0,_arg1,_arg2); + wxPrintout__setCallbackInfo(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; if (PyErr_Occurred()) return NULL; @@ -4992,6 +4992,14 @@ static void *SwigwxPreviewFrameTowxFrame(void *ptr) { return (void *) dest; } +static void *SwigwxPreviewFrameTowxTopLevelWindow(void *ptr) { + wxPreviewFrame *src; + wxTopLevelWindow *dest; + src = (wxPreviewFrame *) ptr; + dest = (wxTopLevelWindow *) src; + return (void *) dest; +} + static void *SwigwxPreviewFrameTowxWindow(void *ptr) { wxPreviewFrame *src; wxWindow *dest; @@ -5174,7 +5182,7 @@ static PyMethodDef printfwcMethods[] = { { "wxPrintout_GetPageSizeMM", (PyCFunction) _wrap_wxPrintout_GetPageSizeMM, METH_VARARGS | METH_KEYWORDS }, { "wxPrintout_GetDC", (PyCFunction) _wrap_wxPrintout_GetDC, METH_VARARGS | METH_KEYWORDS }, { "wxPrintout_Destroy", (PyCFunction) _wrap_wxPrintout_Destroy, METH_VARARGS | METH_KEYWORDS }, - { "wxPrintout__setSelf", (PyCFunction) _wrap_wxPrintout__setSelf, METH_VARARGS | METH_KEYWORDS }, + { "wxPrintout__setCallbackInfo", (PyCFunction) _wrap_wxPrintout__setCallbackInfo, METH_VARARGS | METH_KEYWORDS }, { "new_wxPrintout", (PyCFunction) _wrap_new_wxPrintout, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialog_ShowModal", (PyCFunction) _wrap_wxPrintDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, { "wxPrintDialog_GetPrintDC", (PyCFunction) _wrap_wxPrintDialog_GetPrintDC, METH_VARARGS | METH_KEYWORDS }, @@ -5298,33 +5306,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, - { "_class_wxEvtHandler","_class_wxPreviewFrame",SwigwxPreviewFrameTowxEvtHandler}, - { "_class_wxEvtHandler","_wxPreviewFrame",SwigwxPreviewFrameTowxEvtHandler}, - { "_class_wxEvtHandler","_class_wxPrintDialog",SwigwxPrintDialogTowxEvtHandler}, - { "_class_wxEvtHandler","_wxPrintDialog",SwigwxPrintDialogTowxEvtHandler}, - { "_class_wxEvtHandler","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxEvtHandler}, - { "_class_wxEvtHandler","_wxPageSetupDialog",SwigwxPageSetupDialogTowxEvtHandler}, { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, - { "_class_wxObject","_class_wxPreviewFrame",SwigwxPreviewFrameTowxObject}, - { "_class_wxObject","_wxPreviewFrame",SwigwxPreviewFrameTowxObject}, - { "_class_wxObject","_class_wxPrintPreview",SwigwxPrintPreviewTowxObject}, - { "_class_wxObject","_wxPrintPreview",SwigwxPrintPreviewTowxObject}, - { "_class_wxObject","_class_wxPrinter",SwigwxPrinterTowxObject}, - { "_class_wxObject","_wxPrinter",SwigwxPrinterTowxObject}, - { "_class_wxObject","_class_wxPyPrintout",SwigwxPyPrintoutTowxObject}, - { "_class_wxObject","_wxPyPrintout",SwigwxPyPrintoutTowxObject}, - { "_class_wxObject","_class_wxPrintDialog",SwigwxPrintDialogTowxObject}, - { "_class_wxObject","_wxPrintDialog",SwigwxPrintDialogTowxObject}, - { "_class_wxObject","_class_wxPrintDialogData",SwigwxPrintDialogDataTowxObject}, - { "_class_wxObject","_wxPrintDialogData",SwigwxPrintDialogDataTowxObject}, - { "_class_wxObject","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxObject}, - { "_class_wxObject","_wxPageSetupDialog",SwigwxPageSetupDialogTowxObject}, - { "_class_wxObject","_class_wxPageSetupDialogData",SwigwxPageSetupDialogDataTowxObject}, - { "_class_wxObject","_wxPageSetupDialogData",SwigwxPageSetupDialogDataTowxObject}, - { "_class_wxObject","_class_wxPrintData",SwigwxPrintDataTowxObject}, - { "_class_wxObject","_wxPrintData",SwigwxPrintDataTowxObject}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -5332,14 +5316,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, - { "_wxPanel","_class_wxPrintDialog",SwigwxPrintDialogTowxPanel}, - { "_wxPanel","_wxPrintDialog",SwigwxPrintDialogTowxPanel}, - { "_wxPanel","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel}, - { "_wxPanel","_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel}, - { "_class_wxDialog","_class_wxPrintDialog",SwigwxPrintDialogTowxDialog}, - { "_class_wxDialog","_wxPrintDialog",SwigwxPrintDialogTowxDialog}, - { "_class_wxDialog","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog}, - { "_class_wxDialog","_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog}, + { "_wxTopLevelWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxPrintDialog",SwigwxPrintDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxPageSetupDialog",SwigwxPageSetupDialogTowxTopLevelWindow}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, @@ -5357,10 +5336,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_EBool","_wxWindowID",0}, { "_unsigned_long","_long",0}, { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, - { "_class_wxPanel","_class_wxPrintDialog",SwigwxPrintDialogTowxPanel}, - { "_class_wxPanel","_wxPrintDialog",SwigwxPrintDialogTowxPanel}, - { "_class_wxPanel","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel}, - { "_class_wxPanel","_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, @@ -5371,29 +5346,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_WXTYPE","_unsigned_short",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, - { "_class_wxWindow","_class_wxPreviewFrame",SwigwxPreviewFrameTowxWindow}, - { "_class_wxWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxWindow}, - { "_class_wxWindow","_class_wxPrintDialog",SwigwxPrintDialogTowxWindow}, - { "_class_wxWindow","_wxPrintDialog",SwigwxPrintDialogTowxWindow}, - { "_class_wxWindow","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxWindow}, - { "_class_wxWindow","_wxPageSetupDialog",SwigwxPageSetupDialogTowxWindow}, - { "_wxObject","_class_wxPreviewFrame",SwigwxPreviewFrameTowxObject}, { "_wxObject","_wxPreviewFrame",SwigwxPreviewFrameTowxObject}, - { "_wxObject","_class_wxPrintPreview",SwigwxPrintPreviewTowxObject}, { "_wxObject","_wxPrintPreview",SwigwxPrintPreviewTowxObject}, - { "_wxObject","_class_wxPrinter",SwigwxPrinterTowxObject}, { "_wxObject","_wxPrinter",SwigwxPrinterTowxObject}, - { "_wxObject","_class_wxPyPrintout",SwigwxPyPrintoutTowxObject}, { "_wxObject","_wxPyPrintout",SwigwxPyPrintoutTowxObject}, - { "_wxObject","_class_wxPrintDialog",SwigwxPrintDialogTowxObject}, { "_wxObject","_wxPrintDialog",SwigwxPrintDialogTowxObject}, - { "_wxObject","_class_wxPrintDialogData",SwigwxPrintDialogDataTowxObject}, { "_wxObject","_wxPrintDialogData",SwigwxPrintDialogDataTowxObject}, - { "_wxObject","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxObject}, { "_wxObject","_wxPageSetupDialog",SwigwxPageSetupDialogTowxObject}, - { "_wxObject","_class_wxPageSetupDialogData",SwigwxPageSetupDialogDataTowxObject}, { "_wxObject","_wxPageSetupDialogData",SwigwxPageSetupDialogDataTowxObject}, - { "_wxObject","_class_wxPrintData",SwigwxPrintDataTowxObject}, { "_wxObject","_wxPrintData",SwigwxPrintDataTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, @@ -5405,14 +5365,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_int","_uint",0}, { "_unsigned_int","_wxWindowID",0}, { "_unsigned_int","_int",0}, - { "_wxDialog","_class_wxPrintDialog",SwigwxPrintDialogTowxDialog}, { "_wxDialog","_wxPrintDialog",SwigwxPrintDialogTowxDialog}, - { "_wxDialog","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog}, { "_wxDialog","_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog}, { "_short","_WXTYPE",0}, { "_short","_unsigned_short",0}, { "_short","_signed_short",0}, - { "_wxFrame","_class_wxPreviewFrame",SwigwxPreviewFrameTowxFrame}, { "_wxFrame","_wxPreviewFrame",SwigwxPreviewFrameTowxFrame}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, @@ -5448,20 +5405,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, - { "_wxEvtHandler","_class_wxPreviewFrame",SwigwxPreviewFrameTowxEvtHandler}, { "_wxEvtHandler","_wxPreviewFrame",SwigwxPreviewFrameTowxEvtHandler}, - { "_wxEvtHandler","_class_wxPrintDialog",SwigwxPrintDialogTowxEvtHandler}, { "_wxEvtHandler","_wxPrintDialog",SwigwxPrintDialogTowxEvtHandler}, - { "_wxEvtHandler","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxEvtHandler}, { "_wxEvtHandler","_wxPageSetupDialog",SwigwxPageSetupDialogTowxEvtHandler}, - { "_wxWindow","_class_wxPreviewFrame",SwigwxPreviewFrameTowxWindow}, { "_wxWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxWindow}, - { "_wxWindow","_class_wxPrintDialog",SwigwxPrintDialogTowxWindow}, { "_wxWindow","_wxPrintDialog",SwigwxPrintDialogTowxWindow}, - { "_wxWindow","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxWindow}, { "_wxWindow","_wxPageSetupDialog",SwigwxPageSetupDialogTowxWindow}, - { "_class_wxFrame","_class_wxPreviewFrame",SwigwxPreviewFrameTowxFrame}, - { "_class_wxFrame","_wxPreviewFrame",SwigwxPreviewFrameTowxFrame}, {0,0,0}}; static PyObject *SWIG_globals;