From: Vadim Zeitlin Date: Wed, 6 Feb 2013 12:46:24 +0000 (+0000) Subject: Allow creating wxCursor from ANI files under MSW. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/72bd600b33c1c2c0970abf0131cc028a366bd74e Allow creating wxCursor from ANI files under MSW. 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 --- diff --git a/docs/changes.txt b/docs/changes.txt index d6f1880a1e..1178a107d8 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -640,6 +640,7 @@ wxMSW: - Fix setting initial wxSpinCtrl value outside 0..100 range (joim). - Fix changing labels of menu items with bitmaps (Daniel Hyams). - Fix appearance of multiline coloured wxCheckBox (Catalin Raceanu). +- Allow creating wxCursor from ANI files (Catalin Raceanu). wxOSX/Cocoa: diff --git a/interface/wx/cursor.h b/interface/wx/cursor.h index 67714c5a87..7fc019850e 100644 --- a/interface/wx/cursor.h +++ b/interface/wx/cursor.h @@ -135,8 +135,9 @@ public: platforms: - under Windows, it defaults to @c wxBITMAP_TYPE_CUR_RESOURCE. 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 .ico icon file). + (to load a cursor from a .cur cursor file), @c wxBITMAP_TYPE_ICO + (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; when specifying a string resource name, first the color cursors 'crsr' and then the black/white cursors 'CURS' in the resource chain are scanned diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index bb932667b1..6ffb9e6401 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -240,6 +240,7 @@ wxCursor::wxCursor(const wxString& filename, break; #ifndef __WXWINCE__ + case wxBITMAP_TYPE_ANI: case wxBITMAP_TYPE_CUR: hcursor = ::LoadCursorFromFile(filename.t_str()); break;