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

@@ -104,7 +104,7 @@ public:
protected:
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxApp)
wxDECLARE_NO_COPY_CLASS(wxApp);
DECLARE_DYNAMIC_CLASS(wxApp)
};

View File

@@ -93,7 +93,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxCalendarCtrl)
DECLARE_NO_COPY_CLASS(wxCalendarCtrl)
wxDECLARE_NO_COPY_CLASS(wxCalendarCtrl);
};
#endif // _WX_MSW_CALCTRL_H_

View File

@@ -56,7 +56,7 @@ protected:
private:
bool m_hasCaret;
DECLARE_NO_COPY_CLASS(wxCaret)
wxDECLARE_NO_COPY_CLASS(wxCaret);
};
#endif // _WX_CARET_H_

View File

@@ -36,7 +36,7 @@ protected:
private:
DECLARE_ABSTRACT_CLASS(wxControlWithItems)
DECLARE_NO_COPY_CLASS(wxControlWithItems)
wxDECLARE_NO_COPY_CLASS(wxControlWithItems);
};
#endif // _WX_MSW_CTRLSUB_H_

View File

@@ -310,7 +310,7 @@ protected:
#endif
DECLARE_CLASS(wxMSWDCImpl)
DECLARE_NO_COPY_CLASS(wxMSWDCImpl)
wxDECLARE_NO_COPY_CLASS(wxMSWDCImpl);
};
// ----------------------------------------------------------------------------
@@ -351,7 +351,7 @@ private:
// find it ourselves
const wxSize m_size;
DECLARE_NO_COPY_CLASS(wxDCTempImpl)
wxDECLARE_NO_COPY_CLASS(wxDCTempImpl);
};
class WXDLLIMPEXP_CORE wxDCTemp : public wxDC

View File

