use "new" wx-prefixed macros in samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -151,7 +151,7 @@ public:
|
||||
private:
|
||||
wxBitmap m_bitmap;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
#if wxUSE_METAFILE
|
||||
@@ -187,7 +187,7 @@ public:
|
||||
private:
|
||||
wxMetafile m_metafile;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
#endif // wxUSE_METAFILE
|
||||
@@ -271,7 +271,7 @@ private:
|
||||
wxString m_strText;
|
||||
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -696,7 +696,7 @@ private:
|
||||
*m_textW,
|
||||
*m_textH;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -735,7 +735,7 @@ private:
|
||||
|
||||
static DnDShapeFrame *ms_lastDropTarget;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -826,7 +826,7 @@ enum
|
||||
Button_Colour = 1001
|
||||
};
|
||||
|
||||
BEGIN_EVENT_TABLE(DnDFrame, wxFrame)
|
||||
wxBEGIN_EVENT_TABLE(DnDFrame, wxFrame)
|
||||
EVT_MENU(Menu_Quit, DnDFrame::OnQuit)
|
||||
EVT_MENU(Menu_About, DnDFrame::OnAbout)
|
||||
EVT_MENU(Menu_Drag, DnDFrame::OnDrag)
|
||||
@@ -857,11 +857,11 @@ BEGIN_EVENT_TABLE(DnDFrame, wxFrame)
|
||||
EVT_RIGHT_DOWN( DnDFrame::OnRightDown)
|
||||
EVT_PAINT( DnDFrame::OnPaint)
|
||||
EVT_SIZE( DnDFrame::OnSize)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
#if wxUSE_DRAG_AND_DROP
|
||||
|
||||
BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame)
|
||||
wxBEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame)
|
||||
EVT_MENU(Menu_Shape_New, DnDShapeFrame::OnNewShape)
|
||||
EVT_MENU(Menu_Shape_Edit, DnDShapeFrame::OnEditShape)
|
||||
EVT_MENU(Menu_Shape_Clear, DnDShapeFrame::OnClearShape)
|
||||
@@ -875,22 +875,22 @@ BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame)
|
||||
EVT_LEFT_DOWN(DnDShapeFrame::OnDrag)
|
||||
|
||||
EVT_PAINT(DnDShapeFrame::OnPaint)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(DnDShapeDialog, wxDialog)
|
||||
wxBEGIN_EVENT_TABLE(DnDShapeDialog, wxDialog)
|
||||
EVT_BUTTON(Button_Colour, DnDShapeDialog::OnColour)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
#endif // wxUSE_DRAG_AND_DROP
|
||||
|
||||
BEGIN_EVENT_TABLE(DnDCanvasBitmap, wxScrolledWindow)
|
||||
wxBEGIN_EVENT_TABLE(DnDCanvasBitmap, wxScrolledWindow)
|
||||
EVT_PAINT(DnDCanvasBitmap::OnPaint)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
#if wxUSE_METAFILE
|
||||
BEGIN_EVENT_TABLE(DnDCanvasMetafile, wxScrolledWindow)
|
||||
wxBEGIN_EVENT_TABLE(DnDCanvasMetafile, wxScrolledWindow)
|
||||
EVT_PAINT(DnDCanvasMetafile::OnPaint)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
#endif // wxUSE_METAFILE
|
||||
|
||||
#endif // wxUSE_DRAG_AND_DROP
|
||||
|
Reference in New Issue
Block a user