undisable many warnings for VC++ in defs.h and fixed several thousands of them in the sources

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-22 00:24:07 +00:00
parent cd989b24ae
commit fc7a2a602b
130 changed files with 421 additions and 174 deletions

View File

@@ -260,7 +260,7 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
return needMore;
}
void wxAppBase::OnIdle(wxIdleEvent& event)
void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event))
{
// If there are pending events, we must process them: pending events
// are either events to the threads other than main or events posted

View File

@@ -147,7 +147,7 @@ protected:
// ----------------------------------------------------------------------------
wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
const wxArtClient& client,
const wxArtClient& WXUNUSED(client),
const wxSize& WXUNUSED(size))
{
// wxMessageBox icons:

View File

@@ -217,6 +217,8 @@ public:
private:
wxArrayString& m_files;
DECLARE_NO_COPY_CLASS(wxDirTraverserSimple)
};
/* static */

View File

@@ -42,7 +42,7 @@ wxFileDialogBase::wxFileDialogBase(wxWindow *parent,
const wxString& defaultFile,
const wxString& wildCard,
long style,
const wxPoint& pos)
const wxPoint& WXUNUSED(pos))
{
m_parent = parent;
m_message = message;

View File

@@ -85,6 +85,8 @@ public:
private:
bool m_flagOld;
bool& m_flag;
DECLARE_NO_COPY_CLASS(ReentrancyBlocker)
};
// ============================================================================

View File

@@ -59,7 +59,11 @@
class wxDummyConsoleApp : public wxAppConsole
{
public:
wxDummyConsoleApp() { }
virtual int OnRun() { wxFAIL_MSG( _T("unreachable code") ); return 0; }
DECLARE_NO_COPY_CLASS(wxDummyConsoleApp)
};
// we need a special kind of auto pointer to wxApp which not only deletes the
@@ -87,6 +91,8 @@ public:
wxTheApp = ptr;
}
DECLARE_NO_COPY_CLASS(wxAppPtr)
};
// class to ensure that wxAppBase::CleanUp() is called if our Initialize()
@@ -152,6 +158,8 @@ static struct InitData
// free it when doing cleanup to avoid memory leaks
wchar_t **argv;
#endif // wxUSE_UNICODE
DECLARE_NO_COPY_CLASS(InitData)
} gs_initData;
// ============================================================================

View File

@@ -125,6 +125,7 @@ public:
void Server_OnRequest(wxSocketEvent& event);
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxTCPEventHandler)
};
enum

View File

@@ -846,6 +846,8 @@ public:
// were we initialized successfully?
bool m_ok;
DECLARE_NO_COPY_CLASS(EC_CharSet)
};
#endif // wxUSE_FONTMAP

View File

@@ -44,8 +44,6 @@
// wxWindows macros
// ----------------------------------------------------------------------------
IMPLEMENT_CLASS(wxToolBarBase, wxControl)
BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
END_EVENT_TABLE()

View File

@@ -436,6 +436,8 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
return TRUE;
}
#else
event;
#endif // !__WIN32__
return FALSE;

View File

@@ -70,6 +70,8 @@ public:
private:
wxTextFile m_textfile;
DECLARE_NO_COPY_CLASS(wxFileTipProvider)
};
#ifdef __WIN32__

View File

@@ -85,9 +85,14 @@ wxHtmlHelpIndexCompareFunc(const void *a, const void *b)
class HP_Parser : public wxHtmlParser
{
public:
HP_Parser() { }
wxObject* GetProduct() { return NULL; }
protected:
virtual void AddText(const wxChar* WXUNUSED(txt)) {}
DECLARE_NO_COPY_CLASS(HP_Parser)
};

View File

@@ -68,14 +68,16 @@ void wxHtmlSelection::Set(const wxHtmlCell *fromCell, const wxHtmlCell *toCell)
Set(p1, fromCell, p2, toCell);
}
wxColour wxDefaultHtmlRenderingStyle::GetSelectedTextColour(
const wxColour& clr)
wxColour
wxDefaultHtmlRenderingStyle::
GetSelectedTextColour(const wxColour& WXUNUSED(clr))
{
return wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
}
wxColour wxDefaultHtmlRenderingStyle::GetSelectedTextBgColour(
const wxColour& WXUNUSED(clr))
wxColour
wxDefaultHtmlRenderingStyle::
GetSelectedTextBgColour(const wxColour& WXUNUSED(clr))
{
return wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
}

View File

