Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Another attempt to fix wxTextMeasure compilation with VC6.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2012-10-27 12:28:04 +00:00
parent a9f1207c1b
commit 79275a0dae
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/private/textmeasure.h
View File

@@ -61,18 +61,20 @@ public:
wxArrayInt& widths, wxArrayInt& widths,
double scaleX); double scaleX);
protected:
// These functions are called by our public methods before and after each // These functions are called by our public methods before and after each
// call to DoGetTextExtent(). Derived classes may override them to prepare // call to DoGetTextExtent(). Derived classes may override them to prepare
// for -- possibly several -- subsequent calls to DoGetTextExtent(). // for -- possibly several -- subsequent calls to DoGetTextExtent().
// //
// As these calls must be always paired, they're never called directly but // As these calls must be always paired, they're never called directly but
// only by our friend MeasuringGuard class. // 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 BeginMeasuring() { }
virtual void EndMeasuring() { } virtual void EndMeasuring() { }
friend class MeasuringGuard; protected:
// RAII wrapper for the two methods above. // RAII wrapper for the two methods above.
class MeasuringGuard class MeasuringGuard
{ {