projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of wxFontMapper in wxBase library.
[wxWidgets.git]
/
include
/
wx
/
os2
/
gdiimage.h
diff --git
a/include/wx/os2/gdiimage.h
b/include/wx/os2/gdiimage.h
index 2dff008de0b79ac7bde0c0061ab058de7fa0f0e7..422d3d4b05f584fe7b4d5976aa656c9c260b116f 100644
(file)
--- a/
include/wx/os2/gdiimage.h
+++ b/
include/wx/os2/gdiimage.h
@@
-7,7
+7,7
@@
// Created: 20.11.99
// RCS-ID: $Id$
// Copyright: (c) 1999 David Webster
// Created: 20.11.99
// RCS-ID: $Id$
// Copyright: (c) 1999 David Webster
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
///////////////////////////////////////////////////////////////////////////////
// NB: this is a private header, it is not intended to be directly included by
///////////////////////////////////////////////////////////////////////////////
// NB: this is a private header, it is not intended to be directly included by
@@
-28,6
+28,8
@@
class WXDLLEXPORT wxGDIImageRefData;
class WXDLLEXPORT wxGDIImageHandler;
class WXDLLEXPORT wxGDIImage;
class WXDLLEXPORT wxGDIImageHandler;
class WXDLLEXPORT wxGDIImage;
+WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList);
+
// ----------------------------------------------------------------------------
// wxGDIImageRefData: common data fields for all derived classes
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxGDIImageRefData: common data fields for all derived classes
// ----------------------------------------------------------------------------
@@
-40,10
+42,6
@@
public:
m_nWidth = m_nHeight = m_nDepth = 0;
m_hHandle = 0;
m_nWidth = m_nHeight = m_nDepth = 0;
m_hHandle = 0;
-
-#if WXWIN_COMPATIBILITY_2
- m_bOk = FALSE;
-#endif // WXWIN_COMPATIBILITY_2
}
// accessors
}
// accessors
@@
-80,13
+78,7
@@
public:
WXHCURSOR m_hCursor;
};
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;
};
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
@@
-132,6
+124,12
@@
public:
,int nDesiredWidth
,int nDesiredHeight
) = 0;
,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
virtual bool Save( wxGDIImage* pImage
,const wxString& rName
,int lType
@@
-141,7
+139,7
@@
protected:
wxString m_sName;
wxString m_sExtension;
long m_lType;
wxString m_sName;
wxString m_sExtension;
long m_lType;
-};
+};
// end of wxGDIImageHandler
// ----------------------------------------------------------------------------
// wxGDIImage: this class supports GDI image handlers which may be registered
// ----------------------------------------------------------------------------
// wxGDIImage: this class supports GDI image handlers which may be registered
@@
-153,7
+151,7
@@
class WXDLLEXPORT wxGDIImage : public wxGDIObject
{
public:
// handlers list interface
{
public:
// handlers list interface
- static wxList& GetHandlers() { return ms_handlers; }
+ static wx
GDIImageHandler
List& GetHandlers() { return ms_handlers; }
static void AddHandler(wxGDIImageHandler* hHandler);
static void InsertHandler(wxGDIImageHandler* hHandler);
static void AddHandler(wxGDIImageHandler* hHandler);
static void InsertHandler(wxGDIImageHandler* hHandler);
@@
-212,6
+210,24
@@
public:
}
void SetSize(const wxSize& rSize) { SetSize(rSize.x, rSize.y); }
}
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();
// forward some of base class virtuals to wxGDIImageRefData
bool FreeResource(bool bForce = FALSE);
virtual WXHANDLE GetResourceHandle();
@@
-220,7
+236,7
@@
protected:
// create the data for the derived class here
virtual wxGDIImageRefData* CreateData() const = 0;
// create the data for the derived class here
virtual wxGDIImageRefData* CreateData() const = 0;
- static wx
List
ms_handlers;
+ static wx
GDIImageHandlerList
ms_handlers;
};
#endif // _WX_MSW_GDIIMAGE_H_
};
#endif // _WX_MSW_GDIIMAGE_H_