Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use "new" wx-prefixed macros in samples

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 07:07:55 +00:00
parent 08a02f640a
commit 5b4a70247c
162 changed files with 698 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/docview/doc.h
View File

@@ -99,7 +99,7 @@ private:
DoodleSegments m_doodleSegments;
DECLARE_DYNAMIC_CLASS(DrawingDocument)
wxDECLARE_DYNAMIC_CLASS(DrawingDocument);
};
@@ -179,7 +179,7 @@ protected:
void OnTextChange(wxCommandEvent& event);
wxDECLARE_NO_COPY_CLASS(wxTextDocument);
DECLARE_CLASS(wxTextDocument)
wxDECLARE_ABSTRACT_CLASS(wxTextDocument);
};
// ----------------------------------------------------------------------------
@@ -193,7 +193,7 @@ public:
virtual wxTextCtrl* GetTextCtrl() const wxOVERRIDE;
wxDECLARE_NO_COPY_CLASS(TextEditDocument);
DECLARE_DYNAMIC_CLASS(TextEditDocument)
wxDECLARE_DYNAMIC_CLASS(TextEditDocument);
};
// ----------------------------------------------------------------------------
@@ -219,7 +219,7 @@ private:
wxImage m_image;
wxDECLARE_NO_COPY_CLASS(ImageDocument);
DECLARE_DYNAMIC_CLASS(ImageDocument)
wxDECLARE_DYNAMIC_CLASS(ImageDocument);
};
// This is a child document of ImageDocument: this document doesn't

4
samples/docview/docview.cpp
View File

@@ -72,9 +72,9 @@
IMPLEMENT_APP(MyApp)
BEGIN_EVENT_TABLE(MyApp, wxApp)
wxBEGIN_EVENT_TABLE(MyApp, wxApp)
EVT_MENU(wxID_ABOUT, MyApp::OnAbout)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
MyApp::MyApp()
{

2
samples/docview/docview.h
View File

@@ -76,7 +76,7 @@ private:
MyCanvas *m_canvas;
wxMenu *m_menuEdit;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
wxDECLARE_NO_COPY_CLASS(MyApp);
};

12
samples/docview/view.cpp
View File

@@ -34,9 +34,9 @@
IMPLEMENT_DYNAMIC_CLASS(DrawingView, wxView)
BEGIN_EVENT_TABLE(DrawingView, wxView)
wxBEGIN_EVENT_TABLE(DrawingView, wxView)
EVT_MENU(wxID_CUT, DrawingView::OnCut)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// What to do when a view is created. Creates actual
// windows for displaying the view.
@@ -146,11 +146,11 @@ void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
BEGIN_EVENT_TABLE(TextEditView, wxView)
wxBEGIN_EVENT_TABLE(TextEditView, wxView)
EVT_MENU(wxID_COPY, TextEditView::OnCopy)
EVT_MENU(wxID_PASTE, TextEditView::OnPaste)
EVT_MENU(wxID_SELECTALL, TextEditView::OnSelectAll)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
bool TextEditView::OnCreate(wxDocument *doc, long flags)
{
@@ -198,9 +198,9 @@ bool TextEditView::OnClose(bool deleteWindow)
// MyCanvas implementation
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// Define a constructor for my canvas
MyCanvas::MyCanvas(wxView *view, wxWindow *parent)

12
samples/docview/view.h
View File

@@ -59,7 +59,7 @@ private:
// the last mouse press position
wxPoint m_lastMousePos;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// The view using MyCanvas to show its contents
@@ -80,8 +80,8 @@ private:
MyCanvas *m_canvas;
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(DrawingView)
wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS(DrawingView);
};
// ----------------------------------------------------------------------------
@@ -107,8 +107,8 @@ private:
wxTextCtrl *m_text;
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(TextEditView)
wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS(TextEditView);
};
// ----------------------------------------------------------------------------
@@ -144,7 +144,7 @@ public:
private:
ImageCanvas* m_canvas;
DECLARE_DYNAMIC_CLASS(ImageView)
wxDECLARE_DYNAMIC_CLASS(ImageView);
};
// ----------------------------------------------------------------------------