Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-09-30 16:55:40 +00:00
parent 337c5edd43
commit ec373f2a81
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/radiobox.h
View File

@@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxRadioBox : public wxControl,
{ {
public: public:
// ctors and dtor // ctors and dtor
wxRadioBox() { Init(); } wxRadioBox() { }
wxRadioBox(wxWindow *parent, wxRadioBox(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& title, const wxString& title,
@@ -41,8 +41,6 @@ public:
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr) 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 wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr) 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 );
} }

4
include/wx/gtk/webview_webkit.h
View File

@@ -26,7 +26,7 @@ typedef struct _WebKitWebView WebKitWebView;
class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
{ {
public: public:
wxWebViewWebKit() { Init(); } wxWebViewWebKit() { }
wxWebViewWebKit(wxWindow *parent, wxWebViewWebKit(wxWindow *parent,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
@@ -35,8 +35,6 @@ public:
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxWebViewNameStr) const wxString& name = wxWebViewNameStr)
{ {
Init();
Create(parent, id, url, pos, size, style, name); Create(parent, id, url, pos, size, style, name);
} }

5
include/wx/gtk/window.h
View File

@@ -357,9 +357,6 @@ protected:
virtual void DoSetToolTip( wxToolTip *tip ); virtual void DoSetToolTip( wxToolTip *tip );
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
// common part of all ctors (not virtual because called from ctor)
void Init();
// Create a GtkScrolledWindow containing the given widget (usually // Create a GtkScrolledWindow containing the given widget (usually
// m_wxwindow but not necessarily) and assigns it to m_widget. Also shows // m_wxwindow but not necessarily) and assigns it to m_widget. Also shows
// the widget passed to it. // the widget passed to it.
@@ -404,6 +401,8 @@ protected:
void ConstrainSize(); void ConstrainSize();
private: private:
void Init();
enum ScrollUnit { ScrollUnit_Line, ScrollUnit_Page, ScrollUnit_Max }; enum ScrollUnit { ScrollUnit_Line, ScrollUnit_Page, ScrollUnit_Max };
// common part of ScrollLines() and ScrollPages() and could be used, in the // common part of ScrollLines() and ScrollPages() and could be used, in the