X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32c988a34d4ce6b7ae079fe235853c495a38a3bc..68f36a2ca14a0005874f3343391f85f4aa084f99:/wxPython/src/gtk/image.cpp diff --git a/wxPython/src/gtk/image.cpp b/wxPython/src/gtk/image.cpp index c0d209fadb..c89b012144 100644 --- a/wxPython/src/gtk/image.cpp +++ b/wxPython/src/gtk/image.cpp @@ -88,7 +88,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { #if PYTHON_API_VERSION >= 1009 static char* wxStringErrorMsg = "String or Unicode type required"; #else - static char* wxStringErrorMsg = "string type is required for parameter"; + static char* wxStringErrorMsg = "String type required"; #endif wxImage* wxEmptyImage(int width=0, int height=0) { @@ -2434,41 +2434,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, - { "_wxImageHandler","_class_wxTIFFHandler",SwigwxTIFFHandlerTowxImageHandler}, { "_wxImageHandler","_wxTIFFHandler",SwigwxTIFFHandlerTowxImageHandler}, - { "_wxImageHandler","_class_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler}, { "_wxImageHandler","_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler}, - { "_wxImageHandler","_class_wxPNMHandler",SwigwxPNMHandlerTowxImageHandler}, { "_wxImageHandler","_wxPNMHandler",SwigwxPNMHandlerTowxImageHandler}, - { "_wxImageHandler","_class_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler}, { "_wxImageHandler","_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler}, - { "_wxImageHandler","_class_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler}, { "_wxImageHandler","_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler}, - { "_wxImageHandler","_class_wxJPEGHandler",SwigwxJPEGHandlerTowxImageHandler}, { "_wxImageHandler","_wxJPEGHandler",SwigwxJPEGHandlerTowxImageHandler}, - { "_wxImageHandler","_class_wxPNGHandler",SwigwxPNGHandlerTowxImageHandler}, { "_wxImageHandler","_wxPNGHandler",SwigwxPNGHandlerTowxImageHandler}, { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, - { "_class_wxObject","_class_wxImage",SwigwxImageTowxObject}, - { "_class_wxObject","_wxImage",SwigwxImageTowxObject}, - { "_class_wxObject","_class_wxTIFFHandler",SwigwxTIFFHandlerTowxObject}, - { "_class_wxObject","_wxTIFFHandler",SwigwxTIFFHandlerTowxObject}, - { "_class_wxObject","_class_wxPCXHandler",SwigwxPCXHandlerTowxObject}, - { "_class_wxObject","_wxPCXHandler",SwigwxPCXHandlerTowxObject}, - { "_class_wxObject","_class_wxPNMHandler",SwigwxPNMHandlerTowxObject}, - { "_class_wxObject","_wxPNMHandler",SwigwxPNMHandlerTowxObject}, - { "_class_wxObject","_class_wxGIFHandler",SwigwxGIFHandlerTowxObject}, - { "_class_wxObject","_wxGIFHandler",SwigwxGIFHandlerTowxObject}, - { "_class_wxObject","_class_wxBMPHandler",SwigwxBMPHandlerTowxObject}, - { "_class_wxObject","_wxBMPHandler",SwigwxBMPHandlerTowxObject}, - { "_class_wxObject","_class_wxJPEGHandler",SwigwxJPEGHandlerTowxObject}, - { "_class_wxObject","_wxJPEGHandler",SwigwxJPEGHandlerTowxObject}, - { "_class_wxObject","_class_wxPNGHandler",SwigwxPNGHandlerTowxObject}, - { "_class_wxObject","_wxPNGHandler",SwigwxPNGHandlerTowxObject}, - { "_class_wxObject","_class_wxImageHandler",SwigwxImageHandlerTowxObject}, - { "_class_wxObject","_wxImageHandler",SwigwxImageHandlerTowxObject}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -2503,40 +2478,17 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_WXTYPE","_unsigned_short",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, - { "_wxObject","_class_wxImage",SwigwxImageTowxObject}, { "_wxObject","_wxImage",SwigwxImageTowxObject}, - { "_wxObject","_class_wxTIFFHandler",SwigwxTIFFHandlerTowxObject}, { "_wxObject","_wxTIFFHandler",SwigwxTIFFHandlerTowxObject}, - { "_wxObject","_class_wxPCXHandler",SwigwxPCXHandlerTowxObject}, { "_wxObject","_wxPCXHandler",SwigwxPCXHandlerTowxObject}, - { "_wxObject","_class_wxPNMHandler",SwigwxPNMHandlerTowxObject}, { "_wxObject","_wxPNMHandler",SwigwxPNMHandlerTowxObject}, - { "_wxObject","_class_wxGIFHandler",SwigwxGIFHandlerTowxObject}, { "_wxObject","_wxGIFHandler",SwigwxGIFHandlerTowxObject}, - { "_wxObject","_class_wxBMPHandler",SwigwxBMPHandlerTowxObject}, { "_wxObject","_wxBMPHandler",SwigwxBMPHandlerTowxObject}, - { "_wxObject","_class_wxJPEGHandler",SwigwxJPEGHandlerTowxObject}, { "_wxObject","_wxJPEGHandler",SwigwxJPEGHandlerTowxObject}, - { "_wxObject","_class_wxPNGHandler",SwigwxPNGHandlerTowxObject}, { "_wxObject","_wxPNGHandler",SwigwxPNGHandlerTowxObject}, - { "_wxObject","_class_wxImageHandler",SwigwxImageHandlerTowxObject}, { "_wxObject","_wxImageHandler",SwigwxImageHandlerTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, - { "_class_wxImageHandler","_class_wxTIFFHandler",SwigwxTIFFHandlerTowxImageHandler}, - { "_class_wxImageHandler","_wxTIFFHandler",SwigwxTIFFHandlerTowxImageHandler}, - { "_class_wxImageHandler","_class_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler}, - { "_class_wxImageHandler","_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler}, - { "_class_wxImageHandler","_class_wxPNMHandler",SwigwxPNMHandlerTowxImageHandler}, - { "_class_wxImageHandler","_wxPNMHandler",SwigwxPNMHandlerTowxImageHandler}, - { "_class_wxImageHandler","_class_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler}, - { "_class_wxImageHandler","_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler}, - { "_class_wxImageHandler","_class_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler}, - { "_class_wxImageHandler","_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler}, - { "_class_wxImageHandler","_class_wxJPEGHandler",SwigwxJPEGHandlerTowxImageHandler}, - { "_class_wxImageHandler","_wxJPEGHandler",SwigwxJPEGHandlerTowxImageHandler}, - { "_class_wxImageHandler","_class_wxPNGHandler",SwigwxPNGHandlerTowxImageHandler}, - { "_class_wxImageHandler","_wxPNGHandler",SwigwxPNGHandlerTowxImageHandler}, { "_unsigned_char","_byte",0}, { "_unsigned_int","_wxCoord",0}, { "_unsigned_int","_wxPrintQuality",0},