add wx-prefixed and semicolon-requiring versions of DECLARE_NO_{COPY,ASSIGN}_CLASS macros

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-02-08 11:45:59 +00:00
parent 4800ca79ac
commit c0c133e13b
424 changed files with 715 additions and 704 deletions

View File

@@ -127,7 +127,7 @@ public:
protected:
virtual void AddText(const wxString& WXUNUSED(txt)) {}
DECLARE_NO_COPY_CLASS(HP_Parser)
wxDECLARE_NO_COPY_CLASS(HP_Parser);
};
@@ -170,7 +170,7 @@ class HP_TagHandler : public wxHtmlTagHandler
m_parentItem = NULL;
}
DECLARE_NO_COPY_CLASS(HP_TagHandler)
wxDECLARE_NO_COPY_CLASS(HP_TagHandler);
};

View File

@@ -144,7 +144,7 @@ public:
private:
wxHtmlHelpWindow *m_Window;
DECLARE_NO_COPY_CLASS(wxHtmlHelpHtmlWindow)
wxDECLARE_NO_COPY_CLASS(wxHtmlHelpHtmlWindow);
DECLARE_EVENT_TABLE()
};
@@ -1277,7 +1277,7 @@ public:
}
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxHtmlHelpWindowOptionsDialog)
wxDECLARE_NO_COPY_CLASS(wxHtmlHelpWindowOptionsDialog);
};
BEGIN_EVENT_TABLE(wxHtmlHelpWindowOptionsDialog, wxDialog)

View File

@@ -897,7 +897,7 @@ public:
protected:
virtual void AddText(const wxString& WXUNUSED(txt)) {}
DECLARE_NO_COPY_CLASS(wxMetaTagParser)
wxDECLARE_NO_COPY_CLASS(wxMetaTagParser);
};
class wxMetaTagHandler : public wxHtmlTagHandler
@@ -910,7 +910,7 @@ public:
private:
wxString *m_retval;
DECLARE_NO_COPY_CLASS(wxMetaTagHandler)
wxDECLARE_NO_COPY_CLASS(wxMetaTagHandler);
};
bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)

View File

@@ -71,7 +71,7 @@ private:
int m_pos,
m_orient;
DECLARE_NO_COPY_CLASS(wxHtmlWinAutoScrollTimer)
wxDECLARE_NO_COPY_CLASS(wxHtmlWinAutoScrollTimer);
};
void wxHtmlWinAutoScrollTimer::Notify()

View File

@@ -46,7 +46,7 @@ class wxHtmlLineCell : public wxHtmlCell
// Should we draw 3-D shading or not
bool m_HasShading;
DECLARE_NO_COPY_CLASS(wxHtmlLineCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlLineCell);
};

View File

@@ -68,7 +68,7 @@ class wxHtmlImageMapAreaCell : public wxHtmlCell
wxHtmlRenderingInfo& WXUNUSED(info)) {}
DECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell);
};
@@ -246,7 +246,7 @@ class wxHtmlImageMapCell : public wxHtmlCell
int WXUNUSED(view_y1), int WXUNUSED(view_y2),
wxHtmlRenderingInfo& WXUNUSED(info)) {}
DECLARE_NO_COPY_CLASS(wxHtmlImageMapCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlImageMapCell);
};
@@ -315,7 +315,7 @@ private:
wxHtmlImageMapCell *m_imageMap;
wxString m_mapName;
DECLARE_NO_COPY_CLASS(wxHtmlImageCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlImageCell);
};
#if wxUSE_GIF && wxUSE_TIMER
@@ -331,7 +331,7 @@ class wxGIFTimer : public wxTimer
private:
wxHtmlImageCell *m_cell;
DECLARE_NO_COPY_CLASS(wxGIFTimer)
wxDECLARE_NO_COPY_CLASS(wxGIFTimer);
};
#endif

View File

@@ -79,7 +79,7 @@ public:
wxHtmlRenderingInfo& WXUNUSED(info)) {}
private:
DECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell);
};
bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, wxArrayInt& known_pagebreaks) const

View File

@@ -51,7 +51,7 @@ public:
}
}
DECLARE_NO_COPY_CLASS(wxHtmlAnchorCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlAnchorCell);
};

View File

@@ -41,7 +41,7 @@ class wxHtmlListmarkCell : public wxHtmlCell
void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
wxHtmlRenderingInfo& info);
DECLARE_NO_COPY_CLASS(wxHtmlListmarkCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlListmarkCell);
};
wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCell(), m_Brush(clr, wxBRUSHSTYLE_SOLID)
@@ -93,7 +93,7 @@ class wxHtmlListCell : public wxHtmlContainerCell
void AddRow(wxHtmlContainerCell *mark, wxHtmlContainerCell *cont);
virtual void Layout(int w);
DECLARE_NO_COPY_CLASS(wxHtmlListCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlListCell);
};
wxHtmlListCell::wxHtmlListCell(wxHtmlContainerCell *parent) : wxHtmlContainerCell(parent)

View File

@@ -119,7 +119,7 @@ private:
// only once, before first Layout().
void ComputeMinMaxWidths();
DECLARE_NO_COPY_CLASS(wxHtmlTableCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlTableCell);
};