projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxFileName II. It actually works.
[wxWidgets.git]
/
include
/
wx
/
os2
/
gdiimage.h
diff --git
a/include/wx/os2/gdiimage.h
b/include/wx/os2/gdiimage.h
index db980074f79f51479365b7e9127ec11f0099a93e..2dff008de0b79ac7bde0c0061ab058de7fa0f0e7 100644
(file)
--- a/
include/wx/os2/gdiimage.h
+++ b/
include/wx/os2/gdiimage.h
@@
-47,7
+47,12
@@
public:
}
// accessors
}
// 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
void SetSize( int nW
,int nH
@@
-55,7
+60,7
@@
public:
{ m_nWidth = nW; m_nHeight = nH; }
// free the ressources we allocated
{ 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
// for compatibility, the member fields are public
@@
-170,9
+175,23
@@
public:
// accessors
WXHANDLE GetHandle() const
// 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)
void SetHandle(WXHANDLE hHandle)
- { EnsureHasData(); GetGDIImageData()->m_hHandle = hHandle; }
+ {
+ wxGDIImageRefData* pData;
+
+ EnsureHasData();
+ pData = GetGDIImageData();
+ pData->m_hHandle = hHandle;
+ }
bool Ok() const { return GetHandle() != 0; }
bool Ok() const { return GetHandle() != 0; }