cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some tweaks and cleanup.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2001-04-30 18:37:26 +00:00
parent ed1ae3fb27
commit 926bb76c2a
14 changed files with 1009 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wxPython/BUILD.win32.txt
View File

@ -95,8 +95,9 @@ D. Change to the wx2\include\wx\msw directory and copy setup0.h to
** NEW **
Be sure that wxUSE_GLCANVAS is defined to be 0 as wxPython now
keeps its own copy of the glcanvas sources and expects that it is
not in the main library. This is reduce the number of dependant
DLLs on the core library and therefore help reduce startup time.
not in the main library. This is done to reduce the number of
dependant DLLs on the core library and therefore help reduce
startup time.

35
wxPython/setup.py
View File

@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
# flags and values that affect this script
#----------------------------------------------------------------------
VERSION = "2.3b3"
VERSION = "2.3b4"
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
AUTHOR_EMAIL = "robin@alldunn.com"
@ -31,6 +31,8 @@ on.
BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
BUILD_OGL = 1 # If true, build the contrib/ogl extension module
BUILD_STC = 1 # If true, build the contrib/stc extension module
BUILD_IEWIN = 0 # Internet Explorer wrapper (experimental)
CORE_ONLY = 0 # if true, don't build any of the above
GL_ONLY = 0 # Only used when making the -gl RPM. See the "b" script
# for the ugly details
@ -538,6 +540,37 @@ if not GL_ONLY and BUILD_STC:
#----------------------------------------------------------------------
# Define the IEWIN extension module (experimental)
#----------------------------------------------------------------------
if not GL_ONLY and BUILD_IEWIN:
print 'Preparing IEWIN...'
location = 'contrib/iewin'
swig_files = ['iewin.i', ]
swig_sources = run_swig(swig_files, location, '', PKGDIR,
USE_SWIG, swig_force, swig_args)
ext = Extension('iewinc', ['%s/IEHtmlWin.cpp' % location,
] + swig_sources,
include_dirs = includes,
define_macros = defines,
library_dirs = libdirs,
libraries = libs,
extra_compile_args = cflags,
extra_link_args = lflags,
)
wxpExtensions.append(ext)
#----------------------------------------------------------------------
# Do the Setup/Build/Install/Whatever
#----------------------------------------------------------------------

2
wxPython/src/gdi.i
View File

@ -31,7 +31,6 @@
%import _defs.i
%import misc.i
%{
static wxString wxPyEmptyStr("");
%}
@ -159,6 +158,7 @@ public:
}
#ifdef __WXMSW__
wxBitmap* wxBitmapFromData(PyObject* data, long type,
int width, int height, int depth = 1) {

16
wxPython/src/image.i
View File

@ -96,6 +96,9 @@ public:
~wxImage();
wxBitmap ConvertToBitmap();
#ifdef __WXGTK__
wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;
#endif
void Create( int width, int height );
void Destroy();
wxImage Scale( int width, int height );
@ -169,6 +172,7 @@ public:
static bool RemoveHandler( const wxString& name );
};
// Alternate constructors
%new wxImage* wxEmptyImage(int width=0, int height=0);
%new wxImage* wxImageFromMime(const wxString& name, const wxString& mimetype);
@ -208,4 +212,16 @@ extern wxImage wxNullImage;
//---------------------------------------------------------------------------
// This one is here to avoid circular imports
%new wxBitmap* wxBitmapFromImage(const wxImage& img, int depth=-1);
%{
wxBitmap* wxBitmapFromImage(const wxImage& img, int depth=-1) {
return new wxBitmap(img, depth);
}
%}
//---------------------------------------------------------------------------

1
wxPython/src/msw/gdi.cpp
View File

