No real changes, just make wxDataViewCtrl::Init() private in wxGTK.
The usual convention is for Init() method to be private and to call it from constructor, follow it in GTK implementation of wxDataViewCtrl too instead of making it public and calling it from Create(). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
65536c9221
commit
bf68a18d3c
@ -414,18 +414,18 @@ public:
|
||||
const wxSize& size = wxDefaultSize, long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator )
|
||||
{
|
||||
Init();
|
||||
|
||||
Create(parent, id, pos, size, style, validator );
|
||||
}
|
||||
|
||||
virtual ~wxDataViewCtrl();
|
||||
|
||||
void Init();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize, long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator );
|
||||
|
||||
virtual ~wxDataViewCtrl();
|
||||
|
||||
virtual bool AssociateModel( wxDataViewModel *model );
|
||||
|
||||
virtual bool PrependColumn( wxDataViewColumn *col );
|
||||
@ -481,6 +481,8 @@ protected:
|
||||
virtual void DoApplyWidgetStyle(GtkRcStyle *style);
|
||||
|
||||
private:
|
||||
void Init();
|
||||
|
||||
friend class wxDataViewCtrlDCImpl;
|
||||
friend class wxDataViewColumn;
|
||||
friend class wxGtkDataViewModelNotifier;
|
||||
|
@ -4111,8 +4111,6 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
|
||||
const wxPoint& pos, const wxSize& size,
|
||||
long style, const wxValidator& validator )
|
||||
{
|
||||
Init();
|
||||
|
||||
if (!PreCreation( parent, pos, size ) ||
|
||||
!CreateBase( parent, id, pos, size, style, validator ))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user