AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow creating wxCursor from ANI files under MSW.

Browse Source 
Simply pass them to the standard LoadCursorFromFile() function which supports
this format.

Closes #3472.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-02-06 12:46:24 +00:00
parent d6b180ec36
commit 72bd600b33
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -640,6 +640,7 @@ wxMSW:
- Fix setting initial wxSpinCtrl value outside 0..100 range (joim). - Fix setting initial wxSpinCtrl value outside 0..100 range (joim).
- Fix changing labels of menu items with bitmaps (Daniel Hyams). - Fix changing labels of menu items with bitmaps (Daniel Hyams).
- Fix appearance of multiline coloured wxCheckBox (Catalin Raceanu). - Fix appearance of multiline coloured wxCheckBox (Catalin Raceanu).
- Allow creating wxCursor from ANI files (Catalin Raceanu).
wxOSX/Cocoa: wxOSX/Cocoa:

5
interface/wx/cursor.h
View File

@ -135,8 +135,9 @@ public:
platforms: platforms:
- under Windows, it defaults to @c wxBITMAP_TYPE_CUR_RESOURCE. - under Windows, it defaults to @c wxBITMAP_TYPE_CUR_RESOURCE.
Other permitted types under Windows are @c wxBITMAP_TYPE_CUR Other permitted types under Windows are @c wxBITMAP_TYPE_CUR
(to load a cursor from a .cur cursor file) and @c wxBITMAP_TYPE_ICO (to load a cursor from a .cur cursor file), @c wxBITMAP_TYPE_ICO
(to load a cursor from a .ico icon file). (to load a cursor from a .ico icon file) and @c wxBITMAP_TYPE_ANI
(to load a cursor from a .ani icon file).
- under MacOS, it defaults to @c wxBITMAP_TYPE_MACCURSOR_RESOURCE; - under MacOS, it defaults to @c wxBITMAP_TYPE_MACCURSOR_RESOURCE;
when specifying a string resource name, first the color cursors 'crsr' when specifying a string resource name, first the color cursors 'crsr'
and then the black/white cursors 'CURS' in the resource chain are scanned and then the black/white cursors 'CURS' in the resource chain are scanned

1
src/msw/cursor.cpp
View File

@ -240,6 +240,7 @@ wxCursor::wxCursor(const wxString& filename,
break; break;
#ifndef __WXWINCE__ #ifndef __WXWINCE__
case wxBITMAP_TYPE_ANI:
case wxBITMAP_TYPE_CUR: case wxBITMAP_TYPE_CUR:
hcursor = ::LoadCursorFromFile(filename.t_str()); hcursor = ::LoadCursorFromFile(filename.t_str());
break; break;