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

Removed wxPropertyGridManager::GetChildrentCount() member functions - now use page->GetRoot()->GetChildCount() and such

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-09-25 17:23:54 +00:00
parent 9288df3401
commit 5a8009d2f1
4 changed files with 2 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/propgrid/manager.h
View File

@@ -348,25 +348,6 @@ public:
*/ */
bool EnsureVisible( wxPGPropArg id ); bool EnsureVisible( wxPGPropArg id );
/** Returns number of children of the root property of the selected page. */
size_t GetChildrenCount()
{
return GetChildrenCount( m_pPropGrid->m_pState->m_properties );
}
/** Returns number of children of the root property of given page. */
size_t GetChildrenCount( int pageIndex );
/** Returns number of children for the property.
NB: Cannot be in container methods class due to name hiding.
*/
size_t GetChildrenCount( wxPGPropArg id ) const
{
wxPG_PROP_ARG_CALL_PROLOG_RETVAL(0)
return p->GetChildCount();
}
/** Returns number of columns on given page. By the default, /** Returns number of columns on given page. By the default,
returns number of columns on current page. */ returns number of columns on current page. */
int GetColumnCount( int page = -1 ) const; int GetColumnCount( int page = -1 ) const;

24
interface/wx/propgrid/manager.h
View File

@@ -290,30 +290,6 @@ public:
*/ */
bool EnsureVisible( wxPGPropArg id ); bool EnsureVisible( wxPGPropArg id );
/**
Returns number of children of the root property of the selected page.
*/
size_t GetChildrenCount()
{
return GetChildrenCount( m_pPropGrid->m_pState->m_properties );
}
/**
Returns number of children of the root property of given page.
*/
size_t GetChildrenCount( int pageIndex );
/**
Returns number of children for the property.
NB: Cannot be in container methods class due to name hiding.
*/
size_t GetChildrenCount( wxPGPropArg id ) const
{
wxPG_PROP_ARG_CALL_PROLOG_RETVAL(0)
return p->GetChildCount();
}
/** /**
Returns number of columns on given page. By the default, Returns number of columns on given page. By the default,
returns number of columns on current page. returns number of columns on current page.

4
samples/propgrid/propgrid.cpp
View File

@@ -2238,7 +2238,7 @@ void FormMain::OnInsertPropClick( wxCommandEvent& WXUNUSED(event) )
{ {
wxString propLabel; wxString propLabel;
if ( !m_pPropGridManager->GetChildrenCount() ) if ( !m_pPropGridManager->GetGrid()->GetRoot()->GetChildCount() )
{ {
wxMessageBox(wxT("No items to relate - first add some with Append.")); wxMessageBox(wxT("No items to relate - first add some with Append."));
return; return;
@@ -2304,7 +2304,7 @@ void FormMain::OnInsertCatClick( wxCommandEvent& WXUNUSED(event) )
{ {
wxString propLabel; wxString propLabel;
if ( !m_pPropGridManager->GetChildrenCount() ) if ( !m_pPropGridManager->GetGrid()->GetRoot()->GetChildCount() )
{ {
wxMessageBox(wxT("No items to relate - first add some with Append.")); wxMessageBox(wxT("No items to relate - first add some with Append."));
return; return;

7
src/propgrid/manager.cpp
View File

@@ -1337,13 +1337,6 @@ bool wxPropertyGridManager::EnsureVisible( wxPGPropArg id )
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
size_t wxPropertyGridManager::GetChildrenCount( int page_index )
{
return GetChildrenCount( GetPage(page_index)->GetStatePtr()->m_properties );
}
// -----------------------------------------------------------------------
void wxPropertyGridManager::OnToolbarClick( wxCommandEvent &event ) void wxPropertyGridManager::OnToolbarClick( wxCommandEvent &event )
{ {
int id = event.GetId(); int id = event.GetId();