Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added more image options

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-02-28 18:45:29 +00:00
parent 766abb5bc9
commit 9df51bd066
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wxPython/src/__core_rename.i
View File

@@ -507,6 +507,9 @@
%rename(NullImage) wxNullImage; %rename(NullImage) wxNullImage;
%rename(IMAGE_RESOLUTION_INCHES) wxIMAGE_RESOLUTION_INCHES; %rename(IMAGE_RESOLUTION_INCHES) wxIMAGE_RESOLUTION_INCHES;
%rename(IMAGE_RESOLUTION_CM) wxIMAGE_RESOLUTION_CM; %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_24BPP) wxBMP_24BPP;
%rename(BMP_8BPP) wxBMP_8BPP; %rename(BMP_8BPP) wxBMP_8BPP;
%rename(BMP_8BPP_GREY) wxBMP_8BPP_GREY; %rename(BMP_8BPP_GREY) wxBMP_8BPP_GREY;

12
wxPython/src/_image.i
View File

@@ -150,6 +150,9 @@ public:
} }
} }
// TODO: wxImage( char** xpmData );
void Create( int width, int height ); void Create( int width, int height );
void Destroy(); void Destroy();
@@ -452,6 +455,15 @@ MAKE_CONST_WXSTRING(IMAGE_OPTION_SAMPLESPERPIXEL);
MAKE_CONST_WXSTRING(IMAGE_OPTION_COMPRESSION); MAKE_CONST_WXSTRING(IMAGE_OPTION_COMPRESSION);
MAKE_CONST_WXSTRING(IMAGE_OPTION_IMAGEDESCRIPTOR); 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 enum
{ {

5
wxPython/wxPython/_core.py
View File

@@ -694,6 +694,11 @@ wxIMAGE_OPTION_BITSPERSAMPLE = wx._core.IMAGE_OPTION_BITSPERSAMPLE
wxIMAGE_OPTION_SAMPLESPERPIXEL = wx._core.IMAGE_OPTION_SAMPLESPERPIXEL wxIMAGE_OPTION_SAMPLESPERPIXEL = wx._core.IMAGE_OPTION_SAMPLESPERPIXEL
wxIMAGE_OPTION_COMPRESSION = wx._core.IMAGE_OPTION_COMPRESSION wxIMAGE_OPTION_COMPRESSION = wx._core.IMAGE_OPTION_COMPRESSION
wxIMAGE_OPTION_IMAGEDESCRIPTOR = wx._core.IMAGE_OPTION_IMAGEDESCRIPTOR 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_24BPP = wx._core.BMP_24BPP
wxBMP_8BPP = wx._core.BMP_8BPP wxBMP_8BPP = wx._core.BMP_8BPP
wxBMP_8BPP_GREY = wx._core.BMP_8BPP_GREY wxBMP_8BPP_GREY = wx._core.BMP_8BPP_GREY