native bitmap scaling codes

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

diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h
index d9ec58f7bfe42115c4c620436b8eb0f78f145aba..d6d973aedaf2d0b498039022432a3da51d046ab6 100644 (file)
--- a/include/wx/osx/bitmap.h
+++ b/include/wx/osx/bitmap.h
@@ -104,8 +104,9 @@ public:
     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(CGImageRef image, double scale = 1.0);
     wxBitmap(WX_NSImage image);
+    wxBitmap(CGContextRef bitmapcontext);
 
     // Create a bitmap compatible with the given DC
     wxBitmap(int width, int height, const wxDC& dc);
@@ -132,8 +133,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( CGImageRef image, double scale = 1.0 );
     bool Create( WX_NSImage image );
+    bool Create( CGContextRef bitmapcontext);
     
     // Create a bitmap compatible with the given DC, inheriting its magnification factor
     bool Create(int width, int height, const wxDC& dc);