From 4588acb21b11b6806f15cf3b79adb5ed9a2c808c Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Thu, 16 Jul 2015 21:00:38 +0200 Subject: [PATCH] Use wxEmptyString instead of dedicated wxPropertyGridInterface member variable. --- include/wx/propgrid/propgridiface.h | 2 +- src/propgrid/propgrid.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h index c8554d7195..d1c0ec8661 100644 --- a/include/wx/propgrid/propgridiface.h +++ b/include/wx/propgrid/propgridiface.h @@ -469,7 +469,7 @@ public: /** Returns help string associated with a property. */ wxString GetPropertyHelpString( wxPGPropArg id ) const { - wxPG_PROP_ARG_CALL_PROLOG_RETVAL(m_emptyString) + wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxEmptyString) return p->GetHelpString(); } diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index 072156b596..5937dc77c1 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -4376,7 +4376,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags ) { // Clear help box - but only if it was written // by us at previous time. - statusbar->SetStatusText( m_emptyString ); + statusbar->SetStatusText(wxEmptyString); m_iFlags &= ~(wxPG_FL_STRING_IN_STATUSBAR); } } @@ -5152,14 +5152,14 @@ bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y, } else { - SetToolTip( m_emptyString ); + SetToolTip(wxEmptyString); } } } else { - SetToolTip( m_emptyString ); + SetToolTip(wxEmptyString); } } }