Another attempt to fix wxTextMeasure compilation with VC6.

Simply make the methods accessed by the nested class public.

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

diff --git a/include/wx/private/textmeasure.h b/include/wx/private/textmeasure.h
index a5432143668db509feffe98e5829376fc65710fe..ebd6a612141a1d2496c7263e9212ec6a7558dbcc 100644 (file)
--- a/include/wx/private/textmeasure.h
+++ b/include/wx/private/textmeasure.h
@@ -61,18 +61,20 @@ public:
                                wxArrayInt& widths,
                                double scaleX);
 
                                wxArrayInt& widths,
                                double scaleX);
 

-protected:
+

     // These functions are called by our public methods before and after each
     // call to DoGetTextExtent(). Derived classes may override them to prepare
     // for -- possibly several -- subsequent calls to DoGetTextExtent().
     //
     // As these calls must be always paired, they're never called directly but
     // only by our friend MeasuringGuard class.
     // These functions are called by our public methods before and after each
     // call to DoGetTextExtent(). Derived classes may override them to prepare
     // for -- possibly several -- subsequent calls to DoGetTextExtent().
     //
     // As these calls must be always paired, they're never called directly but
     // only by our friend MeasuringGuard class.

+    //
+    // NB: They're public only to allow VC6 to compile this code, there doesn't
+    //     seem to be any way to give MeasuringGuard access to them (FIXME-VC6)

     virtual void BeginMeasuring() { }
     virtual void EndMeasuring() { }
 
     virtual void BeginMeasuring() { }
     virtual void EndMeasuring() { }
 

-    friend class MeasuringGuard;
-
+protected:

     // RAII wrapper for the two methods above.
     class MeasuringGuard
     {
     // RAII wrapper for the two methods above.
     class MeasuringGuard
     {