make more Init() functions private

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

diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h
index 8a568a70570c868b45b0d219105a9f061c9f722b..20ff1d4edda3a54761da98223fa2bd2b22e64e95 100644 (file)
--- a/include/wx/gtk/animate.h
+++ b/include/wx/gtk/animate.h
@@ -95,8 +95,6 @@ public:
         Create(parent, id, anim, pos, size, style, name);
     }
 
         Create(parent, id, anim, pos, size, style, name);
     }
 

-    void Init();
-

     bool Create(wxWindow *parent, wxWindowID id,
                 const wxAnimation& anim = wxNullAnimation,
                 const wxPoint& pos = wxDefaultPosition,
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxAnimation& anim = wxNullAnimation,
                 const wxPoint& pos = wxDefaultPosition,


@@ -146,6 +144,9 @@ protected:      // internal vars
 
 private:
     typedef wxAnimationCtrlBase base_type;
 
 private:
     typedef wxAnimationCtrlBase base_type;

+
+    void Init();
+

     DECLARE_DYNAMIC_CLASS(wxAnimationCtrl)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxAnimationCtrl)
     DECLARE_EVENT_TABLE()
 };

diff --git a/include/wx/gtk/collpane.h b/include/wx/gtk/collpane.h
index 78c4f266482d6465592c527581e5f1e668163eb9..f0b6af1ab0d22a2ecd7d48f4ae373acf77f474b4 100644 (file)
--- a/include/wx/gtk/collpane.h
+++ b/include/wx/gtk/collpane.h
@@ -35,11 +35,6 @@ public:
         Create(parent, winid, label, pos, size, style, val, name);
     }
 
         Create(parent, winid, label, pos, size, style, val, name);
     }
 

-    void Init()
-    {
-        m_bIgnoreNextChange = false;
-    }
-

     bool Create(wxWindow *parent,
                 wxWindowID winid,
                 const wxString& label,
     bool Create(wxWindow *parent,
                 wxWindowID winid,
                 const wxString& label,


@@ -69,6 +64,11 @@ public:     // used by GTK callbacks
     wxString m_strLabel;
 
 private:
     wxString m_strLabel;
 
 private:

+    void Init()
+    {
+        m_bIgnoreNextChange = false;
+    }
+

     void OnSize(wxSizeEvent&);
     virtual void AddChildGTK(wxWindowGTK* child);
     GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
     void OnSize(wxSizeEvent&);
     virtual void AddChildGTK(wxWindowGTK* child);
     GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

diff --git a/include/wx/gtk/dataobj2.h b/include/wx/gtk/dataobj2.h
index 7629027b3320b8db27ad0cfa17b39d464f41d14e..27fb43eb53c7c185df4d6b97c9855fc262e2c330 100644 (file)
--- a/include/wx/gtk/dataobj2.h
+++ b/include/wx/gtk/dataobj2.h
@@ -49,7 +49,6 @@ public:
     }
 
 protected:
     }
 
 protected:

-    void Init() { m_pngData = NULL; m_pngSize = 0; }

     void Clear() { free(m_pngData); }
     void ClearAll() { Clear(); Init(); }
 
     void Clear() { free(m_pngData); }
     void ClearAll() { Clear(); Init(); }
 


@@ -57,6 +56,9 @@ protected:
     void       *m_pngData;
 
     void DoConvertToPng();
     void       *m_pngData;
 
     void DoConvertToPng();

+
+private:
+    void Init() { m_pngData = NULL; m_pngSize = 0; }

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h
index e5c1fea74657f7661d05880bd82d640179ff72d9..83084aeadccac4b1be15e1a6b2c7dca50b6fc3b4 100644 (file)
--- a/include/wx/gtk/dcscreen.h
+++ b/include/wx/gtk/dcscreen.h
@@ -25,7 +25,7 @@ public:
 
     virtual void DoGetSize(int *width, int *height) const;
 
 
     virtual void DoGetSize(int *width, int *height) const;
 

-protected:
+private:

     void Init();
 
     DECLARE_ABSTRACT_CLASS(wxScreenDCImpl)
     void Init();
 
     DECLARE_ABSTRACT_CLASS(wxScreenDCImpl)

diff --git a/include/wx/gtk/dvrenderers.h b/include/wx/gtk/dvrenderers.h
index 9901bec0cba698be4210acc43dc74f1c6aa9e41c..b9119a9533c72a9f668ead41d50ad12c8dec2ab4 100644 (file)
--- a/include/wx/gtk/dvrenderers.h
+++ b/include/wx/gtk/dvrenderers.h
@@ -142,10 +142,9 @@ public:
 
     virtual GtkCellRendererText *GtkGetTextRenderer() const;
 
 
     virtual GtkCellRendererText *GtkGetTextRenderer() const;
 

