Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bad update last night. Compiler error fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2004-02-26 14:57:18 +00:00
parent 2dd35daad1
commit 53ac3021de
1 changed files with 33 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/os2/gdiimage.cpp
View File

@@ -227,12 +227,6 @@ private:
IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
#endif #endif
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
static wxSize GetHiconSize(WXHICON hicon);
// ============================================================================ // ============================================================================
// implementation // implementation
// ============================================================================ // ============================================================================
@@ -298,13 +292,15 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
const wxString& rName const wxString& rName
) )
{ {
wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst(); wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst();
while ( node )
while ( pNode )
{ {
wxGDIImageHandler *handler = node->GetData(); wxGDIImageHandler* pHandler = pNode->GetData();
if ( handler->GetName() == name )
return handler; if ( pHandler->GetName() == rName )
node = node->GetNext(); return pHandler;
pNode = pNode->GetNext();
} }
return((wxGDIImageHandler*)NULL); return((wxGDIImageHandler*)NULL);
} }
@@ -314,17 +310,17 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
, long lType , long lType
) )
{ {
wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst(); wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst();
while ( node ) while ( pNode )
{ {
wxGDIImageHandler *handler = node->GetData(); wxGDIImageHandler* pHandler = pNode->GetData();
if ( (handler->GetExtension() = extension) &&
(type == -1 || handler->GetType() == type) )
{
return handler;
}
node = node->GetNext(); if ( (pHandler->GetExtension() = rExtension) &&
(lType == -1 || pHandler->GetType() == lType) )
{
return pHandler;
}
pNode = pNode->GetNext();
} }
return((wxGDIImageHandler*)NULL); return((wxGDIImageHandler*)NULL);
} }
@@ -333,29 +329,31 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
long lType long lType
) )
{ {
wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst(); wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst();
while ( node )
while ( pNode )
{ {
wxGDIImageHandler *handler = node->GetData(); wxGDIImageHandler* pHandler = pNode->GetData();
if ( handler->GetType() == type )
return handler;
node = node->GetNext(); if ( pHandler->GetType() == lType )
return pHandler;
pNode = pNode->GetNext();
} }
return((wxGDIImageHandler*)NULL); return((wxGDIImageHandler*)NULL);
} }
void wxGDIImage::CleanUpHandlers() void wxGDIImage::CleanUpHandlers()
{ {
wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst(); wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst();
while ( node )
while ( pNode )
{ {
wxGDIImageHandler *handler = node->GetData(); wxGDIImageHandler* pHandler = pNode->GetData();
wxGDIImageHandlerList::compatibility_iterator next = node->GetNext(); wxGDIImageHandlerList::compatibility_iterator pNext = pNode->GetNext();
delete handler;
ms_handlers.Erase( node ); delete pHandler;
node = next; ms_handlers.Erase( pNode );
pNode = pNext;
} }
} }
@@ -507,17 +505,3 @@ bool wxICOResourceHandler::LoadIcon(
return pIcon->Ok(); return pIcon->Ok();
} // end of wxICOResourceHandler::LoadIcon } // end of wxICOResourceHandler::LoadIcon
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
static wxSize GetHiconSize(
WXHICON hicon
)
{
wxSize vSize(32, 32); // default
// all OS/2 icons are 32x32
return(vSize);
}