Use /bin/echo for creation of Mac OS X PkgInfo files.

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

diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h
index a9d2f3fe36e5609b17762182a67605b2cb04df06..c799d9db5d3b1f4af004c5ff57b13932134fda69 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:
 // Purpose:     wxBitmap class
 // Author:      Stefan Csomor
 // Modified by:


@@ -87,7 +87,7 @@ class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
     friend class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
 
 public:
     friend class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
 
 public:

-    wxBitmap(); // Platform-specific
+    wxBitmap() {} // Platform-specific

 
     // Initialize with raw data.
     wxBitmap(const char bits[], int width, int height, int depth = 1);
 
     // Initialize with raw data.
     wxBitmap(const char bits[], int width, int height, int depth = 1);


@@ -100,9 +100,13 @@ public:
 
     // Constructor for generalised creation from data
     wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth = 1);
 
     // 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
 
     // If depth is omitted, will create a bitmap compatible with the display

-    wxBitmap(int width, int height, int depth = -1);
+    wxBitmap(int width, int height, int depth = -1) { (void)Create(width, height, depth); }
+    wxBitmap(const wxSize& sz, int depth = -1) { (void)Create(sz, depth); }

 
     // Convert from wxImage:
     wxBitmap(const wxImage& image, int depth = -1);
 
     // Convert from wxImage:
     wxBitmap(const wxImage& image, int depth = -1);


@@ -110,15 +114,20 @@ public:
     // Convert from wxIcon
     wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
 
     // Convert from wxIcon
     wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
 

-    virtual ~wxBitmap();
+    virtual ~wxBitmap() {}

 
     wxImage ConvertToImage() const;
 
     // get the given part of bitmap
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
 
     wxImage ConvertToImage() const;
 
     // get the given part of bitmap
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 

-    virtual bool Create(int width, int height, int depth = -1);
+    virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
+    virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
+        { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
+

     virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
     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;
     // 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;


@@ -162,9 +171,13 @@ public:
     // returns a CGImageRef which must released after usage with CGImageRelease
     CGImageRef CreateCGImage() const ;
 
     // 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;
     // 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;
 #endif
     // returns a IconRef which must be retained before and released after usage
     IconRef GetIconRef() const;