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 d6f1880a1e1ec570c9916a1d9dbe5d0c84424b17..1178a107d8797ed49023a374ee3a700836048ba7 100644 (file)
--- 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).
 - 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:
 
 
 wxOSX/Cocoa:
 

diff --git a/interface/wx/cursor.h b/interface/wx/cursor.h
index 67714c5a877c4e5b141b24e0351f6932c89946b3..7fc019850ebdf02fd7878e92ff681e29cdb6fc1c 100644 (file)
--- 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
             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 
             - 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 bb932667b1b9d378a063b5686f9a08b4b761d37e..6ffb9e6401014c55c5ebb7cc21770cae0626ded3 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -240,6 +240,7 @@ wxCursor::wxCursor(const wxString& filename,
             break;
 
 #ifndef __WXWINCE__
             break;
 
 #ifndef __WXWINCE__

+        case wxBITMAP_TYPE_ANI:

         case wxBITMAP_TYPE_CUR:
             hcursor = ::LoadCursorFromFile(filename.t_str());
             break;
         case wxBITMAP_TYPE_CUR:
             hcursor = ::LoadCursorFromFile(filename.t_str());
             break;