Add wxBitmap(NSImage*) ctor to wxOSX.

[wxWidgets.git] / include / wx / osx / bitmap.h

diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h
index 9fd20675fb05bee2cd48e42bd1515f80500299dd..eba46c6a1c2120fe8accadea3be7d9668c995df9 100644 (file)
--- a/include/wx/osx/bitmap.h
+++ b/include/wx/osx/bitmap.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.h
+// Name:        wx/osx/bitmap.h
 // Purpose:     wxBitmap class
 // Author:      Stefan Csomor
 // Modified by:
@@ -57,6 +57,8 @@ public:
     bool Create(const wxBitmap& bitmap);
     bool Create(const wxMemoryBuffer& buf, int width , int height , int bytesPerRow ) ;
 
+    wxBitmap GetBitmap() const;
+
     // Implementation below
 
     void Init() ;
@@ -100,6 +102,10 @@ 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);
+    wxBitmap(WX_NSImage 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 +129,9 @@ 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 );
+    bool Create( WX_NSImage 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;
@@ -166,9 +175,13 @@ public:
     // returns a CGImageRef which must released after usage with CGImageRelease
     CGImageRef CreateCGImage() const ;
 
-#if wxOSX_USE_COCOA_OR_IPHONE
+#if wxOSX_USE_COCOA
     // returns an autoreleased version of the image
     WX_NSImage GetNSImage() const;
+#endif
+#if wxOSX_USE_IPHONE
+    // returns an autoreleased version of the image
+    WX_UIImage GetUIImage() const;
 #endif
     // returns a IconRef which must be retained before and released after usage
     IconRef GetIconRef() const;