///////////////////////////////////////////////////////////////////////////////
-// Name: include/wx/os2/gdiimage.h
+// Name: wx/os2/gdiimage.h
// Purpose: wxGDIImage class: base class for wxBitmap, wxIcon, wxCursor
// under OS/2
// Author: David Webster (adapted from msw version by Vadim Zeitlin)
// Created: 20.11.99
// RCS-ID: $Id$
// Copyright: (c) 1999 David Webster
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// NB: this is a private header, it is not intended to be directly included by
#ifndef _WX_OS2_GDIIMAGE_H_
#define _WX_OS2_GDIIMAGE_H_
-#ifdef __GNUG__
- #pragma interface "gdiimage.h"
-#endif
-
#include "wx/gdiobj.h" // base class
#include "wx/gdicmn.h" // wxBITMAP_TYPE_INVALID
#include "wx/list.h"
bool IsOk() const
{
if (m_hHandle == 0)
- return FALSE;
- return TRUE;
+ return false;
+ return true;
}
void SetSize( int nW
// real handler operations: to implement in derived classes
virtual bool Create( wxGDIImage* pImage
- ,void* pData
+ ,const void* pData
,long lFlags
,int nWidth
,int nHeight
pData->m_hHandle = hHandle;
}
- bool Ok() const { return GetHandle() != 0; }
+ bool Ok() const { return IsOk(); }
+ bool IsOk() const { return GetHandle() != 0; }
int GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_nWidth; }
int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_nHeight; }
pData->m_uId = uId;
}
// forward some of base class virtuals to wxGDIImageRefData
- bool FreeResource(bool bForce = FALSE);
- virtual WXHANDLE GetResourceHandle();
+ bool FreeResource(bool bForce = false);
+ virtual WXHANDLE GetResourceHandle() const;
protected:
// create the data for the derived class here