More changes needed to fix problems resulting from unnecessary wxCursor changes :-(
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -27,7 +27,7 @@ public:
 | 
				
			|||||||
             int hotSpotX = -1, int hotSpotY = -1,
 | 
					             int hotSpotX = -1, int hotSpotY = -1,
 | 
				
			||||||
             const char maskBits[] = NULL);
 | 
					             const char maskBits[] = NULL);
 | 
				
			||||||
    wxCursor(const wxString& name,
 | 
					    wxCursor(const wxString& name,
 | 
				
			||||||
             long flags = wxBITMAP_TYPE_CUR_RESOURCE,
 | 
					             wxBitmapType flags = wxBITMAP_TYPE_CUR_RESOURCE,
 | 
				
			||||||
             int hotSpotX = 0, int hotSpotY = 0);
 | 
					             int hotSpotX = 0, int hotSpotY = 0);
 | 
				
			||||||
    wxCursor(wxStockCursor idCursor);
 | 
					    wxCursor(wxStockCursor idCursor);
 | 
				
			||||||
    virtual ~wxCursor();
 | 
					    virtual ~wxCursor();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -231,7 +231,7 @@ wxCursor::wxCursor(const char WXUNUSED(bits)[],
 | 
				
			|||||||
#ifdef __WXMICROWIN__
 | 
					#ifdef __WXMICROWIN__
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxCursor::wxCursor(const wxString& WXUNUSED(filename),
 | 
					wxCursor::wxCursor(const wxString& WXUNUSED(filename),
 | 
				
			||||||
                   long WXUNUSED(kind),
 | 
					                   wxBitmapType WXUNUSED(kind),
 | 
				
			||||||
                   int WXUNUSED(hotSpotX),
 | 
					                   int WXUNUSED(hotSpotX),
 | 
				
			||||||
                   int WXUNUSED(hotSpotY))
 | 
					                   int WXUNUSED(hotSpotY))
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@@ -244,7 +244,7 @@ wxCursor::wxCursor(int WXUNUSED(cursor_type))
 | 
				
			|||||||
#else // !__WXMICROWIN__
 | 
					#else // !__WXMICROWIN__
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxCursor::wxCursor(const wxString& filename,
 | 
					wxCursor::wxCursor(const wxString& filename,
 | 
				
			||||||
                   long kind,
 | 
					                   wxBitmapType kind,
 | 
				
			||||||
                   int hotSpotX,
 | 
					                   int hotSpotX,
 | 
				
			||||||
                   int hotSpotY)
 | 
					                   int hotSpotY)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user