use wx-style header and commets; fix indentation to be 4 spaces; move Doxygen comment...

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

diff --git a/include/wx/dfb/bitmap.h b/include/wx/dfb/bitmap.h
index 0bbda585bfc94447864a00d47f4bc7a7f9332f57..7ac7cf2b2eebcb503b9ed611f347fea9338e993c 100644 (file)
--- a/include/wx/dfb/bitmap.h
+++ b/include/wx/dfb/bitmap.h
@@ -13,18 +13,20 @@
 
 #include "wx/dfb/dfbptr.h"
 
 
 #include "wx/dfb/dfbptr.h"
 

+class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
+

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

-class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
+class WXDLLIMPEXP_CORE wxBitmapHandler : public wxBitmapHandlerBase

 {
     DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
 };
 
 {
     DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
 };
 

-class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
+class WXDLLIMPEXP_CORE wxBitmap : public wxBitmapBase

 {
 public:
     wxBitmap() {}
 {
 public:
     wxBitmap() {}


@@ -37,11 +39,6 @@ public:
     wxBitmap(const wxImage& image, int depth = -1);
 #endif
 
     wxBitmap(const wxImage& image, int depth = -1);
 #endif
 

-    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 +68,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);


@@ -80,9 +83,10 @@ public:
     wxIDirectFBSurfacePtr GetDirectFBSurface() const;
 
 protected:
     wxIDirectFBSurfacePtr GetDirectFBSurface() const;
 
 protected:

-    // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+    bool CreateWithFormat(int width, int height, int dfbFormat);

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