Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxOS2 no longer relies on xpmlib

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-02-18 04:32:01 +00:00
parent 98edf62696
commit 1c344e89c6
5 changed files with 35 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/os2/bitmap.cpp
View File

@@ -33,6 +33,7 @@
//#include "wx/msw/dib.h"
#include "wx/image.h"
#include "wx/xpmdecod.h"
// ----------------------------------------------------------------------------
// macros
@@ -211,37 +212,6 @@ wxBitmap::wxBitmap(
SetHBITMAP((WXHBITMAP)hBmp);
} // end of wxBitmap::wxBitmap
//
// Create from XPM data
//
wxBitmap::wxBitmap(
char** ppData
)
{
Init();
(void)Create( (void *)ppData
,wxBITMAP_TYPE_XPM_DATA
,0
,0
,0
);
} // end of wxBitmap::wxBitmap
wxBitmap::wxBitmap(
const char** ppData
)
{
Init();
(void)Create( (void *)ppData
,wxBITMAP_TYPE_XPM_DATA
,0
,0
,0
);
} // end of wxBitmap::wxBitmap
wxBitmap::wxBitmap(
int nW
, int nH
@@ -361,6 +331,27 @@ bool wxBitmap::Create(
return Ok();
} // end of wxBitmap::Create
bool wxBitmap::CreateFromXpm(
const char** ppData
)
{
#if wxUSE_IMAGE && wxUSE_XPM
Init();
wxCHECK_MSG(ppData != NULL, FALSE, wxT("invalid bitmap data"))
wxXPMDecoder vDecoder;
wxImage vImg = vDecoder.ReadData(ppData);
wxCHECK_MSG(vImg.Ok(), FALSE, wxT("invalid bitmap data"))
*this = wxBitmap(vImg);
return TRUE;
#else
return FALSE;
#endif
} // end of wxBitmap::CreateFromXpm
bool wxBitmap::LoadFile(
const wxString& rFilename
, long lType
@@ -671,7 +662,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
wxImage wxBitmap::ConvertToImage() const
{
wxImage image;
wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
// create an wxImage object