X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..9c805dec6caf3c98a3797898cffe795b5b56e606:/include/wx/palmos/bitmap.h diff --git a/include/wx/palmos/bitmap.h b/include/wx/palmos/bitmap.h index eff5365cb4..4ef6b5dd56 100644 --- a/include/wx/palmos/bitmap.h +++ b/include/wx/palmos/bitmap.h @@ -48,7 +48,7 @@ public: wxBitmap(const char* const* data); // Load a file or resource - wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE); + wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); // New constructor for generalised creation from data wxBitmap(const void* data, long type, int width, int height, int depth = 1); @@ -58,7 +58,8 @@ public: // // NB: this ctor will create a DIB for 24 and 32bpp bitmaps, use ctor // taking a DC argument if you want to force using DDB in this case - wxBitmap(int width, int height, int depth = -1); + wxBitmap(int width, int height, int depth = -1) { /*TODO*/ } + wxBitmap(const wxSize& sz, int depth = -1) { /*TODO*/ } // Create a bitmap compatible with the given DC wxBitmap(int width, int height, const wxDC& dc); @@ -91,10 +92,11 @@ public: return *this; } - virtual ~wxBitmap(); + virtual ~wxBitmap() {} #if wxUSE_IMAGE && wxUSE_WXDIB wxImage ConvertToImage() const; + wxBitmap ConvertToDisabled(unsigned char brightness = 255) const; #endif // wxUSE_IMAGE // get the given part of bitmap @@ -111,10 +113,13 @@ public: bool CopyFromDIB(const wxDIB& dib); #endif - virtual bool Create(int width, int height, int depth = -1); + virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); + virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) + { return Create(sz.GetWidth(), sz.GetHeight(), depth); } + virtual bool Create(int width, int height, const wxDC& dc); virtual bool Create(const void* data, long type, int width, int height, int depth = 1); - virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE); + virtual bool LoadFile(const wxString& name, long type = wxBITMAP_DEFAULT_TYPE); virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL); wxBitmapRefData *GetBitmapData() const @@ -143,11 +148,6 @@ public: void SetHBITMAP(WXHBITMAP bmp) { SetHandle((WXHANDLE)bmp); } WXHBITMAP GetHBITMAP() const { return (WXHBITMAP)GetHandle(); } -#ifdef __WXDEBUG__ - void SetSelectedInto(wxDC *dc); - wxDC *GetSelectedInto() const; -#endif // __WXDEBUG__ - protected: // common part of all ctors void Init();