merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
--- a/include/wx/generic/plot.h
+++ b/include/wx/generic/plot.h
@@ -325,9 +325,9 @@ public:
    void ResetScrollbar();

 private:
-    friend wxPlotArea;
-    friend wxPlotXAxisArea;
-    friend wxPlotYAxisArea;
+    friend class wxPlotArea;
+    friend class wxPlotXAxisArea;
+    friend class wxPlotYAxisArea;

    double             m_xUnitsPerValue;
    double             m_xZoom;