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

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 8ed57ec0d8a2fb09a27c5e2c53712188b24b5c4e..589da74a9a5d6e64f741bfdc3389b0f4834f238e 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -414,18 +414,18 @@ public:
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator )
     {
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator )
     {

+        Init();
+

         Create(parent, id, pos, size, style, validator );
     }
 
         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 );
 
     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 );
     virtual bool AssociateModel( wxDataViewModel *model );
 
     virtual bool PrependColumn( wxDataViewColumn *col );


@@ -481,6 +481,8 @@ protected:
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
 
 private:
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
 
 private:

+    void Init();
+

     friend class wxDataViewCtrlDCImpl;
     friend class wxDataViewColumn;
     friend class wxGtkDataViewModelNotifier;
     friend class wxDataViewCtrlDCImpl;
     friend class wxDataViewColumn;
     friend class wxGtkDataViewModelNotifier;

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 62fbd52fe2587436ee93ad85f7912916d04229d6..5bb7d75031d8e815862c1a97b594759120879e79 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -4111,8 +4111,6 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator )
 {
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator )
 {

-    Init();
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator ))
     {