From: Paul Cornett <paulcor@bullseye.com>
Date: Sun, 30 Sep 2012 16:55:40 +0000 (+0000)
Subject: make wxWindowGTK::Init() private, it is not meant to be called from derived classes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ec373f2a81c1909bc3e88938a63d18bee51dfe13?ds=sidebyside

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 2fe3566396..efbddfc2ab 100644
--- 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
-    wxRadioBox() { Init(); }
+    wxRadioBox() { }
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
                const wxString& title,
@@ -41,8 +41,6 @@ public:
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
-        Init();
-
         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)
     {
-        Init();
-
         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 72b41c15ce..00ba41eb82 100644
--- 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:
-    wxWebViewWebKit() { Init(); }
+    wxWebViewWebKit() { }
 
     wxWebViewWebKit(wxWindow *parent,
            wxWindowID id = wxID_ANY,
@@ -35,8 +35,6 @@ public:
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxString& name = wxWebViewNameStr)
     {
-        Init();
-
         Create(parent, id, url, pos, size, style, name);
     }
 
diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 68d648ab1d..9a1efc1cc8 100644
--- 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
 
-    // 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.
@@ -404,6 +401,8 @@ protected:
     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