More WinCE mods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-07-11 23:04:34 +00:00
parent 52cd14b1c8
commit f07dc2e2a7
6 changed files with 27 additions and 10 deletions

View File

@@ -506,6 +506,7 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
HBITMAP hbmp;
#if wxUSE_WXDIB
if ( wxShouldCreateDIB(w, h, d, hdc) )
{
if ( d == -1 )
@@ -525,6 +526,7 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
GetBitmapData()->m_depth = d;
}
else // create a DDB
#endif
{
if ( d == -1 )
d = wxDisplayDepth();
@@ -776,6 +778,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc)
bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc )
{
#if wxUSE_WXDIB
wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") );
UnRef();
@@ -835,6 +838,10 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc )
}
return TRUE;
#else
// FIXME: wxWinCE doesn't support wxDIB yet
return FALSE;
#endif
}
wxImage wxBitmap::ConvertToImage() const