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/generic/busyinfo.h
View File

@@ -33,7 +33,7 @@ public:
private:
wxFrame *m_InfoFrame;
DECLARE_NO_COPY_CLASS(wxBusyInfo)
wxDECLARE_NO_COPY_CLASS(wxBusyInfo);
};

2
include/wx/generic/calctrlg.h
View File

@@ -297,7 +297,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxGenericCalendarCtrl)
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxGenericCalendarCtrl)
wxDECLARE_NO_COPY_CLASS(wxGenericCalendarCtrl);
};
#endif // _WX_GENERIC_CALCTRLG_H

2
include/wx/generic/choicdgg.h
View File

@@ -86,7 +86,7 @@ protected:
const wxString *choices,
long styleLbox);
DECLARE_NO_COPY_CLASS(wxAnyChoiceDialog)
wxDECLARE_NO_COPY_CLASS(wxAnyChoiceDialog);
};
// ----------------------------------------------------------------------------

2
include/wx/generic/ctrlsub.h
View File

@@ -116,7 +116,7 @@ private:
return true;
}
DECLARE_NO_COPY_CLASS(wxControlWithItemsGeneric)
wxDECLARE_NO_COPY_CLASS(wxControlWithItemsGeneric);
};
#endif // _WX_GENERIC_CTRLSUB_H_

2
include/wx/generic/dataview.h
View File

@@ -522,7 +522,7 @@ private:
private:
DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl);
DECLARE_EVENT_TABLE()
};

2
include/wx/generic/datectrl.h
View File

@@ -81,7 +81,7 @@ private:
wxCalendarComboPopup* m_popup;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric)
wxDECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric);
};
#endif // _WX_GENERIC_DATECTRL_H_

4
include/wx/generic/dirctrlg.h
View File

@@ -199,7 +199,7 @@ private:
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxGenericDirCtrl)
DECLARE_NO_COPY_CLASS(wxGenericDirCtrl)
wxDECLARE_NO_COPY_CLASS(wxGenericDirCtrl);
};
//-----------------------------------------------------------------------------
@@ -239,7 +239,7 @@ protected:
DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxDirFilterListCtrl)
DECLARE_NO_COPY_CLASS(wxDirFilterListCtrl)
wxDECLARE_NO_COPY_CLASS(wxDirFilterListCtrl);
};
#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXPM__)

2
include/wx/generic/dragimgg.h
View File

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

14
include/wx/generic/grid.h
View File

@@ -281,7 +281,7 @@ protected:
// no friends
friend class wxGridCellEditorDummyFriend;
DECLARE_NO_COPY_CLASS(wxGridCellEditor)
wxDECLARE_NO_COPY_CLASS(wxGridCellEditor);
};
@@ -435,7 +435,7 @@ private:
wxAttrKind m_attrkind;
// use Clone() instead
DECLARE_NO_COPY_CLASS(wxGridCellAttr)
wxDECLARE_NO_COPY_CLASS(wxGridCellAttr);
// suppress the stupid gcc warning about the class having private dtor and
// no friends
@@ -480,7 +480,7 @@ private:
wxGridCellAttrProviderData *m_data;
DECLARE_NO_COPY_CLASS(wxGridCellAttrProvider)
wxDECLARE_NO_COPY_CLASS(wxGridCellAttrProvider);
};
// ----------------------------------------------------------------------------
@@ -649,7 +649,7 @@ private:
wxGridCellAttrProvider *m_attrProvider;
DECLARE_ABSTRACT_CLASS(wxGridTableBase)
DECLARE_NO_COPY_CLASS(wxGridTableBase)
wxDECLARE_NO_COPY_CLASS(wxGridTableBase);
};
@@ -694,7 +694,7 @@ private:
int m_comInt1;
int m_comInt2;
DECLARE_NO_COPY_CLASS(wxGridTableMessage)
wxDECLARE_NO_COPY_CLASS(wxGridTableMessage);
};
@@ -2039,7 +2039,7 @@ private:
DECLARE_DYNAMIC_CLASS( wxGrid )
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxGrid)
wxDECLARE_NO_COPY_CLASS(wxGrid);
};
// ----------------------------------------------------------------------------
@@ -2080,7 +2080,7 @@ private:
wxGrid *m_grid;
DECLARE_NO_COPY_CLASS(wxGridUpdateLocker)
wxDECLARE_NO_COPY_CLASS(wxGridUpdateLocker);
};
// ----------------------------------------------------------------------------

