PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
type, otype);
}
- Py_DECREF(str);
+ if (str)
+ Py_DECREF(str);
return;
}
}
static PyObject *wxPen_GetDashes(wxPen *self){
wxDash* dashes;
int count = self->GetDashes(&dashes);
- bool blocked = wxPyBeginBlockThreads();
+ wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* retval = PyList_New(0);
for (int x=0; x<count; x++) {
PyObject* pyint = PyInt_FromLong(dashes[x]);
return retval;
}
static void wxPen__SetDashes(wxPen *self,PyObject *_self,PyObject *pyDashes){
- bool blocked = wxPyBeginBlockThreads();
+ wxPyBlock_t blocked = wxPyBeginBlockThreads();
int size = PyList_Size(pyDashes);
wxDash* dashes = (wxDash*)byte_LIST_helper(pyDashes);
}
}
static wxFont *new_wxFont(wxString const &info){
- wxNativeFontInfo nfi;
- nfi.FromString(info);
- return new wxFont(nfi);
- }
+ wxNativeFontInfo nfi;
+ nfi.FromString(info);
+ return new wxFont(nfi);
+ }
static wxFont *new_wxFont(int pointSize,wxFontFamily family,int flags=wxFONTFLAG_DEFAULT,wxString const &face=wxPyEmptyString,wxFontEncoding encoding=wxFONTENCODING_DEFAULT){
- return wxFont::New(pointSize, family, flags, face, encoding);
- }
+ return wxFont::New(pointSize, family, flags, face, encoding);
+ }
static wxFont *new_wxFont(wxSize const &pixelSize,int family,int style,int weight,bool underlined=false,wxString const &face=wxEmptyString,wxFontEncoding encoding=wxFONTENCODING_DEFAULT){
- return wxFontBase::New(pixelSize, family,
- style, weight, underlined,
- face, encoding);
- }
+ return wxFontBase::New(pixelSize, family,
+ style, weight, underlined,
+ face, encoding);
+ }
+static wxFont *new_wxFont(wxSize const &pixelSize,wxFontFamily family,int flags=wxFONTFLAG_DEFAULT,wxString const &face=wxEmptyString,wxFontEncoding encoding=wxFONTENCODING_DEFAULT){
+ return wxFontBase::New(pixelSize, family, flags, face, encoding);
+ }
static bool wxFont___eq__(wxFont *self,wxFont const *other){ return other ? (*self == *other) : false; }
static bool wxFont___ne__(wxFont *self,wxFont const *other){ return other ? (*self != *other) : true; }
}
+static PyObject *_wrap_new_BrushFromBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
+ PyObject *resultobj;
+ wxBitmap *arg1 = 0 ;
+ wxBrush *result;
+ PyObject * obj0 = 0 ;
+ char *kwnames[] = {
+ (char *) "stippleBitmap", NULL
+ };
+
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_BrushFromBitmap",kwnames,&obj0)) goto fail;
+ {
+ SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0);
+ if (SWIG_arg_fail(1)) SWIG_fail;
+ if (arg1 == NULL) {
+ SWIG_null_ref("wxBitmap");
+ }
+ if (SWIG_arg_fail(1)) SWIG_fail;
+ }
+ {
+ if (!wxPyCheckForApp()) SWIG_fail;
+ PyThreadState* __tstate = wxPyBeginAllowThreads();
+ result = (wxBrush *)new wxBrush((wxBitmap const &)*arg1);
+
+ wxPyEndAllowThreads(__tstate);
+ if (PyErr_Occurred()) SWIG_fail;
+ }
+ resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBrush, 1);
+ return resultobj;
+ fail:
+ return NULL;
+}
+
+
static PyObject *_wrap_delete_Brush(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxBrush *arg1 = (wxBrush *) 0 ;
}
-static PyObject *_wrap_new_Font2(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FFont(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
int arg1 ;
wxFontFamily arg2 ;
(char *) "pointSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_Font2",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_FFont",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
{
arg1 = (int)(SWIG_As_int(obj0));
if (SWIG_arg_fail(1)) SWIG_fail;
}
+static PyObject *_wrap_new_FFontFromPixelSize(PyObject *, PyObject *args, PyObject *kwargs) {
+ PyObject *resultobj;
+ wxSize *arg1 = 0 ;
+ wxFontFamily arg2 ;
+ int arg3 = (int) wxFONTFLAG_DEFAULT ;
+ wxString const &arg4_defvalue = wxEmptyString ;
+ wxString *arg4 = (wxString *) &arg4_defvalue ;
+ wxFontEncoding arg5 = (wxFontEncoding) wxFONTENCODING_DEFAULT ;
+ wxFont *result;
+ wxSize temp1 ;
+ bool temp4 = false ;
+ PyObject * obj0 = 0 ;
+ PyObject * obj1 = 0 ;
+ PyObject * obj2 = 0 ;
+ PyObject * obj3 = 0 ;
+ PyObject * obj4 = 0 ;
+ char *kwnames[] = {
+ (char *) "pixelSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL
+ };
+
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_FFontFromPixelSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+ {
+ arg1 = &temp1;
+ if ( ! wxSize_helper(obj0, &arg1)) SWIG_fail;
+ }
+ {
+ arg2 = (wxFontFamily)(SWIG_As_int(obj1));
+ if (SWIG_arg_fail(2)) SWIG_fail;
+ }
+ if (obj2) {
+ {
+ arg3 = (int)(SWIG_As_int(obj2));
+ if (SWIG_arg_fail(3)) SWIG_fail;
+ }
+ }
+ if (obj3) {
+ {
+ arg4 = wxString_in_helper(obj3);
+ if (arg4 == NULL) SWIG_fail;
+ temp4 = true;
+ }
+ }
+ if (obj4) {
+ {
+ arg5 = (wxFontEncoding)(SWIG_As_int(obj4));
+ if (SWIG_arg_fail(5)) SWIG_fail;
+ }
+ }
+ {
+ if (!wxPyCheckForApp()) SWIG_fail;
+ PyThreadState* __tstate = wxPyBeginAllowThreads();
+ result = (wxFont *)new_wxFont((wxSize const &)*arg1,(wxFontFamily )arg2,arg3,(wxString const &)*arg4,(wxFontEncoding )arg5);
+
+ wxPyEndAllowThreads(__tstate);
+ if (PyErr_Occurred()) SWIG_fail;
+ }
+ resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 1);
+ {
+ if (temp4)
+ delete arg4;
+ }
+ return resultobj;
+ fail:
+ {
+ if (temp4)
+ delete arg4;
+ }
+ return NULL;
+}
+
+
static PyObject *_wrap_Font_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxFont *arg1 = (wxFont *) 0 ;
static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) {
PyObject *resultobj;
wxDC *arg1 = (wxDC *) 0 ;
- wxBitmap *arg2 = 0 ;
+ wxBitmap const &arg2_defvalue = wxNullBitmap ;
+ wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
int arg3 = (int) wxBUFFER_CLIENT_AREA ;
wxBufferedDC *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
- if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail;
+ if(!PyArg_ParseTuple(args,(char *)"O|OO:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail;
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
- {
- SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0);
- if (SWIG_arg_fail(2)) SWIG_fail;
- if (arg2 == NULL) {
- SWIG_null_ref("wxBitmap");
+ if (obj1) {
+ {
+ SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0);
+ if (SWIG_arg_fail(2)) SWIG_fail;
+ if (arg2 == NULL) {
+ SWIG_null_ref("wxBitmap");
+ }
+ if (SWIG_arg_fail(2)) SWIG_fail;
}
- if (SWIG_arg_fail(2)) SWIG_fail;
}
if (obj2) {
{
for (ii = 0; (ii < argc) && (ii < 3); ii++) {
argv[ii] = PyTuple_GetItem(args,ii);
}
- if ((argc >= 2) && (argc <= 3)) {
+ if ((argc >= 1) && (argc <= 3)) {
int _v;
{
void *ptr;
}
}
if (_v) {
+ if (argc <= 1) {
+ return _wrap_new_BufferedDC__SWIG_0(self,args);
+ }
{
void *ptr = 0;
if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) {
PyObject *resultobj;
wxBrushList *arg1 = (wxBrushList *) 0 ;
wxColour *arg2 = 0 ;
- int arg3 ;
+ int arg3 = (int) wxSOLID ;
wxBrush *result;
wxColour temp2 ;
PyObject * obj0 = 0 ;
(char *) "self",(char *) "colour",(char *) "style", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BrushList_FindOrCreateBrush",kwnames,&obj0,&obj1,&obj2)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:BrushList_FindOrCreateBrush",kwnames,&obj0,&obj1,&obj2)) goto fail;
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBrushList, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
{
arg2 = &temp2;
if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
}
- {
- arg3 = (int)(SWIG_As_int(obj2));
- if (SWIG_arg_fail(3)) SWIG_fail;
+ if (obj2) {
+ {
+ arg3 = (int)(SWIG_As_int(obj2));
+ if (SWIG_arg_fail(3)) SWIG_fail;
+ }
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
{ (char *)"Pen___ne__", (PyCFunction) _wrap_Pen___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Pen_swigregister", Pen_swigregister, METH_VARARGS, NULL},
{ (char *)"new_Brush", (PyCFunction) _wrap_new_Brush, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"new_BrushFromBitmap", (PyCFunction) _wrap_new_BrushFromBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"delete_Brush", (PyCFunction) _wrap_delete_Brush, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Brush_SetColour", (PyCFunction) _wrap_Brush_SetColour, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Brush_SetStyle", (PyCFunction) _wrap_Brush_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"delete_Font", (PyCFunction) _wrap_delete_Font, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"new_FontFromNativeInfo", (PyCFunction) _wrap_new_FontFromNativeInfo, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"new_FontFromNativeInfoString", (PyCFunction) _wrap_new_FontFromNativeInfoString, METH_VARARGS | METH_KEYWORDS, NULL},
- { (char *)"new_Font2", (PyCFunction) _wrap_new_Font2, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"new_FFont", (PyCFunction) _wrap_new_FFont, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"new_FontFromPixelSize", (PyCFunction) _wrap_new_FontFromPixelSize, METH_VARARGS | METH_KEYWORDS, NULL},
+ { (char *)"new_FFontFromPixelSize", (PyCFunction) _wrap_new_FFontFromPixelSize, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Font_Ok", (PyCFunction) _wrap_Font_Ok, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Font___eq__", (PyCFunction) _wrap_Font___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Font___ne__", (PyCFunction) _wrap_Font___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
projects / wxWidgets.git / blobdiff