X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97507ccea7da6ca3765aa3c56bc74b1db47ca557..5f3c1f2e2991d6c0a7d9eb4cb41a784c7dcc1707:/include/wx/os2/bitmap.h diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h index fdd415cfbc..a809df37ad 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,11 +51,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 @@ -72,7 +70,11 @@ public: // Copy constructors inline wxBitmap(const wxBitmap& rBitmap) - { Init(); Ref(rBitmap); } + : wxGDIImage(rBitmap) + { + Init(); + SetHandle(rBitmap.GetHandle()); + } // Initialize with raw data wxBitmap( const char bits[] @@ -82,17 +84,20 @@ public: ); // Initialize with XPM data - wxBitmap( char** ppData - ,wxControl* pAnItem = NULL - ); + wxBitmap(const char* const* bits); - // 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 + wxBitmap( const void* pData ,long lType ,int nWidth ,int nHeight @@ -100,23 +105,16 @@ 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! inline wxBitmap(const wxIcon& rIcon) { Init(); CopyFromIcon(rIcon); } - wxBitmap& operator=(const wxBitmap& rBitmap) - { - if ( m_refData != rBitmap.m_refData ) - Ref(rBitmap); - return(*this); - } - wxBitmap& operator=(const wxIcon& rIcon) { (void)CopyFromIcon(rIcon); @@ -132,6 +130,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); @@ -142,15 +145,18 @@ public: ,int nHeight ,int nDepth = -1 ); - virtual bool Create( void* pData + virtual bool Create( const void* pData ,long lType ,int nWidth ,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 @@ -174,25 +180,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) @@ -207,6 +200,8 @@ 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; @@ -217,11 +212,14 @@ protected: inline virtual wxGDIImageRefData* CreateData() const { return new wxBitmapRefData; } + bool CreateFromImage(const wxImage& image, int depth); + private: bool CopyFromIconOrCursor(const wxGDIImage& rIcon); + bool m_bIsMono; DECLARE_DYNAMIC_CLASS(wxBitmap) -}; +}; // end of CLASS wxBitmap // ---------------------------------------------------------------------------- // wxMask: a mono bitmap used for drawing bitmaps transparently. @@ -270,10 +268,7 @@ public: protected: WXHBITMAP m_hMaskBitmap; DECLARE_DYNAMIC_CLASS(wxMask) -private: - HDC m_hDc; - HPS m_hPs; -}; +}; // end of CLASS wxMask // ---------------------------------------------------------------------------- // wxBitmapHandler is a class which knows how to load/save bitmaps to/from file @@ -298,12 +293,18 @@ public: // keep wxBitmapHandler derived from wxGDIImageHandler compatible with the // old class which worked only with bitmaps virtual bool Create( wxBitmap* pBitmap - ,void* pData + ,const void* pData ,long lFlags ,int nWidth ,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 ,long lFlags @@ -317,14 +318,14 @@ public: ); virtual bool Create( wxGDIImage* pImage - ,void* pData + ,const void* pData ,long lFlags ,int nWidth ,int nHeight ,int nDepth = 1 ); virtual bool Load( wxGDIImage* pImage - ,const wxString& rName + ,int nId ,long lFlags ,int nDesiredWidth ,int nDesiredHeight @@ -334,8 +335,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 CLASS wxBitmapHandler #endif // _WX_BITMAP_H_