projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the main message of wxGenericMessageDialog stand out.
[wxWidgets.git]
/
include
/
wx
/
dfb
/
bitmap.h
diff --git
a/include/wx/dfb/bitmap.h
b/include/wx/dfb/bitmap.h
index 3f26341f473675596b762e41f1187eaf4821052c..e7335658e5190bcf25a094d4607399681e07210b 100644
(file)
--- a/
include/wx/dfb/bitmap.h
+++ b/
include/wx/dfb/bitmap.h
@@
-13,35
+13,32
@@
#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
-{
- DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
-};
-
-class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
+class WXDLLIMPEXP_CORE wxBitmap : public wxBitmapBase
{
public:
wxBitmap() {}
wxBitmap(const wxIDirectFBSurfacePtr& surface) { Create(surface); }
{
public:
wxBitmap() {}
wxBitmap(const wxIDirectFBSurfacePtr& surface) { Create(surface); }
- wxBitmap(int width, int height, int depth = -1);
+ 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_RESOURC
E);
+ wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_
DEFAULT_TYP
E);
wxBitmap(const char* const* bits);
#if wxUSE_IMAGE
wxBitmap(const wxImage& image, int depth = -1);
#endif
wxBitmap(const char* const* bits);
#if wxUSE_IMAGE
wxBitmap(const wxImage& image, int depth = -1);
#endif
- bool Ok() const { return IsOk(); }
- bool IsOk() const;
-
bool Create(const wxIDirectFBSurfacePtr& surface);
bool Create(const wxIDirectFBSurfacePtr& surface);
- bool Create(int width, int height, int depth = -1);
+ 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;
@@
-56,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;
@@
-69,6
+67,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);
@@
-78,9
+82,8
@@
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);
bool CreateWithFormat(int width, int height, int dfbFormat);