From 0c243d938939e1f96a360defb5a80ac564adcaa4 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 19 Feb 2005 23:05:19 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/_core.py | 7 + wxPython/src/gtk/_core_wrap.cpp | 154 ++++++++++++++++++++ wxPython/src/gtk/_misc.py | 11 ++ wxPython/src/gtk/_misc_wrap.cpp | 242 ++++++++++++++++++++++++++++++++ wxPython/wxPython/_core.py | 7 + wxPython/wxPython/_misc.py | 11 ++ 6 files changed, 432 insertions(+) diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index 6fa4e99430..33aa4393c0 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -2539,11 +2539,18 @@ class BMPHandlerPtr(BMPHandler): self.__class__ = BMPHandler _core_.BMPHandler_swigregister(BMPHandlerPtr) NullImage = cvar.NullImage +IMAGE_OPTION_FILENAME = cvar.IMAGE_OPTION_FILENAME IMAGE_OPTION_BMP_FORMAT = cvar.IMAGE_OPTION_BMP_FORMAT IMAGE_OPTION_CUR_HOTSPOT_X = cvar.IMAGE_OPTION_CUR_HOTSPOT_X IMAGE_OPTION_CUR_HOTSPOT_Y = cvar.IMAGE_OPTION_CUR_HOTSPOT_Y IMAGE_OPTION_RESOLUTION = cvar.IMAGE_OPTION_RESOLUTION +IMAGE_OPTION_RESOLUTIONX = cvar.IMAGE_OPTION_RESOLUTIONX +IMAGE_OPTION_RESOLUTIONY = cvar.IMAGE_OPTION_RESOLUTIONY IMAGE_OPTION_RESOLUTIONUNIT = cvar.IMAGE_OPTION_RESOLUTIONUNIT +IMAGE_OPTION_BITSPERSAMPLE = cvar.IMAGE_OPTION_BITSPERSAMPLE +IMAGE_OPTION_SAMPLESPERPIXEL = cvar.IMAGE_OPTION_SAMPLESPERPIXEL +IMAGE_OPTION_COMPRESSION = cvar.IMAGE_OPTION_COMPRESSION +IMAGE_OPTION_IMAGEDESCRIPTOR = cvar.IMAGE_OPTION_IMAGEDESCRIPTOR class ICOHandler(BMPHandler): """Proxy of C++ ICOHandler class""" diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index 441b6d3e1f..b1df947377 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -2463,11 +2463,18 @@ static wxBitmap wxImage_ConvertToMonoBitmap(wxImage *self,unsigned char red,unsi wxBitmap bitmap( mono, 1 ); return bitmap; } + static const wxString wxPyIMAGE_OPTION_FILENAME(wxIMAGE_OPTION_FILENAME); static const wxString wxPyIMAGE_OPTION_BMP_FORMAT(wxIMAGE_OPTION_BMP_FORMAT); static const wxString wxPyIMAGE_OPTION_CUR_HOTSPOT_X(wxIMAGE_OPTION_CUR_HOTSPOT_X); static const wxString wxPyIMAGE_OPTION_CUR_HOTSPOT_Y(wxIMAGE_OPTION_CUR_HOTSPOT_Y); static const wxString wxPyIMAGE_OPTION_RESOLUTION(wxIMAGE_OPTION_RESOLUTION); + static const wxString wxPyIMAGE_OPTION_RESOLUTIONX(wxIMAGE_OPTION_RESOLUTIONX); + static const wxString wxPyIMAGE_OPTION_RESOLUTIONY(wxIMAGE_OPTION_RESOLUTIONY); static const wxString wxPyIMAGE_OPTION_RESOLUTIONUNIT(wxIMAGE_OPTION_RESOLUTIONUNIT); + static const wxString wxPyIMAGE_OPTION_BITSPERSAMPLE(wxIMAGE_OPTION_BITSPERSAMPLE); + static const wxString wxPyIMAGE_OPTION_SAMPLESPERPIXEL(wxIMAGE_OPTION_SAMPLESPERPIXEL); + static const wxString wxPyIMAGE_OPTION_COMPRESSION(wxIMAGE_OPTION_COMPRESSION); + static const wxString wxPyIMAGE_OPTION_IMAGEDESCRIPTOR(wxIMAGE_OPTION_IMAGEDESCRIPTOR); #include @@ -13352,6 +13359,26 @@ static PyObject *_wrap_NullImage_get(void) { } +static int _wrap_IMAGE_OPTION_FILENAME_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_FILENAME is read-only."); + return 1; +} + + +static PyObject *_wrap_IMAGE_OPTION_FILENAME_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyIMAGE_OPTION_FILENAME)->c_str(), (&wxPyIMAGE_OPTION_FILENAME)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyIMAGE_OPTION_FILENAME)->c_str(), (&wxPyIMAGE_OPTION_FILENAME)->Len()); +#endif + } + return pyobj; +} + + static int _wrap_IMAGE_OPTION_BMP_FORMAT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_BMP_FORMAT is read-only."); return 1; @@ -13432,6 +13459,46 @@ static PyObject *_wrap_IMAGE_OPTION_RESOLUTION_get(void) { } +static int _wrap_IMAGE_OPTION_RESOLUTIONX_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_RESOLUTIONX is read-only."); + return 1; +} + + +static PyObject *_wrap_IMAGE_OPTION_RESOLUTIONX_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyIMAGE_OPTION_RESOLUTIONX)->c_str(), (&wxPyIMAGE_OPTION_RESOLUTIONX)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyIMAGE_OPTION_RESOLUTIONX)->c_str(), (&wxPyIMAGE_OPTION_RESOLUTIONX)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_IMAGE_OPTION_RESOLUTIONY_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_RESOLUTIONY is read-only."); + return 1; +} + + +static PyObject *_wrap_IMAGE_OPTION_RESOLUTIONY_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyIMAGE_OPTION_RESOLUTIONY)->c_str(), (&wxPyIMAGE_OPTION_RESOLUTIONY)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyIMAGE_OPTION_RESOLUTIONY)->c_str(), (&wxPyIMAGE_OPTION_RESOLUTIONY)->Len()); +#endif + } + return pyobj; +} + + static int _wrap_IMAGE_OPTION_RESOLUTIONUNIT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_RESOLUTIONUNIT is read-only."); return 1; @@ -13452,6 +13519,86 @@ static PyObject *_wrap_IMAGE_OPTION_RESOLUTIONUNIT_get(void) { } +static int _wrap_IMAGE_OPTION_BITSPERSAMPLE_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_BITSPERSAMPLE is read-only."); + return 1; +} + + +static PyObject *_wrap_IMAGE_OPTION_BITSPERSAMPLE_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyIMAGE_OPTION_BITSPERSAMPLE)->c_str(), (&wxPyIMAGE_OPTION_BITSPERSAMPLE)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyIMAGE_OPTION_BITSPERSAMPLE)->c_str(), (&wxPyIMAGE_OPTION_BITSPERSAMPLE)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_IMAGE_OPTION_SAMPLESPERPIXEL_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_SAMPLESPERPIXEL is read-only."); + return 1; +} + + +static PyObject *_wrap_IMAGE_OPTION_SAMPLESPERPIXEL_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyIMAGE_OPTION_SAMPLESPERPIXEL)->c_str(), (&wxPyIMAGE_OPTION_SAMPLESPERPIXEL)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyIMAGE_OPTION_SAMPLESPERPIXEL)->c_str(), (&wxPyIMAGE_OPTION_SAMPLESPERPIXEL)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_IMAGE_OPTION_COMPRESSION_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_COMPRESSION is read-only."); + return 1; +} + + +static PyObject *_wrap_IMAGE_OPTION_COMPRESSION_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyIMAGE_OPTION_COMPRESSION)->c_str(), (&wxPyIMAGE_OPTION_COMPRESSION)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyIMAGE_OPTION_COMPRESSION)->c_str(), (&wxPyIMAGE_OPTION_COMPRESSION)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_IMAGE_OPTION_IMAGEDESCRIPTOR_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_IMAGEDESCRIPTOR is read-only."); + return 1; +} + + +static PyObject *_wrap_IMAGE_OPTION_IMAGEDESCRIPTOR_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyIMAGE_OPTION_IMAGEDESCRIPTOR)->c_str(), (&wxPyIMAGE_OPTION_IMAGEDESCRIPTOR)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyIMAGE_OPTION_IMAGEDESCRIPTOR)->c_str(), (&wxPyIMAGE_OPTION_IMAGEDESCRIPTOR)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_new_BMPHandler(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxBMPHandler *result; @@ -48195,10 +48342,13 @@ SWIGEXPORT(void) SWIG_init(void) { wxPyPtrTypeMap_Add("wxFileSystemHandler", "wxPyFileSystemHandler"); SWIG_addvarlink(SWIG_globals,(char*)"NullImage",_wrap_NullImage_get, _wrap_NullImage_set); + SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_FILENAME",_wrap_IMAGE_OPTION_FILENAME_get, _wrap_IMAGE_OPTION_FILENAME_set); SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_BMP_FORMAT",_wrap_IMAGE_OPTION_BMP_FORMAT_get, _wrap_IMAGE_OPTION_BMP_FORMAT_set); SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_CUR_HOTSPOT_X",_wrap_IMAGE_OPTION_CUR_HOTSPOT_X_get, _wrap_IMAGE_OPTION_CUR_HOTSPOT_X_set); SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_CUR_HOTSPOT_Y",_wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_get, _wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_set); SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_RESOLUTION",_wrap_IMAGE_OPTION_RESOLUTION_get, _wrap_IMAGE_OPTION_RESOLUTION_set); + SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_RESOLUTIONX",_wrap_IMAGE_OPTION_RESOLUTIONX_get, _wrap_IMAGE_OPTION_RESOLUTIONX_set); + SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_RESOLUTIONY",_wrap_IMAGE_OPTION_RESOLUTIONY_get, _wrap_IMAGE_OPTION_RESOLUTIONY_set); SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_RESOLUTIONUNIT",_wrap_IMAGE_OPTION_RESOLUTIONUNIT_get, _wrap_IMAGE_OPTION_RESOLUTIONUNIT_set); { PyDict_SetItemString(d,"IMAGE_RESOLUTION_INCHES", SWIG_From_int((int)(wxIMAGE_RESOLUTION_INCHES))); @@ -48206,6 +48356,10 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"IMAGE_RESOLUTION_CM", SWIG_From_int((int)(wxIMAGE_RESOLUTION_CM))); } + SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_BITSPERSAMPLE",_wrap_IMAGE_OPTION_BITSPERSAMPLE_get, _wrap_IMAGE_OPTION_BITSPERSAMPLE_set); + SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_SAMPLESPERPIXEL",_wrap_IMAGE_OPTION_SAMPLESPERPIXEL_get, _wrap_IMAGE_OPTION_SAMPLESPERPIXEL_set); + SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_COMPRESSION",_wrap_IMAGE_OPTION_COMPRESSION_get, _wrap_IMAGE_OPTION_COMPRESSION_set); + SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_IMAGEDESCRIPTOR",_wrap_IMAGE_OPTION_IMAGEDESCRIPTOR_get, _wrap_IMAGE_OPTION_IMAGEDESCRIPTOR_set); { PyDict_SetItemString(d,"BMP_24BPP", SWIG_From_int((int)(wxBMP_24BPP))); } diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index 15e2860836..c4dcca1725 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -2577,6 +2577,8 @@ ART_GO_DOWN = cvar.ART_GO_DOWN ART_GO_TO_PARENT = cvar.ART_GO_TO_PARENT ART_GO_HOME = cvar.ART_GO_HOME ART_FILE_OPEN = cvar.ART_FILE_OPEN +ART_FILE_SAVE = cvar.ART_FILE_SAVE +ART_FILE_SAVE_AS = cvar.ART_FILE_SAVE_AS ART_PRINT = cvar.ART_PRINT ART_HELP = cvar.ART_HELP ART_TIP = cvar.ART_TIP @@ -2599,6 +2601,15 @@ ART_QUESTION = cvar.ART_QUESTION ART_WARNING = cvar.ART_WARNING ART_INFORMATION = cvar.ART_INFORMATION ART_MISSING_IMAGE = cvar.ART_MISSING_IMAGE +ART_COPY = cvar.ART_COPY +ART_CUT = cvar.ART_CUT +ART_PASTE = cvar.ART_PASTE +ART_DELETE = cvar.ART_DELETE +ART_UNDO = cvar.ART_UNDO +ART_REDO = cvar.ART_REDO +ART_QUIT = cvar.ART_QUIT +ART_FIND = cvar.ART_FIND +ART_FIND_AND_REPLACE = cvar.ART_FIND_AND_REPLACE def ArtProvider_PushProvider(*args, **kwargs): """ diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp index be0cc21e50..d0267fbef3 100644 --- a/wxPython/src/gtk/_misc_wrap.cpp +++ b/wxPython/src/gtk/_misc_wrap.cpp @@ -2252,6 +2252,8 @@ static PyObject *wxMimeTypesManager_EnumAllFileTypes(wxMimeTypesManager *self){ static const wxString wxPyART_GO_TO_PARENT(wxART_GO_TO_PARENT); static const wxString wxPyART_GO_HOME(wxART_GO_HOME); static const wxString wxPyART_FILE_OPEN(wxART_FILE_OPEN); + static const wxString wxPyART_FILE_SAVE(wxART_FILE_SAVE); + static const wxString wxPyART_FILE_SAVE_AS(wxART_FILE_SAVE_AS); static const wxString wxPyART_PRINT(wxART_PRINT); static const wxString wxPyART_HELP(wxART_HELP); static const wxString wxPyART_TIP(wxART_TIP); @@ -2274,6 +2276,15 @@ static PyObject *wxMimeTypesManager_EnumAllFileTypes(wxMimeTypesManager *self){ static const wxString wxPyART_WARNING(wxART_WARNING); static const wxString wxPyART_INFORMATION(wxART_INFORMATION); static const wxString wxPyART_MISSING_IMAGE(wxART_MISSING_IMAGE); + static const wxString wxPyART_COPY(wxART_COPY); + static const wxString wxPyART_CUT(wxART_CUT); + static const wxString wxPyART_PASTE(wxART_PASTE); + static const wxString wxPyART_DELETE(wxART_DELETE); + static const wxString wxPyART_UNDO(wxART_UNDO); + static const wxString wxPyART_REDO(wxART_REDO); + static const wxString wxPyART_QUIT(wxART_QUIT); + static const wxString wxPyART_FIND(wxART_FIND); + static const wxString wxPyART_FIND_AND_REPLACE(wxART_FIND_AND_REPLACE); // Python aware wxArtProvider class wxPyArtProvider : public wxArtProvider { public: @@ -15655,6 +15666,46 @@ static PyObject *_wrap_ART_FILE_OPEN_get(void) { } +static int _wrap_ART_FILE_SAVE_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ART_FILE_SAVE is read-only."); + return 1; +} + + +static PyObject *_wrap_ART_FILE_SAVE_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyART_FILE_SAVE)->c_str(), (&wxPyART_FILE_SAVE)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyART_FILE_SAVE)->c_str(), (&wxPyART_FILE_SAVE)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_ART_FILE_SAVE_AS_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ART_FILE_SAVE_AS is read-only."); + return 1; +} + + +static PyObject *_wrap_ART_FILE_SAVE_AS_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyART_FILE_SAVE_AS)->c_str(), (&wxPyART_FILE_SAVE_AS)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyART_FILE_SAVE_AS)->c_str(), (&wxPyART_FILE_SAVE_AS)->Len()); +#endif + } + return pyobj; +} + + static int _wrap_ART_PRINT_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable ART_PRINT is read-only."); return 1; @@ -16095,6 +16146,186 @@ static PyObject *_wrap_ART_MISSING_IMAGE_get(void) { } +static int _wrap_ART_COPY_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ART_COPY is read-only."); + return 1; +} + + +static PyObject *_wrap_ART_COPY_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyART_COPY)->c_str(), (&wxPyART_COPY)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyART_COPY)->c_str(), (&wxPyART_COPY)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_ART_CUT_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ART_CUT is read-only."); + return 1; +} + + +static PyObject *_wrap_ART_CUT_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyART_CUT)->c_str(), (&wxPyART_CUT)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyART_CUT)->c_str(), (&wxPyART_CUT)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_ART_PASTE_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ART_PASTE is read-only."); + return 1; +} + + +static PyObject *_wrap_ART_PASTE_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyART_PASTE)->c_str(), (&wxPyART_PASTE)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyART_PASTE)->c_str(), (&wxPyART_PASTE)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_ART_DELETE_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ART_DELETE is read-only."); + return 1; +} + + +static PyObject *_wrap_ART_DELETE_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyART_DELETE)->c_str(), (&wxPyART_DELETE)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyART_DELETE)->c_str(), (&wxPyART_DELETE)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_ART_UNDO_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ART_UNDO is read-only."); + return 1; +} + + +static PyObject *_wrap_ART_UNDO_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyART_UNDO)->c_str(), (&wxPyART_UNDO)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyART_UNDO)->c_str(), (&wxPyART_UNDO)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_ART_REDO_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ART_REDO is read-only."); + return 1; +} + + +static PyObject *_wrap_ART_REDO_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyART_REDO)->c_str(), (&wxPyART_REDO)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyART_REDO)->c_str(), (&wxPyART_REDO)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_ART_QUIT_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ART_QUIT is read-only."); + return 1; +} + + +static PyObject *_wrap_ART_QUIT_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyART_QUIT)->c_str(), (&wxPyART_QUIT)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyART_QUIT)->c_str(), (&wxPyART_QUIT)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_ART_FIND_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ART_FIND is read-only."); + return 1; +} + + +static PyObject *_wrap_ART_FIND_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyART_FIND)->c_str(), (&wxPyART_FIND)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyART_FIND)->c_str(), (&wxPyART_FIND)->Len()); +#endif + } + return pyobj; +} + + +static int _wrap_ART_FIND_AND_REPLACE_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable ART_FIND_AND_REPLACE is read-only."); + return 1; +} + + +static PyObject *_wrap_ART_FIND_AND_REPLACE_get(void) { + PyObject *pyobj; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyART_FIND_AND_REPLACE)->c_str(), (&wxPyART_FIND_AND_REPLACE)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyART_FIND_AND_REPLACE)->c_str(), (&wxPyART_FIND_AND_REPLACE)->Len()); +#endif + } + return pyobj; +} + + static PyObject *_wrap_new_ArtProvider(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyArtProvider *result; @@ -33305,6 +33536,8 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"ART_GO_TO_PARENT",_wrap_ART_GO_TO_PARENT_get, _wrap_ART_GO_TO_PARENT_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_GO_HOME",_wrap_ART_GO_HOME_get, _wrap_ART_GO_HOME_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_FILE_OPEN",_wrap_ART_FILE_OPEN_get, _wrap_ART_FILE_OPEN_set); + SWIG_addvarlink(SWIG_globals,(char*)"ART_FILE_SAVE",_wrap_ART_FILE_SAVE_get, _wrap_ART_FILE_SAVE_set); + SWIG_addvarlink(SWIG_globals,(char*)"ART_FILE_SAVE_AS",_wrap_ART_FILE_SAVE_AS_get, _wrap_ART_FILE_SAVE_AS_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_PRINT",_wrap_ART_PRINT_get, _wrap_ART_PRINT_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_HELP",_wrap_ART_HELP_get, _wrap_ART_HELP_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_TIP",_wrap_ART_TIP_get, _wrap_ART_TIP_set); @@ -33327,6 +33560,15 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"ART_WARNING",_wrap_ART_WARNING_get, _wrap_ART_WARNING_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_INFORMATION",_wrap_ART_INFORMATION_get, _wrap_ART_INFORMATION_set); SWIG_addvarlink(SWIG_globals,(char*)"ART_MISSING_IMAGE",_wrap_ART_MISSING_IMAGE_get, _wrap_ART_MISSING_IMAGE_set); + SWIG_addvarlink(SWIG_globals,(char*)"ART_COPY",_wrap_ART_COPY_get, _wrap_ART_COPY_set); + SWIG_addvarlink(SWIG_globals,(char*)"ART_CUT",_wrap_ART_CUT_get, _wrap_ART_CUT_set); + SWIG_addvarlink(SWIG_globals,(char*)"ART_PASTE",_wrap_ART_PASTE_get, _wrap_ART_PASTE_set); + SWIG_addvarlink(SWIG_globals,(char*)"ART_DELETE",_wrap_ART_DELETE_get, _wrap_ART_DELETE_set); + SWIG_addvarlink(SWIG_globals,(char*)"ART_UNDO",_wrap_ART_UNDO_get, _wrap_ART_UNDO_set); + SWIG_addvarlink(SWIG_globals,(char*)"ART_REDO",_wrap_ART_REDO_get, _wrap_ART_REDO_set); + SWIG_addvarlink(SWIG_globals,(char*)"ART_QUIT",_wrap_ART_QUIT_get, _wrap_ART_QUIT_set); + SWIG_addvarlink(SWIG_globals,(char*)"ART_FIND",_wrap_ART_FIND_get, _wrap_ART_FIND_set); + SWIG_addvarlink(SWIG_globals,(char*)"ART_FIND_AND_REPLACE",_wrap_ART_FIND_AND_REPLACE_get, _wrap_ART_FIND_AND_REPLACE_set); wxPyPtrTypeMap_Add("wxArtProvider", "wxPyArtProvider"); diff --git a/wxPython/wxPython/_core.py b/wxPython/wxPython/_core.py index 217d01a3e4..4a9841ff5a 100644 --- a/wxPython/wxPython/_core.py +++ b/wxPython/wxPython/_core.py @@ -679,13 +679,20 @@ wxImage_InsertHandler = wx._core.Image_InsertHandler wxImage_RemoveHandler = wx._core.Image_RemoveHandler wxImage_GetImageExtWildcard = wx._core.Image_GetImageExtWildcard wxNullImage = wx._core.NullImage +wxIMAGE_OPTION_FILENAME = wx._core.IMAGE_OPTION_FILENAME wxIMAGE_OPTION_BMP_FORMAT = wx._core.IMAGE_OPTION_BMP_FORMAT wxIMAGE_OPTION_CUR_HOTSPOT_X = wx._core.IMAGE_OPTION_CUR_HOTSPOT_X wxIMAGE_OPTION_CUR_HOTSPOT_Y = wx._core.IMAGE_OPTION_CUR_HOTSPOT_Y wxIMAGE_OPTION_RESOLUTION = wx._core.IMAGE_OPTION_RESOLUTION +wxIMAGE_OPTION_RESOLUTIONX = wx._core.IMAGE_OPTION_RESOLUTIONX +wxIMAGE_OPTION_RESOLUTIONY = wx._core.IMAGE_OPTION_RESOLUTIONY wxIMAGE_OPTION_RESOLUTIONUNIT = wx._core.IMAGE_OPTION_RESOLUTIONUNIT wxIMAGE_RESOLUTION_INCHES = wx._core.IMAGE_RESOLUTION_INCHES wxIMAGE_RESOLUTION_CM = wx._core.IMAGE_RESOLUTION_CM +wxIMAGE_OPTION_BITSPERSAMPLE = wx._core.IMAGE_OPTION_BITSPERSAMPLE +wxIMAGE_OPTION_SAMPLESPERPIXEL = wx._core.IMAGE_OPTION_SAMPLESPERPIXEL +wxIMAGE_OPTION_COMPRESSION = wx._core.IMAGE_OPTION_COMPRESSION +wxIMAGE_OPTION_IMAGEDESCRIPTOR = wx._core.IMAGE_OPTION_IMAGEDESCRIPTOR wxBMP_24BPP = wx._core.BMP_24BPP wxBMP_8BPP = wx._core.BMP_8BPP wxBMP_8BPP_GREY = wx._core.BMP_8BPP_GREY diff --git a/wxPython/wxPython/_misc.py b/wxPython/wxPython/_misc.py index c69c81f081..fabf1d3ce8 100644 --- a/wxPython/wxPython/_misc.py +++ b/wxPython/wxPython/_misc.py @@ -411,6 +411,8 @@ wxART_GO_DOWN = wx._misc.ART_GO_DOWN wxART_GO_TO_PARENT = wx._misc.ART_GO_TO_PARENT wxART_GO_HOME = wx._misc.ART_GO_HOME wxART_FILE_OPEN = wx._misc.ART_FILE_OPEN +wxART_FILE_SAVE = wx._misc.ART_FILE_SAVE +wxART_FILE_SAVE_AS = wx._misc.ART_FILE_SAVE_AS wxART_PRINT = wx._misc.ART_PRINT wxART_HELP = wx._misc.ART_HELP wxART_TIP = wx._misc.ART_TIP @@ -433,6 +435,15 @@ wxART_QUESTION = wx._misc.ART_QUESTION wxART_WARNING = wx._misc.ART_WARNING wxART_INFORMATION = wx._misc.ART_INFORMATION wxART_MISSING_IMAGE = wx._misc.ART_MISSING_IMAGE +wxART_COPY = wx._misc.ART_COPY +wxART_CUT = wx._misc.ART_CUT +wxART_PASTE = wx._misc.ART_PASTE +wxART_DELETE = wx._misc.ART_DELETE +wxART_UNDO = wx._misc.ART_UNDO +wxART_REDO = wx._misc.ART_REDO +wxART_QUIT = wx._misc.ART_QUIT +wxART_FIND = wx._misc.ART_FIND +wxART_FIND_AND_REPLACE = wx._misc.ART_FIND_AND_REPLACE wxArtProvider = wx._misc.ArtProvider wxArtProviderPtr = wx._misc.ArtProviderPtr wxArtProvider = wx._misc.ArtProvider