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

Added wxUnusedVar for Borland and fixed 2 release mode warnings for Borland (patch #835707); Slight code cleanup.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth 2003-11-10 15:17:46 +00:00
parent cd32c91a3e
commit 8703bc01c2
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/defs.h
View File

@ -457,8 +457,12 @@ typedef int wxWindowID;
// sometimes the value of a variable is *really* not used, to suppress the
// resulting warning you may pass it to this function
#ifdef __BORLANDC__
#define wxUnusedVar(identifier) identifier
#else
template <class T>
inline void wxUnusedVar(const T& WXUNUSED(t)) { }
#endif
// ----------------------------------------------------------------------------
// compiler specific settings

1
src/generic/vlbox.cpp
View File

@ -540,6 +540,7 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
default:
event.Skip();
current = 0; // just to silent the stupid compiler warnings
wxUnusedVar(current);
return;
}

27
src/html/htmltag.cpp
View File

@ -148,8 +148,9 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
// found a match
if (match_pos == tag_len) {
pos = pos - tag_len - 3;
stpos = pos;
// These 2 lines commented:
//pos = pos - tag_len - 3; pos is not used outside of while loop
//stpos = pos; Value is local to while loop, no need to set it
break;
}
else {
@ -362,12 +363,12 @@ wxHtmlTag::~wxHtmlTag()
bool wxHtmlTag::HasParam(const wxString& par) const
{
return (m_ParamNames.Index(par, FALSE) != wxNOT_FOUND);
return (m_ParamNames.Index(par, false) != wxNOT_FOUND);
}
wxString wxHtmlTag::GetParam(const wxString& par, bool with_commas) const
{
int index = m_ParamNames.Index(par, FALSE);
int index = m_ParamNames.Index(par, false);
if (index == wxNOT_FOUND)
return wxEmptyString;
if (with_commas)
@ -393,23 +394,23 @@ bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
{
wxString str = GetParam(par);
if (str.IsEmpty()) return FALSE;
if (str.IsEmpty()) return false;
if (str.GetChar(0) == wxT('#'))
{
unsigned long tmp;
if (ScanParam(par, wxT("#%lX"), &tmp) != 1)
return FALSE;
return false;
*clr = wxColour((unsigned char)((tmp & 0xFF0000) >> 16),
(unsigned char)((tmp & 0x00FF00) >> 8),
(unsigned char)(tmp & 0x0000FF));
return TRUE;
(unsigned char)((tmp & 0x00FF00) >> 8),
(unsigned char)(tmp & 0x0000FF));
return true;
}
else
{
// Handle colours defined in HTML 4.0:
#define HTML_COLOUR(name,r,g,b) \
if (str.IsSameAs(wxT(name), FALSE)) \
{ *clr = wxColour(r,g,b); return TRUE; }
if (str.IsSameAs(wxT(name), false)) \
{ *clr = wxColour(r,g,b); return true; }
HTML_COLOUR("black", 0x00,0x00,0x00)
HTML_COLOUR("silver", 0xC0,0xC0,0xC0)
HTML_COLOUR("gray", 0x80,0x80,0x80)
@ -429,12 +430,12 @@ bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
#undef HTML_COLOUR
}
return FALSE;
return false;
}
bool wxHtmlTag::GetParamAsInt(const wxString& par, int *clr) const
{
if (!HasParam(par)) return FALSE;
if (!HasParam(par)) return false;
long i;
bool succ = GetParam(par).ToLong(&i);
*clr = (int)i;