Move HAVE_WCSXXX from wx/osx/config_xcode.h to wx/osx/chkconf.h.

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

diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h
index 736e325376e283f731ae859ac8d760107d61e79e..271e320d243c51a645cf4054cd039119366fef50 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);
@@ -115,7 +116,7 @@ public:
     wxBitmap(const wxSize& sz, int depth = -1) { (void)Create(sz, depth); }
 
     // Convert from wxImage:
-    wxBitmap(const wxImage& image, int depth = -1);
+    wxBitmap(const wxImage& image, int depth = -1, double scale = 1.0);
 
     // Convert from wxIcon
     wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
@@ -132,8 +133,15 @@ 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);
+
+    // Create a bitmap with a scale factor, width and height are multiplied with that factor
+    bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale);
     
     // virtual bool Create( WXHICON icon) ;
     virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
@@ -197,6 +205,7 @@ public:
     void *BeginRawAccess() ;
     void EndRawAccess() ;
 
+    double GetScaleFactor() const;
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;