@@ -50,7 +50,7 @@ protected:
void InitDC();
DECLARE_CLASS(wxWindowDCImpl)
DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
};
class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
@@ -70,7 +70,7 @@ protected:
void InitDC();
DECLARE_CLASS(wxClientDCImpl)
DECLARE_NO_COPY_CLASS(wxClientDCImpl)
wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
};
class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl
@@ -93,7 +93,7 @@ protected:
wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
DECLARE_CLASS(wxPaintDCImpl)
DECLARE_NO_COPY_CLASS(wxPaintDCImpl)
wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
};
/*
@@ -108,7 +108,7 @@ public:
wxPaintDCEx(wxWindow *canvas, WXHDC dc);
DECLARE_CLASS(wxPaintDCEx)
DECLARE_NO_COPY_CLASS(wxPaintDCEx)
wxDECLARE_NO_COPY_CLASS(wxPaintDCEx);
};
#endif

View File

@@ -38,7 +38,7 @@ protected:
void Init();
DECLARE_CLASS(wxMemoryDCImpl)
DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)
wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
};
#endif

View File

@@ -58,7 +58,7 @@ protected:
private:
DECLARE_CLASS(wxPrinterDCImpl)
DECLARE_NO_COPY_CLASS(wxPrinterDCImpl)
wxDECLARE_NO_COPY_CLASS(wxPrinterDCImpl);
};
// Gets an HDC for the specified printer configuration

View File

@@ -27,7 +27,7 @@ public:
}
DECLARE_CLASS(wxScreenDCImpl)
DECLARE_NO_COPY_CLASS(wxScreenDCImpl)
wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
};
#endif // _WX_MSW_DCSCREEN_H_

View File

@@ -73,7 +73,7 @@ public:
int m_dataSize;
wxIPCFormat m_dataType;
DECLARE_NO_COPY_CLASS(wxDDEConnection)
wxDECLARE_NO_COPY_CLASS(wxDDEConnection);
DECLARE_DYNAMIC_CLASS(wxDDEConnection)
};

View File

@@ -131,7 +131,7 @@ private:
WXHWND m_hGripper;
DECLARE_DYNAMIC_CLASS(wxDialog)
DECLARE_NO_COPY_CLASS(wxDialog)
wxDECLARE_NO_COPY_CLASS(wxDialog);
};
#endif

View File

@@ -266,7 +266,7 @@ protected:
private:
DECLARE_DYNAMIC_CLASS(wxDragImage)
DECLARE_NO_COPY_CLASS(wxDragImage)
wxDECLARE_NO_COPY_CLASS(wxDragImage);
};
#endif // wxUSE_DRAGIMAGE

View File

@@ -129,7 +129,7 @@ public:
protected:
wxEnhMetaFile m_metafile;
DECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject)
wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject);
};
@@ -172,7 +172,7 @@ public:
protected:
wxEnhMetaFile m_metafile;
DECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject)
wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject);
};
#endif // wxUSE_DRAG_AND_DROP

View File

@@ -56,7 +56,7 @@ protected:
wxFindReplaceDialogImpl *m_impl;
DECLARE_DYNAMIC_CLASS(wxFindReplaceDialog)
DECLARE_NO_COPY_CLASS(wxFindReplaceDialog)
wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialog);
};
#endif // _WX_MSW_FDREPDLG_H_

View File

@@ -63,7 +63,7 @@ private:
int m_centreDir; // nothing to do if 0
DECLARE_DYNAMIC_CLASS(wxFileDialog)
DECLARE_NO_COPY_CLASS(wxFileDialog)
wxDECLARE_NO_COPY_CLASS(wxFileDialog);
};
#endif // _WX_FILEDLG_H_

View File

@@ -126,7 +126,7 @@ private:
// the offset of the window used to emulate scrolling it
int m_scrollOffset;
DECLARE_NO_COPY_CLASS(wxHeaderCtrl)
wxDECLARE_NO_COPY_CLASS(wxHeaderCtrl);
};
#endif // _WX_MSW_HEADERCTRL_H_

View File

@@ -120,7 +120,7 @@ protected:
int m_style;
DECLARE_DYNAMIC_CLASS(wxBestHelpController)
DECLARE_NO_COPY_CLASS(wxBestHelpController)
wxDECLARE_NO_COPY_CLASS(wxBestHelpController);
};
#endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP

View File

@@ -95,7 +95,7 @@ private:
wxString m_strGroup, // current group in appname.ini file
m_strPath; // the rest of the path (no trailing '_'!)
DECLARE_NO_COPY_CLASS(wxIniConfig)
wxDECLARE_NO_COPY_CLASS(wxIniConfig);
DECLARE_ABSTRACT_CLASS(wxIniConfig)
};

View File

@@ -465,7 +465,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxListCtrl)
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxListCtrl)
wxDECLARE_NO_COPY_CLASS(wxListCtrl);
};
#endif // _WX_LISTCTRL_H_

View File

@@ -146,7 +146,7 @@ private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
DECLARE_NO_COPY_CLASS(wxMDIParentFrame)
wxDECLARE_NO_COPY_CLASS(wxMDIParentFrame);
};
// ---------------------------------------------------------------------------

View File

@@ -107,7 +107,7 @@ protected:
private:
DECLARE_CLASS(wxMetafileDCImpl)
DECLARE_NO_COPY_CLASS(wxMetafileDCImpl)
wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl);
};
class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
@@ -133,7 +133,7 @@ public:
private:
DECLARE_CLASS(wxMetafileDC)
DECLARE_NO_COPY_CLASS(wxMetafileDC)
wxDECLARE_NO_COPY_CLASS(wxMetafileDC);
};

View File

@@ -59,7 +59,7 @@ private:
WXHANDLE m_hook; // HHOOK used to position the message box
DECLARE_DYNAMIC_CLASS(wxMessageDialog)
DECLARE_NO_COPY_CLASS(wxMessageDialog)
wxDECLARE_NO_COPY_CLASS(wxMessageDialog);
};

View File

@@ -67,7 +67,7 @@ private:
class wxNotifMsgImpl *m_impl;
DECLARE_NO_COPY_CLASS(wxNotificationMessage)
wxDECLARE_NO_COPY_CLASS(wxNotificationMessage);
};
#endif // _WX_MSW_NOTIFMSG_H_

View File

@@ -59,7 +59,7 @@ private:
void* m_pIAccessibleStd; // the pointer to the standard COM interface,
// for default processing
DECLARE_NO_COPY_CLASS(wxAccessible)
wxDECLARE_NO_COPY_CLASS(wxAccessible);
};
#endif //wxUSE_ACCESSIBILITY

View File

@@ -94,7 +94,7 @@ public:
public:
WXIDISPATCH* m_dispatchPtr;
DECLARE_NO_COPY_CLASS(wxAutomationObject)
wxDECLARE_NO_COPY_CLASS(wxAutomationObject);
};
#endif // wxUSE_OLE_AUTOMATION

View File

@@ -73,7 +73,7 @@ public:
private:
IDataObject *m_pIDataObject; // pointer to the COM interface
DECLARE_NO_COPY_CLASS(wxDataObject)
wxDECLARE_NO_COPY_CLASS(wxDataObject);
};
#endif //_WX_MSW_OLE_DATAOBJ_H

View File

@@ -51,7 +51,7 @@ private:
// the DIB data
void /* BITMAPINFO */ *m_data;
DECLARE_NO_COPY_CLASS(wxBitmapDataObject)
wxDECLARE_NO_COPY_CLASS(wxBitmapDataObject);
};
// ----------------------------------------------------------------------------
@@ -84,7 +84,7 @@ public:
{ return SetData(len, buf); }
private:
DECLARE_NO_COPY_CLASS(wxBitmapDataObject2)
wxDECLARE_NO_COPY_CLASS(wxBitmapDataObject2);
};
// ----------------------------------------------------------------------------
@@ -112,7 +112,7 @@ public:
{ return SetData(len, buf); }
private:
DECLARE_NO_COPY_CLASS(wxFileDataObject)
wxDECLARE_NO_COPY_CLASS(wxFileDataObject);
};
// ----------------------------------------------------------------------------
@@ -140,7 +140,7 @@ private:
// last data object we got data in
wxDataObjectSimple *m_dataObjectLast;
DECLARE_NO_COPY_CLASS(wxURLDataObject)
wxDECLARE_NO_COPY_CLASS(wxURLDataObject);
};
#endif // _WX_MSW_OLE_DATAOBJ2_H

