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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/html/helpctrl.h
View File

@@ -125,7 +125,7 @@ protected:
wxHtmlHelpFrame* m_helpFrame;
wxHtmlHelpDialog* m_helpDialog;
DECLARE_NO_COPY_CLASS(wxHtmlHelpController)
wxDECLARE_NO_COPY_CLASS(wxHtmlHelpController);
};
/*

6
include/wx/html/helpdata.h
View File

@@ -122,7 +122,7 @@ private:
bool m_CaseSensitive;
bool m_WholeWords;
DECLARE_NO_COPY_CLASS(wxHtmlSearchEngine)
wxDECLARE_NO_COPY_CLASS(wxHtmlSearchEngine);
};
@@ -157,7 +157,7 @@ private:
int m_MaxIndex; // number of files we search
// For progress bar: 100*curindex/maxindex = % complete
DECLARE_NO_COPY_CLASS(wxHtmlSearchStatus)
wxDECLARE_NO_COPY_CLASS(wxHtmlSearchStatus);
};
class WXDLLIMPEXP_HTML wxHtmlHelpData : public wxObject
@@ -215,7 +215,7 @@ protected:
// Writes binary book
bool SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f);
DECLARE_NO_COPY_CLASS(wxHtmlHelpData)
wxDECLARE_NO_COPY_CLASS(wxHtmlHelpData);
};
#endif

2
include/wx/html/helpdlg.h
View File

@@ -81,7 +81,7 @@ protected:
wxHtmlHelpController* m_helpController;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxHtmlHelpDialog)
wxDECLARE_NO_COPY_CLASS(wxHtmlHelpDialog);
};
#endif

2
include/wx/html/helpfrm.h
View File

@@ -139,7 +139,7 @@ protected:
private:
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxHtmlHelpFrame)
wxDECLARE_NO_COPY_CLASS(wxHtmlHelpFrame);
};
#endif // wxUSE_WXHTML_HELP

2
include/wx/html/helpwnd.h
View File

@@ -259,7 +259,7 @@ private:
wxHtmlHelpMergedIndex *m_mergedIndex;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxHtmlHelpWindow)
wxDECLARE_NO_COPY_CLASS(wxHtmlHelpWindow);
};
/*!

12
include/wx/html/htmlcell.h
View File

@@ -352,7 +352,7 @@ protected:
wxString m_id;
DECLARE_ABSTRACT_CLASS(wxHtmlCell)
DECLARE_NO_COPY_CLASS(wxHtmlCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlCell);
};
@@ -395,7 +395,7 @@ protected:
bool m_allowLinebreak;
DECLARE_ABSTRACT_CLASS(wxHtmlWordCell)
DECLARE_NO_COPY_CLASS(wxHtmlWordCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlWordCell);
};
@@ -540,7 +540,7 @@ protected:
DECLARE_ABSTRACT_CLASS(wxHtmlContainerCell)
DECLARE_NO_COPY_CLASS(wxHtmlContainerCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlContainerCell);
};
@@ -564,7 +564,7 @@ protected:
unsigned m_Flags;
DECLARE_ABSTRACT_CLASS(wxHtmlColourCell)
DECLARE_NO_COPY_CLASS(wxHtmlColourCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlColourCell);
};
@@ -588,7 +588,7 @@ protected:
wxFont m_Font;
DECLARE_ABSTRACT_CLASS(wxHtmlFontCell)
DECLARE_NO_COPY_CLASS(wxHtmlFontCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlFontCell);
};
@@ -624,7 +624,7 @@ protected:
// width float is used in adjustWidth (it is in percents)
DECLARE_ABSTRACT_CLASS(wxHtmlWidgetCell)
DECLARE_NO_COPY_CLASS(wxHtmlWidgetCell)
wxDECLARE_NO_COPY_CLASS(wxHtmlWidgetCell);
};

6
include/wx/html/htmlpars.h
View File

@@ -191,7 +191,7 @@ protected:
wxHtmlTagHandlersSet m_HandlersSet;
wxHtmlTagHandlersHash m_HandlersHash;
DECLARE_NO_COPY_CLASS(wxHtmlParser)
wxDECLARE_NO_COPY_CLASS(wxHtmlParser);
// class for opening files (file system)
wxFileSystem *m_FS;
@@ -254,7 +254,7 @@ protected:
wxHtmlParser *m_Parser;
DECLARE_NO_COPY_CLASS(wxHtmlTagHandler)
wxDECLARE_NO_COPY_CLASS(wxHtmlTagHandler);
};
@@ -292,7 +292,7 @@ protected:
wxFontEncoding m_encoding;
#endif
DECLARE_NO_COPY_CLASS(wxHtmlEntitiesParser)
wxDECLARE_NO_COPY_CLASS(wxHtmlEntitiesParser);
};

4
include/wx/html/htmltag.h
View File

@@ -47,7 +47,7 @@ public:
wxString::const_iterator *end2,
bool *hasEnding);
DECLARE_NO_COPY_CLASS(wxHtmlTagsCache)
wxDECLARE_NO_COPY_CLASS(wxHtmlTagsCache);
};
@@ -154,7 +154,7 @@ private:
wxHtmlTag *m_FirstChild, *m_LastChild;
wxHtmlTag *m_Parent;
DECLARE_NO_COPY_CLASS(wxHtmlTag)
wxDECLARE_NO_COPY_CLASS(wxHtmlTag);
};

2
include/wx/html/htmlwin.h
View File

@@ -548,7 +548,7 @@ private:
static wxCursor *ms_cursorText;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxHtmlWindow)
wxDECLARE_NO_COPY_CLASS(wxHtmlWindow);
};
class WXDLLIMPEXP_FWD_HTML wxHtmlCellEvent;

6
include/wx/html/htmprint.h
View File

@@ -91,7 +91,7 @@ private:
wxHtmlContainerCell *m_Cells;
int m_MaxWidth, m_Width, m_Height;
DECLARE_NO_COPY_CLASS(wxHtmlDCRenderer)
wxDECLARE_NO_COPY_CLASS(wxHtmlDCRenderer);
};
@@ -194,7 +194,7 @@ private:
// list of HTML filters
static wxList m_Filters;
DECLARE_NO_COPY_CLASS(wxHtmlPrintout)
wxDECLARE_NO_COPY_CLASS(wxHtmlPrintout);
};
@@ -284,7 +284,7 @@ private:
wxString m_Headers[2], m_Footers[2];
wxWindow *m_ParentWindow;
DECLARE_NO_COPY_CLASS(wxHtmlEasyPrinting)
wxDECLARE_NO_COPY_CLASS(wxHtmlEasyPrinting);
};

4
include/wx/html/winpars.h
View File

@@ -230,7 +230,7 @@ private:
// expand TABs; only updated while inside <pre>
int m_posColumn;
DECLARE_NO_COPY_CLASS(wxHtmlWinParser)
wxDECLARE_NO_COPY_CLASS(wxHtmlWinParser);
};
@@ -257,7 +257,7 @@ public:
protected:
wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted
DECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler)
wxDECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler);
};