@@ -805,7 +805,7 @@ void wxHtmlWindow::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell),
// do nothing here
}
void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event)
void wxHtmlWindow::OnEraseBackground(wxEraseEvent& WXUNUSED(event))
{
}
@@ -897,7 +897,7 @@ void wxHtmlWindow::OnSize(wxSizeEvent& event)
}
void wxHtmlWindow::OnMouseMove(wxMouseEvent& event)
void wxHtmlWindow::OnMouseMove(wxMouseEvent& WXUNUSED(event))
{
m_tmpMouseMoved = true;
}
@@ -1218,7 +1218,7 @@ void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
}
}
void wxHtmlWindow::OnCopy(wxCommandEvent& event)
void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event))
{
if ( m_selection )
CopySelection();

View File

@@ -36,6 +36,8 @@ FORCE_LINK_ME(m_dflist)
TAG_HANDLER_BEGIN(DEFLIST, "DL,DT,DD" )
TAG_HANDLER_CONSTR(DEFLIST) { }
TAG_HANDLER_PROC(tag)
{
wxHtmlContainerCell *c;

View File

@@ -36,6 +36,8 @@ TAG_HANDLER_BEGIN(FONT, "FONT" )
TAG_HANDLER_VARS
wxArrayString m_Faces;
TAG_HANDLER_CONSTR(FONT) { }
TAG_HANDLER_PROC(tag)
{
wxColour oldclr = m_WParser->GetActualColor();
@@ -114,6 +116,8 @@ TAG_HANDLER_END(FONT)
TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE")
TAG_HANDLER_CONSTR(FACES_U) { }
TAG_HANDLER_PROC(tag)
{
int underlined = m_WParser->GetFontUnderlined();
@@ -136,6 +140,7 @@ TAG_HANDLER_END(FACES_U)
TAG_HANDLER_BEGIN(FACES_B, "B,STRONG")
TAG_HANDLER_CONSTR(FACES_B) { }
TAG_HANDLER_PROC(tag)
{
@@ -159,6 +164,7 @@ TAG_HANDLER_END(FACES_B)
TAG_HANDLER_BEGIN(FACES_I, "I,EM,CITE,ADDRESS")
TAG_HANDLER_CONSTR(FACES_I) { }
TAG_HANDLER_PROC(tag)
{
@@ -182,6 +188,7 @@ TAG_HANDLER_END(FACES_I)
TAG_HANDLER_BEGIN(FACES_TT, "TT,CODE,KBD,SAMP")
TAG_HANDLER_CONSTR(FACES_TT) { }
TAG_HANDLER_PROC(tag)
{
@@ -206,6 +213,7 @@ TAG_HANDLER_END(FACES_TT)
TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")
TAG_HANDLER_CONSTR(Hx) { }
TAG_HANDLER_PROC(tag)
{
@@ -282,6 +290,7 @@ TAG_HANDLER_END(Hx)
TAG_HANDLER_BEGIN(BIGSMALL, "BIG,SMALL")
TAG_HANDLER_CONSTR(BIGSMALL) { }
TAG_HANDLER_PROC(tag)
{

View File

@@ -50,6 +50,8 @@ class wxHtmlLineCell : public wxHtmlCell
private:
// Should we draw 3-D shading or not
bool m_HasShading;
DECLARE_NO_COPY_CLASS(wxHtmlLineCell)
};
@@ -73,6 +75,7 @@ void wxHtmlLineCell::Draw(wxDC& dc, int x, int y,
TAG_HANDLER_BEGIN(HR, "HR")
TAG_HANDLER_CONSTR(HR) { }
TAG_HANDLER_PROC(tag)
{

View File

@@ -71,6 +71,9 @@ class wxHtmlImageMapAreaCell : public wxHtmlCell
int WXUNUSED(x), int WXUNUSED(y),
int WXUNUSED(view_y1), int WXUNUSED(view_y2),
wxHtmlRenderingInfo& WXUNUSED(info)) {}
DECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell)
};
@@ -247,6 +250,8 @@ class wxHtmlImageMapCell : public wxHtmlCell
int WXUNUSED(x), int WXUNUSED(y),
int WXUNUSED(view_y1), int WXUNUSED(view_y2),
wxHtmlRenderingInfo& WXUNUSED(info)) {}
DECLARE_NO_COPY_CLASS(wxHtmlImageMapCell)
};
@@ -589,6 +594,7 @@ wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
//--------------------------------------------------------------------------------
TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
TAG_HANDLER_CONSTR(IMG) { }
TAG_HANDLER_PROC(tag)
{

View File

@@ -133,6 +133,7 @@ bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, int* known_pagebreaks,
}
TAG_HANDLER_BEGIN(P, "P")
TAG_HANDLER_CONSTR(P) { }
TAG_HANDLER_PROC(tag)
{
@@ -151,6 +152,7 @@ TAG_HANDLER_END(P)
TAG_HANDLER_BEGIN(BR, "BR")
TAG_HANDLER_CONSTR(BR) { }
TAG_HANDLER_PROC(tag)
{
@@ -170,6 +172,7 @@ TAG_HANDLER_END(BR)
TAG_HANDLER_BEGIN(CENTER, "CENTER")
TAG_HANDLER_CONSTR(CENTER) { }
TAG_HANDLER_PROC(tag)
{
@@ -208,6 +211,7 @@ TAG_HANDLER_END(CENTER)
TAG_HANDLER_BEGIN(DIV, "DIV")
TAG_HANDLER_CONSTR(DIV) { }
TAG_HANDLER_PROC(tag)
{
@@ -270,6 +274,7 @@ TAG_HANDLER_END(DIV)
TAG_HANDLER_BEGIN(TITLE, "TITLE")
TAG_HANDLER_CONSTR(TITLE) { }
TAG_HANDLER_PROC(tag)
{
@@ -292,6 +297,7 @@ TAG_HANDLER_END(TITLE)
TAG_HANDLER_BEGIN(BODY, "BODY")
TAG_HANDLER_CONSTR(BODY) { }
TAG_HANDLER_PROC(tag)
{
@@ -321,6 +327,7 @@ TAG_HANDLER_END(BODY)
TAG_HANDLER_BEGIN(BLOCKQUOTE, "BLOCKQUOTE")
TAG_HANDLER_CONSTR(BLOCKQUOTE) { }
TAG_HANDLER_PROC(tag)
{
@@ -351,7 +358,9 @@ TAG_HANDLER_END(BLOCKQUOTE)
// Tag handler for tags that we have to ignore, otherwise non-text data
// would show up as text:
TAG_HANDLER_BEGIN(DoNothing, "SCRIPT")
TAG_HANDLER_PROC(tag)
TAG_HANDLER_CONSTR(DoNothing) { }
TAG_HANDLER_PROC(WXUNUSED(tag))
{
return true;
}

View File

@@ -55,11 +55,14 @@ public:
return wxHtmlCell::Find(condition, param);
}
}
DECLARE_NO_COPY_CLASS(wxHtmlAnchorCell)
};
TAG_HANDLER_BEGIN(A, "A")
TAG_HANDLER_CONSTR(A) { }
TAG_HANDLER_PROC(tag)
{

View File

@@ -45,6 +45,8 @@ class wxHtmlListmarkCell : public wxHtmlCell
wxHtmlListmarkCell(wxDC *dc, const wxColour& clr);
void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
wxHtmlRenderingInfo& info);
DECLARE_NO_COPY_CLASS(wxHtmlListmarkCell)
};
wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCell(), m_Brush(clr, wxSOLID)

View File

@@ -69,6 +69,7 @@ static wxString LINKAGEMODE HtmlizeWhitespaces(const wxString& str)
TAG_HANDLER_BEGIN(PRE, "PRE")
TAG_HANDLER_CONSTR(PRE) { }
TAG_HANDLER_PROC(tag)
{

View File

@@ -31,6 +31,7 @@ FORCE_LINK_ME(m_style)
TAG_HANDLER_BEGIN(STYLE, "STYLE")
TAG_HANDLER_CONSTR(STYLE) { }
TAG_HANDLER_PROC(WXUNUSED(tag))
{

View File

@@ -827,6 +827,9 @@ void wxNotebook::ApplyThemeBackground(wxWindow* window, const wxColour& colour)
wxWindow *child = node->GetData();
ApplyThemeBackground(child, colour);
}
#else
window;
colour;
#endif
}

View File

@@ -398,6 +398,8 @@ public:
private:
wxArrayTreeItemIds& m_selections;
DECLARE_NO_COPY_CLASS(TraverseSelections)
};
// internal class for counting tree items
@@ -425,6 +427,8 @@ public:
private:
size_t m_count;
DECLARE_NO_COPY_CLASS(TraverseCounter)
};
// ----------------------------------------------------------------------------