Use wx-prefixed macros throughout the repository.
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE occurrences to use the wx-prefixed version of the macros.
This commit is contained in:
@@ -42,7 +42,7 @@
|
||||
// DrawingDocument implementation
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument);
|
||||
|
||||
DocumentOstream& DrawingDocument::SaveObject(DocumentOstream& ostream)
|
||||
{
|
||||
@@ -184,7 +184,7 @@ DocumentIstream& DoodleSegment::LoadObject(DocumentIstream& istream)
|
||||
// wxTextDocument: wxDocument and wxTextCtrl married
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_CLASS(wxTextDocument, wxDocument)
|
||||
wxIMPLEMENT_CLASS(wxTextDocument, wxDocument);
|
||||
|
||||
bool wxTextDocument::OnCreate(const wxString& path, long flags)
|
||||
{
|
||||
@@ -250,7 +250,7 @@ void wxTextDocument::OnTextChange(wxCommandEvent& event)
|
||||
// TextEditDocument implementation
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument);
|
||||
|
||||
wxTextCtrl* TextEditDocument::GetTextCtrl() const
|
||||
{
|
||||
@@ -262,7 +262,7 @@ wxTextCtrl* TextEditDocument::GetTextCtrl() const
|
||||
// ImageDocument and ImageDetailsDocument implementation
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(ImageDocument, wxDocument)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(ImageDocument, wxDocument);
|
||||
|
||||
bool ImageDocument::DoOpenDocument(const wxString& file)
|
||||
{
|
||||
|
@@ -70,7 +70,7 @@
|
||||
// MyApp implementation
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_APP(MyApp)
|
||||
wxIMPLEMENT_APP(MyApp);
|
||||
|
||||
wxBEGIN_EVENT_TABLE(MyApp, wxApp)
|
||||
EVT_MENU(wxID_ABOUT, MyApp::OnAbout)
|
||||
|
@@ -87,6 +87,6 @@ private:
|
||||
wxDECLARE_NO_COPY_CLASS(MyApp);
|
||||
};
|
||||
|
||||
DECLARE_APP(MyApp)
|
||||
wxDECLARE_APP(MyApp);
|
||||
|
||||
#endif // _WX_SAMPLES_DOCVIEW_DOCVIEW_H_
|
||||
|
@@ -32,7 +32,7 @@
|
||||
// DrawingView implementation
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(DrawingView, wxView)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(DrawingView, wxView);
|
||||
|
||||
wxBEGIN_EVENT_TABLE(DrawingView, wxView)
|
||||
EVT_MENU(wxID_CUT, DrawingView::OnCut)
|
||||
@@ -144,7 +144,7 @@ void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
|
||||
// TextEditView implementation
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView);
|
||||
|
||||
wxBEGIN_EVENT_TABLE(TextEditView, wxView)
|
||||
EVT_MENU(wxID_COPY, TextEditView::OnCopy)
|
||||
@@ -300,7 +300,7 @@ void ImageCanvas::OnDraw(wxDC& dc)
|
||||
// ImageView implementation
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(ImageView, wxView)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(ImageView, wxView);
|
||||
|
||||
ImageDocument* ImageView::GetDocument()
|
||||
{
|
||||
|
Reference in New Issue
Block a user