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

Changed 'bool recursively' to 'int flags' argument (with default value of wxPG_RECURSE) in wxPropertyGrid Set(Property)BackgroundColour() and Set(Property)TextColour() member functions.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-10-15 16:39:19 +00:00
parent 50355f75e5
commit e607eac25c
6 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1865,12 +1865,13 @@ public:
@param colour
Background colour to use.
@param recursively
If @true, children are affected recursively, and any categories
are not.
@param flags
Default is wxPG_RECURSE which causes colour to be set recursively.
Omit this flag to only set colour for the property in question
and not any of its children.
*/
void SetBackgroundColour( const wxColour& colour,
bool recursively = false );
int flags = wxPG_RECURSE );
/**
Sets property's text colour.
@@ -1878,12 +1879,13 @@ public:
@param colour
Text colour to use.
@param recursively
If @true, children are affected recursively, and any categories
are not.
@param flags
Default is wxPG_RECURSE which causes colour to be set recursively.
Omit this flag to only set colour for the property in question
and not any of its children.
*/
void SetTextColour( const wxColour& colour,
bool recursively = false );
int flags = wxPG_RECURSE );
/** Set default value of a property. Synonymous to

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

@@ -905,13 +905,14 @@ public:
@param colour
New background colour.
@param recursively
If True, child properties are affected recursively. Property
categories are skipped if this flag is used.
@param flags
Default is wxPG_RECURSE which causes colour to be set recursively.
Omit this flag to only set colour for the property in question
and not any of its children.
*/
void SetPropertyBackgroundColour( wxPGPropArg id,
const wxColour& colour,
bool recursively = true );
int flags = wxPG_RECURSE );
/** Resets text and background colours of given property.
*/
@@ -926,13 +927,14 @@ public:
@param colour
New background colour.
@param recursively
If True, child properties are affected recursively. Property
categories are skipped if this flag is used.
@param flags
Default is wxPG_RECURSE which causes colour to be set recursively.
Omit this flag to only set colour for the property in question
and not any of its children.
*/
void SetPropertyTextColour( wxPGPropArg id,
const wxColour& col,
bool recursively = true );
int flags = wxPG_RECURSE );
/**
Returns background colour of first cell of a property.

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

@@ -1323,12 +1323,13 @@ public:
@param colour
Background colour to use.
@param recursively
If @true, children are affected recursively, and any categories
are not.
@param flags
Default is wxPG_RECURSE which causes colour to be set recursively.
Omit this flag to only set colour for the property in question
and not any of its children.
*/
void SetBackgroundColour( const wxColour& colour,
bool recursively = false );
int flags = wxPG_RECURSE );
/**
Sets editor for a property.
@@ -1433,12 +1434,13 @@ public:
@param colour
Text colour to use.
@param recursively
If @true, children are affected recursively, and any categories
are not.
@param flags
Default is wxPG_RECURSE which causes colour to be set recursively.
Omit this flag to only set colour for the property in question
and not any of its children.
*/
void SetTextColour( const wxColour& colour,
bool recursively = false );
int flags = wxPG_RECURSE );
/** Sets wxValidator for a property */
void SetValidator( const wxValidator& validator );

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

@@ -713,13 +713,14 @@ public:
@param colour
New background colour.
@param recursively
If True, child properties are affected recursively. Property
categories are skipped if this flag is used.
@param flags
Default is wxPG_RECURSE which causes colour to be set recursively.
Omit this flag to only set colour for the property in question
and not any of its children.
*/
void SetPropertyBackgroundColour( wxPGPropArg id,
const wxColour& colour,
bool recursively = true );
int flags = wxPG_RECURSE );
/**
Sets text, bitmap, and colours for given column's cell.
@@ -860,13 +861,14 @@ public:
@param colour
New background colour.
@param recursively
If True, child properties are affected recursively. Property
categories are skipped if this flag is used.
@param flags
Default is wxPG_RECURSE which causes colour to be set recursively.
Omit this flag to only set colour for the property in question
and not any of its children.
*/
void SetPropertyTextColour( wxPGPropArg id,
const wxColour& colour,
bool recursively = true );
int flags = wxPG_RECURSE );
/**
Sets validator of a property.

6
src/propgrid/property.cpp
View File

@@ -1547,9 +1547,10 @@ wxPGCell& wxPGProperty::GetOrCreateCell( unsigned int column )
}
void wxPGProperty::SetBackgroundColour( const wxColour& colour,
bool recursively )
int flags )
{
wxPGProperty* firstProp = this;
bool recursively = flags & wxPG_RECURSE ? true : false;
//
// If category is tried to set recursively, skip it and only
@@ -1582,9 +1583,10 @@ void wxPGProperty::SetBackgroundColour( const wxColour& colour,
}
void wxPGProperty::SetTextColour( const wxColour& colour,
bool recursively )
int flags )
{
wxPGProperty* firstProp = this;
bool recursively = flags & wxPG_RECURSE ? true : false;
//
// If category is tried to set recursively, skip it and only

8
src/propgrid/propgridiface.cpp
View File

@@ -652,10 +652,10 @@ bool wxPropertyGridInterface::SetPropertyMaxLength( wxPGPropArg id, int maxLen )
void
wxPropertyGridInterface::SetPropertyBackgroundColour( wxPGPropArg id,
const wxColour& colour,
bool recursively )
int flags )
{
wxPG_PROP_ARG_CALL_PROLOG()
p->SetBackgroundColour( colour, recursively );
p->SetBackgroundColour(colour, flags);
RefreshProperty(p);
}
@@ -663,10 +663,10 @@ wxPropertyGridInterface::SetPropertyBackgroundColour( wxPGPropArg id,
void wxPropertyGridInterface::SetPropertyTextColour( wxPGPropArg id,
const wxColour& colour,
bool recursively )
int flags )
{
wxPG_PROP_ARG_CALL_PROLOG()
p->SetTextColour( colour, recursively );
p->SetTextColour(colour, flags);
RefreshProperty(p);
}