AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

marked FindColour() as deprecated; removed AddColour() which was only used internally

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-11-30 13:41:12 +00:00
parent 89b02325bf
commit 492e2a5b07
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/gdicmn.h
View File

@ -426,9 +426,8 @@ public:
// add a new colour to the database
void AddColour(const wxString& name, const wxColour& colour);
// deprecated, use Find()/Add() instead
wxColour *FindColour(const wxString& name);
void AddColour(const wxString& name, wxColour *colour);
// deprecated, use Find() instead
wxDEPRECATED( wxColour *FindColour(const wxString& name) );
#ifdef __WXPM__

23
src/common/gdicmn.cpp
View File

@ -473,18 +473,21 @@ wxString wxColourDatabase::FindName(const wxColour& colour) const
wxColour *wxColourDatabase::FindColour(const wxString& name)
{
wxColour col = Find(name);
if ( !col.Ok() )
// using a static variable here is not the most elegant solution but unless
// we want to make wxStringToColourHashMap public (i.e. move it to the
// header) so that we could have a member function returning
// wxStringToColourHashMap::iterator, there is really no good way to do it
// otherwise
//
// and knowing that this function is going to disappear in the next release
// anyhow I don't want to waste time on this
static wxColour s_col;
s_col = Find(name);
if ( !s_col.Ok() )
return NULL;
return new wxColour(col);
}
void wxColourDatabase::AddColour(const wxString& name, wxColour *colour)
{
wxCHECK_RET( colour, _T("NULL pointer in wxColourDatabase::AddColour") );
AddColour(name, wxColour(*colour));
return &s_col;
}
// ============================================================================