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

A couple of changes to wxImage:

Browse Source 
1. changed wxBMP_foo, wxCUR_foo to wxIMAGE_OPTION_{BMP,CUR}_foo
   (with backward compatiblity macros, of course)
2. applied Chris' patch to update hotspot when scaling an image
3. applied Chris' patch to write a filename in XPM and generalized it
   to pass wxIMAGE_OPTION_FILENAME to all saving handlers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-02-16 01:45:30 +00:00
parent 06534aa178
commit fd94e8aa45
7 changed files with 67 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/imagbmp.h
View File

@@ -17,8 +17,19 @@
#include "wx/image.h"
// defines for saving the BMP file in different formats, Bits Per Pixel
// USE: wximage.SetOption( wxBMP_FORMAT, wxBMP_xBPP );
#define wxBMP_FORMAT wxString(_T("wxBMP_FORMAT"))
// USE: wximage.SetOption( wxIMAGE_OPTION_BMP_FORMAT, wxBMP_xBPP );
#define wxIMAGE_OPTION_BMP_FORMAT wxString(_T("wxBMP_FORMAT"))
// These two options are filled in upon reading CUR file and can (should) be
// specified when saving a CUR file - they define the hotspot of the cursor:
#define wxIMAGE_OPTION_CUR_HOTSPOT_X wxT("HotSpotX")
#define wxIMAGE_OPTION_CUR_HOTSPOT_Y wxT("HotSpotY")
// Do not use these macros, they are deprecated!! :
#define wxBMP_FORMAT wxIMAGE_OPTION_BMP_FORMAT
#define wxCUR_HOTSPOT_X wxIMAGE_OPTION_CUR_HOTSPOT_X
#define wxCUR_HOTSPOT_Y wxIMAGE_OPTION_CUR_HOTSPOT_Y
enum
{
@@ -100,11 +111,6 @@ private:
// wxCURHandler
// ----------------------------------------------------------------------------
// These two options are filled in upon reading CUR file and can (should) be
// specified when saving a CUR file - they define the hotspot of the cursor:
#define wxCUR_HOTSPOT_X wxT("HotSpotX")
#define wxCUR_HOTSPOT_Y wxT("HotSpotY")
class WXDLLEXPORT wxCURHandler : public wxICOHandler
{
public:

2
include/wx/image.h
View File

@@ -27,6 +27,8 @@
#if wxUSE_IMAGE
#define wxIMAGE_OPTION_FILENAME wxString(_T("FileName"))
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------