X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/086b3a5b02f91b0553970b7c68c3bbde7c047ecc..9d529fa05c2bef6aa4ae9f08b39bb7c0a4fe5c59:/include/wx/msw/dib.h diff --git a/include/wx/msw/dib.h b/include/wx/msw/dib.h index 7f0d2ecb07..0a9fd4587a 100644 --- a/include/wx/msw/dib.h +++ b/include/wx/msw/dib.h @@ -5,7 +5,7 @@ // Modified by: // Created: 03.03.03 (replaces the old file with the same name) // RCS-ID: $Id$ -// Copyright: (c) 1997-2003 wxWindows team +// Copyright: (c) 1997-2003 wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -41,6 +41,10 @@ public: wxDIB(const wxBitmap& bmp) { Init(); (void)Create(bmp); } + // create a DIB from the Windows DDB + wxDIB(HBITMAP hbmp) + { Init(); (void)Create(hbmp); } + // load a DIB from file (any depth is supoprted here unlike above) // // as above, use IsOk() to see if the bitmap was loaded successfully @@ -50,6 +54,7 @@ public: // same as the corresponding ctors but with return value bool Create(int width, int height, int depth); bool Create(const wxBitmap& bmp); + bool Create(HBITMAP hbmp); bool Load(const wxString& filename); // dtor is not virtual, this class is not meant to be used polymorphically @@ -59,10 +64,12 @@ public: // operations // ---------- - // create a bitmap compatiblr with the given HDC (or screen by default) and +#ifndef __WXWINCE__ + // create a bitmap compatible with the given HDC (or screen by default) and // return its handle, the caller is responsible for freeing it (using // DeleteObject()) HBITMAP CreateDDB(HDC hdc = 0) const; +#endif // !__WXWINCE__ // get the handle from the DIB and reset it, i.e. this object won't destroy // the DIB after this (but the caller should do it) @@ -96,15 +103,17 @@ public: // get raw pointer to bitmap bits, you should know what you do if you // decide to use it - void *GetData() const { DoGetObject(); return m_data; } + unsigned char *GetData() const + { DoGetObject(); return (unsigned char *)m_data; } // HBITMAP conversion // ------------------ - // these functions are only used by wxWindows internally right now, please + // these functions are only used by wxWidgets internally right now, please // don't use them directly if possible as they're subject to change +#ifndef __WXWINCE__ // creates a DDB compatible with the given (or screen) DC from either // a plain DIB or a DIB section (in which case the last parameter must be // non NULL) @@ -122,6 +131,7 @@ public: // function (this overload is needed for wxBitmapDataObject code in // src/msw/ole/dataobj.cpp) static size_t ConvertFromBitmap(BITMAPINFO *pbi, HBITMAP hbmp); +#endif // __WXWINCE__ // wxImage conversion @@ -158,6 +168,11 @@ private: // free resources void Free(); + // initialize the contents from the provided DDB (Create() must have been + // already called) + bool CopyFromDDB(HBITMAP hbmp); + + // the DIB section handle, 0 if invalid HBITMAP m_handle; @@ -185,6 +200,11 @@ private: // the case bool m_ownsHandle; + // if true, we have alpha, if false we don't (note that we can still have + // m_depth == 32 but the last component is then simply padding and not + // alpha) + bool m_hasAlpha; + // DIBs can't be copied wxDIB(const wxDIB&); @@ -200,6 +220,7 @@ void wxDIB::Init() { m_handle = 0; m_ownsHandle = true; + m_hasAlpha = false; m_data = NULL;