X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbea3ec6ae2cd8c8d477c6f04a09ca8a1fa1ab96..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/cocoa/bitmap.h?ds=sidebyside diff --git a/include/wx/cocoa/bitmap.h b/include/wx/cocoa/bitmap.h index e1f3e681c4..59e7bbb732 100644 --- a/include/wx/cocoa/bitmap.h +++ b/include/wx/cocoa/bitmap.h @@ -59,10 +59,13 @@ protected: WX_NSBitmapImageRep m_cocoaNSBitmapImageRep; }; + // ======================================================================== // wxBitmap // ======================================================================== -class WXDLLIMPEXP_CORE wxBitmap: public wxGDIObject + +class WXDLLIMPEXP_CORE wxBitmap: public wxGDIObject, + public wxBitmapHelpers { // ------------------------------------------------------------------------ // initialization @@ -83,10 +86,13 @@ public: // Constructor for generalised creation from data wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth = 1); // 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) - { CreateFromImage(image, depth); } + { CreateFromImage(image, depth); } // Convert from wxIcon wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); } @@ -100,7 +106,10 @@ public: // Initialize from wxImage bool CreateFromImage(const wxImage& image, int depth=-1); - 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); } + bool Create(NSImage* cocoaNSImage); bool Create(NSBitmapImageRep* cocoaNSBitmapImageRep); virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);