correct access for virtuals, unneeded includes

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

include/wx/clrpicker.h

@@ -17,7 +17,6 @@
 
 #if wxUSE_COLOURPICKERCTRL
 
-#include "wx/control.h"
 #include "wx/pickerbase.h"
 
 
@@ -137,11 +136,10 @@ public:        // internal functions
     // event handler for our picker
     void OnColourChange(wxColourPickerEvent &);
 
+protected:
     virtual long GetPickerStyle(long style) const
         { return (style & wxCLRP_SHOW_LABEL); }
 
-protected:
-
     // true if the next UpdateTextCtrl() call is to ignore
     bool m_bIgnoreNextTextCtrlUpdate;
 

include/wx/filepicker.h

@@ -14,15 +14,12 @@
 
 #include "wx/defs.h"
 
-
 #if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 
-#include "wx/control.h"
 #include "wx/pickerbase.h"
-#include "wx/filedlg.h"
 #include "wx/filename.h"
 
-
+class WXDLLIMPEXP_CORE wxDialog;
 class WXDLLIMPEXP_CORE wxFileDirPickerEvent;
 
 extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetLabel[];
@@ -220,13 +217,6 @@ public:     // overrides
         return true;
     }
 
-    // extracts the style for our picker from wxFileDirPickerCtrlBase's style
-    long GetPickerStyle(long style) const
-    {
-        return (style & (wxFLP_OPEN|wxFLP_SAVE|wxFLP_OVERWRITE_PROMPT|
-                            wxFLP_FILE_MUST_EXIST|wxFLP_CHANGE_DIR));
-    }
-
     bool CheckPath(const wxString &path) const
     {
         return HasFlag(wxFLP_SAVE) || wxFileName::FileExists(path);
@@ -238,6 +228,14 @@ public:     // overrides
     wxEventType GetEventType() const
         { return wxEVT_COMMAND_FILEPICKER_CHANGED; }
 
+protected:
+    // extracts the style for our picker from wxFileDirPickerCtrlBase's style
+    long GetPickerStyle(long style) const
+    {
+        return (style & (wxFLP_OPEN|wxFLP_SAVE|wxFLP_OVERWRITE_PROMPT|
+                            wxFLP_FILE_MUST_EXIST|wxFLP_CHANGE_DIR));
+    }
+
 private:
     DECLARE_DYNAMIC_CLASS(wxFilePickerCtrl)
 };
@@ -299,10 +297,6 @@ public:     // overrides
         return true;
     }
 
-    // extracts the style for our picker from wxFileDirPickerCtrlBase's style
-    long GetPickerStyle(long style) const
-        { return (style & (wxDIRP_DIR_MUST_EXIST|wxDIRP_CHANGE_DIR)); }
-
     bool CheckPath(const wxString &path) const
         { if (HasFlag(wxDIRP_DIR_MUST_EXIST)) return wxFileName::DirExists(path); else return true; }
 
@@ -312,6 +306,11 @@ public:     // overrides
     wxEventType GetEventType() const
         { return wxEVT_COMMAND_DIRPICKER_CHANGED; }
 
+protected:
+    // extracts the style for our picker from wxFileDirPickerCtrlBase's style
+    long GetPickerStyle(long style) const
+        { return (style & (wxDIRP_DIR_MUST_EXIST|wxDIRP_CHANGE_DIR)); }
+
 private:
     DECLARE_DYNAMIC_CLASS(wxDirPickerCtrl)
 };

include/wx/fontpicker.h

@@ -17,7 +17,6 @@
 
 #if wxUSE_FONTPICKERCTRL
 
-#include "wx/control.h"
 #include "wx/pickerbase.h"
 
 
@@ -156,12 +155,12 @@ public:        // internal functions
     virtual wxString Font2String(const wxFont &font);
     virtual wxFont String2Font(const wxString &font);
 
+protected:
+
     // extracts the style for our picker from wxFontPickerCtrl's style
     long GetPickerStyle(long style) const
         { return (style & (wxFNTP_FONTDESC_AS_LABEL|wxFNTP_USEFONT_FOR_LABEL)); }
 
-protected:
-
     // true if the next UpdateTextCtrl() call is to ignore
     bool m_bIgnoreNextTextCtrlUpdate;
 

include/wx/generic/filepickerg.h

@@ -13,7 +13,6 @@
 #define _WX_FILEDIRPICKER_H_
 
 #include "wx/button.h"
-#include "wx/filename.h"
 #include "wx/filedlg.h"
 #include "wx/dirdlg.h"
 
@@ -136,12 +135,14 @@ public:     // overrideable
         return p;
     }
 
+    wxEventType GetEventType() const
+        { return wxEVT_COMMAND_FILEPICKER_CHANGED; }
+
+protected:
     void UpdateDialogPath(wxDialog *p)
         { wxStaticCast(p, wxFileDialog)->SetPath(m_path); }
     void UpdatePathFromDialog(wxDialog *p)
         { m_path = wxStaticCast(p, wxFileDialog)->GetPath(); }
