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

Moved wxPropertyGrid::SetPropertyName() to wxPropertyGridInterface

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-09-29 17:01:04 +00:00
parent 704ceca8d2
commit 020b004113
7 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/propgrid/propgrid.h
View File

@@ -1035,18 +1035,6 @@ public:
virtual width should be disabled. */ virtual width should be disabled. */
void SetVirtualWidth( int width ); void SetVirtualWidth( int width );
/** Sets name of a property.
@param id
Name or pointer of property which name to change.
@param newname
New name.
*/
void SetPropertyName( wxPGPropArg id, const wxString& newname )
{
wxPG_PROP_ARG_CALL_PROLOG()
DoSetPropertyName( p, newname );
}
/** /**
Moves splitter as left as possible, while still allowing all Moves splitter as left as possible, while still allowing all
labels to be shown in full. labels to be shown in full.
@@ -1813,8 +1801,6 @@ protected:
int CacheColour( const wxColour& colour ); int CacheColour( const wxColour& colour );
void DoSetPropertyName( wxPGProperty* p, const wxString& newname );
// Sets up basic event handling for child control // Sets up basic event handling for child control
void SetupChildEventHandling( wxWindow* wnd, int id ); void SetupChildEventHandling( wxWindow* wnd, int id );

15
include/wx/propgrid/propgridiface.h
View File

@@ -961,6 +961,21 @@ public:
p->SetModifiedStatus(modified); p->SetModifiedStatus(modified);
} }
/**
Sets name of a property.
@param id
Name or pointer of property which name to change.
@param newName
New name for property.
*/
void SetPropertyName( wxPGPropArg id, const wxString& newName )
{
wxPG_PROP_ARG_CALL_PROLOG()
m_pState->DoSetPropertyName( p, newName );
}
/** /**
Sets property (and, recursively, its children) to have read-only value. Sets property (and, recursively, its children) to have read-only value.
In other words, user cannot change the value in the editor, but they In other words, user cannot change the value in the editor, but they

2
include/wx/propgrid/propgridpagestate.h
View File

@@ -502,6 +502,8 @@ public:
wxPGProperty* DoGetRoot() const { return m_properties; } wxPGProperty* DoGetRoot() const { return m_properties; }
void DoSetPropertyName( wxPGProperty* p, const wxString& newName );
// Returns combined width of margin and all the columns // Returns combined width of margin and all the columns
int GetVirtualWidth() const int GetVirtualWidth() const
{ {

11
interface/wx/propgrid/propgrid.h
View File

@@ -797,17 +797,6 @@ public:
*/ */
void SetSplitterPosition( int newxpos, int col = 0 ); void SetSplitterPosition( int newxpos, int col = 0 );
/**
Sets name of a property.
@param id
Name or pointer of property which name to change.
@param newname
New name.
*/
void SetPropertyName( wxPGPropArg id, const wxString& newname );
/** /**
Moves splitter as left as possible, while still allowing all Moves splitter as left as possible, while still allowing all
labels to be shown in full. labels to be shown in full.

11
interface/wx/propgrid/propgridiface.h
View File

@@ -658,6 +658,17 @@ public:
*/ */
void SetPropertyModifiedStatus( wxPGPropArg id, bool modified ); void SetPropertyModifiedStatus( wxPGPropArg id, bool modified );
/**
Sets name of a property.
@param id
Name or pointer of property which name to change.
@param newName
New name for property.
*/
void SetPropertyName( wxPGPropArg id, const wxString& newName );
/** /**
Sets property (and, recursively, its children) to have read-only value. Sets property (and, recursively, its children) to have read-only value.
In other words, user cannot change the value in the editor, but they can In other words, user cannot change the value in the editor, but they can

12
src/propgrid/propgrid.cpp
View File

@@ -1491,18 +1491,6 @@ void wxPropertyGrid::DoSetPropertyValueUnspecified( wxPGProperty* p )
// wxPropertyGrid property operations // wxPropertyGrid property operations
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void wxPropertyGrid::DoSetPropertyName( wxPGProperty* p, const wxString& newname )
{
wxCHECK_RET( p, wxT("invalid property id") );
if ( p->GetBaseName().Len() ) m_pState->m_dictName.erase( p->GetBaseName() );
if ( newname.Len() ) m_pState->m_dictName[newname] = (void*) p;
p->DoSetName(newname);
}
// -----------------------------------------------------------------------
bool wxPropertyGrid::EnsureVisible( wxPGPropArg id ) bool wxPropertyGrid::EnsureVisible( wxPGPropArg id )
{ {
wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false) wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)

13
src/propgrid/propgridpagestate.cpp
View File

@@ -448,6 +448,19 @@ wxPGProperty* wxPropertyGridPageState::BaseGetPropertyByName( const wxString& na
return (wxPGProperty*) NULL; return (wxPGProperty*) NULL;
} }
// -----------------------------------------------------------------------
void wxPropertyGridPageState::DoSetPropertyName( wxPGProperty* p,
const wxString& newName )
{
wxCHECK_RET( p, wxT("invalid property id") );
if ( p->GetBaseName().Len() ) m_dictName.erase( p->GetBaseName() );
if ( newName.Len() ) m_dictName[newName] = (void*) p;
p->DoSetName(newName);
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// wxPropertyGridPageState global operations // wxPropertyGridPageState global operations
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------