Merge remote-tracking branch 'MaartenBent/bitmap_cursor_osx'

Add wxBitmap(const wxCursor &cursor) constructor to wxOSX.

See https://github.com/wxWidgets/wxWidgets/pull/2314

include/wx/osx/bitmap.h

@@ -126,6 +126,11 @@ public:
     // Convert from wxIcon
     wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
 
+#if wxOSX_USE_COCOA
+    // Convert from wxCursor
+    wxBitmap(const wxCursor &cursor);
+#endif
+
     virtual ~wxBitmap() {}
 
     wxImage ConvertToImage() const wxOVERRIDE;

include/wx/osx/cocoa/private.h

@@ -45,6 +45,7 @@ void WXDLLIMPEXP_CORE wxOSXSetImageSize(WX_NSImage image, CGFloat width, CGFloat
 wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxString &client, const wxSize& size);
 WXWindow WXDLLIMPEXP_CORE wxOSXGetMainWindow();
 WXWindow WXDLLIMPEXP_CORE wxOSXGetKeyWindow();
+WXImage WXDLLIMPEXP_CORE wxOSXGetNSImageFromNSCursor(const WXHCURSOR cursor);
 
 class WXDLLIMPEXP_FWD_CORE wxDialog;