From bc48a5d75e6847f7afe434f9c50d7aa32b2ef159 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@bullseye.com>
Date: Thu, 7 Dec 2006 07:22:55 +0000
Subject: [PATCH] correct access for virtuals

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/generic/collpaneg.h |  6 +-----
 include/wx/gtk/collpane.h      | 13 +++++--------
 include/wx/gtk/filepicker.h    |  7 +------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index e8fd85a06e..6f3cd07852 100644
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -21,7 +21,6 @@ class WXDLLEXPORT wxStaticLine;
 // class name
 extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];
 
-
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
@@ -64,7 +63,6 @@ public:
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxCollapsiblePaneNameStr);
 
-
     // public wxCollapsiblePane API
     virtual void Collapse(bool collapse = true);
     virtual void SetLabel(const wxString &label);
@@ -76,6 +74,7 @@ public:
     virtual wxString GetLabel() const
         { return m_strLabel; }
 
+    virtual bool Layout();
 
     // implementation only, don't use
     void OnStateChange(const wxSize& sizeNew);
@@ -83,7 +82,6 @@ public:
 protected:
     // overridden methods
     virtual wxSize DoGetBestSize() const;
-    bool Layout();
 
     wxString GetBtnLabel() const;
     int GetBorder() const;
@@ -107,6 +105,4 @@ private:
 };
 
 #endif // wxUSE_BUTTON && wxUSE_STATLINE
-
-
 #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_
diff --git a/include/wx/gtk/collpane.h b/include/wx/gtk/collpane.h
index 76dc4bd2f4..563ad8f3df 100644
--- a/include/wx/gtk/collpane.h
+++ b/include/wx/gtk/collpane.h
@@ -51,25 +51,22 @@ public:
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxCollapsiblePaneNameStr);
 
-public:     // public API
-
-    wxSize DoGetBestSize() const;
     void Collapse(bool collapse = true);
     bool IsCollapsed() const;
     void SetLabel(const wxString &str);
 
-    void OnSize(wxSizeEvent&);
+protected:
+    virtual wxSize DoGetBestSize() const;
 
 public:     // used by GTK callbacks
-
     bool m_bIgnoreNextChange;
     wxSize m_szCollapsed;
 
 private:
+    void OnSize(wxSizeEvent&);
+
     DECLARE_DYNAMIC_CLASS(wxCollapsiblePane)
     DECLARE_EVENT_TABLE()
 };
 
-
-#endif
-    // _WX_COLLAPSABLE_PANEL_H_GTK_
+#endif // _WX_COLLAPSABLE_PANEL_H_GTK_
diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h
index 0030e4c61c..5a72f6f8a4 100644
--- a/include/wx/gtk/filepicker.h
+++ b/include/wx/gtk/filepicker.h
@@ -17,8 +17,6 @@
 // that GTK+ < 2.4
 #include "wx/generic/filepickerg.h"
 
-
-
 //-----------------------------------------------------------------------------
 // wxFileButton and wxDirButton shared code
 // (cannot be a base class since they need to derive from wxGenericFileButton
@@ -49,6 +47,7 @@
     /*      invalid cast from `GtkFileChooserButton' to  `GtkButton'       */ \
     /* so, override wxButton::GTKGetWindow and return NULL as GTK+ doesn't */ \
     /* give us access to the internal GdkWindow of a GtkFileChooserButton  */ \
+protected:                                                                    \
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const         \
         { return NULL; }
 
@@ -98,9 +97,6 @@ public:     // overrides
     // event handler for the click
     void OnDialogOK(wxCommandEvent &);
 
-
-public:     // some overrides
-
     // GtkFileChooserButton does not support GTK_FILE_CHOOSER_ACTION_SAVE
     // so we replace it with GTK_FILE_CHOOSER_ACTION_OPEN; since wxFD_SAVE
     // is not supported, wxFD_OVERWRITE_PROMPT isn't too...
@@ -118,7 +114,6 @@ public:     // some overrides
 protected:
     wxDialog *m_dialog;
 
-private:
     DECLARE_DYNAMIC_CLASS(wxFileButton)
 };
 
-- 
2.45.2