wxDC rework, forgot these

[wxWidgets.git] / include / wx / msw / dib.h

diff --git a/include/wx/msw/dib.h b/include/wx/msw/dib.h
index c11e4e4d7289c4ab5efac48420370dba6590bbec..9b0751296ff25c1eea481ca6921c518eaadd2c3f 100644 (file)
--- a/include/wx/msw/dib.h
+++ b/include/wx/msw/dib.h
@@ -6,14 +6,14 @@
 // Created:     03.03.03 (replaces the old file with the same name)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997-2003 wxWidgets team
 // Created:     03.03.03 (replaces the old file with the same name)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997-2003 wxWidgets team

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_DIB_H_
 #define _WX_MSW_DIB_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_DIB_H_
 #define _WX_MSW_DIB_H_
 

-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxPalette;

 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 


@@ -41,6 +41,10 @@ public:
     wxDIB(const wxBitmap& bmp)
         { Init(); (void)Create(bmp); }
 
     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
     // 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);
     // 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
     bool Load(const wxString& filename);
 
     // dtor is not virtual, this class is not meant to be used polymorphically


@@ -60,7 +65,7 @@ public:
     // ----------
 
 #ifndef __WXWINCE__
     // ----------
 
 #ifndef __WXWINCE__

-    // create a bitmap compatiblr with the given HDC (or screen by default) and
+    // 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;
     // return its handle, the caller is responsible for freeing it (using
     // DeleteObject())
     HBITMAP CreateDDB(HDC hdc = 0) const;


@@ -98,7 +103,8 @@ public:
 
     // get raw pointer to bitmap bits, you should know what you do if you
     // decide to use it
 
     // 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
 
 
     // HBITMAP conversion


@@ -194,6 +200,11 @@ private:
     // the case
     bool m_ownsHandle;
 
     // 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&);
 
     // DIBs can't be copied
     wxDIB(const wxDIB&);


@@ -209,6 +220,7 @@ void wxDIB::Init()
 {
     m_handle = 0;
     m_ownsHandle = true;
 {
     m_handle = 0;
     m_ownsHandle = true;

+    m_hasAlpha = false;

 
     m_data = NULL;
 
 
     m_data = NULL;