Added more image options

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/__core_rename.i b/wxPython/src/__core_rename.i
index f83a845e5927108688d8035b40c49898d156e7fc..a2adc3117058140bd9e0310ccfd7958960c78b21 100644 (file)
--- a/wxPython/src/__core_rename.i
+++ b/wxPython/src/__core_rename.i
@@ -507,6 +507,9 @@
 %rename(NullImage)                          wxNullImage;
 %rename(IMAGE_RESOLUTION_INCHES)            wxIMAGE_RESOLUTION_INCHES;
 %rename(IMAGE_RESOLUTION_CM)                wxIMAGE_RESOLUTION_CM;
+%rename(PNG_TYPE_COLOUR)                    wxPNG_TYPE_COLOUR;
+%rename(PNG_TYPE_GREY)                      wxPNG_TYPE_GREY;
+%rename(PNG_TYPE_GREY_RED)                  wxPNG_TYPE_GREY_RED;
 %rename(BMP_24BPP)                          wxBMP_24BPP;
 %rename(BMP_8BPP)                           wxBMP_8BPP;
 %rename(BMP_8BPP_GREY)                      wxBMP_8BPP_GREY;

diff --git a/wxPython/src/_image.i b/wxPython/src/_image.i
index 49d17afaf6b61b8fb8812a74db152ce5a2e112f8..ea462f7134f70c340760bd77c8e8ed3d05dfafc8 100644 (file)
--- a/wxPython/src/_image.i
+++ b/wxPython/src/_image.i
@@ -150,6 +150,9 @@ public:
         }
     }
 
+    // TODO: wxImage( char** xpmData );
+
+
     void Create( int width, int height );
     void Destroy();
 
@@ -452,7 +455,16 @@ MAKE_CONST_WXSTRING(IMAGE_OPTION_SAMPLESPERPIXEL);
 MAKE_CONST_WXSTRING(IMAGE_OPTION_COMPRESSION);
 MAKE_CONST_WXSTRING(IMAGE_OPTION_IMAGEDESCRIPTOR);
 
-                    
+MAKE_CONST_WXSTRING(IMAGE_OPTION_PNG_FORMAT);
+MAKE_CONST_WXSTRING(IMAGE_OPTION_PNG_BITDEPTH);
+
+enum
+{
+    wxPNG_TYPE_COLOUR = 0,
+    wxPNG_TYPE_GREY = 2,
+    wxPNG_TYPE_GREY_RED = 3
+};
+
 enum
 {
     wxBMP_24BPP        = 24, // default, do not need to set

diff --git a/wxPython/wxPython/_core.py b/wxPython/wxPython/_core.py
index 73af7caab32110ebb7bbc48e8b90b928532f8b18..ca5f4ecc657340e35137a38f74a1eba6fc32ecf9 100644 (file)
--- a/wxPython/wxPython/_core.py
+++ b/wxPython/wxPython/_core.py
@@ -694,6 +694,11 @@ 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
+wxIMAGE_OPTION_PNG_FORMAT = wx._core.IMAGE_OPTION_PNG_FORMAT
+wxIMAGE_OPTION_PNG_BITDEPTH = wx._core.IMAGE_OPTION_PNG_BITDEPTH
+wxPNG_TYPE_COLOUR = wx._core.PNG_TYPE_COLOUR
+wxPNG_TYPE_GREY = wx._core.PNG_TYPE_GREY
+wxPNG_TYPE_GREY_RED = wx._core.PNG_TYPE_GREY_RED
 wxBMP_24BPP = wx._core.BMP_24BPP
 wxBMP_8BPP = wx._core.BMP_8BPP
 wxBMP_8BPP_GREY = wx._core.BMP_8BPP_GREY