X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58b1642453c5858a4dd29425b065e9215cb8ec79..b77d96500ac802c84e0416e715c907e34d335632:/include/wx/os2/bitmap.h?ds=inline diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h index a9946995d9..ba920a1fac 100644 --- a/include/wx/os2/bitmap.h +++ b/include/wx/os2/bitmap.h @@ -29,6 +29,7 @@ class WXDLLEXPORT wxIcon; class WXDLLEXPORT wxMask; class WXDLLEXPORT wxCursor; class WXDLLEXPORT wxControl; +class WXDLLEXPORT wxImage; // ---------------------------------------------------------------------------- // Bitmap data @@ -54,11 +55,12 @@ public: // ------------ wxDC* m_pSelectedInto; - HPS m_hPresentationSpace; - // optional mask for transparent drawing + // + // Optional mask for transparent drawing + // wxMask* m_pBitmapMask; -}; +}; // end of CLASS wxBitmapRefData // ---------------------------------------------------------------------------- // wxBitmap: a mono or colour bitmap @@ -82,9 +84,8 @@ public: ); // Initialize with XPM data - wxBitmap( char** ppData - ,wxControl* pAnItem = NULL - ); + wxBitmap(const char** ppData); + wxBitmap(char** ppData); // Load a file or resource wxBitmap( const wxString& rName @@ -105,6 +106,9 @@ public: ,int nDepth = -1 ); + wxBitmap( const wxImage& image, int depth = -1 ) + { (void)CreateFromImage(image, depth); } + // we must have this, otherwise icons are silently copied into bitmaps using // the copy ctor but the resulting bitmap is invalid! inline wxBitmap(const wxIcon& rIcon) @@ -132,6 +136,11 @@ public: virtual ~wxBitmap(); + wxImage ConvertToImage() const; + + // get the given part of bitmap + wxBitmap GetSubBitmap(const wxRect& rRect) const; + // copies the contents and mask of the given (colour) icon to the bitmap bool CopyFromIcon(const wxIcon& rIcon); @@ -210,6 +219,10 @@ public: // An OS/2 version that probably doesn't do anything like the msw version wxBitmap GetBitmapForDC(wxDC& rDc) const; +// inline LONG GetId() const +// { return (GetBitmapData() ? GetBitmapData()->m_lId : 0L); } + + protected: // common part of all ctors void Init(); @@ -217,13 +230,15 @@ protected: inline virtual wxGDIImageRefData* CreateData() const { return new wxBitmapRefData; } + // creates the bitmap from XPM data, supposed to be called from ctor + bool CreateFromXpm(const char **bits); + bool CreateFromImage(const wxImage& image, int depth); + private: bool CopyFromIconOrCursor(const wxGDIImage& rIcon); - HDC m_hDc; - HPS m_hPs; DECLARE_DYNAMIC_CLASS(wxBitmap) -}; +}; // end of CLASS wxBitmap // ---------------------------------------------------------------------------- // wxMask: a mono bitmap used for drawing bitmaps transparently. @@ -272,7 +287,7 @@ public: protected: WXHBITMAP m_hMaskBitmap; DECLARE_DYNAMIC_CLASS(wxMask) -}; +}; // end of CLASS wxMask // ---------------------------------------------------------------------------- // wxBitmapHandler is a class which knows how to load/save bitmaps to/from file @@ -305,6 +320,7 @@ public: ); virtual bool LoadFile( wxBitmap* pBitmap ,const wxString& rName + ,HPS hPs ,long lFlags ,int nDesiredWidth ,int nDesiredHeight @@ -324,6 +340,7 @@ public: ); virtual bool Load( wxGDIImage* pImage ,const wxString& rName + ,HPS hPs ,long lFlags ,int nDesiredWidth ,int nDesiredHeight @@ -334,7 +351,7 @@ public: ); private: DECLARE_DYNAMIC_CLASS(wxBitmapHandler) -}; +}; // end of CLASS wxBitmapHandler #endif // _WX_BITMAP_H_