// Created: 20.11.99
// RCS-ID: $Id$
// Copyright: (c) 1999 David Webster
-// Licence: wxWindows license
+// 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"
class WXDLLEXPORT wxGDIImageHandler;
class WXDLLEXPORT wxGDIImage;
+WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList);
+
// ----------------------------------------------------------------------------
// wxGDIImageRefData: common data fields for all derived classes
// ----------------------------------------------------------------------------
m_nWidth = m_nHeight = m_nDepth = 0;
m_hHandle = 0;
-
-#if WXWIN_COMPATIBILITY_2
- m_bOk = FALSE;
-#endif // WXWIN_COMPATIBILITY_2
}
// accessors
- bool IsOk() const { return m_hHandle != 0; }
+ bool IsOk() const
+ {
+ if (m_hHandle == 0)
+ return FALSE;
+ return TRUE;
+ }
void SetSize( int nW
,int nH
{ m_nWidth = nW; m_nHeight = nH; }
// free the ressources we allocated
- virtual void Free() = 0;
+ virtual void Free() { };
// for compatibility, the member fields are public
WXHCURSOR m_hCursor;
};
- // this filed is redundant and using it is error prone but keep it for
- // backwards compatibility
-#if WXWIN_COMPATIBILITY_2
- void SetOk() { m_bOk = m_hHandle != 0; }
-
- bool m_bOk;
-#endif // WXWIN_COMPATIBILITY_2
+ UINT m_uId;
};
// ----------------------------------------------------------------------------
,int nDesiredWidth
,int nDesiredHeight
) = 0;
+ virtual bool Load( wxGDIImage* pImage
+ ,int nId
+ ,long lFlags
+ ,int nDesiredWidth
+ ,int nDesiredHeight
+ ) = 0;
virtual bool Save( wxGDIImage* pImage
,const wxString& rName
,int lType
wxString m_sName;
wxString m_sExtension;
long m_lType;
-};
+}; // end of wxGDIImageHandler
// ----------------------------------------------------------------------------
// wxGDIImage: this class supports GDI image handlers which may be registered
{
public:
// handlers list interface
- static wxList& GetHandlers() { return ms_handlers; }
+ static wxGDIImageHandlerList& GetHandlers() { return ms_handlers; }
static void AddHandler(wxGDIImageHandler* hHandler);
static void InsertHandler(wxGDIImageHandler* hHandler);
// accessors
WXHANDLE GetHandle() const
- { return IsNull() ? 0 : GetGDIImageData()->m_hHandle; }
+ {
+ wxGDIImageRefData* pData;
+
+ pData = GetGDIImageData();
+ if (!pData)
+ return 0;
+ else
+ return pData->m_hHandle;
+ }
void SetHandle(WXHANDLE hHandle)
- { EnsureHasData(); GetGDIImageData()->m_hHandle = hHandle; }
+ {
+ wxGDIImageRefData* pData;
+
+ EnsureHasData();
+ pData = GetGDIImageData();
+ pData->m_hHandle = hHandle;
+ }
bool Ok() const { return GetHandle() != 0; }
}
void SetSize(const wxSize& rSize) { SetSize(rSize.x, rSize.y); }
+ UINT GetId(void) const
+ {
+ wxGDIImageRefData* pData;
+
+ pData = GetGDIImageData();
+ if (!pData)
+ return 0;
+ else
+ return pData->m_uId;
+ } // end of WxWinGdi_CGDIImage::GetId
+ void SetId(UINT uId)
+ {
+ wxGDIImageRefData* pData;
+
+ EnsureHasData();
+ pData = GetGDIImageData();
+ pData->m_uId = uId;
+ }
// forward some of base class virtuals to wxGDIImageRefData
bool FreeResource(bool bForce = FALSE);
virtual WXHANDLE GetResourceHandle();
// create the data for the derived class here
virtual wxGDIImageRefData* CreateData() const = 0;
- static wxList ms_handlers;
+ static wxGDIImageHandlerList ms_handlers;
};
#endif // _WX_MSW_GDIIMAGE_H_