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

6
samples/html/about/about.cpp
View File

@@ -62,7 +62,7 @@ public:
private:
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// ----------------------------------------------------------------------------
@@ -72,10 +72,10 @@ private:
// 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(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
EVT_MENU(wxID_EXIT, MyFrame::OnQuit)
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

6
samples/html/help/help.cpp
View File

@@ -67,7 +67,7 @@ private:
wxHtmlHelpController help;
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// ----------------------------------------------------------------------------
@@ -89,11 +89,11 @@ 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(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_Help, MyFrame::OnHelp)
EVT_CLOSE(MyFrame::OnClose)
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

6
samples/html/htmlctrl/htmlctrl.cpp
View File

@@ -87,7 +87,7 @@ public:
wxTextCtrl* urlText;
private:
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// ----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ private:
// 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(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_BUTTON(ID_BACK, MyFrame::OnBackButton)
EVT_BUTTON(ID_NEXT, MyFrame::OnNextButton)
EVT_BUTTON(ID_STOP, MyFrame::OnStopButton)
@@ -108,7 +108,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_WEBKIT_STATE_CHANGED(MyFrame::OnStateChanged)
//EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
//EVT_MENU(Minimal_About, MyFrame::OnAbout)
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

6
samples/html/printing/printing.cpp
View File

@@ -76,7 +76,7 @@ private:
wxString m_Name;
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// ----------------------------------------------------------------------------
@@ -105,7 +105,7 @@ 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(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
EVT_MENU(Minimal_Print, MyFrame::OnPrint)
@@ -115,7 +115,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_PrintSmall, MyFrame::OnPrintSmall)
EVT_MENU(Minimal_PrintNormal, MyFrame::OnPrintNormal)
EVT_MENU(Minimal_PrintHuge, MyFrame::OnPrintHuge)
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

12
samples/html/test/test.cpp
View File

@@ -73,7 +73,7 @@ private:
bool m_drawCustomBg;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
wxDECLARE_NO_COPY_CLASS(MyHtmlWindow);
};
@@ -103,7 +103,7 @@ private:
wxHtmlProcessor *m_Processor;
// Any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
@@ -143,7 +143,7 @@ enum
// event tables and other macros for wxWidgets
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(wxID_EXIT, MyFrame::OnQuit)
EVT_MENU(ID_PageOpen, MyFrame::OnPageOpen)
EVT_MENU(ID_DefaultLocalBrowser, MyFrame::OnDefaultLocalBrowser)
@@ -156,7 +156,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_HTML_LINK_CLICKED(wxID_ANY, MyFrame::OnHtmlLinkClicked)
EVT_HTML_CELL_HOVER(wxID_ANY, MyFrame::OnHtmlCellHover)
EVT_HTML_CELL_CLICKED(wxID_ANY, MyFrame::OnHtmlCellClicked)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
IMPLEMENT_APP(MyApp)
@@ -377,12 +377,12 @@ wxHtmlOpeningStatus MyHtmlWindow::OnOpeningURL(wxHtmlURLType WXUNUSED(type),
return wxHTML_OPEN;
}
BEGIN_EVENT_TABLE(MyHtmlWindow, wxHtmlWindow)
wxBEGIN_EVENT_TABLE(MyHtmlWindow, wxHtmlWindow)
#if wxUSE_CLIPBOARD
EVT_TEXT_COPY(wxID_ANY, MyHtmlWindow::OnClipboardEvent)
#endif // wxUSE_CLIPBOARD
EVT_ERASE_BACKGROUND(MyHtmlWindow::OnEraseBgEvent)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
#if wxUSE_CLIPBOARD
void MyHtmlWindow::OnClipboardEvent(wxClipboardTextEvent& WXUNUSED(event))

6
samples/html/virtual/virtual.cpp
View File

@@ -111,7 +111,7 @@ public:
private:
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// ----------------------------------------------------------------------------
@@ -137,11 +137,11 @@ 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(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_Back, MyFrame::OnBack)
EVT_MENU(Minimal_Forward, MyFrame::OnForward)
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

6
samples/html/widget/widget.cpp
View File

@@ -104,7 +104,7 @@ public:
private:
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// ----------------------------------------------------------------------------
@@ -130,11 +130,11 @@ 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(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_Back, MyFrame::OnBack)
EVT_MENU(Minimal_Forward, MyFrame::OnForward)
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

6
samples/html/zip/zip.cpp
View File

@@ -60,7 +60,7 @@ public:
private:
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// ----------------------------------------------------------------------------
@@ -83,11 +83,11 @@ 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(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_Back, MyFrame::OnBack)
EVT_MENU(Minimal_Forward, MyFrame::OnForward)
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