Merge branch 'rmv_symbols_3' of https://github.com/catalinr/wxWidgets
Remove obsolete mentions of Windows 9x, Windows CE and OS/2.
This commit is contained in:
@@ -64,10 +64,9 @@ static inline WORD GetNumberOfColours(WORD bitsPerPixel)
|
||||
// wrapper around ::GetObject() for DIB sections
|
||||
static inline bool GetDIBSection(HBITMAP hbmp, DIBSECTION *ds)
|
||||
{
|
||||
// note that at least under Win9x (this doesn't seem to happen under Win2K
|
||||
// but this doesn't mean anything, of course), GetObject() may return
|
||||
// sizeof(DIBSECTION) for a bitmap which is *not* a DIB section and the way
|
||||
// to check for it is by looking at the bits pointer
|
||||
// note that GetObject() may return sizeof(DIBSECTION) for a bitmap
|
||||
// which is *not* a DIB section and the way to check for it is
|
||||
// by looking at the bits pointer
|
||||
return ::GetObject(hbmp, sizeof(DIBSECTION), ds) == sizeof(DIBSECTION) &&
|
||||
ds->dsBm.bmBits;
|
||||
}
|
||||
@@ -485,8 +484,8 @@ HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
|
||||
HGLOBAL hDIB = ::GlobalAlloc(GMEM_MOVEABLE, size);
|
||||
if ( !hDIB )
|
||||
{
|
||||
// this is an error which does risk to happen especially under Win9x
|
||||
// and which the user may understand so let him know about it
|
||||
// this is an error which the user may understand so let him
|
||||
// know about it
|
||||
wxLogError(_("Failed to allocate %luKb of memory for bitmap data."),
|
||||
(unsigned long)(size / 1024));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user