Fixed wxPropertyGridManager::CreatePropertyGrid(), corrected documentation about its use

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli 2009-01-29 16:09:46 +00:00
parent 575e4cd670
commit 3cfde7c049
3 changed files with 14 additions and 6 deletions

View File

@ -607,8 +607,12 @@ protected:
// Subclassing helpers
//
/** Creates property grid for the manager. Override to use subclassed
wxPropertyGrid.
/**
Creates property grid for the manager. Reimplement in derived class to
use subclassed wxPropertyGrid. However, if you you do this then you
must also use the two-step construction (ie. default constructor and
Create() instead of constructor with arguments) when creating the
manager.
*/
virtual wxPropertyGrid* CreatePropertyGrid() const;

View File

@ -463,8 +463,11 @@ protected:
//
/**
Creates property grid for the manager.
Override to use subclassed wxPropertyGrid.
Creates property grid for the manager. Reimplement in derived class to
use subclassed wxPropertyGrid. However, if you you do this then you
must also use the two-step construction (ie. default constructor and
Create() instead of constructor with arguments) when creating the
manager.
*/
virtual wxPropertyGrid* CreatePropertyGrid() const;
};

View File

@ -281,6 +281,8 @@ bool wxPropertyGridManager::Create( wxWindow *parent,
long style,
const wxString& name )
{
if ( !m_pPropGrid )
m_pPropGrid = CreatePropertyGrid();
bool res = wxPanel::Create( parent, id, pos, size,
(style&0xFFFF0000)|wxWANTS_CHARS,
@ -298,8 +300,7 @@ bool wxPropertyGridManager::Create( wxWindow *parent,
void wxPropertyGridManager::Init1()
{
//m_pPropGrid = NULL;
m_pPropGrid = CreatePropertyGrid();
m_pPropGrid = NULL;
#if wxUSE_TOOLBAR
m_pToolbar = NULL;