Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/dfb/bitmap.h b/include/wx/dfb/bitmap.h
index 751535c87b5d823a2eeb0b754ae866b7bc3db473..e7335658e5190bcf25a094d4607399681e07210b 100644 (file)
--- a/include/wx/dfb/bitmap.h
+++ b/include/wx/dfb/bitmap.h
@@ -11,72 +11,34 @@
 #ifndef _WX_DFB_BITMAP_H_
 #define _WX_DFB_BITMAP_H_
 
 #ifndef _WX_DFB_BITMAP_H_
 #define _WX_DFB_BITMAP_H_
 

-#include "wx/dfb/ifacehelpers.h"
+#include "wx/dfb/dfbptr.h"

 
 

-wxDFB_DECLARE_INTERFACE(IDirectFBSurface);
-
-//-----------------------------------------------------------------------------
-// wxMask
-//-----------------------------------------------------------------------------
-
-#warning "FIXME: move wxMask to common code"
-class WXDLLIMPEXP_CORE wxMask: public wxObject
-{
-public:
-    wxMask();
-    wxMask(const wxBitmap& bitmap);
-    wxMask(const wxBitmap& bitmap, const wxColour& colour);
-#if wxUSE_PALETTE
-    wxMask(const wxBitmap& bitmap, int paletteIndex);
-#endif
-    wxMask(const wxMask& mask);
-    ~wxMask();
-
-    bool Create(const wxBitmap& bitmap);
-    bool Create(const wxBitmap& bitmap, const wxColour& colour);
-#if wxUSE_PALETTE
-    bool Create(const wxBitmap& bitmap, int paletteIndex);
-#endif
+class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;

 
 

-    // implementation
-    const wxBitmap& GetBitmap() const;
-
-private:
-    wxBitmap *m_bitmap;
-
-    DECLARE_DYNAMIC_CLASS(wxMask)
-};
+wxDFB_DECLARE_INTERFACE(IDirectFBSurface);

 
 //-----------------------------------------------------------------------------
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxBitmap
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxBitmapHandler : public wxBitmapHandlerBase
-{
-public:
-    wxBitmapHandler() : wxBitmapHandlerBase() {}
-private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
-};
-
-class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
+class WXDLLIMPEXP_CORE wxBitmap : public wxBitmapBase

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

-    wxBitmap(int width, int height, int depth = -1);
+    wxBitmap(const wxIDirectFBSurfacePtr& surface) { Create(surface); }
+    wxBitmap(int width, int height, int depth = -1) { Create(width, height, depth); }
+    wxBitmap(const wxSize& sz, int depth = -1) { Create(sz, depth); }

     wxBitmap(const char bits[], int width, int height, int depth = 1);
     wxBitmap(const char bits[], int width, int height, int depth = 1);

-    wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
-    wxBitmap(const char **bits) { CreateFromXpm(bits); }
-    wxBitmap(char **bits) { CreateFromXpm((const char **)bits); }
+    wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
+    wxBitmap(const char* const* bits);

 #if wxUSE_IMAGE
     wxBitmap(const wxImage& image, int depth = -1);
 #endif
 
 #if wxUSE_IMAGE
     wxBitmap(const wxImage& image, int depth = -1);
 #endif
 

-    bool Ok() const;
-    bool operator==(const wxBitmap& bmp) const;
-    bool operator!=(const wxBitmap& bmp) const { return !(*this == bmp); }
-
-    bool Create(int width, int height, int depth = -1);
+    bool Create(const wxIDirectFBSurfacePtr& surface);
+    bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
+    bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
+        { return Create(sz.GetWidth(), sz.GetHeight(), depth); }

 
     virtual int GetHeight() const;
     virtual int GetWidth() const;
 
     virtual int GetHeight() const;
     virtual int GetWidth() const;


@@ -91,8 +53,9 @@ public:
 
     virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
 
 
     virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
 

-    virtual bool SaveFile(const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL) const;
-    virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
+    virtual bool SaveFile(const wxString &name, wxBitmapType type,
+                          const wxPalette *palette = NULL) const;
+    virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);

 
 #if wxUSE_PALETTE
     virtual wxPalette *GetPalette() const;
 
 #if wxUSE_PALETTE
     virtual wxPalette *GetPalette() const;


@@ -104,20 +67,25 @@ 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);
     virtual void SetDepth(int depth);
 
     // get underlying native representation:
     // implementation:
     virtual void SetHeight(int height);
     virtual void SetWidth(int width);
     virtual void SetDepth(int depth);
 
     // get underlying native representation:

-    IDirectFBSurfacePtr GetDirectFBSurface() const;
+    wxIDirectFBSurfacePtr GetDirectFBSurface() const;

 
 protected:
 
 protected:

-    bool CreateFromXpm(const char **bits);
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
 

-    // ref counting code
-    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)
 };