-protected:
+private:

     bool Init(wxDataViewCellMode mode, int align);
 
     bool Init(wxDataViewCellMode mode, int align);
 

-private:

     // Called from GtkGetTextRenderer() to really create the renderer if
     // necessary.
     void GtkInitTextRenderer();
     // Called from GtkGetTextRenderer() to really create the renderer if
     // necessary.
     void GtkInitTextRenderer();

diff --git a/include/wx/gtk/filectrl.h b/include/wx/gtk/filectrl.h
index 8147b79bc08c6a4bd94085074fb5c203913a32e0..0af8939ee72d10af8fce8bcf25f1e3cac753704a 100644 (file)
--- a/include/wx/gtk/filectrl.h
+++ b/include/wx/gtk/filectrl.h
@@ -90,7 +90,6 @@ public:
 
     virtual ~wxGtkFileCtrl() {}
 
 
     virtual ~wxGtkFileCtrl() {}
 

-    void Init();

     bool Create( wxWindow *parent,
                  wxWindowID id,
                  const wxString& defaultDirectory = wxEmptyString,
     bool Create( wxWindow *parent,
                  wxWindowID id,
                  const wxString& defaultDirectory = wxEmptyString,


@@ -134,6 +133,9 @@ protected:
     wxGtkFileChooser    m_fc;
     wxString            m_wildCard;
 
     wxGtkFileChooser    m_fc;
     wxString            m_wildCard;
 

+private:
+    void Init();
+

     DECLARE_DYNAMIC_CLASS( wxGtkFileCtrl )
 };
 
     DECLARE_DYNAMIC_CLASS( wxGtkFileCtrl )
 };
 

diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h
index 51ef90f66b7e53544c3f1e4d9cb3f7f27450305d..68a59090e02d4ad9060f3b61bf29db07f082cf4d 100644 (file)
--- a/include/wx/gtk/filepicker.h
+++ b/include/wx/gtk/filepicker.h
@@ -176,13 +176,6 @@ public:     // overrides
     FILEDIRBTN_OVERRIDES
 
 protected:
     FILEDIRBTN_OVERRIDES
 
 protected:

-    // common part of all ctors
-    void Init()
-    {
-        m_dialog = NULL;
-        m_bIgnoreNextChange = false;
-    }
-

     wxDialog *m_dialog;
 
 public:    // used by the GTK callback only
     wxDialog *m_dialog;
 
 public:    // used by the GTK callback only


@@ -192,6 +185,12 @@ public:    // used by the GTK callback only
     void GTKUpdatePath(const char *gtkpath);
 
 private:
     void GTKUpdatePath(const char *gtkpath);
 
 private:

+    void Init()
+    {
+        m_dialog = NULL;
+        m_bIgnoreNextChange = false;
+    }
+

     DECLARE_DYNAMIC_CLASS(wxDirButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxDirButton)
 };
 

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 41c19a63f241905c4c3508fb6ef05bb6a81acf07..bb0c5ec7b083411c80be6784eb7022ffd0b59f38 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -119,15 +119,14 @@ public:
 protected:
     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
 
 protected:
     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
 

-    // common part of all ctors
-    void Init();
-

     virtual wxGDIRefData* CreateGDIRefData() const;
     virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
 
     virtual wxFontFamily DoGetFamily() const;
 
 private:
     virtual wxGDIRefData* CreateGDIRefData() const;
     virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
 
     virtual wxFontFamily DoGetFamily() const;
 
 private:

+    void Init();
+

     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index f65f85ee628171d7ad9f480164a54e807ea8b803..397ad76c56ba292792648c4ed2f30cc9f095371b 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -64,9 +64,6 @@ public:
     virtual bool SendIdleEvents(wxIdleEvent& event);
 
 protected:
     virtual bool SendIdleEvents(wxIdleEvent& event);
 
 protected:

-    // common part of all ctors
-    void Init();
-

     // override wxWindow methods to take into account tool/menu/statusbars
     virtual void DoGetClientSize( int *width, int *height ) const;
 
     // override wxWindow methods to take into account tool/menu/statusbars
     virtual void DoGetClientSize( int *width, int *height ) const;
 


@@ -76,6 +73,8 @@ protected:
 #endif // wxUSE_MENUS_NATIVE
 
 private:
 #endif // wxUSE_MENUS_NATIVE
 
 private:

