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

Moved Get/SetPropertyText/BackgroundColour() member functions from wxPropertyGrid to wxPropertyGridInterface

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-11-03 17:02:04 +00:00
parent 9cc56d1fc0
commit e2ca659906
6 changed files with 138 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -839,12 +839,6 @@ public:
*/ */
wxVariant GetUncommittedPropertyValue(); wxVariant GetUncommittedPropertyValue();
/** Returns cell background colour of a property. */
wxColour GetPropertyBackgroundColour( wxPGPropArg id ) const;
/** Returns cell background colour of a property. */
wxColour GetPropertyTextColour( wxPGPropArg id ) const;
/** Returns "root property". It does not have name, etc. and it is not /** Returns "root property". It does not have name, etc. and it is not
visible. It is only useful for accessing its children. visible. It is only useful for accessing its children.
*/ */
@@ -989,33 +983,6 @@ public:
/** Sets background colour of margin. */ /** Sets background colour of margin. */
void SetMarginColour(const wxColour& col); void SetMarginColour(const wxColour& col);
/**
Sets background colour of property.
@param id
Property name or pointer.
@param colour
New background colour.
@param recursively
If True, child properties are affected recursively. Property
categories are skipped if this flag is used.
*/
void SetPropertyBackgroundColour( wxPGPropArg id,
const wxColour& colour,
bool recursively = false);
/** Resets text and background colours of given property.
*/
void SetPropertyColoursToDefault( wxPGPropArg id );
/** Sets text colour of property and all its children.
*/
void SetPropertyTextColour( wxPGPropArg id,
const wxColour& col,
bool recursively = true );
/** /**
Sets selection background colour - applies to selected property name Sets selection background colour - applies to selected property name
background. background.

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

@@ -856,6 +856,62 @@ public:
*/ */
void SetPropertyAttributeAll( const wxString& attrName, wxVariant value ); void SetPropertyAttributeAll( const wxString& attrName, wxVariant value );
/**
Sets background colour of a property.
@param id
Property name or pointer.
@param colour
New background colour.
@param recursively
If True, child properties are affected recursively. Property
categories are skipped if this flag is used.
*/
void SetPropertyBackgroundColour( wxPGPropArg id,
const wxColour& colour,
bool recursively = true );
/** Resets text and background colours of given property.
*/
void SetPropertyColoursToDefault( wxPGPropArg id );
/**
Sets text colour of a property.
@param id
Property name or pointer.
@param colour
New background colour.
@param recursively
If True, child properties are affected recursively. Property
categories are skipped if this flag is used.
*/
void SetPropertyTextColour( wxPGPropArg id,
const wxColour& col,
bool recursively = true );
/**
Returns background colour of first cell of a property.
*/
wxColour GetPropertyBackgroundColour( wxPGPropArg id ) const
{
wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxColour())
return p->GetCell(0).GetBgCol();
}
/**
Returns text colour of first cell of a property.
*/
wxColour GetPropertyTextColour( wxPGPropArg id ) const
{
wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxColour())
return p->GetCell(0).GetFgCol();
}
/** Sets text, bitmap, and colours for given column's cell. /** Sets text, bitmap, and colours for given column's cell.
@remarks @remarks

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

@@ -586,16 +586,6 @@ public:
*/ */
wxVariant GetUncommittedPropertyValue(); wxVariant GetUncommittedPropertyValue();
/**
Returns cell background colour of a property.
*/
wxColour GetPropertyBackgroundColour( wxPGPropArg id ) const;
/**
Returns cell background colour of a property.
*/
wxColour GetPropertyTextColour( wxPGPropArg id ) const;
/** /**
Returns "root property". It does not have name, etc. and it is not Returns "root property". It does not have name, etc. and it is not
visible. It is only useful for accessing its children. visible. It is only useful for accessing its children.
@@ -778,24 +768,6 @@ public:
*/ */
void SetMarginColour(const wxColour& col); void SetMarginColour(const wxColour& col);
/**
Sets background colour of property and all its children. Colours of
captions are not affected. Background brush cache is optimized for often
set colours to be set last.
*/
void SetPropertyBackgroundColour( wxPGPropArg id, const wxColour& col );
/**
Resets text and background colours of given property.
*/
void SetPropertyColoursToDefault( wxPGPropArg id );
/**
Sets text colour of property and all its children.
*/
void SetPropertyTextColour( wxPGPropArg id, const wxColour& col,
bool recursively = true );
/** /**
Sets selection background colour - applies to selected property name Sets selection background colour - applies to selected property name
background. background.

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

@@ -244,6 +244,11 @@ public:
*/ */
wxVariant GetPropertyAttribute( wxPGPropArg id, const wxString& attrName ) const; wxVariant GetPropertyAttribute( wxPGPropArg id, const wxString& attrName ) const;
/**
Returns background colour of first cell of a property.
*/
wxColour GetPropertyBackgroundColour( wxPGPropArg id ) const;
/** /**
Returns pointer of property's nearest parent category. If no category Returns pointer of property's nearest parent category. If no category
found, returns @NULL. found, returns @NULL.
@@ -293,6 +298,11 @@ public:
/** Returns property's name, by which it is globally accessible. */ /** Returns property's name, by which it is globally accessible. */
wxString GetPropertyName( wxPGProperty* property ); wxString GetPropertyName( wxPGProperty* property );
/**
Returns text colour of first cell of a property.
*/
wxColour GetPropertyTextColour( wxPGPropArg id ) const;
/** /**
Returns validator of a property as a reference, which you Returns validator of a property as a reference, which you
can pass to any number of SetPropertyValidator. can pass to any number of SetPropertyValidator.
@@ -616,6 +626,23 @@ public:
*/ */
void SetPropertyAttributeAll( const wxString& attrName, wxVariant value ); void SetPropertyAttributeAll( const wxString& attrName, wxVariant value );
/**
Sets background colour of a property.
@param id
Property name or pointer.
@param colour
New background colour.
@param recursively
If True, child properties are affected recursively. Property
categories are skipped if this flag is used.
*/
void SetPropertyBackgroundColour( wxPGPropArg id,
const wxColour& colour,
bool recursively = true );
/** /**
Sets text, bitmap, and colours for given column's cell. Sets text, bitmap, and colours for given column's cell.
@@ -638,6 +665,11 @@ public:
*/ */
void SetPropertyClientData( wxPGPropArg id, void* clientData ); void SetPropertyClientData( wxPGPropArg id, void* clientData );
/**
Resets text and background colours of given property.
*/
void SetPropertyColoursToDefault( wxPGPropArg id );
/** /**
Sets editor for a property. Sets editor for a property.
@@ -739,6 +771,24 @@ public:
*/ */
bool SetPropertyMaxLength( wxPGPropArg id, int maxLen ); bool SetPropertyMaxLength( wxPGPropArg id, int maxLen );
/**
Sets text colour of a property.
@param id
Property name or pointer.
@param colour
New background colour.
@param recursively
If True, child properties are affected recursively. Property
categories are skipped if this flag is used.
*/
void SetPropertyTextColour( wxPGPropArg id,
const wxColour& col,
bool recursively = true );
/** /**
Sets validator of a property. Sets validator of a property.
*/ */

