typo fix

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

diff --git a/include/wx/osx/carbon/bitmap.h b/include/wx/osx/carbon/bitmap.h
index 5aa1ce31b352c296411c2d3bcac13f091b675b67..a9d2f3fe36e5609b17762182a67605b2cb04df06 100644 (file)
--- a/include/wx/osx/carbon/bitmap.h
+++ b/include/wx/osx/carbon/bitmap.h
@@ -96,7 +96,7 @@ public:
     wxBitmap(const char* const* bits);
 
     // Load a file or resource
     wxBitmap(const char* const* bits);
 
     // Load a file or resource

-    wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_PICT_RESOURCE);
+    wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);

 
     // 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);


@@ -120,7 +120,7 @@ public:
     virtual bool Create(int width, int height, int depth = -1);
     virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
     // virtual bool Create( WXHICON icon) ;
     virtual bool Create(int width, int height, int depth = -1);
     virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
     // virtual bool Create( WXHICON icon) ;

-    virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
+    virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);

     virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
 
     wxBitmapRefData *GetBitmapData() const
     virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
 
     wxBitmapRefData *GetBitmapData() const


@@ -162,6 +162,10 @@ 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
+    // returns an autoreleased version of the image
+    WX_NSImage GetNSImage() const;
+#endif

     // returns a IconRef which must be retained before and released after usage
     IconRef GetIconRef() const;
     // returns a IconRef which must be released after usage
     // returns a IconRef which must be retained before and released after usage
     IconRef GetIconRef() const;
     // returns a IconRef which must be released after usage