correct access for virtuals, unneeded includes

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

diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h
index e36b8cca944dd3ce8d42ab0200c3e55e71801c86..1742257d00ed1388ae1f774914f1597575c486c7 100644 (file)
--- a/include/wx/clrpicker.h
+++ b/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;
 

diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h
index 0564cf0e8e547dbddf1b82ea3109dbe32e4a5a9d..d82fecb82a941e836ea467354ed72c518fa9e8b2 100644 (file)
--- a/include/wx/filepicker.h
+++ b/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)
 };

diff --git a/include/wx/fontpicker.h b/include/wx/fontpicker.h
index e559e8d780a7fcad4718e70da2b4c0d2ffac5ab1..4175ba3f05ac35549d1d2a5c2f7842d5683681ab 100644 (file)
--- a/include/wx/fontpicker.h
+++ b/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;
 

diff --git a/include/wx/generic/filepickerg.h b/include/wx/generic/filepickerg.h
index 51a019b8df483118f7f0fbf0071055a07d6f2918..ec23c505bdce0002e2ebe994f250cfd2f7591e93 100644 (file)
--- a/include/wx/generic/filepickerg.h
+++ b/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)

diff --git a/include/wx/gtk/clrpicker.h b/include/wx/gtk/clrpicker.h
index 5e54c4c2984828d8b8c285be60869509a0a52eac..5a301ad9b6bf012cac563a7e4e601948004ae3b0 100644 (file)
--- a/include/wx/gtk/clrpicker.h
+++ b/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

diff --git a/include/wx/gtk/fontpicker.h b/include/wx/gtk/fontpicker.h
index 8c97e936be1f09589311e4ceb88d96ec3c59faca..06ba2ed99f47bcdf7e4d72b61ee72febf608ef38 100644 (file)
--- a/include/wx/gtk/fontpicker.h
+++ b/include/wx/gtk/fontpicker.h
@@ -51,6 +51,7 @@ public:     // overrides
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxFontPickerWidgetNameStr);
 
+protected:
     void UpdateFont();
 
 

diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index d5bd9a5c47f816afa334a3ed4f4ea682d98144fd..64714f4399487a1526f5a445d63298e7b13bdf81 100644 (file)
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -12,9 +12,11 @@
 #ifndef _WX_PICKERBASE_H_BASE_
 #define _WX_PICKERBASE_H_BASE_
 
-#include "wx/defs.h"
-#include "wx/button.h"
-#include "wx/textctrl.h"
+#include "wx/control.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);

diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp
index 412eaadc7b80c979cb5ff2b4a55c1199e0d6b1e5..9007e15ad852ce58976fcc8df2e01d8e33175e6d 100644 (file)
--- a/src/common/clrpickercmn.cpp
+++ b/src/common/clrpickercmn.cpp
@@ -28,6 +28,7 @@
 
 #include "wx/clrpicker.h"
 
+#include "wx/textctrl.h"
 
 
 // ============================================================================

diff --git a/src/common/fontpickercmn.cpp b/src/common/fontpickercmn.cpp
index a3b766e57126a98347f55efef424d54f77a7b540..35bb1653f6b9715123b91675f0f920347bd0fb0d 100644 (file)
--- a/src/common/fontpickercmn.cpp
+++ b/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"
 

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 68ff4a88ee0e9754c9e00772524b87bf20315fb0..6d56d2da25e82d7546f5009ab19288e853daf747 100644 (file)
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -26,6 +26,7 @@
 
 #include "wx/pickerbase.h"
 
+#include "wx/textctrl.h"
 
 // ============================================================================
 // implementation

diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp
index e0db6bbb012be62eb19d0452f7939f1621de44de..497bfa0a017e38cf74f9026be5d5f61bdef93d4d 100644 (file)
--- a/src/generic/clrpickerg.cpp
+++ b/src/generic/clrpickerg.cpp
@@ -24,11 +24,10 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-#endif //WX_PRECOMP
+#if wxUSE_COLOURPICKERCTRL
 
 #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)
 

diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp
index f5f128d50d67b00472854bda41910742be6a13e7..55583a121e67c25ce22caa6626d0684d7e4993ac 100644 (file)
--- a/src/generic/filepickerg.cpp
+++ b/src/generic/filepickerg.cpp
@@ -24,20 +24,15 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-#endif //WX_PRECOMP
+#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 
 #include "wx/filepicker.h"
-#include "wx/filedlg.h"
 
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
-
 IMPLEMENT_DYNAMIC_CLASS(wxGenericFileButton, wxButton)
 IMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton)
 

diff --git a/src/generic/fontpickerg.cpp b/src/generic/fontpickerg.cpp
index 1a67f07b85a0d14fdcea7a05a61853ef86531d2c..06a5c5c539fd8a0a3d9c290edd63756ffe770924 100644 (file)
--- a/src/generic/fontpickerg.cpp
+++ b/src/generic/fontpickerg.cpp
@@ -24,11 +24,10 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-#endif //WX_PRECOMP
+#if wxUSE_FONTPICKERCTRL
 
 #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)
 

diff --git a/src/gtk/clrpicker.cpp b/src/gtk/clrpicker.cpp
index 9b5cc89a47f0d53a95e9ee4391fe769af5764c96..5ba0324488ddb7623a3cd7ad4a9c179b58a30429 100644 (file)
--- a/src/gtk/clrpicker.cpp
+++ b/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>
 
 // ============================================================================

diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index f6dc7254df429f83351c6e43412655cf55ab4a75..6784f90430f0fa029727e6aa3ee07b37fcd2a5c7 100644 (file)
--- a/src/gtk/filepicker.cpp
+++ b/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

diff --git a/src/gtk/fontpicker.cpp b/src/gtk/fontpicker.cpp
index 5c7f24b383c00cb0fa7e97801c66013a6c4b47b9..27d8bb19bfc1a3ce19035eeed8b50f6c2710e9bb 100644 (file)
--- a/src/gtk/fontpicker.cpp
+++ b/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
 // ============================================================================