@ -153,6 +153,7 @@ static char* wxStringErrorMsg = "string type is required for parameter";
}
#ifdef __WXMSW__
wxBitmap* wxBitmapFromData(PyObject* data, long type,
int width, int height, int depth = 1) {

40
wxPython/src/msw/image.cpp
View File

@ -125,6 +125,11 @@ static char* wxStringErrorMsg = "string type is required for parameter";
extern wxImage wxNullImage;
#endif
wxBitmap* wxBitmapFromImage(const wxImage& img, int depth=-1) {
return new wxBitmap(img, depth);
}
#ifdef __cplusplus
extern "C" {
#endif
@ -291,6 +296,40 @@ static PyObject *_wrap_wxNullImage_get() {
return pyobj;
}
static PyObject *_wrap_wxBitmapFromImage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxBitmap * _result;
wxImage * _arg0;
int _arg1 = (int ) -1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "img","depth", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxBitmapFromImage",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapFromImage. Expected _wxImage_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxBitmap *)wxBitmapFromImage(*_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
#define wxImageHandler_GetName(_swigobj) (_swigobj->GetName())
static PyObject *_wrap_wxImageHandler_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@ -2222,6 +2261,7 @@ static PyMethodDef imagecMethods[] = {
{ "wxImageHandler_GetType", (PyCFunction) _wrap_wxImageHandler_GetType, METH_VARARGS | METH_KEYWORDS },
{ "wxImageHandler_GetExtension", (PyCFunction) _wrap_wxImageHandler_GetExtension, METH_VARARGS | METH_KEYWORDS },
{ "wxImageHandler_GetName", (PyCFunction) _wrap_wxImageHandler_GetName, METH_VARARGS | METH_KEYWORDS },
{ "wxBitmapFromImage", (PyCFunction) _wrap_wxBitmapFromImage, METH_VARARGS | METH_KEYWORDS },
{ "wxInitAllImageHandlers", (PyCFunction) _wrap_wxInitAllImageHandlers, METH_VARARGS | METH_KEYWORDS },
{ "wxImageFromBitmap", (PyCFunction) _wrap_wxImageFromBitmap, METH_VARARGS | METH_KEYWORDS },
{ "wxImageFromMime", (PyCFunction) _wrap_wxImageFromMime, METH_VARARGS | METH_KEYWORDS },

5
wxPython/src/msw/image.py
View File

@ -281,6 +281,11 @@ def wxImageFromBitmap(*_args, **_kwargs):
wxInitAllImageHandlers = imagec.wxInitAllImageHandlers
def wxBitmapFromImage(*_args, **_kwargs):
val = apply(imagec.wxBitmapFromImage,_args,_kwargs)
if val: val = wxBitmapPtr(val); val.thisown = 1
return val
wxImage_CanRead = imagec.wxImage_CanRead
wxImage_AddHandler = imagec.wxImage_AddHandler

770
wxPython/src/msw/printfw.cpp
View File

@ -761,6 +761,754 @@ static PyObject *_wrap_wxPrintData_SetQuality(PyObject *self, PyObject *args, Py
return _resultobj;
}
#define wxPrintData_GetPrinterCommand(_swigobj) (_swigobj->GetPrinterCommand())
static PyObject *_wrap_wxPrintData_GetPrinterCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
wxPrintData * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetPrinterCommand",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetPrinterCommand. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
const wxString & _result_ref = wxPrintData_GetPrinterCommand(_arg0);
_result = (wxString *) &_result_ref;
wxPy_END_ALLOW_THREADS;
}{
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
return _resultobj;
}
#define wxPrintData_GetPrinterOptions(_swigobj) (_swigobj->GetPrinterOptions())
static PyObject *_wrap_wxPrintData_GetPrinterOptions(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
wxPrintData * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetPrinterOptions",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetPrinterOptions. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
const wxString & _result_ref = wxPrintData_GetPrinterOptions(_arg0);
_result = (wxString *) &_result_ref;
wxPy_END_ALLOW_THREADS;
}{
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
return _resultobj;
}
#define wxPrintData_GetPreviewCommand(_swigobj) (_swigobj->GetPreviewCommand())
static PyObject *_wrap_wxPrintData_GetPreviewCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
wxPrintData * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetPreviewCommand",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetPreviewCommand. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
const wxString & _result_ref = wxPrintData_GetPreviewCommand(_arg0);
_result = (wxString *) &_result_ref;
wxPy_END_ALLOW_THREADS;
}{
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
return _resultobj;
}
#define wxPrintData_GetFilename(_swigobj) (_swigobj->GetFilename())
static PyObject *_wrap_wxPrintData_GetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
wxPrintData * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetFilename",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetFilename. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
const wxString & _result_ref = wxPrintData_GetFilename(_arg0);
_result = (wxString *) &_result_ref;
wxPy_END_ALLOW_THREADS;
}{
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
return _resultobj;
}
#define wxPrintData_GetFontMetricPath(_swigobj) (_swigobj->GetFontMetricPath())
static PyObject *_wrap_wxPrintData_GetFontMetricPath(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
wxPrintData * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetFontMetricPath",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetFontMetricPath. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
const wxString & _result_ref = wxPrintData_GetFontMetricPath(_arg0);
_result = (wxString *) &_result_ref;
wxPy_END_ALLOW_THREADS;
}{
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
return _resultobj;
}
#define wxPrintData_GetPrinterScaleX(_swigobj) (_swigobj->GetPrinterScaleX())
static PyObject *_wrap_wxPrintData_GetPrinterScaleX(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
double _result;
wxPrintData * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetPrinterScaleX",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetPrinterScaleX. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (double )wxPrintData_GetPrinterScaleX(_arg0);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("d",_result);
return _resultobj;
}
#define wxPrintData_GetPrinterScaleY(_swigobj) (_swigobj->GetPrinterScaleY())
static PyObject *_wrap_wxPrintData_GetPrinterScaleY(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
double _result;
wxPrintData * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetPrinterScaleY",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetPrinterScaleY. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (double )wxPrintData_GetPrinterScaleY(_arg0);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("d",_result);
return _resultobj;
}
#define wxPrintData_GetPrinterTranslateX(_swigobj) (_swigobj->GetPrinterTranslateX())
static PyObject *_wrap_wxPrintData_GetPrinterTranslateX(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
long _result;
wxPrintData * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetPrinterTranslateX",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetPrinterTranslateX. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (long )wxPrintData_GetPrinterTranslateX(_arg0);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("l",_result);
return _resultobj;
}
#define wxPrintData_GetPrinterTranslateY(_swigobj) (_swigobj->GetPrinterTranslateY())
static PyObject *_wrap_wxPrintData_GetPrinterTranslateY(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
long _result;
wxPrintData * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetPrinterTranslateY",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetPrinterTranslateY. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (long )wxPrintData_GetPrinterTranslateY(_arg0);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("l",_result);
return _resultobj;
}
#define wxPrintData_GetPrintMode(_swigobj) (_swigobj->GetPrintMode())
static PyObject *_wrap_wxPrintData_GetPrintMode(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPrintMode * _result;
wxPrintData * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetPrintMode",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_GetPrintMode. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = new wxPrintMode (wxPrintData_GetPrintMode(_arg0));
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxPrintMode_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
#define wxPrintData_SetPrinterCommand(_swigobj,_swigarg0) (_swigobj->SetPrinterCommand(_swigarg0))
static PyObject *_wrap_wxPrintData_SetPrinterCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPrintData * _arg0;
wxString * _arg1;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","command", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintData_SetPrinterCommand",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPrinterCommand. Expected _wxPrintData_p.");
return NULL;
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
return NULL;
}
if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg1 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPrintData_SetPrinterCommand(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
if (_obj1)
delete _arg1;
}
return _resultobj;
}
#define wxPrintData_SetPrinterOptions(_swigobj,_swigarg0) (_swigobj->SetPrinterOptions(_swigarg0))
static PyObject *_wrap_wxPrintData_SetPrinterOptions(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPrintData * _arg0;
wxString * _arg1;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","options", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintData_SetPrinterOptions",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPrinterOptions. Expected _wxPrintData_p.");
return NULL;
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
return NULL;
}
if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg1 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPrintData_SetPrinterOptions(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
if (_obj1)
delete _arg1;
}
return _resultobj;
}
#define wxPrintData_SetPreviewCommand(_swigobj,_swigarg0) (_swigobj->SetPreviewCommand(_swigarg0))
static PyObject *_wrap_wxPrintData_SetPreviewCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPrintData * _arg0;
wxString * _arg1;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","command", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintData_SetPreviewCommand",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPreviewCommand. Expected _wxPrintData_p.");
return NULL;
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
return NULL;
}
if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg1 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPrintData_SetPreviewCommand(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
if (_obj1)
delete _arg1;
}
return _resultobj;
}
#define wxPrintData_SetFilename(_swigobj,_swigarg0) (_swigobj->SetFilename(_swigarg0))
static PyObject *_wrap_wxPrintData_SetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPrintData * _arg0;
wxString * _arg1;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","filename", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintData_SetFilename",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetFilename. Expected _wxPrintData_p.");
return NULL;
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
return NULL;
}
if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg1 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPrintData_SetFilename(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
if (_obj1)
delete _arg1;
}
return _resultobj;
}
#define wxPrintData_SetFontMetricPath(_swigobj,_swigarg0) (_swigobj->SetFontMetricPath(_swigarg0))
static PyObject *_wrap_wxPrintData_SetFontMetricPath(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPrintData * _arg0;
wxString * _arg1;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","path", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintData_SetFontMetricPath",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetFontMetricPath. Expected _wxPrintData_p.");
return NULL;
}
}
{
#if PYTHON_API_VERSION >= 1009
char* tmpPtr; int tmpSize;
if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
return NULL;
}
if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
return NULL;
_arg1 = new wxString(tmpPtr, tmpSize);
#else
if (!PyString_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
#endif
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPrintData_SetFontMetricPath(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
if (_obj1)
delete _arg1;
}
return _resultobj;
}
#define wxPrintData_SetPrinterScaleX(_swigobj,_swigarg0) (_swigobj->SetPrinterScaleX(_swigarg0))
static PyObject *_wrap_wxPrintData_SetPrinterScaleX(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPrintData * _arg0;
double _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","x", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Od:wxPrintData_SetPrinterScaleX",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPrinterScaleX. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPrintData_SetPrinterScaleX(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxPrintData_SetPrinterScaleY(_swigobj,_swigarg0) (_swigobj->SetPrinterScaleY(_swigarg0))
static PyObject *_wrap_wxPrintData_SetPrinterScaleY(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPrintData * _arg0;
double _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","y", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Od:wxPrintData_SetPrinterScaleY",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPrinterScaleY. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPrintData_SetPrinterScaleY(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxPrintData_SetPrinterScaling(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetPrinterScaling(_swigarg0,_swigarg1))
static PyObject *_wrap_wxPrintData_SetPrinterScaling(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPrintData * _arg0;
double _arg1;
double _arg2;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","x","y", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd:wxPrintData_SetPrinterScaling",_kwnames,&_argo0,&_arg1,&_arg2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPrinterScaling. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPrintData_SetPrinterScaling(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxPrintData_SetPrinterTranslateX(_swigobj,_swigarg0) (_swigobj->SetPrinterTranslateX(_swigarg0))
static PyObject *_wrap_wxPrintData_SetPrinterTranslateX(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPrintData * _arg0;
long _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","x", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxPrintData_SetPrinterTranslateX",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPrinterTranslateX. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPrintData_SetPrinterTranslateX(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxPrintData_SetPrinterTranslateY(_swigobj,_swigarg0) (_swigobj->SetPrinterTranslateY(_swigarg0))
static PyObject *_wrap_wxPrintData_SetPrinterTranslateY(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPrintData * _arg0;
long _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","y", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxPrintData_SetPrinterTranslateY",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPrinterTranslateY. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPrintData_SetPrinterTranslateY(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxPrintData_SetPrinterTranslation(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetPrinterTranslation(_swigarg0,_swigarg1))
static PyObject *_wrap_wxPrintData_SetPrinterTranslation(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPrintData * _arg0;
long _arg1;
long _arg2;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","x","y", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxPrintData_SetPrinterTranslation",_kwnames,&_argo0,&_arg1,&_arg2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPrinterTranslation. Expected _wxPrintData_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPrintData_SetPrinterTranslation(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxPrintData_SetPrintMode(_swigobj,_swigarg0) (_swigobj->SetPrintMode(_swigarg0))
static PyObject *_wrap_wxPrintData_SetPrintMode(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPrintData * _arg0;
wxPrintMode * _arg1;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "self","printMode", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintData_SetPrintMode",_kwnames,&_argo0,&_argo1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPrintData_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPrintData_SetPrintMode. Expected _wxPrintData_p.");
return NULL;
}
}
if (_argo1) {
if (_argo1 == Py_None) { _arg1 = NULL; }
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPrintMode_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintData_SetPrintMode. Expected _wxPrintMode_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxPrintData_SetPrintMode(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static void *SwigwxPrinterDCTowxDC(void *ptr) {
wxPrinterDC *src;
wxDC *dest;
@ -4480,6 +5228,28 @@ static PyMethodDef printfwcMethods[] = {
{ "new_wxPageSetupDialogData", (PyCFunction) _wrap_new_wxPageSetupDialogData, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPrinterDC2", (PyCFunction) _wrap_new_wxPrinterDC2, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPrinterDC", (PyCFunction) _wrap_new_wxPrinterDC, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetPrintMode", (PyCFunction) _wrap_wxPrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetPrinterTranslation", (PyCFunction) _wrap_wxPrintData_SetPrinterTranslation, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetPrinterTranslateY", (PyCFunction) _wrap_wxPrintData_SetPrinterTranslateY, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetPrinterTranslateX", (PyCFunction) _wrap_wxPrintData_SetPrinterTranslateX, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetPrinterScaling", (PyCFunction) _wrap_wxPrintData_SetPrinterScaling, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetPrinterScaleY", (PyCFunction) _wrap_wxPrintData_SetPrinterScaleY, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetPrinterScaleX", (PyCFunction) _wrap_wxPrintData_SetPrinterScaleX, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetFontMetricPath", (PyCFunction) _wrap_wxPrintData_SetFontMetricPath, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetFilename", (PyCFunction) _wrap_wxPrintData_SetFilename, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetPreviewCommand", (PyCFunction) _wrap_wxPrintData_SetPreviewCommand, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetPrinterOptions", (PyCFunction) _wrap_wxPrintData_SetPrinterOptions, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetPrinterCommand", (PyCFunction) _wrap_wxPrintData_SetPrinterCommand, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_GetPrintMode", (PyCFunction) _wrap_wxPrintData_GetPrintMode, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_GetPrinterTranslateY", (PyCFunction) _wrap_wxPrintData_GetPrinterTranslateY, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_GetPrinterTranslateX", (PyCFunction) _wrap_wxPrintData_GetPrinterTranslateX, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_GetPrinterScaleY", (PyCFunction) _wrap_wxPrintData_GetPrinterScaleY, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_GetPrinterScaleX", (PyCFunction) _wrap_wxPrintData_GetPrinterScaleX, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_GetFontMetricPath", (PyCFunction) _wrap_wxPrintData_GetFontMetricPath, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_GetFilename", (PyCFunction) _wrap_wxPrintData_GetFilename, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_GetPreviewCommand", (PyCFunction) _wrap_wxPrintData_GetPreviewCommand, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_GetPrinterOptions", (PyCFunction) _wrap_wxPrintData_GetPrinterOptions, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_GetPrinterCommand", (PyCFunction) _wrap_wxPrintData_GetPrinterCommand, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetQuality", (PyCFunction) _wrap_wxPrintData_SetQuality, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetPaperSize", (PyCFunction) _wrap_wxPrintData_SetPaperSize, METH_VARARGS | METH_KEYWORDS },
{ "wxPrintData_SetPaperId", (PyCFunction) _wrap_wxPrintData_SetPaperId, METH_VARARGS | METH_KEYWORDS },

66
wxPython/src/msw/printfw.py
View File

@ -81,6 +81,72 @@ class wxPrintDataPtr :
def SetQuality(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_SetQuality,(self,) + _args, _kwargs)
return val
def GetPrinterCommand(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_GetPrinterCommand,(self,) + _args, _kwargs)
return val
def GetPrinterOptions(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_GetPrinterOptions,(self,) + _args, _kwargs)
return val
def GetPreviewCommand(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_GetPreviewCommand,(self,) + _args, _kwargs)
return val
def GetFilename(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_GetFilename,(self,) + _args, _kwargs)
return val
def GetFontMetricPath(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_GetFontMetricPath,(self,) + _args, _kwargs)
return val
def GetPrinterScaleX(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_GetPrinterScaleX,(self,) + _args, _kwargs)
return val
def GetPrinterScaleY(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_GetPrinterScaleY,(self,) + _args, _kwargs)
return val
def GetPrinterTranslateX(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_GetPrinterTranslateX,(self,) + _args, _kwargs)
return val
def GetPrinterTranslateY(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_GetPrinterTranslateY,(self,) + _args, _kwargs)
return val
def GetPrintMode(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_GetPrintMode,(self,) + _args, _kwargs)
return val
def SetPrinterCommand(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_SetPrinterCommand,(self,) + _args, _kwargs)
return val
def SetPrinterOptions(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_SetPrinterOptions,(self,) + _args, _kwargs)
return val
def SetPreviewCommand(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_SetPreviewCommand,(self,) + _args, _kwargs)
return val
def SetFilename(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_SetFilename,(self,) + _args, _kwargs)
return val
def SetFontMetricPath(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_SetFontMetricPath,(self,) + _args, _kwargs)
return val
def SetPrinterScaleX(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_SetPrinterScaleX,(self,) + _args, _kwargs)
return val
def SetPrinterScaleY(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_SetPrinterScaleY,(self,) + _args, _kwargs)
return val
def SetPrinterScaling(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_SetPrinterScaling,(self,) + _args, _kwargs)
return val
def SetPrinterTranslateX(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_SetPrinterTranslateX,(self,) + _args, _kwargs)
return val
def SetPrinterTranslateY(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_SetPrinterTranslateY,(self,) + _args, _kwargs)
return val
def SetPrinterTranslation(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_SetPrinterTranslation,(self,) + _args, _kwargs)
return val
def SetPrintMode(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_SetPrintMode,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxPrintData instance at %s>" % (self.this,)
class wxPrintData(wxPrintDataPtr):

36
wxPython/src/msw/windows.cpp
View File

@ -693,6 +693,35 @@ static PyObject *_wrap_wxEvtHandler_Disconnect(PyObject *self, PyObject *args, P
return _resultobj;
}
static const char * wxEvtHandler_GetClassName(wxEvtHandler *self) {
return self->GetClassInfo()->GetClassName();
}
static PyObject *_wrap_wxEvtHandler_GetClassName(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
char * _result;
wxEvtHandler * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvtHandler_GetClassName",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvtHandler_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvtHandler_GetClassName. Expected _wxEvtHandler_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (char *)wxEvtHandler_GetClassName(_arg0);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("s", _result);
return _resultobj;
}
static void *SwigwxValidatorTowxEvtHandler(void *ptr) {
wxValidator *src;
wxEvtHandler *dest;
@ -6636,15 +6665,14 @@ static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args, PyObject *k
int _arg1;
wxString * _arg2;
wxString * _arg3 = (wxString *) &wxPyEmptyStr;
bool _arg4 = (bool ) FALSE;
int _arg4 = (int ) FALSE;
PyObject * _argo0 = 0;
PyObject * _obj2 = 0;
PyObject * _obj3 = 0;
int tempbool4 = (int) FALSE;
char *_kwnames[] = { "self","id","item","helpString","checkable", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|Oi:wxMenu_Append",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&tempbool4))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|Oi:wxMenu_Append",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@ -6690,7 +6718,6 @@ static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args, PyObject *k
_arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
#endif
}
_arg4 = (bool ) tempbool4;
{
wxPy_BEGIN_ALLOW_THREADS;
wxMenu_Append(_arg0,_arg1,*_arg2,*_arg3,_arg4);
@ -10349,6 +10376,7 @@ static PyMethodDef windowscMethods[] = {
{ "wxValidator_GetWindow", (PyCFunction) _wrap_wxValidator_GetWindow, METH_VARARGS | METH_KEYWORDS },
{ "wxValidator_Clone", (PyCFunction) _wrap_wxValidator_Clone, METH_VARARGS | METH_KEYWORDS },
{ "new_wxValidator", (PyCFunction) _wrap_new_wxValidator, METH_VARARGS | METH_KEYWORDS },
{ "wxEvtHandler_GetClassName", (PyCFunction) _wrap_wxEvtHandler_GetClassName, METH_VARARGS | METH_KEYWORDS },
{ "wxEvtHandler_Disconnect", (PyCFunction) _wrap_wxEvtHandler_Disconnect, METH_VARARGS | METH_KEYWORDS },
{ "wxEvtHandler_Connect", (PyCFunction) _wrap_wxEvtHandler_Connect, METH_VARARGS | METH_KEYWORDS },
{ "wxEvtHandler_SetPreviousHandler", (PyCFunction) _wrap_wxEvtHandler_SetPreviousHandler, METH_VARARGS | METH_KEYWORDS },

6
wxPython/src/msw/windows.py
View File

@ -56,11 +56,11 @@ class wxEvtHandlerPtr :
def Disconnect(self, *_args, **_kwargs):
val = apply(windowsc.wxEvtHandler_Disconnect,(self,) + _args, _kwargs)
return val
def GetClassName(self, *_args, **_kwargs):
val = apply(windowsc.wxEvtHandler_GetClassName,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxEvtHandler instance at %s>" % (self.this,)
_prop_list_ = {}
class wxEvtHandler(wxEvtHandlerPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(windowsc.new_wxEvtHandler,_args,_kwargs)

46
wxPython/src/printfw.i
View File

@ -69,30 +69,30 @@ public:
void SetPaperSize(const wxSize& sz);
void SetQuality(wxPrintQuality quality);
// // PostScript-specific data
// const wxString& GetPrinterCommand();
// const wxString& GetPrinterOptions();
// const wxString& GetPreviewCommand();
// const wxString& GetFilename();
// const wxString& GetFontMetricPath();
// double GetPrinterScaleX();
// double GetPrinterScaleY();
// long GetPrinterTranslateX();
// long GetPrinterTranslateY();
// wxPrintMode GetPrintMode();
// PostScript-specific data
const wxString& GetPrinterCommand();
const wxString& GetPrinterOptions();
const wxString& GetPreviewCommand();
const wxString& GetFilename();
const wxString& GetFontMetricPath();
double GetPrinterScaleX();
double GetPrinterScaleY();
long GetPrinterTranslateX();
long GetPrinterTranslateY();
wxPrintMode GetPrintMode();
// void SetPrinterCommand(const wxString& command);
// void SetPrinterOptions(const wxString& options);
// void SetPreviewCommand(const wxString& command);
// void SetFilename(const wxString& filename);
// void SetFontMetricPath(const wxString& path);
// void SetPrinterScaleX(double x);
// void SetPrinterScaleY(double y);
// void SetPrinterScaling(double x, double y);
// void SetPrinterTranslateX(long x);
// void SetPrinterTranslateY(long y);
// void SetPrinterTranslation(long x, long y);
// void SetPrintMode(wxPrintMode printMode);
void SetPrinterCommand(const wxString& command);
void SetPrinterOptions(const wxString& options);
void SetPreviewCommand(const wxString& command);
void SetFilename(const wxString& filename);
void SetFontMetricPath(const wxString& path);
void SetPrinterScaleX(double x);
void SetPrinterScaleY(double y);
void SetPrinterScaling(double x, double y);
void SetPrinterTranslateX(long x);
void SetPrinterTranslateY(long y);
void SetPrinterTranslation(long x, long y);
void SetPrintMode(wxPrintMode printMode);
};

14
wxPython/src/windows.i
View File

@ -71,12 +71,16 @@ public:
&wxPyCallback::EventThunker);
}
// This really belongs in the wxObject base class. It's probably
// time to actually add it...
const char* GetClassName() {
return self->GetClassInfo()->GetClassName();
}
}
%pragma(python) addtoclass = "
_prop_list_ = {}
"
// %pragma(python) addtoclass = "
// _prop_list_ = {}
// "
// %pragma(python) addtoclass = "
// def __getattr__(self, name):
// pl = self._prop_list_
@ -604,7 +608,7 @@ public:
void Append(int id, const wxString& item,
const wxString& helpString = wxPyEmptyStr,
bool checkable = FALSE);
int checkable = FALSE);
%name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
const wxString& helpString = wxPyEmptyStr);
%name(AppendItem)void Append(const wxMenuItem* item);

11
wxPython/tools/img2xpm.py
View File

@ -8,7 +8,7 @@ Usage:
Options:
-o <dir> The directory to place the .xmp file(s), defaults to
-o <dir> The directory to place the .xpm file(s), defaults to
the current directory.
-m <#rrggbb> If the original image has a mask or transparency defined
@ -26,7 +26,11 @@ import sys, os, glob, getopt, string
from wxPython.wx import *
wxInitAllImageHandlers()
app = wxPySimpleApp() # just to let global initialization to take place...
if wxPlatform == "__WXGTK__":
app = wxPySimpleApp() # Blech! the GUI needs initialized before
# bitmaps can be created...
def convert(file, maskClr, outputDir, outputName):
if string.lower(os.path.splitext(file)[1]) == ".ico":
@ -96,9 +100,6 @@ def main(args):
if __name__ == "__main__":
if wxPlatform == "__WXGTK__":
app = wxPySimpleApp() # Blech! the GUI needs initialized before
# bitmaps can be created...
main(sys.argv[1:])