Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/gtk/private/textmeasure.h b/include/wx/gtk/private/textmeasure.h
index c7fc712ea7303ee65fa102eee6cba372ffec44ce..d27b096f261795d57096b2905afde682372a0997 100644 (file)
--- a/include/wx/gtk/private/textmeasure.h
+++ b/include/wx/gtk/private/textmeasure.h
@@ -3,7 +3,6 @@
 // Purpose:     wxGTK-specific declaration of wxTextMeasure class
 // Author:      Manuel Martin
 // Created:     2012-10-05
-// RCS-ID:      $Id:
 // Copyright:   (c) 1997-2012 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -20,13 +19,13 @@ class WXDLLIMPEXP_FWD_CORE wxWindowDCImpl;
 class wxTextMeasure : public wxTextMeasureBase
 {
 public:
-    wxTextMeasure(const wxDC *dc, const wxFont *font)
+    wxEXPLICIT wxTextMeasure(const wxDC *dc, const wxFont *font = NULL)
         : wxTextMeasureBase(dc, font)
     {
         Init();
     }
 
-    wxTextMeasure(const wxWindow *win, const wxFont *font)
+    wxEXPLICIT wxTextMeasure(const wxWindow *win, const wxFont *font = NULL)
         : wxTextMeasureBase(win, font)
     {
         Init();
@@ -49,7 +48,6 @@ protected:
                                          wxArrayInt& widths,
                                          double scaleX);
 
-
     // This class is only used for DC text measuring with GTK+ 2 as GTK+ 3 uses
     // Cairo and not Pango for this. However it's still used even with GTK+ 3
     // for window text measuring, so the context and the layout are still