Small fixes after wxHtmlTagHandler::GetParser() addition.

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

diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h
index bcbeb5187487290d8d76ab548b546054e9ce0d86..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:
 // 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 ) ;
 
     bool Create(const wxBitmap& bitmap);
     bool Create(const wxMemoryBuffer& buf, int width , int height , int bytesPerRow ) ;
 

+    wxBitmap GetBitmap() const;
+

     // Implementation below
 
     void Init() ;
     // Implementation below
 
     void Init() ;


@@ -103,6 +105,7 @@ public:
     
     // creates an bitmap from the native image format
     wxBitmap(CGImageRef image);
     
     // 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); }
 
     // 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); }


@@ -127,6 +130,7 @@ public:
 
     virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
     bool Create( CGImageRef image );
 
     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 Create( WXHICON icon) ;
     virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);