X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66af7a75406831dfcbae81728dce709efe2ed628..d0ee33f5c6908b4ac5e1364381f0ef00942e3936:/wxPython/src/msw/_core_wrap.cpp diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index e72e48bdb5..4756001676 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -2328,7 +2328,7 @@ static unsigned long wxImageHistogram_GetCount(wxImageHistogram *self,unsigned l wxImageHistogramEntry e = (*self)[key]; return e.value; } -static unsigned long wxImageHistogram_GetCountRGB(wxImageHistogram *self,unsigned char r,unsigned char g,unsigned char b){ +static unsigned long wxImageHistogram_GetCountRGB(wxImageHistogram *self,byte r,byte g,byte b){ unsigned long key = wxImageHistogram::MakeKey(r, g, b); wxImageHistogramEntry e = (*self)[key]; return e.value; @@ -2476,7 +2476,7 @@ static wxBitmap wxImage_ConvertToBitmap(wxImage *self,int depth=-1){ wxBitmap bitmap(*self, depth); return bitmap; } -static wxBitmap wxImage_ConvertToMonoBitmap(wxImage *self,unsigned char red,unsigned char green,unsigned char blue){ +static wxBitmap wxImage_ConvertToMonoBitmap(wxImage *self,byte red,byte green,byte blue){ wxImage mono = self->ConvertToMono( red, green, blue ); wxBitmap bitmap( mono, 1 ); return bitmap; @@ -2612,16 +2612,19 @@ static void wxSizeEvent_SetSize(wxSizeEvent *self,wxSize size){ static PyObject *wxDropFilesEvent_GetFiles(wxDropFilesEvent *self){ int count = self->GetNumberOfFiles(); wxString* files = self->GetFiles(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* list = PyList_New(count); if (!list) { PyErr_SetString(PyExc_MemoryError, "Can't allocate list of files!"); + wxPyEndBlockThreads(blocked); return NULL; } for (int i=0; iGetMenuItems(); return wxPy_ConvertList(&list); } +static void MenuBar_SetAutoWindowMenu(bool enable){} +static bool MenuBar_GetAutoWindowMenu(){ return false; } static const wxString wxPyControlNameStr(wxControlNameStr); static int wxItemContainer_Append(wxItemContainer *self,wxString const &item,PyObject *clientData=NULL){ if (clientData) { @@ -10227,9 +10232,9 @@ static PyObject *_wrap_new_ImageHistogram(PyObject *, PyObject *args, PyObject * static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - unsigned char arg1 ; - unsigned char arg2 ; - unsigned char arg3 ; + byte arg1 ; + byte arg2 ; + byte arg3 ; unsigned long result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -10240,15 +10245,15 @@ static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ImageHistogram_MakeKey",kwnames,&obj0,&obj1,&obj2)) goto fail; { - arg1 = (unsigned char)(SWIG_As_unsigned_SS_char(obj0)); + arg1 = (byte)(SWIG_As_unsigned_SS_char(obj0)); if (SWIG_arg_fail(1)) SWIG_fail; } { - arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { @@ -10270,18 +10275,18 @@ static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *, PyObject *args, PyObje static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImageHistogram *arg1 = (wxImageHistogram *) 0 ; - unsigned char *arg2 = (unsigned char *) 0 ; - unsigned char *arg3 = (unsigned char *) 0 ; - unsigned char *arg4 = (unsigned char *) 0 ; - unsigned char arg5 = (unsigned char) 1 ; - unsigned char arg6 = (unsigned char) 0 ; - unsigned char arg7 = (unsigned char) 0 ; + byte *arg2 = (byte *) 0 ; + byte *arg3 = (byte *) 0 ; + byte *arg4 = (byte *) 0 ; + byte arg5 = (byte) 1 ; + byte arg6 = (byte) 0 ; + byte arg7 = (byte) 0 ; bool result; - unsigned char temp2 ; + byte temp2 ; int res2 = 0 ; - unsigned char temp3 ; + byte temp3 ; int res3 = 0 ; - unsigned char temp4 ; + byte temp4 ; int res4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -10299,19 +10304,19 @@ static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *, PyObject if (SWIG_arg_fail(1)) SWIG_fail; if (obj1) { { - arg5 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg5 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(5)) SWIG_fail; } } if (obj2) { { - arg6 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg6 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(6)) SWIG_fail; } } if (obj3) { { - arg7 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg7 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(7)) SWIG_fail; } } @@ -10374,9 +10379,9 @@ static PyObject *_wrap_ImageHistogram_GetCount(PyObject *, PyObject *args, PyObj static PyObject *_wrap_ImageHistogram_GetCountRGB(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImageHistogram *arg1 = (wxImageHistogram *) 0 ; - unsigned char arg2 ; - unsigned char arg3 ; - unsigned char arg4 ; + byte arg2 ; + byte arg3 ; + byte arg4 ; unsigned long result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -10390,15 +10395,15 @@ static PyObject *_wrap_ImageHistogram_GetCountRGB(PyObject *, PyObject *args, Py SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHistogram, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { @@ -10902,14 +10907,16 @@ static PyObject *_wrap_Image_Create(PyObject *, PyObject *args, PyObject *kwargs wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; + bool arg4 = (bool) true ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "width",(char *) "height", NULL + (char *) "self",(char *) "width",(char *) "height",(char *) "clear", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Create",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Image_Create",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -10920,9 +10927,15 @@ static PyObject *_wrap_Image_Create(PyObject *, PyObject *args, PyObject *kwargs arg3 = (int)(SWIG_As_int(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } + if (obj3) { + { + arg4 = (bool)(SWIG_As_bool(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Create(arg2,arg3); + (arg1)->Create(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11156,9 +11169,9 @@ static PyObject *_wrap_Image_SetRGB(PyObject *, PyObject *args, PyObject *kwargs wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; - unsigned char arg4 ; - unsigned char arg5 ; - unsigned char arg6 ; + byte arg4 ; + byte arg5 ; + byte arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11181,15 +11194,15 @@ static PyObject *_wrap_Image_SetRGB(PyObject *, PyObject *args, PyObject *kwargs if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { - arg5 = (unsigned char)(SWIG_As_unsigned_SS_char(obj4)); + arg5 = (byte)(SWIG_As_unsigned_SS_char(obj4)); if (SWIG_arg_fail(5)) SWIG_fail; } { - arg6 = (unsigned char)(SWIG_As_unsigned_SS_char(obj5)); + arg6 = (byte)(SWIG_As_unsigned_SS_char(obj5)); if (SWIG_arg_fail(6)) SWIG_fail; } { @@ -11210,9 +11223,9 @@ static PyObject *_wrap_Image_SetRGBRect(PyObject *, PyObject *args, PyObject *kw PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; wxRect *arg2 = 0 ; - unsigned char arg3 ; - unsigned char arg4 ; - unsigned char arg5 ; + byte arg3 ; + byte arg4 ; + byte arg5 ; wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -11231,15 +11244,15 @@ static PyObject *_wrap_Image_SetRGBRect(PyObject *, PyObject *args, PyObject *kw if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { - arg5 = (unsigned char)(SWIG_As_unsigned_SS_char(obj4)); + arg5 = (byte)(SWIG_As_unsigned_SS_char(obj4)); if (SWIG_arg_fail(5)) SWIG_fail; } { @@ -11261,7 +11274,7 @@ static PyObject *_wrap_Image_GetRed(PyObject *, PyObject *args, PyObject *kwargs wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; - unsigned char result; + byte result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11282,7 +11295,7 @@ static PyObject *_wrap_Image_GetRed(PyObject *, PyObject *args, PyObject *kwargs } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (unsigned char)(arg1)->GetRed(arg2,arg3); + result = (byte)(arg1)->GetRed(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11301,7 +11314,7 @@ static PyObject *_wrap_Image_GetGreen(PyObject *, PyObject *args, PyObject *kwar wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; - unsigned char result; + byte result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11322,7 +11335,7 @@ static PyObject *_wrap_Image_GetGreen(PyObject *, PyObject *args, PyObject *kwar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (unsigned char)(arg1)->GetGreen(arg2,arg3); + result = (byte)(arg1)->GetGreen(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11341,7 +11354,7 @@ static PyObject *_wrap_Image_GetBlue(PyObject *, PyObject *args, PyObject *kwarg wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; - unsigned char result; + byte result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11362,7 +11375,7 @@ static PyObject *_wrap_Image_GetBlue(PyObject *, PyObject *args, PyObject *kwarg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (unsigned char)(arg1)->GetBlue(arg2,arg3); + result = (byte)(arg1)->GetBlue(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11381,7 +11394,7 @@ static PyObject *_wrap_Image_SetAlpha(PyObject *, PyObject *args, PyObject *kwar wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; - unsigned char arg4 ; + byte arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11402,7 +11415,7 @@ static PyObject *_wrap_Image_SetAlpha(PyObject *, PyObject *args, PyObject *kwar if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { @@ -11424,7 +11437,7 @@ static PyObject *_wrap_Image_GetAlpha(PyObject *, PyObject *args, PyObject *kwar wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; - unsigned char result; + byte result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11445,7 +11458,7 @@ static PyObject *_wrap_Image_GetAlpha(PyObject *, PyObject *args, PyObject *kwar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (unsigned char)(arg1)->GetAlpha(arg2,arg3); + result = (byte)(arg1)->GetAlpha(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11517,7 +11530,7 @@ static PyObject *_wrap_Image_IsTransparent(PyObject *, PyObject *args, PyObject wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; - unsigned char arg4 = (unsigned char) wxIMAGE_ALPHA_THRESHOLD ; + byte arg4 = (byte) wxIMAGE_ALPHA_THRESHOLD ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -11540,7 +11553,7 @@ static PyObject *_wrap_Image_IsTransparent(PyObject *, PyObject *args, PyObject } if (obj3) { { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } } @@ -11669,9 +11682,9 @@ static PyObject *_wrap_Image_ConvertAlphaToMask(PyObject *, PyObject *args, PyOb static PyObject *_wrap_Image_ConvertColourToAlpha(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char arg2 ; - unsigned char arg3 ; - unsigned char arg4 ; + byte arg2 ; + byte arg3 ; + byte arg4 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -11685,15 +11698,15 @@ static PyObject *_wrap_Image_ConvertColourToAlpha(PyObject *, PyObject *args, Py SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { @@ -11775,7 +11788,7 @@ static PyObject *_wrap_Image_CanRead(PyObject *, PyObject *args, PyObject *kwarg bool temp1 = false ; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "name", NULL + (char *) "filename", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_CanRead",kwnames,&obj0)) goto fail; @@ -11817,7 +11830,7 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *, PyObject *args, PyObject PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "name",(char *) "type", NULL + (char *) "filename",(char *) "type", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_GetImageCount",kwnames,&obj0,&obj1)) goto fail; @@ -12813,9 +12826,9 @@ static PyObject *_wrap_Image_SetAlphaBuffer(PyObject *, PyObject *args, PyObject static PyObject *_wrap_Image_SetMaskColour(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char arg2 ; - unsigned char arg3 ; - unsigned char arg4 ; + byte arg2 ; + byte arg3 ; + byte arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -12828,15 +12841,15 @@ static PyObject *_wrap_Image_SetMaskColour(PyObject *, PyObject *args, PyObject SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { @@ -12856,14 +12869,14 @@ static PyObject *_wrap_Image_SetMaskColour(PyObject *, PyObject *args, PyObject static PyObject *_wrap_Image_GetOrFindMaskColour(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char *arg2 = (unsigned char *) 0 ; - unsigned char *arg3 = (unsigned char *) 0 ; - unsigned char *arg4 = (unsigned char *) 0 ; - unsigned char temp2 ; + byte *arg2 = (byte *) 0 ; + byte *arg3 = (byte *) 0 ; + byte *arg4 = (byte *) 0 ; + byte temp2 ; int res2 = 0 ; - unsigned char temp3 ; + byte temp3 ; int res3 = 0 ; - unsigned char temp4 ; + byte temp4 ; int res4 = 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -12899,7 +12912,7 @@ static PyObject *_wrap_Image_GetOrFindMaskColour(PyObject *, PyObject *args, PyO static PyObject *_wrap_Image_GetMaskRed(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char result; + byte result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -12910,7 +12923,7 @@ static PyObject *_wrap_Image_GetMaskRed(PyObject *, PyObject *args, PyObject *kw if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (unsigned char)(arg1)->GetMaskRed(); + result = (byte)(arg1)->GetMaskRed(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12927,7 +12940,7 @@ static PyObject *_wrap_Image_GetMaskRed(PyObject *, PyObject *args, PyObject *kw static PyObject *_wrap_Image_GetMaskGreen(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char result; + byte result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -12938,7 +12951,7 @@ static PyObject *_wrap_Image_GetMaskGreen(PyObject *, PyObject *args, PyObject * if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (unsigned char)(arg1)->GetMaskGreen(); + result = (byte)(arg1)->GetMaskGreen(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12955,7 +12968,7 @@ static PyObject *_wrap_Image_GetMaskGreen(PyObject *, PyObject *args, PyObject * static PyObject *_wrap_Image_GetMaskBlue(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char result; + byte result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -12966,7 +12979,7 @@ static PyObject *_wrap_Image_GetMaskBlue(PyObject *, PyObject *args, PyObject *k if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (unsigned char)(arg1)->GetMaskBlue(); + result = (byte)(arg1)->GetMaskBlue(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -13177,12 +13190,12 @@ static PyObject *_wrap_Image_Mirror(PyObject *, PyObject *args, PyObject *kwargs static PyObject *_wrap_Image_Replace(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char arg2 ; - unsigned char arg3 ; - unsigned char arg4 ; - unsigned char arg5 ; - unsigned char arg6 ; - unsigned char arg7 ; + byte arg2 ; + byte arg3 ; + byte arg4 ; + byte arg5 ; + byte arg6 ; + byte arg7 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -13198,27 +13211,27 @@ static PyObject *_wrap_Image_Replace(PyObject *, PyObject *args, PyObject *kwarg SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { - arg5 = (unsigned char)(SWIG_As_unsigned_SS_char(obj4)); + arg5 = (byte)(SWIG_As_unsigned_SS_char(obj4)); if (SWIG_arg_fail(5)) SWIG_fail; } { - arg6 = (unsigned char)(SWIG_As_unsigned_SS_char(obj5)); + arg6 = (byte)(SWIG_As_unsigned_SS_char(obj5)); if (SWIG_arg_fail(6)) SWIG_fail; } { - arg7 = (unsigned char)(SWIG_As_unsigned_SS_char(obj6)); + arg7 = (byte)(SWIG_As_unsigned_SS_char(obj6)); if (SWIG_arg_fail(7)) SWIG_fail; } { @@ -13238,9 +13251,9 @@ static PyObject *_wrap_Image_Replace(PyObject *, PyObject *args, PyObject *kwarg static PyObject *_wrap_Image_ConvertToMono(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char arg2 ; - unsigned char arg3 ; - unsigned char arg4 ; + byte arg2 ; + byte arg3 ; + byte arg4 ; SwigValueWrapper result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -13254,15 +13267,15 @@ static PyObject *_wrap_Image_ConvertToMono(PyObject *, PyObject *args, PyObject SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { @@ -13757,9 +13770,9 @@ static PyObject *_wrap_Image_ConvertToBitmap(PyObject *, PyObject *args, PyObjec static PyObject *_wrap_Image_ConvertToMonoBitmap(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char arg2 ; - unsigned char arg3 ; - unsigned char arg4 ; + byte arg2 ; + byte arg3 ; + byte arg4 ; wxBitmap result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -13773,15 +13786,15 @@ static PyObject *_wrap_Image_ConvertToMonoBitmap(PyObject *, PyObject *args, PyO SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { @@ -16559,7 +16572,7 @@ static PyObject *_wrap_MouseEvent_Button(PyObject *, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "but", NULL + (char *) "self",(char *) "button", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_Button",kwnames,&obj0,&obj1)) goto fail; @@ -18307,7 +18320,7 @@ static PyObject *_wrap_new_KeyEvent(PyObject *, PyObject *args, PyObject *kwargs wxKeyEvent *result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "keyType", NULL + (char *) "eventType", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_KeyEvent",kwnames,&obj0)) goto fail; @@ -19750,7 +19763,7 @@ static PyObject * NcPaintEvent_swigregister(PyObject *, PyObject *args) { static PyObject *_wrap_new_EraseEvent(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 = (int) 0 ; - wxDC *arg2 = (wxDC *) (wxDC *) NULL ; + wxDC *arg2 = (wxDC *) NULL ; wxEraseEvent *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -20366,66 +20379,66 @@ static PyObject *_wrap_CloseEvent_Veto(PyObject *, PyObject *args, PyObject *kwa } -static PyObject *_wrap_CloseEvent_SetCanVeto(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_CloseEvent_GetVeto(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCloseEvent *arg1 = (wxCloseEvent *) 0 ; - bool arg2 ; + bool result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "canVeto", NULL + (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CloseEvent_SetCanVeto",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CloseEvent_GetVeto",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCloseEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (bool)(SWIG_As_bool(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetCanVeto(arg2); + result = (bool)((wxCloseEvent const *)arg1)->GetVeto(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; } -static PyObject *_wrap_CloseEvent_CanVeto(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_CloseEvent_SetCanVeto(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCloseEvent *arg1 = (wxCloseEvent *) 0 ; - bool result; + bool arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "canVeto", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CloseEvent_CanVeto",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CloseEvent_SetCanVeto",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCloseEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (bool)(SWIG_As_bool(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxCloseEvent const *)arg1)->CanVeto(); + (arg1)->SetCanVeto(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_CloseEvent_GetVeto(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_CloseEvent_CanVeto(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCloseEvent *arg1 = (wxCloseEvent *) 0 ; bool result; @@ -20434,12 +20447,12 @@ static PyObject *_wrap_CloseEvent_GetVeto(PyObject *, PyObject *args, PyObject * (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CloseEvent_GetVeto",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CloseEvent_CanVeto",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCloseEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxCloseEvent const *)arg1)->GetVeto(); + result = (bool)((wxCloseEvent const *)arg1)->CanVeto(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -22256,7 +22269,7 @@ static PyObject *_wrap_new_PyEvent(PyObject *, PyObject *args, PyObject *kwargs) PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "winid",(char *) "commandType", NULL + (char *) "winid",(char *) "eventType", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyEvent",kwnames,&obj0,&obj1)) goto fail; @@ -22311,7 +22324,7 @@ static PyObject *_wrap_delete_PyEvent(PyObject *, PyObject *args, PyObject *kwar } -static PyObject *_wrap_PyEvent_SetSelf(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyEvent__SetSelf(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyEvent *arg1 = (wxPyEvent *) 0 ; PyObject *arg2 = (PyObject *) 0 ; @@ -22321,7 +22334,7 @@ static PyObject *_wrap_PyEvent_SetSelf(PyObject *, PyObject *args, PyObject *kwa (char *) "self",(char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEvent_SetSelf",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEvent__SetSelf",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; arg2 = obj1; @@ -22339,7 +22352,7 @@ static PyObject *_wrap_PyEvent_SetSelf(PyObject *, PyObject *args, PyObject *kwa } -static PyObject *_wrap_PyEvent_GetSelf(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyEvent__GetSelf(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyEvent *arg1 = (wxPyEvent *) 0 ; PyObject *result; @@ -22348,7 +22361,7 @@ static PyObject *_wrap_PyEvent_GetSelf(PyObject *, PyObject *args, PyObject *kwa (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyEvent_GetSelf",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyEvent__GetSelf",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -22380,7 +22393,7 @@ static PyObject *_wrap_new_PyCommandEvent(PyObject *, PyObject *args, PyObject * PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "commandType",(char *) "id", NULL + (char *) "eventType",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyCommandEvent",kwnames,&obj0,&obj1)) goto fail; @@ -22435,7 +22448,7 @@ static PyObject *_wrap_delete_PyCommandEvent(PyObject *, PyObject *args, PyObjec } -static PyObject *_wrap_PyCommandEvent_SetSelf(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyCommandEvent__SetSelf(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyCommandEvent *arg1 = (wxPyCommandEvent *) 0 ; PyObject *arg2 = (PyObject *) 0 ; @@ -22445,7 +22458,7 @@ static PyObject *_wrap_PyCommandEvent_SetSelf(PyObject *, PyObject *args, PyObje (char *) "self",(char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCommandEvent_SetSelf",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCommandEvent__SetSelf",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCommandEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; arg2 = obj1; @@ -22463,7 +22476,7 @@ static PyObject *_wrap_PyCommandEvent_SetSelf(PyObject *, PyObject *args, PyObje } -static PyObject *_wrap_PyCommandEvent_GetSelf(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyCommandEvent__GetSelf(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyCommandEvent *arg1 = (wxPyCommandEvent *) 0 ; PyObject *result; @@ -22472,7 +22485,7 @@ static PyObject *_wrap_PyCommandEvent_GetSelf(PyObject *, PyObject *args, PyObje (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCommandEvent_GetSelf",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCommandEvent__GetSelf",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCommandEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -26516,6 +26529,38 @@ static PyObject *_wrap_Window_InvalidateBestSize(PyObject *, PyObject *args, PyO } +static PyObject *_wrap_Window_CacheBestSize(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "size", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_CacheBestSize",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + ((wxWindow const *)arg1)->CacheBestSize((wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_GetBestFittingSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -32016,7 +32061,7 @@ static PyObject *_wrap_Window_GetSizer(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxSizer(result, 0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -32073,7 +32118,7 @@ static PyObject *_wrap_Window_GetContainingSizer(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxSizer(result, 0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -35496,7 +35541,7 @@ static PyObject *_wrap_MenuBar_FindMenu(PyObject *, PyObject *args, PyObject *kw } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxMenuBar const *)arg1)->FindMenu((wxString const &)*arg2); + result = (int)(arg1)->FindMenu((wxString const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -35940,6 +35985,57 @@ static PyObject *_wrap_MenuBar_Detach(PyObject *, PyObject *args, PyObject *kwar } +static PyObject *_wrap_MenuBar_SetAutoWindowMenu(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + bool arg1 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "enable", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MenuBar_SetAutoWindowMenu",kwnames,&obj0)) goto fail; + { + arg1 = (bool)(SWIG_As_bool(obj0)); + if (SWIG_arg_fail(1)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + MenuBar_SetAutoWindowMenu(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_MenuBar_GetAutoWindowMenu(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + bool result; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":MenuBar_GetAutoWindowMenu",kwnames)) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)MenuBar_GetAutoWindowMenu(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject * MenuBar_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -37820,15 +37916,11 @@ static PyObject *_wrap_ItemContainer_AppendItems(PyObject *, PyObject *args, PyO int i, len=PySequence_Length(obj1); for (i=0; iAdd(Py2wxString(str)); + arg2->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } { @@ -39350,7 +39442,7 @@ static PyObject *_wrap_SizerItem_GetSizer(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxSizer(result, 0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -45885,9 +45977,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"CloseEvent_SetLoggingOff", (PyCFunction) _wrap_CloseEvent_SetLoggingOff, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"CloseEvent_GetLoggingOff", (PyCFunction) _wrap_CloseEvent_GetLoggingOff, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"CloseEvent_Veto", (PyCFunction) _wrap_CloseEvent_Veto, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"CloseEvent_GetVeto", (PyCFunction) _wrap_CloseEvent_GetVeto, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"CloseEvent_SetCanVeto", (PyCFunction) _wrap_CloseEvent_SetCanVeto, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"CloseEvent_CanVeto", (PyCFunction) _wrap_CloseEvent_CanVeto, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"CloseEvent_GetVeto", (PyCFunction) _wrap_CloseEvent_GetVeto, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"CloseEvent_swigregister", CloseEvent_swigregister, METH_VARARGS, NULL}, { (char *)"new_ShowEvent", (PyCFunction) _wrap_new_ShowEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ShowEvent_SetShow", (PyCFunction) _wrap_ShowEvent_SetShow, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -45964,13 +46056,13 @@ static PyMethodDef SwigMethods[] = { { (char *)"IdleEvent_swigregister", IdleEvent_swigregister, METH_VARARGS, NULL}, { (char *)"new_PyEvent", (PyCFunction) _wrap_new_PyEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_PyEvent", (PyCFunction) _wrap_delete_PyEvent, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyEvent_SetSelf", (PyCFunction) _wrap_PyEvent_SetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyEvent_GetSelf", (PyCFunction) _wrap_PyEvent_GetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyEvent__SetSelf", (PyCFunction) _wrap_PyEvent__SetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyEvent__GetSelf", (PyCFunction) _wrap_PyEvent__GetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyEvent_swigregister", PyEvent_swigregister, METH_VARARGS, NULL}, { (char *)"new_PyCommandEvent", (PyCFunction) _wrap_new_PyCommandEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_PyCommandEvent", (PyCFunction) _wrap_delete_PyCommandEvent, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyCommandEvent_SetSelf", (PyCFunction) _wrap_PyCommandEvent_SetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyCommandEvent_GetSelf", (PyCFunction) _wrap_PyCommandEvent_GetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyCommandEvent__SetSelf", (PyCFunction) _wrap_PyCommandEvent__SetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyCommandEvent__GetSelf", (PyCFunction) _wrap_PyCommandEvent__GetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyCommandEvent_swigregister", PyCommandEvent_swigregister, METH_VARARGS, NULL}, { (char *)"new_DateEvent", (PyCFunction) _wrap_new_DateEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DateEvent_GetDate", (PyCFunction) _wrap_DateEvent_GetDate, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -46106,6 +46198,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_GetBestSize", (PyCFunction) _wrap_Window_GetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetBestSizeTuple", (PyCFunction) _wrap_Window_GetBestSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_InvalidateBestSize", (PyCFunction) _wrap_Window_InvalidateBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Window_CacheBestSize", (PyCFunction) _wrap_Window_CacheBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetBestFittingSize", (PyCFunction) _wrap_Window_GetBestFittingSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetAdjustedBestSize", (PyCFunction) _wrap_Window_GetAdjustedBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_Center", (PyCFunction) _wrap_Window_Center, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -46375,6 +46468,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"MenuBar_IsAttached", (PyCFunction) _wrap_MenuBar_IsAttached, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MenuBar_Attach", (PyCFunction) _wrap_MenuBar_Attach, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MenuBar_Detach", (PyCFunction) _wrap_MenuBar_Detach, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MenuBar_SetAutoWindowMenu", (PyCFunction) _wrap_MenuBar_SetAutoWindowMenu, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MenuBar_GetAutoWindowMenu", (PyCFunction) _wrap_MenuBar_GetAutoWindowMenu, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MenuBar_swigregister", MenuBar_swigregister, METH_VARARGS, NULL}, { (char *)"new_MenuItem", (PyCFunction) _wrap_new_MenuItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MenuItem_GetMenu", (PyCFunction) _wrap_MenuItem_GetMenu, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -47270,7 +47365,7 @@ static swig_type_info _swigt__unsigned_int[] = {{"_unsigned_int", 0, "unsigned i static swig_type_info _swigt__p_unsigned_int[] = {{"_p_unsigned_int", 0, "unsigned int *|time_t *", 0, 0, 0, 0},{"_p_unsigned_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMenuEvent[] = {{"_p_wxMenuEvent", 0, "wxMenuEvent *", 0, 0, 0, 0},{"_p_wxMenuEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxContextMenuEvent[] = {{"_p_wxContextMenuEvent", 0, "wxContextMenuEvent *", 0, 0, 0, 0},{"_p_wxContextMenuEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *|byte *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxEraseEvent[] = {{"_p_wxEraseEvent", 0, "wxEraseEvent *", 0, 0, 0, 0},{"_p_wxEraseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMouseEvent[] = {{"_p_wxMouseEvent", 0, "wxMouseEvent *", 0, 0, 0, 0},{"_p_wxMouseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCloseEvent[] = {{"_p_wxCloseEvent", 0, "wxCloseEvent *", 0, 0, 0, 0},{"_p_wxCloseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -48672,6 +48767,12 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"STIPPLE", SWIG_From_int((int)(wxSTIPPLE))); } + { + PyDict_SetItemString(d,"STIPPLE_MASK", SWIG_From_int((int)(wxSTIPPLE_MASK))); + } + { + PyDict_SetItemString(d,"STIPPLE_MASK_OPAQUE", SWIG_From_int((int)(wxSTIPPLE_MASK_OPAQUE))); + } { PyDict_SetItemString(d,"BDIAGONAL_HATCH", SWIG_From_int((int)(wxBDIAGONAL_HATCH))); } @@ -49338,6 +49439,156 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"PAPER_A3_EXTRA_TRANSVERSE", SWIG_From_int((int)(wxPAPER_A3_EXTRA_TRANSVERSE))); } + { + PyDict_SetItemString(d,"PAPER_DBL_JAPANESE_POSTCARD", SWIG_From_int((int)(wxPAPER_DBL_JAPANESE_POSTCARD))); + } + { + PyDict_SetItemString(d,"PAPER_A6", SWIG_From_int((int)(wxPAPER_A6))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_KAKU2", SWIG_From_int((int)(wxPAPER_JENV_KAKU2))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_KAKU3", SWIG_From_int((int)(wxPAPER_JENV_KAKU3))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_CHOU3", SWIG_From_int((int)(wxPAPER_JENV_CHOU3))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_CHOU4", SWIG_From_int((int)(wxPAPER_JENV_CHOU4))); + } + { + PyDict_SetItemString(d,"PAPER_LETTER_ROTATED", SWIG_From_int((int)(wxPAPER_LETTER_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_A3_ROTATED", SWIG_From_int((int)(wxPAPER_A3_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_A4_ROTATED", SWIG_From_int((int)(wxPAPER_A4_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_A5_ROTATED", SWIG_From_int((int)(wxPAPER_A5_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_B4_JIS_ROTATED", SWIG_From_int((int)(wxPAPER_B4_JIS_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_B5_JIS_ROTATED", SWIG_From_int((int)(wxPAPER_B5_JIS_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JAPANESE_POSTCARD_ROTATED", SWIG_From_int((int)(wxPAPER_JAPANESE_POSTCARD_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_DBL_JAPANESE_POSTCARD_ROTATED", SWIG_From_int((int)(wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_A6_ROTATED", SWIG_From_int((int)(wxPAPER_A6_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_KAKU2_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_KAKU2_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_KAKU3_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_KAKU3_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_CHOU3_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_CHOU3_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_CHOU4_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_CHOU4_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_B6_JIS", SWIG_From_int((int)(wxPAPER_B6_JIS))); + } + { + PyDict_SetItemString(d,"PAPER_B6_JIS_ROTATED", SWIG_From_int((int)(wxPAPER_B6_JIS_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_12X11", SWIG_From_int((int)(wxPAPER_12X11))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_YOU4", SWIG_From_int((int)(wxPAPER_JENV_YOU4))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_YOU4_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_YOU4_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_P16K", SWIG_From_int((int)(wxPAPER_P16K))); + } + { + PyDict_SetItemString(d,"PAPER_P32K", SWIG_From_int((int)(wxPAPER_P32K))); + } + { + PyDict_SetItemString(d,"PAPER_P32KBIG", SWIG_From_int((int)(wxPAPER_P32KBIG))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_1", SWIG_From_int((int)(wxPAPER_PENV_1))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_2", SWIG_From_int((int)(wxPAPER_PENV_2))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_3", SWIG_From_int((int)(wxPAPER_PENV_3))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_4", SWIG_From_int((int)(wxPAPER_PENV_4))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_5", SWIG_From_int((int)(wxPAPER_PENV_5))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_6", SWIG_From_int((int)(wxPAPER_PENV_6))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_7", SWIG_From_int((int)(wxPAPER_PENV_7))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_8", SWIG_From_int((int)(wxPAPER_PENV_8))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_9", SWIG_From_int((int)(wxPAPER_PENV_9))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_10", SWIG_From_int((int)(wxPAPER_PENV_10))); + } + { + PyDict_SetItemString(d,"PAPER_P16K_ROTATED", SWIG_From_int((int)(wxPAPER_P16K_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_P32K_ROTATED", SWIG_From_int((int)(wxPAPER_P32K_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_P32KBIG_ROTATED", SWIG_From_int((int)(wxPAPER_P32KBIG_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_1_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_1_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_2_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_2_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_3_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_3_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_4_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_4_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_5_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_5_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_6_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_6_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_7_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_7_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_8_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_8_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_9_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_9_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_10_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_10_ROTATED))); + } { PyDict_SetItemString(d,"DUPLEX_SIMPLEX", SWIG_From_int((int)(wxDUPLEX_SIMPLEX))); } @@ -49747,7 +49998,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_SCROLL_PAGEDOWN", PyInt_FromLong(wxEVT_SCROLL_PAGEDOWN)); PyDict_SetItemString(d, "wxEVT_SCROLL_THUMBTRACK", PyInt_FromLong(wxEVT_SCROLL_THUMBTRACK)); PyDict_SetItemString(d, "wxEVT_SCROLL_THUMBRELEASE", PyInt_FromLong(wxEVT_SCROLL_THUMBRELEASE)); - PyDict_SetItemString(d, "wxEVT_SCROLL_ENDSCROLL", PyInt_FromLong(wxEVT_SCROLL_ENDSCROLL)); + PyDict_SetItemString(d, "wxEVT_SCROLL_CHANGED", PyInt_FromLong(wxEVT_SCROLL_CHANGED)); PyDict_SetItemString(d, "wxEVT_SCROLLWIN_TOP", PyInt_FromLong(wxEVT_SCROLLWIN_TOP)); PyDict_SetItemString(d, "wxEVT_SCROLLWIN_BOTTOM", PyInt_FromLong(wxEVT_SCROLLWIN_BOTTOM)); PyDict_SetItemString(d, "wxEVT_SCROLLWIN_LINEUP", PyInt_FromLong(wxEVT_SCROLLWIN_LINEUP));