48
src/propgrid/propgrid.cpp
View File

@@ -1176,54 +1176,6 @@ void wxPropertyGrid::SetCaptionTextColour( const wxColour& col )
Refresh(); Refresh();
} }
// -----------------------------------------------------------------------
void wxPropertyGrid::SetPropertyBackgroundColour( wxPGPropArg id,
const wxColour& colour,
bool recursively )
{
wxPG_PROP_ARG_CALL_PROLOG()
p->SetBackgroundColour( colour, recursively );
DrawItemAndChildren( p );
}
// -----------------------------------------------------------------------
wxColour wxPropertyGrid::GetPropertyBackgroundColour( wxPGPropArg id ) const
{
wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxColour())
return p->GetCell(0).GetBgCol();
}
// -----------------------------------------------------------------------
void wxPropertyGrid::SetPropertyTextColour( wxPGPropArg id, const wxColour& colour,
bool recursively )
{
wxPG_PROP_ARG_CALL_PROLOG()
p->SetTextColour( colour, recursively );
DrawItemAndChildren( p );
}
// -----------------------------------------------------------------------
wxColour wxPropertyGrid::GetPropertyTextColour( wxPGPropArg id ) const
{
wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxColour())
return p->GetCell(0).GetFgCol();
}
// -----------------------------------------------------------------------
void wxPropertyGrid::SetPropertyColoursToDefault( wxPGPropArg id )
{
wxPG_PROP_ARG_CALL_PROLOG()
p->m_cells.clear();
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// wxPropertyGrid property adding and removal // wxPropertyGrid property adding and removal
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------

32
src/propgrid/propgridiface.cpp
View File

@@ -774,6 +774,38 @@ bool wxPropertyGridInterface::SetPropertyMaxLength( wxPGPropArg id, int maxLen )
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void
wxPropertyGridInterface::SetPropertyBackgroundColour( wxPGPropArg id,
const wxColour& colour,
bool recursively )
{
wxPG_PROP_ARG_CALL_PROLOG()
p->SetBackgroundColour( colour, recursively );
RefreshProperty( p );
}
// -----------------------------------------------------------------------
void wxPropertyGridInterface::SetPropertyTextColour( wxPGPropArg id,
const wxColour& colour,
bool recursively )
{
wxPG_PROP_ARG_CALL_PROLOG()
p->SetTextColour( colour, recursively );
RefreshProperty( p );
}
// -----------------------------------------------------------------------
void wxPropertyGridInterface::SetPropertyColoursToDefault( wxPGPropArg id )
{
wxPG_PROP_ARG_CALL_PROLOG()
p->m_cells.clear();
}
// -----------------------------------------------------------------------
void wxPropertyGridInterface::SetPropertyCell( wxPGPropArg id, void wxPropertyGridInterface::SetPropertyCell( wxPGPropArg id,
int column, int column,
const wxString& text, const wxString& text,