projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract default grid header renderers from wxGridCellAttrProvider.
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
bitmap.h
diff --git
a/include/wx/gtk1/bitmap.h
b/include/wx/gtk1/bitmap.h
index 5ecc5920ee7ef0cb528610b16b528f0a080c6342..14f94a6664c306bcec924337a2119d4df8af0fbb 100644
(file)
--- a/
include/wx/gtk1/bitmap.h
+++ b/
include/wx/gtk1/bitmap.h
@@
-64,28
+64,29
@@
private:
class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
{
public:
class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
{
public:
- wxBitmap();
- wxBitmap( int width, int height, int depth = -1 );
+ wxBitmap() {}
+ 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* const* bits );
#ifdef wxNEEDS_CHARPP
// needed for old GCC
wxBitmap(char** data)
{
wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( const char* const* bits );
#ifdef wxNEEDS_CHARPP
// needed for old GCC
wxBitmap(char** data)
{
- *this = wxBitmap(
wx_const_cast(const char* const*,
data));
+ *this = wxBitmap(
const_cast<const char* const*>(
data));
}
#endif
}
#endif
- wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_
TYPE_XPM
);
+ wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_
DEFAULT_TYPE
);
wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
virtual ~wxBitmap();
wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
virtual ~wxBitmap();
- bool Ok() const { return IsOk(); }
- bool IsOk() const;
- 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); }
- int GetHeight() const;
- int GetWidth() const;
- int GetDepth() const;
+
virtual
int GetHeight() const;
+
virtual
int GetWidth() const;
+
virtual
int GetDepth() const;
wxImage ConvertToImage() const;
wxImage ConvertToImage() const;
@@
-98,8
+99,8
@@
public:
wxBitmap GetSubBitmap( const wxRect& rect ) const;
bool SaveFile(const wxString &name, wxBitmapType type,
wxBitmap GetSubBitmap( const wxRect& rect ) const;
bool SaveFile(const wxString &name, wxBitmapType type,
- const wxPalette *palette =
(wxPalette *)
NULL) const;
- bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_
TYPE_XPM
);
+ const wxPalette *palette = NULL) const;
+ bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_
DEFAULT_TYPE
);
#if wxUSE_PALETTE
wxPalette *GetPalette() const;
#if wxUSE_PALETTE
wxPalette *GetPalette() const;
@@
-130,13
+131,12
@@
public:
void UngetRawData(wxPixelDataBase& data);
bool HasAlpha() const;
void UngetRawData(wxPixelDataBase& data);
bool HasAlpha() const;
- void UseAlpha();
protected:
bool CreateFromImage(const wxImage& image, int depth);
protected:
bool CreateFromImage(const wxImage& image, int depth);
- virtual wx
ObjectRefData *Create
RefData() const;
- virtual wx
ObjectRefData *CloneRefData(const wxObject
RefData *data) const;
+ virtual wx
GDIRefData *CreateGDI
RefData() const;
+ virtual wx
GDIRefData *CloneGDIRefData(const wxGDI
RefData *data) const;
private:
// to be called from CreateFromImage only!
private:
// to be called from CreateFromImage only!
@@
-149,13
+149,5
@@
private:
DECLARE_DYNAMIC_CLASS(wxBitmap)
};
DECLARE_DYNAMIC_CLASS(wxBitmap)
};
-//-----------------------------------------------------------------------------
-// wxBitmapHandler
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
-{
- DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
-};
#endif // __GTKBITMAPH__
#endif // __GTKBITMAPH__