X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/341366c67a9af796d39e1f0af92635d47af5308f..21e0a4d5f15ea1df40d29359fc1e84085936ef3f:/include/wx/os2/bitmap.h diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h index 0908e667d5..e1953d3034 100644 --- a/include/wx/os2/bitmap.h +++ b/include/wx/os2/bitmap.h @@ -12,10 +12,6 @@ #ifndef _WX_BITMAP_H_ #define _WX_BITMAP_H_ -#ifdef __GNUG__ - #pragma interface "bitmap.h" -#endif - #include "wx/os2/private.h" #include "wx/os2/gdiimage.h" #include "wx/gdicmn.h" @@ -29,6 +25,7 @@ class WXDLLEXPORT wxIcon; class WXDLLEXPORT wxMask; class WXDLLEXPORT wxCursor; class WXDLLEXPORT wxControl; +class WXDLLEXPORT wxImage; // ---------------------------------------------------------------------------- // Bitmap data @@ -54,12 +51,12 @@ public: // ------------ wxDC* m_pSelectedInto; - HPS m_hPresentationSpace; - LONG m_lId; - // optional mask for transparent drawing + // + // Optional mask for transparent drawing + // wxMask* m_pBitmapMask; -}; +}; // end of CLASS wxBitmapRefData // ---------------------------------------------------------------------------- // wxBitmap: a mono or colour bitmap @@ -73,7 +70,7 @@ public: // Copy constructors inline wxBitmap(const wxBitmap& rBitmap) - { Init(); Ref(rBitmap); } + { Init(); Ref(rBitmap); SetHandle(rBitmap.GetHandle()); } // Initialize with raw data wxBitmap( const char bits[] @@ -83,15 +80,19 @@ public: ); // Initialize with XPM data - wxBitmap( char** ppData - ,wxControl* pAnItem = NULL - ); + wxBitmap(const char** ppData) { CreateFromXpm(ppData); } + wxBitmap(char** ppData) { CreateFromXpm((const char**)ppData); } - // Load a file or resource - wxBitmap( const wxString& rName + // Load a resource + wxBitmap( int nId ,long lType = wxBITMAP_TYPE_BMP_RESOURCE ); + // For compatiability with other ports, under OS/2 does same as default ctor + inline wxBitmap( const wxString& WXUNUSED(rFilename) + ,long WXUNUSED(lType) + ) + { Init(); } // New constructor for generalised creation from data wxBitmap( void* pData ,long lType @@ -101,10 +102,10 @@ public: ); // If depth is omitted, will create a bitmap compatible with the display - wxBitmap( int nWidth - ,int nHeight - ,int nDepth = -1 - ); + wxBitmap( int nWidth, int nHeight, 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! @@ -133,6 +134,8 @@ public: virtual ~wxBitmap(); + wxImage ConvertToImage() const; + // get the given part of bitmap wxBitmap GetSubBitmap(const wxRect& rRect) const; @@ -152,9 +155,12 @@ public: ,int nHeight ,int nDepth = 1 ); - virtual bool LoadFile( const wxString& rName + virtual bool LoadFile( int nId ,long lType = wxBITMAP_TYPE_BMP_RESOURCE ); + virtual bool LoadFile( const wxString& rName + ,long lType = wxBITMAP_TYPE_XPM + ); virtual bool SaveFile( const wxString& rName ,int lType ,const wxPalette* pCmap = NULL @@ -178,25 +184,12 @@ public: void SetMask(wxMask* pMask) ; - inline bool operator==(const wxBitmap& rBitmap) + inline bool operator==(const wxBitmap& rBitmap) const { return m_refData == rBitmap.m_refData; } - inline bool operator!=(const wxBitmap& rBitmap) + inline bool operator!=(const wxBitmap& rBitmap) const { return m_refData != rBitmap.m_refData; } -#if WXWIN_COMPATIBILITY_2 - void SetOk(bool bIsOk); -#endif // WXWIN_COMPATIBILITY_2 - -#if WXWIN_COMPATIBILITY - inline wxPalette* GetColourMap() const - { return GetPalette(); } - - inline void SetColourMap(wxPalette* pCmap) - { SetPalette(*pCmap); }; - -#endif // WXWIN_COMPATIBILITY - // Implementation public: inline void SetHBITMAP(WXHBITMAP hBmp) @@ -211,13 +204,11 @@ public: inline wxDC* GetSelectedInto() const { return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : (wxDC*) NULL); } + inline bool IsMono(void) const { return m_bIsMono; } + // 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(); @@ -226,11 +217,13 @@ protected: { return new wxBitmapRefData; } // creates the bitmap from XPM data, supposed to be called from ctor - bool CreateFromXpm(const char **bits); + bool CreateFromXpm(const char** ppData); + bool CreateFromImage(const wxImage& image, int depth); private: bool CopyFromIconOrCursor(const wxGDIImage& rIcon); + bool m_bIsMono; DECLARE_DYNAMIC_CLASS(wxBitmap) }; // end of CLASS wxBitmap @@ -281,10 +274,7 @@ public: protected: WXHBITMAP m_hMaskBitmap; DECLARE_DYNAMIC_CLASS(wxMask) -private: - HDC m_hDc; - HPS m_hPs; -}; // end of wxMask +}; // end of CLASS wxMask // ---------------------------------------------------------------------------- // wxBitmapHandler is a class which knows how to load/save bitmaps to/from file @@ -315,9 +305,14 @@ public: ,int nHeight ,int nDepth = 1 ); + virtual bool LoadFile( wxBitmap* pBitmap + ,int nId + ,long lFlags + ,int nDesiredWidth + ,int nDesiredHeight + ); virtual bool LoadFile( wxBitmap* pBitmap ,const wxString& rName - ,HPS hPs ,long lFlags ,int nDesiredWidth ,int nDesiredHeight @@ -336,8 +331,7 @@ public: ,int nDepth = 1 ); virtual bool Load( wxGDIImage* pImage - ,const wxString& rName - ,HPS hPs + ,int nId ,long lFlags ,int nDesiredWidth ,int nDesiredHeight @@ -347,8 +341,16 @@ public: ,int lType ); private: + inline virtual bool Load( wxGDIImage* WXUNUSED(pImage) + ,const wxString& WXUNUSED(rName) + ,HPS WXUNUSED(hPs) + ,long WXUNUSED(lFlags) + ,int WXUNUSED(nDesiredWidth) + ,int WXUNUSED(nDesiredHeight) + ) + { return false; } DECLARE_DYNAMIC_CLASS(wxBitmapHandler) -}; // end of wxBitmapHandler +}; // end of CLASS wxBitmapHandler #endif // _WX_BITMAP_H_