implement wxSpinCtrl::Reparent() to properly reparent both the spin button and the...

[wxWidgets.git] / src / dfb / bitmap.cpp

diff --git a/src/dfb/bitmap.cpp b/src/dfb/bitmap.cpp
index 26b3ada0987e59222e51de9ecbe99e67eff88b6c..483183e4f8ac73694b649c8c9b8c4ff6a944ba4e 100644 (file)
--- a/src/dfb/bitmap.cpp
+++ b/src/dfb/bitmap.cpp
@@ -325,9 +325,16 @@ bool wxBitmap::CreateWithFormat(int width, int height, int dfbFormat)
 }
 
 #if wxUSE_IMAGE
 }
 
 #if wxUSE_IMAGE

-wxBitmap::wxBitmap(const wxImage& image, int depth)
+wxBitmap::wxBitmap(const wxImage& imageOrig, int depth)

 {
 {

-    wxCHECK_RET( image.Ok(), wxT("invalid image") );
+    wxCHECK_RET( imageOrig.Ok(), wxT("invalid image") );
+
+    wxImage image(imageOrig);
+
+    // convert mask to alpha channel, because wxMask isn't implemented yet
+    // FIXME: don't do this, implement proper wxMask support
+    if ( image.HasMask() )
+        image.InitAlpha();

 
     DFBSurfacePixelFormat format = DepthToFormat(depth);
     if ( format == DSPF_UNKNOWN && image.HasAlpha() )
 
     DFBSurfacePixelFormat format = DepthToFormat(depth);
     if ( format == DSPF_UNKNOWN && image.HasAlpha() )


@@ -362,9 +369,6 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
                 return;
         }
     }
                 return;
         }
     }

-
-    // FIXME: implement mask creation from image's mask (or alpha channel?)
-    wxASSERT_MSG( !image.HasMask(), "image masks are ignored for now" );

 }
 
 wxImage wxBitmap::ConvertToImage() const
 }
 
 wxImage wxBitmap::ConvertToImage() const