X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbea3ec6ae2cd8c8d477c6f04a09ca8a1fa1ab96..f1a73c6a816aeba155e88c628a0a778a2fe068bd:/include/wx/palmos/bitmap.h?ds=sidebyside diff --git a/include/wx/palmos/bitmap.h b/include/wx/palmos/bitmap.h index 04b38d7b08..e31cf24ce0 100644 --- a/include/wx/palmos/bitmap.h +++ b/include/wx/palmos/bitmap.h @@ -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,7 +92,7 @@ public: return *this; } - virtual ~wxBitmap(); + virtual ~wxBitmap() {} #if wxUSE_IMAGE && wxUSE_WXDIB wxImage ConvertToImage() const; @@ -111,7 +112,10 @@ 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_DEFAULT_TYPE); @@ -143,11 +147,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();