rename wxFileList to wxFileListCtrl

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

diff --git a/include/wx/dfb/bitmap.h b/include/wx/dfb/bitmap.h
index 0bbda585bfc94447864a00d47f4bc7a7f9332f57..28bd0b0f280f918897cd61ac98b3ce2ceaee3d31 100644 (file)
--- a/include/wx/dfb/bitmap.h
+++ b/include/wx/dfb/bitmap.h
@@ -13,6 +13,8 @@
 
 #include "wx/dfb/dfbptr.h"
 
 
 #include "wx/dfb/dfbptr.h"
 

+class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
+

 wxDFB_DECLARE_INTERFACE(IDirectFBSurface);
 
 //-----------------------------------------------------------------------------
 wxDFB_DECLARE_INTERFACE(IDirectFBSurface);
 
 //-----------------------------------------------------------------------------


@@ -39,8 +41,6 @@ public:
 
     bool Ok() const { return IsOk(); }
     bool IsOk() const;
 
     bool Ok() const { return IsOk(); }
     bool IsOk() const;

-    bool operator==(const wxBitmap& bmp) const;
-    bool operator!=(const wxBitmap& bmp) const { return !(*this == bmp); }

 
     bool Create(const wxIDirectFBSurfacePtr& surface);
     bool Create(int width, int height, int depth = -1);
 
     bool Create(const wxIDirectFBSurfacePtr& surface);
     bool Create(int width, int height, int depth = -1);


@@ -71,6 +71,12 @@ public:
 
     static void InitStandardHandlers();
 
 
     static void InitStandardHandlers();
 

+    // raw bitmap access support functions
+    void *GetRawData(wxPixelDataBase& data, int bpp);
+    void UngetRawData(wxPixelDataBase& data);
+
+    bool HasAlpha() const;
+

     // implementation:
     virtual void SetHeight(int height);
     virtual void SetWidth(int width);
     // implementation:
     virtual void SetHeight(int height);
     virtual void SetWidth(int width);


@@ -84,6 +90,8 @@ protected:
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 

+    bool CreateWithFormat(int width, int height, int dfbFormat);
+

     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };