solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Use nullptr instead of NULL

Browse source 
No real changes.
This commit is contained in:
Vadim Zeitlin 2023-10-31 03:45:32 +01:00
parent e9b799270b
commit 9fe386277b
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/xrc/xh_propgrid.cpp
View file

@ -26,7 +26,7 @@
IMPLEMENT_DYNAMIC_CLASS(wxPropertyGridXmlHandler, wxXmlResourceHandler) IMPLEMENT_DYNAMIC_CLASS(wxPropertyGridXmlHandler, wxXmlResourceHandler)
wxPropertyGridXmlHandler::wxPropertyGridXmlHandler() wxPropertyGridXmlHandler::wxPropertyGridXmlHandler()
:wxXmlResourceHandler(), m_manager(NULL), m_populator(NULL) :wxXmlResourceHandler(), m_manager(nullptr), m_populator(nullptr)
{ {
XRC_ADD_STYLE(wxTAB_TRAVERSAL); XRC_ADD_STYLE(wxTAB_TRAVERSAL);
XRC_ADD_STYLE(wxPG_AUTO_SORT); XRC_ADD_STYLE(wxPG_AUTO_SORT);
@ -66,7 +66,7 @@ public:
void DoScanForChildren() override void DoScanForChildren() override
{ {
m_xrcHandler->CreateChildrenPrivately(m_pg, NULL); m_xrcHandler->CreateChildrenPrivately(m_pg, nullptr);
} }
protected: protected:
@ -132,7 +132,7 @@ wxObject *wxPropertyGridXmlHandler::DoCreateResource()
wxString sValue(wxT("value")); wxString sValue(wxT("value"));
wxString value; wxString value;
wxString* pValue = NULL; wxString* pValue = nullptr;
if ( HasParam(sValue) ) if ( HasParam(sValue) )
{ {
value = GetText(sValue); value = GetText(sValue);
@ -150,7 +150,7 @@ wxObject *wxPropertyGridXmlHandler::DoCreateResource()
wxPGProperty* property = m_populator->Add( clas, label, name, pValue, &choices ); wxPGProperty* property = m_populator->Add( clas, label, name, pValue, &choices );
if ( !property ) if ( !property )
return NULL; return nullptr;
wxString sFlags(wxT("flags")); wxString sFlags(wxT("flags"));
wxString flags; wxString flags;
@ -258,7 +258,7 @@ wxObject *wxPropertyGridXmlHandler::DoCreateResource()
HandlePropertyGridParams(); HandlePropertyGridParams();
InitPopulator(); InitPopulator();
CreateChildrenPrivately(control, NULL); CreateChildrenPrivately(control, nullptr);
DonePopulator(); DonePopulator();
m_manager = oldManager; m_manager = oldManager;
@ -271,7 +271,7 @@ wxObject *wxPropertyGridXmlHandler::DoCreateResource()
wxASSERT( false ); wxASSERT( false );
} }
return NULL; return nullptr;
} }
bool wxPropertyGridXmlHandler::CanHandle(wxXmlNode *node) bool wxPropertyGridXmlHandler::CanHandle(wxXmlNode *node)