added (wxMSW-only) wxToolTip::SetMaxWidth() and improve its default behaviour (#2817)

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

diff --git a/include/wx/dfb/bitmap.h b/include/wx/dfb/bitmap.h
index 05f1fe5013a565478456a1f52d83302e641bbb7f..246582a8096ddeeae92d899fcf9116541a43f179 100644 (file)
--- a/include/wx/dfb/bitmap.h
+++ b/include/wx/dfb/bitmap.h
@@ -13,38 +13,27 @@
 
 #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
-{
-public:
-    wxBitmapHandler() : wxBitmapHandlerBase() {}
-private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
-};
-
-class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
+class WXDLLIMPEXP_CORE wxBitmap : public wxBitmapBase

 {
 public:
     wxBitmap() {}
     wxBitmap(const wxIDirectFBSurfacePtr& surface) { Create(surface); }
     wxBitmap(int width, int height, int depth = -1);
     wxBitmap(const char bits[], int width, int height, int depth = 1);
 {
 public:
     wxBitmap() {}
     wxBitmap(const wxIDirectFBSurfacePtr& surface) { Create(surface); }
     wxBitmap(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(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);
 


@@ -61,8 +50,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;


@@ -74,6 +64,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);


@@ -83,11 +79,10 @@ public:
     wxIDirectFBSurfacePtr GetDirectFBSurface() const;
 
 protected:
     wxIDirectFBSurfacePtr GetDirectFBSurface() const;
 
 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)
 };