set eol-style

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

diff --git a/include/wx/cocoa/bitmap.h b/include/wx/cocoa/bitmap.h
index 4eccb2eb7c03fbefc6c67decc7efccac9488c88a..ca2b3b07759934b8bfb66c9f583af838c61ef175 100644 (file)
--- a/include/wx/cocoa/bitmap.h
+++ b/include/wx/cocoa/bitmap.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/cocoa/bitmap.h
+// Name:        wx/cocoa/bitmap.h

 // Purpose:     wxBitmap class
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/07/19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Purpose:     wxBitmap class
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/07/19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BITMAP_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BITMAP_H__


@@ -15,11 +15,11 @@
 #include "wx/palette.h"
 
 // Bitmap
 #include "wx/palette.h"
 
 // Bitmap

-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxIcon;
-class WXDLLEXPORT wxCursor;
-class WXDLLEXPORT wxImage;
-class WXDLLEXPORT wxPixelDataBase;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxCursor;
+class WXDLLIMPEXP_FWD_CORE wxImage;
+class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;

 
 // ========================================================================
 // wxMask
 
 // ========================================================================
 // wxMask


@@ -43,6 +43,9 @@ public:
     // Construct a mask from a mono bitmap (copies the bitmap).
     wxMask(const wxBitmap& bitmap);
 
     // Construct a mask from a mono bitmap (copies the bitmap).
     wxMask(const wxBitmap& bitmap);
 

+    // Copy constructor
+    wxMask(const wxMask& src);
+

     virtual ~wxMask();
 
     bool Create(const wxBitmap& bitmap, const wxColour& colour);
     virtual ~wxMask();
 
     bool Create(const wxBitmap& bitmap, const wxColour& colour);


@@ -86,7 +89,7 @@ public:
 
     // destructor
     virtual ~wxBitmap();
 
     // destructor
     virtual ~wxBitmap();

-  
+

 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------


@@ -107,7 +110,8 @@ public:
     // get the given part of bitmap
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
     // get the given part of bitmap
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

     int GetWidth() const;
     int GetHeight() const;
     int GetDepth() const;
     int GetWidth() const;
     int GetHeight() const;
     int GetDepth() const;


@@ -121,7 +125,6 @@ public:
     // raw bitmap access support functions
     void *GetRawData(wxPixelDataBase& data, int bpp);
     void UngetRawData(wxPixelDataBase& data);
     // raw bitmap access support functions
     void *GetRawData(wxPixelDataBase& data, int bpp);
     void UngetRawData(wxPixelDataBase& data);

-    void UseAlpha();

 
     wxPalette* GetPalette() const;
     void SetPalette(const wxPalette& palette);
 
     wxPalette* GetPalette() const;
     void SetPalette(const wxPalette& palette);


@@ -130,11 +133,6 @@ public:
     void SetMask(wxMask *mask) ;
 
     int GetBitmapType() const;
     void SetMask(wxMask *mask) ;
 
     int GetBitmapType() const;

-  
-    inline bool operator == (const wxBitmap& bitmap) const
-    {   return m_refData == bitmap.m_refData; }
-    inline bool operator != (const wxBitmap& bitmap) const
-    {   return m_refData != bitmap.m_refData; }

 
     // wxObjectRefData
     wxObjectRefData *CreateRefData() const;
 
     // wxObjectRefData
     wxObjectRefData *CreateRefData() const;


@@ -154,4 +152,5 @@ class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
     DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
 };
 
     DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
 };
 

-#endif // __WX_COCOA_BITMAP_H__
+#endif
+    // __WX_COCOA_BITMAP_H__