updates of some SWIG generated stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* This file was automatically generated by :
|
||||
* Simplified Wrapper and Interface Generator (SWIG)
|
||||
* Version 1.1 (Patch 6)
|
||||
* Version 1.1 (Build 810)
|
||||
*
|
||||
* Portions Copyright (c) 1995-1998
|
||||
* The University of Utah and The Regents of the University of California.
|
||||
@@ -105,14 +105,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
|
||||
}
|
||||
|
||||
|
||||
extern byte* byte_LIST_helper(PyObject* source);
|
||||
extern int* int_LIST_helper(PyObject* source);
|
||||
extern long* long_LIST_helper(PyObject* source);
|
||||
extern char** string_LIST_helper(PyObject* source);
|
||||
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
|
||||
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
|
||||
extern wxString* wxString_LIST_helper(PyObject* source);
|
||||
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
|
||||
HELPEREXPORT byte* byte_LIST_helper(PyObject* source);
|
||||
HELPEREXPORT int* int_LIST_helper(PyObject* source);
|
||||
HELPEREXPORT long* long_LIST_helper(PyObject* source);
|
||||
HELPEREXPORT char** string_LIST_helper(PyObject* source);
|
||||
HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source);
|
||||
HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source);
|
||||
HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source);
|
||||
HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
|
||||
|
||||
|
||||
static char* wxStringErrorMsg = "string type is required for parameter";
|
||||
@@ -121,19 +121,20 @@ class wxPyPrintout : public wxPrintout {
|
||||
public:
|
||||
wxPyPrintout(const wxString& title) : wxPrintout(title) {}
|
||||
|
||||
PYCALLBACK_BOOL_INTINT(wxPrintout, OnBeginDocument);
|
||||
PYCALLBACK__(wxPrintout, OnEndDocument);
|
||||
PYCALLBACK__(wxPrintout, OnBeginPrinting);
|
||||
PYCALLBACK__(wxPrintout, OnEndPrinting);
|
||||
PYCALLBACK__(wxPrintout, OnPreparePrinting);
|
||||
PYCALLBACK_BOOL_INT_pure(wxPrintout, OnPrintPage);
|
||||
PYCALLBACK_BOOL_INT(wxPrintout, HasPage);
|
||||
DEC_PYCALLBACK_BOOL_INTINT(OnBeginDocument);
|
||||
DEC_PYCALLBACK__(OnEndDocument);
|
||||
DEC_PYCALLBACK__(OnBeginPrinting);
|
||||
DEC_PYCALLBACK__(OnEndPrinting);
|
||||
DEC_PYCALLBACK__(OnPreparePrinting);
|
||||
DEC_PYCALLBACK_BOOL_INT_pure(OnPrintPage);
|
||||
DEC_PYCALLBACK_BOOL_INT(HasPage);
|
||||
|
||||
|
||||
// Since this one would be tough and ugly to do with the Macros...
|
||||
void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) {
|
||||
bool hadErr = false;
|
||||
|
||||
bool doSave = wxPyRestoreThread();
|
||||
if (m_myInst.findCallback("GetPageInfo")) {
|
||||
PyObject* result = m_myInst.callCallbackObj(Py_BuildValue("()"));
|
||||
if (result && PyTuple_Check(result) && PyTuple_Size(result) == 4) {
|
||||
@@ -163,19 +164,29 @@ public:
|
||||
PyErr_Print();
|
||||
}
|
||||
Py_DECREF(result);
|
||||
#ifdef WXP_WITH_THREAD
|
||||
PyEval_SaveThread();
|
||||
#endif
|
||||
}
|
||||
else
|
||||
wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo);
|
||||
|
||||
wxPySaveThread(doSave);
|
||||
}
|
||||
|
||||
void base_GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) {
|
||||
wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo);
|
||||
}
|
||||
|
||||
PYPRIVATE;
|
||||
};
|
||||
|
||||
IMP_PYCALLBACK_BOOL_INTINT(wxPyPrintout, wxPrintout, OnBeginDocument);
|
||||
IMP_PYCALLBACK__(wxPyPrintout, wxPrintout, OnEndDocument);
|
||||
IMP_PYCALLBACK__(wxPyPrintout, wxPrintout, OnBeginPrinting);
|
||||
IMP_PYCALLBACK__(wxPyPrintout, wxPrintout, OnEndPrinting);
|
||||
IMP_PYCALLBACK__(wxPyPrintout, wxPrintout, OnPreparePrinting);
|
||||
IMP_PYCALLBACK_BOOL_INT_pure(wxPyPrintout, wxPrintout, OnPrintPage);
|
||||
IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
@@ -4497,6 +4508,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_unsigned_long","_long",0},
|
||||
{ "_class_wxRect","_wxRect",0},
|
||||
{ "_class_wxDC","_wxDC",0},
|
||||
{ "_wxScrollWinEvent","_class_wxScrollWinEvent",0},
|
||||
{ "_class_wxProgressDialog","_wxProgressDialog",0},
|
||||
{ "_class_wxDirDialog","_wxDirDialog",0},
|
||||
{ "_class_wxPyTimer","_wxPyTimer",0},
|
||||
@@ -4599,6 +4611,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxWindowID","_int",0},
|
||||
{ "_wxWindowID","_signed_int",0},
|
||||
{ "_wxWindowID","_unsigned_int",0},
|
||||
{ "_class_wxScrollWinEvent","_wxScrollWinEvent",0},
|
||||
{ "_int","_wxPrintQuality",0},
|
||||
{ "_int","_size_t",0},
|
||||
{ "_int","_EBool",0},
|
||||
|
Reference in New Issue
Block a user