Remove wxRTTI macro for wxComboBox from Motif port.

[wxWidgets.git] / include / wx / private / textmeasure.h

diff --git a/include/wx/private/textmeasure.h b/include/wx/private/textmeasure.h
index a5432143668db509feffe98e5829376fc65710fe..393946e7bf476453e280045f234321f409853c5c 100644 (file)
--- a/include/wx/private/textmeasure.h
+++ b/include/wx/private/textmeasure.h
@@ -23,7 +23,8 @@ class wxTextMeasureBase
 {
 public:
     // The first ctor argument must be non-NULL, i.e. each object of this class
 {
 public:
     // The first ctor argument must be non-NULL, i.e. each object of this class

-    // is associated with either a valid wxDC or a valid wxWindow.
+    // is associated with either a valid wxDC or a valid wxWindow. The font can
+    // be NULL to use the current DC/window font or can be specified explicitly.

     wxTextMeasureBase(const wxDC *dc, const wxFont *theFont);
     wxTextMeasureBase(const wxWindow *win, const wxFont *theFont);
 
     wxTextMeasureBase(const wxDC *dc, const wxFont *theFont);
     wxTextMeasureBase(const wxWindow *win, const wxFont *theFont);
 


@@ -61,30 +62,39 @@ 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;
+    // This is another method which is only used by MeasuringGuard.
+    bool IsUsingDCImpl() const { return m_useDCImpl; }

 
 

+protected:

     // RAII wrapper for the two methods above.
     class MeasuringGuard
     {
     public:
         MeasuringGuard(wxTextMeasureBase& tm) : m_tm(tm)
         {
     // RAII wrapper for the two methods above.
     class MeasuringGuard
     {
     public:
         MeasuringGuard(wxTextMeasureBase& tm) : m_tm(tm)
         {

-            m_tm.BeginMeasuring();
+            // BeginMeasuring() should only be called if we have a native DC,
+            // so don't call it if we delegate to a DC of unknown type.
+            if ( !m_tm.IsUsingDCImpl() )
+                m_tm.BeginMeasuring();

         }
 
         ~MeasuringGuard()
         {
         }
 
         ~MeasuringGuard()
         {

-            m_tm.EndMeasuring();
+            if ( !m_tm.IsUsingDCImpl() )
+                m_tm.EndMeasuring();

         }
 
     private:
         }
 
     private:


@@ -121,6 +131,10 @@ protected:
                            wxCoord *descent = NULL,
                            wxCoord *externalLeading = NULL);
 
                            wxCoord *descent = NULL,
                            wxCoord *externalLeading = NULL);
 

+    // Return a valid font: if one was given to us in the ctor, use this one,
+    // otherwise use the current font of the associated wxDC or wxWindow.
+    wxFont GetFont() const;
+

 
     // Exactly one of m_dc and m_win is non-NULL for any given object of this
     // class.
 
     // Exactly one of m_dc and m_win is non-NULL for any given object of this
     // class.