Use wx-prefixed macros throughout the repository.
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE occurrences to use the wx-prefixed version of the macros.
This commit is contained in:
@@ -363,7 +363,7 @@ bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const
|
||||
// wxGenericDirCtrl
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
|
||||
wxBEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
|
||||
EVT_TREE_ITEM_EXPANDING (wxID_TREECTRL, wxGenericDirCtrl::OnExpandItem)
|
||||
EVT_TREE_ITEM_COLLAPSED (wxID_TREECTRL, wxGenericDirCtrl::OnCollapseItem)
|
||||
EVT_TREE_BEGIN_LABEL_EDIT (wxID_TREECTRL, wxGenericDirCtrl::OnBeginEditItem)
|
||||
@@ -371,7 +371,7 @@ BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
|
||||
EVT_TREE_SEL_CHANGED (wxID_TREECTRL, wxGenericDirCtrl::OnTreeSelChange)
|
||||
EVT_TREE_ITEM_ACTIVATED (wxID_TREECTRL, wxGenericDirCtrl::OnItemActivated)
|
||||
EVT_SIZE (wxGenericDirCtrl::OnSize)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
wxGenericDirCtrl::wxGenericDirCtrl(void)
|
||||
{
|
||||
@@ -1286,11 +1286,11 @@ wxTreeItemId wxGenericDirCtrl::AppendItem (const wxTreeItemId & parent,
|
||||
// wxDirFilterListCtrl
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_CLASS(wxDirFilterListCtrl, wxChoice)
|
||||
wxIMPLEMENT_CLASS(wxDirFilterListCtrl, wxChoice);
|
||||
|
||||
BEGIN_EVENT_TABLE(wxDirFilterListCtrl, wxChoice)
|
||||
wxBEGIN_EVENT_TABLE(wxDirFilterListCtrl, wxChoice)
|
||||
EVT_CHOICE(wxID_ANY, wxDirFilterListCtrl::OnSelFilter)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent,
|
||||
const wxWindowID treeid,
|
||||
@@ -1447,7 +1447,7 @@ wxFileIconsTable* wxTheFileIconsTable = NULL;
|
||||
|
||||
class wxFileIconsTableModule: public wxModule
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxFileIconsTableModule)
|
||||
wxDECLARE_DYNAMIC_CLASS(wxFileIconsTableModule);
|
||||
public:
|
||||
wxFileIconsTableModule() {}
|
||||
bool OnInit() wxOVERRIDE { wxTheFileIconsTable = new wxFileIconsTable; return true; }
|
||||
@@ -1457,7 +1457,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFileIconsTableModule, wxModule)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxFileIconsTableModule, wxModule);
|
||||
|
||||
class wxFileIconEntry : public wxObject
|
||||
{
|
||||
|
Reference in New Issue
Block a user