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:
@@ -74,7 +74,7 @@ public:
|
||||
|
||||
protected:
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_NO_COPY_CLASS(wxApp)
|
||||
wxDECLARE_NO_COPY_CLASS(wxApp);
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -56,7 +56,7 @@ protected:
|
||||
private:
|
||||
bool m_hasCaret;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxCaret)
|
||||
wxDECLARE_NO_COPY_CLASS(wxCaret);
|
||||
};
|
||||
|
||||
#endif // _WX_CARET_H_
|
||||
|
@@ -307,7 +307,7 @@ protected:
|
||||
#endif
|
||||
|
||||
DECLARE_CLASS(wxPalmDCImpl)
|
||||
DECLARE_NO_COPY_CLASS(wxPalmDCImpl)
|
||||
wxDECLARE_NO_COPY_CLASS(wxPalmDCImpl);
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -348,7 +348,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
|
||||
|
@@ -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);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -36,7 +36,7 @@ protected:
|
||||
void Init();
|
||||
|
||||
DECLARE_CLASS(wxMemoryDCImpl)
|
||||
DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)
|
||||
wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -24,7 +24,7 @@ public:
|
||||
virtual void DoGetSize(int *w, int *h) const;
|
||||
|
||||
DECLARE_CLASS(wxScreenDCImpl)
|
||||
DECLARE_NO_COPY_CLASS(wxScreenDCImpl)
|
||||
wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -82,7 +82,7 @@ private:
|
||||
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxDialog)
|
||||
DECLARE_NO_COPY_CLASS(wxDialog)
|
||||
wxDECLARE_NO_COPY_CLASS(wxDialog);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -255,7 +255,7 @@ protected:
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxDragImage)
|
||||
DECLARE_NO_COPY_CLASS(wxDragImage)
|
||||
wxDECLARE_NO_COPY_CLASS(wxDragImage);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -126,7 +126,7 @@ public:
|
||||
protected:
|
||||
wxEnhMetaFile m_metafile;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject)
|
||||
wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject);
|
||||
};
|
||||
|
||||
|
||||
@@ -169,7 +169,7 @@ public:
|
||||
protected:
|
||||
wxEnhMetaFile m_metafile;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject)
|
||||
wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject);
|
||||
};
|
||||
|
||||
#endif // wxUSE_DRAG_AND_DROP
|
||||
|
@@ -56,7 +56,7 @@ protected:
|
||||
wxFindReplaceDialogImpl *m_impl;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxFindReplaceDialog)
|
||||
DECLARE_NO_COPY_CLASS(wxFindReplaceDialog)
|
||||
wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialog);
|
||||
};
|
||||
|
||||
#endif // _WX_PALMOS_FDREPDLG_H_
|
||||
|
@@ -39,7 +39,7 @@ private:
|
||||
wxArrayString m_fileNames;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxFileDialog)
|
||||
DECLARE_NO_COPY_CLASS(wxFileDialog)
|
||||
wxDECLARE_NO_COPY_CLASS(wxFileDialog);
|
||||
};
|
||||
|
||||
#endif // _WX_FILEDLG_H_
|
||||
|
@@ -388,7 +388,7 @@ private:
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxListCtrl)
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_NO_COPY_CLASS(wxListCtrl)
|
||||
wxDECLARE_NO_COPY_CLASS(wxListCtrl);
|
||||
};
|
||||
|
||||
#endif // wxUSE_LISTCTRL
|
||||
|
@@ -103,7 +103,7 @@ private:
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
|
||||
DECLARE_NO_COPY_CLASS(wxMDIParentFrame)
|
||||
wxDECLARE_NO_COPY_CLASS(wxMDIParentFrame);
|
||||
};
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
@@ -27,7 +27,7 @@ public:
|
||||
virtual int ShowModal(void);
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxMessageDialog)
|
||||
DECLARE_NO_COPY_CLASS(wxMessageDialog)
|
||||
wxDECLARE_NO_COPY_CLASS(wxMessageDialog);
|
||||
};
|
||||
|
||||
|
||||
|
@@ -57,7 +57,7 @@ private:
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxPen;
|
||||
|
||||
// Cannot use
|
||||
// DECLARE_NO_COPY_CLASS(wxPenRefData)
|
||||
// wxDECLARE_NO_COPY_CLASS(wxPenRefData);
|
||||
// because copy constructor is explicitly declared above;
|
||||
// but no copy assignment operator is defined, so declare
|
||||
// it private to prevent the compiler from defining it:
|
||||
|
@@ -83,7 +83,7 @@ private:
|
||||
// current group modified ?
|
||||
bool m_modGroup;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxPrefConfig)
|
||||
wxDECLARE_NO_COPY_CLASS(wxPrefConfig);
|
||||
DECLARE_ABSTRACT_CLASS(wxPrefConfig)
|
||||
};
|
||||
|
||||
|
@@ -46,7 +46,7 @@ private:
|
||||
bool m_destroyDC;
|
||||
wxWindow* m_dialogParent;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxPrintDialog)
|
||||
wxDECLARE_NO_COPY_CLASS(wxPrintDialog);
|
||||
};
|
||||
|
||||
class WXDLLIMPEXP_CORE wxPageSetupDialog: public wxDialog
|
||||
@@ -67,7 +67,7 @@ private:
|
||||
wxPageSetupData m_pageSetupData;
|
||||
wxWindow* m_dialogParent;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxPageSetupDialog)
|
||||
wxDECLARE_NO_COPY_CLASS(wxPageSetupDialog);
|
||||
};
|
||||
|
||||
#endif // wxUSE_PRINTING_ARCHITECTURE
|
||||
|
@@ -35,7 +35,7 @@ public:
|
||||
private:
|
||||
WXFARPROC m_lpAbortProc;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxPalmPrinter)
|
||||
wxDECLARE_NO_COPY_CLASS(wxPalmPrinter);
|
||||
};
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
@@ -50,7 +50,7 @@ private:
|
||||
// Virtual function hiding supression
|
||||
virtual void Update() { wxDialog::Update(); }
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxProgressDialog)
|
||||
wxDECLARE_NO_COPY_CLASS(wxProgressDialog);
|
||||
};
|
||||
|
||||
#endif // wxUSE_PROGRESSDLG
|
||||
|
@@ -163,7 +163,7 @@ private:
|
||||
wxHashTable m_radios;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxRadioBox)
|
||||
DECLARE_NO_COPY_CLASS(wxRadioBox)
|
||||
wxDECLARE_NO_COPY_CLASS(wxRadioBox);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -44,7 +44,7 @@ private:
|
||||
int m_waveLength;
|
||||
bool m_isResource;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxSound)
|
||||
wxDECLARE_NO_COPY_CLASS(wxSound);
|
||||
};
|
||||
#endif
|
||||
#endif
|
||||
|
@@ -109,7 +109,7 @@ protected:
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_NO_COPY_CLASS(wxSpinCtrl)
|
||||
wxDECLARE_NO_COPY_CLASS(wxSpinCtrl);
|
||||
};
|
||||
|
||||
#endif // _WX_PALMOS_SPINCTRL_H_
|
||||
|
@@ -93,7 +93,7 @@ protected:
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
|
||||
DECLARE_NO_COPY_CLASS(wxStaticBitmap)
|
||||
wxDECLARE_NO_COPY_CLASS(wxStaticBitmap);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -104,7 +104,7 @@ protected:
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_DYNAMIC_CLASS(wxToolBar)
|
||||
DECLARE_NO_COPY_CLASS(wxToolBar)
|
||||
wxDECLARE_NO_COPY_CLASS(wxToolBar);
|
||||
};
|
||||
|
||||
#endif // wxUSE_TOOLBAR
|
||||
|
@@ -62,7 +62,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_PALMOS_TOOLTIP_H_
|
||||
|
@@ -121,7 +121,7 @@ protected:
|
||||
wxWindow *m_winLastFocused;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_NO_COPY_CLASS(wxTopLevelWindowPalm)
|
||||
wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowPalm);
|
||||
};
|
||||
|
||||
#endif // _WX_PALMOS_TOPLEVEL_H_
|
||||
|
@@ -425,7 +425,7 @@ private:
|
||||
friend class wxTreeSortHelper;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
|
||||
DECLARE_NO_COPY_CLASS(wxTreeCtrl)
|
||||
wxDECLARE_NO_COPY_CLASS(wxTreeCtrl);
|
||||
};
|
||||
|
||||
#endif // wxUSE_TREECTRL
|
||||
|
@@ -270,7 +270,7 @@ private:
|
||||
bool HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags);
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxWindowPalm)
|
||||
DECLARE_NO_COPY_CLASS(wxWindowPalm)
|
||||
wxDECLARE_NO_COPY_CLASS(wxWindowPalm);
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user