-    wxEventType GetEventType() const
-        { return wxEVT_COMMAND_FILEPICKER_CHANGED; }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericFileButton)
@@ -193,12 +194,14 @@ public:     // overrideable
                                    GetDialogStyle());
     }
 
+    wxEventType GetEventType() const
+        { return wxEVT_COMMAND_DIRPICKER_CHANGED; }
+
+protected:
     void UpdateDialogPath(wxDialog *p)
         { wxStaticCast(p, wxDirDialog)->SetPath(m_path); }
     void UpdatePathFromDialog(wxDialog *p)
         { m_path = wxStaticCast(p, wxDirDialog)->GetPath(); }
-    wxEventType GetEventType() const
-        { return wxEVT_COMMAND_DIRPICKER_CHANGED; }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericDirButton)

include/wx/gtk/clrpicker.h

@@ -52,9 +52,9 @@ public:     // overrides
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxColourPickerWidgetNameStr);
 
+protected:
     void UpdateColour();
 
-
 public:     // used by the GTK callback only
 
     GdkColor *GetGdkColor() const

include/wx/gtk/fontpicker.h

@@ -51,6 +51,7 @@ public:     // overrides
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxFontPickerWidgetNameStr);
 
+protected:
     void UpdateFont();
 
 

include/wx/pickerbase.h

@@ -12,9 +12,11 @@
 #ifndef _WX_PICKERBASE_H_BASE_
 #define _WX_PICKERBASE_H_BASE_
 
-#include "wx/defs.h"
+#include "wx/control.h"
-#include "wx/button.h"
+
-#include "wx/textctrl.h"
+class WXDLLIMPEXP_CORE wxTextCtrl;
+
+extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxPickerBase is the base class for the picker controls which support
@@ -70,6 +72,7 @@ public:     // wxWindow overrides
                         int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
                         int incW = wxDefaultCoord, int incH = wxDefaultCoord );
 
+protected:
     void DoSetSize(int x, int y,
                    int width, int height,
                    int sizeFlags = wxSIZE_AUTO);

src/common/clrpickercmn.cpp

@@ -28,6 +28,7 @@
 
 #include "wx/clrpicker.h"
 
+#include "wx/textctrl.h"
 
 
 // ============================================================================

src/common/fontpickercmn.cpp

@@ -27,6 +27,8 @@
 #if wxUSE_FONTPICKERCTRL
 
 #include "wx/fontpicker.h"
+
+#include "wx/textctrl.h"
 #include "wx/fontenum.h"
 #include "wx/tokenzr.h"
 

src/common/pickerbase.cpp

@@ -26,6 +26,7 @@
 
 #include "wx/pickerbase.h"
 
+#include "wx/textctrl.h"
 
 // ============================================================================
 // implementation

src/generic/clrpickerg.cpp

@@ -24,11 +24,10 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
+#if wxUSE_COLOURPICKERCTRL
-    #include "wx/window.h"
-#endif //WX_PRECOMP
 
 #include "wx/clrpicker.h"
+
 #include "wx/colordlg.h"
 
 
@@ -36,8 +35,6 @@
 // implementation
 // ============================================================================
 
-#if wxUSE_COLOURPICKERCTRL
-
 wxColourData wxGenericColourButton::ms_data;
 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourButton, wxButton)
 

src/generic/filepickerg.cpp

@@ -24,20 +24,15 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
+#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
-    #include "wx/window.h"
-#endif //WX_PRECOMP
 
 #include "wx/filepicker.h"
-#include "wx/filedlg.h"
 
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
-
 IMPLEMENT_DYNAMIC_CLASS(wxGenericFileButton, wxButton)
 IMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton)
 

src/generic/fontpickerg.cpp

@@ -24,11 +24,10 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
+#if wxUSE_FONTPICKERCTRL
-    #include "wx/window.h"
-#endif //WX_PRECOMP
 
 #include "wx/fontpicker.h"
+
 #include "wx/fontdlg.h"
 
 
@@ -36,8 +35,6 @@
 // implementation
 // ============================================================================
 
-#if wxUSE_FONTPICKERCTRL
-
 wxFontData wxGenericFontButton::ms_data;
 IMPLEMENT_DYNAMIC_CLASS(wxGenericFontButton, wxButton)
 

src/gtk/clrpicker.cpp

@@ -21,9 +21,6 @@
 
 #include "wx/clrpicker.h"
 
-#include "wx/gtk/private.h"
-
-#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 // ============================================================================

src/gtk/filepicker.cpp

@@ -21,13 +21,8 @@
 
 #include "wx/filepicker.h"
 
-#include "wx/gtk/private.h"
+#include "wx/tooltip.h"
 
-#if wxUSE_TOOLTIPS
-    #include "wx/tooltip.h"
-#endif
-
-#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include <unistd.h> // chdir

src/gtk/fontpicker.cpp

@@ -24,9 +24,6 @@
 #include "wx/fontutil.h"        // for wxNativeFontInfo
 #include "wx/gtk/private.h"
 
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
 // ============================================================================
 // implementation
 // ============================================================================