View File

@@ -71,7 +71,7 @@ protected:
private:
wxIDropSource *m_pIDropSource; // the pointer to COM interface
DECLARE_NO_COPY_CLASS(wxDropSource)
wxDECLARE_NO_COPY_CLASS(wxDropSource);
};
#endif //wxUSE_DRAG_AND_DROP

View File

@@ -67,7 +67,7 @@ private:
wxIDropTarget *m_pIDropTarget; // the pointer to our COM interface
IDataObject *m_pIDataSource; // the pointer to the source data object
DECLARE_NO_COPY_CLASS(wxDropTarget)
wxDECLARE_NO_COPY_CLASS(wxDropTarget);
};
#endif //wxUSE_DRAG_AND_DROP

View File

@@ -85,7 +85,7 @@ private:
void* m_printDlg;
private:
DECLARE_NO_COPY_CLASS(wxWindowsPrintDialog)
wxDECLARE_NO_COPY_CLASS(wxWindowsPrintDialog);
DECLARE_CLASS(wxWindowsPrintDialog)
};

View File

@@ -36,7 +36,7 @@ public:
private:
WXFARPROC m_lpAbortProc;
DECLARE_NO_COPY_CLASS(wxWindowsPrinter)
wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter);
};
// ---------------------------------------------------------------------------

