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

fix some unused variables warnings reported by Borland

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-05-08 14:48:59 +00:00
parent 7f0cbaaa4a
commit e54266add7
4 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/windowid.cpp
View File

@@ -118,7 +118,7 @@ void DecIdRefCount(wxWindowID id)
// so it should never be reserved, but test anyway // so it should never be reserved, but test anyway
if(gs_autoIdsRefCount[id] == ID_RESERVED) if(gs_autoIdsRefCount[id] == ID_RESERVED)
{ {
wxASSERT_MSG(false, wxT("reserve id being decreased")); wxFAIL_MSG(wxT("reserve id being decreased"));
gs_autoIdsRefCount[id] = ID_FREE; gs_autoIdsRefCount[id] = ID_FREE;
} }
else else

6
src/generic/progdlgg.cpp
View File

@@ -182,9 +182,6 @@ wxProgressDialog::wxProgressDialog(const wxString& title,
m_break = 0; m_break = 0;
m_ctdelay = 0; m_ctdelay = 0;
// if we are going to have at least one label, remember it in this var
wxStaticText *label = NULL;
// also count how many labels we really have // also count how many labels we really have
size_t nTimeLabels = 0; size_t nTimeLabels = 0;
@@ -194,7 +191,6 @@ wxProgressDialog::wxProgressDialog(const wxString& title,
{ {
nTimeLabels++; nTimeLabels++;
label =
m_elapsed = CreateLabel(_("Elapsed time:"), sizerLabels); m_elapsed = CreateLabel(_("Elapsed time:"), sizerLabels);
} }
@@ -202,7 +198,6 @@ wxProgressDialog::wxProgressDialog(const wxString& title,
{ {
nTimeLabels++; nTimeLabels++;
label =
m_estimated = CreateLabel(_("Estimated time:"), sizerLabels); m_estimated = CreateLabel(_("Estimated time:"), sizerLabels);
} }
@@ -210,7 +205,6 @@ wxProgressDialog::wxProgressDialog(const wxString& title,
{ {
nTimeLabels++; nTimeLabels++;
label =
m_remaining = CreateLabel(_("Remaining time:"), sizerLabels); m_remaining = CreateLabel(_("Remaining time:"), sizerLabels);
} }
sizerTop->Add(sizerLabels, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, LAYOUT_MARGIN); sizerTop->Add(sizerLabels, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, LAYOUT_MARGIN);

2
src/html/winpars.cpp
View File

@@ -477,7 +477,6 @@ void wxHtmlWinParser::AddPreBlock(const wxString& text)
const wxString::const_iterator end = text.end(); const wxString::const_iterator end = text.end();
wxString::const_iterator copyFrom = text.begin(); wxString::const_iterator copyFrom = text.begin();
size_t posFrom = 0;
size_t pos = 0; size_t pos = 0;
int posColumn = m_posColumn; int posColumn = m_posColumn;
for ( wxString::const_iterator i = copyFrom; i != end; ++i, ++pos ) for ( wxString::const_iterator i = copyFrom; i != end; ++i, ++pos )
@@ -493,7 +492,6 @@ void wxHtmlWinParser::AddPreBlock(const wxString& text)
posColumn += expandTo; posColumn += expandTo;
copyFrom = i + 1; copyFrom = i + 1;
posFrom = pos + 1;
} }
else else
{ {

4
src/msw/ole/automtn.cpp
View File

@@ -674,6 +674,7 @@ WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& ole
WXDLLEXPORT bool WXDLLEXPORT bool
wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant) wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
{ {
bool ok = true;
if ( oleVariant.vt & VT_ARRAY ) if ( oleVariant.vt & VT_ARRAY )
{ {
variant.ClearList(); variant.ClearList();
@@ -689,7 +690,6 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
if ( FAILED(hr) ) if ( FAILED(hr) )
return false; return false;
bool ok = true;
for ( int i = 0; i < cElements; i++ ) for ( int i = 0; i < cElements; i++ )
{ {
VARIANTARG& oleElement = pvdata[i]; VARIANTARG& oleElement = pvdata[i];
@@ -802,7 +802,7 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
} }
} }
return true; return ok;
} }
/* /*