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:
@@ -94,7 +94,7 @@ private:
|
||||
wxPanel *m_scrollWindow;
|
||||
|
||||
// any class wishing to process wxWidgets events must use this macro
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
class VScrollWindow : public wxVScrolledWindow
|
||||
@@ -184,15 +184,15 @@ private:
|
||||
|
||||
bool m_changed;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
BEGIN_EVENT_TABLE(VScrollWindow, wxVScrolledWindow)
|
||||
wxBEGIN_EVENT_TABLE(VScrollWindow, wxVScrolledWindow)
|
||||
EVT_IDLE(VScrollWindow::OnIdle)
|
||||
EVT_PAINT(VScrollWindow::OnPaint)
|
||||
EVT_SCROLLWIN(VScrollWindow::OnScroll)
|
||||
EVT_MOUSE_EVENTS(VScrollWindow::OnMouse)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
class HScrollWindow : public wxHScrolledWindow
|
||||
{
|
||||
@@ -281,15 +281,15 @@ private:
|
||||
|
||||
bool m_changed;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
BEGIN_EVENT_TABLE(HScrollWindow, wxHScrolledWindow)
|
||||
wxBEGIN_EVENT_TABLE(HScrollWindow, wxHScrolledWindow)
|
||||
EVT_IDLE(HScrollWindow::OnIdle)
|
||||
EVT_PAINT(HScrollWindow::OnPaint)
|
||||
EVT_SCROLLWIN(HScrollWindow::OnScroll)
|
||||
EVT_MOUSE_EVENTS(HScrollWindow::OnMouse)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
class HVScrollWindow : public wxHVScrolledWindow
|
||||
{
|
||||
@@ -410,15 +410,15 @@ private:
|
||||
|
||||
bool m_changed;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
BEGIN_EVENT_TABLE(HVScrollWindow, wxHVScrolledWindow)
|
||||
wxBEGIN_EVENT_TABLE(HVScrollWindow, wxHVScrolledWindow)
|
||||
EVT_IDLE(HVScrollWindow::OnIdle)
|
||||
EVT_PAINT(HVScrollWindow::OnPaint)
|
||||
EVT_SCROLLWIN(HVScrollWindow::OnScroll)
|
||||
EVT_MOUSE_EVENTS(HVScrollWindow::OnMouse)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// constants
|
||||
@@ -447,14 +447,14 @@ enum
|
||||
// the event tables connect the wxWidgets events with the functions (event
|
||||
// handlers) which process them. It can be also done at run-time, but for the
|
||||
// simple menu events like this the static method is much simpler.
|
||||
BEGIN_EVENT_TABLE(VarScrollFrame, wxFrame)
|
||||
wxBEGIN_EVENT_TABLE(VarScrollFrame, wxFrame)
|
||||
EVT_MENU(VScroll_Quit, VarScrollFrame::OnQuit)
|
||||
EVT_MENU(VScroll_VScrollMode, VarScrollFrame::OnModeVScroll)
|
||||
EVT_MENU(VScroll_HScrollMode, VarScrollFrame::OnModeHScroll)
|
||||
EVT_MENU(VScroll_HVScrollMode, VarScrollFrame::OnModeHVScroll)
|
||||
EVT_MENU(VScroll_About, VarScrollFrame::OnAbout)
|
||||
EVT_SIZE(VarScrollFrame::OnSize)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
// Create a new application object: this macro will allow wxWidgets to create
|
||||
// the application object during program execution (it's better than using a
|
||||
|
Reference in New Issue
Block a user