View File

@@ -398,7 +398,7 @@ public:
private:
HDC m_hdc;
DECLARE_NO_COPY_CLASS(ScreenHDC)
wxDECLARE_NO_COPY_CLASS(ScreenHDC);
};
// the same as ScreenHDC but for window DCs
@@ -414,7 +414,7 @@ private:
HWND m_hwnd;
HDC m_hdc;
DECLARE_NO_COPY_CLASS(WindowHDC)
wxDECLARE_NO_COPY_CLASS(WindowHDC);
};
// the same as ScreenHDC but for memory DCs: creates the HDC compatible with
@@ -430,7 +430,7 @@ public:
private:
HDC m_hdc;
DECLARE_NO_COPY_CLASS(MemoryHDC)
wxDECLARE_NO_COPY_CLASS(MemoryHDC);
};
// a class which selects a GDI object into a DC in its ctor and deselects in
@@ -462,7 +462,7 @@ private:
HDC m_hdc;
HGDIOBJ m_hgdiobj;
DECLARE_NO_COPY_CLASS(SelectInHDC)
wxDECLARE_NO_COPY_CLASS(SelectInHDC);
};
// a class which cleans up any GDI object
@@ -579,7 +579,7 @@ public:
private:
HDC m_hdc;
DECLARE_NO_COPY_CLASS(HDCClipper)
wxDECLARE_NO_COPY_CLASS(HDCClipper);
};
// set the given map mode for the life time of this object
@@ -610,7 +610,7 @@ private:
HDC m_hdc;
int m_modeOld;
DECLARE_NO_COPY_CLASS(HDCMapModeChanger)
wxDECLARE_NO_COPY_CLASS(HDCMapModeChanger);
};
#define wxCHANGE_HDC_MAP_MODE(hdc, mm) \
@@ -652,7 +652,7 @@ public:
private:
HGLOBAL m_hGlobal;
DECLARE_NO_COPY_CLASS(GlobalPtr)
wxDECLARE_NO_COPY_CLASS(GlobalPtr);
};
// when working with global pointers (which is unfortunately still necessary
@@ -710,7 +710,7 @@ private:
HGLOBAL m_hGlobal;
void *m_ptr;
DECLARE_NO_COPY_CLASS(GlobalPtrLock)
wxDECLARE_NO_COPY_CLASS(GlobalPtrLock);
};
// register the class when it is first needed and unregister it in dtor

View File

@@ -61,7 +61,7 @@ private:
friend class wxSocketMSWManager;
DECLARE_NO_COPY_CLASS(wxSocketImplMSW)
wxDECLARE_NO_COPY_CLASS(wxSocketImplMSW);
};
#endif /* _WX_MSW_GSOCKMSW_H_ */

View File

@@ -175,7 +175,7 @@ protected:
private:
DECLARE_DYNAMIC_CLASS(wxRadioBox)
DECLARE_NO_COPY_CLASS(wxRadioBox)
wxDECLARE_NO_COPY_CLASS(wxRadioBox);
};
#endif

View File

@@ -106,7 +106,7 @@ private:
// current path (not '/' terminated)
wxString m_strPath;
DECLARE_NO_COPY_CLASS(wxRegConfig)
wxDECLARE_NO_COPY_CLASS(wxRegConfig);
DECLARE_ABSTRACT_CLASS(wxRegConfig)
};

View File

@@ -243,7 +243,7 @@ private:
long m_dwLastError; // last error (0 if none)
DECLARE_NO_COPY_CLASS(wxRegKey)
wxDECLARE_NO_COPY_CLASS(wxRegKey);
};
#endif // wxUSE_REGKEY

View File

@@ -43,7 +43,7 @@ private:
// data of this object
class wxSoundData *m_data;
DECLARE_NO_COPY_CLASS(wxSound)
wxDECLARE_NO_COPY_CLASS(wxSound);
};
#endif // wxUSE_SOUND

