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

By default, always refresh editor and redraw properties when property value is changed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-03-04 19:53:34 +00:00
parent aa960026e6
commit e777bd14b3
5 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/propgrid/property.h
View File

@@ -1897,12 +1897,15 @@ public:
SetValueInEvent() instead.
@param pList
Pointer to list variant that contains child values. Used to indicate
which children should be marked as modified.
Pointer to list variant that contains child values. Used to
indicate which children should be marked as modified.
@param flags
Various flags (for instance, wxPG_SETVAL_REFRESH_EDITOR).
Various flags (for instance, wxPG_SETVAL_REFRESH_EDITOR, which is
enabled by default).
*/
void SetValue( wxVariant value, wxVariant* pList = NULL, int flags = 0 );
void SetValue( wxVariant value, wxVariant* pList = NULL,
int flags = wxPG_SETVAL_REFRESH_EDITOR );
/** Set wxBitmap in front of the value. This bitmap may be ignored
by custom cell renderers.

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

@@ -1358,6 +1358,21 @@ public:
virtual void SetWindowStyleFlag( long style );
void DrawItems( const wxPGProperty* p1, const wxPGProperty* p2 );
void DrawItem( wxPGProperty* p )
{
DrawItems(p,p);
}
virtual void DrawItemAndChildren( wxPGProperty* p );
/**
Draws item, children, and consequtive parents as long as category is
not met.
*/
void DrawItemAndValueRelated( wxPGProperty* p );
protected:
/**
@@ -1760,21 +1775,6 @@ protected:
void DrawItems( wxDC& dc, unsigned int topitemy, unsigned int bottomitemy,
const wxRect* clip_rect = (const wxRect*) NULL );
void DrawItems( const wxPGProperty* p1, const wxPGProperty* p2 );
void DrawItem( wxPGProperty* p )
{
DrawItems(p,p);
}
virtual void DrawItemAndChildren( wxPGProperty* p );
/**
Draws item, children, and consequtive parents as long as category is
not met.
*/
void DrawItemAndValueRelated( wxPGProperty* p );
// Translate wxKeyEvent to wxPG_ACTION_XXX
int KeyEventToActions(wxKeyEvent &event, int* pSecond) const;

7
interface/wx/propgrid/property.h
View File

@@ -1371,10 +1371,11 @@ public:
Pointer to list variant that contains child values. Used to indicate
which children should be marked as modified. Usually you just use @NULL.
@param flags
Use wxPG_SETVAL_REFRESH_EDITOR to update editor control, if it
was selected.
wxPG_SETVAL_REFRESH_EDITOR is set by default, to refresh editor
and redraw properties.
*/
void SetValue( wxVariant value, wxVariant* pList = NULL, int flags = 0 );
void SetValue( wxVariant value, wxVariant* pList = NULL,
int flags = wxPG_SETVAL_REFRESH_EDITOR );
/**
Set wxBitmap in front of the value. This bitmap may be ignored

7
src/propgrid/property.cpp
View File

@@ -1327,7 +1327,12 @@ void wxPGProperty::SetValue( wxVariant value, wxVariant* pList, int flags )
// We need to check for these, otherwise GetGrid() may fail.
if ( flags & wxPG_SETVAL_REFRESH_EDITOR )
{
RefreshEditor();
wxPropertyGrid* pg = GetGridIfDisplayed();
if ( pg )
pg->DrawItemAndValueRelated(this);
}
}
@@ -1977,6 +1982,8 @@ bool wxPGProperty::IsVisible() const
wxPropertyGrid* wxPGProperty::GetGridIfDisplayed() const
{
wxPropertyGridPageState* state = GetParentState();
if ( !state )
return NULL;
wxPropertyGrid* propGrid = state->GetGrid();
if ( state == propGrid->GetState() )
return propGrid;

14
src/propgrid/propgridiface.cpp
View File

@@ -543,13 +543,7 @@ void wxPropertyGridInterface::SetPropVal( wxPGPropArg id, wxVariant& value )
wxPG_PROP_ARG_CALL_PROLOG()
if ( p )
{
p->SetValue(value);
wxPropertyGrid* propGrid = p->GetGridIfDisplayed();
if ( propGrid )
propGrid->DrawItemAndValueRelated( p );
}
}
// -----------------------------------------------------------------------
@@ -558,12 +552,8 @@ void wxPropertyGridInterface::SetPropertyValueString( wxPGPropArg id, const wxSt
{
wxPG_PROP_ARG_CALL_PROLOG()
if ( m_pState->DoSetPropertyValueString(p,value) )
{
wxPropertyGrid* propGrid = p->GetGridIfDisplayed();
if ( propGrid )
propGrid->DrawItemAndValueRelated( p );
}
if ( p )
m_pState->DoSetPropertyValueString(p, value);
}
// -----------------------------------------------------------------------