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

4
samples/xti/classlist.cpp
View File

@@ -31,14 +31,14 @@
#endif
// IMPLEMENT_DYNAMIC_CLASS( ClassListDialog, wxDialog ) -- see the header
BEGIN_EVENT_TABLE( ClassListDialog, wxDialog )
wxBEGIN_EVENT_TABLE( ClassListDialog, wxDialog )
EVT_LISTBOX( ID_LISTBOX, ClassListDialog::OnListboxSelected )
EVT_TREE_SEL_CHANGED( ID_TREECTRL, ClassListDialog::OnTreectrlSelChanged )
EVT_CHOICEBOOK_PAGE_CHANGED( ID_LISTMODE, ClassListDialog::OnChoiceBookPageChange )
EVT_CHECKBOX( ID_SHOW_ONLY_XTI, ClassListDialog::OnShowOnlyXTICheckbox )
EVT_CHECKBOX( ID_SHOW_PROPERTIES_RECURSIVELY, ClassListDialog::OnShowRecursiveInfoCheckbox )
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// defined later
wxString DumpClassInfo(const wxClassInfo*, bool recursive);

4
samples/xti/classlist.h
View File

@@ -44,10 +44,10 @@
class ClassListDialog: public wxDialog
{
// we explicitly don't want to use the following macro:
// DECLARE_DYNAMIC_CLASS( ClassListDialog )
// wxDECLARE_DYNAMIC_CLASS( ClassListDialog );
// as otherwise the ClassListDialog class would appear in the list
// shown by this dialog!
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
public:
// Constructors

12
samples/xti/xti.cpp
View File

@@ -111,14 +111,14 @@ enum
// event tables and other macros for wxWidgets
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_Persist, MyFrame::OnPersist)
EVT_MENU(Minimal_Depersist, MyFrame::OnDepersist)
EVT_MENU(Minimal_GenerateCode, MyFrame::OnGenerateCode)
EVT_MENU(Minimal_DumpClasses, MyFrame::OnDumpClasses)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_About, MyFrame::OnAbout)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
wxIMPLEMENT_APP(MyApp);
@@ -240,8 +240,8 @@ MyFrame::MyFrame(const wxString& title)
// protected:
// wxButton* m_button;
//
// DECLARE_EVENT_TABLE()
// DECLARE_DYNAMIC_CLASS_NO_COPY(MyXTIFrame)
// wxDECLARE_EVENT_TABLE();
// wxDECLARE_DYNAMIC_CLASS_NO_COPY(MyXTIFrame);
// };
//
// IMPLEMENT_DYNAMIC_CLASS_XTI(MyXTIFrame, MyXTIFrame, "x.h")
@@ -257,8 +257,8 @@ MyFrame::MyFrame(const wxString& title)
// WX_CONSTRUCTOR_5( MyXTIFrame, wxWindow*, Parent, wxWindowID, Id,
// wxString, Title, wxPoint, Position, wxSize, Size )
//
// BEGIN_EVENT_TABLE(MyXTIFrame, wxFrame)
// END_EVENT_TABLE()
// wxBEGIN_EVENT_TABLE(MyXTIFrame, wxFrame)
// wxEND_EVENT_TABLE()
// the following class "persists" (i.e. saves) a wxFrame into a wxObjectWriter