Tweaks needed to update to current CVS

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-04-23 23:24:56 +00:00
parent 9cc79dd629
commit a7c987f91e
10 changed files with 37 additions and 9 deletions

View File

@@ -27,7 +27,6 @@ enum {
wxIMAGE_ALPHA_OPAQUE
};
// Constants for wxImage::Scale() for determining the level of quality
enum
{
@@ -1141,13 +1140,21 @@ MAKE_CONST_WXSTRING(IMAGE_OPTION_RESOLUTIONY);
MAKE_CONST_WXSTRING(IMAGE_OPTION_RESOLUTIONUNIT);
MAKE_CONST_WXSTRING(IMAGE_OPTION_QUALITY);
enum
// constants used with wxIMAGE_OPTION_RESOLUTIONUNIT
enum wxImageResolution
{
// Resolution not specified
wxIMAGE_RESOLUTION_NONE = 0,
// Resolution specified in inches
wxIMAGE_RESOLUTION_INCHES = 1,
// Resolution specified in centimeters
wxIMAGE_RESOLUTION_CM = 2
};
MAKE_CONST_WXSTRING(IMAGE_OPTION_BITSPERSAMPLE);
MAKE_CONST_WXSTRING(IMAGE_OPTION_SAMPLESPERPIXEL);
MAKE_CONST_WXSTRING(IMAGE_OPTION_COMPRESSION);