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

Derive wxBitmap from wxBitmapBase in wxMotif, with the appropriate

Browse Source 
changes to wxIcon.
  Fix deprecation warnings and use %p to format WXWidget in debug output
(fixes the 4 non-deprecation warnings).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-01-19 09:52:29 +00:00
parent 2fda214570
commit 1bc822dfb5
14 changed files with 204 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/common/bmpbase.cpp
View File

@@ -19,7 +19,7 @@
#pragma hdrstop
#endif
#if defined(__WXMGL__) || defined(__WXMAC__)
#if defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXMOTIF__)
#include "wx/wx.h"
#include "wx/setup.h"
@@ -60,51 +60,51 @@ bool wxBitmapBase::RemoveHandler(const wxString& name)
wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& name)
{
wxNode *node = sm_handlers.First();
wxList::Node *node = sm_handlers.GetFirst();
while ( node )
{
wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
if ( handler->GetName() == name )
return handler;
node = node->Next();
node = node->GetNext();
}
return NULL;
}
wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& extension, wxBitmapType bitmapType)
{
wxNode *node = sm_handlers.First();
wxList::Node *node = sm_handlers.GetFirst();
while ( node )
{
wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
if ( handler->GetExtension() == extension &&
(bitmapType == -1 || handler->GetType() == bitmapType) )
return handler;
node = node->Next();
node = node->GetNext();
}
return NULL;
}
wxBitmapHandler *wxBitmapBase::FindHandler(wxBitmapType bitmapType)
{
wxNode *node = sm_handlers.First();
wxList::Node *node = sm_handlers.GetFirst();
while ( node )
{
wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
if (handler->GetType() == bitmapType)
return handler;
node = node->Next();
node = node->GetNext();
}
return NULL;
}
void wxBitmapBase::CleanUpHandlers()
{
wxNode *node = sm_handlers.First();
wxList::Node *node = sm_handlers.GetFirst();
while ( node )
{
wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
wxNode *next = node->Next();
wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
wxList::Node *next = node->GetNext();
delete handler;
delete node;
node = next;
@@ -122,5 +122,5 @@ public:
IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
#endif // defined(__WXMGL__) || defined(__WXMAC__)
#endif // defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXMOTIF__)