projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prefix implementation methods of wxBitmapButton with 'GTK' to prevent shadowing of...
[wxWidgets.git]
/
src
/
os2
/
gdiimage.cpp
diff --git
a/src/os2/gdiimage.cpp
b/src/os2/gdiimage.cpp
index a5b6a56e7a7e1001e2435b302cec45937d431ce8..4c2fee54259d262a30f38f03f2d458fefa288fc6 100644
(file)
--- a/
src/os2/gdiimage.cpp
+++ b/
src/os2/gdiimage.cpp
@@
-241,7
+241,7
@@
bool wxGDIImage::FreeResource( bool WXUNUSED(bForce) )
return true;
}
return true;
}
-WXHANDLE wxGDIImage::GetResourceHandle()
+WXHANDLE wxGDIImage::GetResourceHandle()
const
{
return GetHandle();
}
{
return GetHandle();
}
@@
-300,7
+300,7
@@
wxGDIImageHandler* wxGDIImage::FindHandler(
{
wxGDIImageHandler* pHandler = pNode->GetData();
{
wxGDIImageHandler* pHandler = pNode->GetData();
- if ( (pHandler->GetExtension() = rExtension) &&
+ if ( (pHandler->GetExtension() =
=
rExtension) &&
(lType == -1 || pHandler->GetType() == lType) )
{
return pHandler;
(lType == -1 || pHandler->GetType() == lType) )
{
return pHandler;
@@
-469,7
+469,7
@@
bool wxICOResourceHandler::LoadIcon( wxIcon* pIcon,
{
HPOINTER hIcon;
{
HPOINTER hIcon;
- hIcon = ::WinLoadFileIcon(
(PSZ)
rName.c_str()
+ hIcon = ::WinLoadFileIcon( rName.c_str()
,TRUE // load for private use
);
,TRUE // load for private use
);