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

26
samples/propgrid/propgrid.cpp
View File

@@ -80,7 +80,7 @@
class wxSampleMultiButtonEditor : public wxPGTextCtrlEditor
{
DECLARE_DYNAMIC_CLASS(wxSampleMultiButtonEditor)
wxDECLARE_DYNAMIC_CLASS(wxSampleMultiButtonEditor);
public:
wxSampleMultiButtonEditor() {}
virtual ~wxSampleMultiButtonEditor() {}
@@ -441,7 +441,7 @@ enum
// Event table
// -----------------------------------------------------------------------
BEGIN_EVENT_TABLE(FormMain, wxFrame)
wxBEGIN_EVENT_TABLE(FormMain, wxFrame)
EVT_IDLE(FormMain::OnIdle)
EVT_MOVE(FormMain::OnMove)
EVT_SIZE(FormMain::OnResize)
@@ -557,7 +557,7 @@ BEGIN_EVENT_TABLE(FormMain, wxFrame)
EVT_CONTEXT_MENU( FormMain::OnContextMenu )
EVT_BUTTON(ID_SHOWPOPUP, FormMain::OnShowPopup)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// -----------------------------------------------------------------------
@@ -1762,16 +1762,16 @@ protected:
void OnPageChange( wxPropertyGridEvent& event );
private:
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
BEGIN_EVENT_TABLE(wxMyPropertyGridPage, wxPropertyGridPage)
wxBEGIN_EVENT_TABLE(wxMyPropertyGridPage, wxPropertyGridPage)
EVT_PG_SELECTED( wxID_ANY, wxMyPropertyGridPage::OnPropertySelect )
EVT_PG_CHANGING( wxID_ANY, wxMyPropertyGridPage::OnPropertyChanging )
EVT_PG_CHANGED( wxID_ANY, wxMyPropertyGridPage::OnPropertyChange )
EVT_PG_PAGE_CHANGED( wxID_ANY, wxMyPropertyGridPage::OnPageChange )
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
void wxMyPropertyGridPage::OnPropertySelect( wxPropertyGridEvent& WXUNUSED(event) )
@@ -1811,12 +1811,12 @@ public:
event.Skip();
}
private:
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
BEGIN_EVENT_TABLE(wxPGKeyHandler,wxEvtHandler)
wxBEGIN_EVENT_TABLE(wxPGKeyHandler,wxEvtHandler)
EVT_KEY_DOWN( wxPGKeyHandler::OnKeyEvent )
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// -----------------------------------------------------------------------
@@ -3257,15 +3257,15 @@ struct PropertyGridPopup : wxPopupWindow
SetSize(pos.x, pos.y, size.x, size.y);
}
DECLARE_CLASS(PropertyGridPopup)
DECLARE_EVENT_TABLE()
wxDECLARE_ABSTRACT_CLASS(PropertyGridPopup);
wxDECLARE_EVENT_TABLE();
};
IMPLEMENT_CLASS(PropertyGridPopup, wxPopupWindow)
BEGIN_EVENT_TABLE(PropertyGridPopup, wxPopupWindow)
wxBEGIN_EVENT_TABLE(PropertyGridPopup, wxPopupWindow)
EVT_PG_ITEM_COLLAPSED(ID_POPUPGRID, PropertyGridPopup::OnCollapse)
EVT_PG_ITEM_EXPANDED(ID_POPUPGRID, PropertyGridPopup::OnExpand)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
void FormMain::OnShowPopup(wxCommandEvent& WXUNUSED(event))

2
samples/propgrid/propgrid.h
View File

@@ -260,7 +260,7 @@ public:
bool RunTests( bool fullTest, bool interactive = false );
private:
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// -----------------------------------------------------------------------

6
samples/propgrid/propgrid_minimal.cpp
View File

@@ -23,14 +23,14 @@ public:
private:
wxPropertyGrid* m_pg;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(wxID_HIGHEST+1, MyFrame::OnAction)
EVT_PG_CHANGED( -1, MyFrame::OnPropertyGridChange )
EVT_PG_CHANGING( -1, MyFrame::OnPropertyGridChanging )
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
MyFrame::MyFrame(wxWindow* parent)
: wxFrame(parent, wxID_ANY, wxT("PropertyGrid Test"))

2
samples/propgrid/sampleprops.cpp
View File

@@ -365,7 +365,7 @@ protected:
virtual void ArraySwap( size_t first, size_t second ) wxOVERRIDE;
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxArrayDoubleEditorDialog)
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxArrayDoubleEditorDialog);
};
IMPLEMENT_DYNAMIC_CLASS(wxArrayDoubleEditorDialog, wxPGArrayEditorDialog)