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

@@ -78,7 +78,7 @@ public:
virtual bool OnInit();
DECLARE_NO_COPY_CLASS(MyApp)
wxDECLARE_NO_COPY_CLASS(MyApp);
};
class MyFrame: public wxFrame
@@ -104,7 +104,7 @@ private:
wxBoxSizer *m_paneSizer;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(MyFrame)
wxDECLARE_NO_COPY_CLASS(MyFrame);
};
class MyDialog : public wxDialog
@@ -120,7 +120,7 @@ private:
wxGridSizer *m_paneSizer;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(MyDialog)
wxDECLARE_NO_COPY_CLASS(MyDialog);
};

View File

@@ -169,7 +169,7 @@ private:
// number of lines drawn in OnPaint()
int m_numLines;
DECLARE_NO_COPY_CLASS(MyFrame)
wxDECLARE_NO_COPY_CLASS(MyFrame);
DECLARE_EVENT_TABLE()
};
@@ -204,7 +204,7 @@ public:
private:
bool m_uploadReport;
DECLARE_NO_COPY_CLASS(MyApp)
wxDECLARE_NO_COPY_CLASS(MyApp);
};
IMPLEMENT_APP(MyApp)

View File

@@ -980,7 +980,7 @@ private:
wxTextCtrl *m_text;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(MyRearrangeDialog)
wxDECLARE_NO_COPY_CLASS(MyRearrangeDialog);
};
BEGIN_EVENT_TABLE(MyRearrangeDialog, wxRearrangeDialog)

View File

@@ -228,7 +228,7 @@ private:
*m_chkCentre;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(TestMessageBoxDialog)
wxDECLARE_NO_COPY_CLASS(TestMessageBoxDialog);
};
class TestDefaultActionDialog: public wxDialog

View File

@@ -173,7 +173,7 @@ protected:
virtual bool DoSaveDocument(const wxString& filename);
virtual bool DoOpenDocument(const wxString& filename);
DECLARE_NO_COPY_CLASS(wxTextDocument)
wxDECLARE_NO_COPY_CLASS(wxTextDocument);
DECLARE_CLASS(wxTextDocument)
};
@@ -187,7 +187,7 @@ public:
TextEditDocument() : wxTextDocument() { }
virtual wxTextCtrl* GetTextCtrl() const;
DECLARE_NO_COPY_CLASS(TextEditDocument)
wxDECLARE_NO_COPY_CLASS(TextEditDocument);
DECLARE_DYNAMIC_CLASS(TextEditDocument)
};

View File

@@ -80,7 +80,7 @@ private:
wxMenu *m_menuEdit;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(MyApp)
wxDECLARE_NO_COPY_CLASS(MyApp);
};
DECLARE_APP(MyApp)

View File

@@ -120,7 +120,7 @@ public:
private:
wxString m_swf;
DECLARE_NO_COPY_CLASS(FlashApp)
wxDECLARE_NO_COPY_CLASS(FlashApp);
};
// Define a new frame type: this is going to be our main frame
@@ -187,7 +187,7 @@ private:
*m_funcarg;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(FlashFrame)
wxDECLARE_NO_COPY_CLASS(FlashFrame);
};
// ----------------------------------------------------------------------------

View File

@@ -1877,7 +1877,7 @@ private:
// fla for EVT_IDLE handler
bool m_shouldUpdateOrder;
DECLARE_NO_COPY_CLASS(TabularGridFrame)
wxDECLARE_NO_COPY_CLASS(TabularGridFrame);
DECLARE_EVENT_TABLE()
};

View File

@@ -95,7 +95,7 @@ public:
wxTextFile m_file;
#endif
DECLARE_NO_COPY_CLASS(MyHtmlListBox)
wxDECLARE_NO_COPY_CLASS(MyHtmlListBox);
DECLARE_DYNAMIC_CLASS(MyHtmlListBox)
};

View File

@@ -60,7 +60,7 @@ private:
#if wxUSE_CLIPBOARD
DECLARE_EVENT_TABLE()
#endif // wxUSE_CLIPBOARD
DECLARE_NO_COPY_CLASS(MyHtmlWindow)
wxDECLARE_NO_COPY_CLASS(MyHtmlWindow);
};
// Define a new frame type: this is going to be our main frame

View File

@@ -104,7 +104,7 @@ private:
// should we notify the client about changes to m_item?
bool m_advise;
DECLARE_NO_COPY_CLASS(BenchConnection)
wxDECLARE_NO_COPY_CLASS(BenchConnection);
};
// a simple server accepting connections to IPC_TOPIC and IPC_BENCHMARK_TOPIC

View File

@@ -26,7 +26,7 @@ public:
virtual bool OnInit();
private:
DECLARE_NO_COPY_CLASS(MyApp)
wxDECLARE_NO_COPY_CLASS(MyApp);
};
class MyListCtrl: public wxListCtrl
@@ -93,7 +93,7 @@ private:
long m_updated;
DECLARE_NO_COPY_CLASS(MyListCtrl)
wxDECLARE_NO_COPY_CLASS(MyListCtrl);
DECLARE_EVENT_TABLE()
};
@@ -175,7 +175,7 @@ private:
bool m_smallVirtual;
DECLARE_NO_COPY_CLASS(MyFrame)
wxDECLARE_NO_COPY_CLASS(MyFrame);
DECLARE_EVENT_TABLE()
};

View File

@@ -70,7 +70,7 @@ private:
GLfloat m_xrot;
GLfloat m_yrot;
DECLARE_NO_COPY_CLASS(TestGLCanvas)
wxDECLARE_NO_COPY_CLASS(TestGLCanvas);
DECLARE_EVENT_TABLE()
};

View File

@@ -100,7 +100,7 @@ private:
GLData m_gldata;
DXFRenderer m_renderer;
DECLARE_NO_COPY_CLASS(TestGLCanvas)
wxDECLARE_NO_COPY_CLASS(TestGLCanvas);
DECLARE_EVENT_TABLE()
};

View File

@@ -74,7 +74,7 @@ public:
virtual bool OnInit();
DECLARE_NO_COPY_CLASS(MyApp)
wxDECLARE_NO_COPY_CLASS(MyApp);
};
class MyFrame: public wxFrame
@@ -114,7 +114,7 @@ private:
wxWindow *m_replacewindow;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(MyFrame)
wxDECLARE_NO_COPY_CLASS(MyFrame);
};
class MySplitterWindow : public wxSplitterWindow
@@ -132,7 +132,7 @@ private:
wxFrame *m_frame;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(MySplitterWindow)
wxDECLARE_NO_COPY_CLASS(MySplitterWindow);
};
class MyCanvas: public wxScrolledWindow
@@ -146,7 +146,7 @@ public:
private:
bool m_mirror;
DECLARE_NO_COPY_CLASS(MyCanvas)
wxDECLARE_NO_COPY_CLASS(MyCanvas);
};
// ============================================================================

View File

@@ -59,7 +59,7 @@ private:
ItemContainerWidgetsPage *m_tracker;
int m_value;
DECLARE_NO_COPY_CLASS(TrackedClientData)
wxDECLARE_NO_COPY_CLASS(TrackedClientData);
};
// ============================================================================