From 55a3946af88ba25510995ea6e9f0e188952ee686 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 30 Nov 2022 20:09:57 +0300 Subject: [PATCH] Properties: Use a constant variable for PG_UNIT_EDITOR editor name. --- common/properties/pg_editors.cpp | 2 ++ common/properties/pg_properties.cpp | 5 +++-- include/properties/pg_editors.h | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/common/properties/pg_editors.cpp b/common/properties/pg_editors.cpp index 8cf53afc27..9cacfa4ae9 100644 --- a/common/properties/pg_editors.cpp +++ b/common/properties/pg_editors.cpp @@ -24,6 +24,8 @@ #include +const wxString PG_UNIT_EDITOR::EDITOR_NAME = wxS( "KiCadUnitEditor" ); + PG_UNIT_EDITOR::PG_UNIT_EDITOR( EDA_DRAW_FRAME* aFrame ) : wxPGTextCtrlEditor(), diff --git a/common/properties/pg_properties.cpp b/common/properties/pg_properties.cpp index b29b50e621..4c884d4c80 100644 --- a/common/properties/pg_properties.cpp +++ b/common/properties/pg_properties.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -86,13 +87,13 @@ wxPGProperty* PGPropertyFactory( const PROPERTY_BASE* aProperty ) { case PROPERTY_DISPLAY::PT_SIZE: ret = new PGPROPERTY_SIZE(); - ret->SetEditor( wxT( "UnitEditor" ) ); + ret->SetEditor( PG_UNIT_EDITOR::EDITOR_NAME ); break; case PROPERTY_DISPLAY::PT_COORD: ret = new PGPROPERTY_COORD(); static_cast( ret )->SetCoordType( aProperty->CoordType() ); - ret->SetEditor( wxT( "UnitEditor" ) ); + ret->SetEditor( PG_UNIT_EDITOR::EDITOR_NAME ); break; case PROPERTY_DISPLAY::PT_DECIDEGREE: diff --git a/include/properties/pg_editors.h b/include/properties/pg_editors.h index 9f38724670..34aa62ff61 100644 --- a/include/properties/pg_editors.h +++ b/include/properties/pg_editors.h @@ -31,11 +31,13 @@ class PROPERTY_EDITOR_UNIT_BINDER; class PG_UNIT_EDITOR : public wxPGTextCtrlEditor { public: + static const wxString EDITOR_NAME; + PG_UNIT_EDITOR( EDA_DRAW_FRAME* aFrame ); virtual ~PG_UNIT_EDITOR(); - wxString GetName() const override { return wxT( "KiCadUnitEditor" ); } + wxString GetName() const override { return EDITOR_NAME; } wxPGWindowList CreateControls( wxPropertyGrid* aPropGrid, wxPGProperty* aProperty, const wxPoint& aPos, const wxSize& aSize ) const override;