16
include/wx/generic/grideditors.h
View File

@@ -42,7 +42,7 @@ private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)
DECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler)
wxDECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler);
};
@@ -92,7 +92,7 @@ private:
size_t m_maxChars; // max number of chars allowed
wxString m_value;
DECLARE_NO_COPY_CLASS(wxGridCellTextEditor)
wxDECLARE_NO_COPY_CLASS(wxGridCellTextEditor);
};
// the editor for numeric (long) data
@@ -149,7 +149,7 @@ private:
long m_value;
DECLARE_NO_COPY_CLASS(wxGridCellNumberEditor)
wxDECLARE_NO_COPY_CLASS(wxGridCellNumberEditor);
};
// the editor for floating point numbers (double) data
@@ -185,7 +185,7 @@ private:
m_precision;
double m_value;
DECLARE_NO_COPY_CLASS(wxGridCellFloatEditor)
wxDECLARE_NO_COPY_CLASS(wxGridCellFloatEditor);
};
#endif // wxUSE_TEXTCTRL
@@ -238,7 +238,7 @@ private:
static wxString ms_stringValues[2];
DECLARE_NO_COPY_CLASS(wxGridCellBoolEditor)
wxDECLARE_NO_COPY_CLASS(wxGridCellBoolEditor);
};
#endif // wxUSE_CHECKBOX
@@ -283,7 +283,7 @@ protected:
wxArrayString m_choices;
bool m_allowOthers;
DECLARE_NO_COPY_CLASS(wxGridCellChoiceEditor)
wxDECLARE_NO_COPY_CLASS(wxGridCellChoiceEditor);
};
#endif // wxUSE_COMBOBOX
@@ -305,7 +305,7 @@ public:
private:
long m_index;
DECLARE_NO_COPY_CLASS(wxGridCellEnumEditor)
wxDECLARE_NO_COPY_CLASS(wxGridCellEnumEditor);
};
#endif // wxUSE_COMBOBOX
@@ -321,7 +321,7 @@ public:
virtual wxGridCellEditor *Clone() const
{ return new wxGridCellAutoWrapStringEditor; }
DECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor)
wxDECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor);
};
#endif // wxUSE_GRID

2
include/wx/generic/gridsel.h
View File

@@ -109,7 +109,7 @@ private:
friend class WXDLLIMPEXP_FWD_ADV wxGrid;
DECLARE_NO_COPY_CLASS(wxGridSelection)
wxDECLARE_NO_COPY_CLASS(wxGridSelection);
};
#endif // wxUSE_GRID

2
include/wx/generic/headerctrlg.h
View File

@@ -177,7 +177,7 @@ private:
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxHeaderCtrl)
wxDECLARE_NO_COPY_CLASS(wxHeaderCtrl);
};
#endif // _WX_GENERIC_HEADERCTRLG_H_

4
include/wx/generic/logg.h
View File

@@ -38,7 +38,7 @@ private:
// the control we use
wxTextCtrl *m_pTextCtrl;
DECLARE_NO_COPY_CLASS(wxLogTextCtrl)
wxDECLARE_NO_COPY_CLASS(wxLogTextCtrl);
};
#endif // wxUSE_TEXTCTRL
@@ -147,7 +147,7 @@ protected:
private:
wxLogFrame *m_pLogFrame; // the log frame
DECLARE_NO_COPY_CLASS(wxLogWindow)
wxDECLARE_NO_COPY_CLASS(wxLogWindow);
};
#endif // wxUSE_LOGWINDOW

2
include/wx/generic/notifmsg.h
View File

@@ -54,7 +54,7 @@ private:
wxNotificationMessageDialog *m_dialog;
DECLARE_NO_COPY_CLASS(wxGenericNotificationMessage)
wxDECLARE_NO_COPY_CLASS(wxGenericNotificationMessage);
};
#endif // _WX_GENERIC_NOTIFMSG_H_

2
include/wx/generic/numdlgg.h
View File

@@ -57,7 +57,7 @@ protected:
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxNumberEntryDialog)
DECLARE_NO_COPY_CLASS(wxNumberEntryDialog)
wxDECLARE_NO_COPY_CLASS(wxNumberEntryDialog);
};
// ----------------------------------------------------------------------------

14
include/wx/generic/private/grid.h
View File

