X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..72ac4e888aff9b766216f96cc090b051a7f52188:/include/wx/cocoa/bitmap.h diff --git a/include/wx/cocoa/bitmap.h b/include/wx/cocoa/bitmap.h index 79d0c6279d..d3caa0d5a5 100644 --- a/include/wx/cocoa/bitmap.h +++ b/include/wx/cocoa/bitmap.h @@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; // ======================================================================== // A mask is a 1-bit alpha bitmap used for drawing bitmaps transparently. -class WXDLLEXPORT wxMask: public wxObject +class WXDLLIMPEXP_CORE wxMask: public wxObject { DECLARE_DYNAMIC_CLASS(wxMask) public: @@ -62,7 +62,7 @@ protected: // ======================================================================== // wxBitmap // ======================================================================== -class WXDLLEXPORT wxBitmap: public wxGDIObject +class WXDLLIMPEXP_CORE wxBitmap: public wxGDIObject { // ------------------------------------------------------------------------ // initialization @@ -135,7 +135,7 @@ public: wxMask *GetMask() const; void SetMask(wxMask *mask) ; - int GetBitmapType() const; + wxBitmapType GetBitmapType() const; // wxCocoa WX_NSBitmapImageRep GetNSBitmapImageRep(); @@ -152,9 +152,5 @@ protected: DECLARE_DYNAMIC_CLASS(wxBitmap) }; -class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase -{ - DECLARE_ABSTRACT_CLASS(wxBitmapHandler) -}; #endif // __WX_COCOA_BITMAP_H__