View File

@@ -133,7 +133,7 @@ protected:
private:
DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxSpinCtrl)
wxDECLARE_NO_COPY_CLASS(wxSpinCtrl);
};
#endif // wxUSE_SPINCTRL

View File

@@ -86,7 +86,7 @@ protected:
private:
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
DECLARE_NO_COPY_CLASS(wxStaticBitmap)
wxDECLARE_NO_COPY_CLASS(wxStaticBitmap);
};
#endif

View File

@@ -165,7 +165,7 @@ private:
wxWindowIDRef *m_ids;
DECLARE_NO_COPY_CLASS(wxSubwindows)
wxDECLARE_NO_COPY_CLASS(wxSubwindows);
};
// convenient macro to forward a few methods which are usually propagated to

View File

@@ -51,7 +51,7 @@ public:
private:
DWORD m_slot;
DECLARE_NO_COPY_CLASS(wxTlsKey)
wxDECLARE_NO_COPY_CLASS(wxTlsKey);
};
#endif // _WX_MSW_TLS_H_

View File

@@ -151,7 +151,7 @@ private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxToolBar)
DECLARE_NO_COPY_CLASS(wxToolBar)
wxDECLARE_NO_COPY_CLASS(wxToolBar);
};
#endif // wxUSE_TOOLBAR

View File

@@ -76,7 +76,7 @@ private:
wxWindow *m_window; // window we're associated with
DECLARE_ABSTRACT_CLASS(wxToolTip)
DECLARE_NO_COPY_CLASS(wxToolTip)
wxDECLARE_NO_COPY_CLASS(wxToolTip);
};
#endif // _WX_MSW_TOOLTIP_H_

View File

@@ -206,7 +206,7 @@ private:
#endif
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)
wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW);
};
#endif // _WX_MSW_TOPLEVEL_H_

View File

@@ -277,7 +277,7 @@ private:
friend class wxTreeSortHelper;
DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
DECLARE_NO_COPY_CLASS(wxTreeCtrl)
wxDECLARE_NO_COPY_CLASS(wxTreeCtrl);
};
#endif // wxUSE_TREECTRL

View File

@@ -168,7 +168,7 @@ private:
friend class wxUxThemeModule;
#endif // wxUSE_UXTHEME
DECLARE_NO_COPY_CLASS(wxUxThemeEngine)
wxDECLARE_NO_COPY_CLASS(wxUxThemeEngine);
};
#if wxUSE_UXTHEME
@@ -223,7 +223,7 @@ public:
private:
HTHEME m_hTheme;
DECLARE_NO_COPY_CLASS(wxUxThemeHandle)
wxDECLARE_NO_COPY_CLASS(wxUxThemeHandle);
};
#endif // _WX_UXTHEME_H_

View File

@@ -69,7 +69,7 @@ protected:
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxToolBar)
DECLARE_NO_COPY_CLASS(wxToolBar)
wxDECLARE_NO_COPY_CLASS(wxToolBar);
};
#else
@@ -158,7 +158,7 @@ protected:
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxToolMenuBar)
DECLARE_NO_COPY_CLASS(wxToolMenuBar)
wxDECLARE_NO_COPY_CLASS(wxToolMenuBar);
};
#endif

View File

@@ -573,7 +573,7 @@ private:
#endif
DECLARE_DYNAMIC_CLASS(wxWindowMSW)
DECLARE_NO_COPY_CLASS(wxWindowMSW)
wxDECLARE_NO_COPY_CLASS(wxWindowMSW);
DECLARE_EVENT_TABLE()
};

View File

@@ -81,7 +81,7 @@ public:
private:
LPITEMIDLIST m_pidl;
DECLARE_NO_COPY_CLASS(wxItemIdList)
wxDECLARE_NO_COPY_CLASS(wxItemIdList);
};
// enable autocompleting filenames in the text control with given HWND