make wxWindowGTK::Init() private, it is not meant to be called from derived classes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 2fe356639626a94ecd33209e7f275ed34dc6b014..efbddfc2ab7e53b6dc3e50933fc992e073f53083 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxRadioBox : public wxControl,
 {
 public:
     // ctors and dtor
 {
 public:
     // ctors and dtor

-    wxRadioBox() { Init(); }
+    wxRadioBox() { }

     wxRadioBox(wxWindow *parent,
                wxWindowID id,
                const wxString& title,
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
                const wxString& title,


@@ -41,8 +41,6 @@ public:
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {

-        Init();
-

         Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }
 
         Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }
 


@@ -57,8 +55,6 @@ public:
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {

-        Init();
-

         Create( parent, id, title, pos, size, choices, majorDim, style, val, name );
     }
 
         Create( parent, id, title, pos, size, choices, majorDim, style, val, name );
     }
 

diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h
index 72b41c15ceb02b43be74b4aec7b44b31e16187f3..00ba41eb82bb68405ab790850ed77ec839f5f33b 100644 (file)
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -26,7 +26,7 @@ typedef struct _WebKitWebView WebKitWebView;
 class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
 {
 public:
 class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
 {
 public:

-    wxWebViewWebKit() { Init(); }
+    wxWebViewWebKit() { }

 
     wxWebViewWebKit(wxWindow *parent,
            wxWindowID id = wxID_ANY,
 
     wxWebViewWebKit(wxWindow *parent,
            wxWindowID id = wxID_ANY,


@@ -35,8 +35,6 @@ public:
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxString& name = wxWebViewNameStr)
     {
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxString& name = wxWebViewNameStr)
     {

-        Init();
-

         Create(parent, id, url, pos, size, style, name);
     }
 
         Create(parent, id, url, pos, size, style, name);
     }
 

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 68d648ab1dc20a42d1475045787b513edddaa307..9a1efc1cc81454ef393b81d59b173709d550cb6d 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -357,9 +357,6 @@ protected:
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS
 
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS
 

-    // common part of all ctors (not virtual because called from ctor)
-    void Init();
-

     // Create a GtkScrolledWindow containing the given widget (usually
     // m_wxwindow but not necessarily) and assigns it to m_widget. Also shows
     // the widget passed to it.
     // Create a GtkScrolledWindow containing the given widget (usually
     // m_wxwindow but not necessarily) and assigns it to m_widget. Also shows
     // the widget passed to it.


@@ -404,6 +401,8 @@ protected:
     void ConstrainSize();
 
 private:
     void ConstrainSize();
 
 private:

+    void Init();
+

     enum ScrollUnit { ScrollUnit_Line, ScrollUnit_Page, ScrollUnit_Max };
 
     // common part of ScrollLines() and ScrollPages() and could be used, in the
     enum ScrollUnit { ScrollUnit_Line, ScrollUnit_Page, ScrollUnit_Max };
 
     // common part of ScrollLines() and ScrollPages() and could be used, in the