Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix names of wxDirProperty ctor parameters

Browse Source 
First two paramaters of ctors of wxPGProperty and its derivates are named
'label' and 'name' so wxDirProperty ctor should conform to this convention.

Close #18547.
This commit is contained in:
Artur Wieczorek
2019-10-29 23:34:37 +01:00
parent d6c6fe78bb
commit 9e4d28ba7f
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/propgrid/props.h
View File

@@ -665,8 +665,8 @@ class WXDLLIMPEXP_PROPGRID wxDirProperty : public wxEditorDialogProperty
{ {
WX_PG_DECLARE_PROPERTY_CLASS(wxDirProperty) WX_PG_DECLARE_PROPERTY_CLASS(wxDirProperty)
public: public:
wxDirProperty( const wxString& name = wxPG_LABEL, wxDirProperty( const wxString& label = wxPG_LABEL,
const wxString& label = wxPG_LABEL, const wxString& name = wxPG_LABEL,
const wxString& value = wxEmptyString ); const wxString& value = wxEmptyString );
virtual ~wxDirProperty(); virtual ~wxDirProperty();

4
interface/wx/propgrid/props.h
View File

@@ -688,8 +688,8 @@ protected:
class wxDirProperty : public wxEditorDialogProperty class wxDirProperty : public wxEditorDialogProperty
{ {
public: public:
wxDirProperty( const wxString& name = wxPG_LABEL, wxDirProperty( const wxString& label = wxPG_LABEL,
const wxString& label = wxPG_LABEL, const wxString& name = wxPG_LABEL,
const wxString& value = wxEmptyString ); const wxString& value = wxEmptyString );
virtual ~wxDirProperty(); virtual ~wxDirProperty();

4
src/propgrid/props.cpp
View File

@@ -1855,8 +1855,8 @@ bool wxFlagsProperty::DoSetAttribute( const wxString& name, wxVariant& value )
wxPG_IMPLEMENT_PROPERTY_CLASS(wxDirProperty, wxEditorDialogProperty, TextCtrlAndButton) wxPG_IMPLEMENT_PROPERTY_CLASS(wxDirProperty, wxEditorDialogProperty, TextCtrlAndButton)
wxDirProperty::wxDirProperty( const wxString& name, const wxString& label, const wxString& value ) wxDirProperty::wxDirProperty( const wxString& label, const wxString& name, const wxString& value )
: wxEditorDialogProperty(name, label) : wxEditorDialogProperty(label, name)
{ {
m_flags &= ~wxPG_PROP_ACTIVE_BTN; // Property button enabled only in not read-only mode. m_flags &= ~wxPG_PROP_ACTIVE_BTN; // Property button enabled only in not read-only mode.
SetValue(value); SetValue(value);