@@ -244,7 +244,7 @@ private:
wxVector<wxGridHeaderColumn> m_columns;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxGridHeaderCtrl)
wxDECLARE_NO_COPY_CLASS(wxGridHeaderCtrl);
};
// common base class for various grid subwindows
@@ -272,7 +272,7 @@ protected:
wxGrid *m_owner;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxGridSubwindow)
wxDECLARE_NO_COPY_CLASS(wxGridSubwindow);
};
class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxGridSubwindow
@@ -290,7 +290,7 @@ private:
void OnMouseWheel( wxMouseEvent& event );
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxGridRowLabelWindow)
wxDECLARE_NO_COPY_CLASS(wxGridRowLabelWindow);
};
@@ -309,7 +309,7 @@ private:
void OnMouseWheel( wxMouseEvent& event );
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxGridColLabelWindow)
wxDECLARE_NO_COPY_CLASS(wxGridColLabelWindow);
};
@@ -327,7 +327,7 @@ private:
void OnPaint( wxPaintEvent& event );
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow)
wxDECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow);
};
class WXDLLIMPEXP_ADV wxGridWindow : public wxGridSubwindow
@@ -356,7 +356,7 @@ private:
void OnFocus( wxFocusEvent& );
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxGridWindow)
wxDECLARE_NO_COPY_CLASS(wxGridWindow);
};
// ----------------------------------------------------------------------------
@@ -785,7 +785,7 @@ struct wxGridDataTypeInfo
wxGridCellRenderer* m_renderer;
wxGridCellEditor* m_editor;
DECLARE_NO_COPY_CLASS(wxGridDataTypeInfo)
wxDECLARE_NO_COPY_CLASS(wxGridDataTypeInfo);
};

2
include/wx/generic/progdlgg.h
View File

@@ -168,7 +168,7 @@ private:
class WXDLLIMPEXP_FWD_CORE wxWindowDisabler *m_winDisabler;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxProgressDialog)
wxDECLARE_NO_COPY_CLASS(wxProgressDialog);
};
#endif // wxUSE_PROGRESSDLG

2
include/wx/generic/sashwin.h
View File

@@ -200,7 +200,7 @@ private:
private:
DECLARE_DYNAMIC_CLASS(wxSashWindow)
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxSashWindow)
wxDECLARE_NO_COPY_CLASS(wxSashWindow);
};
class WXDLLIMPEXP_FWD_ADV wxSashEvent;

2
include/wx/generic/scrolwin.h
View File

@@ -46,7 +46,7 @@ private:
wxScrollbarVisibility m_xVisibility,
m_yVisibility;
DECLARE_NO_COPY_CLASS(wxScrollHelper)
wxDECLARE_NO_COPY_CLASS(wxScrollHelper);
};
#endif // _WX_GENERIC_SCROLLWIN_H_

4
include/wx/generic/splash.h
View File

@@ -60,7 +60,7 @@ protected:
DECLARE_DYNAMIC_CLASS(wxSplashScreen)
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxSplashScreen)
wxDECLARE_NO_COPY_CLASS(wxSplashScreen);
};
/*
@@ -84,7 +84,7 @@ protected:
wxBitmap m_bitmap;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxSplashScreenWindow)
wxDECLARE_NO_COPY_CLASS(wxSplashScreenWindow);
};

2
include/wx/generic/splitter.h
View File

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

4
include/wx/generic/textdlgg.h
View File

@@ -68,7 +68,7 @@ protected:
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)
DECLARE_NO_COPY_CLASS(wxTextEntryDialog)
wxDECLARE_NO_COPY_CLASS(wxTextEntryDialog);
};
// ----------------------------------------------------------------------------
@@ -86,7 +86,7 @@ public:
const wxPoint& pos = wxDefaultPosition);
private:
DECLARE_DYNAMIC_CLASS(wxPasswordEntryDialog)
DECLARE_NO_COPY_CLASS(wxPasswordEntryDialog)
wxDECLARE_NO_COPY_CLASS(wxPasswordEntryDialog);
};
// ----------------------------------------------------------------------------

2
include/wx/generic/treectlg.h
View File

@@ -348,7 +348,7 @@ protected:
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl)
DECLARE_NO_COPY_CLASS(wxGenericTreeCtrl)
wxDECLARE_NO_COPY_CLASS(wxGenericTreeCtrl);
};
#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)

2
include/wx/generic/wizard.h
View File

@@ -163,7 +163,7 @@ protected:
DECLARE_DYNAMIC_CLASS(wxWizard)
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxWizard)
wxDECLARE_NO_COPY_CLASS(wxWizard);
};
#endif // _WX_GENERIC_WIZARD_H_