+    void Init();
+

     long m_fsSaveFlag;
 
     DECLARE_DYNAMIC_CLASS(wxFrame)
     long m_fsSaveFlag;
 
     DECLARE_DYNAMIC_CLASS(wxFrame)

diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index 728d6b77829bbf7c93549a3b1f5ba5d126369bf8..53c2cea3724dfa2f7528b52091ce479f8e2eec70 100644 (file)
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -71,15 +71,14 @@ public:
         m_gaugePos;
 
 protected:
         m_gaugePos;
 
 protected:

-    // common part of all ctors
-    void Init() { m_rangeMax = m_gaugePos = 0; }
-

     // set the gauge value to the value of m_gaugePos
     void DoSetGauge();
 
     virtual wxSize DoGetBestSize() const;
 
 private:
     // set the gauge value to the value of m_gaugePos
     void DoSetGauge();
 
     virtual wxSize DoGetBestSize() const;
 
 private:

+    void Init() { m_rangeMax = m_gaugePos = 0; }
+

     DECLARE_DYNAMIC_CLASS(wxGauge)
 };
 
     DECLARE_DYNAMIC_CLASS(wxGauge)
 };
 

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index dcb4b01d15dee6945125351c4e8b86b5521be173..761f7758acc6fab798b43d7f1267f46450c7bd66 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -67,11 +67,11 @@ public:
     virtual void OnInternalIdle();
 
 protected:
     virtual void OnInternalIdle();
 
 protected:

-    void Init();

     virtual void DoGetClientSize(int* width, int* height) const;
 
 private:
     friend class wxMDIChildFrame;
     virtual void DoGetClientSize(int* width, int* height) const;
 
 private:
     friend class wxMDIChildFrame;

+    void Init();

 
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 };

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 2d116acdd08afd39db8e6b95350634f501482fcc..878bbc4dd33fd39c13ad3f0585311f50dfba8a42 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -107,9 +107,6 @@ public:
     bool DoPhase(int phase);
 #endif
 
     bool DoPhase(int phase);
 #endif
 

-    // common part of all ctors
-    void Init();
-

     // Called by GTK event handler when the current page is definitely changed.
     void GTKOnPageChanged();
 
     // Called by GTK event handler when the current page is definitely changed.
     void GTKOnPageChanged();
 


@@ -138,6 +135,7 @@ private:
     // the padding set by SetPadding()
     int m_padding;
 
     // the padding set by SetPadding()
     int m_padding;
 

+    void Init();

     virtual void AddChildGTK(wxWindowGTK* child);
 
     DECLARE_DYNAMIC_CLASS(wxNotebook)
     virtual void AddChildGTK(wxWindowGTK* child);
 
     DECLARE_DYNAMIC_CLASS(wxNotebook)

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 336a5cfa2e44116a474da8afc2fa1ad5a8b809c5..5d061c5b33025b9a2d59c0676b71cbdb7c65f3c0 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -158,9 +158,6 @@ protected:
     virtual void DoFreeze();
     virtual void DoThaw();
 
     virtual void DoFreeze();
     virtual void DoThaw();
 

-    // common part of all ctors
-    void Init();
-

     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }


@@ -179,6 +176,8 @@ protected:
     void GTKSetJustification();
 
 private:
     void GTKSetJustification();
 
 private:

+    void Init();
+

     // overridden wxTextEntry virtual methods
     virtual GtkEditable *GetEditable() const;
     virtual GtkEntry *GetEntry() const;
     // overridden wxTextEntry virtual methods
     virtual GtkEditable *GetEditable() const;
     virtual GtkEntry *GetEntry() const;

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index 1b69ba287b3c02a454607f116f3c34eb4a0d9b27..768f2e14f5b9662971ce27e8727cafd6fc30924d 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -128,9 +128,6 @@ protected:
     virtual void DoSetSizeHints( int minW, int minH,
                                  int maxW, int maxH,
                                  int incW, int incH);
     virtual void DoSetSizeHints( int minW, int minH,
                                  int maxW, int maxH,
                                  int incW, int incH);

-    // common part of all ctors
-    void Init();
-

     // move the window to the specified location and resize it
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // move the window to the specified location and resize it
     virtual void DoMoveWindow(int x, int y, int width, int height);
 


@@ -148,6 +145,7 @@ protected:
     bool m_deferShow;
 
 private:
     bool m_deferShow;
 
 private:

+    void Init();

     wxSize& GetCachedDecorSize();
 
     // size hint increments
     wxSize& GetCachedDecorSize();
 
     // size hint increments