From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 24 Jan 2011 13:17:59 +0000 (+0000)
Subject: direct constructor from CGImageRef
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4cf611db979b5510f9d031a0cd29f25326b363f3?ds=inline

direct constructor from CGImageRef

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h
index 61420faaec..bcbeb51874 100644
--- a/include/wx/osx/bitmap.h
+++ b/include/wx/osx/bitmap.h
@@ -100,6 +100,9 @@ public:
 
     // Constructor for generalised creation from data
     wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth = 1);
+    
+    // creates an bitmap from the native image format
+    wxBitmap(CGImageRef image);
 
     // If depth is omitted, will create a bitmap compatible with the display
     wxBitmap(int width, int height, int depth = -1) { (void)Create(width, height, depth); }
@@ -123,6 +126,8 @@ public:
         { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
 
     virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
+    bool Create( CGImageRef image );
+    
     // virtual bool Create( WXHICON icon) ;
     virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
     virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;